Merge pull request #3630 from microsoft/0_23_1_release

0 23 1 release

Extension/.vscodeignore

@@ -23,9 +23,10 @@ jobs/**
 
 # ignore development files
 tsconfig.json
+test.tsconfig.json
 tslint.json
 webpack.config.js
-README.md
+tscCompileList.txt
 gulpfile.js
 .gitattributes
 .gitignore

Extension/CHANGELOG.md

@@ -1,5 +1,12 @@
 # C/C++ for Visual Studio Code Change Log
 
+## Version 0.23.1: May 13, 2019
+### Bug Fixes
+* Fix `launch.json` creation when `intelliSenseEngine` is `"Disabled"`. [#3583](https://github.com/microsoft/vscode-cpptools/issues/3583)
+* Fix C/C++ commands not working if the language service isn't activated. [#3615](https://github.com/microsoft/vscode-cpptools/issues/3615)
+* Fix missing extension `"Details"` page. [#3621](https://github.com/microsoft/vscode-cpptools/issues/3621)
+* Fix some random crashes related to IntelliSense inactive region processing.
+
 ## Version 0.23.0: May 6, 2019
 ### New Features
 * Add a configuration UI editor to edit IntelliSense settings defined in the underlying `c_cpp_properties.json` file. [PR #3479](https://github.com/Microsoft/vscode-cpptools/pull/3479), [PR #3487](https://github.com/Microsoft/vscode-cpptools/pull/3487), [PR #3519](https://github.com/Microsoft/vscode-cpptools/pull/3519), [#3524](https://github.com/Microsoft/vscode-cpptools/issues/3524), [PR #3563](https://github.com/Microsoft/vscode-cpptools/pull/3563), [#3526](https://github.com/Microsoft/vscode-cpptools/issues/3526)
@@ -28,6 +35,7 @@
 
 ### Bug Fixes
 * Fix browsing for functions with BOOST_FOREACH. [#953](https://github.com/Microsoft/vscode-cpptools/issues/953)
+* Fix code action sometimes not appearing over a squiggled identifier. [#1436](https://github.com/microsoft/vscode-cpptools/issues/1436)
 * Work around issue with VS Code not treating `.C` files as C++ files [Microsoft/vscode#59369](https://github.com/Microsoft/vscode/issues/59369) -- `.C` files become associated by name in `files.associations`. [#2558](https://github.com/Microsoft/vscode-cpptools/issues/2558)
 * Fix various IntelliSense parsing bugs. [#2824](https://github.com/Microsoft/vscode-cpptools/issues/2824), [#3110](https://github.com/Microsoft/vscode-cpptools/issues/3110), [#3168](https://github.com/Microsoft/vscode-cpptools/issues/3168)
 * Preserve newlines in documentation comments. [#2937](https://github.com/Microsoft/vscode-cpptools/issues/2937)
@@ -54,7 +62,6 @@
 * Fix `includePath` code actions, configuration prompts, and the `C/C++: Change configuration provider...` command. [PR #3576](https://github.com/Microsoft/vscode-cpptools/pull/3576)
 * Fix randomly occurring crash (that could occur when opening files while IntelliSense squiggles are pending).
 * Fix crash on hover (that could occur when document comments have blank lines).
-* Fix code action sometimes not appearing over a squiggled identifier.
 * Fix icon of parameters in completion results.
 
 ## Version 0.22.1: March 21, 2019

Extension/package.json

@@ -2,7 +2,7 @@
   "name": "cpptools",
   "displayName": "C/C++",
   "description": "C/C++ IntelliSense, debugging, and code browsing.",
-  "version": "0.23.0-master",
+  "version": "0.23.1",
   "publisher": "ms-vscode",
   "preview": true,
   "icon": "LanguageCCPP_color_128x.png",
@@ -1450,46 +1450,43 @@
   },
   "devDependencies": {
     "@types/mocha": "^5.2.6",
-    "@types/node": "^8.10.45",
+    "@types/node": "^12.0.0",
     "async-child-process": "^1.1.1",
     "await-notify": "^1.0.1",
-    "child-process": "^1.0.2",
-    "extend": "3.0.2",
-    "gulp": "^4.0.0",
-    "gulp-env": "0.4.0",
-    "gulp-mocha": "5.0.0",
-    "gulp-tslint": "8.1.2",
-    "mocha": "^5.2.0",
-    "tslint": "5.8.0",
-    "tslint-microsoft-contrib": "5.0.1",
-    "tslint-no-unused-expression-chai": "0.0.3",
-    "ts-loader": "^5.3.3",
-    "typescript": "^2.9.2",
-    "vrsource-tslint-rules": "^5.8.3",
-    "vscode": "^1.1.33",
+    "gulp": "^4.0.2",
+    "gulp-env": "^0.4.0",
+    "gulp-mocha": "^6.0.0",
+    "gulp-tslint": "^8.1.4",
+    "tslint": "^5.16.0",
+    "tslint-microsoft-contrib": "^6.1.1",
+    "tslint-no-unused-expression-chai": "^0.1.4",
+    "ts-loader": "^6.0.0",
+    "typescript": "^3.4.5",
+    "vrsource-tslint-rules": "^6.0.0",
+    "vscode": "^1.1.34",
     "webpack": "^4.30.0",
-    "webpack-cli": "^3.3.1"
+    "webpack-cli": "^3.3.2"
   },
   "dependencies": {
     "@types/minimatch": "^3.0.3",
-    "escape-string-regexp": "1.0.5",
-    "http-proxy-agent": "~2.1.0",
-    "https-proxy-agent": "~2.2.0",
-    "jsonc-parser": "^1.0.0",
-    "minimatch": "~3.0.4",
-    "mkdirp": "~0.5.1",
-    "tmp": "~0.0.33",
+    "escape-string-regexp": "^2.0.0",
+    "http-proxy-agent": "^2.1.0",
+    "https-proxy-agent": "^2.2.1",
+    "jsonc-parser": "^2.1.0",
+    "minimatch": "^3.0.4",
+    "mkdirp": "^0.5.1",
+    "tmp": "^0.1.0",
     "vscode-cpptools": "^2.1.2",
-    "vscode-debugadapter": "~1.33.0",
-    "vscode-debugprotocol": "~1.33.0",
+    "vscode-debugadapter": "^1.34.0",
+    "vscode-debugprotocol": "^1.34.0",
     "vscode-extension-telemetry": "^0.1.1",
-    "vscode-languageclient": "5.1.1",
-    "yauzl": "~2.10.0"
+    "vscode-languageclient": "^5.2.1",
+    "yauzl": "^2.10.0"
   },
   "runtimeDependencies": [
     {
       "description": "C/C++ language components (Linux / x86_64)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2085632",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2092043",
       "platforms": [
         "linux"
       ],
@@ -1503,7 +1500,7 @@
     },
     {
       "description": "C/C++ language components (Linux / x86)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2085734",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2092112",
       "platforms": [
         "linux"
       ],
@@ -1519,7 +1516,7 @@
     },
     {
       "description": "C/C++ language components (OS X)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2085735",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2092042",
       "platforms": [
         "darwin"
       ],
@@ -1530,7 +1527,7 @@
     },
     {
       "description": "C/C++ language components (Windows)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2085633",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2092111",
       "platforms": [
         "win32"
       ],
@@ -1651,4 +1648,4 @@
       "binaries": []
     }
   ]
-}
+}

Extension/src/LanguageServer/client.ts

@@ -402,6 +402,7 @@ class DefaultClient implements Client {
         let serverModule: string = getLanguageServerFileName();
         let exeExists: boolean = fs.existsSync(serverModule);
         if (!exeExists) {
+            telemetry.logLanguageServerEvent("missingLanguageServerBinary");
             throw String('Missing binary at ' + serverModule);
         }
         let serverName: string = this.getName(workspaceFolder);

Extension/src/LanguageServer/extension.ts

@@ -42,6 +42,7 @@ let buildInfoCache: BuildInfo | null = null;
 const taskSourceStr: string = "C/C++";
 const cppInstallVsixStr: string = 'C/C++: Install vsix -- ';
 let taskProvider: vscode.Disposable;
+const intelliSenseDisabledError: string = "Do not activate the extension when IntelliSense is disabled.";
 
 /**
  * activate: set up the extension for language services
@@ -150,7 +151,15 @@ export async function getBuildTasks(returnComplerPath: boolean): Promise<vscode.
     // for the active file, remove duplicate compiler names, then finally add the user's compilerPath setting.
     let compilerPaths: string[];
     const isWindows: boolean = os.platform() === 'win32';
-    const activeClient: Client = getActiveClient();
+    let activeClient: Client;
+    try {
+        activeClient = getActiveClient();
+    } catch (e) {
+        if (!e || e.message !== intelliSenseDisabledError) {
+            console.error("Unknown error calling getActiveClient().");
+        }
+        return []; // Language service features may be disabled.
+    }
     let userCompilerPath: string = await activeClient.getCompilerPath();
     if (userCompilerPath) {
         userCompilerPath = userCompilerPath.trim();
@@ -280,7 +289,7 @@ function onActivationEvent(): void {
 
 function realActivation(): void {
     if (new CppSettings().intelliSenseEngine === "Disabled") {
-        throw new Error("Do not activate the extension when IntelliSense is disabled.");
+        throw new Error(intelliSenseDisabledError);
     } else {
         console.log("activating extension");
         let checkForConflictingExtensions: PersistentState<boolean> = new PersistentState<boolean>("CPP." + util.packageJson.version + ".checkForConflictingExtensions", true);

Extension/src/main.ts

@@ -29,8 +29,8 @@ let reloadMessageShown: boolean = false;
 let disposables: vscode.Disposable[] = [];
 
 export async function activate(context: vscode.ExtensionContext): Promise<CppToolsApi & CppToolsExtension> {
-    initializeTemporaryCommandRegistrar();
     util.setExtensionContext(context);
+    initializeTemporaryCommandRegistrar();
     Telemetry.activate();
     util.setProgress(0);
 

Extension/ui/settings.ts

@@ -106,8 +106,7 @@ class SettingsApp {
             this.showErrorWithInfo(elementId.includePathInvalid, 
                     errors.includePath ? true : false, 
                     errors.includePath);
-        }
-        finally {
+        } finally {
             this.updating = false;
         }
     }