Merge pull request #2725 from Microsoft/master

2nd merge for 0.20.0

.travis.yml

@@ -35,7 +35,9 @@ script:
   - npm run tslint
   # pr-check needs to run before test. test modifies package.json.
   - npm run pr-check
-  - npm run test
+  - npm run unitTests
+  # TODO: Merge tests into one group due to Gulp 4.0
+  - npm run integrationTests
   # Dump integrationTest.log output
   - find ~ -name "integrationTests.log" -type f -exec cat {} \;
   

Documentation/LanguageServer/c_cpp_properties.json.md

@@ -68,7 +68,11 @@
   A list of files that should be included before any other characters in the source file are processed. Files are included in the order listed.
 
 * #### `compilerPath` (optional)
-  The absolute path to the compiler you use to build your project. The extension will query the compiler to determine the system include paths and default defines to use for IntelliSense. Args can be added to modify the includes/defines used, e.g. `-nostdinc++`, `-m32`, etc., but paths with spaces must be surrounded by double quotes (`"`) if args are used.
+  The absolute path to the compiler you use to build your project. The extension will query the compiler to determine the system include paths and default defines to use for IntelliSense.
+  
+  Args can be added to modify the includes/defines used, e.g. `-nostdinc++`, `-m32`, `-fno-ms-extensions`, etc., but paths with spaces must be surrounded by double quotes (`"`) if args are used.
+  
+  If you want to disable automatic querying of system include paths and defines, set this value to the emptry string `""`. This is generally not recommended, but there are some cases where automatic querying of system includes and defines is undesirable.
 
 * #### `cStandard`
   The C standard revision to use for IntelliSense in your project.

Extension/CHANGELOG.md

@@ -1,5 +1,29 @@
 # C/C++ for Visual Studio Code Change Log
 
