Add ${VcpkgRoot} variable

Author: sean-mcmanus

Extension/CHANGELOG.md

@@ -1,5 +1,12 @@
 # C/C++ for Visual Studio Code Change Log
 
+## Version 0.17.7: July 16, 2018
+* Add `${vcpkgRoot}` variable. [#1817](https://github.com/Microsoft/vscode-cpptools/issues/1817)
+* Skip automatic parsing of source files in Mac system framework paths. [#2156](https://github.com/Microsoft/vscode-cpptools/issues/2156)
+* Fix `Edit Configuration...` not working after `c_cpp_properties.json` is deleted. [#2214](https://github.com/Microsoft/vscode-cpptools/issues/2214)
+* Fix indexing of the entire root drive on Windows when no is folder open. [#2216](https://github.com/Microsoft/vscode-cpptools/issues/2216)
+* Fix out-of-memory crash with `#include` code actions when no folder is open. [#2225](https://github.com/Microsoft/vscode-cpptools/issues/2225)
+
 ## Version 0.17.6: July 2, 2018
 * Fix the database icon getting stuck with recursive includes. [#2104](https://github.com/Microsoft/vscode-cpptools/issues/2104)
 * Fix the red flame appearing late with recursive includes. [#2105](https://github.com/Microsoft/vscode-cpptools/issues/2105)

Extension/package.json

@@ -2,7 +2,7 @@
   "name": "cpptools",
   "displayName": "C/C++",
   "description": "C/C++ IntelliSense, debugging, and code browsing.",
-  "version": "0.17.6",
+  "version": "0.17.7-master",
   "publisher": "ms-vscode",
   "preview": true,
   "icon": "LanguageCCPP_color_128x.png",
@@ -1351,7 +1351,7 @@
   "runtimeDependencies": [
     {
       "description": "C/C++ language components (Linux / x86_64)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2003936",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2004596",
       "platforms": [
         "linux"
       ],
@@ -1365,7 +1365,7 @@
     },
     {
       "description": "C/C++ language components (Linux / x86)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2003833",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2004498",
       "platforms": [
         "linux"
       ],
@@ -1381,7 +1381,7 @@
     },
     {
       "description": "C/C++ language components (OS X)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2003834",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2004597",
       "platforms": [
         "darwin"
       ],
@@ -1392,7 +1392,7 @@
     },
     {
       "description": "C/C++ language components (Windows)",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2003835",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2004598",
       "platforms": [
         "win32"
       ],

Extension/src/LanguageServer/client.ts

@@ -354,7 +354,8 @@ class DefaultClient implements Client {
                 preferredPathSeparator: settings.preferredPathSeparator,
                 default: {
                     systemIncludePath: settings.defaultSystemIncludePath
-                }
+                },
+                vcpkg_root: util.getVcpkgRoot()
             },
             middleware: createProtocolFilter(this, allClients),  // Only send messages directed at this client.
             errorHandler: {

Extension/src/LanguageServer/configurations.ts

@@ -88,7 +88,7 @@ export class CppProperties {
     private vcpkgIncludes: string[] = [];
     private vcpkgPathReady: boolean = false;
     private defaultIntelliSenseMode: string = null;
-    private readonly configurationGlobPattern: string = "**/c_cpp_properties.json"; // TODO: probably should be a single file, not all files...
+    private readonly configurationGlobPattern: string = "c_cpp_properties.json";
     private disposables: vscode.Disposable[] = [];
     private configurationsChanged = new vscode.EventEmitter<Configuration[]>();
     private selectionChanged = new vscode.EventEmitter<number>();
@@ -247,27 +247,25 @@ export class CppProperties {
 
     private async buildVcpkgIncludePath(): Promise<void> {
         try {
-            // Check for vcpkg instance and include relevent paths if found.
-            if (await util.checkFileExists(util.getVcpkgPathDescriptorFile())) {
-                let vcpkgRoot: string = await util.readFileText(util.getVcpkgPathDescriptorFile());
-                vcpkgRoot = vcpkgRoot.trim();
-                if (await util.checkDirectoryExists(vcpkgRoot)) {
-                    let vcpkgInstalledPath: string = path.join(vcpkgRoot, "/installed");
-                    let list: string[] = await util.readDir(vcpkgInstalledPath);
-                    if (list !== undefined) {
-                        // For every *directory* in the list (non-recursive). Each directory is basically a platform.
-                        list.forEach((entry) => {
-                            if (entry !== "vcpkg") {
-                                let pathToCheck: string = path.join(vcpkgInstalledPath, entry);
-                                if (fs.existsSync(pathToCheck)) {
-                                    let p: string = path.join(pathToCheck, "include");
-                                    if (fs.existsSync(p)) {
-                                        this.vcpkgIncludes.push(p);
-                                    }
+            // Check for vcpkgRoot and include relevent paths if found.
+            let vcpkgRoot: string = util.getVcpkgRoot();
+            if (vcpkgRoot) {
+                let list: string[] = await util.readDir(vcpkgRoot);
+                if (list !== undefined) {
+                    // For every *directory* in the list (non-recursive). Each directory is basically a platform.
+                    list.forEach((entry) => {
+                        if (entry !== "vcpkg") {
+                            let pathToCheck: string = path.join(vcpkgRoot, entry);
+                            if (fs.existsSync(pathToCheck)) {
+                                let p: string = path.join(pathToCheck, "include");
+                                if (fs.existsSync(p)) {
+                                    p = p.replace(/\\/g, "/");
+                                    p = p.replace(vcpkgRoot, "${vcpkgRoot}");
+                                    this.vcpkgIncludes.push(p);
                                 }
                             }
-                        });
-                    }
+                        }
+                    });
                 }
             }
         } catch (error) {} finally {

Extension/src/common.ts

@@ -57,6 +57,22 @@ export function getVcpkgPathDescriptorFile(): string {
     }
 }
 
+let vcpkgRoot: string;
+export function getVcpkgRoot(): string {
+    if (!vcpkgRoot && vcpkgRoot !== "") {
+        vcpkgRoot = "";
+        // Check for vcpkg instance.
+        if (fs.existsSync(getVcpkgPathDescriptorFile())) {
+            let vcpkgRootTemp: string = fs.readFileSync(getVcpkgPathDescriptorFile()).toString();
+            vcpkgRootTemp = vcpkgRootTemp.trim();
+            if (fs.existsSync(vcpkgRootTemp)) {
+                vcpkgRoot = path.join(vcpkgRootTemp, "/installed").replace(/\\/g, "/");
+            }
+        }
+    }
+    return vcpkgRoot;
+}
+
 // Extension is ready if install.lock exists and debugAdapters folder exist.
 export async function isExtensionReady(): Promise<boolean> {
     const doesInstallLockFileExist: boolean = await checkInstallLockFile();