Merge pull request #1746 from Microsoft/master

Merge to release 0.16.0
microsoft · Mar 28, 2018 · 3bbfed6 · 3bbfed6
2 parents d079892 + 638fd67
commit 3bbfed6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
@@ -1,6 +1,6 @@
 # C/C++ for Visual Studio Code Change Log
 
-## Version 0.16.0: March 22, 2018
+## Version 0.16.0: March 28, 2018
 * Enable autocomplete for local and global scopes. [#13](https://github.com/Microsoft/vscode-cpptools/issues/13)
 * Add a setting to define multiline comment patterns: `C_Cpp.commentContinuationPatterns`. [#1100](https://github.com/Microsoft/vscode-cpptools/issues/1100), [#1539](https://github.com/Microsoft/vscode-cpptools/issues/1539)
 * Add a setting to disable inactive region highlighting: `C_Cpp.dimInactiveRegions`. [#1592](https://github.com/Microsoft/vscode-cpptools/issues/1592)

diff --git a/Extension/package.json b/Extension/package.json
@@ -428,7 +428,7 @@
                     "ignoreFailures": {
                       "type": "boolean",
                       "description": "If true, failures from the command should be ignored. Default value is false.",
-                      "default": "false"
+                      "default": false
                     }
                   }
                 },
@@ -453,7 +453,7 @@
                     "ignoreFailures": {
                       "type": "boolean",
                       "description": "If true, failures from the command should be ignored. Default value is false.",
-                      "default": ""
+                      "default": false
                     }
                   }
                 },
@@ -476,7 +476,7 @@
               "showDisplayString": {
                 "type": "boolean",
                 "description": "When a visualizerFile is specified, showDisplayString will enable the display string. Turning this option on can cause slower performance during debugging.",
-                "default": "true"
+                "default": true
               },
               "environment": {
                 "type": "array",
@@ -533,12 +533,12 @@
               "filterStdout": {
                 "type": "boolean",
                 "description": "Search stdout stream for server-started pattern and log stdout to debug output. Defaults to true.",
-                "default": "true"
+                "default": true
               },
               "filterStderr": {
                 "type": "boolean",
                 "description": "Search stderr stream for server-started pattern and log stderr to debug output. Defaults to false.",
-                "default": "false"
+                "default": false
               },
               "serverLaunchTimeout": {
                 "type": "integer",
@@ -553,7 +553,7 @@
               "externalConsole": {
                 "type": "boolean",
                 "description": "If true, a console is launched for the debuggee. If false, no console is launched. Note this option is ignored in some cases for technical reasons.",
-                "default": "false"
+                "default": false
               },
               "sourceFileMap": {
                 "type": "object",
@@ -673,7 +673,7 @@
               "showDisplayString": {
                 "type": "boolean",
                 "description": "When a visualizerFile is specified, showDisplayString will enable the display string. Turning this option on can cause slower performance during debugging.",
-                "default": "true"
+                "default": true
               },
               "additionalSOLibSearchPath": {
                 "type": "string",
@@ -712,12 +712,12 @@
               "filterStdout": {
                 "type": "boolean",
                 "description": "Search stdout stream for server-started pattern and log stdout to debug output. Defaults to true.",
-                "default": "true"
+                "default": true
               },
               "filterStderr": {
                 "type": "boolean",
                 "description": "Search stderr stream for server-started pattern and log stderr to debug output. Defaults to false.",
-                "default": "false"
+                "default": false
               },
               "sourceFileMap": {
                 "type": "object",
@@ -825,7 +825,7 @@
                     "ignoreFailures": {
                       "type": "boolean",
                       "description": "If true, failures from the command should be ignored. Default value is false.",
-                      "default": "false"
+                      "default": false
                     }
                   }
                 },
@@ -914,7 +914,7 @@
               "externalConsole": {
                 "type": "boolean",
                 "description": "If true, a console is launched for the debuggee. If false, no console is launched.",
-                "default": "false"
+                "default": false
               },
               "sourceFileMap": {
                 "type": "object",

diff --git a/Extension/src/LanguageServer/configurations.ts b/Extension/src/LanguageServer/configurations.ts
@@ -220,7 +220,9 @@ export class CppProperties {
             if (process.platform === 'darwin') {
                 this.configurationJson.configurations[this.CurrentConfiguration].macFrameworkPath = this.defaultFrameworks;
             }
-            this.configurationJson.configurations[this.CurrentConfiguration].compilerPath = this.defaultCompilerPath;
+            if (this.defaultCompilerPath) {
+                this.configurationJson.configurations[this.CurrentConfiguration].compilerPath = this.defaultCompilerPath;
+            }
             if (this.defaultCStandard) {
                 this.configurationJson.configurations[this.CurrentConfiguration].cStandard = this.defaultCStandard;
             }
@@ -475,15 +477,16 @@ export class CppProperties {
 
             // Update the compilerPath, cStandard, and cppStandard with the default if they're missing.
             let config: Configuration = this.configurationJson.configurations[this.CurrentConfiguration];
-            if (config.compilerPath === undefined) {
+            // Don't set the default if compileCommands exist, until it is fixed to have the correct value.
+            if (config.compilerPath === undefined && this.defaultCompilerPath && !config.compileCommands) {
                 config.compilerPath = this.defaultCompilerPath;
                 dirty = true;
             }
-            if (!config.cStandard) {
+            if (!config.cStandard && this.defaultCStandard) {
                 config.cStandard = this.defaultCStandard;
                 dirty = true;
             }
-            if (!config.cppStandard) {
+            if (!config.cppStandard && this.defaultCppStandard) {
                 config.cppStandard = this.defaultCppStandard;
                 dirty = true;
             }