+## Version 0.20.0: October 29, 2018
+* Add IntegratedTerminal support for Linux and Windows. [#35](https://github.com/microsoft/vscode-cpptools/issues/35)
+* Unify Visual Studio Code debug protocol parsing by using a shared library with Visual Studio.
+* Fix IntelliSense-based `Go to Definition` on overloads (in the same TU). [#1071](https://github.com/Microsoft/vscode-cpptools/issues/1071)
+* Fix inactive regions not being disabled when falling back to the Tag Parser. [#2181](https://github.com/Microsoft/vscode-cpptools/issues/2181)
+* Fix `#include` completion not working with `compile_commands.json` or custom configuration providers. [#2242](https://github.com/Microsoft/vscode-cpptools/issues/2242)
+* Fix IntelliSense failing if recursive includes removes all paths. [#2442](https://github.com/Microsoft/vscode-cpptools/issues/2442)
+* Fix incorrect IntelliSense errors with MinGW (stop using `-fms-extensions` by default). [#2443](https://github.com/Microsoft/vscode-cpptools/issues/2443), [#2623](https://github.com/Microsoft/vscode-cpptools/issues/2623)
+* Fix error squiggles sometimes not updating after typing. [#2448](https://github.com/Microsoft/vscode-cpptools/issues/2448)
+* Add support for Mac framework paths in `compile_commands.json`. [#2508](https://github.com/Microsoft/vscode-cpptools/issues/2508)
+* Fix IntelliSense-based `Go to Definition` falling back to the Tag Parser for definitions not in the TU. [#2536](https://github.com/Microsoft/vscode-cpptools/issues/2536), [#2677](https://github.com/Microsoft/vscode-cpptools/issues/2677)
+* Fix IntelliSense-based `Go to Definition` on the identifier of a definition with no declaration. [#2573](https://github.com/Microsoft/vscode-cpptools/issues/2573)
+* Fix IntelliSense-based `Go to Definition` not falling back to the declaration (in certain cases). [#2574](https://github.com/Microsoft/vscode-cpptools/issues/2574)
+* Fix IntelliSense-based `Go to Definition` going to the wrong location after edits are made. [#2579](https://github.com/Microsoft/vscode-cpptools/issues/2579)
+* Fix `Go to Definition` when the `intelliSenseEngineFallback` is `Disabled` and `#include`s are missing. [#2583](https://github.com/Microsoft/vscode-cpptools/issues/2583)
+* Fix empty `C_Cpp.default.*` settings not being used. [#2584](https://github.com/Microsoft/vscode-cpptools/issues/2584)
+* Fix quoting around `ssh`'s command (for the debugger). [#2585](https://github.com/Microsoft/vscode-cpptools/issues/2585)
+* Fix crash on hover (and `Go to Definition`) when using the `Tag Parser`. [#2586](https://github.com/Microsoft/vscode-cpptools/issues/2586)
+* Fix errors when a workspace folder isn't open. [#2613](https://github.com/Microsoft/vscode-cpptools/issues/2613), [#2691](https://github.com/Microsoft/vscode-cpptools/issues/2691)
+* Fix `-isystem` without a space after getting ignored in `compile_comamands.json`. [#2629](https://github.com/Microsoft/vscode-cpptools/issues/2629)
+* Fix Insiders update channel installation bugs. [#2636](https://github.com/Microsoft/vscode-cpptools/issues/2636), [#2685](https://github.com/Microsoft/vscode-cpptools/issues/2685)
+* Fix IntelliSense-based `Go to Declaration` falling back to the Tag Parser if the definition is also in the TU. [#2642](https://github.com/Microsoft/vscode-cpptools/issues/2642)
+* Fix the `Disabled` `intelliSenseEngine` setting not working with custom configuration providers. [#2656](https://github.com/Microsoft/vscode-cpptools/issues/2656)
+
 ## Version 0.19.0: September 27, 2018
 * Change the symbol database to update without needing to save. [#202](https://github.com/Microsoft/vscode-cpptools/issues/202)
 * Enable IntelliSense-based `Go to Definition` for the current translation unit, including local variables and overloaded operators. [#255](https://github.com/Microsoft/vscode-cpptools/issues/255), [#979](https://github.com/Microsoft/vscode-cpptools/issues/979)
@@ -497,7 +521,7 @@
 * Switch between header and source.
 * Control which files are processed under include path.
 
-## Version 0.6.1: June 03, 2016
+## Version 0.6.1: June 3, 2016
 * Bug fixes.
 
 ## Version 0.6.0: May 24, 2016

Extension/ReleaseNotes.html

@@ -205,12 +205,8 @@
                         <tr>
                             <td>
                                 <div>
-                                    <h2 class="caption">September 2018 Update</h2>
-                                    <div>Thank you for installing the C/C++ extension. In the September update, we added a preview of semantic-aware Go To Definition. This allows Go To Definition to work for local variables.
-                                        In addition, when the Go To Definition request references a symbol defined in the current translation unit, other incorrect symbols in the workspace with the same identifier will be
-                                        filtered from the results.<br/>
-                                        <br/>
-                                        We also added a new setting: <code>C_Cpp.updateChannel</code> to facilitate installing Insiders releases of the C++ extension.<br/>
+                                    <h2 class="caption">October 2018 Update</h2>
+                                    <div>Thank you for installing the C/C++ extension. In the October update, we finished our semantic-aware implementation of Go To Definition. We also added IntegratedTerminal support for debugging.<br/>
                                         <br/>
                                         Additional features and bug fixes are detailed in the <a href="https://github.com/Microsoft/vscode-cpptools/releases">full release notes</a>.</div>
                                 </div>

Extension/ThirdPartyNotices.txt

@@ -1,8 +1,16 @@
-
-THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
+
+THIRD PARTY SOFTWARE NOTICES AND INFORMATION
 Do Not Translate or Localize
 
-Microsoft C/C++ Extension for Visual Studio Code incorporates components from the projects listed below. Microsoft licenses these components under the Microsoft C/C++ Extension for Visual Studio Code license terms, except as noted. The original copyright notices and the licenses under which Microsoft received such components are set forth below for informational purposes. Microsoft reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise. 
+This Microsoft product may utilize material made available by third parties under the following license terms.  Any source code that Microsoft is required to make available can be found at http://3rdpartysource.microsoft.com. You may also obtain a copy of any such source code (during the period provided by the license) by sending a check or money order for US $5.00 to: 
+
+Source Code Compliance Team
+Microsoft Corporation
+One Microsoft Way
+Redmond, WA 98052 USA
+
+Please write “Source for [OSS PROJECT NAME]” in the memo line of your payment. 
+
 
 1.	agent-base (https://github.com/TooTallNate/node-agent-base)
 2.	ANTLR (http://www.antlr2.org/)

Extension/gulpfile.js

@@ -12,31 +12,41 @@ const mocha = require('gulp-mocha');
 const fs = require('fs');
 const optionsSchemaGenerator = require('./out/tools/GenerateOptionsSchema');
 
-gulp.task('unitTests', () => {
+gulp.task('unitTests', (done) => {
     env.set({
             CODE_TESTS_PATH: "./out/test/unitTests",
         });
 
-    gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
+    return gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
         .pipe(mocha({ ui: "tdd" }))
-        .once('error', err => process.exit(1))
-        .once('end', () => process.exit())
+        .once('error', err => {
+            done();
+            process.exit(1);
+        })
+        .once('end', () => {
+            done();
+            process.exit();
+        });
 });
 
-gulp.task('integrationTests', () => {
+gulp.task('integrationTests', (done) => {
     env.set({
             CODE_TESTS_PATH: "./out/test/integrationTests",
             CODE_TESTS_WORKSPACE: "./test/integrationTests/testAssets/SimpleCppProject"
         });
 
-    gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
+    return gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
         .pipe(mocha({ ui: "tdd" }))
-        .once('error', err => process.exit(1))
-        .once('end', () => process.exit())
+        .once('error', err => {
+            done();
+            process.exit(1);
+        })
+        .once('end', () => {
+            done();
+            process.exit();
+        });
 });
 
-gulp.task('allTests', ['unitTests', 'integrationTests']);
-
 /// Misc Tasks
 const allTypeScript = [
     'src/**/*.ts',
@@ -55,7 +65,7 @@ const lintReporter = (output, file, options) => {
 };
 
 gulp.task('tslint', () => {
-    gulp.src(allTypeScript)
+    return gulp.src(allTypeScript)
         .pipe(tslint({
             program: require('tslint').Linter.createProgram("./tsconfig.json"),
             configuration: "./tslint.json"
@@ -66,14 +76,19 @@ gulp.task('tslint', () => {
         }))
 });
 
-gulp.task('pr-check', () => {
+gulp.task('pr-check', (done) => {
     const packageJson = JSON.parse(fs.readFileSync('./package.json').toString());
     if (packageJson.activationEvents.length !== 1 && packageJson.activationEvents[0] !== '*') {
         console.log('Please make sure to not check in package.json that has been rewritten by the extension activation. If you intended to have changes in package.json, please only check-in your changes. If you did not, please run `git checkout -- package.json`.');
+        done();
         process.exit(1);
     }
+
+    done();
 });
 
-gulp.task('generateOptionsSchema', () => {
+gulp.task('generateOptionsSchema', (done) => {
     optionsSchemaGenerator.generateOptionsSchema();
+
+    done();
 });

Extension/package.json

@@ -2,7 +2,7 @@
   "name": "cpptools",
   "displayName": "C/C++",
   "description": "C/C++ IntelliSense, debugging, and code browsing.",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "publisher": "ms-vscode",
   "preview": true,
   "icon": "LanguageCCPP_color_128x.png",
@@ -108,7 +108,7 @@
             "Disabled"
           ],
           "default": "Default",
-          "description": "Controls the IntelliSense provider. \"Tag Parser\" provides \"fuzzy\" results that are not context-aware. \"Default\" provides context-aware results and is in preview mode - member list, hover tooltips, and error squiggles are currently implemented. Features not yet implemented in the new default engine will use the tag parser engine instead.",
+          "description": "Controls the IntelliSense provider. \"Tag Parser\" provides \"fuzzy\" results that are not context-aware. \"Default\" provides context-aware results. \"Disabled\" turns off C/C++ language service features.",
           "scope": "resource"
         },
         "C_Cpp.intelliSenseEngineFallback": {
@@ -1387,7 +1387,9 @@
   "devDependencies": {
     "@types/mocha": "^2.2.43",
     "@types/node": "^8.0.46",
-    "gulp": "3.9.1",
+    "async-child-process": "^1.1.1",
+    "child-process": "^1.0.2",
+    "gulp": "^4.0.0",
     "gulp-env": "0.4.0",
     "gulp-mocha": "5.0.0",
     "gulp-tslint": "8.1.2",
@@ -1409,14 +1411,14 @@
     "vscode-cpptools": "2.1.1",
     "vscode-debugadapter": "~1.24.0",
     "vscode-debugprotocol": "~1.24.0",
-    "vscode-extension-telemetry": "~0.0.11",
+    "vscode-extension-telemetry": "~0.1.0",
     "vscode-languageclient": "3.5.1",
     "yauzl": "~2.8.0"
   },
   "runtimeDependencies": [
     {
       "description": "C/C++ language components (Linux / x86_64)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2010302",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2026727",
       "platforms": [
         "linux"
       ],
@@ -1430,7 +1432,7 @@
     },
     {
       "description": "C/C++ language components (Linux / x86)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2010301",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2026568",
       "platforms": [
         "linux"
       ],
@@ -1446,7 +1448,7 @@
     },
     {
       "description": "C/C++ language components (OS X)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2010303",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2026569",
       "platforms": [
         "darwin"
       ],
@@ -1457,7 +1459,7 @@
     },
     {
       "description": "C/C++ language components (Windows)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2010204",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2026728",
       "platforms": [
         "win32"
       ],
@@ -1511,7 +1513,7 @@
     },
     {
       "description": "Mono Framework Assemblies",
-      "url": "https://go.microsoft.com/fwlink/?LinkId=816539",
+      "url": "https://go.microsoft.com/fwlink/?LinkId=2027135",
       "platforms": [
         "linux",
         "darwin"
@@ -1520,7 +1522,7 @@
     },
     {
       "description": "Mono Runtime (Linux / x86)",
-      "url": "https://go.microsoft.com/fwlink/?LinkId=816540",
+      "url": "https://go.microsoft.com/fwlink/?LinkId=2027410",
       "platforms": [
         "linux"
       ],
@@ -1535,7 +1537,7 @@
     },
     {
       "description": "Mono Runtime (Linux / x86_64)",
-      "url": "https://go.microsoft.com/fwlink/?LinkId=816541",
+      "url": "https://go.microsoft.com/fwlink/?LinkId=2027416",
       "platforms": [
         "linux"
       ],
@@ -1548,7 +1550,7 @@
     },
     {
       "description": "Mono Runtime (OS X)",
-      "url": "https://go.microsoft.com/fwlink/?LinkId=816542",
+      "url": "https://go.microsoft.com/fwlink/?LinkId=2027403",
       "platforms": [
         "darwin"
       ],
@@ -1578,4 +1580,4 @@
       "binaries": []
     }
   ]
-}
+}

Extension/src/Debugger/attachToProcess.ts

@@ -123,7 +123,7 @@ export class RemoteAttachPicker {
         const command: string = `sh -c 'uname && if [ $(uname) = "Linux" ] ; then ${PsProcessParser.psLinuxCommand} ; elif [ $(uname) = "Darwin" ] ; ` +
             `then ${PsProcessParser.psDarwinCommand}; fi'`;
 
-        return execChildProcess(`${pipeCmd} "${command}"`, null, this._channel).then(output => {
+        return execChildProcess(`${pipeCmd} '${command}'`, null, this._channel).then(output => {
             // OS will be on first line
             // Processess will follow if listed
             let lines: string[] = output.split(/\r?\n/);

Extension/src/LanguageServer/configurations.ts

@@ -215,6 +215,10 @@ export class CppProperties {
         if (this.configurationIncomplete && this.defaultIncludes && this.defaultFrameworks && this.vcpkgPathReady) {
             let configuration: Configuration = this.CurrentConfiguration;
             let settings: CppSettings = new CppSettings(this.rootUri);
+            let isUnset: (input: any) => boolean = (input: any) => {
+                // default values for "default" config settings is null.
+                return input === null;
+            };
 
             // Anything that has a vscode setting for it will be resolved in updateServerOnFolderSettingsChange.
             // So if a property is currently unset, but has a vscode setting, don't set it yet, otherwise the linkage
@@ -222,32 +226,32 @@ export class CppProperties {
 
             // Only add settings from the default compiler if user hasn't explicitly set the corresponding VS Code setting.
 
-            if (!settings.defaultIncludePath) {
+            if (isUnset(settings.defaultIncludePath)) {
                 // We don't add system includes to the includePath anymore. The language server has this information.
                 let abTestSettings: ABTestSettings = getABTestSettings();
                 let rootFolder: string = abTestSettings.UseRecursiveIncludes ? "${workspaceFolder}/**" : "${workspaceFolder}";
                 configuration.includePath = [rootFolder].concat(this.vcpkgIncludes);
             }
             // browse.path is not set by default anymore. When it is not set, the includePath will be used instead.
-            if (!settings.defaultDefines) {
+            if (isUnset(settings.defaultDefines)) {
                 configuration.defines = (process.platform === 'win32') ? ["_DEBUG", "UNICODE", "_UNICODE"] : [];
             }
-            if (!settings.defaultMacFrameworkPath && process.platform === 'darwin') {
+            if (isUnset(settings.defaultMacFrameworkPath) && process.platform === 'darwin') {
                 configuration.macFrameworkPath = this.defaultFrameworks;
             }
-            if (!settings.defaultWindowsSdkVersion && this.defaultWindowsSdkVersion && process.platform === 'win32') {
+            if (isUnset(settings.defaultWindowsSdkVersion) && this.defaultWindowsSdkVersion && process.platform === 'win32') {
                 configuration.windowsSdkVersion = this.defaultWindowsSdkVersion;
             }
-            if (!settings.defaultCompilerPath && this.defaultCompilerPath) {
+            if (isUnset(settings.defaultCompilerPath) && this.defaultCompilerPath) {
                 configuration.compilerPath = this.defaultCompilerPath;
             }
-            if (!settings.defaultCStandard && this.defaultCStandard) {
+            if (isUnset(settings.defaultCStandard) && this.defaultCStandard) {
                 configuration.cStandard = this.defaultCStandard;
             }
-            if (!settings.defaultCppStandard && this.defaultCppStandard) {
+            if (isUnset(settings.defaultCppStandard) && this.defaultCppStandard) {
                 configuration.cppStandard = this.defaultCppStandard;
             }
-            if (!settings.defaultIntelliSenseMode) {
+            if (isUnset(settings.defaultIntelliSenseMode)) {
                 configuration.intelliSenseMode = this.defaultIntelliSenseMode;
             }
             this.configurationIncomplete = false;
@@ -260,7 +264,7 @@ export class CppProperties {
             Object.assign(result, this.configurationJson.env);
         }
 
-        result["workspaceFolderBasename"] = path.basename(this.rootUri.fsPath);
+        result["workspaceFolderBasename"] = this.rootUri ? path.basename(this.rootUri.fsPath) : "";
         return result;
     }
 
@@ -431,11 +435,11 @@ export class CppProperties {
     private updateConfiguration(property: string, defaultValue: string, env: Environment): string;
     private updateConfiguration(property: string | boolean, defaultValue: boolean, env: Environment): boolean;
     private updateConfiguration(property, defaultValue, env): any {
-        if (typeof property === "string" || typeof defaultValue === "string") {
+        if (util.isString(property) || util.isString(defaultValue)) {
             return this.resolveVariables(property, defaultValue, env);
-        } else if (typeof property === "boolean" || typeof defaultValue === "boolean") {
+        } else if (util.isBoolean(property) || util.isBoolean(defaultValue)) {
             return this.resolveVariables(property, defaultValue, env);
-        } else if (property instanceof Array || defaultValue instanceof Array) {
+        } else if (util.isArrayOfString(property) || util.isArrayOfString(defaultValue)) {
             if (property) {
                 return this.resolveAndSplit(property, defaultValue, env);
             } else if (property === undefined && defaultValue) {

Extension/src/LanguageServer/customProviders.ts

@@ -4,8 +4,9 @@
  * ------------------------------------------------------------------------------------------ */
 'use strict';
 
-import { CustomConfigurationProvider, Version, SourceFileConfigurationItem, WorkspaceBrowseConfiguration } from 'vscode-cpptools';
 import * as vscode from 'vscode';
+import { CustomConfigurationProvider, Version, SourceFileConfigurationItem, WorkspaceBrowseConfiguration } from 'vscode-cpptools';
+import { CppSettings } from './settings';
 
 /**
  * An interface that is guaranteed to be backward compatible with version 0
@@ -135,6 +136,11 @@ export class CustomConfigurationProviderCollection {
     }
 
     public add(provider: CustomConfigurationProvider, version: Version): boolean {
+        if (new CppSettings().intelliSenseEngine === "Disabled") {
+            console.warn("IntelliSense is disabled. Provider will not be registered.");
+            return false;
+        }
+
         let wrapper: CustomProviderWrapper = new CustomProviderWrapper(provider, version);
         if (!wrapper.isValid) {
             this.logProblems(provider, version);

Extension/src/LanguageServer/extension.ts

@@ -105,6 +105,10 @@ function onActivationEvent(): void {
 }
 
 function realActivation(): void {
+    if (new CppSettings().intelliSenseEngine === "Disabled") {
+        throw new Error("Do not activate the extension when IntelliSense is disabled.");
+    }
+
     realActivationOccurred = true;
     console.log("starting language server");
     clients = new ClientCollection();
@@ -242,10 +246,10 @@ async function installVsix(vsixLocation: string, updateChannel: string): Promise
                     cmdFile = 'code.cmd';
                 }
                 const vsCodeExeDir: string = path.dirname(process.execPath);
-                return '"' + path.join(vsCodeExeDir, 'bin', cmdFile) + '"';
+                return path.join(vsCodeExeDir, 'bin', cmdFile);
             } else if (platformInfo.platform === 'darwin') {
-                return '"' + path.join(process.execPath, '..', '..', '..', '..', '..',
-                    'Resources', 'app', 'bin', 'code') + '"';
+                return path.join(process.execPath, '..', '..', '..', '..', '..',
+                    'Resources', 'app', 'bin', 'code');
             } else {
                 const vsCodeBinName: string = path.basename(process.execPath);
                 try {
@@ -262,8 +266,13 @@ async function installVsix(vsixLocation: string, updateChannel: string): Promise
 
         // Install the VSIX
         return new Promise<void>((resolve, reject) => {
-            let process: ChildProcess = spawn(vsCodeScriptPath, ['--install-extension', vsixLocation]);
-            if (process.pid === undefined) {
+            let process: ChildProcess;
+            try {
+                process = spawn(vsCodeScriptPath, ['--install-extension', vsixLocation]);
+                if (process.pid === undefined) {
+                    throw new Error();
+                }
+            } catch (error) {
                 reject(new Error('Failed to launch VS Code script process for installation'));
                 return;
             }
@@ -296,10 +305,6 @@ async function installVsix(vsixLocation: string, updateChannel: string): Promise
  * @param updateChannel The user's updateChannel setting.
  */
 async function checkAndApplyUpdate(updateChannel: string): Promise<void> {
-    // Helper fn to avoid code duplication
-    let logFailure: (error: Error) => void = (error: Error) => {
-        telemetry.logLanguageServerEvent('installVsix', { 'error': error.message, 'success': 'false' });
-    };
     // Wrap in new Promise to allow tmp.file callback to successfully resolve/reject
     // as tmp.file does not do anything with the callback functions return value
     const p: Promise<void> = new Promise<void>((resolve, reject) => {
@@ -339,14 +344,15 @@ async function checkAndApplyUpdate(updateChannel: string): Promise<void> {
             });
         }, (error: Error) => {
             // Handle getTargetBuildInfo rejection
-            logFailure(error);
             reject(error);
         });
     });
     await p.catch((error: Error) => {
         // Handle .then following getTargetBuildInfo rejection
-        logFailure(error);
-        throw error;
+        if (error.message.indexOf('/') !== -1 || error.message.indexOf('\\') !== -1) {
+            error.message = "Potential PII hidden";
+        }
+        telemetry.logLanguageServerEvent('installVsix', { 'error': error.message, 'success': 'false' });
     });
 }
 
@@ -658,6 +664,11 @@ function handleCrashFileRead(err: NodeJS.ErrnoException, data: string): void {
     if (data.length > 16384) {
         data = data.substr(0, 16384) + "...";
     }
+    if (data.length < 2) {
+        return; // Don't send telemetry if there's no call stack.
+    }
+    // Get rid of the memory addresses (which breaks being able get a hit count for each crash call stack).
+    data = data.replace(/0x................ /g, "");
     crashObject["CrashingThreadCallStack"] = data;
     telemetry.logLanguageServerEvent("MacCrash", crashObject, null);
 }

Extension/src/Support/copyDebuggerDependencies.ts

@@ -118,6 +118,7 @@ function copyBinaryDependencies(): void {
     copy(miEngineRoot, DebugAdapterBinPath, "Microsoft.MIDebugEngine.dll");
     copy(miEngineRoot, DebugAdapterBinPath, "Microsoft.MIDebugEngine.dll.mdb");
     copy(miEngineRoot, DebugAdapterBinPath, "osxlaunchhelper.scpt");
+    copy(miEngineRoot, DebugAdapterBinPath, "Microsoft.VisualStudio.Debugger.Interop.15.0.dll");
 
     copy(openDebugRoot, DebugAdapterBinPath, "Microsoft.VisualStudio.Debugger.Interop.10.0.dll");
     copy(openDebugRoot, DebugAdapterBinPath, "Microsoft.VisualStudio.Debugger.Interop.11.0.dll");
@@ -129,6 +130,8 @@ function copyBinaryDependencies(): void {
     copy(openDebugRoot, DebugAdapterBinPath, "OpenDebugAD7.exe.config");
     copy(openDebugRoot, DebugAdapterBinPath, "OpenDebugAD7.exe.mdb");
     copy(openDebugRoot, DebugAdapterBinPath, "Newtonsoft.Json.dll");
+    copy(openDebugRoot, DebugAdapterBinPath, "WindowsDebugLauncher.exe");
+    copy(openDebugRoot, DebugAdapterBinPath, "Microsoft.VisualStudio.Shared.VSCodeDebugProtocol.dll");
 }
 
 function copyMonoDependencies(): void {

Extension/src/common.ts

@@ -183,12 +183,20 @@ export function isNumber(input: any): input is number {
     return typeof(input) === "number";
 }
 
+export function isBoolean(input: any): input is boolean {
+    return typeof(input) === "boolean";
+}
+
+export function isArray(input: any): input is any[] {
+    return input instanceof Array;
+}
+
 export function isOptionalString(input: any): input is string|undefined {
     return input === undefined || isString(input);
 }
 
 export function isArrayOfString(input: any): input is string[] {
-    return (input instanceof Array) && input.every(item => isString(item));
+    return isArray(input) && input.every(item => isString(item));
 }
 
 export function isOptionalArrayOfString(input: any): input is string[]|undefined {
@@ -620,4 +628,37 @@ export function downloadFileToDestination(urlStr: string, destinationPath: strin
         request.on('error', (error) => { reject(); });
         request.end();
     });
+}
+
+export function downloadFileToStr(urlStr: string, headers?: OutgoingHttpHeaders): Promise<any> {
+    return new Promise<string>((resolve, reject) => {
+        let parsedUrl: url.Url = url.parse(urlStr);
+        let request: ClientRequest = https.request({
+            host: parsedUrl.host,
+            path: parsedUrl.path,
+            agent: getHttpsProxyAgent(),
+            rejectUnauthorized: vscode.workspace.getConfiguration().get('http.proxyStrictSSL', true),
+            headers: headers
+        }, (response) => {
+            if (response.statusCode === 301 || response.statusCode === 302) { // If redirected
+                // Download from new location
+                let redirectUrl: string;
+                if (typeof response.headers.location === 'string') {
+                    redirectUrl = response.headers.location;
+                } else {
+                    redirectUrl = response.headers.location[0];
+                }
+                return resolve(downloadFileToStr(redirectUrl, headers));
+            }
+            if (response.statusCode !== 200) { // If request is not successful
+                return reject();
+            }
+            let downloadedData: string = '';
+            response.on('data', (data) => { downloadedData += data; });
+            response.on('error', (error) => { reject(); });
+            response.on('end', () => { resolve(downloadedData); });
+        });
+        request.on('error', (error) => { reject(); });
+        request.end();
+    });
 }

Extension/src/githubAPI.ts

@@ -6,7 +6,6 @@
 
 import { PackageVersion } from './packageVersion';
 import * as util from './common';
-import * as tmp from 'tmp';
 import { PlatformInformation } from './platform';
 import { OutgoingHttpHeaders } from 'http';
 
@@ -101,8 +100,10 @@ function vsixNameForPlatform(info: PlatformInformation): string {
             case 'darwin': return 'cpptools-osx.vsix';
             default: {
                 switch (platformInfo.architecture) {
-                    case 'x86': return 'cpptools-linux32.vsix';
                     case 'x86_64': return 'cpptools-linux.vsix';
+                    case 'x86':
+                    case 'i386':
+                    case 'i686': return 'cpptools-linux32.vsix';
                 }
             }
         }
@@ -129,7 +130,21 @@ export interface BuildInfo {
  */
 export async function getTargetBuildInfo(updateChannel: string): Promise<BuildInfo> {
     return getReleaseJson()
-        .then(builds => getTargetBuild(builds, updateChannel))
+        .then(builds => {
+            if (!builds || builds.length === 0) {
+                return undefined;
+            }
+
+            // If the user version is greater than or incomparable to the latest available verion then there is no need to update
+            // Allows testing pre-releases without accidentally downgrading to the latest version
+            const userVersion: PackageVersion = new PackageVersion(util.packageJson.version);
+            const latestVersion: PackageVersion = new PackageVersion(builds[0].name);
+            if (userVersion.isGreaterThan(latestVersion) || (userVersion.suffix && userVersion.suffix !== 'insiders')) {
+                return undefined;
+            }
+
+            return getTargetBuild(builds, userVersion, updateChannel);
+        })
         .then(async build => {
             if (!build) {
                 return Promise.resolve(undefined);
@@ -148,10 +163,11 @@ export async function getTargetBuildInfo(updateChannel: string): Promise<BuildIn
 /**
  * Determines whether there exists a Build in the given Build[] that should be installed.
  * @param builds The GitHub release list parsed as an array of Builds.
+ * @param userVersion The verion of the extension that the user is running.
  * @param updateChannel The user's updateChannel setting.
  * @return The Build if the user should update to it, otherwise undefined.
  */
-function getTargetBuild(builds: Build[], updateChannel: string): Build {
+function getTargetBuild(builds: Build[], userVersion: PackageVersion, updateChannel: string): Build {
     // Get predicates to determine the build to install, if any
     let needsUpdate: (installed: PackageVersion, target: PackageVersion) => boolean;
     let useBuild: (build: Build) => boolean;
@@ -172,52 +188,78 @@ function getTargetBuild(builds: Build[], updateChannel: string): Build {
     }
 
     // Check current version against target's version to determine if the installation should happen
-    const userVersion: PackageVersion = new PackageVersion(util.packageJson.version);
     const targetVersion: PackageVersion = new PackageVersion(targetBuild.name);
     return needsUpdate(userVersion, targetVersion) ? targetBuild : undefined;
 }
 
+interface Rate {
+    remaining: number;
+}
+
+interface RateLimit {
+    rate: Rate;
+}
+
+function isRate(input: any): input is Rate {
+    return input && input.remaining && util.isNumber(input.remaining);
+}
+
+function isRateLimit(input: any): input is RateLimit {
+    return input && isRate(input.rate);
+}
+
+async function getRateLimit(): Promise<RateLimit> {
+    const header: OutgoingHttpHeaders = { 'User-Agent': 'vscode-cpptools' };
+    const data: string = await util.downloadFileToStr('https://api.github.com/rate_limit', header)
+        .catch(() => { throw new Error('Failed to download rate limit JSON'); });
+
+    let rateLimit: any;
+    try {
+        rateLimit = JSON.parse(data);
+    } catch (error) {
+        throw new Error('Failed to parse rate limit JSON');
+    }
+
+    if (isRateLimit(rateLimit)) {
+        return Promise.resolve(rateLimit);
+    } else {
+        throw new Error('Rate limit JSON is not of type RateLimit');
+    }
+}
+
+async function rateLimitExceeded(): Promise<boolean> {
+    const rateLimit: RateLimit = await getRateLimit();
+    return rateLimit.rate.remaining <= 0;
+}
+
 /**
  * Download and parse the release list JSON from the GitHub API into a Build[].
  * @return Information about the released builds of the C/C++ extension.
  */
 async function getReleaseJson(): Promise<Build[]> {
-    return new Promise<Build[]>((resolve, reject) => {
-        // Create temp file to hold JSON
-        tmp.file(async (err, releaseJsonPath, fd, cleanupCallback) => {
-            if (err) {
-                reject(new Error('Failed to create release json file'));
-                return;
-            }
+    if (await rateLimitExceeded()) {
+        throw new Error('Failed to stay within GitHub API rate limit');
+    }
 
-            try {
-                // Download release JSON
-                const releaseUrl: string = 'https://api.github.com/repos/Microsoft/vscode-cpptools/releases';
-                const header: OutgoingHttpHeaders = { 'User-Agent': 'vscode-cpptools' };
-                await util.downloadFileToDestination(releaseUrl, releaseJsonPath, header)
-                    .catch(() => { throw new Error('Failed to download release JSON'); });
+    // Download release JSON
+    const releaseUrl: string = 'https://api.github.com/repos/Microsoft/vscode-cpptools/releases';
+    const header: OutgoingHttpHeaders = { 'User-Agent': 'vscode-cpptools' };
 
-                // Read the release JSON file
-                const fileContent: string = await util.readFileText(releaseJsonPath)
-                    .catch(() => { throw new Error('Failed to read release JSON file'); } );
+    const data: string = await util.downloadFileToStr(releaseUrl, header)
+        .catch(() => { throw new Error('Failed to download release JSON'); });
 
-                // Parse the file
-                let releaseJson: any;
-                try {
-                    releaseJson = JSON.parse(fileContent);
-                } catch (error) {
-                    throw new Error('Failed to parse release JSON');
-                }
+    // Parse the file
+    let releaseJson: any;
+    try {
+        releaseJson = JSON.parse(data);
+    } catch (error) {
+        throw new Error('Failed to parse release JSON');
+    }
 
-                // Type check
-                if (isArrayOfBuilds(releaseJson)) {
-                    resolve(releaseJson);
-                } else {
-                    reject(releaseJson);
-                }
-            } catch (error) {
-                reject(error);
-            }
-        });
-    });
+    // Type check
+    if (isArrayOfBuilds(releaseJson)) {
+        return releaseJson;
+    } else {
+        throw new Error('Release JSON is not of type Build[]');
+    }
 }

Extension/src/main.ts

@@ -16,7 +16,7 @@ import * as vscode from 'vscode';
 import { CppToolsApi, CppToolsExtension } from 'vscode-cpptools';
 import { getTemporaryCommandRegistrarInstance, initializeTemporaryCommandRegistrar } from './commands';
 import { PlatformInformation } from './platform';
-import { PackageManager, PackageManagerError, PackageManagerWebResponseError, IPackage } from './packageManager';
+import { PackageManager, PackageManagerError, IPackage } from './packageManager';
 import { PersistentState } from './LanguageServer/persistentState';
 import { getInstallationInformation, InstallationInformation, setInstallationStage } from './installationInformation';
 import { Logger, getOutputChannelLogger, showOutputChannel } from './logger';
@@ -192,17 +192,6 @@ function handleError(error: any): void {
     let errorMessage: string;
 
     if (error instanceof PackageManagerError) {
-        // If this is a WebResponse error, log the IP that it resolved from the package URL
-        if (error instanceof PackageManagerWebResponseError) {
-            let webRequestPackageError: PackageManagerWebResponseError = error;
-            if (webRequestPackageError.socket) {
-                let address: any = webRequestPackageError.socket.address();
-                if (address) {
-                    installationInformation.telemetryProperties['error.targetIP'] = address.address + ':' + address.port;
-                }
-            }
-        }
-
         let packageError: PackageManagerError = error;
 
         installationInformation.telemetryProperties['error.methodName'] = packageError.methodName;

Extension/src/packageVersion.ts

@@ -26,7 +26,13 @@ export class PackageVersion {
             if (firstDigitOffset !== -1) {
                 this.suffix = tokens[3].substring(0, firstDigitOffset);
                 this.suffixVersion = parseInt(tokens[3].substring(firstDigitOffset));
+            } else {
+                this.suffix = tokens[3];
+                this.suffixVersion = 1;
             }
+        } else {
+            this.suffix = undefined;
+            this.suffixVersion = 0;
         }
 
         if (this.major === undefined || this.minor === undefined || this.patch === undefined) {

Extension/test/runVsCodeTestsWithAbsolutePaths.js

@@ -5,11 +5,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+child_process = require('child_process');
 path = require('path');
+async_child_process = require('async-child-process');
 
 if (process.env.CODE_TESTS_PATH
     && process.env.CODE_TESTS_PATH.startsWith('.')){
         process.env.CODE_TESTS_PATH = path.join(process.cwd(), process.env.CODE_TESTS_PATH.substr(2));
 }
 
-require(path.resolve(__dirname, '../node_modules/vscode/bin/test'));
+let optionsWithFullEnvironment = {
+    cwd: path.resolve(__dirname, '..'),
+    stdio: 'inherit', 
+    env: {
+        ...process.env,
+    }
+};
+
+spawn = child_process.spawn('node', [path.resolve(__dirname, '../node_modules/vscode/bin/test')], optionsWithFullEnvironment);
+
+return async_child_process.join(spawn);