Remove json-based snippets, handled by the server now. (#2945)

* Remove json-based snippets, handled by the server now.
microsoft · Dec 28, 2018 · c727cec · c727cec
1 parent f58af4f
commit c727cec
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 202 deletions.
diff --git a/Extension/cpp_snippets.json b/Extension/cpp_snippets.json
diff --git a/Extension/package.json b/Extension/package.json
@@ -505,11 +505,6 @@
         "title": "%c_cpp.command.navigate.title%",
         "category": "C/C++"
       },
-      {
-        "command": "C_Cpp.ToggleSnippets",
-        "title": "%c_cpp.command.toggleSnippets.title%",
-        "category": "C/C++"
-      },
       {
         "command": "C_Cpp.ToggleErrorSquiggles",
         "title": "%c_cpp.command.toggleErrorSquiggles.title%",
@@ -1372,17 +1367,7 @@
       "[c]": {
         "editor.wordBasedSuggestions": false
       }
-    },
-    "snippets": [
-      {
-        "language": "cpp",
-        "path": "./cpp_snippets.json"
-      },
-      {
-        "language": "c",
-        "path": "./cpp_snippets.json"
-      }
-    ]
+    }
   },
   "scripts": {
     "compile": "npm run vscode:prepublish",

diff --git a/Extension/package.nls.it.json b/Extension/package.nls.it.json
@@ -6,7 +6,6 @@
     "c_cpp.command.peekDeclaration.title": "Visualizza dichiarazione",
     "c_cpp.command.switchHeaderSource.title": "Visualizza Header/Sorgente",
     "c_cpp.command.navigate.title": "Naviga...",
-    "c_cpp.command.toggleSnippets.title": "Attiva/Disattiva frammenti di codice",
     "c_cpp.command.toggleErrorSquiggles.title": "Attiva/Disattiva sottolineamento errori",
     "c_cpp.command.toggleIncludeFallback.title": "Attiva/Disattiva motore di fallback IntelliSense negli errori di inclusione",
     "c_cpp.command.toggleDimInactiveRegions.title": "Attiva/Disattiva colorazione regioni inattive",

diff --git a/Extension/package.nls.json b/Extension/package.nls.json
@@ -6,7 +6,6 @@
     "c_cpp.command.peekDeclaration.title": "Peek declaration",
     "c_cpp.command.switchHeaderSource.title": "Switch Header/Source",
     "c_cpp.command.navigate.title": "Navigate...",
-    "c_cpp.command.toggleSnippets.title": "Toggle snippets",
     "c_cpp.command.toggleErrorSquiggles.title": "Toggle error squiggles",
     "c_cpp.command.toggleIncludeFallback.title": "Toggle IntelliSense engine fallback on include errors",
     "c_cpp.command.toggleDimInactiveRegions.title": "Toggle inactive region colorization",

diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
@@ -395,7 +395,6 @@ function registerCommands(): void {
     disposables.push(vscode.commands.registerCommand('C_Cpp.ConfigurationEdit', onEditConfiguration));
     disposables.push(vscode.commands.registerCommand('C_Cpp.AddToIncludePath', onAddToIncludePath));
     disposables.push(vscode.commands.registerCommand('C_Cpp.ToggleErrorSquiggles', onToggleSquiggles));
-    disposables.push(vscode.commands.registerCommand('C_Cpp.ToggleSnippets', onToggleSnippets));
     disposables.push(vscode.commands.registerCommand('C_Cpp.ToggleIncludeFallback', onToggleIncludeFallback));
     disposables.push(vscode.commands.registerCommand('C_Cpp.ToggleDimInactiveRegions', onToggleDimInactiveRegions));
     disposables.push(vscode.commands.registerCommand('C_Cpp.ShowReleaseNotes', onShowReleaseNotes));
@@ -542,47 +541,6 @@ function onToggleSquiggles(): void {
     settings.toggleSetting("errorSquiggles", "Enabled", "Disabled");
 }
 
-function onToggleSnippets(): void {
-    onActivationEvent();
-
-    // This will apply to all clients as it's a global toggle. It will require a reload.
-    const snippetsCatName: string  = "Snippets";
-    let newPackageJson: any = util.getRawPackageJson();
-
-    if (newPackageJson.categories.findIndex(cat => cat === snippetsCatName) === -1) {
-        // Add the Snippet category and snippets node. 
-
-        newPackageJson.categories.push(snippetsCatName);
-        newPackageJson.contributes.snippets = [{"language": "cpp", "path": "./cpp_snippets.json"}, {"language": "c", "path": "./cpp_snippets.json"}];
-
-        fs.writeFile(util.getPackageJsonPath(), util.stringifyPackageJson(newPackageJson), () => {
-            showReloadPrompt("Reload Window to finish enabling C++ snippets");
-        });
-
-    } else {
-        // Remove the category and snippets node.
-        let ndxCat: number = newPackageJson.categories.indexOf(snippetsCatName);
-        if (ndxCat !== -1) {
-            newPackageJson.categories.splice(ndxCat, 1);
-        }
-
-        delete newPackageJson.contributes.snippets;
-
-        fs.writeFile(util.getPackageJsonPath(), util.stringifyPackageJson(newPackageJson), () => {
-            showReloadPrompt("Reload Window to finish disabling C++ snippets");
-        });
-    }
-}
-
-function showReloadPrompt(msg: string): void { 
-    let reload: string = "Reload"; 
-    vscode.window.showInformationMessage(msg, reload).then(value => { 
-       if (value === reload) { 
-          vscode.commands.executeCommand("workbench.action.reloadWindow"); 
-       } 
-    }); 
- } 
-
 function onToggleIncludeFallback(): void {
     onActivationEvent();
     // This only applies to the active client.

diff --git a/Extension/src/commands.ts b/Extension/src/commands.ts
@@ -24,7 +24,6 @@ class TemporaryCommandRegistrar {
         "C_Cpp.ToggleErrorSquiggles",
         "C_Cpp.ToggleIncludeFallback",
         "C_Cpp.ToggleDimInactiveRegions",
-        "C_Cpp.ToggleSnippets",
         "C_Cpp.ShowReleaseNotes",
         "C_Cpp.ResetDatabase",
         "C_Cpp.PauseParsing",

diff --git a/Extension/src/main.ts b/Extension/src/main.ts
@@ -339,7 +339,6 @@ function rewriteManifest(): Promise<void> {
         "onCommand:C_Cpp.ToggleErrorSquiggles",
         "onCommand:C_Cpp.ToggleIncludeFallback",
         "onCommand:C_Cpp.ToggleDimInactiveRegions",
-        "onCommand:C_Cpp.ToggleSnippets",
         "onCommand:C_Cpp.ShowReleaseNotes",
         "onCommand:C_Cpp.ResetDatabase",
         "onCommand:C_Cpp.PauseParsing",