Merge branch 'master' of https://github.com/Microsoft/vscode-cpptools into inactive-region-highlight

Author: grdowns

Extension/CHANGELOG.md

@@ -1,6 +1,6 @@
 # C/C++ for Visual Studio Code Change Log
 
-## Version 0.14.6: Janurary 17, 2017
+## Version 0.14.6: January 17, 2018
 * Fix tag parser failing (and continuing to fail after edits) when it shouldn't. [#1367](https://github.com/Microsoft/vscode-cpptools/issues/1367)
 * Fix tag parser taking too long due to redundant processing. [#1288](https://github.com/Microsoft/vscode-cpptools/issues/1288)
 * Fix debugging silently failing the 1st time if a C/C++ file isn't opened. [#1366](https://github.com/Microsoft/vscode-cpptools/issues/1366)
@@ -52,7 +52,7 @@
 
 ## Version 0.14.1: November 9, 2017
 * Add support for multi-root workspaces. [#1070](https://github.com/Microsoft/vscode-cpptools/issues/1070)
-* Fix files temporarly being unsavable after Save As and other scenarios on Windows. [Microsoft/vscode#27329](https://github.com/Microsoft/vscode/issues/27329)
+* Fix files temporarily being unsavable after Save As and other scenarios on Windows. [Microsoft/vscode#27329](https://github.com/Microsoft/vscode/issues/27329)
 * Fix files "permanently" being unsavable if the IntelliSense process launches during tag parsing of the file. [#1040](https://github.com/Microsoft/vscode-cpptools/issues/1040)
 * Show pause and resume parsing commands after clicking the database icon. [#1141](https://github.com/Microsoft/vscode-cpptools/issues/1141)
 * Don't show the install output unless an error occurs. [#1160](https://github.com/Microsoft/vscode-cpptools/issues/1160)
@@ -75,7 +75,7 @@
 * Fix `limitSymbolsToIncludedHeaders` not working with single files. [#1109](https://github.com/Microsoft/vscode-cpptools/issues/1109)
 * Add logging to Output window. Errors will be logged by default. Verbosity is controlled by the `"C_Cpp.loggingLevel"` setting.
 * Add new database status bar icon for "Indexing" or "Parsing" with progress numbers, and the previous flame icon is now just for "Updating IntelliSense".
-* Stop showing `(Global Scope)` if there's actually an error in identifiying the correct scope.
+* Stop showing `(Global Scope)` if there's actually an error in identifying the correct scope.
 * Fix crash with the IntelliSense process when parsing certain template code (the most frequently hit crash).
 * Fix main thread being blocked while searching for files to remove after changing `files.exclude`.
 * Fix incorrect code action include path suggestion when a folder comes after "..".
@@ -266,7 +266,7 @@
 * Debugging for Visual C++ applications on Windows (Program Database files) is now available.
 * `clang-format` is now automatically installed as a part of the extension and formats code as you type.
 * `clang-format` options have been moved from c_cpp_properties.json file to settings.json (File->Preferences->User settings).
-* `clang-format` fall-back style is now set to 'Visual Studio'.
+* `clang-format` fallback style is now set to 'Visual Studio'.
 * Attach now requires a request type of `attach` instead of `launch`.
 * Support for additional console logging using the keyword `logging` inside `launch.json`.
 * Bug fixes.
@@ -300,7 +300,7 @@
 * Support for debugging with GDB on Cygwin.
 * Debugging on 32-bit Linux now enabled.
 * Format code using clang-format.
-* Experimental fuzzy autocompletion.
+* Experimental fuzzy auto-completion.
 * Bug fixes.
 
 ## Version 0.5.0: April 14, 2016

Extension/src/Debugger/attachToProcess.ts

@@ -96,34 +96,34 @@ export class RemoteAttachPicker {
             // Processess will follow if listed
             let lines: string[] = output.split(/\r?\n/);
 
-            if (lines.length == 0) {
+            if (lines.length === 0) {
                 return Promise.reject<AttachItem[]>(new Error("Pipe transport failed to get OS and processes."));
             } else {
                 let remoteOS: string = lines[0].replace(/[\r\n]+/g, '');
 
-                if (remoteOS != "Linux" && remoteOS != "Darwin") {
+                if (remoteOS !== "Linux" && remoteOS !== "Darwin") {
                     return Promise.reject<AttachItem[]>(new Error(`Operating system "${remoteOS}" not supported.`));
                 }
 
                 // Only got OS from uname
-                if (lines.length == 1) {
+                if (lines.length === 1) {
                     return Promise.reject<AttachItem[]>(new Error("Transport attach could not obtain processes list."));
                 } else {
                     let processes: string[] = lines.slice(1);
                     return PsProcessParser.ParseProcessFromPsArray(processes)
                         .sort((a, b) => {
-                            if (a.name == undefined) {
-                                if (b.name == undefined) {
+                            if (a.name === undefined) {
+                                if (b.name === undefined) {
                                     return 0;
                                 }
                                 return 1;
                             }
-                            if (b.name == undefined) {
+                            if (b.name === undefined) {
                                 return -1;
                             }
                             let aLower: string = a.name.toLowerCase();
                             let bLower: string = b.name.toLowerCase();
-                            if (aLower == bLower) {
+                            if (aLower === bLower) {
                                 return 0;
                             }
                             return aLower < bLower ? -1 : 1;

Extension/src/Debugger/configurationProvider.ts

@@ -81,7 +81,7 @@ abstract class DefaultConfigurationProvider implements IConfigurationAssetProvid
             configurationSnippet.push(configuration.GetLaunchConfiguration()); 
         });
 
-        let initialConfigurations: any = configurationSnippet.filter(snippet => snippet.debuggerType == debuggerType && snippet.isInitialConfiguration)
+        let initialConfigurations: any = configurationSnippet.filter(snippet => snippet.debuggerType === debuggerType && snippet.isInitialConfiguration)
             .map(snippet => JSON.parse(snippet.bodyText));
 
         // If configurations is empty, then it will only have an empty configurations array in launch.json. Users can still add snippets.

Extension/src/Debugger/copyScript.ts

@@ -63,7 +63,7 @@ function findCppToolsExtensionDebugAdapterFolder(): string {
             }
         }
 
-        if (dirPath == os.homedir()) {
+        if (dirPath === os.homedir()) {
             console.error("Could not find installed C/C++ extension.");
             return null;
         }
@@ -81,7 +81,7 @@ function enableDevWorkflow(): Boolean {
         return false;
     }
 
-    return (EnableDevWorkflow || (process.env.CPPTOOLS_DEV != null));
+    return (EnableDevWorkflow || (process.env.CPPTOOLS_DEV !== null));
 }
 
 function copySourceDependencies(): void {

Extension/src/Debugger/extension.ts

@@ -74,7 +74,7 @@ function registerAdapterExecutableCommands(): void {
     }));
 
     disposables.push(vscode.commands.registerCommand('extension.cppvsdbgAdapterExecutableCommand', () => {
-        if (os.platform() != 'win32') {
+        if (os.platform() !== 'win32') {
             vscode.window.showErrorMessage("Debugger type 'cppvsdbg' is not avaliable for non-Windows machines.");
             return null;
         } else {

Extension/src/Debugger/nativeAttach.ts

@@ -38,18 +38,18 @@ abstract class NativeAttachItemsProvider implements AttachItemsProvider {
             // localeCompare is significantly slower than < and > (2000 ms vs 80 ms for 10,000 elements)
             // We can change to localeCompare if this becomes an issue
             processEntries.sort((a, b) => {
-                if (a.name == undefined) {
-                    if (b.name == undefined) {
+                if (a.name === undefined) {
+                    if (b.name === undefined) {
                         return 0;
                     }
                     return 1;
                 }
-                if (b.name == undefined) {
+                if (b.name === undefined) {
                     return -1;
                 }
                 let aLower: string = a.name.toLowerCase();
                 let bLower: string = b.name.toLowerCase();
-                if (aLower == bLower) {
+                if (aLower === bLower) {
                     return 0;
                 }
                 return aLower < bLower ? -1 : 1;

Extension/src/LanguageServer/client.ts

@@ -124,7 +124,7 @@ function collectSettings(filter: (key: string, val: string, settings: vscode.Wor
         }
         if (filter(key, val, settings)) {
             previousCppSettings[key] = val;
-            result[key] = (key == "clang_format_path") ? "..." : String(previousCppSettings[key]);
+            result[key] = (key === "clang_format_path") ? "..." : String(previousCppSettings[key]);
             if (result[key].length > maxSettingLengthForTelemetry) {
                 result[key] = result[key].substr(0, maxSettingLengthForTelemetry) + "...";
             }
@@ -560,7 +560,7 @@ class DefaultClient implements Client {
                 continue; // File already has an association.
             }
             let j: number = file.lastIndexOf('.');
-            if (j != -1) {
+            if (j !== -1) {
                 let ext: string = file.substr(j);
                 if ((("*" + ext) in assocs) || (("**/*" + ext) in assocs)) {
                     continue; // Extension already has an association.
@@ -756,9 +756,9 @@ class DefaultClient implements Client {
         this.notifyWhenReady(() => {
             ui.showParsingCommands()
                 .then((index: number) => {
-                    if (index == 0) {
+                    if (index === 0) {
                         this.pauseParsing();
-                    } else if (index == 1) {
+                    } else if (index === 1) {
                         this.resumeParsing();
                     }
                 });
@@ -800,11 +800,11 @@ class DefaultClient implements Client {
 function getLanguageServerFileName(): string {
     let extensionProcessName: string = 'Microsoft.VSCode.CPP.Extension';
     let plat: NodeJS.Platform = process.platform;
-    if (plat == 'linux') {
+    if (plat === 'linux') {
         extensionProcessName += '.linux';
-    } else if (plat == 'darwin') {
+    } else if (plat === 'darwin') {
         extensionProcessName += '.darwin';
-    } else if (plat == 'win32') {
+    } else if (plat === 'win32') {
         extensionProcessName += '.exe';
     } else {
         throw "Invalid Platform";

Extension/src/LanguageServer/configurations.ts

@@ -203,7 +203,7 @@ export class CppProperties {
         if (this.configurationIncomplete && this.defaultIncludes !== undefined && this.defaultFrameworks !== undefined) {
             this.configurationJson.configurations[this.CurrentConfiguration].includePath = this.defaultIncludes;
             this.configurationJson.configurations[this.CurrentConfiguration].browse.path = this.defaultIncludes;
-            if (process.platform == 'darwin') {
+            if (process.platform === 'darwin') {
                 this.configurationJson.configurations[this.CurrentConfiguration].macFrameworkPath = this.defaultFrameworks;
             }
             this.configurationIncomplete = false;
@@ -216,15 +216,15 @@ export class CppProperties {
         }
         let nodePlatform: NodeJS.Platform = process.platform;
         let plat: string;
-        if (nodePlatform == 'linux') {
+        if (nodePlatform === 'linux') {
             plat = "Linux";
-        } else if (nodePlatform == 'darwin') {
+        } else if (nodePlatform === 'darwin') {
             plat = "Mac";
-        } else if (nodePlatform == 'win32') {
+        } else if (nodePlatform === 'win32') {
             plat = "Win32";
         }
         for (let i: number = 0; i < this.configurationJson.configurations.length; i++) {
-            if (config.configurations[i].name == plat) {
+            if (config.configurations[i].name === plat) {
                 return i;
             }
         }
@@ -233,14 +233,14 @@ export class CppProperties {
 
     private getIntelliSenseModeForPlatform(name: string): string {
         // Do the built-in configs first.
-        if (name == "Linux" || name == "Mac") {
+        if (name === "Linux" || name === "Mac") {
             return "clang-x64";
-        } else if (name == "Win32") {
+        } else if (name === "Win32") {
             return "msvc-x64";
         } else {
             // Custom configs default to the OS's preference.
             let nodePlatform: NodeJS.Platform = process.platform;
-            if (nodePlatform == 'linux' || nodePlatform == 'darwin') {
+            if (nodePlatform === 'linux' || nodePlatform === 'darwin') {
                 return "clang-x64";
             }
         }
@@ -266,7 +266,7 @@ export class CppProperties {
     }
 
     public select(index: number): Configuration {
-        if (index == this.configurationJson.configurations.length) {
+        if (index === this.configurationJson.configurations.length) {
             this.handleConfigurationEditCommand(vscode.window.showTextDocument);
             return;
         }
@@ -319,7 +319,7 @@ export class CppProperties {
         });
         filePaths.forEach((path: string) => {
             this.compileCommandFileWatchers.push(fs.watch(path, (event: string, filename: string) => {
-                if (event != "rename") {
+                if (event !== "rename") {
                     this.onCompileCommandsChanged(path);
                 }
             }));
@@ -389,7 +389,7 @@ export class CppProperties {
     private parsePropertiesFile(): void {
         try {
             let readResults: string = fs.readFileSync(this.propertiesFile.fsPath, 'utf8');
-            if (readResults == "") {
+            if (readResults === "") {
                 return; // Repros randomly when the file is initially created. The parse will get called again after the file is written.
             }
 
@@ -418,7 +418,7 @@ export class CppProperties {
                 }
             }
 
-            if (this.configurationJson.version != configVersion) {
+            if (this.configurationJson.version !== configVersion) {
                 dirty = true;
                 if (this.configurationJson.version === undefined) {
                     this.updateToVersion2();
@@ -477,13 +477,13 @@ export class CppProperties {
         let propertiesFile: string = path.join(this.configFolder, "c_cpp_properties.json");
         fs.stat(propertiesFile, (err, stats) => {
             if (err) {
-                if (this.propertiesFile != null) {
+                if (this.propertiesFile !== null) {
                     this.propertiesFile = null; // File deleted.
                     this.resetToDefaultSettings(true);
                     this.handleConfigurationChange();
                 }
             } else if (stats.mtime > this.configFileWatcherFallbackTime) {
-                if (this.propertiesFile == null) {
+                if (this.propertiesFile === null) {
                     this.propertiesFile = vscode.Uri.file(propertiesFile); // File created.
                 }
                 this.handleConfigurationChange();

Extension/src/LanguageServer/extension.ts

@@ -81,7 +81,7 @@ export function activate(activationEventOccurred: boolean): void {
     if (vscode.workspace.textDocuments !== undefined && vscode.workspace.textDocuments.length > 0) {
         for (let i: number = 0; i < vscode.workspace.textDocuments.length; ++i) {
             let document: vscode.TextDocument = vscode.workspace.textDocuments[i];
-            if (document.languageId == "cpp" || document.languageId == "c") {
+            if (document.languageId === "cpp" || document.languageId === "c") {
                 return onActivationEvent();
             }
         }
@@ -95,7 +95,7 @@ function onDidOpenTextDocument(document: vscode.TextDocument): void {
 }
 
 function onActivationEvent(): void {
-    if (tempCommands.length == 0) {
+    if (tempCommands.length === 0) {
         return;
     }
 
@@ -163,7 +163,7 @@ function onDidChangeActiveTextEditor(editor: vscode.TextEditor): void {
     }
 
     let activeEditor: vscode.TextEditor = vscode.window.activeTextEditor;
-    if (!activeEditor || (activeEditor.document.languageId != "cpp" && activeEditor.document.languageId != "c")) {
+    if (!activeEditor || (activeEditor.document.languageId !== "cpp" && activeEditor.document.languageId !== "c")) {
         activeDocument = "";
     } else {
         activeDocument = editor.document.uri.toString();
@@ -180,7 +180,7 @@ function onDidChangeTextEditorSelection(event: vscode.TextEditorSelectionChangeE
         return;
         }
 
-    if (activeDocument != event.textEditor.document.uri.toString()) {
+    if (activeDocument !== event.textEditor.document.uri.toString()) {
         // For some strange (buggy?) reason we don't reliably get onDidChangeActiveTextEditor callbacks.
         activeDocument = event.textEditor.document.uri.toString();
         clients.activeDocumentChanged(event.textEditor.document);
@@ -245,7 +245,7 @@ function onSwitchHeaderSource(): void {
         return;
     }
 
-    if (activeEditor.document.languageId != "cpp" && activeEditor.document.languageId != "c") {
+    if (activeEditor.document.languageId !== "cpp" && activeEditor.document.languageId !== "c") {
         return;
     }
 
@@ -379,7 +379,7 @@ function onTakeSurvey(): void {
 }
 
 function reportMacCrashes(): void {
-    if (process.platform == "darwin") {
+    if (process.platform === "darwin") {
         prevCrashFile = "";
         let crashFolder: string = path.resolve(process.env.HOME, "Library/Logs/DiagnosticReports");
         fs.stat(crashFolder, (err, stats) => {

Extension/src/LanguageServer/ui.ts

@@ -187,7 +187,7 @@ export class UI {
 
         let items: IndexableQuickPickItem[];
         items = [];
-        if (this.browseEngineStatusBarItem.tooltip == "Parsing paused") {
+        if (this.browseEngineStatusBarItem.tooltip === "Parsing paused") {
             items.push({ label: "Resume Parsing", description: "", index: 1 });
         } else {
             items.push({ label: "Pause Parsing", description: "", index: 0 });