Provide safer logic when dealing with restore process.

package.json

@@ -2,8 +2,8 @@
 	"name": "snippets",
 	"displayName": "Snippets",
 	"description": "Manage your code snippets without quitting your editor.",
-	"version": "2.0.1",
-	"preview": true,
+	"version": "2.0.2",
+	"preview": false,
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"publisher": "tahabasri",
 	"author": {

src/config/labels.ts

@@ -36,8 +36,10 @@ export const enum Labels {
 	snippetsInvalidNewPath = "Snippets path [{0}] is not a valid JSON file, will revert back to old location [{1}].",
 	snippetsNoNewPath = "Snippets will be saved to old location [{0}].",
 
+	snippetsBackupRequest = "Please keep a copy of your snippets file before proceeding with the restore. Yours is located in [{0}]",
 	snippetsMigrateRequest = "You have some old snippets saved in [{0}], do you want to restore them ? (Original file will be saved in case of error).",
 	snippetsDataRestored = "Snippets restored. Kept original file as [{0}].",
+	snippetsDataNotRestored = "Snippets were not restored. We kept original file in [{0}]. Please reload window and try again !",
 	snippetsDataRestoredButFileNotRenamed = "Snippets restored. But couldn't rename file [{0}], please rename it manually.",
 	snippetsNoDataRestored = "No data was provided from file to restore.",
 

src/extension.ts

@@ -59,6 +59,9 @@ export function activate(context: vscode.ExtensionContext) {
 				if(dataAccess.hasNoChild() && !noData) {
 					const migrateData = Labels.migrateData;
 					const discardData = Labels.discardData;
+					vscode.window.showWarningMessage(
+						StringUtility.formatString(Labels.snippetsBackupRequest, oldSnippetsPath)
+					);
 					vscode.window.showInformationMessage(
 						StringUtility.formatString(Labels.snippetsMigrateRequest, oldSnippetsPath),
 						...[migrateData, discardData])
@@ -72,18 +75,24 @@ export function activate(context: vscode.ExtensionContext) {
 									newSnippets.lastId = oldSnippets.lastId;
 									dataAccess.save(newSnippets);
 									snippetsProvider.sync();
-									fs.rename(oldSnippetsPath, `${oldSnippetsPath}_bak`, (err) => {
-										if (err) {
-											vscode.window.showInformationMessage(
-												StringUtility.formatString(Labels.snippetsDataRestoredButFileNotRenamed, `${oldSnippetsPath}_bak`)
-											);
-										}else {
-											//file removed
-											vscode.window.showInformationMessage(
-												StringUtility.formatString(Labels.snippetsDataRestored, `${oldSnippetsPath}_bak`)
-											);
-										}
-									});
+									if (dataAccess.hasNoChild() || !newSnippets.children || newSnippets.children.length !== oldSnippets.children.length) {
+										vscode.window.showErrorMessage(
+											StringUtility.formatString(Labels.snippetsDataNotRestored, oldSnippetsPath)
+										);
+									}else {
+										fs.rename(oldSnippetsPath, `${oldSnippetsPath}_bak`, (err) => {
+											if (err) {
+												vscode.window.showInformationMessage(
+													StringUtility.formatString(Labels.snippetsDataRestoredButFileNotRenamed, `${oldSnippetsPath}_bak`)
+												);
+											}else {
+												//file removed
+												vscode.window.showInformationMessage(
+													StringUtility.formatString(Labels.snippetsDataRestored, `${oldSnippetsPath}_bak`)
+												);
+											}
+										});
+									}
 								}else{
 									vscode.window.showInformationMessage(Labels.snippetsNoDataRestored);
 								}