Merge pull request #2029 from Microsoft/seanmcm/0_17_3_release

Seanmcm/0 17 3 release

Author: sean-mcmanus

Extension/CHANGELOG.md

@@ -1,6 +1,7 @@
 # C/C++ for Visual Studio Code Change Log
 
-## Version 0.17.2: May 21, 2018
+## Version 0.17.3: May 22, 2018
+* Add support for `${workspaceFolder:folderName}`. [#1774](https://github.com/Microsoft/vscode-cpptools/issues/1774)
 * Fix infinite loop during initialization on Windows. [#1960](https://github.com/Microsoft/vscode-cpptools/issues/1960)
 * Fix main process IntelliSense-related crashes. [#2006](https://github.com/Microsoft/vscode-cpptools/issues/2006)
 * Fix deadlock after formatting large files. [#2007](https://github.com/Microsoft/vscode-cpptools/issues/2007)

Extension/package-lock.json

@@ -2,7 +2,7 @@
   "name": "cpptools",
   "displayName": "C/C++",
   "description": "C/C++ IntelliSense, debugging, and code browsing.",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "publisher": "ms-vscode",
   "preview": true,
   "icon": "LanguageCCPP_color_128x.png",

Extension/package.json

@@ -152,7 +152,7 @@ export function resolveVariables(input: string, additionalEnvironment: {[key: st
     }
 
     // Replace environment and configuration variables.
-    let regexp: RegExp = /\$\{((env|config)(.|:))?(.*?)\}/g;
+    let regexp: RegExp = /\$\{((env|config|workspaceFolder)(.|:))?(.*?)\}/g;
     let ret: string = input.replace(regexp, (match: string, ignored1: string, varType: string, ignored2: string, name: string) => {
         // Historically, if the variable didn't have anything before the "." or ":"
         // it was assumed to be an environment variable
@@ -180,6 +180,18 @@ export function resolveVariables(input: string, additionalEnvironment: {[key: st
                 newValue = (config) ? config.toString() : undefined;
                 break;
             }
+            case "workspaceFolder": {
+                // Only replace ${workspaceFolder:name} variables for now.
+                // We may consider doing replacement of ${workspaceFolder} here later, but we would have to update the language server and also
+                // intercept messages with paths in them and add the ${workspaceFolder} variable back in (e.g. for light bulb suggestions)
+                if (name && vscode.workspace && vscode.workspace.workspaceFolders) {
+                    let folder: vscode.WorkspaceFolder = vscode.workspace.workspaceFolders.find(folder => folder.name.toLocaleLowerCase() === name.toLocaleLowerCase());
+                    if (folder) {
+                        newValue = folder.uri.fsPath;
+                    }
+                }
+                break;
+            }
             default: { assert.fail("unknown varType matched"); }
         }
         return (newValue) ? newValue : match;