From 2de59e3cabb9a3d2e30bd731e97c140251c5dca7 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Tue, 5 Feb 2019 13:46:02 -0800 Subject: [PATCH 1/3] Add suggestSnippets setting. --- Extension/package.json | 6 ++++++ Extension/src/LanguageServer/client.ts | 1 + Extension/src/LanguageServer/settings.ts | 1 + 3 files changed, 8 insertions(+) diff --git a/Extension/package.json b/Extension/package.json index 6e68a19f0..064938909 100644 --- a/Extension/package.json +++ b/Extension/package.json @@ -467,6 +467,12 @@ "description": "Set to \"Insiders\" to automatically download and install the latest Insiders builds of the extension, which include upcoming features and bug fixes.", "scope": "resource" } + }, + "C_Cpp.suggestSnippets": { + "type": "boolean", + "default": true, + "description": "If true, snippets are provided from the language server.", + "scope": "resource" } }, "commands": [ diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts index a4ba37098..e7fa65e3f 100644 --- a/Extension/src/LanguageServer/client.ts +++ b/Extension/src/LanguageServer/client.ts @@ -399,6 +399,7 @@ class DefaultClient implements Client { autocomplete: settings.autoComplete, errorSquiggles: settings.errorSquiggles, dimInactiveRegions: settings.dimInactiveRegions, + suggestSnippets: settings.suggestSnippets, loggingLevel: settings.loggingLevel, workspaceParsingPriority: settings.workspaceParsingPriority, workspaceSymbols: settings.workspaceSymbols, diff --git a/Extension/src/LanguageServer/settings.ts b/Extension/src/LanguageServer/settings.ts index 50becfb8f..cc21c6bed 100644 --- a/Extension/src/LanguageServer/settings.ts +++ b/Extension/src/LanguageServer/settings.ts @@ -36,6 +36,7 @@ export class CppSettings extends Settings { public get clangFormatSortIncludes(): string { return super.Section.get("clang_format_sortIncludes"); } public get clangFormatOnSave(): string { return super.Section.get("clang_format_formatOnSave"); } public get formatting(): string { return super.Section.get("formatting"); } + public get suggestSnippets(): boolean { return super.Section.get("suggestSnippets"); } public get intelliSenseEngine(): string { return super.Section.get("intelliSenseEngine"); } public get intelliSenseEngineFallback(): string { return super.Section.get("intelliSenseEngineFallback"); } public get errorSquiggles(): string { return super.Section.get("errorSquiggles"); } From 3e7351c09ba02dcd4487d353a590b038e730c789 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Tue, 5 Feb 2019 13:50:25 -0800 Subject: [PATCH 2/3] Fix package.json. --- Extension/package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Extension/package.json b/Extension/package.json index 064938909..f534cca36 100644 --- a/Extension/package.json +++ b/Extension/package.json @@ -466,13 +466,13 @@ "default": "Default", "description": "Set to \"Insiders\" to automatically download and install the latest Insiders builds of the extension, which include upcoming features and bug fixes.", "scope": "resource" + }, + "C_Cpp.suggestSnippets": { + "type": "boolean", + "default": true, + "description": "If true, snippets are provided from the language server.", + "scope": "resource" } - }, - "C_Cpp.suggestSnippets": { - "type": "boolean", - "default": true, - "description": "If true, snippets are provided from the language server.", - "scope": "resource" } }, "commands": [ From b024c9b0f43465f9304a091a09e0366477946688 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Tue, 5 Feb 2019 15:14:51 -0800 Subject: [PATCH 3/3] Change snippet comment. --- Extension/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Extension/package.json b/Extension/package.json index f534cca36..dd373defc 100644 --- a/Extension/package.json +++ b/Extension/package.json @@ -470,7 +470,7 @@ "C_Cpp.suggestSnippets": { "type": "boolean", "default": true, - "description": "If true, snippets are provided from the language server.", + "description": "If true, snippets are provided by the language server.", "scope": "resource" } }