Merge pull request #2572 from Microsoft/master

Merge latest changes

.github/ISSUE_TEMPLATE/debugger.md

@@ -0,0 +1,30 @@
+---
+name: Debugger
+about: Issues pertaining to debugging such as call stack, breakpoints, watch window,
+  launching or attaching to a debuggee.
+
+---
+
+Type: Debugger
+**Input information below**
+
+**Please review existing issues and our documentation at https://github.com/Microsoft/vscode-cpptools/tree/master/Documentation prior to filing an issue.**
+
+**Describe the bug**
+- OS and Version:
+- VS Code Version:
+- C/C++ Extension Version:
+- Other extensions you installed (and if the issue persists after disabling them):
+- A clear and concise description of what the bug is.
+
+**To Reproduce**
+*Please include a code sample and `launch.json` configuration.*
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Additional context**
+*If applicable, please include logging by adding "logging": { "engineLogging": true, "trace": true, "traceResponse": true } in your `launch.json`*
+Add any other context about the problem here including log or error messages in your Debug Console or Output windows.

.github/ISSUE_TEMPLATE/general-extension.md

@@ -0,0 +1,34 @@
+---
+name: General Extension
+about: Issues pertaining to downloading, installing, or building the extension.
+
+---
+
+Type: General
+**Input information below**
+
+**Please review existing issues and our documentation at https://github.com/Microsoft/vscode-cpptools/tree/master/Documentation prior to filing an issue.**
+
+**Describe the bug**
+- OS and Version:
+- VS Code Version:
+- C/C++ Extension Version:
+- Other extensions you installed (and if the issue persists after disabling them):
+- A clear and concise description of what the bug is.
+
+**To Reproduce**
+*Please include code sample and `task.json` files.*
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here including log messages from the Output window.

.github/ISSUE_TEMPLATE/language-service.md

@@ -0,0 +1,39 @@
+---
+name: Language Service
+about: 'Issues pertaining to IntelliSense, autocomplete, code editing, etc. '
+
+---
+
+**Type: LanguageService**
+<!----- Input information below ----->
+
+<!--
+**Please review existing issues and our documentation at https://github.com/Microsoft/vscode-cpptools/tree/master/Documentation prior to filing an issue.**
+-->
+
+**Describe the bug**
+- OS and Version:
+- VS Code Version:
+- C/C++ Extension Version:
+- Other extensions you installed (and if the issue persists after disabling them):
+- A clear and concise description of what the bug is.
+
+**To Reproduce**
+<!-- Steps to reproduce the behavior: -->
+<!-- *The most actionable issue reports include a code sample including configuration files such as c_cpp_properties.json* -->
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**Additional context**
+<!--
+*Call Stacks: For bugs like crashes, deadlocks, infinite loops, etc. that we are not able to repro and for which the call stack may be useful, please attach a debugger and/or create a dmp and provide the call stacks. Starting with 0.17.3, Windows binaries have symbols available in VS Code by setting your "symbolSearchPath" to "http://msdl.microsoft.com/download/symbols".*
+Add any other context about the problem here including log messages in your Output window ("C_Cpp.loggingLevel": "Debug" in settings.json).
+-->

.travis.yml

@@ -0,0 +1,41 @@
+language: node_js
+
+node_js:
+- "8"
+
+before_install:
+  # Do not modify. Required for GUI based tests: See https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-xvfb-to-Run-Tests-That-Require-a-GUI
+  - if [ $TRAVIS_OS_NAME == "linux" ]; then
+      export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
+      sh -e /etc/init.d/xvfb start;
+      sleep 3;
+    fi
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+      - sourceline: 'deb https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main'
+        key_url: 'https://packages.microsoft.com/keys/microsoft.asc'
+    packages:
+      - gdb
+      - g++-4.9
+
+
+script:
+  # Download debugAdapters from an existing extension version. See TravisCI settings to set CPPTOOL_VERSION
+  - mkdir -p ~/.vscode/extensions/ms-vscode.cpptools-$CPPTOOL_VERSION
+  - wget https://github.com/Microsoft/vscode-cpptools/releases/download/$CPPTOOL_VERSION/cpptools.vsix -O ~/cpptools.vsix
+  - unzip ~/cpptools.vsix "extension/debugAdapters/*" -d ~/.
+  - mv ~/extension/debugAdapters ~/.vscode/extensions/ms-vscode.cpptools-$CPPTOOL_VERSION/debugAdapters
+  # Build and then run tests
+  - cd Extension
+  - npm install
+  - npm run compile
+  - npm run tslint
+  # pr-check needs to run before test. test modifies package.json.
+  - npm run pr-check
+  - npm run test
+  # Dump integrationTest.log output
+  - find ~ -name "integrationTests.log" -type f -exec cat {} \;
+  

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+## Microsoft Open Source Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact opencode@microsoft.com with any additional questions or comments.

CONTRIBUTING.md

@@ -0,0 +1,20 @@
+# How to Contribute Changes
+
+## Contribution Steps
+
+* [Build and debug the extension](Documentation/Building%20the%20Extension.md).
+* File an [issue](https://github.com/Microsoft/vscode-cpptools/issues) and a [pull request](https://github.com/Microsoft/vscode-cpptools/pulls) with the change and we will review it.
+* If the change affects functionality, add a line describing the change to [**CHANGELOG.md**](Extension/CHANGELOG.md).
+* Try and add a test in [**test/extension.test.ts**](Extension/test/unitTests/extension.test.ts).
+* Run tests via opening the [**Extension**](https://github.com/Microsoft/vscode-cpptools/tree/master/Extension) folder in Visual Studio Code, selecting the "Launch Tests" configuration in the Debug pane, and choosing "Start Debugging".
+
+## About the Code
+
+* Execution starts in the `activate` method in [**main.ts**](Extension/src/main.ts).
+  * `processRuntimeDependencies` handles the downloading and installation of the OS-dependent files. Downloading code exists in [**packageManager.ts**](Extension/src/packageManager.ts).
+  * `downloadCpptoolsJsonPkg` handles the **cpptools.json**, which can be used to enable changes to occur mid-update, such as turning the `intelliSenseEngine` to `"Default"` for a certain percentage of users.
+* The debugger code is in the [**Debugger**](https://github.com/Microsoft/vscode-cpptools/tree/master/Extension/src/Debugger) folder.
+* [**LanguageServer/client.ts**](Extension/src/LanguageServer/client.ts) handles various language server functionality.
+* [**LanguageServer/configurations.ts**](Extension/src/LanguageServer/configurations.ts) handles functionality related to **c_cpp_properties.json**.
+* [**telemetry.ts**](Extension/src/telemetry.ts): Telemetry data gets sent to either `logLanguageServerEvent` or `logDebuggerEvent`.
+* The Tag Parser (symbol database) doesn't automatically expand macros, so the [**cpp.hint**](Extension/cpp.hint) file contains definitions of macros that should be expanded in order for symbols to be parsed correctly.

Code Samples/Fib/.vscode/launch.json

@@ -0,0 +1,40 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "preLaunchTask": "build",
+            "type": "cppdbg",
+            "request": "launch",
+            "args": [],
+            "stopAtEntry": true,
+            "cwd": "${workspaceRoot}",
+            "environment": [],
+            "externalConsole": true,
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ],
+            "logging": {
+                "engineLogging": false,
+                "trace": false
+            },
+            "windows": {
+                "program": "${workspaceRoot}/fib.exe",
+                "MIMode": "gdb",
+                "miDebuggerPath": "<Path/To/GDB>" // Path to gdb on windows
+            },
+            "linux": {
+                "program": "${workspaceRoot}/fib.out",
+                "MIMode": "gdb"
+            },
+            "osx": {
+                "program": "${workspaceRoot}/fib.out",
+                "MIMode": "lldb"
+            }
+        }
+    ]
+}

Code Samples/Fib/.vscode/tasks.json

@@ -0,0 +1,50 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "taskName": "build",
+            "type": "shell",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared"
+            },
+            "windows": {
+                "command": "${workspaceRoot}/build.cmd",
+                "args": [
+                    "<Path/To/MinGW/Cygwin/Bin/Folder>",    // Path to the bin folder containing g++ to compile
+                    "fib.exe"                               // Output executable name
+                ]
+            },
+            "linux": {
+                "command": "g++",
+                "args": [
+                    "-g",
+                    "*.cpp",
+                    "-lpthread",
+                    "--std=c++11",
+                    "-o",
+                    "fib.out"
+                ]
+            },
+            "osx": {
+                "command": "g++",
+                "args": [
+                    "-g",
+                    "*.cpp",
+                    "-lpthread",
+                    "--std=c++11",
+                    "-o",
+                    "fib.out"
+                ]
+            }
+        }
+    ]
+}

Code Samples/Fib/README.md

@@ -0,0 +1,3 @@
+# Fib
+
+This code sample is to show debugging. Update `launch.json` and `tasks.json` in the `.vscode` folder to use your setup to build and debug. 

Code Samples/Fib/build.cmd

@@ -0,0 +1,2 @@
+SET PATH=%PATH%;%1
+g++ -g *.cpp -lpthread --std=c++11 -O0 -o %2

Code Samples/Fib/main.cpp

@@ -0,0 +1,58 @@
+#include <iostream>
+#include <unistd.h>
+#include <sys/types.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <string.h>
+
+#include "thread.h"
+
+#define THREAD_COUNT 10
+
+static char block[] = "--block";
+int test = 0;
+
+int main(int argc, char **argv)
+{
+    srand(time(NULL));
+
+    static char pidText[] = "PID: ";
+    std::string helpText = "Attach a debugger and execute 'set foo=0' to continue";
+    char helloText[] = "Hello World!";
+
+    std::cout << helloText << std::endl;
+
+    pthread_t threads[THREAD_COUNT];
+
+    if (argc == 2 && !strcmp(block, argv[1]))
+    {
+        std::cout << helpText << std::endl;
+        volatile int foo = 1;
+        while (foo)
+            ;
+    }
+
+    if (argc == 2 && !strcmp("--crash", argv[1]))
+    {
+        int foo = 0;
+        int bar = 1 / foo;
+    }
+
+    for (int i = 0; i < THREAD_COUNT; i++)
+    {
+        std::cout << "Test " << i << std::endl;
+        pthread_create(&threads[i], NULL, &thread_proc, NULL);
+    }
+
+    for (int i = 0; i < THREAD_COUNT; i++)
+    {
+        pthread_join(threads[i], NULL);
+        test++;
+    }
+
+    std::cout << "All threads exited!" << std::endl;
+
+    return 1;
+}

Code Samples/Fib/thread.cpp

@@ -0,0 +1,48 @@
+#include <iostream>
+#include <unistd.h>
+#include <sys/types.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <string.h>
+
+#include "thread.h"
+
+static int g_tid = 0;
+
+static int fib(int n){
+    switch (n) {
+        case 0: return 1;
+        case 1: return 1;
+        default: return (fib(n-2) + fib(n-1)); 
+    }    
+}
+
+void * thread_proc(void* ctx)
+{
+    int tid = g_tid++;
+    
+    char thread_name[16];
+    sprintf(thread_name, "Thread %d", tid);
+#ifdef __APPLE__
+    pthread_setname_np(thread_name);
+#else
+    pthread_setname_np(pthread_self(), thread_name);
+#endif
+    
+    // Random delay, 0 - 0.5 sec
+    timespec ts;
+    ts.tv_sec = 0;
+    ts.tv_nsec = 500000000 + ((float)rand() / (float)RAND_MAX) * 500000000;
+    nanosleep(&ts, NULL);
+    
+    volatile int i = 0;
+    while (i <= 30) {
+        std::cout << "Thread " << tid << ": fib(" << i << ") = " << fib(i) << std::endl;
+        i++;
+        nanosleep(&ts, NULL);
+    }
+    
+    std::cout << thread_name << " exited!" << std::endl;
+}

Code Samples/Fib/thread.h

@@ -0,0 +1 @@
+void * thread_proc(void* ctx);

Code Samples/SampleClangProject/.gitignore

@@ -0,0 +1,2 @@
+main.exe
+main.exe.dSYM

Code Samples/SampleClangProject/.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(lldb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceRoot}/main.exe", // this is executable to launch the debugger with
+            "args": ["YourNameHere"],
+            "stopAtEntry": true, // if true then stop at the main entry (function)
+            "cwd": "${workspaceRoot}",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "lldb"
+        }
+    ]
+}

Code Samples/SampleClangProject/.vscode/tasks.json

@@ -0,0 +1,19 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "clang++",
+            "command": "clang++ --debug -o main.exe main.cpp",
+                // "--debug" enables debugging symbols
+                // "-o main.exe" specifies the output executable
+                // "main.cpp" is the source file to compile
+            "type": "shell",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}

Code Samples/SampleClangProject/README.md

@@ -0,0 +1,10 @@
+# README
+This is a sample debuggable C++ project. It uses the vendor provided version of clang installed. `tasks.json` and `launch.json` have been edited to demonstrate how to create a configuration for a C++ project that builds with clang.
+
+There's a sample build task in `.vscode/tasks.json`; you can also see the build configurations by using the menu option `Configure` -> `Configure Tasks` or by clicking the gear icon in the Debug Panel.
+
+To run a build, use the menu option `Tasks` -> `Run Build Task...`.
+
+There's a sample debug configuration in `.vscode/launch.json`; you can also see the configuration by using the menu option `Debug` -> `Open Configurations`.
+
+To debug the build, use the menu option `Debug` -> `Start Debugging`. The executable will launch and stop in the main function.

Code Samples/SampleClangProject/main.cpp

@@ -0,0 +1,17 @@
+#include <iostream>
+#include <string>
+
+using namespace std;
+
+void greet(const string& person) {
+    cout << "Hello, " << person << "!" << endl;
+}
+
+int main(int argc, char** argv) {
+    if(argc >= 2) {
+        greet(argv[1]);
+    } else {
+        cerr << "insufficient args, usage: " << argv[0] << " personNameHere" << endl;
+    }
+    return 0;
+}

Documentation/Building the Extension.md

@@ -0,0 +1,13 @@
+## How to build and debug the Microsoft CppTools Extension
+
+These steps will allow you to debug the TypeScript code that is part of the Microsoft CppTools extension for Visual Studio Code.
+
+Prerequisite steps:
+  * Clone [this](https://github.com/Microsoft/vscode-cpptools) repository.
+  * Install [npm](https://nodejs.org).
+  * From a command line, run the following commands from the **Extension** folder in the root of the repository:
+      * `npm install` will install the dependencies needed to build the extension.
+      * **(optional)** `npm install -g vsce` will install `vsce` globally to create a VSIX package that you can install.
+  * **(optional)** Set an environment variable `CPPTOOLS_DEV=1`.
+    * This enables the local developer workflow when testing the debugger, copying dependencies from the **node_modules** folder. Testing the language server does not require this step.
+  * Open the **Extension** folder in Visual Studio Code and press F5. This will launch a VS Code Extension Host window and activate the TypeScript debugger. You can set breakpoints on the extension source code and debug your scenario.

Documentation/Debugger/How To Debug MIEngine.md

@@ -1,7 +1,6 @@
-# How To Debug MIEngine (Work in Progress)
-*This is a work in progress. Please create a pull request with updates if there is anything wrong with it.*
+# How To Debug MIEngine
 
-MIEngine is one of the components used to enable the C/C++ debugging scenario with the Microsoft C/C++ extension with VS Code. This document is to help enable users who want to debug and contribute to MIEngine to fix issues or extend functionality. MIEngine is used to communicate with `gdb/lldb` using the MI protocol. 
+MIEngine is one of the components used to enable the C/C++ debugging scenario with the Microsoft C/C++ extension with VS Code. This document is to help enable users who want to debug and contribute to MIEngine to fix issues or extend functionality. MIEngine is used to communicate with `gdb`/`lldb` using the MI protocol. 
 
 **Repository:** https://github.com/Microsoft/MIEngine
 
@@ -9,33 +8,43 @@ MIEngine is one of the components used to enable the C/C++ debugging scenario wi
 
 To build MIEngine, you will either need Visual Studio 2015+ installed or at the very least [MSBuild](https://github.com/Microsoft/msbuild) installed. The configuration you want to build is `Desktop.Debug`.
 
-You can open the solution file `MIDebugEngine.sln` located under `src` and change the configuration and build. You will want to look in the `bin\Desktop.Debug` folder for the compiled bits. You will need to copy the following files to your `.vscode\extensions\ms-vscode.cpptools-<version>\debugadapters\bin` folder in your users/home folder:
+You can open the solution file **MIDebugEngine.sln** located under **src** and change the configuration and build. You will want to look in the **bin\Desktop.Debug** folder for the compiled bits. You will need to copy the following files to your **.vscode\extensions\ms-vscode.cpptools-\<version\>\debugadapters\bin** folder in your users/home folder:
 
 * Microsoft.MICore.dll
 * Microsoft.MICore.XmlSerializers.dll
 * Microsoft.MIDebugEngine.dll
+* vscode\OpenDebugAD7.exe
+* vscode\Microsoft.DebugEngineHost.dll
 
 The symbol files are as follows:
 
 **On Windows** 
 * Microsoft.MICore.pdb
 * Microsoft.MIDebugEngine.dll
+* vscode\OpenDebugAD7.pdb
+* vscode\Microsoft.DebugEngineHost.pdb
 
 **On Linux/Mac**
 * Microsoft.MICore.dll.mdb
 * Microsoft.MIDebugEngine.dll.mdb
+* vscode\OpenDebugAD7.exe.mdb
+* vscode\Microsoft.DebugEngineHost.dll.mdb
 
 ### Debugging On Windows
 
-On Windows, the easiest way to debug is to use Visual Studio. Locate the `package.json` file in the extension folder and open it in an editor.
+On Windows, the easiest way to debug is to use Visual Studio. Locate the **src\Debugger\extension.ts** file in the **Extension** folder and open it in an editor.
 
-Locate the following line: 
+If you are not building the extension, Locate the **out\src\Debugger\extension.ts** file in the **.vscode\extensions\ms-vscode.cpptools** folder and open it in an editor.
+
+Locate the following lines: 
 ```json
-"program": "./debugAdapters/OpenDebugAD7",
+return {
+    command: command
+};
 ```
-and add the following line below it:
+and add the following line to the object:
 ```json
-"args": ["--pauseForDebugger"],
+args: ["--pauseForDebugger"]
 ```
 
 This will cause the debugger to look like it has hung once you start debugging, but in reality it is waiting for a debugger to attach. Set your breakpoints and attach your debugger to the `OpenDebugAD7.exe` process. Once the debugger is attached, VS Code should start debugging and you can reproduce your scenario. 
@@ -49,29 +58,32 @@ On Linux and Mac OS X, we use `mono` as our framework. You can download Xamarin
 2. Install [Xamarin Studio v5.10.1.6](http://download.xamarin.com/studio/Windows/XamarinStudio-5.10.1.6-0.msi)
 
 Remote attach functionality behind a flag.  You can run it like this:
-```
-    cd "\Program Files (x86)\MonoDevelop\bin"
-    set MONODEVELOP_SDB_TEST=1
-    MonoDevelop.exe
+```PowerShell
+cd "\Program Files (x86)\MonoDevelop\bin"
+set MONODEVELOP_SDB_TEST=1
+MonoDevelop.exe
 ```
 
 #### Create an empty project for attaching (one-time setup)
+
 1. Launch MonoDevelop
 2. File -> New Solution
 3. Misc/Generic Project
 4. Name project and hit "Create"
 5. Right-click the project node (blue square) and do "Options"
-6. Under Run -> Custom Commands, select "Execute" in the lower dropdown and choose a command (I use c:\windows\notepad.exe - it doesn't matter what the command is, but MonoDevelop requires it to exist before it'll light up the Run menu).
+6. Under Run -> Custom Commands, select "Execute" in the lower dropdown and choose a command (I use `c:\windows\notepad.exe` - it doesn't matter what the command is, but MonoDevelop requires it to exist before it'll light up the Run menu).
 
 #### Configure the extension to enable remote debugging
-Open the `~/.vscode/extensions/ms-vscode.cpptools-<version>/debugAdapters/OpenDebugAD7` file with a text editor and locate and uncomment the line at the bottom. When you start debugging, it will now hang until the remote debugger is attached from Xamarin Studio. 
+
+Open the **~/.vscode/extensions/ms-vscode.cpptools-\<version\>/debugAdapters/OpenDebugAD7** file with a text editor and locate and uncomment the line at the bottom. When you start debugging, it will now hang until the remote debugger is attached from Xamarin Studio. 
 
 #### Attach the remote debugger
+
 In MonoDevelop: Run -> Run With -> Custom Command Mono Soft Debugger
 Fill in the IP and port of the Linux/Mac OS X machine and hit "Connect" to start debugging
 
-After you've done this once, you can hit the MonoDevelop "Play" button or F5 to bring up the connect dialog again.
+After you've done this once, you can hit the MonoDevelop "Play" button or <kbd>F5</kbd> to bring up the connect dialog again.
 
 Note: If you are debugging to CentOS, you will need to make an exception in the firewall
-* sudo firewall-cmd --zone=public --add-port=1234/tcp --permanent
-* sudo firewall-cmd --reload
+* `sudo firewall-cmd --zone=public --add-port=1234/tcp --permanent`
+* `sudo firewall-cmd --reload`

Documentation/Debugger/gdb/PipeTransport.md

@@ -1,52 +1,54 @@
 # Pipe Transport
-Pipe Transport allows communication through a pipe program to a remote shell. An example on linux would be `ssh`.
+
+Pipe Transport allows communication through a pipe program to a remote shell. An example on Linux would be `ssh`.
 
 ## How-To
-We have added `"pipeTransport"` as an option within the `launch.json` file. The structure looks as follows:
-```
-    "pipeTransport": {
-        "pipeCwd": "/usr/bin",
-        "pipeProgram": "/usr/bin/ssh",
-        "pipeArgs": [
-            "-pw",
-            "<password>",
-            "[email protected]"
-        ],
-        "debuggerPath": "/usr/bin/gdb"
-    },
+
+We have added `"pipeTransport"` as an option within the **launch.json** file. The structure looks as follows:
+```json
+"pipeTransport": {
+    "pipeCwd": "/usr/bin",
+    "pipeProgram": "/usr/bin/ssh",
+    "pipeArgs": [
+        "-pw",
+        "<password>",
+        "[email protected]"
+    ],
+    "debuggerPath": "/usr/bin/gdb"
+},
 ```
 The `pipeArgs` can be any set of arguments necessary to setup and authenticate the pipe connection. In the example, a password is used but you can also use an ssh key.
 
 You may also need to add a `sourceFileMap` to map the path of where the code exists on the remote shell to where it is locally:
-```
-    "sourceFileMap": {
-        // "remote": "local"
-        "/home/user/src": "/src/projectA/src"
-    }
+```json
+"sourceFileMap": {
+    // "remote": "local"
+    "/home/user/src": "/src/projectA/src"
+}
 ```
 
 ## Attach
+
 You can also use the above `pipeTransport` block to attach to a remote process. In the attach case, you will need to specify a `processId`. We have added the ability to query processes from the remote machine. To do this, change `"processId": "${command.pickProcess}"` to `"processId": "${command.pickRemoteProcess}"`. The `pipeTransport` settings will be used to query the processes on the remote machine. Then select the process from the drop down list. As with `launch`, you may need to configure `sourceFileMap`. 
 
 ## Docker example
 
-The `pipeTransport` can also be used to debug a process in a Docker container. For an attach, the `launch.json` will include:
+The `pipeTransport` can also be used to debug a process in a Docker container. For an attach, **launch.json** will include:
 
+```json
+"pipeTransport": {
+    "pipeCwd": "${workspaceRoot}",
+    "pipeProgram": "docker",
+    "pipeArgs": [
+        "exec", 
+        "-i", 
+        "hello_gdb", 
+        "sh",
+        "-c"
+    ],
+    "debuggerPath": "/usr/bin/gdb"
+},
 ```
-    "pipeTransport": {
-        "pipeCwd": "${workspaceRoot}",
-        "pipeProgram": "docker",
-        "pipeArgs": [
-            "exec", 
-            "-i", 
-            "hello_gdb", 
-            "sh",
-            "-c"
-        ],
-        "debuggerPath": "/usr/bin/gdb"
-    },
-```
-
 Where `hello_gdb` is the name of your container.
 
-Launching a process is accomplished by starting a container and then using the same `pipeTransport` launch additional processes in the container. See this [`launch.json`](https://github.com/andyneff/hello-world-gdb/blob/master/.vscode/launch.json) for a [full example](https://github.com/andyneff/hello-world-gdb/)
+Launching a process is accomplished by starting a container and then using the same `pipeTransport` launch additional processes in the container. See this [**launch.json**](https://github.com/andyneff/hello-world-gdb/blob/master/.vscode/launch.json) for a [full example](https://github.com/andyneff/hello-world-gdb/).

Documentation/Debugger/gdb/Windows Subsystem for Linux.md

@@ -1,86 +1,91 @@
 # Windows 10's Windows Subsystem for Linux
-With the release of Windows 10 Creators Update (Build 15063), you will now be able to use Visual Studio Code and the Microsoft C/C++ extension to debug your `Windows Subsystem for Linux (WSL)` [Bash on Ubuntu](https://msdn.microsoft.com/en-us/commandline/wsl/about) projects.
 
-Code can be written on Windows itself using VSCode and debugged through `bash.exe` to the Bash on Windows layer. 
+With the release of Windows 10 Creators Update (Build 15063), you will now be able to use Visual Studio Code and the Microsoft C/C++ extension to debug your [Windows Subsystem for Linux (WSL)](https://msdn.microsoft.com/en-us/commandline/wsl/about) projects.
 
-**NOTE: Creator's Update (Build 15063 or later) is required due to bugfixes within the subsystem that we rely on to provide debugging. Debugging using a previous version of WSL is unsupported and likely will not work. To check your Windows version, enter `winver` in a command prompt.**
+Code can be written on Windows itself using VSCode and debugged through `bash.exe` to the Bash on Windows layer.
+
+As of the Fall Creator's Update, you can have multiple distros installed, but `bash.exe` and `wsl.exe` use the default distro. Use [WSL Config](https://msdn.microsoft.com/en-us/commandline/wsl/wsl-config) to set your default distro.
+
+**NOTE: Creator's Update (Build 15063 or later) is required due to bug-fixes within the subsystem that we rely on to provide debugging. Debugging using a previous version of WSL is unsupported and likely will not work. To check your Windows version, enter `winver` in a command prompt.**
 
 ## Prerequisites
-* [Windows 10 Creators Update with Windows Subsystem for Linux and Bash](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide) installed.
+
+* [Windows 10 Creators Update or later with Windows Subsystem for Linux](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide) installed.
 * Install g++/gcc and gdb within `WSL` to allow compiling and debugging. You can use the package manager to do this. For example, to install g++, you can run `sudo apt install g++` in the Bash window.
 * [Visual Studio Code](https://code.visualstudio.com) + Microsoft C/C++ extension for VSCode.
 
 ## How-To
-To debug, commands will be routed from Windows through `bash.exe` to set up debugging. Because our extension runs as a 32-bit process, it will need to use the `C:\Windows\SysNative` folder to access the `bash.exe` executable that is normally in `C:\Windows\System32`. We will be using the `"pipeTransport"` ability within the extension to do debugging and `"sourceFileMap"` to map the source from the subsystem's paths back to Windows path. 
+
+To debug, commands will be routed from Windows through `bash.exe` to set up debugging. Because our extension runs as a 32-bit process, it will need to use the `C:\Windows\SysNative` folder to access the `bash.exe` executable that is normally in `C:\Windows\System32`. We will be using the `"pipeTransport"` ability within the extension to do debugging and `"sourceFileMap"` to map the source from the subsystem's paths back to Windows path.
 
 **NOTE: Applications will need to be compiled in the `Windows Subsystem for Linux (WSL)` prior to debugging.**
 
 ### Example `launch.json` for Launching
 
-In the following example, I have a local drive, `Z:\` that has my source code within windows for an app called kitchensink. I have set up the `"program"` and `"cwd"` paths to point to the directory within `WSL`. I have set up the `"pipeTransport"` to use `bash.exe`. I have also set up a `"sourceFileMap"` to have everything that is returned by `gdb` that starts with `/mnt/z` to point to `Z:\\` in Windows.
+In the following example, I have a local drive, `Z:\` that has my source code within windows for an app called _kitchensink_. I have set up the `"program"` and `"cwd"` paths to point to the directory within `WSL`. I have set up the `"pipeTransport"` to use `bash.exe`. I have also set up a `"sourceFileMap"` to have everything that is returned by `gdb` that starts with `/mnt/z` to point to `Z:\\` in Windows.
 
-```
-        {
-            "name": "C++ Launch",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "/mnt/z/Bash/kitchensink/a.out",
-            "args": ["-fThreading"],
-            "stopAtEntry": false,
-            "cwd": "/mnt/z/Bash/kitchensink",
-            "environment": [],
-            "externalConsole": true,
-            "windows": {
-                "MIMode": "gdb",
-                "setupCommands": [
-                    {
-                        "description": "Enable pretty-printing for gdb",
-                        "text": "-enable-pretty-printing",
-                        "ignoreFailures": true
-                    }
-                ]
-            }, 
-            "pipeTransport": {
-                "pipeCwd": "",
-                "pipeProgram": "c:\\windows\\sysnative\\bash.exe",
-                "pipeArgs": ["-c"],
-                "debuggerPath": "/usr/bin/gdb"
-            },
-            "sourceFileMap": {
-                "/mnt/z": "z:\\"
+```json
+{
+    "name": "C++ Launch",
+    "type": "cppdbg",
+    "request": "launch",
+    "program": "/mnt/z/Bash/kitchensink/a.out",
+    "args": ["-fThreading"],
+    "stopAtEntry": false,
+    "cwd": "/mnt/z/Bash/kitchensink",
+    "environment": [],
+    "externalConsole": true,
+    "windows": {
+        "MIMode": "gdb",
+        "setupCommands": [
+            {
+                "description": "Enable pretty-printing for gdb",
+                "text": "-enable-pretty-printing",
+                "ignoreFailures": true
             }
-        }
+        ]
+    },
+    "pipeTransport": {
+        "pipeCwd": "",
+        "pipeProgram": "c:\\windows\\sysnative\\bash.exe",
+        "pipeArgs": ["-c"],
+        "debuggerPath": "/usr/bin/gdb"
+    },
+    "sourceFileMap": {
+        "/mnt/z": "z:\\"
+    }
+}
 ```
 
 ### Example `launch.json` for Attaching to an Existing Process
 
-This configuration similar to the launch process above. I have chosen to start the same application above from the Bash command line and now I want to attach to it for debugging. I have changed the `"processID"` to use the remote process picker by specifying the command `"${command:pickRemoteProcess}"` and set up the same `"sourceFileMap"`. When I press F5 to attach, I get a picker drop down showing the running processes within `WSL`. I can scroll or search for the process I want to attach to and start debugging.
+This configuration similar to the launch process above. I have chosen to start the same application above from the Bash command line and now I want to attach to it for debugging. I have changed the `"processID"` to use the remote process picker by specifying the command `"${command:pickRemoteProcess}"` and set up the same `"sourceFileMap"`. When I press <kbd>F5</kbd> to attach, I get a picker drop down showing the running processes within `WSL`. I can scroll or search for the process I want to attach to and start debugging.
 
-```
-        {
-            "name": "C++ Attach",
-            "type": "cppdbg",
-            "request": "attach",
-            "program": "/mnt/z/Bash/kitchensink/a.out",
-            "processId": "${command:pickRemoteProcess}",
-            "windows": {
-                "MIMode": "gdb",
-                "setupCommands": [
-                    {
-                        "description": "Enable pretty-printing for gdb",
-                        "text": "-enable-pretty-printing",
-                        "ignoreFailures": true
-                    }
-                ]
-            },
-            "pipeTransport": {
-                "pipeCwd": "",
-                "pipeProgram": "c:\\windows\\sysnative\\bash.exe",
-                "pipeArgs": ["-c"],
-                "debuggerPath": "/usr/bin/gdb"
-            },
-            "sourceFileMap": {
-                "/mnt/z": "z:\\"
+```json
+{
+    "name": "C++ Attach",
+    "type": "cppdbg",
+    "request": "attach",
+    "program": "/mnt/z/Bash/kitchensink/a.out",
+    "processId": "${command:pickRemoteProcess}",
+    "windows": {
+        "MIMode": "gdb",
+        "setupCommands": [
+            {
+                "description": "Enable pretty-printing for gdb",
+                "text": "-enable-pretty-printing",
+                "ignoreFailures": true
             }
-        }
+        ]
+    },
+    "pipeTransport": {
+        "pipeCwd": "",
+        "pipeProgram": "c:\\windows\\sysnative\\bash.exe",
+        "pipeArgs": ["-c"],
+        "debuggerPath": "/usr/bin/gdb"
+    },
+    "sourceFileMap": {
+        "/mnt/z": "z:\\"
+    }
+}
 ```

Documentation/Debugger/natvis/Natvis.md

@@ -0,0 +1,15 @@
+# Natvis - Custom views for native objects
+
+The Natvis framework allows developers to write custom schemas to help visualize native objects.
+
+For gdb/lldb debugging (`"type": "cppdbg"`), a subset of the Natvis framework has been ported to the C/C++ extension and the code resides in the [MIEngine](https://github.com/Microsoft/MIEngine) shared component. If additional features that are not implemented are requested, please file an [issue](https://github.com/Microsoft/MIEngine/issues) on the MIEngine GitHub page with details of what is missing.
+
+For Visual C++ debugging (`"type": "cppvsdbg"`), the debugger contains the full implementation of the Natvis framework as Visual Studio.
+
+## Documentation
+
+The official documentation can be found [here](https://docs.microsoft.com/en-us/visualstudio/debugger/create-custom-views-of-native-objects).
+
+## Schema
+
+The Natvis schema can be found [here](natvis.xsd).

Documentation/FAQs.md

@@ -0,0 +1,82 @@
+# FAQs
+
+## Table of Contents
+* Setup: [Debugging Setup](#debugging-setup)
+* Debugger: [Why is debugging not working?](#why-is-debugging-not-working)
+* Build: [How to enable debug symbols](#how-to-enable-debug-symbols)
+* Logging: [How to enable logging](#how-to-enable-logging)
+
+## Debugging Setup
+The debugger needs to be configured to know which executable and debugger to use:
+
+Click menu item: `Debug` -> `Add Configuration...`
+
+The file **launch.json** will now be open for editing with a new configuration. The default settings will *probably* work except that you need to specify the **program** setting.
+
+See the [**Documentation/Debugger**](https://github.com/Microsoft/vscode-cpptools/tree/master/Documentation/Debugger) folder in this repository for more in-depth documentation on how to configure the debugger.
+
+## Why is debugging not working?
+
+### My breakpoints aren't being hit
+
+When you start debugging, if it is showing that your breakpoints aren't bound (solid red circle) or they are not being hit, you may need to enable [debug symbols](#how-to-enable-debug-symbols) during compilation. 
+
+### Debugging starts but all the lines in my stack trace are grey
+
+If your debugger is showing a grey stacktrace or won't stop at a breakpoint,or the symbols in the call stack are grey then your executable was compiled without [debug symbols](#how-to-enable-debug-symbols).
+
+## How to enable debug symbols?
+
+Enabling debug symbols are dependent on the type of compiler you are using. Below are some of the compilers and the compiler options necessary to enable debug symbols.
+
+When in doubt, please check your compiler's documentation for the options necessary to include debug symbols in the output. This may be some variant of `-g` or `--debug`.
+
+* #### Clang (C++)
+  * If you invoke the compiler manually then add the `--debug` option.
+  * If you're using a script then make sure the `CXXFLAGS` environment variable is set; e.g. `export CXXFLAGS="${CXXFLAGS} --debug"`
+  * If you're using CMake then set make sure the `CMAKE_CXX_FLAGS` is set; e.g. `export CMAKE_CXX_FLAGS=${CXXFLAGS}`
+
+* #### Clang (C)
+  See Clang C++ but use `CFLAGS` instead of `CXXFLAGS`.
+
+* #### gcc or g++
+  If you invoke the compiler manually, add the `-g` option.
+
+* #### cl.exe
+  Symbols are located in the `*.pdb` file.
+
+## How to enable logging
+
+Enabling logging will show communication information between VS Code and our extension and between our extension and the debugger.
+
+### Logging for `MI` debuggers
+
+The logging block with its defaults is as follows:
+
+```
+"logging": {
+    "trace": false,
+    "traceResponse": false,
+    "engineLogging": false
+}
+```
+
+#### VS Code and the CppTools extension
+
+The logging here is called `trace` logging and can be enabled by setting `trace` and `traceResponse` to `true` in the logging block inside `launch.json`. This will help diagnose issues related to VS Code's communication to our extension and our responses.
+
+#### CppTools extension and the debugger
+
+The logging between CppTools and the debugger is called `engineLogging`. When using an `MI` debugger such as `gdb` or `lldb`, this will show the request, response and events using the `mi` interpreter. This logging will help us determine whether the debugger is receiving the right commands and generating the correct responses.
+
+### Logging for `Visual C++` debugger
+
+The logging block with its defaults is as follows:
+
+```
+"logging": { 
+    "engineLogging": false
+}
+```
+
+The `Visual C++` debugger logging will show only the communication to and from VS Code as all communication to the debugger is done internally to the process and is not visible through logging.

Documentation/Getting started with IntelliSense configuration.md

@@ -0,0 +1,56 @@
+
+# Configuring includePath for better IntelliSense results
+
+This page describes how to configure include paths for folders containing C or C++ files to get the full IntelliSense experience. If you're seeing the following message when opening a folder in VS Code, it means the C++ IntelliSense engine needs additional information about the paths in which your include files are located.
+
+![Configure includePath for better IntelliSense](https://github.com/Microsoft/vscode-cpptools/raw/master/Images/configure%20includepath.jpg)
+
+## Where are the include paths defined?
+
+The include paths are defined in the `"includePath"` setting in a file called **c_cpp_properties.json** located in the **.vscode** directory in the opened folder.
+
+You can create or open this file by either using the `"C/Cpp: Edit Configurations"` command in the command palette or by selecting `"Edit "includePath" setting"` in the lightbulb menu (see the screenshot below). The quickest way to locate a lightbulb is to scroll to the top of the source file and click on any green squiggle that shows up under a #include statement.
+
+![lightbulb menu "Edit "includePath" setting"](https://github.com/Microsoft/vscode-cpptools/raw/master/Images/Lightbulb.png)
+
+ When a folder is opened, the extension attempts to locate your system headers based on your operating system, but it does not know about any other libraries that your project depends on. You can hover over the green squiggles or open the Problems window to understand which headers the IntelliSense engine is unable to open - sometimes it's the dependent headers that can't be located.
+
+![include error message](https://github.com/Microsoft/vscode-cpptools/raw/master/Images/Include%20errors.png)
+
+## How to specify the include paths?
+
+You can specify the remaining paths using one of the techniques described below.
+
+#### 1. Use `compile_commands.json` file to supply includePaths and defines information
+
+The extension can get the information for `"includePath"` and `"defines"` from a **compile_commands.json** file, which can be auto-generated by many build systems such as CMake and Ninja. Look for the section where your current configuration is defined (by default there's one configuration per OS, such as "Win32 or "Mac"), and set the `"compileCommands"` property in **c_cpp_properties.json** to the full path to your **compile_commands.json** file and the extension will use that instead of the `"includes"` and `"defines"` properties for IntelliSense.
+
+![use compileCommands setting](https://github.com/Microsoft/vscode-cpptools/raw/master/Images/compile_commands.png)
+
+#### 2. Use the lightbulb suggestions to auto-resolve includePath
+
+The first thing to try is to leverage the lightbulb path suggestions to auto-resolve the include paths. When you open a folder, the extension will **recursively** search for potential include paths that match the header files your code is using based on the paths set by the `"browse.path"` setting in **c_cpp_properties.json**. Click on the green squiggles under #include statements and you'll see a lightbulb offering suggestions of paths that will allow IntelliSense to resolve the included file.
+
+![lightbulb suggestions](https://github.com/Microsoft/vscode-cpptools/raw/master/Images/lightbulb%20suggestion.png)
+
+If you don't see path suggestions in the lightbulb, try adding the root folder where the headers are likely located in to the `"browse.path"` setting in **c_cpp_properties.json**. This allows the extension to **recursively** search in these folders and offer more suggestions in the lightbulb as the search process goes on.
+
+#### 3. Manually add include paths
+If none of the above fully resolves the paths, you could manually specify the paths to the headers that your project depends on in the **c_cpp_properties.json** file.  Look for the section where your current configuration is defined (by default there's one configuration per OS, such as "Win32 or "Mac"), and add your paths in the `"includePath"` setting and defines in the `"defines"` setting. For example, the following screenshot shows a snippet of the file specifying path for the Mac configuration.
+
+![c_cpp_properties file snippet](https://github.com/Microsoft/vscode-cpptools/raw/master/Images/c_cpp_properties%20file.PNG)
+
+## Verify the include paths are correctly resolved
+
+There are two ways to verify that the include paths are correctly resolved:
+
+1. The green squiggles in the source file are no longer showing
+2. Error messages are cleared in the Problems window
+
+This indicates that the IntelliSense engine has got the include paths resolved so you can start enjoying the full IntelliSense for your C or C++ code for the current translation unit. Note that you may still see errors on other files if they belong to a different translation unit that requires additional include paths to be configured.
+
+## See Also
+
+[IntelliSense engines](https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/LanguageServer/IntelliSense%20engine.md)
+
+[**c_cpp_properties.json** reference guide](https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/LanguageServer/c_cpp_properties.json.md)

Documentation/Getting started.md

@@ -1,21 +0,0 @@
-# Getting started
-
-## Configuring IntelliSense
-
-**Quick summary**: Open your settings file and add `"C_Cpp.intelliSenseEngine": "Default"` to preview the new and improved IntelliSense. Then add the necessary include paths and preprocessor defines to your c_cpp_properties.json file so that IntelliSense can find your symbols.
-
-#### The IntelliSense engines
-
-When the extension was first released, we shipped an IntelliSense engine that provided quick, but "fuzzy" results for common operations like auto-complete, parameter help, quick info tooltips, and goto definition. This "tag parser" built up a database of symbols by parsing the most important "tags" from your source files, ignoring preprocessor blocks, local variables, and most errors. More recently, we have begun the process of porting the MSVC IntelliSense engine from Visual Studio to VS Code to provide more accurate results. 
-
-You can choose the engine that works best for your projects by editing your [user or workspace settings](https://code.visualstudio.com/docs/getstarted/settings). The setting you should modify is `"C_Cpp.intelliSenseEngine"`. There are two values for this setting:
-
-* `"Default"` - use Visual Studio's IntelliSense engine (in preview, the default for VS Code Insiders)
-* `"Tag Parser"` - use the "fuzzy" IntelliSense engine (the default for users on the stable VS Code build)
-
-#### Include paths
-
-In order to get accurate IntelliSense results with either engine, the extension needs some information about your project.  When you open a folder, the extension will attempt to locate your system headers based on your operating system, but it does not know about any auxiliary libraries that your project depends on.  You can specify the remaining paths by using the `"C/Cpp: Edit Configurations"` command in the command palette.
-
-This command will create or open a file called **c_cpp_properties.json** in your workspace.  In this file, you can specify the paths to the headers that your project depends on.  There are two settings in this file that you should pay particular attention to: `"includePath"` and `"browse.path"`.  `"includePath"` is the setting used by the `"Default"` IntelliSense engine and `"browse.path"` is the setting used by the tag parser engine.  [More information about these settings is documented here](https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/LanguageServer/FAQ.md#what-is-the-difference-between-includepath-and-browsepath-in-c_cpp_propertiesjson).
-

Documentation/LanguageServer/Archive/Enabling logging.md

@@ -0,0 +1,16 @@
+#### Old information (it still works, but is no longer recommended):
+
+Logging is controlled by environment variables and is disabled by default. To enable logging, launch VS Code from an environment that contains the following variables:
+
+```
+VSCODE_CPP_LOGDIR=c:\path\to\logfolder
+VSCODE_CPP_LOGFILE_LEVEL=5
+```
+
+When you open your folder in VS Code, we will create a **vscode.cpp.log.\<pid\>.txt** file for each extension process launched (\<pid\> = process id).
+
+The log file level is a number that determines how much detail we'll log. Level 5 is generally detailed enough to give us information about what is going on in your session. We don't recommend you set this higher than 7 since the log quickly becomes cluttered with information that doesn't really help us diagnose your issues and actually makes it harder for us to spot problems. It may also slow down the extension considerably and make it harder for you to reproduce your problem.
+
+**Note:** You will likely need to reload the window or close VS Code to flush the contents of the log file since we do not flush the log after every call. If your log file seems to be empty, try reloading the window after you have followed the steps to reproduce your issue.
+
+**Don't forget to remove the environment variables when you are finished providing us with the logs.** You wouldn't want the extension to needlessly spend CPU time and disk space writing data you don't need into log files.

Documentation/LanguageServer/Archive/MinGW.md

@@ -0,0 +1,76 @@
+## Extension version 0.16.1 and earlier:
+
+For developers using MinGW on Windows, we recommend you start with the following **c_cpp_properties.json** template.  Select "C/Cpp: Edit Configurations" from the command palette to create this file if you haven't already.
+
+In earlier versions of the extension, the `includePath` and a some system defines need to be set in order for IntelliSense to work properly. Note that you may have to change the MinGW version number to match what you have installed. Eg. `C:/MinGW/lib/gcc/mingw32/5.3.0/` instead of `C:/MinGW/lib/gcc/mingw32/6.3.0/`.
+
+```json
+{
+    "configurations": [
+        {
+            "name": "MinGW",
+            "intelliSenseMode": "clang-x64",
+            "includePath": [
+                "${workspaceRoot}",
+                "C:/MinGW/lib/gcc/mingw32/6.3.0/include/c++",
+                "C:/MinGW/lib/gcc/mingw32/6.3.0/include/c++/mingw32",
+                "C:/MinGW/lib/gcc/mingw32/6.3.0/include/c++/backward",
+                "C:/MinGW/lib/gcc/mingw32/6.3.0/include",
+                "C:/MinGW/include",
+                "C:/MinGW/lib/gcc/mingw32/6.3.0/include-fixed"
+            ],
+            "defines": [
+                "_DEBUG",
+                "__GNUC__=6",
+                "__cdecl=__attribute__((__cdecl__))"
+            ],
+            "browse": {
+                "path": [
+                    "C:/MinGW/lib/gcc/mingw32/6.3.0/include",
+                    "C:/MinGW/lib/gcc/mingw32/6.3.0/include-fixed",
+                    "C:/MinGW/include/*",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        }
+    ]
+}
+```
+
+The `includePath` above includes the system header paths that gcc uses in version 6.3.0 for C++ projects and matches the output of `"gcc -v -E -x c++ nul"`. The `intelliSenseMode` should be set to **"clang-x64"** to get MinGW projects to work properly with IntelliSense. The `__GNUC__=#` define should match the major version of the toolchain in your installation (6 in this example).
+
+For C projects, simply remove the C++ lines:
+
+```json
+{
+    "configurations": [
+        {
+            "name": "MinGW",
+            "intelliSenseMode": "clang-x64",
+            "includePath": [
+                "${workspaceRoot}",
+                "C:/MinGW/lib/gcc/mingw32/6.3.0/include",
+                "C:/MinGW/include",
+                "C:/MinGW/lib/gcc/mingw32/6.3.0/include-fixed"
+            ],
+            "defines": [
+                "_DEBUG",
+                "__GNUC__=6",
+                "__cdecl=__attribute__((__cdecl__))"
+            ],
+            "browse": {
+                "path": [
+                    "C:/MinGW/lib/gcc/mingw32/6.3.0/include",
+                    "C:/MinGW/lib/gcc/mingw32/6.3.0/include-fixed",
+                    "C:/MinGW/include/*",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        }
+    ]
+}
+```

Documentation/LanguageServer/Archive/Windows Subsystem for Linux.md

@@ -0,0 +1,139 @@
+# Windows Subsystem for Linux
+
+To use the Windows Subsystem for Linux with this extension you need to add a configuration to your **c_cpp_properties.json** file which adds the necessary header paths from within the WSL filesystem to the `includePath`.
+
+Select "C/Cpp: Edit Configurations" from the command palette to create the **c_cpp_properties.json** file if you haven't already.
+
+## Release
+
+For developers using Ubuntu with the current version of WSL released with the Fall Creators Update, you can add the following configuration template to your **c_cpp_properties.json** file.
+
+```json
+{
+    "name": "WSL",
+    "intelliSenseMode": "clang-x64",
+    "includePath": [
+        "${workspaceRoot}",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include/c++/5",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include/x86_64-linux-gnu/c++/5",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include/c++/5/backward",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/local/include",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include/x86_64-linux-gnu",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include"
+    ],
+    "defines": [
+        "__linux__",
+        "__x86_64__"
+    ],
+    "browse": {
+        "path": [
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include/c++/5",
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include/x86_64-linux-gnu/c++/5",
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include",
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/local/include",
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include/x86_64-linux-gnu",
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include/*"
+        ],
+        "limitSymbolsToIncludedHeaders": true,
+        "databaseFilename": ""
+    }
+}
+```
+
+The `includePath` above includes the system header paths that gcc uses for C++ projects and matches the output of `gcc -v -E -x c++ - < /dev/null`. The intelliSenseMode should be set to **"clang-x64"** to get WSL projects to work properly with IntelliSense.
+
+Note that `${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/` is the path to the root of the Ubuntu filesystem. This will be different if you are using a different distro. You can discover the paths to your distro's filesystem by using this handy PowerShell command:
+
+```Powershell
+PS R:\> ($(get-appxpackage).PackageFamilyName | findstr /i 'SUSE Ubuntu') -replace '^', "$`{localappdata`}/Packages/"
+
+${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc
+${localappdata}/Packages/46932SUSE.openSUSELeap42.2_022rs5jcyhyac
+${localappdata}/Packages/46932SUSE.SUSELinuxEnterpriseServer12SP2_022rs5jcyhyac
+```
+
+For C projects, simply remove the C++ lines:
+
+```json
+{
+    "name": "WSL",
+    "intelliSenseMode": "clang-x64",
+    "includePath": [
+        "${workspaceRoot}",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/local/include",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include/x86_64-linux-gnu",
+        "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include"
+    ],
+    "defines": [
+        "__linux__",
+        "__x86_64__"
+    ],
+    "browse": {
+        "path": [
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include",
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/local/include",
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include/x86_64-linux-gnu",
+            "${localappdata}/Packages/CanonicalGroupLimited.UbuntuonWindows_79rhkp1fndgsc/LocalState/rootfs/usr/include/*"
+        ],
+        "limitSymbolsToIncludedHeaders": true,
+        "databaseFilename": ""
+    }
+}
+```
+
+### Beta
+
+For developers using Bash on Ubuntu on Windows with the beta version of WSL from before the Fall Creators Update, you can add the following configuration template to your **c_cpp_properties.json** file.
+
+```json
+{
+    "name": "WSL (Beta)",
+    "intelliSenseMode": "clang-x64",
+    "includePath": [
+        "${workspaceRoot}",
+        "${localappdata}/lxss/rootfs/usr/include/c++/5",
+        "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu/c++/5",
+        "${localappdata}/lxss/rootfs/usr/include/c++/5/backward",
+        "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include",
+        "${localappdata}/lxss/rootfs/usr/local/include",
+        "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
+        "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu",
+        "${localappdata}/lxss/rootfs/usr/include"
+    ],
+    "defines": [
+        "__linux__",
+        "__x86_64__"
+    ],
+    "browse": {
+        "path": [
+            "${localappdata}/lxss/rootfs/usr/include/c++/5",
+            "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu/c++/5",
+            "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include",
+            "${localappdata}/lxss/rootfs/usr/local/include",
+            "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
+            "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu",
+            "${localappdata}/lxss/rootfs/usr/include/*"
+        ],
+        "limitSymbolsToIncludedHeaders": true,
+        "databaseFilename": ""
+    }
+}
+```
+
+The `includePath` above includes the system header paths that gcc uses for C++ projects and matches the output of `gcc -v -E -x c++ - < /dev/null`. The intelliSenseMode should be set to **"clang-x64"** to get WSL projects to work properly with IntelliSense.
+
+Note that `${localappdata}/lxss/rootfs/` is the path to the root of the filesystem for Bash on Ubuntu on Windows.
+
+For C projects, simply remove the C++ lines as in the previous example.
+
+---
+
+With these configurations, you should be all set up to use the new IntelliSense engine for linting, memberlist autocomplete, and quick info (tooltips).  Add `"C_Cpp.intelliSenseEngine": "Default"` to your **settings.json** file to try out the new IntelliSense engine.
+
+And remember to [heed the warnings of the Windows team about not creating or editing Linux files from a Windows app](https://blogs.msdn.microsoft.com/commandline/2016/11/17/do-not-change-linux-files-using-windows-apps-and-tools/)!

Documentation/LanguageServer/Customizing Default Settings.md

@@ -0,0 +1,99 @@
+# Customizing Default Settings
+
+In version 0.17.0 we introduced new settings that allow you to override the extension's default values for properties set in **c_cpp_properties.json**.
+
+## New VS Code settings
+
+The following `C_Cpp.default.*` settings map to each of the properties in a configuration block of **c_cpp_properties.json**. Namely:
+
+```
+C_Cpp.default.includePath                          : string[]
+C_Cpp.default.defines                              : string[]
+C_Cpp.default.compileCommands                      : string
+C_Cpp.default.macFrameworkPath                     : string[]
+C_Cpp.default.forcedIncludes                       : string[]
+C_Cpp.default.intelliSenseMode                     : string
+C_Cpp.default.compilerPath                         : string
+C_Cpp.default.cStandard                            : c89 | c99 | c11
+C_Cpp.default.cppStandard                          : c++98 | c++03 | c++11 | c++14 | c++17
+C_Cpp.default.browse.path                          : string[]
+C_Cpp.default.browse.databaseFilename              : string
+C_Cpp.default.browse.limitSymbolsToIncludedHeaders : boolean
+```
+
+These settings have all of the benefits of VS Code settings, meaning that they can have default, "User", "Workspace", and "Folder" values.  So you can set a global value for `C_Cpp.default.cppStandard` in your "User" settings and have it apply to all of the folders you open. If any one folder needs a different value, you can override the value by adding a "Folder" or "Workspace" value.
+
+This property of VS Code settings allows you to configure each of your workspaces independently - making the **c_cpp_properties.json** file optional.
+
+## Updated **c_cpp_properties.json** syntax
+
+A special variable has been added to the accepted syntax of **c_cpp_properties.json** that will instruct the extension to insert  the value from the VS Code settings mentioned above. If you set the value of any setting in **c_cpp_properties.json** to "${default}" it will instruct the extension to read the VS Code default setting for that property and insert it. For example:
+
+```
+"configurations": [
+    {
+        "name": "Win32",
+        "includePath": [
+            "additional/paths",
+            "${default}"
+        ],
+        "defines": [
+            "${default}",
+        ],
+        "macFrameworkPath": [
+            "${default}",
+            "additional/paths"
+        ],
+        "forceInclude": [
+            "${default}",
+            "additional/paths"
+        ],
+        "compileCommands": "${default}",
+        "browse": {
+            "limitSymbolsToIncludedHeaders": true,
+            "databaseFilename": "${default}",
+            "path": [
+                "${default}",
+                "additional/paths"
+            ]
+        },
+        "intelliSenseMode": "${default}",
+        "cStandard": "${default}",
+        "cppStandard": "${default}",
+        "compilerPath": "${default}"
+    }
+],
+```
+
+Take note that for the properties that accept string[], the syntax proposed above allows you to augment the VS Code setting with additional values, thus allowing you to have common paths listed in the VS Code settings and configuration-specific settings in **c_cpp_properties.json**.
+
+If a property is missing from **c_cpp_properties.json**, the extension will use the value in the VS Code setting. If a developer assigns values to all of the settings that apply for a given folder, then **c_cpp_properties.json** could be removed from the .vscode folder as it will no longer be needed.
+
+### System includes
+
+A new setting will be added that allows you specify the system include path separate from the folder's include path. If this setting has a value, then the system include path the extension gets from the compiler specified in the `compilerPath` setting will not be added to the path array that the extension uses for IntelliSense. We may want to provide a VS Code command to populate this value from the compiler's default for users who are interested in using it in case they want to make some modifications to the defaults.
+
+```
+C_Cpp.default.systemIncludePath                    : string[]
+```
+
+### System Include Path/Defines Resolution Strategies
+
+The extension determines the system includePath and defines to send to the IntelliSense engine in the following manner:
+
+1. If `compileCommands` has a valid value and the file open in the editor is in the database, use the compile command in the database entry to determine the include path and defines.
+    * The system include path and defines are determined using the following logic (in order):
+        1. If `systemIncludePath` has a value, use it (continue to the next step to search for system defines).
+        2. If `compilerPath` is valid, query it.
+        3. Interpret the first argument in the command as the compiler and attempt to query it.
+        4. If `compilerPath` is `""`, use an empty array for system include path and defines.
+        5. If `compilerPath` is undefined, look for a compiler on the system and query it.
+	
+2. If `compileCommands` is invalid or the current file is not listed in the database, use the `includePath` and `defines` properties in the configuration for IntelliSense.
+    * The system include path and defines are determined using the following logic (in order):
+        1. If `systemIncludePath` has a value, use it (continue to the next step to search for system defines).
+        2. If `compilerPath` is valid, query it.
+        3. If `compilerPath` is `""`, use an empty array for system include path and defines (they are assumed to be in the `includePath` and `defines` for the current config already).
+        4. If `compilerPath` is undefined, look for a compiler on the system and query it.
+
+System includes should no longer be added to the `"includePath"` or `"browse.path"` variables. If the extension detects any system include paths in the `"includePath"` property it will silently remove them so that it can ensure system include paths are added last and in the correct order (this is especially important for GCC/Clang). In a future update we may add a notification message to the extension to remind developers to remove system include paths from their `"includePath"` and `'browse.path"` as they will be ignored.

Documentation/LanguageServer/Enabling logging.md

@@ -2,15 +2,11 @@
 
 If you are experiencing a problem that we are unable to diagnose based on information in your issue report, we might ask you to enable logging and send us your logs.
 
-Logging is controlled by environment variables and is disabled by default. To enable logging, launch VS Code from an environment that contains the following variables:
+As of version 0.14.0 of the extension, logging information is now delivered directly to the Output window in VSCode. To turn on full logging for an issue report, add `"C_Cpp.loggingLevel": "Information"` or `"C_Cpp.loggingLevel": "Debug"` to your **settings.json**.
 
-```
-VSCODE_CPP_LOGDIR=c:\path\to\logfolder
-VSCODE_CPP_LOGFILE_LEVEL=5
-```
+![image](https://user-images.githubusercontent.com/12818240/44601186-8a2af380-a790-11e8-9094-7064d1ba3cfb.png)
 
-When you open your folder in VS Code, we will create a vscode.cpp.log.\<pid\>.txt file for each extension process launched (\<pid\> = process id).
+VS Code organizes the logging from different extensions to improve readability so you must select the "C/C++" option in the log filter selector to see logging from the C/C++ extension:
 
-The log file level is a number that determines how much detail we'll log. Level 5 is generally detailed enough to give us information about what is going on in your session. We don't recommend you set this higher than 7 since the log quickly becomes cluttered with information that doesn't really help us diagnose your issues and actually makes it harder for us to spot problems. It may also slow down the extension considerably and make it harder for you to reproduce your problem.
+![image](https://user-images.githubusercontent.com/12818240/39769357-d6673bea-52a0-11e8-86c6-3be91618e8fc.png)
 
-**Don't forget to remove the environment variables when you are finished providing us with the logs.** You wouldn't want the extension to needlessly spend CPU time and disk space writing data you don't need into log files.

Documentation/LanguageServer/FAQ.md

@@ -1,25 +1,24 @@
 # Frequently asked questions
 
-[How do I get IntelliSense to work correctly](#how-do-i-get-intellisense-to-work-correctly)?
-
-[How do I get the new IntelliSense to work with MinGW on Windows](#how-do-i-get-the-new-intellisense-to-work-with-mingw-on-windows)?
-
-[What is the difference between "includePath" and "browse.path" in c\_cpp\_properties.json](#what-is-the-difference-between-includepath-and-browsepath-in-c_cpp_propertiesjson)?
-
-[How do I re-create the IntelliSense database](#how-do-i-re-create-the-intellisense-database)?
+* [How do I get IntelliSense to work correctly?](#how-do-i-get-intellisense-to-work-correctly)
+* [Why do I see red squiggles under Standard Library types?](#why-do-i-see-red-squiggles-under-standard-library-types)
+* [How do I get the new IntelliSense to work with MinGW on Windows?](#how-do-i-get-the-new-intellisense-to-work-with-mingw-on-windows)
+* [How do I get the new IntelliSense to work with the Windows Subsystem for Linux?](#how-do-i-get-the-new-intellisense-to-work-with-the-windows-subsystem-for-linux)
+* [What is the difference between `"includePath"` and `"browse.path"` in **c_cpp_properties.json**?](#what-is-the-difference-between-includepath-and-browsepath-in-c_cpp_propertiesjson)
+* [How do I re-create the IntelliSense database?](#how-do-i-re-create-the-intellisense-database)
 
 ## How do I get IntelliSense to work correctly?
 
 There are two IntelliSense engines present in the extension: the "fuzzy" engine (or Tag Parser), and the new "Default" engine. If you are using version 0.11.0 or higher of the cpptools extension, then you can preview our new IntelliSense engine which has more accurate auto-complete suggestions and tooltips. To use the new engine, you need to ensure that `"C_Cpp.intelliSenseEngine"` is set to `"Default"` in your settings. Since the engine is still in preview it is not on by default for everyone yet.
 
-After selecting the IntelliSense engine that you prefer, take a look at the Problems window in VS Code to see if you need to do any further configuration for your folder. For example, the Default engine will not provide squiggles and auto-complete suggestions for a translation unit (read: a source file and its dependencies) if the include path is not configured properly. You can select any of the problems in the window to navigate to the line when the problem was detected and a lightbulb will appear in the editor with some options (code actions) to help you resolve the problem.
+After selecting the IntelliSense engine that you prefer, take a look at the Problems window in VS Code to see if you need to do any further configuration for your folder. For example, the Default engine will not provide squiggles and auto-complete suggestions for a translation unit (read: a source file and its dependencies) if the include path is not configured properly. You can select any of the problems in the window to navigate to the line when the problem was detected and a lightbulb will appear in the editor with some options (code actions) to help you resolve the problem:
 
-1. Update your includePath (and preprocessor defines)
+1. Update your `includePath` (and preprocessor defines)
 2. Force semantic IntelliSense
 
-#### Update your includePath (and preprocessor defines)
+#### Update your `includePath` (and preprocessor defines)
 
-Selecting this option will open a file called c_cpp_properties.json. If you haven't created this file already, it will be created for you in the .vscode folder of your workspace.
+Selecting this option will open a file called **c_cpp_properties.json**. If you haven't created this file already, it will be created for you in the **.vscode** folder of your workspace.
 
 Add the necessary paths to your include files to the `"includePath"` array. The `${workspaceRoot}` variable is available to use to get a relative path to the folder you have opened. Also add any required symbols that need to be defined to the `"defines"` array. Both "\<var\>" and "\<var\>=\<value\>" syntax is accepted. When you edit and save this file, the IntelliSense engine will reset and reparse source your source files and headers with the new settings.
 
@@ -27,25 +26,40 @@ Add the necessary paths to your include files to the `"includePath"` array. The
 
 If you want IntelliSense to operate on your files even when all #include directives do not resolve, then you can choose the `Force semantic IntelliSense` code action to always use the new IntelliSense engine. You can also set the `C_Cpp.intelliSenseEngineFallback` setting to `"Disabled"`.
 
+## Why do I see red squiggles under Standard Library types?
+
+The most common reason for this is missing include paths and defines. The easiest way to fix this on each platform is as follows:
+
+**Linux/Mac**
+* Set `"intelliSenseMode": "clang-x64"` and `"compilerPath"` in **c_cpp_properties.json** to the path to your compiler.
+
+**Windows**
+* If you are using a Microsoft compiler from Visual Studio, set `"intelliSenseMode": "msvc-x64"`, but don't add the `"compilerPath"` property to **c_cpp_properties.json**.
+* If you are using Clang for Windows, set `"intelliSenseMode": "msvc-x64"`, and `"compilerPath"` in **c_cpp_properties.json** to the path to your compiler.
+
 ## How do I get the new IntelliSense to work with MinGW on Windows?
 
-Since MinGW is a relative of GCC, Microsoft mode compilation (which is the default on Windows) doesn't work very well with it. To use GCC/CLang mode, set the `"intelliSenseMode"` property in your **c_cpp_properties.json** file to `"clang-x64"`. An example **c_cpp_properties.json** [is shared here for your convenience](https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/LanguageServer/MinGW.md).
+The page discussing configuration with MinGW is [here](https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/LanguageServer/MinGW.md).
 
-## What is the difference between "includePath" and "browse.path" in c\_cpp\_properties.json?
+## How do I get the new IntelliSense to work with the Windows Subsystem for Linux?
 
-Starting with version 0.11.0 of the cpptools extension, there are now two settings in the c\_cpp\_properties.json file. They are used by the different IntelliSense engines that we support and have slightly different meanings for the components that use them.
+The page discussing configuration with WSL is [here](https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/LanguageServer/Windows%20Subsystem%20for%20Linux.md).
 
-The active IntelliSense engine is controlled via the `"C_Cpp.intelliSenseEngine"` setting in your settings.json file. The valid values for this setting are:
-* `"Default"`
-* `"Tag Parser"`
+## What is the difference between `"includePath"` and `"browse.path"` in **c_cpp_properties.json**?
 
-**includePath**: This array of path strings is used by the new "Default" IntelliSense engine that was introduced in version 0.11.0 of the extension. This new engine provides semantic-aware IntelliSense features and will be the eventual replacement for the Tag Parser that has been powering the extension since it was first released. It currently provides tooltips and error squiggles in the editor. The remaining features (e.g. code completion, signature help, go to definition, ...) are implemented using the Tag Parser's database, so it is still important to ensure that the browse.path setting is properly set.
+Starting with version 0.11.0 of the cpptools extension, there are now two settings in the **c_cpp_properties.json** file. They are used by the different IntelliSense engines that we support and have slightly different meanings for the components that use them.
 
-The paths that you specify for this setting are the same paths that you would send to your compiler via the `-I` switch. When your source files are parsed, the IntelliSense engine will prepend these paths to the files specified by your `#include` directives while attempting to resolve them. These paths are _not searched recursively_.
+The active IntelliSense engine is controlled via the `"C_Cpp.intelliSenseEngine"` setting in your **settings.json** file. The valid values for this setting are `"Default"` and `"Tag Parser"`.
 
-**browse.path**: This array of path strings is used by the "Tag Parser" (a.k.a. "browse engine"). This engine will _recursively_ enumerate all files under the paths specified and track them as potential includes while tag parsing your project folder. To disable recursive enumeration of a path, you can append a `/*` to the path string.
+* #### `"includePath"`
+  This array of path strings is used by the new "Default" IntelliSense engine that was introduced in version 0.11.0 of the extension. This new engine provides semantic-aware IntelliSense features and will be the eventual replacement for the Tag Parser that has been powering the extension since it was first released. It currently provides tooltips and error squiggles in the editor. The remaining features (e.g. code completion, signature help, go to definition, ...) are implemented using the Tag Parser's database, so it is still important to ensure that the browse.path setting is properly set.
 
-When you open a workspace for the first time, the extension adds `${workspaceRoot}` to both arrays. If this is undesirable, you can open your c_cpp_properties.json file and remove it.
+  The paths that you specify for this setting are the same paths that you would send to your compiler via the `-I` switch. When your source files are parsed, the IntelliSense engine will prepend these paths to the files specified by your #include directives while attempting to resolve them. These paths are **not** searched recursively.
+
+* #### `"browse.path"`
+  This array of path strings is used by the "Tag Parser" (a.k.a. "browse engine"). This engine will _recursively_ enumerate all files under the paths specified and track them as potential includes while tag parsing your project folder. To disable recursive enumeration of a path, you can append a `/*` to the path string.
+
+When you open a workspace for the first time, the extension adds `${workspaceRoot}` to both arrays. If this is undesirable, you can open your **c_cpp_properties.json** file and remove it.
 
 ## How do I re-create the IntelliSense database?
 

Documentation/LanguageServer/IntelliSense engine.md

@@ -0,0 +1,44 @@
+# IntelliSense engines
+
+There are two IntelliSense engines used to power the C/C++ IntelliSense experience in VS Code.
+
+* `"Default"` - Visual Studio's IntelliSense engine, which is the default engine that provides semantic-aware IntelliSense features
+* `"Tag Parser"` - the "fuzzy" IntelliSense engine that provides quick but "fuzzy" results, is used to provide the fallback experience if the default engine is unable to fully resolve include paths
+
+Ultimately all the IntelliSense and code browsing features will be powered by the "Default" engine. The following features have been implemented so far:
+
+* Auto-complete suggestions for class/struct/namespace members
+* Parameter hints
+* Quick info (hover over tooltip)
+* Error squiggles
+* Reference highlighting
+
+The other IntelliSense features, such as global auto-complete, and code browsing features, such as Go to definition/declaration, are currently powered by the "Tag Parser" based engine.
+
+### `includePath` and `browse.path`
+The two IntelliSense engines use two different settings in the **c_cpp_properties.json** file for specifying include paths. This file is located in the **.vscode** directory in the opened folder. You can create or open this file by either using the "C/Cpp: Edit Configurations" command in the command palette or by selecting "Edit "includePath" setting" in the lightbulb menu. Look for the following settings in the section where your current configuration is defined (by default there's one configuration per OS, such as "Win32 or "Mac").
+
+* #### `"includePath"`
+  This array of path strings is used by the "Default" IntelliSense engine. The paths that you specify for this setting are the same paths that you would send to your compiler via the -I switch. When your source files are parsed, the IntelliSense engine will prepend these paths to the files specified by your #include directives while attempting to resolve them. These paths are searched **non-recursively**.
+
+* #### `"browse.path"`
+  This array of path strings is used by the "Tag Parser" (a.k.a. "browse engine"). This engine will **recursively** enumerate all files under the paths specified and track them as potential includes while tag parsing your project folder. To disable recursive enumeration of a path, you can append a `/*` to the path string.
+
+### How fallback works and how to control the behavior
+
+The extension first tries to fully parse any opened file using the "Default" IntelliSense engine. If it discovers that it cannot find a header file or a dependency, it will fall back to the tag parser and provide the fuzzy IntelliSense behavior. The fallback affects a full translation unit (TU), not just a single open file. The Problems panel provides details about unresolved headers and dependencies. Other opened TUs will continue to use the "Default" IntelliSense engine provided that all #include dependencies are resolved.
+
+We recognize that resolving all #includes may not be necessary for all projects and you may still want to experience the productivity benefits of using the "Default" semantic engine without customizing the default include path. For that, the “Force semantic IntelliSense” action can be chosen. When invoked, all unresolved #include squiggles will turn red and semantic member list and linting will be enabled in all files regardless of whether or not #include statements can be resolved.
+
+### IntelliSense engine setting
+
+We recommend using the "Default" engine for the best IntelliSense experience. However, it is possible to explicitly choose the IntelliSense engine by editing your [user or workspace settings](https://code.visualstudio.com/docs/getstarted/settings). The setting you should modify is `"C_Cpp.intelliSenseEngine"`. There are two values for this setting:
+
+* `"Default"` - use Visual Studio's IntelliSense engine
+* `"Tag Parser"` - use the "fuzzy" IntelliSense engine
+
+### See Also
+
+[Configuring includePath for better IntelliSense results](https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/Getting%20started%20with%20IntelliSense%20configuration.md)
+
+[**c_cpp_properties.json** reference guide](https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/LanguageServer/c_cpp_properties.json.md)

Documentation/LanguageServer/MinGW.md

@@ -1,74 +1,25 @@
-For developers using MinGW on Windows, we recommend you start with the following **c_cpp_properties.json** template.  Select "C/Cpp: Edit Configurations" from the command palette to create this file if you haven't already.
+# MinGW
 
-```
+To use MinGW on Windows, we recommend you add the following configuration to your **c_cpp_properties.json** file.  Select "C/Cpp: Edit Configurations" from the command palette to create this file if you haven't already.
+
+## Extension version 0.17.0 and higher:
+
+When you set the `compilerPath` property and change `intelliSenseMode` to `clang-x64` (or `gcc-x64` in version 0.18.0 and higher), you no longer need to copy the system include path or defines to `includePath`, `browse.path`, or `defines` to enable IntelliSense to work properly. For example:
+
+```json
 {
-    "configurations": [
-        {
-            "name": "Win32",
-            "intelliSenseMode": "clang-x64",
-            "includePath": [
-                "${workspaceRoot}",
-                "C:/MinGW/lib/gcc/mingw32/5.3.0/include/c++",
-                "C:/MinGW/lib/gcc/mingw32/5.3.0/include/c++/mingw32",
-                "C:/MinGW/lib/gcc/mingw32/5.3.0/include/c++/backward",
-                "C:/MinGW/lib/gcc/mingw32/5.3.0/include",
-                "C:/MinGW/include",
-                "C:/MinGW/lib/gcc/mingw32/5.3.0/include-fixed"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE",
-                "__GNUC__=5",
-                "__cdecl=__attribute__((__cdecl__))"
-            ],
-            "browse": {
-                "path": [
-                    "C:/MinGW/lib/gcc/mingw32/5.3.0/include",
-                    "C:/MinGW/lib/gcc/mingw32/5.3.0/include-fixed",
-                    "C:/MinGW/include/*"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        }
-    ]
+    "name": "MinGW",
+    "intelliSenseMode": "gcc-x64",
+    "compilerPath": "C:/mingw64/bin/gcc.exe",
+    "includePath": [
+        "${workspaceFolder}"
+    ],
+    "defines": [],
+    "cStandard": "c11",
+    "cppStandard": "c++17"
 }
 ```
 
-The `includePath` above includes the system header paths that gcc uses in version 5.3.0 for C++ projects and matches the output of `gcc -v -E -x c++ -`. The `intelliSenseMode` should be set to **"clang-x64"** to get MinGW projects to work properly with IntelliSense. The `__GNUC__=#` define should match the major version of the toolchain in your installation (5 in this example).
+## Extension version 0.16.1 and earlier:
 
-For C projects, simply remove the c++ lines:
-
-```
-{
-    "configurations": [
-        {
-            "name": "Win32",
-            "intelliSenseMode": "clang-x64",
-            "includePath": [
-                "${workspaceRoot}",
-                "C:/MinGW/lib/gcc/mingw32/5.3.0/include",
-                "C:/MinGW/include",
-                "C:/MinGW/lib/gcc/mingw32/5.3.0/include-fixed"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE",
-                "__GNUC__=5",
-                "__cdecl=__attribute__((__cdecl__))"
-            ],
-            "browse": {
-                "path": [
-                    "C:/MinGW/lib/gcc/mingw32/5.3.0/include",
-                    "C:/MinGW/lib/gcc/mingw32/5.3.0/include-fixed",
-                    "C:/MinGW/include/*"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        }
-    ]
-}
-```
-
-With these configurations, you should be all set up to use the new IntelliSense engine for linting, memberlist autocomplete, and quick info (tooltips).  Add `"C_Cpp.intelliSenseEngine": "Default"` to your **settings.json** file to try out the new IntelliSense engine.
+If you have an older version of the C/C++ extension installed, use [these instructions](Archive/MinGW.md) instead.

Documentation/LanguageServer/Windows Subsystem for Linux.md

@@ -1,75 +1,33 @@
-For developers using the Windows Subsystem for Linux, we recommend you start with the following **c_cpp_properties.json** template.  Select "C/Cpp: Edit Configurations" from the command palette to create this file if you haven't already.
+# Windows Subsystem for Linux
 
-```
-        {
-            "name": "WSL",
-            "intelliSenseMode": "clang-x64",
-            "includePath": [
-                "${workspaceRoot}",
-                "${localappdata}/lxss/rootfs/usr/include/c++/5",
-                "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu/c++/5",
-                "${localappdata}/lxss/rootfs/usr/include/c++/5/backward",
-                "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include",
-                "${localappdata}/lxss/rootfs/usr/local/include",
-                "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
-                "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu",
-                "${localappdata}/lxss/rootfs/usr/include"
-            ],
-            "defines": [
-                "__linux__",
-                "__x86_64__"
-            ],
-            "browse": {
-                "path": [
-                    "${localappdata}/lxss/rootfs/usr/include/c++/5",
-                    "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu/c++/5",
-                    "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include",
-                    "${localappdata}/lxss/rootfs/usr/local/include",
-                    "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
-                    "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu",
-                    "${localappdata}/lxss/rootfs/usr/include/*"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        }
+> **Note:** If you are on **build 17110 of Windows or higher**, you must use extension version 0.17.0 or higher for IntelliSense to work. The Windows team turned on case-sensitive folders for the WSL environment and the C/C++ extension doesn't support case-sensitive folders until version 0.17.0.
 
+To use the Windows Subsystem for Linux with this extension you need to add a configuration to your **c_cpp_properties.json** file which adds the necessary header paths from within the WSL filesystem to the `includePath`.
+
+Select "C/Cpp: Edit Configurations" from the command palette to create the **c_cpp_properties.json** file if you haven't already.
+
+## With extension version 0.17.0 and higher:
+
+In **c_cpp_properties.json** you can directly address your WSL compiler and include paths by using *nix-style paths and we will do the conversion to Windows paths for you.  If you have multiple distros installed, we disambiguate the `compilerPath` by picking the one marked as Default when you run `wslconfig.exe /l` in a CMD or PowerShell window. We continue to support Windows-style paths for these properties as outlined in the [archived instructions](Archive/Windows%20Subsystem%20for%20Linux.md) if you prefer to use those.
+
+```json
+{
+    "name": "WSL",
+    "intelliSenseMode": "gcc-x64",
+    "compilerPath": "/usr/bin/gcc",
+    "includePath": [
+        "${workspaceFolder}/**"
+    ],
+    "defines": [],
+    "cStandard": "c11",
+    "cppStandard": "c++17"
+}
 ```
 
-The `includePath` above includes the system header paths that gcc uses for C++ projects and matches the output of `gcc -v -E -x c++ - < /dev/null`. The intelliSenseMode should be set to **"clang-x64"** to get WSL projects to work properly with IntelliSense.
+## Earlier versions of the extension:
 
-For C projects, simply remove the c++ lines:
+If you are on a build of Windows prior to 17110 and you have an older version of the C/C++ extension installed, use [these instructions](Archive/Windows%20Subsystem%20for%20Linux.md) instead.
 
-```
-        {
-            "name": "WSL",
-            "intelliSenseMode": "clang-x64",
-            "includePath": [
-                "${workspaceRoot}",
-                "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include",
-                "${localappdata}/lxss/rootfs/usr/local/include",
-                "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
-                "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu",
-                "${localappdata}/lxss/rootfs/usr/include"
-            ],
-            "defines": [
-                "__linux__",
-                "__x86_64__"
-            ],
-            "browse": {
-                "path": [
-                    "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include",
-                    "${localappdata}/lxss/rootfs/usr/local/include",
-                    "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
-                    "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu",
-                    "${localappdata}/lxss/rootfs/usr/include/*"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        }
-```
+---
 
-With these configurations, you should be all set up to use the new IntelliSense engine for linting, memberlist autocomplete, and quick info (tooltips).  Add `"C_Cpp.intelliSenseEngine": "Default"` to your **settings.json** file to try out the new IntelliSense engine.
-
-And remember to [heed the warnings of the Windows team about not creating or editing Linux files from a Windows app](https://blogs.msdn.microsoft.com/commandline/2016/11/17/do-not-change-linux-files-using-windows-apps-and-tools/)! 
+Remember to [heed the warnings of the Windows team about not creating or editing Linux files from a Windows app](https://blogs.msdn.microsoft.com/commandline/2016/11/17/do-not-change-linux-files-using-windows-apps-and-tools/)!

Documentation/LanguageServer/c_cpp_properties.json.md

@@ -1,47 +1,96 @@
-# c_cpp_properties.json Reference Guide
+# `c_cpp_properties.json` Reference Guide
 
-### Example:
-```
+> See also: [Customizing Default Settings](Customizing%20Default%20Settings.md)
+
+### Example
+
+```json
 {
+    "env" : {
+        "myDefaultIncludePath": [
+            "${workspaceFolder}",
+            "${workspaceFolder}/include"
+        ],
+        "myCompilerPath": "/usr/local/bin/gcc-7"
+    },
     "configurations": [
         {
-            "name": "Win32",
-            "intelliSenseMode": "msvc-x64",
-            "includePath": [ "${workspaceRoot}" ],
+            "name": "Mac",
+            "intelliSenseMode": "clang-x64",
+            "includePath": [ "${myDefaultIncludePath}", "/another/path" ],
+            "macFrameworkPath": [ "/System/Library/Frameworks" ],
             "defines": [ "FOO", "BAR=100" ],
+            "forcedInclude": [ "${workspaceFolder}/include/config.h" ],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c11",
+            "cppStandard": "c++17",
+            "compileCommands": "/path/to/compile_commands.json",
             "browse": {
-                "path": [ "${workspaceRoot}" ],
+                "path": [ "${workspaceFolder}" ],
                 "limitSymbolsToIncludedHeaders": true,
                 "databaseFilename": ""
             }
         }
     ],
-    "version": 2
+    "version": 4
 }
 ```
 
 ## Top-level properties
 
-**configurations**: An array of configuration objects that provide the IntelliSense engine with information about your project and your preferences. By default, the extension creates 3 configurations for you, one each for Linux, Mac, and Windows, but it is not required to keep them all. You may also add additional configurations if necessary.
+* #### `env`
+  An array of user-defined variables that will be available for substitution in the configurations via the standard environment variable syntax: `${<var>}` or `${env:<var>}`. Strings and arrays of strings are accepted.
 
-**version**: We recommend you don't edit this field. It tracks the current version of the c_cpp_properties.json file so that the extension knows what properties and settings should be present and how to upgrade this file to the latest version.
+* #### `configurations`
+  An array of configuration objects that provide the IntelliSense engine with information about your project and your preferences. By default, the extension creates a configuration for you based on your operating system. You may also add additional configurations.
+
+* #### `version`
+  We recommend you don't edit this field. It tracks the current version of the **c_cpp_properties.json** file so that the extension knows what properties and settings should be present and how to upgrade this file to the latest version.
 
 ## Configuration properties
 
-**name**: A friendly name for the configuration. "Linux", "Mac", and "Win32" are special names that instruct the extension to load that configuration by default on the associated operating system unless additional configurations have been created. The status bar in VS Code will show you which configuration is active. You can also click on the label in the status bar to change the active configuration.
+* #### `name`
+  A friendly name for the configuration. "Linux", "Mac", and "Win32" are special names that instruct the extension to load that configuration by default on the associated operating system unless additional configurations have been created. The status bar in VS Code will show you which configuration is active. You can also click on the label in the status bar to change the active configuration.
 
-**intelliSenseMode**: If `"C_Cpp.intelliSenseEngine"` is set to "Default" in your settings file, this property determines which mode the IntelliSense engine will run in. `"msvc-x64"` maps to Visual Studio mode with 64-bit pointer sizes. `"clang-x64"` maps to GCC/CLang mode with 64-bit pointer sizes. Windows uses `"msvc-x64"` by default and Linux/Mac use `"clang-x64"` by default.
+* #### `intelliSenseMode`
+  If `"C_Cpp.intelliSenseEngine"` is set to "Default" in your settings file, this property determines which mode the IntelliSense engine will run in. `"msvc-x64"` maps to Visual Studio mode with 64-bit pointer sizes. `"clang-x64"` maps to CLang mode with 64-bit pointer sizes. `"gcc-x64"` maps to GCC mode with 64-bit pointer sizes. Windows uses `"msvc-x64"` by default, macOS uses `"clang-x64"` by default, and Linux uses `"gcc-x64"` by default.
 
-**includePath**: If `"C_Cpp.intelliSenseEngine"` is set to "Default" in your settings file, this list of paths will be used by IntelliSense to search for headers included by your source files. This is basically the same as the list of paths you pass to your compiler with the `-I` switch; the IntelliSense engine will not do a recursive search in these paths for includes.
+* #### `includePath`
+  If `"C_Cpp.intelliSenseEngine"` is set to "Default" in your settings file, this list of paths will be used by IntelliSense to search for headers included by your source files. This is basically the same as the list of paths you pass to your compiler with the `-I` switch. If a path ends with `/**` the IntelliSense engine will do a recursive search for includes starting from that directory. If on Windows with Visual Studio installed, or if a compiler is specified in the `compilerPath` setting, it is not necessary to list the system include paths in this list.
 
-**defines**: If `"C_Cpp.intelliSenseEngine"` is set to "Default" in your settings file, this list of preprocessor symbols will be used by IntelliSense during the compilation of your source files. This is basically the same as the list of symbols you pass to your compiler with the `-D` switch.
+* #### `macFrameworkPath`
+  If `"C_Cpp.intelliSenseEngine"` is set to "Default" in your settings file, this list of paths will be used by IntelliSense to search for framework headers included by your source files. This is basically the same as the list of paths you pass to your compiler with the `-F` switch; the IntelliSense engine will not do a recursive search in these paths for includes.
 
-**browse**: The set of properties used when `"C_Cpp.intelliSenseEngine"` is set to `"Tag Parser"` (also referred to as "fuzzy" IntelliSense, or the "browse" engine).
+* #### `defines`
+  If `"C_Cpp.intelliSenseEngine"` is set to "Default" in your settings file, this list of preprocessor symbols will be used by IntelliSense during the compilation of your source files. This is basically the same as the list of symbols you pass to your compiler with the `-D` switch. If on Windows with Visual Studio installed, or if a compiler is specified in the `compilerPath` setting, it is not necessary to list the system include paths in this list.
+
+* #### `forcedInclude` (optional)
+  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.
+
+* #### `cStandard`
+  The C standard revision to use for IntelliSense in your project.
+
+* #### `cppStandard`
+  The C++ standard revision to use for IntelliSense in your project.
+
+* #### `compileCommands` (optional)
+  If `"C_Cpp.intelliSenseEngine"` is set to "Default" in your settings file, the includes and defines discovered in this file will be used instead of the values set for `includePath` and `defines`. If the compile commands database does not contain an entry for the translation unit that corresponds to the file you opened in the editor, then a warning message will appear and the extension will use the `includePath` and `defines` settings instead.
+
+  >For more information about the file format, see the [Clang documentation](https://clang.llvm.org/docs/JSONCompilationDatabase.html). Some build systems, such as CMake, [simplify generating this file](https://cmake.org/cmake/help/v3.5/variable/CMAKE_EXPORT_COMPILE_COMMANDS.html).
+
+* #### `browse`
+  The set of properties used when `"C_Cpp.intelliSenseEngine"` is set to `"Tag Parser"` (also referred to as "fuzzy" IntelliSense, or the "browse" engine). These properties are also used by the Go To Definition/Declaration features, or when the "Default" IntelliSense engine is unable to resolve the #includes in your source files.
 
 ### Browse properties
 
-**path**: This list of paths will be used by the Tag Parser to search for headers included by your source files. The Tag Parser will automatically search all subfolders in these paths unless the path ends with a `/*` or `\*`. For example, `/usr/include` directs the Tag Parser to search the `include` folder and its subfolders for headers while `/usr/include/*` directs the Tag Parser not to look in any subfolders of `/usr/include`.
+* #### `path`
+  This list of paths will be used by the Tag Parser to search for headers included by your source files. If omitted, `includePath` will be used as the `path`. The Tag Parser will automatically search all subfolders in these paths unless the path ends with a `/*` or `\*`. For example, `/usr/include` directs the Tag Parser to search the `include` folder and its subfolders for headers while `/usr/include/*` directs the Tag Parser not to look in any subfolders of `/usr/include`.
 
-**limitSymbolsToIncludedHeaders**: When true, the Tag Parser will only parse code files that have been directly or indirectly included by a source file in the ${workspaceRoot}. When false, the Tag Parser will parse all code files found in the paths specified in the **path** list.
+* #### `limitSymbolsToIncludedHeaders`
+  When true, the Tag Parser will only parse code files that have been directly or indirectly included by a source file in `${workspaceFolder}`. When false, the Tag Parser will parse all code files found in the paths specified in the **path** list.
 
-**databaseFilename**: When set, this instructs the extension to save the Tag Parser's symbol database somewhere other than the workspace's default storage location. If a relative path is specified, it will be made relative to the workspace's default storage location, not the workspace folder itself. The ${workspaceRoot} variable can be used to specify a path relative to the workspace folder (e.g. $[workspaceRoot}/.vscode/browse.vc.db)
+* #### `databaseFilename`
+  When set, this instructs the extension to save the Tag Parser's symbol database somewhere other than the workspace's default storage location. If a relative path is specified, it will be made relative to the workspace's default storage location, not the workspace folder itself. The `${workspaceFolder}` variable can be used to specify a path relative to the workspace folder (e.g. `${workspaceFolder}/.vscode/browse.vc.db`)

Extension/.gitattributes

@@ -0,0 +1,3 @@
+*.sh text eol=lf
+OpenDebugAD7 text eol=lf
+link-binaries text eol=lf

Extension/.gitignore

@@ -0,0 +1,21 @@
+# ignore dependency packages
+node_modules
+
+# ignore compliled typescript
+out
+
+# ignore downloaded extension files and folders
+server
+debugAdapters
+LLVM
+bin/Microsoft.VSCode.CPP.*
+
+# ignore lock files
+install.lock
+
+# ignore generated packages
+*.vsix
+
+# ignore vscode test
+.vscode-test/
+browse*db*

Extension/.vscode/launch.json

@@ -0,0 +1,59 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+{
+	"version": "0.1.0",
+	"configurations": [
+		{
+			"name": "Launch Extension",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}"
+			],
+			"stopOnEntry": false,
+			"sourceMaps": true,
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
+			"preLaunchTask": "compile",
+		},
+		{
+			"name": "Launch Tests",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--extensionTestsPath=${workspaceFolder}/out/test/unitTests"
+			],
+			"stopOnEntry": false,
+			"sourceMaps": true,
+			"outFiles": [
+				"${workspaceFolder}/out/test/**/*.js"
+			],
+			"preLaunchTask": "compile"
+		},
+		{
+			"name": "Node Attach",
+			"type": "node",
+			"request": "attach",
+			"port": 5858
+		},
+		{
+			"name": "Launch Integration Tests",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"${workspaceFolder}/test/integrationTests/testAssets/SimpleCppProject",
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests"
+			],
+			"stopOnEntry": false,
+			"sourceMaps": true,
+			"outFiles": [
+				"${workspaceFolder}/out/test/**/*.js"
+			]
+		},
+	]
+}

Extension/.vscode/settings.json

@@ -0,0 +1,10 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+	"files.exclude": {
+		"out": false // set this to true to hide the "out" folder with the compiled JS files
+	},
+	"search.exclude": {
+		"out": true // set this to false to include "out" folder in search results
+	},
+	"typescript.tsdk": "./node_modules/typescript/lib" // we want to use the TS server from our node_modules folder to control its version
+}

Extension/.vscode/tasks.json

@@ -0,0 +1,60 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "TypeScript Compile",
+            "identifier": "compile",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "isBackground": true,
+            "type": "shell",
+            "presentation": {
+                "echo": true,
+                "reveal": "silent",
+                "focus": false,
+                "panel": "shared"
+            },
+            "command": "npm",
+            "args": [
+                "run",
+                "compile",
+                "--loglevel",
+                "silent"
+            ],
+            "problemMatcher": "$tsc-watch"
+        },
+        {
+            "label": "TypeScript Lint",
+            "identifier": "tslint",
+            "group": "build",
+            "isBackground": false,
+            "type": "shell",
+            "command": "npm",
+            "args": [
+                "run",
+                "tslint"
+            ],
+            "problemMatcher": {
+                "fileLocation": "absolute",
+                "source": "tslint",
+                "pattern": [
+                    {
+                        "regexp": "(ERROR:) ([a-zA-Z/:\\-\\.]*)\\[(\\d+), (\\d+)\\]: (.*)",
+                        "severity": 1,
+                        "file": 2,
+                        "line": 3,
+                        "column": 4,
+                        "message": 5
+                    }
+                ]
+            },
+            "dependsOn": [
+                "compile"
+            ]
+        }
+    ]
+}

Extension/.vscodeignore

@@ -0,0 +1,15 @@
+obj/**
+.vscode/**
+typings/**
+out/test/**
+test/**
+src/**
+**/*.map
+.gitignore
+tsconfig.json
+CMakeLists.txt
+debugAdapters/install.lock*
+out/src/Debugger/copyScript.js
+tools/**
+out/tools/**
+notices/**

Extension/CHANGELOG.md

@@ -0,0 +1,516 @@
+# C/C++ for Visual Studio Code Change Log
+
+## 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)
+* Improved the `Go to Definition` performance with large workspaces and files with lots of `#include`s. [#273](https://github.com/Microsoft/vscode-cpptools/issues/273)
+* Disable `Go to Definition` for invalid tokens, e.g. comments, strings, keywords, etc. [#559](https://github.com/Microsoft/vscode-cpptools/issues/559)
+* Add `C_Cpp.updateChannel` setting for easier access to Insider builds of the extension. [#1526](https://github.com/Microsoft/vscode-cpptools/issues/1526)
+* Add support for v2 of the configuration provider API. [#2237](https://github.com/Microsoft/vscode-cpptools/issues/2237)
+* Fix bug with parsing definitions in `compile_commands.json`. [#2305](https://github.com/Microsoft/vscode-cpptools/issues/2305)
+* Fix `sh` failure when attaching to a remote Linux process. [#2444](https://github.com/Microsoft/vscode-cpptools/issues/2444)
+* Fix incorrect default `cl.exe` macro. [PR #2468](https://github.com/Microsoft/vscode-cpptools/issues/2468)
+* Fix multiple bugs with the symbols in the Outline view not updating correctly. [#2477](https://github.com/Microsoft/vscode-cpptools/issues/2477), [#2500](https://github.com/Microsoft/vscode-cpptools/issues/2500), [#2504](https://github.com/Microsoft/vscode-cpptools/issues/2504)
+* Add support for `workspaceFolderBasename` expansion. [#2491](https://github.com/Microsoft/vscode-cpptools/issues/2491)
+  * Gabriel Arjones (@g-arjones) [PR #2495](https://github.com/Microsoft/vscode-cpptools/pull/2495), [PR #2503](https://github.com/Microsoft/vscode-cpptools/pull/2503)
+* Fix bug with variable resolution. [#2532](https://github.com/Microsoft/vscode-cpptools/issues/2532)
+* Fix off-by-one bug with hover and `Go to Definition`. [#2535](https://github.com/Microsoft/vscode-cpptools/issues/2535)
+* Fix for [Microsoft/vscode#54213](https://github.com/Microsoft/vscode/issues/54213)
+
+## Version 0.18.1: August 17, 2018
+* Fix 0.18.0 regression causing non-MinGW compilers to use `-fms-extensions` on Windows. [#2424](https://github.com/Microsoft/vscode-cpptools/issues/2424), [#2425](https://github.com/Microsoft/vscode-cpptools/issues/2425)
+
+## Version 0.18.0: August 17, 2018
+### New Features
+* Add the `C_Cpp.intelliSenseEngine` setting value of `Disabled` (for users who only use the debugger). [#785](https://github.com/Microsoft/vscode-cpptools/issues/785)
+* Add `C_Cpp.workspaceSymbols` setting with default `Just My Code` to filter out system header symbols. [#1119](https://github.com/Microsoft/vscode-cpptools/issues/1119), [#2320](https://github.com/Microsoft/vscode-cpptools/issues/2320)
+* Add `C_Cpp.inactiveRegionForegroundColor` and `C_Cpp.inactiveRegionBackgroundColor` settings. [#1620](https://github.com/Microsoft/vscode-cpptools/issues/1620), [#2212](https://github.com/Microsoft/vscode-cpptools/issues/2212)
+  * John Patterson (@john-patterson) [PR #2308](https://github.com/Microsoft/vscode-cpptools/pull/2308)
+* Add `gcc-x64` `intelliSenseMode` and send the correct clang or gcc version to our parser, fixing various IntelliSense errors. [#2112](https://github.com/Microsoft/vscode-cpptools/issues/2112), [#2175](https://github.com/Microsoft/vscode-cpptools/issues/2175), [#2260](https://github.com/Microsoft/vscode-cpptools/issues/2260), [#2299](https://github.com/Microsoft/vscode-cpptools/issues/2299), [#2317](https://github.com/Microsoft/vscode-cpptools/issues/2317)
+* Make `Go to Definition` on the definition go to the declaration instead. [#2298](https://github.com/Microsoft/vscode-cpptools/issues/2298)
+* Add multi-pass environment variable resolution allowing variables defined in terms of other variables. [#2057](https://github.com/Microsoft/vscode-cpptools/issues/2057)
+  * John Patterson (@john-patterson) [PR #2322](https://github.com/Microsoft/vscode-cpptools/pull/2322)
+* Allow users to use `~` for `${userProfile}` on Windows. [PR #2333](https://github.com/Microsoft/vscode-cpptools/pull/2333)
+* Add support for compiler flags `-fms-extensions` and `-fno-ms-extensions` on Windows (the default for MinGW-based compilers). [#2363](https://github.com/Microsoft/vscode-cpptools/issues/2363)
+* Make completion "show more results" (i.e. inaccessible members) when invoked a 2nd time. [#2386](https://github.com/Microsoft/vscode-cpptools/issues/2386)
+
+### Bug Fixes
+* Fix attach to process for systems without `bash` by using `sh` instead. [#569](https://github.com/Microsoft/vscode-cpptools/issues/569)
+  * Andy Neff (@andyneff) [PR #2340](https://github.com/Microsoft/vscode-cpptools/pull/2340)
+* Fix IntelliSense crash after hover or completion with `_Complex` types. [#689](https://github.com/Microsoft/vscode-cpptools/issues/689), [#1112](https://github.com/Microsoft/vscode-cpptools/issues/1112)
+* Fix `files.exclude` not working to exclude non-workspace folders from symbol parsing. [#1066](https://github.com/Microsoft/vscode-cpptools/issues/1066)
+* Fix `Switch Header/Source` to give results that match the parent folder name before using just the file name. [#1085](https://github.com/Microsoft/vscode-cpptools/issues/1085)
+* Fix incorrect IntelliSense errors caused by namespace lookup failure when instantiation template arguments in clang mode. [#1395](https://github.com/Microsoft/vscode-cpptools/issues/1395), [#1559](https://github.com/Microsoft/vscode-cpptools/issues/1559), [#1753](https://github.com/Microsoft/vscode-cpptools/issues/1753), [#2272](https://github.com/Microsoft/vscode-cpptools/issues/2272)
+* Fix missing parameter help when using { for constructors. [#1667](https://github.com/Microsoft/vscode-cpptools/issues/1667)
+* Fix Mac framework dependencies not being discovered. [#1913](https://github.com/Microsoft/vscode-cpptools/issues/1913)
+* Fix `compilerPath` not working with `${workspaceFolder}`. [#1982](https://github.com/Microsoft/vscode-cpptools/issues/1982)
+* Fix red flame getting stuck after modifying `c_cpp_properties.json`. [#2077](https://github.com/Microsoft/vscode-cpptools/issues/2077)
+* Don't add empty `windowsSDKVersion` if none exists. [#2300](https://github.com/Microsoft/vscode-cpptools/issues/2300)
+* Fix IntelliSense crash when the gcc-8 type_traits header is used. [#2323](https://github.com/Microsoft/vscode-cpptools/issues/2323), [#2328](https://github.com/Microsoft/vscode-cpptools/issues/2328)
+* Limit configuration popups to one at a time. [#2324](https://github.com/Microsoft/vscode-cpptools/issues/2324)
+* Don't show `includePath` code actions if compile commands or custom configuration providers are used. [#2334](https://github.com/Microsoft/vscode-cpptools/issues/2334)
+* Fix `Cpp.clang_format_path` not accepting environment variables. [#2344](https://github.com/Microsoft/vscode-cpptools/issues/2344)
+* Fix IntelliSense not working with non-ASCII characters in the WSL install path. [#2351](https://github.com/Microsoft/vscode-cpptools/issues/2351)
+* Filter out buggy IntelliSense error `"= delete" can only appear on the first declaration of a function`. [#2352](https://github.com/Microsoft/vscode-cpptools/issues/2352)
+* Fix IntelliSense failing with WSL if gcc is installed bug g++ isn't. [#2360](https://github.com/Microsoft/vscode-cpptools/issues/2360)
+* Fix WSL paths starting with `/mnt/` failing to get symbols parsed. [#2361](https://github.com/Microsoft/vscode-cpptools/issues/2361)
+* Fix IntelliSense process crash when hovering over a designated initializer list with an anonymous struct. [#2370](https://github.com/Microsoft/vscode-cpptools/issues/2370)
+* Stop showing "File: " in completion details for internal compiler defines. [#2387](https://github.com/Microsoft/vscode-cpptools/issues/2387)
+* Invoke `Edit Configurations...` when the `Configuration Help` button is clicked. [#2408](https://github.com/Microsoft/vscode-cpptools/issues/2408)
+* Fix provider configuration prompt not showing for newly added workspace folders. [#2415](https://github.com/Microsoft/vscode-cpptools/issues/2415)
+* Fix to allow SIGINT to be sent using the kill -2 command when using pipeTransport.
+
+## Version 0.17.7: July 22, 2018
+* Fix `Go to Definition` for code scoped with an aliased namespace. [#387](https://github.com/Microsoft/vscode-cpptools/issues/387)
+* Fix incorrect IntelliSense errors with template template-arguments. [#1014](https://github.com/Microsoft/vscode-cpptools/issues/1014)
+* Fix crash when using designated initializer lists. [#1440](https://github.com/Microsoft/vscode-cpptools/issues/1440)
+* Add `windowsSdkVersion` to `c_cpp_properties.json`. [#1585](https://github.com/Microsoft/vscode-cpptools/issues/1585)
+* Add `${vcpkgRoot}` variable. [#1817](https://github.com/Microsoft/vscode-cpptools/issues/1817)
+* Fix dangling IntelliSense processes. [#2075](https://github.com/Microsoft/vscode-cpptools/issues/2075), [#2169](https://github.com/Microsoft/vscode-cpptools/issues/2169)
+* Fix incorrect IntelliSense errors when class template argument deduction is used. [#2101](https://github.com/Microsoft/vscode-cpptools/issues/2101)
+* Skip automatic parsing of source files in Mac system framework paths. [#2156](https://github.com/Microsoft/vscode-cpptools/issues/2156)
+* Fix `Edit Configurations...` 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)
+* Disable the config provider message for headers outside the workspace and when debugging. [#2221](https://github.com/Microsoft/vscode-cpptools/issues/2221)
+* Add `Change Configuration Provider...` command. [#2224](https://github.com/Microsoft/vscode-cpptools/issues/2224)
+* Fix out-of-memory crash with `#include` code actions when no folder is open. [#2225](https://github.com/Microsoft/vscode-cpptools/issues/2225)
+* Fix `intelliSenseMode` with custom config providers on Windows. [#2228](https://github.com/Microsoft/vscode-cpptools/issues/2228)
+* Fix formatting not working on Windows if the VC++ 2015 redist isn't installed. [#2232](https://github.com/Microsoft/vscode-cpptools/issues/2232)
+* Fix variables not resolving in `macFrameworkPath`. [#2234](https://github.com/Microsoft/vscode-cpptools/issues/2234)
+* Fix `Go to Definition` not working for macros followed by `.` or `->`. [#2245](https://github.com/Microsoft/vscode-cpptools/issues/2245)
+* Fix `#include` autocomplete with Mac framework headers. [#2251](https://github.com/Microsoft/vscode-cpptools/issues/2251)
+* Fix for debugging to support empty arguments for debuggee. [#2258](https://github.com/Microsoft/vscode-cpptools/issues/2258)
+* Fix `Go to Definition` bug (missing symbols outside the workspace). [#2281](https://github.com/Microsoft/vscode-cpptools/issues/2281)
+* Add a setting to silence configuration provider warnings. [#2292](https://github.com/Microsoft/vscode-cpptools/issues/2292)
+* Fix for debugging async Visual C++ causing debugger to hang.
+* Fix `main` snippet.
+
+## 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)
+* Fix source files being parsed in system directories. [#2156](https://github.com/Microsoft/vscode-cpptools/issues/2156)
+* Fix internal document corruption (visible after formatting) when edits are made too soon after activation. [#2162](https://github.com/Microsoft/vscode-cpptools/issues/2162)
+* Fix a crash when saving with recursive includes. [#2173](https://github.com/Microsoft/vscode-cpptools/issues/2173)
+* Fix a crash when the `includePath` or `browse.path` is `"**"`. [#2174](https://github.com/Microsoft/vscode-cpptools/issues/2174)
+* Fix IntelliSense for WSL without g++ installed. [#2178](https://github.com/Microsoft/vscode-cpptools/issues/2178)
+* Fix random IntelliSense (completion) failures due to edits being delayed. [#2184](https://github.com/Microsoft/vscode-cpptools/issues/2184)
+* Fix database deletion failure with non-ASCII file paths on Windows. [#2205](https://github.com/Microsoft/vscode-cpptools/issues/2205)
+* Fix `Go to Definition` results with `var::` and `var->`, and filter out invalid constructor results. [#2207](https://github.com/Microsoft/vscode-cpptools/issues/2207)
+* Fix a performance bug with recursive includes.
+* Fixed a CPU usage problem on Mac related to system frameworks parsing.
+* Keep the IntelliSense process around for 10 seconds after a file is closed in case it's needed again.
+* Added an API so build system extensions can provide IntelliSense configurations for source files. More details at [npmjs.com](https://www.npmjs.com/package/vscode-cpptools).
+* Fix automatic argument quoting when debugging with gdb/lldb to include when the argument has a '(' or ')' in it. Also escape existing '"' symbols.
+* Removed `-` in `ps` call for ProcessPicker and RemoteProcessPicker. [#2183](https://github.com/Microsoft/vscode-cpptools/issues/2183)
+
+## Version 0.17.5: June 21, 2018
+* Detect `compile_commands.json` and show prompt to use it. [#1297](https://github.com/Microsoft/vscode-cpptools/issues/1297)
+* Change inactive regions from gray to translucent. [#1907](https://github.com/Microsoft/vscode-cpptools/issues/1907)
+* Improve performance of recursive includes paths. [#2068](https://github.com/Microsoft/vscode-cpptools/issues/2068)
+* Fix IntelliSense client failure due to `No args provider`. [#1908](https://github.com/Microsoft/vscode-cpptools/issues/1908)
+* Fix `#include` completion with headers in the same directory. [#2031](https://github.com/Microsoft/vscode-cpptools/issues/2031)
+* Fix non-header files outside the workspace folder not being parsed (i.e. so `Go to Definition` works). [#2053](https://github.com/Microsoft/vscode-cpptools/issues/2053)
+* Fix some crashes. [#2080](https://github.com/Microsoft/vscode-cpptools/issues/2080)
+* Support asm clobber registers on Windows. [#2090](https://github.com/Microsoft/vscode-cpptools/issues/2090)
+* Fix usage of `${config:section.setting}`. [#2165](https://github.com/Microsoft/vscode-cpptools/issues/2165)
+* `browse.path` now inherits `includePath` if not set in `c_cpp_properties.json`.
+* On Windows, `compilerPath` now populates with the guessed `cl.exe` path, and the `MSVC` include path is based on the `cl.exe` path.
+* Fix files under a non-recursive `browse.path` being removed from the database.
+* Fix `*` not working in `browse.path` with WSL.
+* Fix for -break-insert main returning multiple bind points. [#729](https://github.com/Microsoft/MIEngine/pull/729)
+* Use -- instead of -x for gnome-terminal. [#733](https://github.com/Microsoft/MIEngine/pull/733)
+* Added `miDebuggerArgs` in order to pass arguments to the program in `miDebuggerPath`. [#720](https://github.com/Microsoft/MIEngine/pull/720)
+
+## Version 0.17.4: May 31, 2018
+* Fix infinite loop (caused by deadlock) when using recursive includes. [#2043](https://github.com/Microsoft/vscode-cpptools/issues/2043)
+* Stop using recursive includes in the default configuration.
+  * @Hyzeta [PR #2059](https://github.com/Microsoft/vscode-cpptools/pull/2059)
+* Fix various other potential deadlocks and crashes.
+* Fix `Go to Definition` on `#include` not filtering out results based on the path. [#1253](https://github.com/Microsoft/vscode-cpptools/issues/1253), [#2033](https://github.com/Microsoft/vscode-cpptools/issues/2033)
+* Fix database icon getting stuck. [#1917](https://github.com/Microsoft/vscode-cpptools/issues/1917)
+
+## 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)
+* Fix recursive includes failing to find some system includes. [#2019](https://github.com/Microsoft/vscode-cpptools/issues/2019)
+
+## Version 0.17.1: May 17, 2018
+* Fix IntelliSense update slowness when using recursive includes. [#1949](https://github.com/Microsoft/vscode-cpptools/issues/1949)
+* Fix code navigation failure after switching between WSL and non-WSL configs. [#1958](https://github.com/Microsoft/vscode-cpptools/issues/1958)
+* Fix extension crash when the `includePath` is a file or the root drive. [#1979](https://github.com/Microsoft/vscode-cpptools/issues/1979), [#1965](https://github.com/Microsoft/vscode-cpptools/issues/1965)
+* Fix IntelliSense crash in `have_member_access_from_class_scope`. [#1763](https://github.com/Microsoft/vscode-cpptools/issues/1763)
+* Fix `#include` completion bugs. [#1959](https://github.com/Microsoft/vscode-cpptools/issues/1959), [#1970](https://github.com/Microsoft/vscode-cpptools/issues/1970)
+* Add `Debug` value for `loggingLevel` (previously the hidden value `"6"`).
+* Fix C++17 features not being fully enabled with msvc-x64 mode. [#1990](https://github.com/Microsoft/vscode-cpptools/issues/1990)
+* Fix IntelliSense interprocess deadlocks. [#1407](https://github.com/Microsoft/vscode-cpptools/issues/1407), [#1777](https://github.com/Microsoft/vscode-cpptools/issues/1777)
+
+## Version 0.17.0: May 7, 2018
+* Auto-complete for headers after typing `#include`. [#802](https://github.com/Microsoft/vscode-cpptools/issues/802)
+* Add support for recursive `includePath`, e.g. `${workspaceFolder}/**`. [#897](https://github.com/Microsoft/vscode-cpptools/issues/897)
+* Configuration improvements. [#1338](https://github.com/Microsoft/vscode-cpptools/issues/1338)
+  * Potentially addresses: [#368](https://github.com/Microsoft/vscode-cpptools/issues/368), [#410](https://github.com/Microsoft/vscode-cpptools/issues/410), [#1229](https://github.com/Microsoft/vscode-cpptools/issues/1229), [#1270](https://github.com/Microsoft/vscode-cpptools/issues/1270), [#1404](https://github.com/Microsoft/vscode-cpptools/issues/1404)
+* Add support for querying system includes/defines from WSL and Cygwin compilers. [#1845](https://github.com/Microsoft/vscode-cpptools/issues/1845), [#1736](https://github.com/Microsoft/vscode-cpptools/issues/1736)
+* Fix IntelliSense for WSL projects in Windows builds 17110 and greater. [#1694](https://github.com/Microsoft/vscode-cpptools/issues/1694)
+* Add snippets. [PR #1823](https://github.com/Microsoft/vscode-cpptools/pull/1823)
+* Add support for vcpkg. [PR #1886](https://github.com/Microsoft/vscode-cpptools/pull/1886)
+* Add support for custom variables in `c_cpp_properties.json` via `env`. [#1857](https://github.com/Microsoft/vscode-cpptools/issues/1857), [#368](https://github.com/Microsoft/vscode-cpptools/issues/368)
+* Stop automatically adding `/usr/include` to the `includePath`. [#1819](https://github.com/Microsoft/vscode-cpptools/issues/1819)
+* Fix wrong configuration being used if there are four or more. [#1599](https://github.com/Microsoft/vscode-cpptools/issues/1599)
+* Fix `c_cpp_properties.json` requiring write access. [#1790](https://github.com/Microsoft/vscode-cpptools/issues/1790)
+* Change file not found in `compile_commands.json` message from an error to a warning. [#1783](https://github.com/Microsoft/vscode-cpptools/issues/1783)
+* Fix an IntelliSense crash during completion requests. [#1782](https://github.com/Microsoft/vscode-cpptools/issues/1782)
+* Update the installed clang-format to 6.0.
+* Fix bug with `compile_commands.json` when "arguments" have both a switch and a value in the arg. [#1890](https://github.com/Microsoft/vscode-cpptools/issues/1890)
+* Fix bug with garbage data appearing in tooltips on Linux/Mac. [#1577](https://github.com/Microsoft/vscode-cpptools/issues/1577)
+
+## Version 0.16.1: March 30, 2018
+* Fix random deadlock caused by logging code on Linux/Mac. [#1759](https://github.com/Microsoft/vscode-cpptools/issues/1759)
+* Fix compiler from `compileCommands` not being queried for includes/defines if `compilerPath` isn't set on Windows. [#1754](https://github.com/Microsoft/vscode-cpptools/issues/1754)
+* Fix OSX `UseShellExecute` I/O bug. [#1756](https://github.com/Microsoft/vscode-cpptools/issues/1756)
+* Invalidate partially unzipped files from package manager. [#1757](https://github.com/Microsoft/vscode-cpptools/issues/1757)
+
+## Version 0.16.0: March 28, 2018
+* Enable autocomplete for local and global scopes. [#13](https://github.com/Microsoft/vscode-cpptools/issues/13)
+* Add a setting to define multiline comment patterns: `C_Cpp.commentContinuationPatterns`. [#1100](https://github.com/Microsoft/vscode-cpptools/issues/1100), [#1539](https://github.com/Microsoft/vscode-cpptools/issues/1539)
+* Add a setting to disable inactive region highlighting: `C_Cpp.dimInactiveRegions`. [#1592](https://github.com/Microsoft/vscode-cpptools/issues/1592)
+* Add `forcedInclude` configuration setting. [#852](https://github.com/Microsoft/vscode-cpptools/issues/852)
+* Add `compilerPath`, `cStandard`, and `cppStandard` configuration settings, and query gcc/clang-based compilers for default defines. [#1293](https://github.com/Microsoft/vscode-cpptools/issues/1293), [#1251](https://github.com/Microsoft/vscode-cpptools/issues/1251), [#1448](https://github.com/Microsoft/vscode-cpptools/issues/1448), [#1465](https://github.com/Microsoft/vscode-cpptools/issues/1465), [#1484](https://github.com/Microsoft/vscode-cpptools/issues/1484)
+* Fix text being temporarily gray when an inactive region is deleted. [Microsoft/vscode#44872](https://github.com/Microsoft/vscode/issues/44872)
+* Add support for `${workspaceFolder}` variable in **c_cpp_properties.json**. [#1392](https://github.com/Microsoft/vscode-cpptools/issues/1392)
+* Fix IntelliSense not updating in source files after dependent header files are changed. [#1501](https://github.com/Microsoft/vscode-cpptools/issues/1501)
+* Change database icon to use the `statusBar.foreground` color. [#1638](https://github.com/Microsoft/vscode-cpptools/issues/1638)
+* Enable C++/CLI IntelliSense mode via adding the `/clr` arg to the `compilerPath`. [#1596](https://github.com/Microsoft/vscode-cpptools/issues/1596)
+* Fix delay in language service activation caused by **cpptools.json** downloading. [#1640](https://github.com/Microsoft/vscode-cpptools/issues/1640)
+* Fix debugger failure when a single quote is in the path. [#1554](https://github.com/Microsoft/vscode-cpptools/issues/1554)
+* Fix terminal stdout and stderr redirection to not send to VS Code. [#1348](https://github.com/Microsoft/vscode-cpptools/issues/1348)
+* Fix blank config and endless "Initializing..." if the file watcher limit is hit when using `compileCommands`. [PR #1709](https://github.com/Microsoft/vscode-cpptools/pull/1709)
+* Fix error squiggles re-appearing after editing then closing a file. [#1712](https://github.com/Microsoft/vscode-cpptools/issues/1712)
+* Show error output from clang-format. [#1259](https://github.com/Microsoft/vscode-cpptools/issues/1259)
+* Fix `add_expression_to_index` crash (most frequent crash in 0.15.0). [#1396](https://github.com/Microsoft/vscode-cpptools/issues/1396)
+* Fix incorrect error squiggle `explicitly instantiated more than once`. [#871](https://github.com/Microsoft/vscode-cpptools/issues/871)
+
+## Version 0.15.0: February 15, 2018
+* Add colorization for inactive regions. [#1466](https://github.com/Microsoft/vscode-cpptools/issues/1466)
+* Fix 3 highest hitting crashes. [#1137](https://github.com/Microsoft/vscode-cpptools/issues/1137), [#1337](https://github.com/Microsoft/vscode-cpptools/issues/1337), [#1497](https://github.com/Microsoft/vscode-cpptools/issues/1497)
+* Update IntelliSense compiler (bug fixes and more C++17 support). [#1067](https://github.com/Microsoft/vscode-cpptools/issues/1067), [#1313](https://github.com/Microsoft/vscode-cpptools/issues/1313)
+* Fix duplicate `cannot open source file` errors. [#1469](https://github.com/Microsoft/vscode-cpptools/issues/1469)
+* Fix `Go to Symbol in File...` being slow for large workspaces. [#1472](https://github.com/Microsoft/vscode-cpptools/issues/1472)
+* Fix stuck processes during shutdown. [#1474](https://github.com/Microsoft/vscode-cpptools/issues/1474)
+* Fix error popup appearing with non-workspace files when using `compile_commands.json`. [#1475](https://github.com/Microsoft/vscode-cpptools/issues/1475)
+* Fix snippet completions being blocked after `#`. [#1531](https://github.com/Microsoft/vscode-cpptools/issues/1531)
+* Add more macros to `cpp.hint` (fixing missing symbols).
+* Add `__CHAR_BIT__=8` to default defines on Mac. [#1510](https://github.com/Microsoft/vscode-cpptools/issues/1510)
+* Added support for config variables to `c_cpp_properties.json`. [#314](https://github.com/Microsoft/vscode-cpptools/issues/314)
+  * Joshua Cannon (@thejcannon) [PR #1529](https://github.com/Microsoft/vscode-cpptools/pull/1529)
+* Define `_UNICODE` by default on Windows platforms. [#1538](https://github.com/Microsoft/vscode-cpptools/issues/1538)
+  * Charles Milette (@sylveon) [PR #1540](https://github.com/Microsoft/vscode-cpptools/pull/1540)
+
+## 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)
+* Skip automatically adding to `files.associations` if it matches an existing glob pattern or if `C_Cpp.autoAddFileAssociations` is `false`. [#722](https://github.com/Microsoft/vscode-cpptools/issues/722)
+* The debugger no longer requires an extra reload. [#1362](https://github.com/Microsoft/vscode-cpptools/issues/1362)
+* Fix incorrect "Warning: Expected file ... is missing" message after installing on Linux. [#1334](https://github.com/Microsoft/vscode-cpptools/issues/1334)
+* Fix "Include file not found" messages not re-appearing after settings changes. [#1363](https://github.com/Microsoft/vscode-cpptools/issues/1363)
+* Performance improvements with `browse.path` parsing, and stop showing "Parsing files" when there's no actual parsing. [#1393](https://github.com/Microsoft/vscode-cpptools/issues/1393)
+* Fix crash when settings with the wrong type are used. [#1396](https://github.com/Microsoft/vscode-cpptools/issues/1396)
+* Allow semicolons in `browse.path`. [#1415](https://github.com/Microsoft/vscode-cpptools/issues/1415)
+* Fix to handle relative pathing in source file paths properly when normalizing. [#1228](https://github.com/Microsoft/vscode-cpptools/issues/1228)
+* Fix delay in language service activation caused by cpptools.json downloading. [#1429](https://github.com/Microsoft/vscode-cpptools/issues/1429)
+* Add `C_Cpp.workspaceParsingPriority` setting to enable using less than 100% CPU during parsing of workspace files.
+* Add `C_Cpp.exclusionPolicy` default to `checkFolders` to avoid expensive `files.exclude` checking on every file.
+
+## Version 0.14.5: December 18, 2017
+* Fix for stackwalk `NullReferenceException`. [#1339](https://github.com/Microsoft/vscode-cpptools/issues/1339)
+* Fix for `-isystem` (or `-I`) not being used in `compile_commands.json` if there's a space after it. [#1343](https://github.com/Microsoft/vscode-cpptools/issues/1343)
+* Fix for header switching from `.cc` to `.hpp` files (and other cases). [#1341](https://github.com/Microsoft/vscode-cpptools/issues/1341)
+* Fix reload prompts not appearing in debugging scenarios (after the initial installation). [#1344](https://github.com/Microsoft/vscode-cpptools/issues/1344)
+* Add a "wait" message when commands are invoked during download/installation. [#1344](https://github.com/Microsoft/vscode-cpptools/issues/1344)
+* Prevent blank "C/C++ Configuration" from appearing when debugging is started but the language service is not. [#1353](https://github.com/Microsoft/vscode-cpptools/issues/1353)
+
+## Version 0.14.4: December 11, 2017
+* Enable the language service processes to run without glibc 2.18. [#19](https://github.com/Microsoft/vscode-cpptools/issues/19)
+* Enable the language service processes to run on 32-bit Linux. [#424](https://github.com/Microsoft/vscode-cpptools/issues/424)
+* Fix extension process not working on Windows with non-ASCII usernames. [#1319](https://github.com/Microsoft/vscode-cpptools/issues/1319)
+* Fix IntelliSense on single processor VMs. [#1321](https://github.com/Microsoft/vscode-cpptools/issues/1321)
+* Enable offline installation of the extension. [#298](https://github.com/Microsoft/vscode-cpptools/issues/298)
+* Add support for `-isystem` in `compile_commands.json`. [#1156](https://github.com/Microsoft/vscode-cpptools/issues/1156)
+* Remember the selected configuration across launches of VS Code. [#1273](https://github.com/Microsoft/vscode-cpptools/issues/1273)
+* Fix 'Add Configuration...` entries not appearing if the extension wasn't previously activated. [#1287](https://github.com/Microsoft/vscode-cpptools/issues/1287)
+* Add `(declaration)` to declarations in the navigation list. [#1311](https://github.com/Microsoft/vscode-cpptools/issues/1311)
+* Fix function definition body not being visible after navigation. [#1311](https://github.com/Microsoft/vscode-cpptools/issues/1311)
+* Improve performance for fetching call stacks with large arguments. [#363](https://github.com/Microsoft/vscode-cpptools/issues/363)
+
+## Version 0.14.3: November 27, 2017
+* Fix for disappearing parameter hints tooltip. [#1165](https://github.com/Microsoft/vscode-cpptools/issues/1165)
+* Fix for parameter hints only showing up after the opening parenthesis. [#902](https://github.com/Microsoft/vscode-cpptools/issues/902), [#819](https://github.com/Microsoft/vscode-cpptools/issues/819)
+* Fix for customer reported crashes in the TypeScript extension code. [#1240](https://github.com/Microsoft/vscode-cpptools/issues/1240), [#1245](https://github.com/Microsoft/vscode-cpptools/issues/1245)
+* Fix .browse.VC-#.db files being unnecessarily created when an shm file exists. [#1234](https://github.com/Microsoft/vscode-cpptools/issues/1234)
+* Fix language service to only activate after a C/C++ file is opened or a C/Cpp command is used (not onDebug).
+* Fix database resetting if shutdown got blocked by an IntelliSense operation. [#1260](https://github.com/Microsoft/vscode-cpptools/issues/1260)
+* Fix deadlock that can occur when switching configurations.
+* Fix browse.databaseFilename changing not taking effect until a reload.
+
+## Version 0.14.2: November 9, 2017
+* Unsupported Linux clients sending excessive telemetry when the language server fails to start. [#1227](https://github.com/Microsoft/vscode-cpptools/issues/1227)
+
+## Version 0.14.1: November 9, 2017
+* Add support for multi-root workspaces. [#1070](https://github.com/Microsoft/vscode-cpptools/issues/1070)
+* 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)
+* Fix bug with `${workspaceRoot}` symbols not getting added if a parent folder is in the `browse.path`. [#1185](https://github.com/Microsoft/vscode-cpptools/issues/1185)
+* Fix `Add configuration` C++ launch.json on Insiders. [#1191](https://github.com/Microsoft/vscode-cpptools/issues/1191)
+* Fix extension restart logic so that the extension doesn't get stuck on "Initializing..." when it crashes. [#893](https://github.com/Microsoft/vscode-cpptools/issues/893)
+* Remove the Reload window prompt after installation (it only appears if launch.json is active).
+* Prevent browse database from being reset if shutdown takes > 1 second.
+* Remove the `UnloadLanguageServer` command and the `clang_format_formatOnSave` setting.
+* Fix bugs with include path suggestions.
+* Fix max files to parse status number being too big, due to including non-`${workspaceRoot}` files.
+* Update default `launch.json` configurations to use `${workspaceFolder}` instead of `${workspaceRoot}`.
+* Update how default initial configurations for `launch.json` are being provided. [Microsoft/vscode#33794](https://github.com/Microsoft/vscode/issues/33794)
+* Add support for normalizing source file locations. (Windows [#272](https://github.com/Microsoft/vscode-cpptools/issues/272)), (Mac OS X [#1095](https://github.com/Microsoft/vscode-cpptools/issues/1095))
+
+## Version 0.14.0: October 19, 2017
+* Add support for `compile_commands.json`. [#156](https://github.com/Microsoft/vscode-cpptools/issues/156)
+* Fix crash with signature help. [#1076](https://github.com/Microsoft/vscode-cpptools/issues/1076)
+* Skip parsing redundant browse.path directories. [#1106](https://github.com/Microsoft/vscode-cpptools/issues/1106)
+* 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 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 "..".
+* Fix a crash on shutdown.
+
+## Version 0.13.1: October 5, 2017
+* Delete unused symbol databases when `browse.databaseFilename` in `c_cpp_properties.json` changes. [#558](https://github.com/Microsoft/vscode-cpptools/issues/558)
+* Fix infinite loop during IntelliSense parsing. [#981](https://github.com/Microsoft/vscode-cpptools/issues/981)
+* Fix database resetting due to the extension process not shutting down fast enough. [#1060](https://github.com/Microsoft/vscode-cpptools/issues/1060)
+* Fix crash with document highlighting [#1076](https://github.com/Microsoft/vscode-cpptools/issues/1076)
+* Fix bug that could cause symbols to be missing when shutdown occurs during tag parsing.
+* Fix bug that could cause included files to not be reparsed if they were modified after the initial parsing.
+* Fix potential buffer overrun when logging is enabled.
+* Add logging to help diagnose cause of document corruption after formatting.
+
+## Version 0.13.0: September 25, 2017
+* Reference highlighting is now provided by the extension for both IntelliSense engines.
+* Parameter help is now provided by both IntelliSense engines.
+* Light bulbs (code actions) for `#include` errors now suggest potential paths to add to the `includePath` based on a recursive search of the `browse.path`. [#846](https://github.com/Microsoft/vscode-cpptools/issues/846)
+* Browse database now removes old symbols when `browse.path` changes. [#262](https://github.com/Microsoft/vscode-cpptools/issues/262)
+* Add `*` on new lines after a multiline comment with `/**` is started. [#579](https://github.com/Microsoft/vscode-cpptools/issues/579)
+* Fix `Go to Definition`, completion, and parameter hints for partially scoped members. [#635](https://github.com/Microsoft/vscode-cpptools/issues/635)
+* Fix bug in `macFrameworkPath` not resolving variables.
+
+## Version 0.12.4: September 12, 2017
+* Fix a crash in IntelliSense for users with non-ASCII user names (Windows-only). [#910](https://github.com/Microsoft/vscode-cpptools/issues/910)
+* Add `macFrameworkPath` to `c_cpp_properties.json`. [#970](https://github.com/Microsoft/vscode-cpptools/issues/970)
+* Fix incorrect auto-complete suggestions when using template types with the scope operator `::`. [#988](https://github.com/Microsoft/vscode-cpptools/issues/988)
+* Fix potential config file parsing failure. [#989](https://github.com/Microsoft/vscode-cpptools/issues/989)
+* Support `${env:VAR}` syntax for environment variables in `c_cpp_properties.json`. [#1000](https://github.com/Microsoft/vscode-cpptools/issues/1000)
+* Support semicolon delimiters for include paths in `c_cpp_properties.json` to better support environment variables. [#1001](https://github.com/Microsoft/vscode-cpptools/issues/1001)
+* Add `__LITTLE_ENDIAN__=1` to default defines so that "endian.h" is not needed on Mac projects. [#1005](https://github.com/Microsoft/vscode-cpptools/issues/1005)
+* Fix for source code files on Windows with incorrect casing. [#984](https://github.com/Microsoft/vscode-cpptools/issues/984)
+
+## Version 0.12.3: August 17, 2017
+* Fix regression for paths containing multibyte characters. [#958](https://github.com/Microsoft/vscode-cpptools/issues/958)
+* Fix bug with the Tag Parser completion missing results. [#943](https://github.com/Microsoft/vscode-cpptools/issues/943)
+* Add /usr/include/machine or i386 to the default Mac `includePath`. [#944](https://github.com/Microsoft/vscode-cpptools/issues/944)
+* Add a command to reset the Tag Parser database. [#601](https://github.com/Microsoft/vscode-cpptools/issues/601), [#464](https://github.com/Microsoft/vscode-cpptools/issues/464)
+* Fix bug with error-related code actions remaining after the errors are cleared.
+* Fix bug with Tag Parser completion not working when :: preceded an identifier.
+* Upgrade SQLite (for better reliability and performance).
+
+## Version 0.12.2: August 2, 2017
+* Fix bug in our build system causing Windows binaries to build against the wrong version of the Windows SDK. [#325](https://github.com/Microsoft/vscode-cpptools/issues/325)
+* Added a gcc problemMatcher. [#854](https://github.com/Microsoft/vscode-cpptools/issues/854)
+* Fix bug where .c/.cpp files could get added to `files.associations` as the opposite "cpp"/"c" language after `Go to Definition` on a symbol. [#884](https://github.com/Microsoft/vscode-cpptools/issues/884)
+* Remove completion results after `#pragma`. [#886](https://github.com/Microsoft/vscode-cpptools/issues/886)
+* Fix a possible infinite loop when viewing Boost sources. [#888](https://github.com/Microsoft/vscode-cpptools/issues/888)
+* Fix `Go to Definition` not working for files in `#include_next`. [#906](https://github.com/Microsoft/vscode-cpptools/issues/906)
+  * Also fix incorrect preprocessor suggestions at the end of a `#include_next`.
+* Skip automatically adding to `files.associations` if they already match global patterns. [Microsoft/vscode#27404](https://github.com/Microsoft/vscode/issues/27404)
+* Fix a crash with the IntelliSense process (responsible for ~25% of all crashes).
+
+## Version 0.12.1: July 18, 2017
+* Fix Tag Parser features not working with some MinGW library code.
+* Fix a symbol search crash.
+* Fix an IntelliSense engine compiler crash.
+* Fix `Go to Declaration` to return `Go to Definition` results if the declarations have no results.
+* Fix formatting with non-ASCII characters in the path. [#870](https://github.com/Microsoft/vscode-cpptools/issues/870)
+* Fix handling of symbolic links to files on Linux/Mac. [#872](https://github.com/Microsoft/vscode-cpptools/issues/872)
+* Move red flame icon to its own section so the configuration text is always readable. [#875](https://github.com/Microsoft/vscode-cpptools/issues/875)
+* Remove `addWorkspaceRootToIncludePath` setting and instead make `${workspaceRoot}` in `browse.path` explicit.
+* Add `Show Release Notes` command.
+* Add `Edit Configurations...` command to the `Select a Configuration...` dropdown.
+* Update Microsoft Visual C++ debugger to Visual Studio 2017 released components.
+  * Fix issue with showing wrong thread. [#550](https://github.com/Microsoft/vscode-cpptools/issues/550)
+  * Fix issue with binaries compiled with /FASTLINK causing debugger to hang. [#484](https://github.com/Microsoft/vscode-cpptools/issues/484)
+* Fix issue in MinGW/Cygwin debugging where stop debugging causes VS Code to hang. [Microsoft/MIEngine#636](https://github.com/Microsoft/MIEngine/pull/636)
+
+## Version 0.12.0: June 26, 2017
+* The default IntelliSense engine now provides semantic-aware autocomplete suggestions for `.`, `->`, and `::` operators. [#13](https://github.com/Microsoft/vscode-cpptools/issues/13)
+* The default IntelliSense engine now reports the unresolved include files in referenced headers and falls back to the Tag Parser until headers are resolved.
+  * This behavior can be overridden by setting `"C_Cpp.intelliSenseEngineFallback": "Disabled"`
+* Added `"intelliSenseMode"` property to `c_cpp_properties.json` to allow switching between MSVC and Clang modes. [#710](https://github.com/Microsoft/vscode-cpptools/issues/710), [#757](https://github.com/Microsoft/vscode-cpptools/issues/757)
+* A crashed IntelliSense engine no longer gives the popup message, and it automatically restarts after an edit to the translation unit occurs.
+* Fix the IntelliSense engine to use "c" mode if a C header is opened before the C file.
+* Fix a bug which could cause the IntelliSense engine to not update results if changes are made to multiple files of a translation unit.
+* Auto `files.association` registers "c" language headers when `Go to Definition` is used in a C file.
+* Downloading extension dependencies will retry up to 5 times in the event of a failure. [#694](https://github.com/Microsoft/vscode-cpptools/issues/694)
+* Changes to `c_cpp_properties.json` are detected even if file watchers fail.
+* Update default IntelliSense options for MSVC mode to make Boost projects work better. [#775](https://github.com/Microsoft/vscode-cpptools/issues/775)
+* Fix `Go to Definition` not working until all `browse.path` files are re-scanned. [#788](https://github.com/Microsoft/vscode-cpptools/issues/788)
+
+## Version 0.11.4: June 2, 2017
+* Fix for `System.Xml.Serialization.XmlSerializationReader threw an exception` when debugging on Linux. [#792](https://github.com/Microsoft/vscode-cpptools/issues/792)
+* Fix for escaping for `${workspaceRoot}` in `launch.json`.
+
+## Version 0.11.3: May 31, 2017
+* Fix `x86_64-pc-linux-gnu` and `x86_64-linux-gnu` paths missing from the default `includePath`.
+
+## Version 0.11.2: May 24, 2017
+* Revert the default `C_Cpp.intelliSenseEngine` setting back to "Tag Parser" for non-Insiders while we work on improving the migration experience.
+
+## Version 0.11.1: May 19, 2017
+* Add keywords to auto-complete (C, C++, or preprocessor). [#120](https://github.com/Microsoft/vscode-cpptools/issues/120)
+* Fix non-recursive `browse.path` on Linux/Mac. [#546](https://github.com/Microsoft/vscode-cpptools/issues/546)
+* Fix .clang-format file not being used on Linux/Mac. [#604](https://github.com/Microsoft/vscode-cpptools/issues/604)
+* Stop setting the c/cpp `editor.quickSuggestions` to false. [#606](https://github.com/Microsoft/vscode-cpptools/issues/606)
+  * We also do a one-time clearing of that user setting, which will also copy any other c/cpp workspace settings to user settings. The workspace setting isn't cleared.
+* Fix selection range off by one with `Peek Definition`. [#648](https://github.com/Microsoft/vscode-cpptools/issues/648)
+* Upgrade the installed clang-format to 4.0 [#656](https://github.com/Microsoft/vscode-cpptools/issues/656)
+* Make keyboard shortcuts only apply to c/cpp files. [#662](https://github.com/Microsoft/vscode-cpptools/issues/662)
+* Fix autocomplete with qstring.h. [#666](https://github.com/Microsoft/vscode-cpptools/issues/666)
+* Fix C files without a ".c" extension from being treated like C++ for `errorSquiggles`. [#673](https://github.com/Microsoft/vscode-cpptools/issues/673)
+* Make the C IntelliSense engine use C11 instead of C89. [#685](https://github.com/Microsoft/vscode-cpptools/issues/685)
+* Fix bug with clang-format not working with non-trimmed styles. [#691](https://github.com/Microsoft/vscode-cpptools/issues/691)
+* Enable the C++ IntelliSense engine to use six C++17 features. [#699](https://github.com/Microsoft/vscode-cpptools/issues/699)
+* Add reload prompt when a settings change requires it.
+* Prevent non-existent files from being returned in `Go To Definition` results.
+
+## Version 0.11.0: April 24, 2017
+* Enabled first IntelliSense features based on the MSVC engine.
+  * Quick info tooltips and compiler errors are provided by the MSVC engine.
+  * `C_Cpp.intelliSenseEngine` property controls whether the new engine is used or not.
+  * `C_Cpp.errorSquiggles` property controls whether compiler errors are made visible in the editor.
+* Add `Go to Declaration` and `Peek Declaration`. [#271](https://github.com/Microsoft/vscode-cpptools/issues/271)
+* Fix language-specific workspace settings leaking into user settings. [Microsoft/vscode#23118](https://github.com/Microsoft/vscode/issues/23118)
+* Fix `files.exclude` not being used in some cases. [#485](https://github.com/Microsoft/vscode-cpptools/issues/485)
+* Fix a couple potential references to an undefined `textEditor`. [#584](https://github.com/Microsoft/vscode-cpptools/issues/584)
+* Move changes from `README.md` to `CHANGELOG.md`. [#586](https://github.com/Microsoft/vscode-cpptools/issues/586)
+* Fix crash on Mac/Linux when building the browse database and `nftw` fails. [#591](https://github.com/Microsoft/vscode-cpptools/issues/591)
+* Add `Alt+N` keyboard shortcut for navigation. [#593](https://github.com/Microsoft/vscode-cpptools/issues/593)
+* Fix autocomplete crash when the result has an invalid UTF-8 character. [#608](https://github.com/Microsoft/vscode-cpptools/issues/608)
+* Fix symbol search crash with `_` symbol. [#611](https://github.com/Microsoft/vscode-cpptools/issues/611)
+* Fix the `Edit Configurations` command when '#' is in the workspace root path. [#625](https://github.com/Microsoft/vscode-cpptools/issues/625)
+* Fix clang-format `TabWidth` not being set when formatting with the `Visual Studio` style. [#630](https://github.com/Microsoft/vscode-cpptools/issues/630)
+* Enable `clang_format_fallbackStyle` to be a custom style. [#641](https://github.com/Microsoft/vscode-cpptools/issues/641)
+* Fix potential `undefined` references when attaching to a process. [#650](https://github.com/Microsoft/vscode-cpptools/issues/650)
+* Fix `files.exclude` not working on Mac. [#653](https://github.com/Microsoft/vscode-cpptools/issues/653)
+* Fix crashes during edit and hover with unexpected UTF-8 data. [#654](https://github.com/Microsoft/vscode-cpptools/issues/654)
+
+## Version 0.10.5: March 21, 2017
+* Fix a crash that randomly occurred when the size of a document increased. [#430](https://github.com/Microsoft/vscode-cpptools/issues/430)
+* Fix for browsing not working for Linux/Mac stdlib.h functions. [#578](https://github.com/Microsoft/vscode-cpptools/issues/578)
+* Additional fixes for switch header/source not respecting `files.exclude`. [#485](https://github.com/Microsoft/vscode-cpptools/issues/485)
+* Made `editor.quickSuggestions` dependent on `C_Cpp.autocomplete`. [#572](https://github.com/Microsoft/vscode-cpptools/issues/572)
+  * We recommend you close and reopen your settings.json file anytime you change the `C_Cpp.autocomplete` setting. [More info here](https://github.com/Microsoft/vscode-cpptools/releases).
+
+## Version 0.10.4: March 15, 2017
+* Fix a crash in signature help. [#525](https://github.com/microsoft/vscode-cpptools/issues/525)
+* Re-enable switch header/source when no workspace folder is open. [#541](https://github.com/microsoft/vscode-cpptools/issues/541)
+* Fix inline `clang_format_style`. [#536](https://github.com/microsoft/vscode-cpptools/issues/536)
+* Some other minor bug fixes.
+
+## Version 0.10.3: March 7, 2017
+* Database stability fixes.
+* Added enums to the C_Cpp settings so the possible values are displayed in the dropdown.
+* Change from `${command.*}` to `${command:*}`. [#521](https://github.com/Microsoft/vscode-cpptools/issues/521)
+* Current execution row was not highlighting in debug mode when using gdb. [#526](https://github.com/microsoft/vscode-cpptools/issues/526)
+
+## Version 0.10.2: March 1, 2017
+* New `addWorkspaceRootToIncludePath` setting allows users to disable automatic parsing of all files under the workspace root. [#374](https://github.com/Microsoft/vscode-cpptools/issues/374)
+* The cpp.hint file was missing from the vsix package. [#508](https://github.com/Microsoft/vscode-cpptools/issues/508)
+* Switch header/source now respects `files.exclude`. [#485](https://github.com/Microsoft/vscode-cpptools/issues/485)
+* Switch header/source performance improvements. [#231](https://github.com/Microsoft/vscode-cpptools/issues/231)
+* Switch header/source now appears in the right-click menu.
+* Improvements to signature help.
+* Various other bug fixes.
+
+## Version 0.10.1: February 9, 2017
+* Bug fixes.
+
+## Version 0.10.0: January 24, 2017
+* Suppressed C++ language auto-completion inside a C++ comment or string literal. TextMate based completion is still available.
+* Fixed bugs regarding the filtering of files and symbols, including:
+  * Find-symbol now excludes symbols found in `files.exclude` or `search.exclude` files
+  * Go-to-definition now excludes symbols found in `files.exclude` files (i.e. `search.exclude` paths are still included).
+* Added option to disable `clang-format`-based formatting provided by this extension via `"C_Cpp.formatting" : "disabled"`
+* Added new `pipeTransport` functionality within the `launch.json` to support pipe communications with `gdb/lldb` such as using `plink.exe` or `ssh`.
+* Added support for `{command.pickRemoteProcess}` to allow picking of processes for remote pipe connections during `attach` scenarios. This is similar to how `{command.pickProcess}` works for local attach.
+* Bug fixes.
+
+## Version 0.9.3: December 8, 2016
+* [December update](https://aka.ms/cppvscodedec) for C/C++ extension
+* Ability to map source files during debugging using `sourceFileMap` property in `launch.json`.
+* Enable pretty-printing by default for gdb users in `launch.json`.
+* Bug fixes.
+
+## Version 0.9.2: September 22, 2016
+* Bug fixes.
+
+## Version 0.9.1: September 7, 2016
+* Bug fixes.
+
+## Version 0.9.0: August 29, 2016
+* [August update](https://blogs.msdn.microsoft.com/vcblog/2016/08/29/august-update-for-the-visual-studio-code-cc-extension/) for C/C++ extension.
+* 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` 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.
+
+## Version 0.8.1: July 27, 2016
+* Bug fixes.
+
+## Version 0.8.0: July 21, 2016
+* [July update](https://blogs.msdn.microsoft.com/vcblog/2016/07/26/july-update-for-the-visual-studio-code-cc-extension/) for C/C++ extension.
+* Support for debugging on OS X with LLDB 3.8.0. LLDB is now the default debugging option on OS X.
+* Attach to process displays a list of available processes.
+* Set variable values through Visual Studio Code's locals window.
+* Bug fixes.
+
+## Version 0.7.1: June 27, 2016
+* Bug fixes.
+
+## Version 0.7.0: June 20, 2016
+* [June Update](https://blogs.msdn.microsoft.com/vcblog/2016/06/01/may-update-for-the-cc-extension-in-visual-studio-code/) for C/C++ extension.
+* Bug fixes.
+* Switch between header and source.
+* Control which files are processed under include path.
+
+## Version 0.6.1: June 03, 2016
+* Bug fixes.
+
+## Version 0.6.0: May 24, 2016
+* [May update](https://blogs.msdn.microsoft.com/vcblog/2016/07/26/july-update-for-the-visual-studio-code-cc-extension/) for C/C++ extension.
+* Support for debugging on OS X with GDB.
+* Support for debugging with GDB on MinGW.
+* Support for debugging with GDB on Cygwin.
+* Debugging on 32-bit Linux now enabled.
+* Format code using clang-format.
+* Experimental fuzzy auto-completion.
+* Bug fixes.
+
+## Version 0.5.0: April 14, 2016
+* Usability and correctness bug fixes.
+* Simplify installation experience.
+* Usability and correctness bug fixes.

Extension/LICENSE.txt

@@ -0,0 +1,203 @@
+MICROSOFT PRE-RELEASE SOFTWARE LICENSE TERMS
+MICROSOFT C/C++ EXTENSION FOR VISUAL STUDIO CODE
+
+These license terms are an agreement between Microsoft Corporation (or
+based on where you live, one of its affiliates) and you. They apply to
+the pre-release software named above. The terms also apply to any
+Microsoft services or updates for the software, except to the extent
+those have additional terms.
+
+IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW.
+
+1. INSTALLATION AND USE RIGHTS. You may only use the C/C++ Extension
+   for Visual Studio Code with Visual Studio Code, Visual Studio or
+   Xamarin Studio software to help you develop and test your
+   applications.
+
+2. TERMS FOR SPECIFIC COMPONENTS
+   a. Third Party Components. The software may include third party
+   components with separate legal notices or governed by other
+   agreements, as may be described in the ThirdPartyNotices file(s)
+   accompanying the software.
+   b. Package Managers. The software may include package managers, like
+   Nuget, that give you the option to download other Microsoft and third
+   party software packages to use with your application. Those packages
+   are under their own licenses, and not this agreement. Microsoft does
+   not distribute, license or provide any warranties for any of the third
+   party packages.
+
+3. DATA.
+   a. Data Collection. The software may collect information about you and
+   your use of the software, and send that to Microsoft. Microsoft may
+   use this information to provide services and improve our products and
+   services. You may opt-out of many of these scenarios, but not all, as
+   described in the product documentation.  There are also some features
+   in the software that may enable you and Microsoft to collect data from
+   users of your applications. If you use these features, you must comply
+   with applicable law, including providing appropriate notices to users
+   of your applications together with a copy of Microsoft’s privacy
+   statement. Our privacy statement is located at
+   https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more
+   about data collection and use in the help documentation and our
+   privacy statement. Your use of the software operates as your consent
+   to these practices.
+   b. Processing of Personal Data. To the extent Microsoft is a processor
+   or subprocessor of personal data in connection with the software,
+   Microsoft makes the commitments in the European Union General Data
+   Protection Regulation Terms of the Online Services Terms to all
+   customers effective May 25, 2018, at
+   http://go.microsoft.com/?linkid=9840733.
+
+4. PRE-RELEASE SOFTWARE. This software is a pre-release version. It
+   may not work the way a final version of the software will. We may
+   change it for the final, commercial version. We also may not release a
+   commercial version.
+
+5. FEEDBACK. If you give feedback about the software to Microsoft, you
+   give to Microsoft, without charge, the right to use, share and
+   commercialize your feedback in any way and for any purpose. You will
+   not give feedback that is subject to a license that requires Microsoft
+   to license its software or documentation to third parties because we
+   include your feedback in them. These rights survive this agreement.
+
+6. SCOPE OF LICENSE. The software is licensed, not sold. This
+   agreement only gives you some rights to use the software. Microsoft
+   reserves all other rights. Unless applicable law gives you more rights
+   despite this limitation, you may use the software only as expressly
+   permitted in this agreement. In doing so, you must comply with any
+   technical limitations in the software that only allow you to use it in
+   certain ways. You may not
+      *  work around any technical limitations in the software;
+      *  reverse engineer, decompile or disassemble the software, or attempt
+         to derive the source code for the software, except and to the extent
+         required by third party licensing terms governing use of certain open
+         source components that may be included with the software;
+      *  remove, minimize, block or modify any notices of Microsoft or its
+         suppliers in the software;
+      *  use the software in any way that is against the law; or
+      *  share, publish, rent, or lease the software, or provide the software
+         as a stand-alone hosted solution for others to use.
+
+7. EXPORT RESTRICTIONS. You must comply with all domestic and
+   international export laws and regulations that apply to the software,
+   which include restrictions on destinations, end users and end use.
+   For further information on export restrictions, visit
+   (aka.ms/exporting).
+
+8. SUPPORT SERVICES. Because this software is “as is,” we may not
+provide support services for it.
+
+9. ENTIRE AGREEMENT. This agreement, and the terms for supplements,
+   updates, Internet-based services and support services that you use,
+   are the entire agreement for the software and support services.
+
+10. APPLICABLE LAW.  If you acquired the software in the United
+   States, Washington law applies to interpretation of and claims for
+   breach of this agreement, and the laws of the state where you live
+   apply to all other claims. If you acquired the software in any other
+   country, its laws apply.
+
+11. CONSUMER RIGHTS; REGIONAL VARIATIONS. This agreement describes
+   certain legal rights. You may have other rights, including consumer
+   rights, under the laws of your state or country. Separate and apart
+   from your relationship with Microsoft, you may also have rights with
+   respect to the party from which you acquired the software. This
+   agreement does not change those other rights if the laws of your state
+   or country do not permit it to do so. For example, if you acquired the
+   software in one of the below regions, or mandatory country law
+   applies, then the following provisions apply to you:
+
+   a. Australia. You have statutory guarantees under the Australian
+      Consumer Law and nothing in this agreement is intended to affect those
+      rights.
+
+   b. Canada. If you acquired this software in Canada, you may stop
+      receiving updates by turning off the automatic update feature,
+      disconnecting your device from the Internet (if and when you re-
+      connect to the Internet, however, the software will resume checking
+      for and installing updates), or uninstalling the software. The product
+      documentation, if any, may also specify how to turn off updates for
+      your specific device or software.
+
+   c. Germany and Austria.
+      (i)   Warranty. The properly licensed software will perform
+            substantially as described in any Microsoft materials that accompany
+            the software. However, Microsoft gives no contractual guarantee in
+            relation to the licensed software.
+      (ii)  Limitation of Liability. In case of intentional conduct, gross
+            negligence, claims based on the Product Liability Act, as well as, in
+            case of death or personal or physical injury, Microsoft is liable
+            according to the statutory law.
+            Subject to the foregoing clause (ii), Microsoft will only be liable
+            for slight negligence if Microsoft is in breach of such material
+            contractual obligations, the fulfillment of which facilitate the due
+            performance of this agreement, the breach of which would endanger the
+            purpose of this agreement and the compliance with which a party may
+            constantly trust in (so-called "cardinal obligations"). In other cases
+            of slight negligence, Microsoft will not be liable for slight
+            negligence.
+
+12. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS-IS.” YOU
+   BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES,
+   GUARANTEES OR CONDITIONS. TO THE EXTENT PERMITTED UNDER YOUR LOCAL
+   LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+13. LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM
+   MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU
+   CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST
+   PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
+
+   This limitation applies to (a) anything related to the software,
+   services, content (including code) on third party Internet sites, or
+   third party applications; and (b) claims for breach of contract,
+   breach of warranty, guarantee or condition, strict liability,
+   negligence, or other tort to the extent permitted by applicable law.
+
+   It also applies even if Microsoft knew or should have known about the
+   possibility of the damages. The above limitation or exclusion may not
+   apply to you because your country may not allow the exclusion or
+   limitation of incidental, consequential or other damages.
+
+Please note: As this software is distributed in Quebec, Canada, some
+of the clauses in this agreement are provided below in French.
+
+Remarque : Ce logiciel étant distribué au Québec, Canada, certaines
+des clauses dans ce contrat sont fournies ci-dessous en français.
+
+EXONÉRATION DE GARANTIE. Le logiciel visé par une licence est offert
+« tel quel ». Toute utilisation de ce logiciel est à votre seule
+risque et péril. Microsoft n’accorde aucune autre garantie
+expresse. Vous pouvez bénéficier de droits additionnels en vertu du
+droit local sur la protection des consommateurs, que ce contrat ne
+peut modifier. La ou elles sont permises par le droit locale, les
+garanties implicites de qualité marchande, d’adéquation à un
+usage particulier et d’absence de contrefaçon sont exclues.
+
+LIMITATION DES DOMMAGES-INTÉRÊTS ET EXCLUSION DE RESPONSABILITÉ
+POUR LES DOMMAGES. Vous pouvez obtenir de Microsoft et de ses
+fournisseurs une indemnisation en cas de dommages directs uniquement
+à hauteur de 5,00 $ US. Vous ne pouvez prétendre à aucune
+indemnisation pour les autres dommages, y compris les dommages
+spéciaux, indirects ou accessoires et pertes de bénéfices.
+
+Cette limitation concerne:
+
+   *  tout ce qui est relié au logiciel, aux services ou au contenu (y
+      compris le code) figurant sur des sites Internet tiers ou dans des
+      programmes tiers ; et
+   *  les réclamations au titre de violation de contrat ou de garantie,
+      ou au titre de responsabilité stricte, de négligence ou d’une
+      autre faute dans la limite autorisée par la loi en vigueur.
+
+Elle s’applique également, même si Microsoft connaissait ou
+devrait connaître l’éventualité d’un tel dommage. Si votre pays
+n’autorise pas l’exclusion ou la limitation de responsabilité
+pour les dommages indirects, accessoires ou de quelque nature que ce
+soit, il se peut que la limitation ou l’exclusion ci-dessus ne
+s’appliquera pas à votre égard.
+
+EFFET JURIDIQUE. Le présent contrat décrit certains droits
+juridiques. Vous pourriez avoir d’autres droits prévus par les lois
+de votre pays. Le présent contrat ne modifie pas les droits que vous
+confèrent les lois de votre pays si celles-ci ne le permettent pas.

Extension/README.md

@@ -0,0 +1,27 @@
+# C/C++ for Visual Studio Code
+This preview release of the extension adds language support for C/C++ to Visual Studio Code including:
+* Language service
+  * Code Formatting (clang-format)
+  * Auto-Completion (experimental)
+  * Symbol Searching
+  * Go to Definition/Declaration
+  * Peek Definition/Declaration
+  * Class/Method Navigation
+  * Signature Help
+  * Quick Info (Hover)
+  * Error Squiggles
+* Debugging
+  * Support for debugging Windows (PDB, MinGW/Cygwin), Linux and macOS applications
+  * Line by line code stepping
+  * Breakpoints (including conditional and function breakpoints)
+  * Variable inspection
+  * Multi-threaded debugging support
+  * Core dump debugging support
+  * Executing GDB or MI commands directly when using 'C++ (GDB/LLDB)' debugging environment
+  * For help configuring the debugger see [Configuring launch.json for C/C++ debugging](https://github.com/Microsoft/vscode-cpptools/blob/master/launch.md)
+    on our [GitHub page](https://github.com/Microsoft/vscode-cpptools).
+
+You can find more detailed information about C/C++ support for Visual Studio Code at our [GitHub page](https://github.com/Microsoft/vscode-cpptools/tree/master/Documentation) and our [VS Code documentation page](https://code.visualstudio.com/docs/languages/cpp).
+
+## Contact Us
+If you run into any issues or have suggestions for us, please file [issues and suggestions on GitHub](https://github.com/Microsoft/vscode-cpptools/issues). If you haven’t already provided us feedback, please take this [quick survey](https://www.research.net/r/VBVV6C6) to help shape this extension for your needs.

Extension/ReleaseNotes.html

@@ -0,0 +1,262 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <STYLE type="text/css">
+        body {
+            padding: 10px 20px;
+            line-height: 22px
+        }
+
+        img {
+            max-width: 100%;
+            max-height: 100%
+        }
+
+        a {
+            text-decoration: none
+        }
+
+        a:focus,
+        input:focus,
+        select:focus,
+        textarea:focus {
+            outline: 1px solid -webkit-focus-ring-color;
+            outline-offset: -1px
+        }
+
+        hr {
+            border: 0;
+            height: 2px;
+            border-bottom: 2px solid
+        }
+
+        h1 {
+            padding-bottom: .3em;
+            line-height: 1.2;
+            border-bottom-width: 1px;
+            border-bottom-style: solid
+        }
+
+        h1,
+        h2,
+        h3 {
+            font-weight: 400
+        }
+
+        a:hover {
+            text-decoration: underline
+        }
+
+        table {
+            border-collapse: collapse
+        }
+
+        table > thead > tr > th {
+            text-align: left
+        }
+
+        table > thead > tr > th,
+        table > thead > tr > td,
+        table > tbody > tr > th,
+        table > tbody > tr > td {
+            padding: 5px 10px
+        }
+
+        blockquote {
+            margin: 0 7px 0 5px;
+            padding: 0 16px 0 10px;
+            border-left: 5px solid
+        }
+
+        code {
+            font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
+            font-size: 14px;
+            line-height: 19px
+        }
+
+        .mac code {
+            font-size: 12px;
+            line-height: 18px
+        }
+
+        code > div {
+            padding: 16px;
+            border-radius: 3px;
+            overflow: auto
+        }
+
+        .monaco-tokenized-source {
+            white-space: pre
+        }
+
+        /** Theming */
+
+        .vscode-light {
+            color: #1e1e1e
+        }
+
+        .vscode-dark {
+            color: #ddd
+        }
+
+        .vscode-high-contrast {
+            color: #fff
+        }
+
+        .vscode-light code {
+            color: #a31515
+        }
+
+        .vscode-dark code {
+            color: #d7ba7d
+        }
+
+        .vscode-light code > div {
+            background-color: rgba(220, 220, 220, .4)
+        }
+
+        .vscode-dark code > div {
+            background-color: rgba(10, 10, 10, .4)
+        }
+
+        .vscode-high-contrast code > div {
+            background-color: #000
+        }
+
+        .vscode-high-contrast h1 {
+            border-color: #000
+        }
+
+        .vscode-light table > thead > tr > th {
+            border-color: rgba(0, 0, 0, .69)
+        }
+
+        .vscode-dark table > thead > tr > th {
+            border-color: rgba(255, 255, 255, .69)
+        }
+
+        .vscode-light h1,
+        .vscode-light hr,
+        .vscode-light table > tbody > tr + tr > td {
+            border-color: rgba(0, 0, 0, .18)
+        }
+
+        .vscode-dark h1,
+        .vscode-dark hr,
+        .vscode-dark table > tbody > tr + tr > td {
+            border-color: rgba(255, 255, 255, 0.18)
+        }
+
+        .vscode-light blockquote,
+        .vscode-dark blockquote {
+            background: rgba(127, 127, 127, .1);
+            border-color: rgba(0, 122, 204, .5)
+        }
+
+        .vscode-high-contrast blockquote {
+            background: transparent;
+            border-color: #fff
+        }
+
+        .main-content {
+            width: 65%;
+            vertical-align: top
+        }
+
+        .sidebar {
+            vertical-align: top
+        }
+
+        .footer {
+            padding: 25px;
+            text-align: center
+        }
+
+        .vscode-light table > tbody > tr > td.sidebar {
+            background-color: rgba(0, 0, 0, 0.1);
+            border-radius: 10px
+        }
+
+        .vscode-dark table > tbody > tr > td.sidebar {
+            background-color: rgba(255, 255, 255, 0.1);
+            border-radius: 10px
+        }
+
+        .vscode-light a {
+            color: #4080D0
+        }
+
+        .vscode-dark a {
+            color: #a2c1e8
+        }
+    </STYLE>
+</head>
+
+<body>
+    <div>
+        <div>
+            <h1>Microsoft C/C++ Extension for VS Code</h1>
+        </div>
+        <table>
+            <tr>
+                <td class="main-content">
+                    <table>
+                        <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/>
+                                        <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>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+                <td class="sidebar">
+                    <table>
+                        <tr>
+                            <td>
+                                <div>
+                                    <h3 class="caption">Getting Started</h3>
+                                    <div><a href="https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/Getting%20started%20with%20IntelliSense%20configuration.md">Configuring IntelliSense</a></div>
+                                    <div><a href="https://github.com/Microsoft/vscode-cpptools/blob/master/launch.md">Configuring Debugging</a></div>
+                                    <div><a href="https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/LanguageServer/MinGW.md">IntelliSense for MinGW projects</a></div>
+                                    <div><a href="https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/LanguageServer/Windows%20Subsystem%20for%20Linux.md">IntelliSense for Windows Subsystem for Linux projects</a></div>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <div>
+                                    <h3 class="caption">Blog Posts</h3>
+                                    <div><a href="https://blogs.msdn.microsoft.com/vcblog/2018/08/23/visual-studio-code-c-c-extension-august-2018-update/">August 2018 Update</a></div>
+                                    <div><a href="https://blogs.msdn.microsoft.com/vcblog/2018/07/25/visual-studio-code-cc-extension-july-2018-update-and-intellisense-auto-configuration-for-cmake/">July 2018 Update</a></div>
+                                    <div><a href="https://blogs.msdn.microsoft.com/vcblog/2018/06/21/visual-studio-code-cc-extension-june-2018-update/">June 2018 Update</a></div>
+                                    <div><a href="https://blogs.msdn.microsoft.com/vcblog/2016/03/31/cc-extension-for-visual-studio-code/">C/C++ Extension anouncement</a></div>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2" class="footer">
+                    <div>
+                        Having trouble with the extension? -
+                        <a href="https://github.com/Microsoft/vscode-cpptools/tree/master/Documentation">Browse the documentation</a> -
+                        <a href="https://www.github.com/Microsoft/vscode-cpptools/issues">Report an issue</a>
+                    </div>
+                </td>
+            </tr>
+
+        </table>
+    </div>
+</body>
+
+</html>

Extension/bin/msvc.32.intel.json

@@ -0,0 +1,17 @@
+  {
+    "defaults": [
+      "-D_MSC_EXTENSIONS",
+      "--microsoft",
+      "--microsoft_bugs",
+      "--microsoft_version",
+      "1914",
+      "--pack_alignment",
+      "8",
+      "-D_MSC_VER=1914",
+      "-D_MSC_FULL_VER=191426428",
+      "-D_MSC_BUILD=0",
+      "-D_M_IX86=600",
+      "-D_M_IX86_FP=2"
+    ],
+    "defaults_op" :  "merge"
+  }

Extension/bin/msvc.64.darwin.json

@@ -0,0 +1,7 @@
+  {
+    "defaults": [
+      "--pack_alignment",
+      "8"
+    ],
+    "defaults_op" :  "merge"
+  }

Extension/bin/msvc.64.darwin.msvc.json

@@ -0,0 +1,18 @@
+  {
+    "defaults": [
+      "-D_MSC_EXTENSIONS",
+      "--microsoft",
+      "--microsoft_bugs",
+      "--microsoft_version",
+      "1914",
+      "--pack_alignment",
+      "8",
+      "-D_CPPUNWIND=1",
+      "-D_MSC_VER=1914",
+      "-D_MSC_FULL_VER=191426428",
+      "-D_MSC_BUILD=0",
+      "-D_M_X64=100",
+      "-D_M_AMD64=100"
+    ],
+    "defaults_op" :  "merge"
+  }

Extension/bin/msvc.64.intel.clang.json

@@ -0,0 +1,7 @@
+  {
+    "defaults": [
+      "--pack_alignment",
+      "8"
+    ],
+    "defaults_op" :  "merge"
+  }

Extension/bin/msvc.64.intel.json

@@ -0,0 +1,18 @@
+  {
+    "defaults": [
+      "-D_MSC_EXTENSIONS",
+      "--microsoft",
+      "--microsoft_bugs",
+      "--microsoft_version",
+      "1914",
+      "--pack_alignment",
+      "8",
+      "-D_CPPUNWIND=1",
+      "-D_MSC_VER=1914",
+      "-D_MSC_FULL_VER=191426428",
+      "-D_MSC_BUILD=0",
+      "-D_M_X64=100",
+      "-D_M_AMD64=100"
+    ],
+    "defaults_op" :  "merge"
+  }

Extension/bin/msvc.64.linux.json

@@ -0,0 +1,7 @@
+  {
+    "defaults": [
+      "--pack_alignment",
+      "8"
+    ],
+    "defaults_op" :  "merge"
+  }

Extension/bin/msvc.64.linux.msvc.json

@@ -0,0 +1,18 @@
+  {
+    "defaults": [
+      "-D_MSC_EXTENSIONS",
+      "--microsoft",
+      "--microsoft_bugs",
+      "--microsoft_version",
+      "1914",
+      "--pack_alignment",
+      "8",
+      "-D_CPPUNWIND=1",
+      "-D_MSC_VER=1914",
+      "-D_MSC_FULL_VER=191426428",
+      "-D_MSC_BUILD=0",
+      "-D_M_X64=100",
+      "-D_M_AMD64=100"
+    ],
+    "defaults_op" :  "merge"
+  }

Extension/bin/msvc.json

@@ -0,0 +1,33 @@
+  {
+    "defaults": [
+      "cpfe",
+      "--wchar_t_keyword",
+      "--no_warnings",
+      "--rtti",
+      "--edge",
+      "--exceptions",
+      "--error_limit",
+      "25000",
+      "-D_EDG_COMPILER",
+      "-D_USE_DECLSPECS_FOR_SAL=1"
+    ],
+    "source_file_format": "-f %s",
+    "expressions": [
+      {
+        "match": "^/I(.*)",
+        "replace": "-I\n$1"
+      },
+      {
+        "match": "^/D(.*)",
+        "replace": "-D$1"
+      },
+      {
+        "match": "^/AI(.*)",
+        "replace": "--using_directory\n$1"
+      },
+      {
+        "match": "^/dE--header_only_fallback",
+        "replace": "--header_only_fallback"
+      }
+    ]
+  }

Extension/c_cpp_properties.schema.json

@@ -0,0 +1,160 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "definitions": {
+        "configurations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "required": [
+                    "name"
+                ],
+                "properties": {
+                    "name": {
+                        "description": "Configuration identifier. Mac, Linux, and Win32 are special identifiers for configurations that will be auto-selected on those platforms, but the identifier can be anything.",
+                        "type": "string"
+                    },
+                    "compilerPath": {
+                        "description": "Full path of the compiler being used, e.g. /usr/bin/gcc, to enable more accurate IntelliSense. Args can be added to modify the includes/defines used, e.g. -nostdinc++, -m32, etc., but paths with spaces must be surrounded with \\\" if args are used.",
+                        "type": "string"
+                    },
+                    "cStandard": {
+                        "description": "Version of the C language standard to use for IntelliSense.",
+                        "type": "string",
+                        "enum": [
+                            "c89",
+                            "c99",
+                            "c11",
+                            "${default}"
+                        ]
+                    },
+                    "cppStandard": {
+                        "description": "Version of the C++ language standard to use for IntelliSense.",
+                        "type": "string",
+                        "enum": [
+                            "c++98",
+                            "c++03",
+                            "c++11",
+                            "c++14",
+                            "c++17",
+                            "${default}"
+                        ]
+                    },
+                    "compileCommands": {
+                        "description": "Full path to compile_commands.json file for the workspace.",
+                        "type": "string"
+                    },
+                    "includePath": {
+                        "description": "A list of paths for the IntelliSense engine to use while searching for included headers. Searching on these paths is not recursive.",
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    },
+                    "macFrameworkPath": {
+                        "description": "A list of paths for the Intellisense engine to use while searching for included headers from Mac frameworks. Only supported on Mac configuration.",
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    },
+                    "windowsSdkVersion": {
+                        "description": "Version of the Windows SDK include path to use on Windows, e.g. '10.0.17134.0'.",
+                        "type": "string",
+                        "pattern": "^\\d{2}\\.\\d{1}\\.\\d{5}\\.\\d{1}$|^8\\.1$"
+                    },
+                    "defines": {
+                        "description": "A list of preprocessor definitions for the IntelliSense engine to use while parsing files. Optionally, use = to set a value, e.g. VERSION=1.",
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    },
+                    "intelliSenseMode": {
+                        "description": "If set, it overrides the default mode used by the IntelliSense engine. Windows defaults to msvc-x64, Linux defaults to gcc-x64, and Mac default to clang-x64.",
+                        "type": "string",
+                        "enum": [
+                            "msvc-x64",
+                            "gcc-x64",
+                            "clang-x64",
+                            "${default}"
+                        ]
+                    },
+                    "forcedInclude": {
+                        "description": "A list of files that should be included before any include file in a translation unit.",
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    },
+                    "configurationProvider": {
+                        "description": "The id of a VS Code extension that can provide IntelliSense configuration information for source files.",
+                        "type": "string"
+                    },
+                    "browse": {
+                        "type": "object",
+                        "properties": {
+                            "limitSymbolsToIncludedHeaders": {
+                                "description": "true to process only those files directly or indirectly included as headers, false to process all files under the specified include paths.",
+                                "type": [
+                                    "boolean",
+                                    "string"
+                                ]
+                            },
+                            "databaseFilename": {
+                                "description": "Path to the generated symbol database. If a relative path is specified, it will be made relative to the workspace's default storage location.",
+                                "type": "string"
+                            },
+                            "path": {
+                                "description": "A list of paths for the tag parser to use while searching for included headers. Searching on these paths is recursive by default. Specify '*' to indicate non-recursive search. For example: '/usr/include' will search through all subdirectories while '/usr/include/*' will not.",
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "env": {
+            "type": "object",
+            "description": "Custom variables that can be reused anywhere in this file using the ${variable} or ${env:variable} syntax.",
+            "patternProperties": {
+                "(?!^workspaceFolder$)(?!^workspaceRoot$)(?!^workspaceFolderBasename$)(?!^default$)(^.+$)": {
+                    "oneOf": [
+                        {
+                            "type": "string"
+                        },
+                        {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    ]
+                }
+            },
+            "additionalProperties": false
+        },
+        "version": {
+            "type": "integer",
+            "description": "Version of the configuration file. This property is managed by the extension. Please do not change it."
+        }
+    },
+    "properties": {
+        "configurations": {
+            "$ref": "#/definitions/configurations"
+        },
+        "env": {
+            "$ref": "#/definitions/env"
+        },
+        "version": {
+            "$ref": "#/definitions/version"
+        }
+    },
+    "required": [
+        "configurations",
+        "version"
+    ]
+}

Extension/cpp.hint

@@ -0,0 +1,2 @@
+// https://go.microsoft.com/fwlink/?linkid=865984
+#pragma inject_default_hints

Extension/cpp_snippets.json

@@ -0,0 +1,140 @@
+{
+  "class": {
+    "prefix": "class",
+    "body": "\nclass ${1:${TM_FILENAME_BASE}}\n{\nprivate:\n\t${2:/* data */}\npublic:\n\t${1}(${3:/* args */});\n\t~${1}();\n};\n\n${1}::${1}(${3})\n{\n}\n\n${1}::~${1}()\n{\n}\n",
+    "description": "Code snippet for class",
+    "scope": "source.c++, source.objc++"
+  },
+  "classi": {
+    "prefix": "classi",
+    "body": "\nclass ${1:${TM_FILENAME_BASE}}\n{\nprivate:\n\t${2:/* data */}\npublic:\n\t${1}(${3:/* args */}) { $0}\n\t~${1}() { }\n};",
+    "description": "Code snippet for class with inlined constructor/destructor",
+    "scope": "source.c++, source.objc++"
+  },
+  "classt": {
+    "prefix": "classt",
+    "body": "\ntemplate<typename T>\nclass ${1:${TM_FILENAME_BASE}}\n{\nprivate:\n\tT ${2:/* data */}\npublic:\n\t${1}(T ${3:/* args */});\n};\n",
+    "description": "Code snippet for class template",
+    "scope": "source.c++, source.objc++"
+  },
+  "struct": {
+    "prefix": "struct",
+    "body": "\nstruct ${1:${TM_FILENAME_BASE}}\n{\n\t${0:/* data */}\n};\n",
+    "description": "Code snippet for struct",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "union": {
+    "prefix": "union",
+    "body": "\nunion ${1:${TM_FILENAME_BASE}}\n{\n\t${0:/* data */}\n};\n",
+    "description": "Code snippet for union",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "if": {
+    "prefix": "if",
+    "body": "\nif (${1:/* condition */}) {\n\t${0:/* code */}\n}\n",
+    "description": "Code snippet for if()",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "ifel": {
+    "prefix": "ifel",
+    "body": "\nif (${1:/* condition */}) {\n\t${2:/* code */}\n}\nelse {\n\t${0:/* code */}\n}\n",
+    "description": "Code snippet for if() else",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "ifelif": {
+    "prefix": "ifelif",
+    "body": "\nif (${1:/* condition */}) {\n\t${2:/* code */}\n}\nelse if(${3:/* condition */}) {\n\t${4:/* code */}\n}\nelse {\n\t${0:/* code */}\n}\n",
+    "description": "Code snippet for if() else if() else",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "else": {
+    "prefix": "else",
+    "body": "\nelse\n{\n\t${0:/* code */}\n}\n",
+    "description": "Code snippet for else",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "elif": {
+    "prefix": "elif",
+    "body": "\nelse if (${1:/* condition */})\n{\n\t${0:/* code */}\n}\n",
+    "description": "Code snippet for else if ()",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "switch": {
+    "prefix": "switch",
+    "body": "\nswitch (${1:expression})\n{\n\tcase ${2:/* constant-expression */}:\n\t\t${3:/* code */}\n\t\tbreak;\n\n\tdefault:\n\t\tbreak;\n}",
+    "description": "Code snippet for switch",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "main": {
+    "prefix": "main",
+    "body": "main(int argc, char const *argv[])\n{\n\t${1:/* code */}\n\treturn 0;\n}\n",
+    "description": "Code snippet for main()",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "do": {
+    "prefix": "do_",
+    "body": "\ndo\n{\n\t${0:/* code */}\n} while (${1:/* condition */});\n",
+    "description": "Code snippet for do while loop",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "for": {
+    "prefix": "for",
+    "body": "\nfor(${1:size_t} ${2:i} = 0; $2 < ${3:count}; ${4:$2++})\n{\n\t${0:/* code */}\n}\n",
+    "description": "Code snippet for for loop",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "forr": {
+    "prefix": "forr",
+    "body": "\nfor(int ${1:i} = ${2:length} - 1; $1 >= 0; ${3:$1--})\n{\n\t${0:/* code */}\n}\n",
+    "description": "Code snippet for reverse for loop",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "foreach": {
+    "prefix": "foreach",
+    "body": "\nfor(${1:object} = ${2:var} in ${3:collection})\n{\n\t${0:/* code */}\n}\n",
+    "description": "Code snippet for foreach loop",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "forrange": {
+    "prefix": "forrange",
+    "body": "\nfor(auto&& ${1:i} : ${2:v})\n{\n\t$0\n}\n",
+    "description": "Code snippet for range-based forloop",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "while": {
+    "prefix": "while",
+    "body": "\nwhile(${1:/* condition */}){\n\t${2:/* code */}\n}\n",
+    "description": "Code snippet for while loop",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "ifd": {
+    "prefix": "ifnd",
+    "body": "\n#if defined($1)\n\n${0}\n\n#endif // $1\n",
+    "description": "Code snippet for if defined()",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "ifnd": {
+    "prefix": "ifnd",
+    "body": "\n#if !defined($1)\n#define ${1:MACRO}\n\n${0}\n\n#endif // $1\n",
+    "description": "Code snippet for if !defined()",
+    "scope": "source.c, source.objc, source.c++, source.objc++"
+  },
+  "mitl": {
+    "prefix": "mitl",
+    "body": "\n// The MIT License (MIT)\n\n// Copyright (c) ${1:YEAR} ${2:NAME}\n\n//  Permission is hereby granted, free of charge, to any person obtaining a\n//  copy of this software and associated documentation files (the \"Software\"),\n//  to deal in the Software without restriction, including without limitation\n//  the rights to use, copy, modify, merge, publish, distribute, sublicense,\n//  and/or sell copies of the Software, and to permit persons to whom the\n//  Software is furnished to do so, subject to the following conditions:\n//\n//  The above copyright notice and this permission notice shall be included in\n//  all copies or substantial portions of the Software.\n//\n//  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\n//  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER\n//  DEALINGS IN THE SOFTWARE.\n\n${0:/* code */}\n",
+    "description": "Code snippet for MIT License",
+    "scope": ""
+  },
+  "namesp": {
+    "prefix": "namesp",
+    "body": "\nnamespace ${1:name}\n{\n\t$0\n} // $1\n",
+    "description": "Code snippet for namespace",
+    "scope": "source.c++, source.objc++"
+  },
+  "try": {
+    "prefix": "try",
+    "body": "\ntry\n{\n\t${1:/* code */}\n}\ncatch(${2:const std::exception& e})\n{\n\t${0:std::cerr << e.what() << '\\n';}\n}\n",
+    "description": "Code snippet for try catch block",
+    "scope": "source.c++, source.objc++, source.c++11"
+  }
+}

Extension/cppdbg.ad7Engine.json

@@ -0,0 +1,6 @@
+{
+  "engineAssemblyName": "Microsoft.MIDebugEngine",
+  "engineClassName": "Microsoft.MIDebugEngine.AD7Engine",
+  "conditionalBP": true,
+  "functionBP": true
+}

Extension/cpptools.json

@@ -0,0 +1,6 @@
+{
+    "intelliSenseEngine_default_percentage": 100,
+    "defaultIntelliSenseEngine": 100,
+    "recursiveIncludes": 100,
+    "gotoDefIntelliSense": 100
+}

Extension/gulpfile.js

@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+const gulp = require('gulp');
+const env = require('gulp-env')
+const tslint = require('gulp-tslint');
+const mocha = require('gulp-mocha');
+const fs = require('fs');
+const optionsSchemaGenerator = require('./out/tools/GenerateOptionsSchema');
+
+gulp.task('unitTests', () => {
+    env.set({
+            CODE_TESTS_PATH: "./out/test/unitTests",
+        });
+
+    gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
+        .pipe(mocha({ ui: "tdd" }))
+        .once('error', err => process.exit(1))
+        .once('end', () => process.exit())
+});
+
+gulp.task('integrationTests', () => {
+    env.set({
+            CODE_TESTS_PATH: "./out/test/integrationTests",
+            CODE_TESTS_WORKSPACE: "./test/integrationTests/testAssets/SimpleCppProject"
+        });
+
+    gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
+        .pipe(mocha({ ui: "tdd" }))
+        .once('error', err => process.exit(1))
+        .once('end', () => process.exit())
+});
+
+gulp.task('allTests', ['unitTests', 'integrationTests']);
+
+/// Misc Tasks
+const allTypeScript = [
+    'src/**/*.ts',
+    'tools/**/*.ts',
+    '!**/*.d.ts',
+    '!**/typings**'
+];
+
+const lintReporter = (output, file, options) => {
+    //emits: src/helloWorld.c:5:3: warning: implicit declaration of function ‘prinft’
+    var relativeBase = file.base.substring(file.cwd.length + 1).replace('\\', '/');
+    output.forEach(e => {
+        var message = relativeBase + e.name + ':' + (e.startPosition.line + 1) + ':' + (e.startPosition.character + 1) + ': ' + e.failure;
+        console.log('[tslint] ' + message);
+    });
+};
+
+gulp.task('tslint', () => {
+    gulp.src(allTypeScript)
+        .pipe(tslint({
+            program: require('tslint').Linter.createProgram("./tsconfig.json"),
+            configuration: "./tslint.json"
+        }))
+        .pipe(tslint.report(lintReporter, {
+            summarizeFailureOutput: false,
+            emitError: false
+        }))
+});
+
+gulp.task('pr-check', () => {
+    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`.');
+        process.exit(1);
+    }
+});
+
+gulp.task('generateOptionsSchema', () => {
+    optionsSchemaGenerator.generateOptionsSchema();
+});

Extension/notices/ThirdPartyNotices.LLVM.txt

@@ -0,0 +1,216 @@
+
+THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
+Do Not Translate or Localize
+
+This package is for the Microsoft C/C++ Extension for Visual Studio Code. This package includes components from the projects listed below. Microsoft licenses these components under the Microsoft C/C++ Extension for Visual Studio Code license terms. 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. 
+
+
+1.	Clang (http://clang.llvm.org/)
+2.	LLDB  (http://lldb.llvm.org/)
+3.	LLVM (http://llvm.org/)
+
+
+%% Clang NOTICES AND INFORMATION BEGIN HERE
+=========================================
+LLVM Release License
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 2007-2015 University of Illinois at Urbana-Champaign.
+All rights reserved.
+
+Developed by:
+
+    LLVM Team
+
+    University of Illinois at Urbana-Champaign
+
+    http://llvm.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLVM Team, University of Illinois at
+      Urbana-Champaign, nor the names of its contributors may be used to
+      endorse or promote products derived from this Software without specific
+      prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
+==============================================================================
+The LLVM software contains code written by third parties.  Such software will
+have its own individual LICENSE.TXT file in the directory in which it appears.
+This file will describe the copyrights, license, and restrictions which apply
+to that code.
+
+The disclaimer of warranty in the University of Illinois Open Source License
+applies to all code in the LLVM Distribution, and nothing in any of the
+other licenses gives permission to use the names of the LLVM Team or the
+University of Illinois to endorse or promote products derived from this
+Software.
+
+This project may include:
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ * 
+ * Disclaimer
+ * 
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ * 
+ * Limitations on Rights to Redistribute This Code
+ * 
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+
+=========================================
+END OF Clang NOTICES AND INFORMATION
+
+%% LLDB  NOTICES AND INFORMATION BEGIN HERE
+=========================================
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 2010 Apple Inc.
+All rights reserved.
+
+Developed by:
+
+    LLDB Team
+
+    http://lldb.llvm.org/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLDB Team, copyright holders, nor the names of 
+      its contributors may be used to endorse or promote products derived from 
+      this Software without specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+=========================================
+END OF LLDB  NOTICES AND INFORMATION
+
+%% LLVM NOTICES AND INFORMATION BEGIN HERE
+=========================================
+LLVM Release License
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 2003-2015 University of Illinois at Urbana-Champaign.
+All rights reserved.
+
+Developed by:
+
+    LLVM Team
+
+    University of Illinois at Urbana-Champaign
+
+    http://llvm.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLVM Team, University of Illinois at
+      Urbana-Champaign, nor the names of its contributors may be used to
+      endorse or promote products derived from this Software without specific
+      prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
+==============================================================================
+Copyrights and Licenses for Third Party Software Distributed with LLVM:
+==============================================================================
+The LLVM software contains code written by third parties.  Such software will
+have its own individual LICENSE.TXT file in the directory in which it appears.
+This file will describe the copyrights, license, and restrictions which apply
+to that code.
+
+The disclaimer of warranty in the University of Illinois Open Source License
+applies to all code in the LLVM Distribution, and nothing in any of the
+other licenses gives permission to use the names of the LLVM Team or the
+University of Illinois to endorse or promote products derived from this
+Software.
+
+The following pieces of software have additional or alternate copyrights,
+licenses, and/or restrictions:
+
+Program             Directory
+-------             ---------
+Autoconf            llvm/autoconf
+                    llvm/projects/ModuleMaker/autoconf
+Google Test         llvm/utils/unittest/googletest
+OpenBSD regex       llvm/lib/Support/{reg*, COPYRIGHT.regex}
+pyyaml tests        llvm/test/YAMLParser/{*.data, LICENSE.TXT}
+ARM contributions   llvm/lib/Target/ARM/LICENSE.TXT
+md5 contributions   llvm/lib/Support/MD5.cpp llvm/include/llvm/Support/MD5.h
+
+=========================================
+END OF LLVM NOTICES AND INFORMATION
+
+
+
+
+
+
+
+

Extension/notices/ThirdPartyNotices.Mono.txt

@@ -0,0 +1,170 @@
+
+THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
+Do Not Translate or Localize
+
+
+This package is for the Microsoft C/C++ Extension for Visual Studio Code. This package includes components from the projects listed below. Microsoft licenses these components under the Microsoft C/C++ Extension for Visual Studio Code license terms. 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. 
+
+
+1.	Mono  (https://github.com/mono/mono)
+
+
+%% Mono  NOTICES AND INFORMATION BEGIN HERE
+=========================================
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and its contributors. All rights reserved.  
+
+Permission is hereby granted, free of charge, to any person obtaining a copy  
+of this software and associated documentation files (the "Software"), to deal  
+in the Software without restriction, including without limitation the rights  
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies  
+of the Software, and to permit persons to whom the Software is furnished to do  
+so, subject to the following conditions:  
+ 
+The above copyright notice and this permission notice shall be included in all  
+copies or substantial portions of the Software.   
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR  
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE  
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER  
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,  
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN  
+THE SOFTWARE.  
+
+The following code is linked with the final Mono runtime, the libmono
+embeddable runtime:
+
+* support/minizip: BSD license (modified). 
+* Copyright (C) 1998-2005 Gilles Vollant
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+* mono/utils/freebsd-dwarf.h.
+ * Copyright (c) 2007 John Birrell ([email protected])
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+*  mono/utils/freebsd-elf_common.h, freebsd-elf64.h freebsd-elf32.h: BSD license.
+ * Copyright (c) 1998 John D. Polstra.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+* mono/utils/bsearch.c: BSD license.
+ * Taken from NetBSD with some minor modifications.
+ *
+ * Copyright (c) 1990, 1993
+ * The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+* mono/io-layer/wapi_glob.h, wapi_glob.c: BSD license
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Guido van Rossum.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+=========================================
+END OF Mono  NOTICES AND INFORMATION
+ 

Extension/src/Debugger/attachToProcess.ts

@@ -0,0 +1,181 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import { execChildProcess } from '../common';
+import { PsProcessParser } from './nativeAttach';
+
+import * as debugUtils from './utils';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import * as util from '../common';
+import * as vscode from 'vscode';
+
+export interface AttachItem extends vscode.QuickPickItem {
+    id: string;
+}
+
+export interface AttachItemsProvider {
+    getAttachItems(): Promise<AttachItem[]>;
+}
+
+export class AttachPicker {
+    constructor(private attachItemsProvider: AttachItemsProvider) { }
+
+    public ShowAttachEntries(): Promise<string> {
+        return util.isExtensionReady().then(ready => {
+            if (!ready) {
+                util.displayExtensionNotReadyPrompt();
+            } else {
+                return this.attachItemsProvider.getAttachItems()
+                    .then(processEntries => {
+                        let attachPickOptions: vscode.QuickPickOptions = {
+                            matchOnDescription: true,
+                            matchOnDetail: true,
+                            placeHolder: "Select the process to attach to"
+                        };
+
+                        return vscode.window.showQuickPick(processEntries, attachPickOptions)
+                            .then(chosenProcess => {
+                                return chosenProcess ? chosenProcess.id : Promise.reject<string>(new Error("Process not selected."));
+                            });
+                    });
+            }
+        });
+    }
+}
+
+export class RemoteAttachPicker {
+    constructor() {
+        this._channel = vscode.window.createOutputChannel('remote-attach');
+    }
+
+    private _channel: vscode.OutputChannel = null;
+
+    public ShowAttachEntries(config: any): Promise<string> {
+        return util.isExtensionReady().then(ready => {
+            if (!ready) {
+                util.displayExtensionNotReadyPrompt();
+            } else {
+                this._channel.clear();
+
+                let pipeTransport: any = config ? config.pipeTransport : null;
+
+                if (pipeTransport === null) {
+                    return Promise.reject<string>(new Error("Chosen debug configuration does not contain pipeTransport"));
+                }
+
+                let pipeProgram: string = null;
+
+                if (os.platform() === 'win32' &&
+                    pipeTransport.pipeProgram &&
+                    !fs.existsSync(pipeTransport.pipeProgram)) {
+                    const pipeProgramStr: string = pipeTransport.pipeProgram.toLowerCase().trim();
+                    const expectedArch: debugUtils.ArchType = debugUtils.ArchType[process.arch];
+                    
+                    // Check for pipeProgram
+                    if (!fs.existsSync(config.pipeTransport.pipeProgram)) {
+                        pipeProgram = debugUtils.ArchitectureReplacer.checkAndReplaceWSLPipeProgram(pipeProgramStr, expectedArch);
+                    }
+
+                    // If pipeProgram does not get replaced and there is a pipeCwd, concatenate with pipeProgramStr and attempt to replace.
+                    if (!pipeProgram && config.pipeTransport.pipeCwd) {
+                        const pipeCwdStr: string = config.pipeTransport.pipeCwd.toLowerCase().trim();
+                        const newPipeProgramStr: string = path.join(pipeCwdStr, pipeProgramStr);
+                        
+                        if (!fs.existsSync(newPipeProgramStr)) {
+                            pipeProgram = debugUtils.ArchitectureReplacer.checkAndReplaceWSLPipeProgram(newPipeProgramStr, expectedArch);
+                        }
+                    }
+                }
+
+                if (!pipeProgram) {
+                    pipeProgram = pipeTransport.pipeProgram;
+                }
+
+                let pipeArgs: string[] = pipeTransport.pipeArgs;
+
+                let argList: string = RemoteAttachPicker.createArgumentList(pipeArgs);
+
+                let pipeCmd: string = `"${pipeProgram}" ${argList}`;
+
+                return this.getRemoteOSAndProcesses(pipeCmd)
+                    .then(processes => {
+                        let attachPickOptions: vscode.QuickPickOptions = {
+                            matchOnDetail: true,
+                            matchOnDescription: true,
+                            placeHolder: "Select the process to attach to"
+                        };
+
+                        return vscode.window.showQuickPick(processes, attachPickOptions)
+                            .then(item => {
+                                return item ? item.id : Promise.reject<string>(new Error("Process not selected."));
+                            });
+                    });
+            }
+        });
+    }
+
+    private getRemoteOSAndProcesses(pipeCmd: string): Promise<AttachItem[]> {
+        // Commands to get OS and processes
+        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 => {
+            // OS will be on first line
+            // Processess will follow if listed
+            let lines: string[] = output.split(/\r?\n/);
+
+            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") {
+                    return Promise.reject<AttachItem[]>(new Error(`Operating system "${remoteOS}" not supported.`));
+                }
+
+                // Only got OS from uname
+                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) {
+                                    return 0;
+                                }
+                                return 1;
+                            }
+                            if (b.name === undefined) {
+                                return -1;
+                            }
+                            let aLower: string = a.name.toLowerCase();
+                            let bLower: string = b.name.toLowerCase();
+                            if (aLower === bLower) {
+                                return 0;
+                            }
+                            return aLower < bLower ? -1 : 1;
+                        })
+                        .map(p => p.toAttachItem());
+                }
+            }
+        });
+    }
+
+    private static createArgumentList(args: string[]): string {
+        let argsString: string = "";
+
+        for (let arg of args) {
+            if (argsString) {
+                argsString += " ";
+            }
+            argsString += `"${arg}"`;
+        }
+
+        return argsString;
+    }
+}

Extension/src/Debugger/configurationProvider.ts

@@ -0,0 +1,230 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import * as debugUtils from './utils';
+import * as os from 'os';
+import * as path from 'path';
+import * as vscode from 'vscode';
+
+import { IConfiguration, IConfigurationSnippet, DebuggerType, MIConfigurations, WindowsConfigurations, WSLConfigurations, PipeTransportConfigurations } from './configurations';
+import { parse } from 'jsonc-parser';
+
+abstract class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
+    private type: DebuggerType;
+    private provider: IConfigurationAssetProvider;
+
+    public constructor(provider: IConfigurationAssetProvider, type: DebuggerType) {
+        this.provider = provider;
+        this.type = type;
+    }
+
+    /**
+	 * Returns a list of initial debug configurations based on contextual information, e.g. package.json or folder.
+	 */
+    provideDebugConfigurations(folder: vscode.WorkspaceFolder | undefined, token?: vscode.CancellationToken): vscode.ProviderResult<vscode.DebugConfiguration[]> {
+        return this.provider.getInitialConfigurations(this.type);
+    }
+
+    /**
+	 * Try to add all missing attributes to the debug configuration being launched.
+	 */
+    resolveDebugConfiguration(folder: vscode.WorkspaceFolder | undefined, config: vscode.DebugConfiguration, token?: vscode.CancellationToken): vscode.ProviderResult<vscode.DebugConfiguration> {
+        if (config) {
+            // Fail if cppvsdbg type is running on non-Windows
+            if (config.type === 'cppvsdbg' && os.platform() !== 'win32') {
+                vscode.window.showErrorMessage("Debugger of type: 'cppvsdbg' is only available on Windows. Use type: 'cppdbg' on the current OS platform.");
+                return undefined;
+            }
+
+            // Modify WSL config for OpenDebugAD7
+            if (os.platform() === 'win32' &&
+                config.pipeTransport &&
+                config.pipeTransport.pipeProgram) {
+                let replacedPipeProgram: string = null;
+                const pipeProgramStr: string = config.pipeTransport.pipeProgram.toLowerCase().trim();
+
+                // OpenDebugAD7 is a 32-bit process. Make sure the WSL pipe transport is using the correct program.
+                replacedPipeProgram = debugUtils.ArchitectureReplacer.checkAndReplaceWSLPipeProgram(pipeProgramStr, debugUtils.ArchType.ia32);
+
+                // If pipeProgram does not get replaced and there is a pipeCwd, concatenate with pipeProgramStr and attempt to replace.
+                if (!replacedPipeProgram && !path.isAbsolute(pipeProgramStr) && config.pipeTransport.pipeCwd) {
+                    const pipeCwdStr: string = config.pipeTransport.pipeCwd.toLowerCase().trim();
+                    const newPipeProgramStr: string = path.join(pipeCwdStr, pipeProgramStr);
+
+                    replacedPipeProgram = debugUtils.ArchitectureReplacer.checkAndReplaceWSLPipeProgram(newPipeProgramStr, debugUtils.ArchType.ia32);
+                }
+
+                if (replacedPipeProgram) {
+                    config.pipeTransport.pipeProgram = replacedPipeProgram;
+                }
+            }
+        }
+        // if config or type is not specified, return null to trigger VS Code to open a configuration file https://github.com/Microsoft/vscode/issues/54213 
+        return config && config.type ? config : null;
+    }
+}
+
+export class CppVsDbgConfigurationProvider extends CppConfigurationProvider {
+    public constructor(provider: IConfigurationAssetProvider) {
+        super(provider, DebuggerType.cppvsdbg);
+    }
+}
+
+export class CppDbgConfigurationProvider extends CppConfigurationProvider {
+    public constructor(provider: IConfigurationAssetProvider) {
+        super(provider, DebuggerType.cppdbg);
+    }
+}
+
+export interface IConfigurationAssetProvider {
+    getInitialConfigurations(debuggerType: DebuggerType): any;
+    getConfigurationSnippets(): vscode.CompletionItem[];
+}
+
+export class ConfigurationAssetProviderFactory {
+    public static getConfigurationProvider(): IConfigurationAssetProvider {
+        switch (os.platform()) {
+            case 'win32':
+                return new WindowsConfigurationProvider();
+            case 'darwin':
+                return new OSXConfigurationProvider();
+            case 'linux':
+                return new LinuxConfigurationProvider();
+            default:
+                throw new Error("Unexpected OS type");
+        }
+    }
+}
+
+abstract class DefaultConfigurationProvider implements IConfigurationAssetProvider {
+    configurations: IConfiguration[];
+
+    public getInitialConfigurations(debuggerType: DebuggerType): any {
+        let configurationSnippet: IConfigurationSnippet[] = [];
+
+        // Only launch configurations are initial configurations
+        this.configurations.forEach(configuration => {
+            configurationSnippet.push(configuration.GetLaunchConfiguration());
+        });
+
+        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.
+        return initialConfigurations;
+    }
+
+    public getConfigurationSnippets(): vscode.CompletionItem[] {
+        let completionItems: vscode.CompletionItem[] = [];
+
+        this.configurations.forEach(configuration => {
+            completionItems.push(convertConfigurationSnippetToCompetionItem(configuration.GetLaunchConfiguration()));
+            completionItems.push(convertConfigurationSnippetToCompetionItem(configuration.GetAttachConfiguration()));
+        });
+
+        return completionItems;
+    }
+}
+
+class WindowsConfigurationProvider extends DefaultConfigurationProvider {
+    private executable: string = "a.exe";
+    private pipeProgram: string = "<full path to pipe program such as plink.exe>";
+    private MIMode: string = 'gdb';
+    private setupCommandsBlock: string = `"setupCommands": [
+    {
+        "description": "Enable pretty-printing for gdb",
+        "text": "-enable-pretty-printing",
+        "ignoreFailures": true
+    }
+]`;
+
+    constructor() {
+        super();
+        this.configurations = [
+            new MIConfigurations(this.MIMode, this.executable, this.pipeProgram, this.setupCommandsBlock),
+            new PipeTransportConfigurations(this.MIMode, this.executable, this.pipeProgram, this.setupCommandsBlock),
+            new WindowsConfigurations(this.MIMode, this.executable, this.pipeProgram, this.setupCommandsBlock),
+            new WSLConfigurations(this.MIMode, this.executable, this.pipeProgram, this.setupCommandsBlock),
+        ];
+    }
+}
+
+class OSXConfigurationProvider extends DefaultConfigurationProvider {
+    private MIMode: string = 'lldb';
+    private executable: string = "a.out";
+    private pipeProgram: string = "/usr/bin/ssh";
+
+    constructor() {
+        super();
+        this.configurations = [
+            new MIConfigurations(this.MIMode, this.executable, this.pipeProgram),
+        ];
+    }
+}
+
+class LinuxConfigurationProvider extends DefaultConfigurationProvider {
+    private MIMode: string = 'gdb';
+    private setupCommandsBlock: string = `"setupCommands": [
+    {
+        "description": "Enable pretty-printing for gdb",
+        "text": "-enable-pretty-printing",
+        "ignoreFailures": true
+    }
+]`;
+    private executable: string = "a.out";
+    private pipeProgram: string = "/usr/bin/ssh";
+
+    constructor() {
+        super();
+        this.configurations = [
+            new MIConfigurations(this.MIMode, this.executable, this.pipeProgram, this.setupCommandsBlock),
+            new PipeTransportConfigurations(this.MIMode, this.executable, this.pipeProgram, this.setupCommandsBlock)
+        ];
+    }
+}
+
+function convertConfigurationSnippetToCompetionItem(snippet: IConfigurationSnippet): vscode.CompletionItem {
+    let item: vscode.CompletionItem = new vscode.CompletionItem(snippet.label, vscode.CompletionItemKind.Snippet);
+
+    item.insertText = snippet.bodyText;
+
+    return item;
+}
+
+export class ConfigurationSnippetProvider implements vscode.CompletionItemProvider {
+    private provider: IConfigurationAssetProvider;
+    private snippets: vscode.CompletionItem[];
+
+    constructor(provider: IConfigurationAssetProvider) {
+        this.provider = provider;
+        this.snippets = this.provider.getConfigurationSnippets();
+    }
+    public resolveCompletionItem(item: vscode.CompletionItem, token: vscode.CancellationToken): Thenable<vscode.CompletionItem> {
+        return Promise.resolve(item);
+    }
+
+    // This function will only provide completion items via the Add Configuration Button
+    // There are two cases where the configuration array has nothing or has some items.
+    // 1. If it has nothing, insert a snippet the user selected.
+    // 2. If there are items, the Add Configuration button will append it to the start of the configuration array. This function inserts a comma at the end of the snippet.
+    public provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken, context: vscode.CompletionContext): Thenable<vscode.CompletionList> {
+        let items: vscode.CompletionItem[] = this.snippets;
+
+        const launch: any = parse(document.getText());
+        // Check to see if the array is empty, so any additional inserted snippets will need commas.
+        if (launch.configurations.length !== 0) {
+            items = [];
+
+            // Make a copy of each snippet since we are adding a comma to the end of the insertText.
+            this.snippets.forEach((item) => items.push(Object.assign({}, item)));
+
+            items.map((item) => {
+                item.insertText = item.insertText + ','; // Add comma 
+            });
+        }
+
+        return Promise.resolve(new vscode.CompletionList(items, true));
+    }
+}

Extension/src/Debugger/configurations.ts

@@ -0,0 +1,257 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+ import * as os from 'os';
+
+export enum DebuggerType {
+    cppvsdbg,
+    cppdbg
+}
+
+export interface IConfigurationSnippet {
+    label: string;
+    description: string;
+    bodyText: string;
+
+    // Internal
+    isInitialConfiguration?: boolean;
+    debuggerType: DebuggerType;
+}
+
+export function indentJsonString(json: string, numTabs: number = 1): string {
+    return json.split('\n').map(line => '\t'.repeat(numTabs) + line).join('\n').trim();
+}
+
+function formatString(format: string, args: string[]): string {
+    for (let arg in args) {
+        format = format.replace("{" + arg + "}", args[arg]);
+    }
+    return format;
+}
+
+function createLaunchString(name: string, type: string, executable: string): string {
+        return `"name": "${name}",
+"type": "${type}",
+"request": "launch",
+"program": "${"enter program name, for example " + "$\{workspaceFolder\}" + "/" + executable}",
+"args": [],
+"stopAtEntry": false,
+"cwd": "$\{workspaceFolder\}",
+"environment": [],
+"externalConsole": true
+`;
+    }
+
+function createAttachString(name: string, type: string, executable: string): string {
+    return formatString(`
+"name": "${name}",
+"type": "${type}",
+"request": "attach",{0}
+"processId": "$\{command:pickProcess\}"
+`, [type === "cppdbg" ? `${os.EOL}"program": "${"enter program name, for example $\{workspaceFolder\}/" + executable}",` : ""]);
+    }
+
+function createRemoteAttachString(name: string, type: string, executable: string): string {
+        return `
+"name": "${name}",
+"type": "${type}",
+"request": "attach",
+"program": "${"enter program name, for example $\{workspaceFolder\}/" + executable}",
+"processId": "$\{command:pickRemoteProcess\}"
+`;
+    }
+
+ function createPipeTransportString(pipeProgram: string, debuggerProgram: string, pipeArgs: string[] = []): string {
+        return `
+"pipeTransport": {
+\t"debuggerPath": "/usr/bin/${debuggerProgram}",
+\t"pipeProgram": "${pipeProgram}",
+\t"pipeArgs": ${JSON.stringify(pipeArgs)},
+\t"pipeCwd": ""
+}`;
+    }
+
+export interface IConfiguration {
+    GetLaunchConfiguration(): IConfigurationSnippet;
+    GetAttachConfiguration(): IConfigurationSnippet;
+}
+
+abstract class Configuration implements IConfiguration {
+    public snippetPrefix = "C/C++: ";
+
+    public executable: string;
+    public pipeProgram: string;
+    public MIMode: string;
+    public additionalProperties: string;
+
+    public miDebugger = "cppdbg";
+    public windowsDebugger = "cppvsdbg";
+
+    constructor(MIMode: string, executable: string, pipeProgram: string, additionalProperties: string = "") {
+        this.MIMode = MIMode;
+        this.executable = executable;
+        this.pipeProgram = pipeProgram;
+        this.additionalProperties = additionalProperties;
+    }
+
+    abstract GetLaunchConfiguration(): IConfigurationSnippet;
+    abstract GetAttachConfiguration(): IConfigurationSnippet;
+}
+
+export class MIConfigurations extends Configuration {
+
+    public GetLaunchConfiguration(): IConfigurationSnippet {
+        let name: string = `(${this.MIMode}) Launch`;
+
+        let body: string = formatString(`{
+\t${indentJsonString(createLaunchString(name, this.miDebugger, this.executable))},
+\t"MIMode": "${this.MIMode}"{0}{1}
+}`, [this.miDebugger === "cppdbg" && os.platform() === "win32" ? `,${os.EOL}\t"miDebuggerPath": "/path/to/gdb"` : "", 
+this.additionalProperties ? `,${os.EOL}\t${indentJsonString(this.additionalProperties)}` : ""]);
+
+        return {
+            "label": this.snippetPrefix + name,
+            "description": `Launch with ${this.MIMode}.`,
+            "bodyText": body.trim(),
+            "isInitialConfiguration": true,
+            "debuggerType": DebuggerType.cppdbg
+        };
+    }
+
+    public GetAttachConfiguration(): IConfigurationSnippet {
+        let name: string = `(${this.MIMode}) Attach`;
+
+        let body: string = formatString(`{ 
+\t${indentJsonString(createAttachString(name, this.miDebugger, this.executable))},
+\t"MIMode": "${this.MIMode}"{0}{1}
+}`, [this.miDebugger === "cppdbg" && os.platform() === "win32" ? `,${os.EOL}\t"miDebuggerPath": "/path/to/gdb"` : "",
+this.additionalProperties ? `,${os.EOL}\t${indentJsonString(this.additionalProperties)}` : ""]);
+
+        return {
+            "label": this.snippetPrefix + name,
+            "description": `Attach with ${this.MIMode}.`,
+            "bodyText": body.trim(),
+            "debuggerType": DebuggerType.cppdbg
+        };
+
+    }
+}
+
+export class PipeTransportConfigurations extends Configuration {
+
+    public GetLaunchConfiguration(): IConfigurationSnippet {
+        let name: string = `(${this.MIMode}) Pipe Launch`;
+
+        let body: string = formatString(`
+{
+\t${indentJsonString(createLaunchString(name, this.miDebugger, this.executable))},
+\t${indentJsonString(createPipeTransportString(this.pipeProgram, this.MIMode))},
+\t"MIMode": "${this.MIMode}"{0}
+}`, [this.additionalProperties ? `,${os.EOL}\t${indentJsonString(this.additionalProperties)}` : ""]);
+
+        return {
+            "label": this.snippetPrefix + name,
+            "description": `Pipe Launch with ${this.MIMode}.`,
+            "bodyText": body.trim(),
+            "debuggerType": DebuggerType.cppdbg
+        };
+
+    }
+
+    public GetAttachConfiguration(): IConfigurationSnippet {
+        let name: string = `(${this.MIMode}) Pipe Attach`;
+
+        let body: string = formatString(`
+{
+\t${indentJsonString(createRemoteAttachString(name, this.miDebugger, this.executable))},
+\t${indentJsonString(createPipeTransportString(this.pipeProgram, this.MIMode))},
+\t"MIMode": "${this.MIMode}"{0}
+}`, [this.additionalProperties ? `,${os.EOL}\t${indentJsonString(this.additionalProperties)}` : ""]);
+        return {
+            "label": this.snippetPrefix + name,
+            "description": `Pipe Attach with ${this.MIMode}.`,
+            "bodyText": body.trim(),
+            "debuggerType": DebuggerType.cppdbg
+        };
+
+    }
+}
+
+export class WindowsConfigurations extends Configuration {
+
+    public GetLaunchConfiguration(): IConfigurationSnippet {
+        let name: string = "(Windows) Launch";
+
+        let body: string = `
+{
+\t${indentJsonString(createLaunchString(name, this.windowsDebugger, this.executable))}
+}`;
+
+        return {
+            "label": this.snippetPrefix + name,
+            "description": "Launch with the Visual Studio C/C++ debugger.",
+            "bodyText": body.trim(),
+            "isInitialConfiguration": true,
+            "debuggerType": DebuggerType.cppvsdbg
+        };
+
+    }
+
+    public GetAttachConfiguration(): IConfigurationSnippet {
+        let name: string = "(Windows) Attach";
+
+        let body: string = `
+{
+\t${indentJsonString(createAttachString(name, this.windowsDebugger, this.executable))}
+}`;
+
+        return {
+            "label": this.snippetPrefix + name,
+            "description": "Attach to a process with the Visual Studio C/C++ debugger.",
+            "bodyText": body.trim(),
+            "debuggerType": DebuggerType.cppvsdbg
+        };
+
+    }
+}
+
+export class WSLConfigurations extends Configuration {
+    // Detects if the current VSCode is 32-bit and uses the correct bash.exe
+    public bashPipeProgram = process.arch === 'ia32' ? "${env:windir}\\\\sysnative\\\\bash.exe" : "${env:windir}\\\\system32\\\\bash.exe";
+
+    public GetLaunchConfiguration(): IConfigurationSnippet {
+        let name: string = `(${this.MIMode}) Bash on Windows Launch`;
+
+        let body: string = formatString(`
+{
+\t${indentJsonString(createLaunchString(name, this.miDebugger, this.executable))},
+\t${indentJsonString(createPipeTransportString(this.bashPipeProgram, this.MIMode, ["-c"]))}{0}
+}`, [this.additionalProperties ? `,${os.EOL}\t${indentJsonString(this.additionalProperties)}` : ""]);
+
+        return {
+            "label": this.snippetPrefix + name,
+            "description": `Launch in Bash on Windows using ${this.MIMode}.`,
+            "bodyText": body.trim(),
+            "debuggerType": DebuggerType.cppdbg
+        };
+    }
+
+    public GetAttachConfiguration(): IConfigurationSnippet {
+        let name: string = `(${this.MIMode}) Bash on Windows Attach`;
+
+        let body: string = formatString(`
+{
+\t${indentJsonString(createRemoteAttachString(name, this.miDebugger, this.executable))},
+\t${indentJsonString(createPipeTransportString(this.bashPipeProgram, this.MIMode, ["-c"]))}{0}
+}`, [this.additionalProperties ? `,${os.EOL}\t${indentJsonString(this.additionalProperties)}` : ""]);
+
+        return {
+            "label": this.snippetPrefix + name,
+            "description": `Attach to a remote process running in Bash on Windows using ${this.MIMode}.`,
+            "bodyText": body.trim(),
+            "debuggerType": DebuggerType.cppdbg
+        };
+    }
+}

Extension/src/Debugger/extension.ts

@@ -0,0 +1,94 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import * as vscode from 'vscode';
+import * as os from 'os';
+import { AttachPicker, RemoteAttachPicker, AttachItemsProvider } from './attachToProcess';
+import { NativeAttachItemsProviderFactory } from './nativeAttach';
+import { ConfigurationAssetProviderFactory, CppVsDbgConfigurationProvider, CppDbgConfigurationProvider, ConfigurationSnippetProvider, IConfigurationAssetProvider } from './configurationProvider';
+import * as util from '../common';
+import * as path from 'path';
+
+// The extension deactivate method is asynchronous, so we handle the disposables ourselves instead of using extensonContext.subscriptions.
+let disposables: vscode.Disposable[] = [];
+
+export function initialize(): void {
+    // Activate Process Picker Commands
+    let attachItemsProvider: AttachItemsProvider = NativeAttachItemsProviderFactory.Get();
+    let attacher: AttachPicker = new AttachPicker(attachItemsProvider);
+    disposables.push(vscode.commands.registerCommand('extension.pickNativeProcess', () => attacher.ShowAttachEntries()));
+    let remoteAttacher: RemoteAttachPicker = new RemoteAttachPicker();
+    disposables.push(vscode.commands.registerCommand('extension.pickRemoteNativeProcess', (any) => remoteAttacher.ShowAttachEntries(any)));
+
+    // Activate ConfigurationProvider
+    let configurationProvider: IConfigurationAssetProvider = ConfigurationAssetProviderFactory.getConfigurationProvider();
+    // On non-windows platforms, the cppvsdbg debugger will not be registered for initial configurations.
+    // This will cause it to not show up on the dropdown list.
+    if (os.platform() === 'win32') {
+        disposables.push(vscode.debug.registerDebugConfigurationProvider('cppvsdbg', new CppVsDbgConfigurationProvider(configurationProvider)));
+    }
+    disposables.push(vscode.debug.registerDebugConfigurationProvider('cppdbg', new CppDbgConfigurationProvider(configurationProvider)));
+
+    configurationProvider.getConfigurationSnippets();
+
+    const launchJsonDocumentSelector: vscode.DocumentSelector = [{
+        scheme: 'file',
+        language: 'jsonc',
+        pattern: '**/launch.json'
+    }];
+    // ConfigurationSnippetProvider needs to be initiallized after configurationProvider calls getConfigurationSnippets.
+    disposables.push(vscode.languages.registerCompletionItemProvider(launchJsonDocumentSelector, new ConfigurationSnippetProvider(configurationProvider)));
+
+    // Activate Adapter Commands 
+    registerAdapterExecutableCommands();
+
+    vscode.Disposable.from(...disposables);
+}
+
+export function dispose(): void {
+    disposables.forEach(d => d.dispose());
+}
+
+// Registers adapterExecutableCommands for cppdbg and cppvsdbg. If it is not ready, it will prompt waiting for the download.
+// 
+// Note: util.extensionContext.extensionPath is needed for the commands because VsCode does not support relative paths for adapterExecutableComand
+function registerAdapterExecutableCommands(): void {
+    disposables.push(vscode.commands.registerCommand('extension.cppdbgAdapterExecutableCommand', () => {
+        return util.isExtensionReady().then(ready => {
+            if (ready) {
+                let command: string = path.join(util.extensionContext.extensionPath, './debugAdapters/OpenDebugAD7');
+
+                // Windows has the exe in debugAdapters/bin.
+                if (os.platform() === 'win32') {
+                    command = path.join(util.extensionContext.extensionPath, "./debugAdapters/bin/OpenDebugAD7.exe");
+                }
+
+                return {
+                    command: command
+                };
+            } else {
+                throw new Error(util.extensionNotReadyString);
+            }
+        });
+    }));
+
+    disposables.push(vscode.commands.registerCommand('extension.cppvsdbgAdapterExecutableCommand', () => {
+        if (os.platform() !== 'win32') {
+            vscode.window.showErrorMessage("Debugger type 'cppvsdbg' is not avaliable for non-Windows machines.");
+            return null;
+        } else {
+            return util.isExtensionReady().then(ready => {
+                if (ready) {
+                    return {
+                        command: path.join(util.extensionContext.extensionPath, './debugAdapters/vsdbg/bin/vsdbg.exe'),
+                        args: ['--interpreter=vscode']
+                    };
+                } else {
+                    throw new Error(util.extensionNotReadyString);
+                }
+            });
+        }
+    }));
+}

Extension/src/Debugger/nativeAttach.ts

@@ -0,0 +1,247 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import * as child_process from 'child_process';
+import * as os from 'os';
+import { AttachItem, AttachItemsProvider } from './attachToProcess';
+
+class Process {
+    constructor(public name: string, public pid: string, public commandLine: string) { }
+
+    public toAttachItem(): AttachItem {
+        return {
+            label: this.name,
+            description: this.pid,
+            detail: this.commandLine,
+            id: this.pid
+        };
+    }
+}
+
+export class NativeAttachItemsProviderFactory {
+    static Get(): AttachItemsProvider {
+        if (os.platform() === 'win32') {
+            return new WmicAttachItemsProvider();
+        } else {
+            return new PsAttachItemsProvider();
+        }
+    }
+}
+
+abstract class NativeAttachItemsProvider implements AttachItemsProvider {
+    protected abstract getInternalProcessEntries(): Promise<Process[]>;
+
+    getAttachItems(): Promise<AttachItem[]> {
+        return this.getInternalProcessEntries().then(processEntries => {
+            // 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) {
+                        return 0;
+                    }
+                    return 1;
+                }
+                if (b.name === undefined) {
+                    return -1;
+                }
+                let aLower: string = a.name.toLowerCase();
+                let bLower: string = b.name.toLowerCase();
+                if (aLower === bLower) {
+                    return 0;
+                }
+                return aLower < bLower ? -1 : 1;
+            });
+            let attachItems: AttachItem[] = processEntries.map(p => p.toAttachItem());
+            return attachItems;
+        });
+    }
+}
+
+export class PsAttachItemsProvider extends NativeAttachItemsProvider {
+    // Perf numbers:
+    // OS X 10.10
+    // | # of processes | Time (ms) |
+    // |----------------+-----------|
+    // |            272 |        52 |
+    // |            296 |        49 |
+    // |            384 |        53 |
+    // |            784 |       116 |
+    //
+    // Ubuntu 16.04
+    // | # of processes | Time (ms) |
+    // |----------------+-----------|
+    // |            232 |        26 |
+    // |            336 |        34 |
+    // |            736 |        62 |
+    // |           1039 |       115 |
+    // |           1239 |       182 |
+
+    // ps outputs as a table. With the option "ww", ps will use as much width as necessary.
+    // However, that only applies to the right-most column. Here we use a hack of setting
+    // the column header to 50 a's so that the second column will have at least that many
+    // characters. 50 was chosen because that's the maximum length of a "label" in the
+    // QuickPick UI in VSCode.
+
+    protected getInternalProcessEntries(): Promise<Process[]> {
+        let processCmd: string = '';
+        switch (os.platform()) {
+            case 'darwin':
+                processCmd = PsProcessParser.psDarwinCommand;
+                break;
+            case 'linux':
+                processCmd = PsProcessParser.psLinuxCommand;
+                break;
+            default:
+                return Promise.reject<Process[]>(new Error(`Operating system "${os.platform()}" not support.`));
+        }
+        return execChildProcess(processCmd, null).then(processes => {
+            return PsProcessParser.ParseProcessFromPs(processes);
+        });
+    }
+}
+
+export class PsProcessParser {
+    private static get secondColumnCharacters(): number { return 50; }
+    private static get commColumnTitle(): string { return Array(PsProcessParser.secondColumnCharacters).join("a"); }
+    // the BSD version of ps uses '-c' to have 'comm' only output the executable name and not
+    // the full path. The Linux version of ps has 'comm' to only display the name of the executable
+    // Note that comm on Linux systems is truncated to 16 characters:
+    // https://bugzilla.redhat.com/show_bug.cgi?id=429565
+    // Since 'args' contains the full path to the executable, even if truncated, searching will work as desired.
+    public static get psLinuxCommand(): string { return `ps axww -o pid=,comm=${PsProcessParser.commColumnTitle},args=`; }
+    public static get psDarwinCommand(): string { return `ps axww -o pid=,comm=${PsProcessParser.commColumnTitle},args= -c`; }
+
+    // Only public for tests.
+    public static ParseProcessFromPs(processes: string): Process[] {
+        let lines: string[] = processes.split(os.EOL);
+        return PsProcessParser.ParseProcessFromPsArray(lines);
+    }
+
+    public static ParseProcessFromPsArray(processArray: string[]): Process[] {
+        let processEntries: Process[] = [];
+
+        // lines[0] is the header of the table
+        for (let i: number = 1; i < processArray.length; i++) {
+            let line: string = processArray[i];
+            if (!line) {
+                continue;
+            }
+
+            let processEntry: Process = PsProcessParser.parseLineFromPs(line);
+            processEntries.push(processEntry);
+        }
+
+        return processEntries;
+    }
+
+    private static parseLineFromPs(line: string): Process {
+        // Explanation of the regex:
+        //   - any leading whitespace
+        //   - PID
+        //   - whitespace
+        //   - executable name --> this is PsAttachItemsProvider.secondColumnCharacters - 1 because ps reserves one character
+        //     for the whitespace separator
+        //   - whitespace
+        //   - args (might be empty)
+        const psEntry: RegExp = new RegExp(`^\\s*([0-9]+)\\s+(.{${PsProcessParser.secondColumnCharacters - 1}})\\s+(.*)$`);
+        const matches: RegExpExecArray = psEntry.exec(line);
+        if (matches && matches.length === 4) {
+            const pid: string = matches[1].trim();
+            const executable: string = matches[2].trim();
+            const cmdline: string = matches[3].trim();
+            return new Process(executable, pid, cmdline);
+        }
+    }
+}
+
+/**
+ * Originally from common.ts. Due to test code not having vscode, it was refactored to not have vscode.OutputChannel.
+ */
+function execChildProcess(process: string, workingDirectory: string): Promise<string> {
+    return new Promise<string>((resolve, reject) => {
+        child_process.exec(process, { cwd: workingDirectory, maxBuffer: 500 * 1024 }, (error: Error, stdout: string, stderr: string) => {
+
+            if (error) {
+                reject(error);
+                return;
+            }
+
+            if (stderr && stderr.length > 0) {
+                reject(new Error(stderr));
+                return;
+            }
+
+            resolve(stdout);
+        });
+    });
+}
+
+export class WmicAttachItemsProvider extends NativeAttachItemsProvider {
+    // Perf numbers on Win10:
+    // | # of processes | Time (ms) |
+    // |----------------+-----------|
+    // |            309 |       413 |
+    // |            407 |       463 |
+    // |            887 |       746 |
+    // |           1308 |      1132 |
+
+    protected getInternalProcessEntries(): Promise<Process[]> {
+        const wmicCommand: string = 'wmic process get Name,ProcessId,CommandLine /FORMAT:list';
+        return execChildProcess(wmicCommand, null).then(processes => {
+            return WmicProcessParser.ParseProcessFromWmic(processes);
+        });
+    }
+}
+
+export class WmicProcessParser {
+    private static get wmicNameTitle(): string { return 'Name'; }
+    private static get wmicCommandLineTitle(): string { return 'CommandLine'; }
+    private static get wmicPidTitle(): string { return 'ProcessId'; }
+
+    // Only public for tests.
+    public static ParseProcessFromWmic(processes: string): Process[] {
+        let lines: string[] = processes.split(os.EOL);
+        let currentProcess: Process = new Process(null, null, null);
+        let processEntries: Process[] = [];
+
+        for (let i: number = 0; i < lines.length; i++) {
+            let line: string = lines[i];
+            if (!line) {
+                continue;
+            }
+
+            WmicProcessParser.parseLineFromWmic(line, currentProcess);
+
+            // Each entry of processes has ProcessId as the last line
+            if (line.lastIndexOf(WmicProcessParser.wmicPidTitle, 0) === 0) {
+                processEntries.push(currentProcess);
+                currentProcess = new Process(null, null, null);
+            }
+        }
+
+        return processEntries;
+    }
+
+    private static parseLineFromWmic(line: string, process: Process): void {
+        let splitter: number = line.indexOf('=');
+        if (splitter >= 0) {
+            let key: string = line.slice(0, line.indexOf('=')).trim();
+            let value: string = line.slice(line.indexOf('=') + 1).trim();
+            if (key === WmicProcessParser.wmicNameTitle) {
+                process.name = value;
+            } else if (key === WmicProcessParser.wmicPidTitle) {
+                process.pid = value;
+            } else if (key === WmicProcessParser.wmicCommandLineTitle) {
+                const extendedLengthPath: string = '\\??\\';
+                if (value.lastIndexOf(extendedLengthPath, 0) === 0) {
+                    value = value.slice(extendedLengthPath.length);
+                }
+
+                process.commandLine = value;
+            }
+        }
+    }
+}

Extension/src/Debugger/utils.ts

@@ -0,0 +1,49 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+export enum ArchType {
+    ia32,
+    x64
+}
+
+export class ArchitectureReplacer {
+    public static checkAndReplaceWSLPipeProgram(pipeProgramStr: string, expectedArch: ArchType): string {
+        let replacedPipeProgram: string = null;
+        const winDir: string = process.env.WINDIR ? process.env.WINDIR.toLowerCase() : null;
+        const winDirAltDirSep: string =  process.env.WINDIR ? process.env.WINDIR.replace('\\', '/').toLowerCase() : null;
+        const winDirEnv: string = "${env:windir}";
+
+        if (winDir && winDirAltDirSep && (pipeProgramStr.indexOf(winDir) === 0 || pipeProgramStr.indexOf(winDirAltDirSep) === 0 || pipeProgramStr.indexOf(winDirEnv) === 0)) {
+            if (expectedArch === ArchType.x64) {
+                const pathSep: string = ArchitectureReplacer.checkForFolderInPath(pipeProgramStr, "sysnative");
+                if (pathSep) {
+                    // User has sysnative but we expect 64 bit. Should be using System32 since sysnative is a 32bit concept.
+                    replacedPipeProgram = pipeProgramStr.replace(`${pathSep}sysnative${pathSep}`, `${pathSep}system32${pathSep}`);
+                }
+            } else if (expectedArch === ArchType.ia32) {
+                const pathSep: string = ArchitectureReplacer.checkForFolderInPath(pipeProgramStr, "system32");
+                if (pathSep) {
+                    // User has System32 but we expect 32 bit. Should be using sysnative
+                    replacedPipeProgram = pipeProgramStr.replace(`${pathSep}system32${pathSep}`, `${pathSep}sysnative${pathSep}`);
+                }
+            }
+        }
+
+        return replacedPipeProgram;
+    }
+
+    // Checks to see if the folder name is in the path using both win and unix style path seperators.
+    // Returns the path seperator it detected if the folder is in the path. 
+    // Or else it returns empty string to indicate it did not find it in the path.
+    public static checkForFolderInPath(path: string, folder: string): string {
+        if (path.indexOf(`/${folder}/`) >= 0) {
+            return '/';
+        } else if (path.indexOf(`\\${folder}\\`) >= 0) {
+            return '\\';
+        }
+
+        return "";
+    }
+}

Extension/src/LanguageServer/clientCollection.ts

@@ -0,0 +1,213 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as vscode from 'vscode';
+import * as util from '../common';
+import * as telemetry from '../telemetry';
+import * as cpptools from './client';
+import * as path from 'path';
+import { getCustomConfigProviders } from './customProviders';
+
+const defaultClientKey: string = "@@default@@";
+export interface ClientKey {
+    name: string;
+    key: string;
+}
+
+export class ClientCollection {
+    private disposables: vscode.Disposable[] = [];
+    private languageClients = new Map<string, cpptools.Client>();
+    private defaultClient: cpptools.Client;
+    private activeClient: cpptools.Client;
+    private activeDocument: vscode.TextDocument;
+
+    public get ActiveClient(): cpptools.Client { return this.activeClient; }
+    public get Names(): ClientKey[] {
+        let result: ClientKey[] = [];
+        this.languageClients.forEach((client, key) => {
+            result.push({ name: client.Name, key: key });
+        });
+        return result;
+    }
+    public get Count(): number { return this.languageClients.size; }
+
+    constructor() {
+        let key: string = defaultClientKey;
+        if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0) {
+            let folder: vscode.WorkspaceFolder = vscode.workspace.workspaceFolders[0];
+            key = util.asFolder(folder.uri);
+            this.activeClient = cpptools.createClient(this, folder);
+        } else {
+            this.activeClient = cpptools.createClient(this);
+        }
+        this.defaultClient = this.activeClient;
+        this.languageClients.set(key, this.activeClient);
+
+        this.disposables.push(vscode.workspace.onDidChangeWorkspaceFolders(e => this.onDidChangeWorkspaceFolders(e)));
+        this.disposables.push(vscode.workspace.onDidOpenTextDocument(d => this.onDidOpenTextDocument(d)));
+        this.disposables.push(vscode.workspace.onDidCloseTextDocument(d => this.onDidCloseTextDocument(d)));
+    }
+
+    public activeDocumentChanged(document: vscode.TextDocument): void {
+        this.activeDocument = document;
+        let activeClient: cpptools.Client = this.getClientFor(document.uri);
+
+        // Notify the active client that the document has changed.
+        activeClient.activeDocumentChanged(document);
+
+        // If the active client changed, resume the new client and tell the currently active client to deactivate.
+        if (activeClient !== this.activeClient) {
+            activeClient.activate();
+            this.activeClient.deactivate();
+            this.activeClient = activeClient;
+        }
+    }
+
+    /**
+     * get a handle to a language client. returns null if the client was not found.
+     */
+    public get(key: string): cpptools.Client | null {
+        if (this.languageClients.has(key)) {
+            return this.languageClients.get(key);
+        }
+        console.assert("key not found");
+        return null;
+    }
+
+    public forEach(callback: (client: cpptools.Client) => void): void {
+        this.languageClients.forEach(callback);
+    }
+
+    public checkOwnership(client: cpptools.Client, document: vscode.TextDocument): boolean {
+        let owners: cpptools.Client[] = [];
+        this.languageClients.forEach(languageClient => {
+            if (document.uri.fsPath.startsWith(languageClient.RootPath + path.sep)) {
+                owners.push(languageClient);
+            }
+        });
+        if (owners.length === 0) {
+            owners.push(this.activeClient);
+        }
+
+        return (owners[0] === client);  // TODO: we may want to pick the owner with the longest path?
+    }
+
+    /**
+     * creates a new client to replace one that crashed.
+     */
+    public replace(client: cpptools.Client, transferFileOwnership: boolean): cpptools.Client {
+        let key: string = undefined;
+        for (let pair of this.languageClients) {
+            if (pair[1] === client) {
+                key = pair[0];
+                break;
+            }
+        }
+
+        if (key) {
+            this.languageClients.delete(key);
+
+            if (transferFileOwnership) {
+                // This will create a new Client for the workspace since we removed the old one from this.languageClients.
+                client.TrackedDocuments.forEach(document => this.transferOwnership(document, client));
+                client.TrackedDocuments.clear();
+            } else {
+                // Create an empty client that will continue to "own" files matching this workspace, but ignore all messages from VS Code.
+                this.languageClients.set(key, cpptools.createNullClient());
+            }
+
+            if (this.activeClient === client) {
+                this.activeClient = this.getClientFor(this.activeDocument.uri);
+                this.activeClient.activeDocumentChanged(this.activeDocument);
+            }
+
+            client.dispose();
+            return this.languageClients.get(key);
+        } else {
+            console.assert(key, "unable to locate language client");
+            return null;
+        }
+    }
+
+    /**
+     * Remove folders that were closed. We don't check the e.added property because we will
+     * add new clients on-demand as files are opened.
+     */
+    private onDidChangeWorkspaceFolders(e?: vscode.WorkspaceFoldersChangeEvent): void {
+        let folderCount: number = vscode.workspace.workspaceFolders ? vscode.workspace.workspaceFolders.length : 0;
+        if (folderCount > 1) {
+            telemetry.logLanguageServerEvent("workspaceFoldersChange", { "count": folderCount.toString() });
+        }
+
+        if (e !== undefined) {
+            e.removed.forEach(folder => {
+                let path: string = util.asFolder(folder.uri);
+                let client: cpptools.Client = this.languageClients.get(path);
+                if (client) {
+                    this.languageClients.delete(path);  // Do this first so that we don't iterate on it during the ownership transfer process.
+
+                    // Transfer ownership of the client's documents to another client.
+                    // (this includes calling textDocument/didOpen on the new client so that the server knows it's open too)
+                    client.TrackedDocuments.forEach(document => this.transferOwnership(document, client));
+                    client.TrackedDocuments.clear();
+
+                    if (this.activeClient === client) {
+                        // Need to make a different client the active client.
+                        this.activeClient = this.getClientFor(this.activeDocument.uri);
+                        this.activeClient.activeDocumentChanged(this.activeDocument);
+                        // may not need this, the navigation UI should not have changed.
+                        // this.activeClient.selectionChanged(Range.create(vscode.window.activeTextEditor.selection.start, vscode.window.activeTextEditor.selection.end);
+                    }
+
+                    client.dispose();
+                }
+            });
+        }
+    }
+
+    private transferOwnership(document: vscode.TextDocument, oldOwner: cpptools.Client): void {
+        let newOwner: cpptools.Client = this.getClientFor(document.uri);
+        console.assert(newOwner !== oldOwner, "'oldOwner' should not be in the list of clients to consider");
+        newOwner.takeOwnership(document);
+    }
+
+    private onDidOpenTextDocument(document: vscode.TextDocument): void {
+        if (document.languageId === "c" || document.languageId === "cpp") {
+            // Make sure a client exists for this document's workspace.
+            this.getClientFor(document.uri);
+        }
+    }
+
+    private getClientFor(uri: vscode.Uri): cpptools.Client {
+        let folder: vscode.WorkspaceFolder = vscode.workspace.getWorkspaceFolder(uri);
+        if (!folder) {
+            return this.defaultClient;
+        } else {
+            let key: string = util.asFolder(folder.uri);
+            if (!this.languageClients.has(key)) {
+                let newClient: cpptools.Client = cpptools.createClient(this, folder);
+                this.languageClients.set(key, newClient);
+                getCustomConfigProviders().forEach(provider => newClient.onRegisterCustomConfigurationProvider(provider));
+            }
+            return this.languageClients.get(key);
+        }
+    }
+
+    private onDidCloseTextDocument(document: vscode.TextDocument): void {
+        // Don't seem to need to do anything here since we clean up when the workspace is closed instead.
+    }
+
+    public dispose(): Thenable<void> {
+        let promises: Thenable<void>[] = [];
+
+        // this.defaultClient is already in this.languageClients, so do not call dispose() on it.
+        this.defaultClient = undefined;
+
+        this.languageClients.forEach(client => promises.push(client.dispose()));
+        this.languageClients.clear();
+        return Promise.all(promises).then(() => undefined);
+    }
+}

Extension/src/LanguageServer/configurations.ts

@@ -0,0 +1,738 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as path from 'path';
+import * as fs from "fs";
+import * as vscode from 'vscode';
+import * as util from '../common';
+import * as telemetry from '../telemetry';
+import { PersistentFolderState } from './persistentState';
+import { CppSettings } from './settings';
+import { ABTestSettings, getABTestSettings } from '../abTesting';
+import { getCustomConfigProviders } from './customProviders';
+const configVersion: number = 4;
+
+type Environment = { [key: string]: string | string[] };
+
+// No properties are set in the config since we want to apply vscode settings first (if applicable).
+// That code won't trigger if another value is already set.
+// The property defaults are moved down to applyDefaultIncludePathsAndFrameworks.
+function getDefaultConfig(): Configuration {
+    if (process.platform === 'darwin') {
+        return { name: "Mac" };
+    } else if (process.platform === 'win32') {
+        return { name: "Win32" };
+    } else {
+        return { name: "Linux" };
+    }
+}
+
+function getDefaultCppProperties(): ConfigurationJson {
+    return {
+        configurations: [getDefaultConfig()],
+        version: configVersion
+    };
+}
+
+export interface ConfigurationJson {
+    configurations: Configuration[];
+    env?: {[key: string]: string | string[]};
+    version: number;
+}
+
+export interface Configuration {
+    name: string;
+    compilerPath?: string;
+    cStandard?: string;
+    cppStandard?: string;
+    includePath?: string[];
+    macFrameworkPath?: string[];
+    windowsSdkVersion?: string;
+    defines?: string[];
+    intelliSenseMode?: string;
+    compileCommands?: string;
+    forcedInclude?: string[];
+    configurationProvider?: string;
+    browse?: Browse;
+}
+
+export interface Browse {
+    path?: string[];
+    limitSymbolsToIncludedHeaders?: boolean | string;
+    databaseFilename?: string;
+}
+
+export interface CompilerDefaults {
+    compilerPath: string;
+    cStandard: string;
+    cppStandard: string;
+    includes: string[];
+    frameworks: string[];
+    windowsSdkVersion: string;
+    intelliSenseMode: string;
+}
+
+export class CppProperties {
+    private rootUri: vscode.Uri;
+    private propertiesFile: vscode.Uri = null;
+    private readonly configFolder: string;
+    private configurationJson: ConfigurationJson = null;
+    private currentConfigurationIndex: PersistentFolderState<number>;
+    private configFileWatcher: vscode.FileSystemWatcher = null;
+    private configFileWatcherFallbackTime: Date = new Date(); // Used when file watching fails.
+    private compileCommandFileWatchers: fs.FSWatcher[] = [];
+    private defaultCompilerPath: string = null;
+    private defaultCStandard: string = null;
+    private defaultCppStandard: string = null;
+    private defaultIncludes: string[] = null;
+    private defaultFrameworks: string[] = null;
+    private defaultWindowsSdkVersion: string = null;
+    private vcpkgIncludes: string[] = [];
+    private vcpkgPathReady: boolean = false;
+    private defaultIntelliSenseMode: string = null;
+    private readonly configurationGlobPattern: string = "c_cpp_properties.json";
+    private disposables: vscode.Disposable[] = [];
+    private configurationsChanged = new vscode.EventEmitter<Configuration[]>();
+    private selectionChanged = new vscode.EventEmitter<number>();
+    private compileCommandsChanged = new vscode.EventEmitter<string>();
+
+    // Any time the default settings are parsed and assigned to `this.configurationJson`,
+    // we want to track when the default includes have been added to it.
+    private configurationIncomplete: boolean = true;
+
+    constructor(rootUri: vscode.Uri) {
+        console.assert(rootUri !== undefined);
+        this.rootUri = rootUri;
+        let rootPath: string = rootUri ? rootUri.fsPath : "";
+        this.currentConfigurationIndex = new PersistentFolderState<number>("CppProperties.currentConfigurationIndex", -1, rootPath);
+        this.configFolder = path.join(rootPath, ".vscode");
+
+        let configFilePath: string = path.join(this.configFolder, "c_cpp_properties.json");
+        if (fs.existsSync(configFilePath)) {
+            this.propertiesFile = vscode.Uri.file(configFilePath);
+            this.parsePropertiesFile();
+        }
+        if (!this.configurationJson) {
+            this.resetToDefaultSettings(this.CurrentConfigurationIndex === -1);
+        }
+
+        this.configFileWatcher = vscode.workspace.createFileSystemWatcher(path.join(this.configFolder, this.configurationGlobPattern));
+        this.disposables.push(this.configFileWatcher);
+        this.configFileWatcher.onDidCreate((uri) => {
+            this.propertiesFile = uri;
+            this.handleConfigurationChange();
+        });
+
+        this.configFileWatcher.onDidDelete(() => {
+            this.propertiesFile = null;
+            this.resetToDefaultSettings(true);
+            this.handleConfigurationChange();
+        });
+
+        this.configFileWatcher.onDidChange(() => {
+            this.handleConfigurationChange();
+        });
+
+        this.buildVcpkgIncludePath();
+
+        this.disposables.push(vscode.Disposable.from(this.configurationsChanged, this.selectionChanged, this.compileCommandsChanged));
+    }
+
+    public get ConfigurationsChanged(): vscode.Event<Configuration[]> { return this.configurationsChanged.event; }
+    public get SelectionChanged(): vscode.Event<number> { return this.selectionChanged.event; }
+    public get CompileCommandsChanged(): vscode.Event<string> { return this.compileCommandsChanged.event; }
+    public get Configurations(): Configuration[] { return this.configurationJson.configurations; }
+    public get CurrentConfigurationIndex(): number { return this.currentConfigurationIndex.Value; }
+    public get CurrentConfiguration(): Configuration { return this.Configurations[this.CurrentConfigurationIndex]; }
+
+    public get CurrentConfigurationProvider(): string|null {
+        if (this.CurrentConfiguration.configurationProvider) {
+            return this.CurrentConfiguration.configurationProvider;
+        }
+        return new CppSettings(this.rootUri).defaultConfigurationProvider;
+    }
+
+    public get ConfigurationNames(): string[] {
+        let result: string[] = [];
+        this.configurationJson.configurations.forEach((config: Configuration) => result.push(config.name));
+        return result;
+    }
+
+    public set CompilerDefaults(compilerDefaults: CompilerDefaults) {
+        this.defaultCompilerPath = compilerDefaults.compilerPath;
+        this.defaultCStandard = compilerDefaults.cStandard;
+        this.defaultCppStandard = compilerDefaults.cppStandard;
+        this.defaultIncludes = compilerDefaults.includes;
+        this.defaultFrameworks = compilerDefaults.frameworks;
+        this.defaultWindowsSdkVersion = compilerDefaults.windowsSdkVersion;
+        this.defaultIntelliSenseMode = compilerDefaults.intelliSenseMode;
+
+        // defaultPaths is only used when there isn't a c_cpp_properties.json, but we don't send the configuration changed event
+        // to the language server until the default include paths and frameworks have been sent.
+        this.handleConfigurationChange();
+    }
+
+    public get VcpkgInstalled(): boolean {
+        return this.vcpkgIncludes.length > 0;
+    }
+
+    private onConfigurationsChanged(): void {
+        this.configurationsChanged.fire(this.Configurations);
+    }
+
+    private onSelectionChanged(): void {
+        this.selectionChanged.fire(this.CurrentConfigurationIndex);
+    }
+
+    private onCompileCommandsChanged(path: string): void {
+        this.compileCommandsChanged.fire(path);
+    }
+
+    public onDidChangeSettings(): void {
+        // Default settings may have changed in a way that affects the configuration.
+        // Just send another message since the language server will sort out whether anything important changed or not.
+        if (!this.propertiesFile) {
+            this.resetToDefaultSettings(true);
+            this.handleConfigurationChange();
+        } else if (!this.configurationIncomplete) {
+            this.handleConfigurationChange();
+        }
+    }
+
+    private resetToDefaultSettings(resetIndex: boolean): void {
+        this.configurationJson = getDefaultCppProperties();
+        if (resetIndex || this.CurrentConfigurationIndex < 0 ||
+            this.CurrentConfigurationIndex >= this.configurationJson.configurations.length) {
+            this.currentConfigurationIndex.Value = this.getConfigIndexForPlatform(this.configurationJson);
+        }
+        this.configurationIncomplete = true;
+    }
+
+     private applyDefaultIncludePathsAndFrameworks(): void {
+        if (this.configurationIncomplete && this.defaultIncludes && this.defaultFrameworks && this.vcpkgPathReady) {
+            let configuration: Configuration = this.CurrentConfiguration;
+            let settings: CppSettings = new CppSettings(this.rootUri);
+
+            // 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
+            // to the setting will be lost if this configuration is saved into a c_cpp_properties.json file.
+
+            // Only add settings from the default compiler if user hasn't explicitly set the corresponding VS Code setting.
+
+            if (!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) {
+                configuration.defines = (process.platform === 'win32') ? ["_DEBUG", "UNICODE", "_UNICODE"] : [];
+            }
+            if (!settings.defaultMacFrameworkPath && process.platform === 'darwin') {
+                configuration.macFrameworkPath = this.defaultFrameworks;
+            }
+            if (!settings.defaultWindowsSdkVersion && this.defaultWindowsSdkVersion && process.platform === 'win32') {
+                configuration.windowsSdkVersion = this.defaultWindowsSdkVersion;
+            }
+            if (!settings.defaultCompilerPath && this.defaultCompilerPath) {
+                configuration.compilerPath = this.defaultCompilerPath;
+            }
+            if (!settings.defaultCStandard && this.defaultCStandard) {
+                configuration.cStandard = this.defaultCStandard;
+            }
+            if (!settings.defaultCppStandard && this.defaultCppStandard) {
+                configuration.cppStandard = this.defaultCppStandard;
+            }
+            if (!settings.defaultIntelliSenseMode) {
+                configuration.intelliSenseMode = this.defaultIntelliSenseMode;
+            }
+            this.configurationIncomplete = false;
+        }
+    }
+
+    private get ExtendedEnvironment(): Environment {
+        let result: Environment = {};
+        if (this.configurationJson.env) {
+            Object.assign(result, this.configurationJson.env);
+        }
+
+        result["workspaceFolderBasename"] = path.basename(this.rootUri.fsPath);
+        return result;
+    }
+
+    private async buildVcpkgIncludePath(): Promise<void> {
+        try {
+            // 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 {
+            this.vcpkgPathReady = true;
+            this.handleConfigurationChange();
+        }
+    }
+
+    private getConfigIndexForPlatform(config: any): number {
+        let plat: string;
+        if (process.platform === 'darwin') {
+            plat = "Mac";
+        } else if (process.platform === 'win32') {
+            plat = "Win32";
+        } else {
+            plat = "Linux";
+        }
+        for (let i: number = 0; i < this.configurationJson.configurations.length; i++) {
+            if (config.configurations[i].name === plat) {
+                return i;
+            }
+        }
+        return this.configurationJson.configurations.length - 1;
+    }
+
+    private getIntelliSenseModeForPlatform(name: string): string {
+        // Do the built-in configs first.
+        if (name === "Linux") {
+            return "gcc-x64";
+        } else if (name === "Mac") {
+            return "clang-x64";
+        } else if (name === "Win32") {
+            return "msvc-x64";
+        } else if (process.platform === 'win32') {
+            // Custom configs default to the OS's preference.
+            return "msvc-x64";
+        } else if (process.platform === 'darwin') {
+            return "clang-x64";
+        } else {
+            return "gcc-x64";
+        }
+    }
+
+    public addToIncludePathCommand(path: string): void {
+        this.handleConfigurationEditCommand((document: vscode.TextDocument) => {
+            telemetry.logLanguageServerEvent("addToIncludePath");
+            this.parsePropertiesFile(); // Clear out any modifications we may have made internally.
+            let config: Configuration = this.CurrentConfiguration;
+            if (config.includePath === undefined) {
+                config.includePath = ["${default}"];
+            }
+            config.includePath.splice(config.includePath.length, 0, path);
+            fs.writeFileSync(this.propertiesFile.fsPath, JSON.stringify(this.configurationJson, null, 4));
+            this.handleConfigurationChange();
+        });
+    }
+
+    public updateCustomConfigurationProvider(providerId: string): Thenable<void> {
+        return new Promise<void>((resolve) => {
+            if (this.propertiesFile) {
+                this.handleConfigurationEditCommand((document: vscode.TextDocument) => {
+                    this.parsePropertiesFile(); // Clear out any modifications we may have made internally.
+                    let config: Configuration = this.CurrentConfiguration;
+                    if (providerId) {
+                        config.configurationProvider = providerId;
+                    } else {
+                        delete config.configurationProvider;
+                    }
+                    fs.writeFileSync(this.propertiesFile.fsPath, JSON.stringify(this.configurationJson, null, 4));
+                    this.handleConfigurationChange();
+                    resolve();
+                });
+            } else {
+                let settings: CppSettings = new CppSettings(this.rootUri);
+                if (providerId) {
+                    settings.update("default.configurationProvider", providerId);
+                } else {
+                    settings.update("default.configurationProvider", undefined); // delete the setting
+                }
+                this.CurrentConfiguration.configurationProvider = providerId;
+                resolve();
+            }
+        });
+    }
+
+    public setCompileCommands(path: string): void {
+        this.handleConfigurationEditCommand((document: vscode.TextDocument) => {
+            this.parsePropertiesFile(); // Clear out any modifications we may have made internally.
+            let config: Configuration = this.CurrentConfiguration;
+            config.compileCommands = path;
+            fs.writeFileSync(this.propertiesFile.fsPath, JSON.stringify(this.configurationJson, null, 4));
+            this.handleConfigurationChange();
+        });
+    }
+
+    public select(index: number): Configuration {
+        if (index === this.configurationJson.configurations.length) {
+            this.handleConfigurationEditCommand(vscode.window.showTextDocument);
+            return;
+        }
+        this.currentConfigurationIndex.Value = index;
+        this.onSelectionChanged();
+    }
+
+    private resolveDefaults(entries: string[], defaultValue: string[]): string[] {
+        let result: string[] = [];
+        entries.forEach(entry => {
+            if (entry === "${default}") {
+                // package.json default values for string[] properties is null.
+                // If no default is set, return an empty array instead of an array with `null` in it.
+                if (defaultValue !== null) {
+                    result = result.concat(defaultValue);
+                }
+            } else {
+                result.push(entry);
+            }
+        });
+        return result;
+    }
+
+    private resolveAndSplit(paths: string[] | undefined, defaultValue: string[], env: Environment): string[] {
+        let result: string[] = [];
+        if (paths) {
+            paths.forEach(entry => {
+                let entries: string[] = util.resolveVariables(entry, env).split(";").filter(e => e);
+                entries = this.resolveDefaults(entries, defaultValue);
+                result = result.concat(entries);
+            });
+        }
+        return result;
+    }
+
+    private resolveVariables(input: string | boolean, defaultValue: string | boolean, env: Environment): string | boolean {
+        if (input === undefined || input === "${default}") {
+            input = defaultValue;
+        }
+        if (typeof input === "boolean") {
+            return input;
+        }
+        return util.resolveVariables(input, env);
+    }
+
+    private updateConfiguration(property: string[], defaultValue: string[], env: Environment): string[];
+    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") {
+            return this.resolveVariables(property, defaultValue, env);
+        } else if (typeof property === "boolean" || typeof defaultValue === "boolean") {
+            return this.resolveVariables(property, defaultValue, env);
+        } else if (property instanceof Array || defaultValue instanceof Array) {
+            if (property) {
+                return this.resolveAndSplit(property, defaultValue, env);
+            } else if (property === undefined && defaultValue) {
+                return this.resolveAndSplit(defaultValue, [], env);
+            }
+        }
+        return property;
+    }
+
+    private updateServerOnFolderSettingsChange(): void {
+        let settings: CppSettings = new CppSettings(this.rootUri);
+        let env: Environment = this.ExtendedEnvironment;
+        for (let i: number = 0; i < this.configurationJson.configurations.length; i++) {
+            let configuration: Configuration = this.configurationJson.configurations[i];
+
+            configuration.includePath = this.updateConfiguration(configuration.includePath, settings.defaultIncludePath, env);
+            configuration.defines = this.updateConfiguration(configuration.defines, settings.defaultDefines, env);
+            configuration.macFrameworkPath = this.updateConfiguration(configuration.macFrameworkPath, settings.defaultMacFrameworkPath, env);
+            configuration.windowsSdkVersion = this.updateConfiguration(configuration.windowsSdkVersion, settings.defaultWindowsSdkVersion, env);
+            configuration.forcedInclude = this.updateConfiguration(configuration.forcedInclude, settings.defaultForcedInclude, env);
+            configuration.compileCommands = this.updateConfiguration(configuration.compileCommands, settings.defaultCompileCommands, env);
+            configuration.compilerPath = this.updateConfiguration(configuration.compilerPath, settings.defaultCompilerPath, env);
+            configuration.cStandard = this.updateConfiguration(configuration.cStandard, settings.defaultCStandard, env);
+            configuration.cppStandard = this.updateConfiguration(configuration.cppStandard, settings.defaultCppStandard, env);
+            configuration.intelliSenseMode = this.updateConfiguration(configuration.intelliSenseMode, settings.defaultIntelliSenseMode, env);
+            configuration.configurationProvider = this.updateConfiguration(configuration.configurationProvider, settings.defaultConfigurationProvider, env);
+
+            if (!configuration.browse) {
+                configuration.browse = {};
+            }
+
+            if (!configuration.browse.path) {
+                if (settings.defaultBrowsePath) {
+                    configuration.browse.path = settings.defaultBrowsePath;
+                } else if (configuration.includePath) {
+                    // If the user doesn't set browse.path, copy the includePath over. Make sure ${workspaceFolder} is in there though...
+                    configuration.browse.path = configuration.includePath.slice(0);
+                    if (-1 === configuration.includePath.findIndex((value: string, index: number) => {
+                        return !!value.match(/^\$\{(workspaceRoot|workspaceFolder)\}(\\|\\\*\*|\/|\/\*\*)?$/g);
+                    })) {
+                        configuration.browse.path.push("${workspaceFolder}");
+                    }
+                }
+            } else {
+                configuration.browse.path = this.updateConfiguration(configuration.browse.path, settings.defaultBrowsePath, env);
+            }
+
+            configuration.browse.limitSymbolsToIncludedHeaders = this.updateConfiguration(configuration.browse.limitSymbolsToIncludedHeaders, settings.defaultLimitSymbolsToIncludedHeaders, env);
+            configuration.browse.databaseFilename = this.updateConfiguration(configuration.browse.databaseFilename, settings.defaultDatabaseFilename, env);
+        }
+
+        this.updateCompileCommandsFileWatchers();
+        if (!this.configurationIncomplete) {
+            this.onConfigurationsChanged();
+        }
+    }
+
+    // Dispose existing and loop through cpp and populate with each file (exists or not) as you go.
+    // paths are expected to have variables resolved already
+    public updateCompileCommandsFileWatchers(): void {
+        this.compileCommandFileWatchers.forEach((watcher: fs.FSWatcher) => watcher.close());
+        this.compileCommandFileWatchers = []; //reset it
+        let filePaths: Set<string> = new Set<string>();
+        this.configurationJson.configurations.forEach(c => {
+            if (c.compileCommands !== undefined && fs.existsSync(c.compileCommands)) {
+                filePaths.add(c.compileCommands);
+            }
+        });
+        try {
+            filePaths.forEach((path: string) => {
+                this.compileCommandFileWatchers.push(fs.watch(path, (event: string, filename: string) => {
+                    if (event !== "rename") {
+                        this.onCompileCommandsChanged(path);
+                    }
+                }));
+            });
+        } catch (e) {
+            // The file watcher limit is hit.
+            // TODO: Check if the compile commands file has a higher timestamp during the interval timer.
+        }
+    }
+
+    public handleConfigurationEditCommand(onSuccess: (document: vscode.TextDocument) => void): void {
+        if (this.propertiesFile && fs.existsSync(this.propertiesFile.fsPath)) {
+            vscode.workspace.openTextDocument(this.propertiesFile).then((document: vscode.TextDocument) => {
+                onSuccess(document);
+            });
+        } else {
+            fs.mkdir(this.configFolder, (e: NodeJS.ErrnoException) => {
+                if (!e || e.code === 'EEXIST') {
+                    let fullPathToFile: string = path.join(this.configFolder, "c_cpp_properties.json");
+                    let filePath: vscode.Uri = vscode.Uri.file(fullPathToFile).with({ scheme: "untitled" });
+                    vscode.workspace.openTextDocument(filePath).then((document: vscode.TextDocument) => {
+                        let edit: vscode.WorkspaceEdit = new vscode.WorkspaceEdit();
+                        if (this.configurationJson) {
+                            this.resetToDefaultSettings(true);
+                        }
+                        this.applyDefaultIncludePathsAndFrameworks();
+                        let settings: CppSettings = new CppSettings(this.rootUri);
+                        if (settings.defaultConfigurationProvider) {
+                            this.configurationJson.configurations.forEach(config => {
+                                config.configurationProvider = settings.defaultConfigurationProvider;
+                            });
+                            settings.update("default.configurationProvider", undefined); // delete the setting
+                        }
+                        edit.insert(document.uri, new vscode.Position(0, 0), JSON.stringify(this.configurationJson, null, 4));
+                        vscode.workspace.applyEdit(edit).then((status) => {
+                            // Fix for issue 163
+                            // https://github.com/Microsoft/vscppsamples/issues/163
+                            // Save the file to disk so that when the user tries to re-open the file it exists.
+                            // Before this fix the file existed but was unsaved, so we went through the same
+                            // code path and reapplied the edit.
+                            document.save().then(() => {
+                                this.propertiesFile = vscode.Uri.file(path.join(this.configFolder, "c_cpp_properties.json"));
+                                vscode.workspace.openTextDocument(this.propertiesFile).then((document: vscode.TextDocument) => {
+                                    onSuccess(document);
+                                });
+                            });
+                        });
+                    });
+                }
+            });
+        }
+    }
+
+    private handleConfigurationChange(): void {
+        this.configFileWatcherFallbackTime = new Date();
+        if (this.propertiesFile) {
+            this.parsePropertiesFile();
+            // parsePropertiesFile can fail, but it won't overwrite an existing configurationJson in the event of failure.
+            // this.configurationJson should only be undefined here if we have never successfully parsed the propertiesFile.
+            if (this.configurationJson !== undefined) {
+                if (this.CurrentConfigurationIndex < 0 ||
+                    this.CurrentConfigurationIndex >= this.configurationJson.configurations.length) {
+                    // If the index is out of bounds (during initialization or due to removal of configs), fix it.
+                    this.currentConfigurationIndex.Value = this.getConfigIndexForPlatform(this.configurationJson);
+                }
+            }
+        }
+
+        if (this.configurationJson === undefined) {
+            this.resetToDefaultSettings(true);  // I don't think there's a case where this will be hit anymore.
+        }
+
+        this.applyDefaultIncludePathsAndFrameworks();
+        this.updateServerOnFolderSettingsChange();
+    }
+
+    private parsePropertiesFile(): void {
+        try {
+            let readResults: string = fs.readFileSync(this.propertiesFile.fsPath, 'utf8');
+            if (readResults === "") {
+                return; // Repros randomly when the file is initially created. The parse will get called again after the file is written.
+            }
+
+            // Try to use the same configuration as before the change.
+            let newJson: ConfigurationJson = JSON.parse(readResults);
+            if (!newJson || !newJson.configurations || newJson.configurations.length === 0) {
+                throw { message: "Invalid configuration file. There must be at least one configuration present in the array." };
+            }
+            if (!this.configurationIncomplete && this.configurationJson && this.configurationJson.configurations &&
+                this.CurrentConfigurationIndex >= 0 && this.CurrentConfigurationIndex < this.configurationJson.configurations.length) {
+                for (let i: number = 0; i < newJson.configurations.length; i++) {
+                    if (newJson.configurations[i].name === this.configurationJson.configurations[this.CurrentConfigurationIndex].name) {
+                        this.currentConfigurationIndex.Value = i;
+                        break;
+                    }
+                }
+            }
+            this.configurationJson = newJson;
+            if (this.CurrentConfigurationIndex < 0 || this.CurrentConfigurationIndex >= newJson.configurations.length) {
+                this.currentConfigurationIndex.Value = this.getConfigIndexForPlatform(newJson);
+            }
+
+            let dirty: boolean = false;
+            for (let i: number = 0; i < this.configurationJson.configurations.length; i++) {
+                let newId: string = getCustomConfigProviders().checkId(this.configurationJson.configurations[i].configurationProvider);
+                if (newId !== this.configurationJson.configurations[i].configurationProvider) {
+                    dirty = true;
+                    this.configurationJson.configurations[i].configurationProvider = newId;
+                }
+            }
+
+            // Remove disallowed variable overrides
+            if (this.configurationJson.env) {
+                delete this.configurationJson.env['workspaceRoot'];
+                delete this.configurationJson.env['workspaceFolder'];
+                delete this.configurationJson.env['workspaceFolderBasename'];
+                delete this.configurationJson.env['default'];
+            }
+
+            // Warning: There is a chance that this is incorrect in the event that the c_cpp_properties.json file was created before
+            // the system includes were available.
+            this.configurationIncomplete = false;
+
+            if (this.configurationJson.version !== configVersion) {
+                dirty = true;
+                if (this.configurationJson.version === undefined) {
+                    this.updateToVersion2();
+                }
+
+                if (this.configurationJson.version === 2) {
+                    this.updateToVersion3();
+                }
+
+                if (this.configurationJson.version === 3) {
+                    this.updateToVersion4();
+                } else {
+                    this.configurationJson.version = configVersion;
+                    vscode.window.showErrorMessage('Unknown version number found in c_cpp_properties.json. Some features may not work as expected.');
+                }
+            }
+
+            if (dirty) {
+                try {
+                    fs.writeFileSync(this.propertiesFile.fsPath, JSON.stringify(this.configurationJson, null, 4));
+                } catch (err) {
+                    // Ignore write errors, the file may be under source control. Updated settings will only be modified in memory.
+                    vscode.window.showWarningMessage('Attempt to update "' + this.propertiesFile.fsPath + '" failed (do you have write access?)');
+                }
+            }
+        } catch (err) {
+            vscode.window.showErrorMessage('Failed to parse "' + this.propertiesFile.fsPath + '": ' + err.message);
+            throw err;
+        }
+    }
+
+    private updateToVersion2(): void {
+        this.configurationJson.version = 2;
+        // no-op. We don't automatically populate the browse.path anymore.
+        // We use includePath if browse.path is not present which is what this code used to do.
+    }
+
+    private updateToVersion3(): void {
+        this.configurationJson.version = 3;
+        for (let i: number = 0; i < this.configurationJson.configurations.length; i++) {
+            let config: Configuration = this.configurationJson.configurations[i];
+            // Look for Mac configs and extra configs on Mac systems
+            if (config.name === "Mac" || (process.platform === 'darwin' && config.name !== "Win32" && config.name !== "Linux")) {
+                if (config.macFrameworkPath === undefined) {
+                    config.macFrameworkPath = [
+                        "/System/Library/Frameworks",
+                        "/Library/Frameworks"
+                    ];
+                }
+            }
+        }
+    }
+
+    private updateToVersion4(): void {
+        this.configurationJson.version = 4;
+        // Update intelliSenseMode, compilerPath, cStandard, and cppStandard with the defaults if they're missing.
+        // If VS Code settings exist for these properties, don't add them to c_cpp_properties.json
+        let settings: CppSettings = new CppSettings(this.rootUri);
+        for (let i: number = 0; i < this.configurationJson.configurations.length; i++) {
+            let config: Configuration = this.configurationJson.configurations[i];
+
+            if (config.intelliSenseMode === undefined && !settings.defaultIntelliSenseMode) {
+                config.intelliSenseMode = this.getIntelliSenseModeForPlatform(config.name);
+            }
+            // Don't set the default if compileCommands exist, until it is fixed to have the correct value.
+            if (config.compilerPath === undefined && this.defaultCompilerPath && !config.compileCommands && !settings.defaultCompilerPath) {
+                config.compilerPath = this.defaultCompilerPath;
+            }
+            if (!config.cStandard && this.defaultCStandard && !settings.defaultCStandard) {
+                config.cStandard = this.defaultCStandard;
+            }
+            if (!config.cppStandard && this.defaultCppStandard && !settings.defaultCppStandard) {
+                config.cppStandard = this.defaultCppStandard;
+            }
+        }
+    }
+
+    public checkCppProperties(): void {
+        // Check for change properties in case of file watcher failure.
+        let propertiesFile: string = path.join(this.configFolder, "c_cpp_properties.json");
+        fs.stat(propertiesFile, (err, stats) => {
+            if (err) {
+                if (this.propertiesFile !== null) {
+                    this.propertiesFile = null; // File deleted.
+                    this.resetToDefaultSettings(true);
+                    this.handleConfigurationChange();
+                }
+            } else if (stats.mtime > this.configFileWatcherFallbackTime) {
+                if (this.propertiesFile === null) {
+                    this.propertiesFile = vscode.Uri.file(propertiesFile); // File created.
+                }
+                this.handleConfigurationChange();
+            }
+        });
+    }
+
+    dispose(): void {
+        this.disposables.forEach((d) => d.dispose());
+        this.disposables = [];
+
+        this.compileCommandFileWatchers.forEach((watcher: fs.FSWatcher) => watcher.close());
+        this.compileCommandFileWatchers = []; //reset it
+    }
+}

Extension/src/LanguageServer/customProviders.ts

@@ -0,0 +1,209 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import { CustomConfigurationProvider, Version, SourceFileConfigurationItem, WorkspaceBrowseConfiguration } from 'vscode-cpptools';
+import * as vscode from 'vscode';
+
+/**
+ * An interface that is guaranteed to be backward compatible with version 0
+ */
+export interface CustomConfigurationProvider1 extends CustomConfigurationProvider {
+    isReady: boolean;
+    readonly isValid: boolean;
+    readonly version: Version;
+}
+
+/**
+ * Wraps the incoming CustomConfigurationProvider so that we can treat all of them as if they were the same version (e.g. latest)
+ */
+class CustomProviderWrapper implements CustomConfigurationProvider1 {
+    private provider: CustomConfigurationProvider;
+    private _isReady: boolean;
+    private _version: Version;
+
+    constructor(provider: CustomConfigurationProvider, version: Version) {
+        this._isReady = version < Version.v2;
+        this.provider = provider;
+        if (provider.extensionId && version === Version.v0) {
+            version = Version.v1; // provider implemented the new API but is interfacing with the extension using the old API version.
+        }
+        this._version = version;
+    }
+
+    public get isReady(): boolean {
+        return this._isReady;
+    }
+
+    public set isReady(ready: boolean) {
+        this._isReady = ready;
+    }
+
+    public get isValid(): boolean {
+        let valid: boolean = !!(this.provider.name && this.provider.canProvideConfiguration && this.provider.provideConfigurations);
+        if (valid && this._version > Version.v0) {
+            valid = !!(this.provider.extensionId && this.provider.dispose);
+        }
+        if (valid && this._version > Version.v1) {
+            valid = !!(this.provider.canProvideBrowseConfiguration && this.provider.provideBrowseConfiguration);
+        }
+        return valid;
+    }
+
+    public get version(): Version {
+        return this._version;
+    }
+
+    public get name(): string {
+        return this.provider.name;
+    }
+
+    public get extensionId(): string {
+        return this._version === Version.v0 ? this.provider.name : this.provider.extensionId;
+    }
+
+    public canProvideConfiguration(uri: vscode.Uri, token?: vscode.CancellationToken): Thenable<boolean> {
+        return this.provider.canProvideConfiguration(uri, token);
+    }
+
+    public provideConfigurations(uris: vscode.Uri[], token?: vscode.CancellationToken): Thenable<SourceFileConfigurationItem[]> {
+        return this.provider.provideConfigurations(uris, token);
+    }
+
+    public canProvideBrowseConfiguration(token?: vscode.CancellationToken): Thenable<boolean> {
+        return this._version < Version.v2 ? Promise.resolve(false) : this.provider.canProvideBrowseConfiguration(token);
+    }
+
+    public provideBrowseConfiguration(token?: vscode.CancellationToken): Thenable<WorkspaceBrowseConfiguration> {
+        console.assert(this._version >= Version.v2);
+        return this._version < Version.v2 ? Promise.resolve({browsePath: []}) : this.provider.provideBrowseConfiguration(token);
+    }
+
+    public dispose(): void {
+        if (this._version !== Version.v0) {
+            this.provider.dispose();
+        }
+    }
+}
+
+export class CustomConfigurationProviderCollection {
+    private providers: Map<string, CustomProviderWrapper> = new Map<string, CustomProviderWrapper>();
+
+    private logProblems(provider: CustomConfigurationProvider, version: Version): void {
+        let missing: string[] = [];
+        if (!provider.name) {
+            missing.push("'name'");
+        }
+        if (version !== Version.v0 && !provider.extensionId) {
+            missing.push("'extensionId'");
+        }
+        if (!provider.canProvideConfiguration) {
+            missing.push("'canProvideConfiguration'");
+        }
+        if (!provider.provideConfigurations) {
+            missing.push("'canProvideConfiguration'");
+        }
+        if (version !== Version.v0 && !provider.dispose) {
+            missing.push("'dispose'");
+        }
+        if (version >= Version.v2 && !provider.canProvideBrowseConfiguration) {
+            missing.push("'canProvideBrowseConfiguration'");
+        }
+        if (version >= Version.v2 && !provider.provideBrowseConfiguration) {
+            missing.push("'provideBrowseConfiguration'");
+        }
+        console.error(`CustomConfigurationProvider was not registered. The following properties are missing from the implementation: ${missing.join(", ")}.`);
+    }
+
+    private getId(provider: string|CustomConfigurationProvider): string {
+        if (typeof provider === "string") {
+            return provider;
+        } else if (provider.extensionId) {
+            return provider.extensionId;
+        } else if (provider.name) {
+            return provider.name;
+        } else {
+            console.error(`invalid provider: ${provider}`);
+            return "";
+        }
+    }
+
+    public get size(): number {
+        return this.providers.size;
+    }
+
+    public add(provider: CustomConfigurationProvider, version: Version): boolean {
+        let wrapper: CustomProviderWrapper = new CustomProviderWrapper(provider, version);
+        if (!wrapper.isValid) {
+            this.logProblems(provider, version);
+            return false;
+        }
+
+        let exists: boolean = this.providers.has(wrapper.extensionId);
+        if (exists) {
+            let existing: CustomProviderWrapper = this.providers.get(wrapper.extensionId);
+            exists = (existing.version === Version.v0 && wrapper.version === Version.v0);
+        }
+
+        if (!exists) {
+            this.providers.set(wrapper.extensionId, wrapper);
+        } else {
+            console.error(`CustomConfigurationProvider '${wrapper.extensionId}' has already been registered.`);
+        }
+        return !exists;
+    }
+
+    public get(provider: string|CustomConfigurationProvider): CustomConfigurationProvider1|null {
+        let id: string = this.getId(provider);
+
+        if (this.providers.has(id)) {
+            return this.providers.get(id);
+        }
+        return null;
+    }
+
+    public forEach(func: (provider: CustomConfigurationProvider1) => void): void {
+        this.providers.forEach(provider => func(provider));
+    }
+
+    public remove(provider: CustomConfigurationProvider): void {
+        let id: string = this.getId(provider);
+        if (this.providers.has(id)) {
+            this.providers.delete(id);
+        } else {
+            console.warn(`${id} is not registered`);
+        }
+    }
+
+    public checkId(providerId?: string): string {
+        if (!providerId) {
+            return providerId;
+        }
+        let found: CustomConfigurationProvider1[] = [];
+        let noUpdate: boolean = false;
+        this.forEach(provider => {
+            if (provider.extensionId === providerId) {
+                noUpdate = true;
+            } else if (provider.name === providerId && provider.version !== Version.v0) {
+                found.push(provider);
+            }
+        });
+        if (noUpdate) {
+            return providerId;
+        }
+        if (found.length === 1) {
+            return found[0].extensionId;
+        } else if (found.length > 1) {
+            console.warn("duplicate provider name found. Not upgrading.");
+        }
+        return providerId;
+    }
+}
+
+let providerCollection: CustomConfigurationProviderCollection = new CustomConfigurationProviderCollection();
+
+export function getCustomConfigProviders(): CustomConfigurationProviderCollection {
+    return providerCollection;
+}

Extension/src/LanguageServer/dataBinding.ts

@@ -0,0 +1,47 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+import * as vscode from 'vscode';
+
+export class DataBinding<T> {
+    private value: T;
+    private valueChanged = new vscode.EventEmitter<T>();
+    private isActive: boolean = true;
+
+    constructor(value: T) {
+        this.value = value;
+        this.isActive = true;
+    }
+
+    public get Value(): T {
+        return this.value;
+    }
+
+    public set Value(value: T) {
+        if (value !== this.value) {
+            this.value = value;
+            if (this.isActive) {
+                this.valueChanged.fire(this.value);
+            }
+        }
+    }
+
+    public get ValueChanged(): vscode.Event<T> {
+        return this.valueChanged.event;
+    }
+
+    public activate(): void {
+        this.isActive = true;
+        this.valueChanged.fire(this.value);
+    }
+
+    public deactivate(): void {
+        this.isActive = false;
+    }
+
+    public dispose(): void {
+        this.deactivate();
+        this.valueChanged.dispose();
+    }
+}

Extension/src/LanguageServer/extension.ts

@@ -0,0 +1,692 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as path from 'path';
+import * as vscode from 'vscode';
+import * as os from 'os';
+import * as fs from 'fs';
+import * as util from '../common';
+import * as telemetry from '../telemetry';
+import { UI, getUI } from './ui';
+import { Client } from './client';
+import { ClientCollection } from './clientCollection';
+import { CppSettings } from './settings';
+import { PersistentWorkspaceState } from './persistentState';
+import { getLanguageConfig } from './languageConfig';
+import { getCustomConfigProviders } from './customProviders';
+import { PlatformInformation } from '../platform';
+import { Range } from 'vscode-languageclient';
+import { ChildProcess, spawn, execSync } from 'child_process';
+import * as tmp from 'tmp';
+import { getTargetBuildInfo } from '../githubAPI';
+
+let prevCrashFile: string;
+let clients: ClientCollection;
+let activeDocument: string;
+let ui: UI;
+let disposables: vscode.Disposable[] = [];
+let languageConfigurations: vscode.Disposable[] = [];
+let intervalTimer: NodeJS.Timer;
+let insiderUpdateTimer: NodeJS.Timer;
+let realActivationOccurred: boolean = false;
+let tempCommands: vscode.Disposable[] = [];
+let activatedPreviously: PersistentWorkspaceState<boolean>;
+const insiderUpdateTimerInterval: number = 1000 * 60 * 60;
+
+/**
+ * activate: set up the extension for language services
+ */
+export function activate(activationEventOccurred: boolean): void {
+    console.log("activating extension");
+
+    // Activate immediately if an activation event occurred in the previous workspace session.
+    // If onActivationEvent doesn't occur, it won't auto-activate next time.
+    activatedPreviously = new PersistentWorkspaceState("activatedPreviously", false);
+    if (activatedPreviously.Value) {
+        activatedPreviously.Value = false;
+        realActivation();
+    }
+
+    registerCommands();
+    tempCommands.push(vscode.workspace.onDidOpenTextDocument(d => onDidOpenTextDocument(d)));
+
+    // Check if an activation event has already occurred.
+    if (activationEventOccurred) {
+        onActivationEvent();
+        return;
+    }
+
+    // handle "workspaceContains:/.vscode/c_cpp_properties.json" activation event.
+    if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0) {
+        for (let i: number = 0; i < vscode.workspace.workspaceFolders.length; ++i) {
+            let config: string = path.join(vscode.workspace.workspaceFolders[i].uri.fsPath, ".vscode/c_cpp_properties.json");
+            if (fs.existsSync(config)) {
+                onActivationEvent();
+                return;
+            }
+        }
+    }
+
+    // handle "onLanguage:cpp" and "onLanguage:c" activation events.
+    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") {
+                onActivationEvent();
+                return;
+            }
+        }
+    }
+}
+
+function onDidOpenTextDocument(document: vscode.TextDocument): void {
+    if (document.languageId === "c" || document.languageId === "cpp") {
+        onActivationEvent();
+    }
+}
+
+function onActivationEvent(): void {
+    if (tempCommands.length === 0) {
+        return;
+    }
+
+    // Cancel all the temp commands that just look for activations.
+    tempCommands.forEach((command) => {
+        command.dispose();
+    });
+    tempCommands = [];
+    if (!realActivationOccurred) {
+        realActivation();
+    }
+    activatedPreviously.Value = true;
+}
+
+function realActivation(): void {
+    realActivationOccurred = true;
+    console.log("starting language server");
+    clients = new ClientCollection();
+    ui = getUI();
+
+    // Check for files left open from the previous session. We won't get events for these until they gain focus,
+    // so we manually activate the visible file.
+    if (vscode.workspace.textDocuments !== undefined && vscode.workspace.textDocuments.length > 0) {
+        onDidChangeActiveTextEditor(vscode.window.activeTextEditor);
+    }
+
+    // There may have already been registered CustomConfigurationProviders.
+    // Request for configurations from those providers.
+    clients.forEach(client => {
+        getCustomConfigProviders().forEach(provider => client.onRegisterCustomConfigurationProvider(provider));
+    });
+
+    disposables.push(vscode.workspace.onDidChangeConfiguration(onDidChangeSettings));
+    disposables.push(vscode.workspace.onDidSaveTextDocument(onDidSaveTextDocument));
+    disposables.push(vscode.window.onDidChangeActiveTextEditor(onDidChangeActiveTextEditor));
+    disposables.push(vscode.window.onDidChangeTextEditorSelection(onDidChangeTextEditorSelection));
+    disposables.push(vscode.window.onDidChangeVisibleTextEditors(onDidChangeVisibleTextEditors));
+
+    updateLanguageConfigurations();
+
+    reportMacCrashes();
+
+    const settings: CppSettings = new CppSettings(clients.ActiveClient.RootUri);
+    if (settings.updateChannel === 'Insiders') {
+        insiderUpdateTimer = setInterval(checkAndApplyUpdate, insiderUpdateTimerInterval, settings.updateChannel);
+        checkAndApplyUpdate(settings.updateChannel);
+    }
+
+    intervalTimer = setInterval(onInterval, 2500);
+}
+
+export function updateLanguageConfigurations(): void {
+    languageConfigurations.forEach(d => d.dispose());
+    languageConfigurations = [];
+
+    languageConfigurations.push(vscode.languages.setLanguageConfiguration('c', getLanguageConfig('c', clients.ActiveClient.RootUri)));
+    languageConfigurations.push(vscode.languages.setLanguageConfiguration('cpp', getLanguageConfig('cpp', clients.ActiveClient.RootUri)));
+}
+
+/*********************************************
+ * workspace events
+ *********************************************/
+
+function onDidChangeSettings(): void {
+    const changedActiveClientSettings: { [key: string] : string } = clients.ActiveClient.onDidChangeSettings();
+    clients.forEach(client => client.onDidChangeSettings());
+
+    const newUpdateChannel: string = changedActiveClientSettings['updateChannel'];
+    if (newUpdateChannel) {
+        if (newUpdateChannel === 'Default') {
+            clearInterval(insiderUpdateTimer);
+        } else if (newUpdateChannel === 'Insiders') {
+            insiderUpdateTimer = setInterval(checkAndApplyUpdate, insiderUpdateTimerInterval);
+        }
+
+        checkAndApplyUpdate(newUpdateChannel);
+    }
+}
+
+let saveMessageShown: boolean = false;
+function onDidSaveTextDocument(doc: vscode.TextDocument): void {
+    if (!vscode.window.activeTextEditor || doc !== vscode.window.activeTextEditor.document || (doc.languageId !== "cpp" && doc.languageId !== "c")) {
+        return;
+    }
+
+    if (!saveMessageShown && new CppSettings(doc.uri).clangFormatOnSave) {
+        saveMessageShown = true;
+        vscode.window.showInformationMessage("\"C_Cpp.clang_format_formatOnSave\" has been removed. Please use \"editor.formatOnSave\" instead.");
+    }
+}
+
+function onDidChangeActiveTextEditor(editor: vscode.TextEditor): void {
+    /* need to notify the affected client(s) */
+    console.assert(clients !== undefined, "client should be available before active editor is changed");
+    if (clients === undefined) {
+        return;
+    }
+
+    let activeEditor: vscode.TextEditor = vscode.window.activeTextEditor;
+    if (!activeEditor || (activeEditor.document.languageId !== "cpp" && activeEditor.document.languageId !== "c")) {
+        activeDocument = "";
+    } else {
+        activeDocument = editor.document.uri.toString();
+        clients.activeDocumentChanged(editor.document);
+        clients.ActiveClient.selectionChanged(Range.create(editor.selection.start, editor.selection.end));
+    }
+    ui.activeDocumentChanged();
+}
+
+function onDidChangeTextEditorSelection(event: vscode.TextEditorSelectionChangeEvent): void {
+    /* need to notify the affected client(s) */
+    if (!event.textEditor || !vscode.window.activeTextEditor || event.textEditor.document.uri !== vscode.window.activeTextEditor.document.uri ||
+        (event.textEditor.document.languageId !== "cpp" && event.textEditor.document.languageId !== "c")) {
+        return;
+    }
+
+    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);
+        ui.activeDocumentChanged();
+    }
+    clients.ActiveClient.selectionChanged(Range.create(event.selections[0].start, event.selections[0].end));
+}
+
+function onDidChangeVisibleTextEditors(editors: vscode.TextEditor[]): void {
+    clients.forEach(client => client.onDidChangeVisibleTextEditors(editors));
+}
+
+function onInterval(): void {
+    // TODO: do we need to pump messages to all clients? depends on what we do with the icons, I suppose.
+    clients.ActiveClient.onInterval();
+}
+
+/**
+ * Install a VSIX package. This helper function will exist until VSCode offers a command to do so.
+ * @param updateChannel The user's updateChannel setting.
+ */
+async function installVsix(vsixLocation: string, updateChannel: string): Promise<void> {
+    // Get the path to the VSCode command -- replace logic later when VSCode allows calling of
+    // workbench.extensions.action.installVSIX from TypeScript w/o instead popping up a file dialog
+    return PlatformInformation.GetPlatformInformation().then((platformInfo) => {
+        const vsCodeScriptPath: string = function(platformInfo): string {
+            if (platformInfo.platform === 'win32') {
+                const vsCodeBinName: string = path.basename(process.execPath);
+                let cmdFile: string; // Windows VS Code Insiders breaks VS Code naming conventions
+                if (vsCodeBinName === 'Code - Insiders.exe') {
+                    cmdFile = 'code-insiders.cmd';
+                } else {
+                    cmdFile = 'code.cmd';
+                }
+                const vsCodeExeDir: string = path.dirname(process.execPath);
+                return '"' + path.join(vsCodeExeDir, 'bin', cmdFile) + '"';
+            } else if (platformInfo.platform === 'darwin') {
+                return '"' + path.join(process.execPath, '..', '..', '..', '..', '..',
+                    'Resources', 'app', 'bin', 'code') + '"';
+            } else {
+                const vsCodeBinName: string = path.basename(process.execPath);
+                try {
+                    const stdout: Buffer = execSync('which ' + vsCodeBinName);
+                    return stdout.toString().trim();
+                } catch (error) {
+                    return undefined;
+                }
+            }
+        }(platformInfo);
+        if (!vsCodeScriptPath) {
+            return Promise.reject(new Error('Failed to find VS Code script'));
+        }
+
+        // Install the VSIX
+        return new Promise<void>((resolve, reject) => {
+            let process: ChildProcess = spawn(vsCodeScriptPath, ['--install-extension', vsixLocation]);
+            if (process.pid === undefined) {
+                reject(new Error('Failed to launch VS Code script process for installation'));
+                return;
+            }
+
+            // Timeout the process if no response is sent back. Ensures this Promise resolves/rejects
+            const timer: NodeJS.Timer = setTimeout(() => {
+                process.kill();
+                reject(new Error('Failed to receive response from VS Code script process for installation within 10s.'));
+            }, 10000);
+
+            // If downgrading, the VS Code CLI will prompt whether the user is sure they would like to downgrade.
+            // Respond to this by writing 0 to stdin (the option to override and install the VSIX package)
+            let sentOverride: boolean = false;
+            process.stdout.on('data', () => {
+                if (sentOverride) {
+                    return;
+                }
+                process.stdin.write('0\n');
+                sentOverride = true;
+                clearInterval(timer);
+                resolve();
+            });
+        });
+    });
+}
+
+/**
+ * Query package.json and the GitHub API to determine whether the user should update, if so then install the update.
+ * The update can be an upgrade or downgrade depending on the the updateChannel setting.
+ * @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) => {
+        getTargetBuildInfo(updateChannel).then(buildInfo => {
+            if (!buildInfo) {
+                resolve();
+                return;
+            }
+
+            // Create a temporary file, download the VSIX to it, then install the VSIX
+            tmp.file({postfix: '.vsix'}, async (err, vsixPath, fd, cleanupCallback) => {
+                if (err) {
+                    reject(new Error('Failed to create vsix file'));
+                    return;
+                }
+
+                // Place in try/catch as the .catch call catches a rejection in downloadFileToDestination
+                // then the .catch call will return a resolved promise
+                // Thusly, the .catch call must also throw, as a return would simply return an unused promise
+                // instead of returning early from this function scope
+                try {
+                    await util.downloadFileToDestination(buildInfo.downloadUrl, vsixPath)
+                        .catch(() => { throw new Error('Failed to download VSIX package'); });
+                    await installVsix(vsixPath, updateChannel)
+                        .catch((error: Error) => { throw error; });
+                } catch (error) {
+                    reject(error);
+                    return;
+                }
+                clearInterval(insiderUpdateTimer);
+                const message: string =
+                    `The C/C++ Extension has been updated to version ${buildInfo.name}. Please reload the window for the changes to take effect.`;
+                util.promptReloadWindow(message);
+                telemetry.logLanguageServerEvent('installVsix', { 'success': 'true' });
+
+                resolve();
+            });
+        }, (error: Error) => {
+            // Handle getTargetBuildInfo rejection
+            logFailure(error);
+            reject(error);
+        });
+    });
+    await p.catch((error: Error) => {
+        // Handle .then following getTargetBuildInfo rejection
+        logFailure(error);
+        throw error;
+    });
+}
+
+/*********************************************
+ * registered commands
+ *********************************************/
+
+function registerCommands(): void {
+    disposables.push(vscode.commands.registerCommand('C_Cpp.Navigate', onNavigate));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.GoToDeclaration', onGoToDeclaration));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.PeekDeclaration', onPeekDeclaration));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.SwitchHeaderSource', onSwitchHeaderSource));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.ResetDatabase', onResetDatabase));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.ConfigurationSelect', onSelectConfiguration));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.ConfigurationProviderSelect', onSelectConfigurationProvider));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.ConfigurationEdit', onEditConfiguration));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.AddToIncludePath', onAddToIncludePath));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.ToggleErrorSquiggles', onToggleSquiggles));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.ToggleSnippets', onToggleSnippets));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.ToggleIncludeFallback', onToggleIncludeFallback));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.ToggleDimInactiveRegions', onToggleDimInactiveRegions));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.ShowReleaseNotes', onShowReleaseNotes));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.PauseParsing', onPauseParsing));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.ResumeParsing', onResumeParsing));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.ShowParsingCommands', onShowParsingCommands));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.TakeSurvey', onTakeSurvey));
+}
+
+function onNavigate(): void {
+    onActivationEvent();
+    let activeEditor: vscode.TextEditor = vscode.window.activeTextEditor;
+    if (!activeEditor) {
+        return;
+    }
+
+    clients.ActiveClient.requestNavigationList(activeEditor.document).then((navigationList: string) => {
+        ui.showNavigationOptions(navigationList);
+    });
+}
+
+function onGoToDeclaration(): void {
+    onActivationEvent();
+    clients.ActiveClient.requestGoToDeclaration().then(() => vscode.commands.executeCommand("editor.action.goToDeclaration"));
+}
+
+function onPeekDeclaration(): void {
+    onActivationEvent();
+    clients.ActiveClient.requestGoToDeclaration().then(() => vscode.commands.executeCommand("editor.action.previewDeclaration"));
+}
+
+function onSwitchHeaderSource(): void {
+    onActivationEvent();
+    let activeEditor: vscode.TextEditor = vscode.window.activeTextEditor;
+    if (!activeEditor || !activeEditor.document) {
+        return;
+    }
+
+    if (activeEditor.document.languageId !== "cpp" && activeEditor.document.languageId !== "c") {
+        return;
+    }
+
+    let rootPath: string = clients.ActiveClient.RootPath;
+    let fileName: string = activeEditor.document.fileName;
+
+    if (!rootPath) {
+        rootPath = path.dirname(fileName); // When switching without a folder open.
+    }
+
+    clients.ActiveClient.requestSwitchHeaderSource(rootPath, fileName).then((targetFileName: string) => {
+        vscode.workspace.openTextDocument(targetFileName).then((document: vscode.TextDocument) => {
+            let foundEditor: boolean = false;
+            // If the document is already visible in another column, open it there.
+            vscode.window.visibleTextEditors.forEach((editor, index, array) => {
+                if (editor.document === document && !foundEditor) {
+                    foundEditor = true;
+                    vscode.window.showTextDocument(document, editor.viewColumn);
+                }
+            });
+            // TODO: Handle non-visibleTextEditor...not sure how yet.
+            if (!foundEditor) {
+                if (vscode.window.activeTextEditor !== undefined) {
+                    // TODO: Change to show it in a different column?
+                    vscode.window.showTextDocument(document, vscode.window.activeTextEditor.viewColumn);
+                } else {
+                    vscode.window.showTextDocument(document);
+                }
+            }
+        });
+    });
+}
+
+/**
+ * Allow the user to select a workspace when multiple workspaces exist and get the corresponding Client back.
+ * The resulting client is used to handle some command that was previously invoked.
+ */
+function selectClient(): Thenable<Client> {
+    if (clients.Count === 1) {
+        return Promise.resolve(clients.ActiveClient);
+    } else {
+        return ui.showWorkspaces(clients.Names).then(key => {
+            if (key !== "") {
+                let client: Client = clients.get(key);
+                if (client) {
+                    return client;
+                } else {
+                    console.assert("client not found");
+                }
+            }
+            return Promise.reject<Client>("client not found");
+        });
+    }
+}
+
+function onResetDatabase(): void {
+    onActivationEvent();
+    /* need to notify the affected client(s) */
+    selectClient().then(client => client.resetDatabase(), rejected => {});
+}
+
+function onSelectConfiguration(): void {
+    onActivationEvent();
+    if (!isFolderOpen()) {
+        vscode.window.showInformationMessage('Open a folder first to select a configuration');
+    } else {
+        // This only applies to the active client. You cannot change the configuration for
+        // a client that is not active since that client's UI will not be visible.
+        clients.ActiveClient.handleConfigurationSelectCommand();
+    }
+}
+
+function onSelectConfigurationProvider(): void {
+    onActivationEvent();
+    if (!isFolderOpen()) {
+        vscode.window.showInformationMessage('Open a folder first to select a configuration provider');
+    } else {
+        selectClient().then(client => client.handleConfigurationProviderSelectCommand(), rejected => {});
+    }
+}
+
+function onEditConfiguration(): void {
+    onActivationEvent();
+    if (!isFolderOpen()) {
+        vscode.window.showInformationMessage('Open a folder first to edit configurations');
+    } else {
+        selectClient().then(client => client.handleConfigurationEditCommand(), rejected => {});
+    }
+}
+
+function onAddToIncludePath(path: string): void {
+    if (!isFolderOpen()) {
+        vscode.window.showInformationMessage('Open a folder first to add to includePath');
+    } else {
+        // This only applies to the active client. It would not make sense to add the include path
+        // suggestion to a different workspace.
+        clients.ActiveClient.handleAddToIncludePathCommand(path);
+    }
+}
+
+function onToggleSquiggles(): void {
+    onActivationEvent();
+    // This only applies to the active client.
+    let settings: CppSettings = new CppSettings(clients.ActiveClient.RootUri);
+    settings.toggleSetting("errorSquiggles", "Enabled", "Disabled");
+}
+
+function onToggleSnippets(): void {
+    onActivationEvent();
+
+    // This will apply to all clients as it's a global toggle. It will require a reload.
+    const snippetsCatName: string  = "Snippets";
+    let newPackageJson: any = util.getRawPackageJson();
+
+    if (newPackageJson.categories.findIndex(cat => cat === snippetsCatName) === -1) {
+        // Add the Snippet category and snippets node. 
+
+        newPackageJson.categories.push(snippetsCatName);
+        newPackageJson.contributes.snippets = [{"language": "cpp", "path": "./cpp_snippets.json"}, {"language": "c", "path": "./cpp_snippets.json"}];
+
+        fs.writeFile(util.getPackageJsonPath(), util.stringifyPackageJson(newPackageJson), () => {
+            showReloadPrompt("Reload Window to finish enabling C++ snippets");
+        });
+        
+    } else {
+        // Remove the category and snippets node.
+        let ndxCat: number = newPackageJson.categories.indexOf(snippetsCatName);
+        if (ndxCat !== -1) {
+            newPackageJson.categories.splice(ndxCat, 1);
+        }
+
+        delete newPackageJson.contributes.snippets;
+
+        fs.writeFile(util.getPackageJsonPath(), util.stringifyPackageJson(newPackageJson), () => {
+            showReloadPrompt("Reload Window to finish disabling C++ snippets");
+        });
+    }
+}
+
+function showReloadPrompt(msg: string): void { 
+    let reload: string = "Reload"; 
+    vscode.window.showInformationMessage(msg, reload).then(value => { 
+       if (value === reload) { 
+          vscode.commands.executeCommand("workbench.action.reloadWindow"); 
+       } 
+    }); 
+ } 
+
+function onToggleIncludeFallback(): void {
+    onActivationEvent();
+    // This only applies to the active client.
+    let settings: CppSettings = new CppSettings(clients.ActiveClient.RootUri);
+    settings.toggleSetting("intelliSenseEngineFallback", "Enabled", "Disabled");
+}
+
+function onToggleDimInactiveRegions(): void {
+    onActivationEvent();
+    // This only applies to the active client.
+    let settings: CppSettings = new CppSettings(clients.ActiveClient.RootUri);
+    settings.update<boolean>("dimInactiveRegions", !settings.dimInactiveRegions);
+}
+
+function onShowReleaseNotes(): void {
+    onActivationEvent();
+    util.showReleaseNotes();
+}
+
+function onPauseParsing(): void {
+    onActivationEvent();
+    selectClient().then(client => client.pauseParsing(), rejected => {});
+}
+
+function onResumeParsing(): void {
+    onActivationEvent();
+    selectClient().then(client => client.resumeParsing(), rejected => {});
+}
+
+function onShowParsingCommands(): void {
+    onActivationEvent();
+    selectClient().then(client => client.handleShowParsingCommands(), rejected => {});
+}
+
+function onTakeSurvey(): void {
+    onActivationEvent();
+    telemetry.logLanguageServerEvent("onTakeSurvey");
+    let uri: vscode.Uri = vscode.Uri.parse(`https://www.research.net/r/VBVV6C6?o=${os.platform()}&m=${vscode.env.machineId}`);
+    vscode.commands.executeCommand('vscode.open', uri);
+}
+
+function reportMacCrashes(): void {
+    if (process.platform === "darwin") {
+        prevCrashFile = "";
+        let crashFolder: string = path.resolve(process.env.HOME, "Library/Logs/DiagnosticReports");
+        fs.stat(crashFolder, (err, stats) => {
+            let crashObject: { [key: string]: string } = {};
+            if (err) {
+                // If the directory isn't there, we have a problem...
+                crashObject["fs.stat: err.code"] = err.code;
+                telemetry.logLanguageServerEvent("MacCrash", crashObject, null);
+                return;
+            }
+
+            // vscode.workspace.createFileSystemWatcher only works in workspace folders.
+            try {
+                fs.watch(crashFolder, (event, filename) => {
+                    if (event !== "rename") {
+                        return;
+                    }
+                    if (filename === prevCrashFile) {
+                        return;
+                    }
+                    prevCrashFile = filename;
+                    if (!filename.startsWith("Microsoft.VSCode.CPP.")) {
+                        return;
+                    }
+                    // Wait 5 seconds to allow time for the crash log to finish being written.
+                    setTimeout(() => {
+                        fs.readFile(path.resolve(crashFolder, filename), 'utf8', (err, data) => {
+                            if (err) {
+                                // Try again?
+                                fs.readFile(path.resolve(crashFolder, filename), 'utf8', handleCrashFileRead);
+                                return;
+                            }
+                            handleCrashFileRead(err, data);
+                        });
+                    }, 5000);
+                });
+            } catch (e) {
+                // The file watcher limit is hit (may not be possible on Mac, but just in case).
+            }
+        });
+    }
+}
+
+function handleCrashFileRead(err: NodeJS.ErrnoException, data: string): void {
+    let crashObject: { [key: string]: string } = {};
+    if (err) {
+        crashObject["readFile: err.code"] = err.code;
+        telemetry.logLanguageServerEvent("MacCrash", crashObject, null);
+        return;
+    }
+    let startCrash: number = data.indexOf(" Crashed:");
+    if (startCrash < 0) {
+        startCrash = 0;
+    }
+    let endCrash: number = data.indexOf("Thread ", startCrash);
+    if (endCrash < startCrash) {
+        endCrash = data.length - 1;
+    }
+    data = data.substr(startCrash, endCrash - startCrash);
+    if (data.length > 16384) {
+        data = data.substr(0, 16384) + "...";
+    }
+    crashObject["CrashingThreadCallStack"] = data;
+    telemetry.logLanguageServerEvent("MacCrash", crashObject, null);
+}
+
+export function deactivate(): Thenable<void> {
+    console.log("deactivating extension");
+    telemetry.logLanguageServerEvent("LanguageServerShutdown");
+    clearInterval(intervalTimer);
+    clearInterval(insiderUpdateTimer);
+    disposables.forEach(d => d.dispose());
+    languageConfigurations.forEach(d => d.dispose());
+    ui.dispose();
+    return clients.dispose();
+}
+
+export function isFolderOpen(): boolean {
+    return vscode.workspace.workspaceFolders !== undefined && vscode.workspace.workspaceFolders.length > 0;
+}
+
+export function getClients(): ClientCollection {
+    if (!realActivationOccurred) {
+        realActivation();
+    }
+    return clients;
+}
+
+export function getActiveClient(): Client {
+    if (!realActivationOccurred) {
+        realActivation();
+    }
+    return clients.ActiveClient;
+}

Extension/src/LanguageServer/languageConfig.ts

@@ -0,0 +1,321 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as vscode from 'vscode';
+import { CppSettings } from './settings';
+import { getOutputChannel } from '../logger';
+
+export interface CommentPattern {
+    begin: string;
+    continue: string;
+}
+
+const escapeChars: RegExp = /[\\\^\$\*\+\?\{\}\(\)\.\!\=\|\[\]\ \/]/;  // characters that should be escaped.
+
+// Insert '\\' in front of regexp escape chars.
+function escape(chars: string): string {
+    let result: string = "";
+    for (let char of chars) {
+        if (char.match(escapeChars)) {
+            result += `\\${char}`;
+        } else {
+            result += char;
+        }
+    }
+    return result;
+}
+
+// BEWARE: below are string representations of regular expressions, so the backslashes must all be escaped.
+
+function getMLBeginPattern(insert: string): string | undefined {
+    if (insert && insert.startsWith("/*")) {
+        let match: string = escape(insert.substr(2)); // trim the leading '/*' and escape any troublesome characters.
+        return `^\\s*\\/\\*${match}(?!\\/)([^\\*]|\\*(?!\\/))*$`;
+    }
+    return undefined;
+}
+
+function getMLSplitAfterPattern(): string {
+    return "^\\s*\\*\\/$";
+}
+
+function getMLContinuePattern(insert: string): string | undefined {
+    if (insert) {
+        let match: string = escape(insert.trimRight());
+        if (match) {
+            let right: string = escape(insert.substr(insert.trimRight().length));
+            return `^\\s*${match}(${right}([^\\*]|\\*(?!\\/))*)?$`;
+        }
+        // else: if the continuation is just whitespace, vscode already does indentation preservation.
+    }
+    return undefined;
+}
+
+function getMLEndPattern(insert: string): string | undefined {
+    if (insert) {
+        let match: string = escape(insert.trimRight().trimLeft());
+        if (match) {
+            return `^\\s*${match}[^/]*\\*\\/\\s*$`;
+        }
+        // else: if the continuation is just whitespace, don't mess with indentation
+        // since we don't know if this is a continuation line or not.
+    }
+    return undefined;
+}
+
+function getMLEmptyEndPattern(insert: string): string | undefined {
+    if (insert) {
+        insert = insert.trimRight();
+        if (insert) {
+            if (insert.endsWith('*')) {
+                insert = insert.substr(0, insert.length - 1);
+            }
+            let match: string = escape(insert.trimRight());
+            return `^\\s*${match}\\*\\/\\s*$`;
+        }
+        // else: if the continuation is just whitespace, don't mess with indentation
+        // since we don't know if this is a continuation line or not.
+    }
+    return undefined;
+}
+
+function getSLBeginPattern(insert: string): string | undefined {
+    if (insert) {
+        let match: string = escape(insert.trimRight());
+        return `^\\s*${match}.*$`;
+    }
+    return undefined;
+}
+
+function getSLContinuePattern(insert: string): string | undefined {
+    if (insert) {
+        let match: string = escape(insert.trimRight());
+        return `^\\s*${match}.+$`;
+    }
+    return undefined;
+}
+
+function getSLEndPattern(insert: string): string | undefined {
+    if (insert) {
+        let match: string = escape(insert);
+        let trimmed: string = escape(insert.trimRight());
+        if (match !== trimmed) {
+            match = `(${match}|${trimmed})`;
+        }
+        return `^\\s*${match}$`;
+    }
+    return undefined;
+}
+
+// When Enter is pressed while the cursor is between '/**' and '*/' on the same line.
+function getMLSplitRule(comment: CommentPattern): vscode.OnEnterRule | undefined {
+    if (comment) {
+        let beforePattern: string | undefined = getMLBeginPattern(comment.begin);
+        if (beforePattern) {
+            return {
+                beforeText: new RegExp(beforePattern),
+                afterText: new RegExp(getMLSplitAfterPattern()),
+                action: {
+                    indentAction: vscode.IndentAction.IndentOutdent,
+                    appendText: comment.continue ? comment.continue : ''
+                }
+            };
+        }
+    }
+    return undefined;
+}
+
+// When Enter is pressed while the cursor is after '/**' and there is no '*/' on the same line after the cursor
+function getMLFirstLineRule(comment: CommentPattern): vscode.OnEnterRule | undefined {
+    if (comment) {
+        let beforePattern: string | undefined = getMLBeginPattern(comment.begin);
+        if (beforePattern) {
+            return {
+                beforeText: new RegExp(beforePattern),
+                action: {
+                    indentAction: vscode.IndentAction.None,
+                    appendText: comment.continue ? comment.continue : ''
+                }
+            };
+        }
+    }
+    return undefined;
+}
+
+// When Enter is pressed while the cursor is after the continuation pattern
+function getMLContinuationRule(comment: CommentPattern): vscode.OnEnterRule | undefined {
+    if (comment) {
+        let continuePattern: string = getMLContinuePattern(comment.continue);
+        if (continuePattern) {
+            return {
+                beforeText: new RegExp(continuePattern),
+                action: {
+                    indentAction: vscode.IndentAction.None,
+                    appendText: comment.continue.trimLeft()
+                }
+            };
+        }
+    }
+    return undefined;
+}
+
+// When Enter is pressed while the cursor is after '*/' (and '*/' plus leading whitespace is all that is on the line) 
+function getMLEndRule(comment: CommentPattern): vscode.OnEnterRule | undefined {
+    if (comment) {
+        let endPattern: string = getMLEndPattern(comment.continue);
+        if (endPattern) {
+            return {
+                beforeText: new RegExp(endPattern),
+                action: {
+                    indentAction: vscode.IndentAction.None,
+                    removeText: comment.continue.length - comment.continue.trimLeft().length
+                }
+            };
+        }
+    }
+    return undefined;
+}
+
+// When Enter is pressed while the cursor is after the continuation pattern and '*/'
+function getMLEmptyEndRule(comment: CommentPattern): vscode.OnEnterRule | undefined {
+    if (comment) {
+        let endPattern: string = getMLEmptyEndPattern(comment.continue);
+        if (endPattern) {
+            return {
+                beforeText: new RegExp(endPattern),
+                action: {
+                    indentAction: vscode.IndentAction.None,
+                    removeText: comment.continue.length - comment.continue.trimLeft().length
+                }
+            };
+        }
+    }
+    return undefined;
+}
+
+// When the continue rule is different than the begin rule for single line comments
+function getSLFirstLineRule(comment: CommentPattern): vscode.OnEnterRule | undefined {
+    if (comment) {
+        let continuePattern: string = getSLBeginPattern(comment.begin);
+        if (continuePattern) {
+            return {
+                beforeText: new RegExp(continuePattern),
+                action: {
+                    indentAction: vscode.IndentAction.None,
+                    appendText: comment.continue.trimLeft()
+                }
+            };
+        }
+    }
+    return undefined;
+}
+
+// When Enter is pressed while the cursor is after the continuation pattern plus at least one other character.
+function getSLContinuationRule(comment: CommentPattern): vscode.OnEnterRule | undefined {
+    if (comment) {
+        let continuePattern: string = getSLContinuePattern(comment.continue);
+        if (continuePattern) {
+            return {
+                beforeText: new RegExp(continuePattern),
+                action: {
+                    indentAction: vscode.IndentAction.None,
+                    appendText: comment.continue.trimLeft()
+                }
+            };
+        }
+    }
+    return undefined;
+}
+
+// When Enter is pressed while the cursor is immediately after the continuation pattern
+function getSLEndRule(comment: CommentPattern): vscode.OnEnterRule | undefined {
+    if (comment) {
+        let endPattern: string = getSLEndPattern(comment.continue);
+        if (endPattern) {
+            return {
+                beforeText: new RegExp(endPattern),
+                action: {
+                    indentAction: vscode.IndentAction.None,
+                    removeText: comment.continue.length - comment.continue.trimLeft().length
+                }
+            };
+        }
+    }
+    return undefined;
+}
+
+interface Rules {
+    begin: vscode.OnEnterRule[];
+    continue: vscode.OnEnterRule[];
+    end: vscode.OnEnterRule[];
+}
+
+export function getLanguageConfig(languageId: string, resource?: vscode.Uri): vscode.LanguageConfiguration {
+    let settings: CppSettings = new CppSettings(resource);
+    let patterns: (string | CommentPattern)[] = settings.commentContinuationPatterns;
+    return getLanguageConfigFromPatterns(languageId, patterns);
+}
+
+export function getLanguageConfigFromPatterns(languageId: string, patterns: (string | CommentPattern)[]): vscode.LanguageConfiguration {
+    let beginPatterns: string[] = [];       // avoid duplicate rules
+    let continuePatterns: string[] = [];    // avoid duplicate rules
+    let duplicates: boolean = false;
+    let beginRules: vscode.OnEnterRule[] = [];
+    let continueRules: vscode.OnEnterRule[] = [];
+    let endRules: vscode.OnEnterRule[] = [];
+    patterns.forEach(pattern => {
+        let c: CommentPattern = (typeof pattern === "string") ? { begin: pattern, continue: pattern.startsWith('/*') ? " * " : pattern } : <CommentPattern>pattern;
+        let r: Rules = constructCommentRules(c, languageId);
+        if (beginPatterns.indexOf(c.begin) < 0) {
+            if (r.begin && r.begin.length > 0) {
+                beginRules = beginRules.concat(r.begin);
+            }
+            beginPatterns.push(c.begin);
+        } else {
+            duplicates = true;
+        }
+        if (continuePatterns.indexOf(c.continue) < 0) {
+            if (r.continue && r.continue.length > 0) {
+                continueRules = continueRules.concat(r.continue);
+            }
+            if (r.end && r.end.length > 0) {
+                endRules = endRules.concat(r.end);
+            }
+            continuePatterns.push(c.continue);
+        }
+    });
+    if (duplicates) {
+        getOutputChannel().appendLine("Duplicate multiline comment patterns detected.");
+    }
+    return { onEnterRules: beginRules.concat(continueRules).concat(endRules).filter(e => (e)) };    // Remove any 'undefined' entries
+}
+
+function constructCommentRules(comment: CommentPattern, languageId: string): Rules {
+    if (comment && comment.begin && comment.begin.startsWith('/*') && (languageId === 'c' || languageId === 'cpp')) {
+        return {
+            begin: [
+                getMLSplitRule(comment),
+                getMLFirstLineRule(comment)
+            ],
+            continue: [ getMLContinuationRule(comment) ],
+            end: [
+                getMLEmptyEndRule(comment),
+                getMLEndRule(comment)
+            ]
+        };
+    } else if (comment && comment.begin && comment.begin.startsWith('//') && languageId === 'cpp') {
+        return {
+            begin: (comment.begin === comment.continue) ? [] : [ getSLFirstLineRule(comment) ],
+            continue: [ getSLContinuationRule(comment) ],
+            end: [ getSLEndRule(comment) ]
+        };
+    }
+    return {
+        begin: [],
+        continue: [],
+        end: []
+    };
+}

Extension/src/LanguageServer/persistentState.ts

@@ -0,0 +1,53 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as util from '../common';
+import * as vscode from 'vscode';
+import * as path from 'path';
+
+class PersistentStateBase<T> {
+    private key: string;
+    private defaultvalue: T;
+    private state: vscode.Memento;
+
+    constructor(key: string, defaultValue: T, state: vscode.Memento) {
+        this.key = key;
+        this.defaultvalue = defaultValue;
+        this.state = state;
+    }
+
+    public get Value(): T {
+        return this.state.get<T>(this.key, this.defaultvalue);
+    }
+
+    public set Value(newValue: T) {
+        this.state.update(this.key, newValue);
+    }
+
+    public get DefaultValue(): T {
+        return this.defaultvalue;
+    }
+}
+
+// Abstraction for global state that persists across activations but is not present in a settings file
+export class PersistentState<T> extends PersistentStateBase<T> {
+    constructor(key: string, defaultValue: T) {
+        super(key, defaultValue, util.extensionContext.globalState);
+    }
+}
+
+export class PersistentWorkspaceState<T> extends PersistentStateBase<T> {
+    constructor(key: string, defaultValue: T) {
+        super(key, defaultValue, util.extensionContext.workspaceState);
+    }
+}
+
+export class PersistentFolderState<T> extends PersistentWorkspaceState<T> {
+    constructor(key: string, defaultValue: T, folder: string) {
+        let newKey: string = key + (folder ? `-${path.basename(folder)}` : "-untitled");
+        super(newKey, defaultValue);
+    }
+}

Extension/src/LanguageServer/protocolFilter.ts

@@ -0,0 +1,74 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import { Middleware } from 'vscode-languageclient';
+import { ClientCollection } from './clientCollection';
+import { Client } from './client';
+
+export function createProtocolFilter(me: Client, clients: ClientCollection): Middleware {
+    // Disabling lint for invoke handlers
+    /* tslint:disable */
+    let defaultHandler: (data: any, callback: (data: any) => void) => void = (data, callback: (data) => void) => { if (clients.ActiveClient === me) {me.notifyWhenReady(() => callback(data));}};
+    let invoke1 = (a, callback: (a) => any) => { if (clients.ActiveClient === me) { return me.requestWhenReady(() => callback(a)); } return null; };
+    let invoke2 = (a, b, callback: (a, b) => any) => { if (clients.ActiveClient === me) { return me.requestWhenReady(() => callback(a, b)); } return null; };
+    let invoke3 = (a, b, c, callback: (a, b, c) => any) => { if (clients.ActiveClient === me)  { return me.requestWhenReady(() => callback(a, b, c)); } return null; };
+    let invoke4 = (a, b, c, d, callback: (a, b, c, d) => any) => { if (clients.ActiveClient === me)  { return me.requestWhenReady(() => callback(a, b, c, d)); } return null; };
+    let invoke5 = (a, b, c, d, e, callback: (a, b, c, d, e) => any) => { if (clients.ActiveClient === me)  { return me.requestWhenReady(() => callback(a, b, c, d, e)); } return null; };
+    /* tslint:enable */
+
+    return {
+        didOpen: (document, sendMessage) => {
+            if (clients.checkOwnership(me, document)) {
+                me.TrackedDocuments.add(document);
+                me.provideCustomConfiguration(document).then(() => {
+                    sendMessage(document);
+                }, () => {
+                    sendMessage(document);
+                });
+            }
+        },
+        didChange: defaultHandler,
+        willSave: defaultHandler,
+        willSaveWaitUntil: (event, sendMessage) => {
+            if (clients.ActiveClient === me) {
+                return me.requestWhenReady(() => sendMessage(event));
+            }
+            return Promise.resolve([]);
+        },
+        didSave: defaultHandler,
+        didClose: (document, sendMessage) => {
+            if (clients.ActiveClient === me) {
+                console.assert(me.TrackedDocuments.has(document));
+                me.TrackedDocuments.delete(document);
+                me.notifyWhenReady(() => sendMessage(document));
+            }
+        },
+
+        provideCompletionItem: invoke3,
+        resolveCompletionItem: invoke2,
+        provideHover: invoke3,
+        provideSignatureHelp: invoke3,
+        provideDefinition: invoke3,
+        provideReferences: invoke4,
+        provideDocumentHighlights: invoke3,
+        provideDocumentSymbols: invoke2,
+        provideWorkspaceSymbols: invoke2,
+        provideCodeActions: invoke4,
+        provideCodeLenses: invoke2,
+        resolveCodeLens: invoke2,
+        provideDocumentFormattingEdits: invoke3,
+        provideDocumentRangeFormattingEdits: invoke4,
+        provideOnTypeFormattingEdits: invoke5,
+        provideRenameEdits: invoke4,
+        provideDocumentLinks: invoke2,
+        resolveDocumentLink: invoke2,
+
+        // I believe the default handler will do the same thing.
+        // workspace: {
+        //     didChangeConfiguration: (sections, sendMessage) => sendMessage(sections)
+        // }
+    };
+}

Extension/src/LanguageServer/settings.ts

@@ -0,0 +1,100 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as vscode from 'vscode';
+import { CommentPattern } from './languageConfig';
+
+function getTarget(): vscode.ConfigurationTarget {
+    return (vscode.workspace.workspaceFolders) ? vscode.ConfigurationTarget.WorkspaceFolder : vscode.ConfigurationTarget.Global;
+}
+
+class Settings {
+    private readonly settings: vscode.WorkspaceConfiguration;
+
+    /**
+     * create the Settings object.
+     * @param resource The path to a resource to which the settings should apply, or undefined if global settings are desired
+     */
+    constructor(section: string, resource?: vscode.Uri) {
+        this.settings = vscode.workspace.getConfiguration(section, resource ? resource : null);
+    }
+
+    protected get Section(): vscode.WorkspaceConfiguration { return this.settings; }
+}
+
+export class CppSettings extends Settings {
+    constructor(resource?: vscode.Uri) {
+        super("C_Cpp", resource);
+    }
+  
+    public get clangFormatPath(): string { return super.Section.get<string>("clang_format_path"); }
+    public get clangFormatStyle(): string { return super.Section.get<string>("clang_format_style"); }
+    public get clangFormatFallbackStyle(): string { return super.Section.get<string>("clang_format_fallbackStyle"); }
+    public get clangFormatSortIncludes(): string { return super.Section.get<string>("clang_format_sortIncludes"); }
+    public get clangFormatOnSave(): string { return super.Section.get<string>("clang_format_formatOnSave"); }
+    public get formatting(): string { return super.Section.get<string>("formatting"); }
+    public get intelliSenseEngine(): string { return super.Section.get<string>("intelliSenseEngine"); }
+    public get intelliSenseEngineFallback(): string { return super.Section.get<string>("intelliSenseEngineFallback"); }
+    public get errorSquiggles(): string { return super.Section.get<string>("errorSquiggles"); }
+    public get dimInactiveRegions(): boolean { return super.Section.get<boolean>("dimInactiveRegions"); }
+    public get inactiveRegionOpacity(): number { return super.Section.get<number>("inactiveRegionOpacity"); }
+    public get inactiveRegionForegroundColor(): string { return super.Section.get<string>("inactiveRegionForegroundColor"); }
+    public get inactiveRegionBackgroundColor(): string { return super.Section.get<string>("inactiveRegionBackgroundColor"); }
+    public get autoComplete(): string { return super.Section.get<string>("autocomplete"); }
+    public get loggingLevel(): string { return super.Section.get<string>("loggingLevel"); }
+    public get navigationLength(): number { return super.Section.get<number>("navigation.length", 60); }
+    public get autoAddFileAssociations(): boolean { return super.Section.get<boolean>("autoAddFileAssociations"); }
+    public get workspaceParsingPriority(): boolean { return super.Section.get<boolean>("workspaceParsingPriority"); }
+    public get workspaceSymbols(): string { return super.Section.get<string>("workspaceSymbols"); }
+    public get exclusionPolicy(): boolean { return super.Section.get<boolean>("exclusionPolicy"); }
+    public get commentContinuationPatterns(): (string | CommentPattern)[] { return super.Section.get<(string | CommentPattern)[]>("commentContinuationPatterns"); }
+    public get configurationWarnings(): string { return super.Section.get<string>("configurationWarnings"); }
+    public get preferredPathSeparator(): string { return super.Section.get<string>("preferredPathSeparator"); }
+    public get updateChannel(): string { return super.Section.get<string>("updateChannel"); }
+    public get defaultIncludePath(): string[] { return super.Section.get<string[]>("default.includePath"); }
+    public get defaultDefines(): string[] { return super.Section.get<string[]>("default.defines"); }
+    public get defaultMacFrameworkPath(): string[] { return super.Section.get<string[]>("default.macFrameworkPath"); }
+    public get defaultWindowsSdkVersion(): string { return super.Section.get<string>("default.windowsSdkVersion"); }
+    public get defaultCompileCommands(): string { return super.Section.get<string>("default.compileCommands"); }
+    public get defaultForcedInclude(): string[] { return super.Section.get<string[]>("default.forcedInclude"); }
+    public get defaultIntelliSenseMode(): string { return super.Section.get<string>("default.intelliSenseMode"); }
+    public get defaultCompilerPath(): string { return super.Section.get<string>("default.compilerPath"); }
+    public get defaultCStandard(): string { return super.Section.get<string>("default.cStandard"); }
+    public get defaultCppStandard(): string { return super.Section.get<string>("default.cppStandard"); }
+    public get defaultConfigurationProvider(): string { return super.Section.get<string>("default.configurationProvider"); }
+    public get defaultBrowsePath(): string[] { return super.Section.get<string[]>("default.browse.path"); }
+    public get defaultDatabaseFilename(): string { return super.Section.get<string>("default.browse.databaseFilename"); }
+    public get defaultLimitSymbolsToIncludedHeaders(): boolean { return super.Section.get<boolean>("default.browse.limitSymbolsToIncludedHeaders"); }
+    public get defaultSystemIncludePath(): string[] { return super.Section.get<string[]>("default.systemIncludePath"); }
+
+    public toggleSetting(name: string, value1: string, value2: string): void {
+        let value: string = super.Section.get<string>(name);
+        super.Section.update(name, value === value1 ? value2 : value1, getTarget());
+    }
+    public update<T>(name: string, value: T): void {
+        super.Section.update(name, value);
+    }
+}
+
+export class OtherSettings {
+    private resource: vscode.Uri;
+
+    constructor(resource?: vscode.Uri) {
+        if (!resource) {
+            resource = null;
+        }
+        this.resource = resource;
+    }
+
+    public get editorTabSize(): vscode.WorkspaceConfiguration { return vscode.workspace.getConfiguration("editor", this.resource).get("tabSize"); }
+    public get filesAssociations(): any { return vscode.workspace.getConfiguration("files", null).get("associations"); }
+    public get filesExclude(): vscode.WorkspaceConfiguration { return vscode.workspace.getConfiguration("files", this.resource).get("exclude"); }
+    public get searchExclude(): vscode.WorkspaceConfiguration { return vscode.workspace.getConfiguration("search", this.resource).get("exclude"); }
+
+    public set filesAssociations(value: any) {
+         vscode.workspace.getConfiguration("files", null).update("associations", value, vscode.ConfigurationTarget.Workspace);
+    }
+}

Extension/src/LanguageServer/settingsTracker.ts

@@ -0,0 +1,190 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as vscode from 'vscode';
+import * as util from '../common';
+
+/**
+ * track settings changes for telemetry
+ */
+type FilterFunction = (key: string, val: string, settings: vscode.WorkspaceConfiguration) => boolean;
+type KeyValuePair = { key: string; value: string };
+
+const maxSettingLengthForTelemetry: number = 50;
+let cache: SettingsTracker = undefined;
+
+export class SettingsTracker {
+    private previousCppSettings: { [key: string]: any } = {};
+    private resource: vscode.Uri;
+
+    constructor(resource: vscode.Uri) {
+        this.resource = resource;
+        this.collectSettings(() => true);
+    }
+
+    public getUserModifiedSettings(): { [key: string]: string } {
+        let filter: FilterFunction = (key: string, val: string, settings: vscode.WorkspaceConfiguration) => {
+            return !this.areEqual(val, settings.inspect(key).defaultValue);
+        };
+        return this.collectSettings(filter);
+    }
+
+    public getChangedSettings(): { [key: string]: string } {
+        let filter: FilterFunction = (key: string, val: string) => {
+            return !(key in this.previousCppSettings) || !this.areEqual(val, this.previousCppSettings[key]);
+        };
+        return this.collectSettings(filter);
+    }
+
+    private collectSettings(filter: FilterFunction): { [key: string]: string } {
+        let settings: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("C_Cpp", this.resource);
+        let result: { [key: string]: string } = {};
+
+        for (let key in settings) {
+            let val: any = this.getSetting(settings, key);
+            if (val === undefined) {
+                continue;
+            }
+            if (val instanceof Object && !(val instanceof Array)) {
+                for (let subKey in val) {
+                    let newKey: string = key + "." + subKey;
+                    let subVal: any = this.getSetting(settings, newKey);
+                    if (subVal === undefined) {
+                        continue;
+                    }
+                    let entry: KeyValuePair = this.filterAndSanitize(newKey, subVal, settings, filter);
+                    if (entry && entry.key && entry.value) {
+                        result[entry.key] = entry.value;
+                    }
+                }
+                continue;
+            }
+
+            let entry: KeyValuePair = this.filterAndSanitize(key, val, settings, filter);
+            if (entry && entry.key && entry.value) {
+                result[entry.key] = entry.value;
+            }
+        }
+
+        return result;
+    }
+
+    private getSetting(settings: vscode.WorkspaceConfiguration, key: string): any {
+        // Ignore methods and settings that don't exist
+        if (settings.inspect(key).defaultValue !== undefined) {
+            let val: any = settings.get(key);
+            if (val instanceof Object) {
+                return val; // It's a sub-section.
+            }
+
+            // Only return values that match the setting's type and enum (if applicable).
+            let curSetting: any = util.packageJson.contributes.configuration.properties["C_Cpp." + key];
+            if (curSetting) {
+                let type: string = this.typeMatch(val, curSetting["type"]);
+                if (type) {
+                    if (type !== "string") {
+                        return val;
+                    }
+                    let curEnum: any[] = curSetting["enum"];
+                    if (curEnum && curEnum.indexOf(val) === -1) {
+                        return "<invalid>";
+                    }
+                    return val;
+                }
+            }
+        }
+        return undefined;
+    }
+
+    private typeMatch(value: any, type?: string | string[]): string {
+        if (type) {
+            if (type instanceof Array) {
+                for (let i: number = 0; i < type.length; i++) {
+                    let t: string = type[i];
+                    if (t) {
+                        if (typeof value === t) {
+                            return t;
+                        }
+                        if (t === "array" && value instanceof Array) {
+                            return t;
+                        }
+                        if (t === "null" && value === null) {
+                            return t;
+                        }
+                    }
+                }
+            } else if (typeof type === "string" && typeof value === type) {
+                return type;
+            }
+        }
+        return undefined;
+    }
+
+    private filterAndSanitize(key: string, val: any, settings: vscode.WorkspaceConfiguration, filter: FilterFunction): KeyValuePair {
+        if (filter(key, val, settings)) {
+            let value: string;
+            this.previousCppSettings[key] = val;
+            switch (key) {
+                case "clang_format_style":
+                case "clang_format_fallbackStyle": {
+                    let newKey: string = key + "2";
+                    if (val) {
+                        switch (String(val).toLowerCase()) {
+                            case "visual studio":
+                            case "llvm":
+                            case "google":
+                            case "chromium":
+                            case "mozilla":
+                            case "webkit":
+                            case "file":
+                            case "none": {
+                                value = String(this.previousCppSettings[key]);
+                                break;
+                            }
+                            default: {
+                                value = "...";
+                                break;
+                            }
+                        }
+                    } else {
+                        value = "null";
+                    }
+                    key = newKey;
+                    break;
+                }
+                case "commentContinuationPatterns": {
+                    value = this.areEqual(val, settings.inspect(key).defaultValue) ? "<default>" : "..."; // Track whether it's being used, but nothing specific about it.
+                    break;
+                }
+                default: {
+                    if (key === "clang_format_path" || key.startsWith("default.")) {
+                        value = this.areEqual(val, settings.inspect(key).defaultValue) ? "<default>" : "..."; // Track whether it's being used, but nothing specific about it.
+                    } else {
+                        value = String(this.previousCppSettings[key]);
+                    }
+                }
+            }
+            if (value && value.length > maxSettingLengthForTelemetry) {
+                value = value.substr(0, maxSettingLengthForTelemetry) + "...";
+            }
+            return {key: key, value: value};
+        }
+    }
+
+    private areEqual(value1: any, value2: any): boolean {
+        if (value1 instanceof Object && value2 instanceof Object) {
+            return JSON.stringify(value1) === JSON.stringify(value2);
+        }
+        return value1 === value2;
+    }
+}
+
+export function getTracker(resource: vscode.Uri): SettingsTracker {
+    if (!cache) {
+        cache = new SettingsTracker(resource);
+    }
+    return cache;
+}

Extension/src/LanguageServer/ui.ts

@@ -0,0 +1,295 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as vscode from 'vscode';
+import { Client } from './client';
+import { getCustomConfigProviders, CustomConfigurationProviderCollection } from './customProviders';
+
+let ui: UI;
+
+interface IndexableQuickPickItem extends vscode.QuickPickItem {
+    index: number;
+}
+interface KeyedQuickPickItem extends vscode.QuickPickItem {
+    key: string;
+}
+
+// Higher numbers mean greater priority.
+enum ConfigurationPriority {
+    IncludePath = 1,
+    CompileCommands = 2,
+    CustomProvider = 3,
+}
+
+interface ConfigurationResult {
+    configured: boolean;
+    priority: ConfigurationPriority;
+}
+
+export class UI {
+    private navigationStatusBarItem: vscode.StatusBarItem;
+    private configStatusBarItem: vscode.StatusBarItem;
+    private browseEngineStatusBarItem: vscode.StatusBarItem;
+    private intelliSenseStatusBarItem: vscode.StatusBarItem;
+    private configurationUIPromise: Thenable<ConfigurationResult>;
+
+    constructor() {
+        // 1000 = priority, it needs to be high enough to be on the left of the Ln/Col.
+        this.navigationStatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 1000);
+        this.navigationStatusBarItem.tooltip = "C/C++ Navigation";
+        this.navigationStatusBarItem.command = "C_Cpp.Navigate";
+        this.ShowNavigation = true;
+
+        this.configStatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 2);
+        this.configStatusBarItem.command = "C_Cpp.ConfigurationSelect";
+        this.configStatusBarItem.tooltip = "C/C++ Configuration";
+        this.ShowConfiguration = true;
+
+        this.intelliSenseStatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 1);
+        this.intelliSenseStatusBarItem.text = "";
+        this.intelliSenseStatusBarItem.tooltip = "Updating IntelliSense...";
+        this.intelliSenseStatusBarItem.color = "Red";
+        this.ShowFlameIcon = true;
+
+        this.browseEngineStatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 0);
+        this.browseEngineStatusBarItem.text = "";
+        this.browseEngineStatusBarItem.tooltip = "Discovering files...";
+        this.browseEngineStatusBarItem.color = new vscode.ThemeColor("statusBar.foreground");
+        this.browseEngineStatusBarItem.command = "C_Cpp.ShowParsingCommands";
+        this.ShowDBIcon = true;
+    }
+
+    private set NavigationLocation(location: string) {
+        this.navigationStatusBarItem.text = location;
+    }
+
+    private set ActiveConfig(label: string) {
+        this.configStatusBarItem.text = label;
+    }
+
+    private set TagParseStatus(label: string) {
+        this.browseEngineStatusBarItem.tooltip = label;
+    }
+
+    private get IsTagParsing(): boolean {
+        return this.browseEngineStatusBarItem.text !== "";
+    }
+    private set IsTagParsing(val: boolean) {
+        this.browseEngineStatusBarItem.text = val ? "$(database)" : "";
+        this.ShowDBIcon = val;
+    }
+
+    private get IsUpdatingIntelliSense(): boolean {
+        return this.intelliSenseStatusBarItem.text !== "";
+    }
+    private set IsUpdatingIntelliSense(val: boolean) {
+        this.intelliSenseStatusBarItem.text = val ? "$(flame)" : "";
+        this.ShowFlameIcon = val;
+    }
+
+    private set ShowNavigation(show: boolean) {
+        if (show) {
+            this.navigationStatusBarItem.show();
+        } else {
+            this.navigationStatusBarItem.hide();
+        }
+    }
+
+    private set ShowDBIcon(show: boolean) {
+        if (show && this.IsTagParsing) {
+            this.browseEngineStatusBarItem.show();
+        } else {
+            this.browseEngineStatusBarItem.hide();
+        }
+    }
+
+    private set ShowFlameIcon(show: boolean) {
+        if (show && this.IsUpdatingIntelliSense) {
+            this.intelliSenseStatusBarItem.show();
+        } else {
+            this.intelliSenseStatusBarItem.hide();
+        }
+    }
+
+    private set ShowConfiguration(show: boolean) {
+        if (show) {
+            this.configStatusBarItem.show();
+        } else {
+            this.configStatusBarItem.hide();
+        }
+    }
+
+    public activeDocumentChanged(): void {
+        let activeEditor: vscode.TextEditor = vscode.window.activeTextEditor;
+        let isCpp: boolean = (activeEditor && (activeEditor.document.languageId === "cpp" || activeEditor.document.languageId === "c"));
+
+        // It's sometimes desirable to see the config and icons when making settings changes.
+        let isSettingsJson: boolean = (activeEditor && (activeEditor.document.fileName.endsWith("c_cpp_properties.json") || activeEditor.document.fileName.endsWith("settings.json")));
+
+        this.ShowConfiguration = isCpp || isSettingsJson;
+        this.ShowDBIcon = isCpp || isSettingsJson;
+        this.ShowFlameIcon = isCpp || isSettingsJson;
+        this.ShowNavigation = isCpp;
+    }
+
+    public bind(client: Client): void {
+        client.TagParsingChanged(value => { this.IsTagParsing = value; });
+        client.IntelliSenseParsingChanged(value => { this.IsUpdatingIntelliSense = value; });
+        client.NavigationLocationChanged(value => { this.NavigationLocation = value; });
+        client.TagParserStatusChanged(value => { this.TagParseStatus = value; });
+        client.ActiveConfigChanged(value => { this.ActiveConfig = value; });
+    }
+
+    public showNavigationOptions(navigationList: string): void {
+        let options: vscode.QuickPickOptions = {};
+        options.placeHolder = "Select where to navigate to";
+
+        let items: IndexableQuickPickItem[] = [];
+        let navlist: string[] = navigationList.split(";");
+        for (let i: number = 0; i < navlist.length - 1; i += 2) {
+            items.push({ label: navlist[i], description: "", index: Number(navlist[i + 1]) });
+        }
+
+        vscode.window.showQuickPick(items, options)
+            .then(selection => {
+                if (!selection) {
+                    return;
+                }
+                vscode.window.activeTextEditor.revealRange(new vscode.Range(selection.index, 0, selection.index, 0), vscode.TextEditorRevealType.InCenter);
+                vscode.window.activeTextEditor.selection = new vscode.Selection(new vscode.Position(selection.index, 0), new vscode.Position(selection.index, 0));
+            });
+    }
+
+    public showConfigurations(configurationNames: string[]): Thenable<number> {
+        let options: vscode.QuickPickOptions = {};
+        options.placeHolder = "Select a Configuration...";
+
+        let items: IndexableQuickPickItem[] = [];
+        for (let i: number = 0; i < configurationNames.length; i++) {
+            items.push({ label: configurationNames[i], description: "", index: i });
+        }
+        items.push({ label: "Edit Configurations...", description: "", index: configurationNames.length });
+
+        return vscode.window.showQuickPick(items, options)
+            .then(selection => (selection) ? selection.index : -1);
+    }
+
+    public showConfigurationProviders(currentProvider: string|null): Thenable<string|undefined> {
+        let options: vscode.QuickPickOptions = {};
+        options.placeHolder = "Select a Configuration Provider...";
+        let providers: CustomConfigurationProviderCollection = getCustomConfigProviders();
+
+        let items: KeyedQuickPickItem[] = [];
+        providers.forEach(provider => {
+            let label: string = provider.name;
+            if (provider.extensionId === currentProvider) {
+                label += " (active)";
+            }
+            items.push({ label: label, description: "", key: provider.extensionId });
+        });
+        items.push({ label: "(none)", description: "Disable the active configuration provider, if applicable.", key: "" });
+
+        return vscode.window.showQuickPick(items, options)
+            .then(selection => (selection) ? selection.key : undefined);
+    }
+
+    public showCompileCommands(paths: string[]): Thenable<number> {
+        let options: vscode.QuickPickOptions = {};
+        options.placeHolder = "Select a compile_commands.json...";
+
+        let items: IndexableQuickPickItem[] = [];
+        for (let i: number = 0; i < paths.length; i++) {
+            items.push({label: paths[i], description: "", index: i});
+        }
+
+        return vscode.window.showQuickPick(items, options)
+            .then(selection => (selection) ? selection.index : -1);
+    }
+
+    public showWorkspaces(workspaceNames: { name: string; key: string }[]): Thenable<string> {
+        let options: vscode.QuickPickOptions = {};
+        options.placeHolder = "Select a Workspace...";
+
+        let items: KeyedQuickPickItem[] = [];
+        workspaceNames.forEach(name => items.push({ label: name.name, description: "", key: name.key }));
+
+        return vscode.window.showQuickPick(items, options)
+            .then(selection => (selection) ? selection.key : "");
+    }
+
+    public showParsingCommands(): Thenable<number> {
+        let options: vscode.QuickPickOptions = {};
+        options.placeHolder = "Select a parsing command...";
+
+        let items: IndexableQuickPickItem[];
+        items = [];
+        if (this.browseEngineStatusBarItem.tooltip === "Parsing paused") {
+            items.push({ label: "Resume Parsing", description: "", index: 1 });
+        } else {
+            items.push({ label: "Pause Parsing", description: "", index: 0 });
+        }
+        
+        return vscode.window.showQuickPick(items, options)
+            .then(selection => (selection) ? selection.index : -1);
+    }
+
+    public showConfigureIncludePathMessage(prompt: () => Thenable<boolean>, onSkip: () => void): void {
+        setTimeout(() => {
+            this.showConfigurationPrompt(ConfigurationPriority.IncludePath, prompt, onSkip);
+        }, 10000);
+    }
+
+    public showConfigureCompileCommandsMessage(prompt: () => Thenable<boolean>, onSkip: () => void): void {
+        setTimeout(() => {
+            this.showConfigurationPrompt(ConfigurationPriority.CompileCommands, prompt, onSkip);
+        }, 5000);
+    }
+
+    public showConfigureCustomProviderMessage(prompt: () => Thenable<boolean>, onSkip: () => void): void {
+        this.showConfigurationPrompt(ConfigurationPriority.CustomProvider, prompt, onSkip);
+    }
+
+    private showConfigurationPrompt(priority: ConfigurationPriority, prompt: () => Thenable<boolean>, onSkip: () => void): void {
+        let showPrompt: () => Thenable<ConfigurationResult> = async () => {
+            let configured: boolean = await prompt();
+            return Promise.resolve({
+                priority: priority,
+                configured: configured
+            });
+        };
+
+        if (this.configurationUIPromise) {
+            this.configurationUIPromise = this.configurationUIPromise.then(result => {
+                if (priority > result.priority) {
+                    return showPrompt();
+                } else if (!result.configured) {
+                    return showPrompt();
+                }
+                onSkip();
+                return Promise.resolve({
+                    priority: result.priority,
+                    configured: true
+                });
+            });
+        } else {
+            this.configurationUIPromise = showPrompt();
+        }
+    }
+
+    public dispose(): void {
+        this.configStatusBarItem.dispose();
+        this.browseEngineStatusBarItem.dispose();
+        this.intelliSenseStatusBarItem.dispose();
+        this.navigationStatusBarItem.dispose();
+    }
+}
+
+export function getUI(): UI {
+    if (ui === undefined) {
+        ui = new UI();
+    }
+    return ui;
+}

Extension/src/Support/copyDebuggerDependencies.ts

@@ -0,0 +1,216 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+/**
+ * This file is used for packaging the application and should not be referenced
+ * by any other source files
+ */
+
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+
+//Change this to true to force a dev workflow.
+const EnableDevWorkflow: boolean = false;
+
+const DebugAdapterPath: string = "./debugAdapters";
+const DebugAdapterBinPath: string = DebugAdapterPath + "/bin";
+
+let CpptoolsExtensionRoot: string = null;
+let SearchCompleted: boolean = false;
+
+interface RootsHashtable {
+    "miEngineRoot": string;
+    "openDebugRoot": string;
+    "monoDeps": string;
+}
+
+const internalBinaryRoots: RootsHashtable = {
+    "miEngineRoot": process.env.CPPTOOLS_MIENGINE_ROOT,
+    "openDebugRoot": process.env.CPPTOOLS_OPENDEBUG_ROOT,
+    "monoDeps": process.env.CPPTOLS_MONODEPS_ROOT
+};
+
+const externalBinaryRoots: RootsHashtable = {
+    "miEngineRoot": DebugAdapterBinPath,
+    "openDebugRoot": DebugAdapterBinPath,
+    "monoDeps": DebugAdapterPath
+};
+
+function findCppToolsExtensionDebugAdapterFolder(): string {
+    const vscodeFolderRegExp: RegExp = new RegExp(/\.vscode-*[a-z]*$/);
+    const cpptoolsFolderRegExp: RegExp = new RegExp(/ms\-vscode\.cpptools\-.*$/);
+
+    let dirPath: string = os.homedir();
+    if (fs.existsSync(dirPath)) {
+        let files: string[] = fs.readdirSync(dirPath);
+        for (let i: number = 0; i < files.length; i++) {
+            // Check to see if it starts with '.vscode'
+            if (vscodeFolderRegExp.test(files[i])) {
+                let extPath: string = path.join(dirPath, files[i], "extensions");
+                if (fs.existsSync(extPath)) {
+                    let extFiles: string[] = fs.readdirSync(extPath);
+                    for (let j: number = 0; j < extFiles.length; j++) {
+                        if (cpptoolsFolderRegExp.test(path.join(extFiles[j]))) {
+                            dirPath = path.join(extPath, extFiles[j]);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (dirPath === os.homedir()) {
+            console.error("Could not find installed C/C++ extension.");
+            return null;
+        }
+
+        return dirPath;
+    } else {
+        console.error("Unable to determine C/C++ extension installation location.");
+        return null;
+    }
+}
+
+function enableDevWorkflow(): Boolean {
+    if (process.env.AGENT_ID) {
+        //Agent machines must not attempt any dev workflows
+        return false;
+    }
+
+    return (EnableDevWorkflow || (process.env.CPPTOOLS_DEV !== undefined));
+}
+
+function copySourceDependencies(): void {
+    copy("./", DebugAdapterBinPath, "cppdbg.ad7Engine.json");
+}
+
+function getRoot(rootKey: string): string {
+    const internal: string = internalBinaryRoots[rootKey];
+    if (internal) {
+        return internal;
+    }
+
+    // Only search for the extension root once.
+    if (!CpptoolsExtensionRoot && !SearchCompleted) {
+        CpptoolsExtensionRoot = findCppToolsExtensionDebugAdapterFolder();
+        SearchCompleted = true;
+    }
+
+    if (CpptoolsExtensionRoot) {
+        return path.join(CpptoolsExtensionRoot, externalBinaryRoots[rootKey]);
+    }
+
+    console.error("Unable to determine internal/external location to copy from for root %s.", rootKey);
+    return null;
+}
+
+function copyBinaryDependencies(): void {
+    const miEngineRoot: string = getRoot("miEngineRoot");
+    const openDebugRoot: string = getRoot("openDebugRoot");
+
+    copy(miEngineRoot, DebugAdapterBinPath, "Microsoft.MICore.dll");
+    copy(miEngineRoot, DebugAdapterBinPath, "Microsoft.MICore.dll.mdb");
+    copy(miEngineRoot, DebugAdapterBinPath, "Microsoft.MICore.XmlSerializers.dll");
+    copy(miEngineRoot, DebugAdapterBinPath, "Microsoft.MIDebugEngine.dll");
+    copy(miEngineRoot, DebugAdapterBinPath, "Microsoft.MIDebugEngine.dll.mdb");
+    copy(miEngineRoot, DebugAdapterBinPath, "osxlaunchhelper.scpt");
+
+    copy(openDebugRoot, DebugAdapterBinPath, "Microsoft.VisualStudio.Debugger.Interop.10.0.dll");
+    copy(openDebugRoot, DebugAdapterBinPath, "Microsoft.VisualStudio.Debugger.Interop.11.0.dll");
+    copy(openDebugRoot, DebugAdapterBinPath, "Microsoft.VisualStudio.Debugger.Interop.12.0.dll");
+    copy(openDebugRoot, DebugAdapterBinPath, "Microsoft.VisualStudio.Debugger.InteropA.dll");
+    copy(openDebugRoot, DebugAdapterBinPath, "Microsoft.DebugEngineHost.dll");
+    copy(openDebugRoot, DebugAdapterBinPath, "Microsoft.DebugEngineHost.dll.mdb");
+    copy(openDebugRoot, DebugAdapterBinPath, "OpenDebugAD7.exe");
+    copy(openDebugRoot, DebugAdapterBinPath, "OpenDebugAD7.exe.config");
+    copy(openDebugRoot, DebugAdapterBinPath, "OpenDebugAD7.exe.mdb");
+    copy(openDebugRoot, DebugAdapterBinPath, "Newtonsoft.Json.dll");
+}
+
+function copyMonoDependencies(): void {
+    const monoDeps: string = getRoot("monoDeps");
+
+    copy(monoDeps, DebugAdapterPath, "OpenDebugAD7");
+}
+
+function copy(root: string, target: string, file: string): void {
+    if (!root) {
+        console.error("Unknown root location. Copy Failed for %s.", file);
+        return;
+    }
+
+    const source: string = path.join(root, file);
+    const destination: string = path.join(target, file);
+
+    if (!fs.existsSync(target)) {
+        console.log('Creating directory %s', target);
+        makeDirectory(target);
+    }
+
+    console.log('copying %s to %s', source, destination);
+    if (fs.existsSync(source)) {
+        fs.writeFileSync(destination, fs.readFileSync(source));
+    } else {
+        console.error('ERR: could not find file %s', source);
+    }
+}
+
+function removeFolder(root: string): void {
+    if (!isDirectory(root)) {
+        console.warn('Skipping deletion of %s; directory does not exist', root);
+        return;
+    }
+
+    let files: string[] = fs.readdirSync(root);
+    for (let i: number = 0; i < files.length; i++) {
+        let fullPath: string = path.join(root, files[i]);
+        console.warn('Found entry %s', fullPath);
+        if (!isDirectory(fullPath)) {
+            console.warn('Deleting %s', fullPath);
+            fs.unlinkSync(fullPath);
+        } else {
+            removeFolder(fullPath);
+        }
+    }
+
+    console.warn('Deleting %s', root);
+    fs.rmdirSync(root);
+}
+
+function isDirectory(dir: string): Boolean {
+    try {
+        return fs.statSync(dir).isDirectory();
+    } catch (e) {
+    }
+    return false;
+}
+
+function makeDirectory(dir: string): void {
+    try {
+        //Note: mkdir is limited to creating folders with one level of nesting. Creating "a/b" if 'a' doesn't exist will throw a ENOENT.
+        fs.mkdirSync(dir);
+    } catch (e) {
+        if ((<NodeJS.ErrnoException>e).code !== "EEXIST") {
+            throw e;
+        }
+    }
+}
+
+if (enableDevWorkflow()) {
+    removeFolder("./debugAdapters");
+}
+
+makeDirectory("./debugAdapters");
+copySourceDependencies();
+
+if (enableDevWorkflow()) {
+    copyMonoDependencies();
+    copyBinaryDependencies();
+} else {
+    console.warn('WARNING: Debugger dependencies are missing.');
+    console.log('If you are trying to build and run the extension from source and need the debugger dependencies, set the environment variable CPPTOOLS_DEV=1 and try again.');
+}

Extension/src/Support/prepublish.js

@@ -0,0 +1,34 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+/**
+ * This file is used during local debugging of the extension and should not be referenced by any
+ * other source files.
+ */
+
+const fs = require("fs");
+const cp = require("child_process");
+const path = require("path");
+
+if (!process.env.CPPTOOLS_DEV && fs.existsSync('./node_modules')) {
+    console.warn("WARNING: Skipping npm install since it appears to have been executed already.");
+} else {
+    console.log(">> npm install");
+    cp.execSync("npm install", { stdio: [0, 1, 2] });
+}
+
+// Compile the TypeScript code
+console.log(">> tsc -p ./");
+cp.execSync("tsc -p ./", {stdio:[0, 1, 2]});
+
+// If the required debugger file doesn't exist, make sure it is copied.
+if (process.env.CPPTOOLS_DEV || !fs.existsSync('./debugAdapters/bin/cppdbg.ad7Engine.json')) {
+    const copyDebuggerDependenciesJSFile = './out/src/Support/copyDebuggerDependencies.js';
+
+    // Required for nightly builds. Nightly builds do not enable CPPTOOLS_DEV.
+    console.log(">> node " + copyDebuggerDependenciesJSFile);
+    cp.execSync("node " + copyDebuggerDependenciesJSFile, { stdio: [0, 1, 2] });
+}

Extension/src/abTesting.ts

@@ -0,0 +1,110 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as util from './common';
+import * as Telemetry from './telemetry';
+import { PersistentState } from './LanguageServer/persistentState';
+import * as fs from 'fs';
+
+const userBucketMax: number = 100;
+const userBucketString: string = "CPP.UserBucket";
+const localConfigFile: string = "cpptools.json";
+
+interface Settings {
+    defaultIntelliSenseEngine?: number;
+    recursiveIncludes?: number;
+    gotoDefIntelliSense?: number;
+}
+
+export class ABTestSettings {
+    private settings: Settings;
+    private intelliSenseEngineDefault: PersistentState<number>;
+    private recursiveIncludesDefault: PersistentState<number>;
+    private gotoDefIntelliSenseDefault: PersistentState<number>;
+    private bucket: PersistentState<number>;
+
+    constructor() {
+        this.intelliSenseEngineDefault = new PersistentState<number>("ABTest.1", 100);
+        this.recursiveIncludesDefault = new PersistentState<number>("ABTest.2", 100);
+        this.gotoDefIntelliSenseDefault = new PersistentState<number>("ABTest.3", 100);
+        this.settings = {
+            defaultIntelliSenseEngine: this.intelliSenseEngineDefault.Value,
+            recursiveIncludes: this.recursiveIncludesDefault.Value,
+            gotoDefIntelliSense: this.gotoDefIntelliSenseDefault.Value
+        };
+        this.bucket = new PersistentState<number>(userBucketString, -1);
+        if (this.bucket.Value === -1) {
+            this.bucket.Value = Math.floor(Math.random() * userBucketMax) + 1; // Range is [1, userBucketMax].
+        }
+
+        this.updateSettings();
+        // Redownload cpptools.json after initialization so it's not blocked.
+        // It'll be used the next time the extension reloads.
+        this.downloadCpptoolsJsonPkgAsync();
+
+        // Redownload occasionally to prevent an extra reload during long sessions.
+        setInterval(() => { this.downloadCpptoolsJsonPkgAsync(); }, 30 * 60 * 1000); // 30 minutes.
+    }
+
+    public get UseDefaultIntelliSenseEngine(): boolean {
+        return util.isNumber(this.settings.defaultIntelliSenseEngine) ? this.settings.defaultIntelliSenseEngine >= this.bucket.Value : true;
+    }
+
+    public get UseRecursiveIncludes(): boolean {
+        return util.isNumber(this.settings.recursiveIncludes) ? this.settings.recursiveIncludes >= this.bucket.Value : true;
+    }
+
+    public get UseGoToDefIntelliSense(): boolean {
+        return util.isNumber(this.settings.gotoDefIntelliSense) ? this.settings.gotoDefIntelliSense >= this.bucket.Value : true;
+    }
+
+    private updateSettings(): void {
+        const cpptoolsJsonFile: string = util.getExtensionFilePath(localConfigFile);
+
+        try {
+            const exists: boolean = fs.existsSync(cpptoolsJsonFile);
+            if (exists) {
+                const fileContent: string = fs.readFileSync(cpptoolsJsonFile).toString();
+                let newSettings: Settings = <Settings>JSON.parse(fileContent);
+                this.intelliSenseEngineDefault.Value = util.isNumber(newSettings.defaultIntelliSenseEngine) ? newSettings.defaultIntelliSenseEngine : this.intelliSenseEngineDefault.DefaultValue;
+                this.recursiveIncludesDefault.Value = util.isNumber(newSettings.recursiveIncludes) ? newSettings.recursiveIncludes : this.recursiveIncludesDefault.DefaultValue;
+                this.gotoDefIntelliSenseDefault.Value = util.isNumber(newSettings.gotoDefIntelliSense) ? newSettings.gotoDefIntelliSense : this.gotoDefIntelliSenseDefault.DefaultValue;
+                this.settings = {
+                    defaultIntelliSenseEngine: this.intelliSenseEngineDefault.Value,
+                    recursiveIncludes: this.recursiveIncludesDefault.Value,
+                    gotoDefIntelliSense: this.gotoDefIntelliSenseDefault.Value
+                };
+            }
+        } catch (error) {
+            // Ignore any cpptoolsJsonFile errors
+        }
+    }
+
+    private downloadCpptoolsJsonPkgAsync(): Promise<void> {
+        let hasError: boolean = false;
+        let telemetryProperties: { [key: string]: string } = {};
+        const localConfigPath: string = util.getExtensionFilePath(localConfigFile);
+        return util.downloadFileToDestination("https://go.microsoft.com/fwlink/?linkid=2026205", localConfigPath)
+            .catch((error) => {
+                // More specific error info is not likely to be helpful, and we get detailed download data from the initial install.
+                hasError = true;
+            })
+            .then(() => {
+                this.updateSettings();
+                telemetryProperties['success'] = (!hasError).toString();
+                Telemetry.logDebuggerEvent("cpptoolsJsonDownload", telemetryProperties);
+            });
+    }
+}
+
+let settings: ABTestSettings;
+
+export function getABTestSettings(): ABTestSettings {
+    if (!settings) {
+        settings = new ABTestSettings();
+    }
+    return settings;
+}

Extension/src/commands.ts

@@ -0,0 +1,84 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as vscode from 'vscode';
+import * as LanguageServer from './LanguageServer/extension';
+
+class TemporaryCommandRegistrar {
+    // Used to save/re-execute commands used before the extension has activated (e.g. delayed by dependency downloading).
+    private delayedCommandsToExecute: Set<string>;
+    private tempCommands: vscode.Disposable[]; // Need to save this to unregister/dispose the temporary commands.
+    private isLanguageServerDisabled: boolean;
+
+    private commandsToRegister: string[] = [
+        "C_Cpp.ConfigurationEdit",
+        "C_Cpp.ConfigurationSelect",
+        "C_Cpp.ConfigurationProviderSelect",
+        "C_Cpp.SwitchHeaderSource",
+        "C_Cpp.Navigate",
+        "C_Cpp.GoToDeclaration",
+        "C_Cpp.PeekDeclaration",
+        "C_Cpp.ToggleErrorSquiggles",
+        "C_Cpp.ToggleIncludeFallback",
+        "C_Cpp.ToggleDimInactiveRegions",
+        "C_Cpp.ToggleSnippets",
+        "C_Cpp.ShowReleaseNotes",
+        "C_Cpp.ResetDatabase",
+        "C_Cpp.PauseParsing",
+        "C_Cpp.ResumeParsing",
+        "C_Cpp.ShowParsingCommands",
+        "C_Cpp.TakeSurvey"
+    ];
+
+    constructor() {
+        this.tempCommands = [];
+        this.delayedCommandsToExecute = new Set<string>();
+
+        // Add temp commands that invoke the real commands after download/install is complete (preventing an error message)
+        this.commandsToRegister.forEach(command => {
+            this.registerTempCommand(command);
+        });
+    }
+
+    public registerTempCommand(command: string): void {
+        this.tempCommands.push(vscode.commands.registerCommand(command, () => {
+            if (this.isLanguageServerDisabled) {
+                vscode.window.showInformationMessage("The command is disabled because \"C_Cpp.intelliSenseEngine\" is set to \"Disabled\".");
+                return;
+            }
+            this.delayedCommandsToExecute.add(command);
+        }));
+    }
+
+    public disableLanguageServer(): void {
+        this.isLanguageServerDisabled = true;
+    }
+
+    public activateLanguageServer(): void {
+        // Main activation code.
+        this.tempCommands.forEach((command) => {
+            command.dispose();
+        });
+        this.tempCommands = [];
+
+        LanguageServer.activate(this.delayedCommandsToExecute.size > 0);
+        
+        this.delayedCommandsToExecute.forEach((command) => {
+            vscode.commands.executeCommand(command);
+        });
+        this.delayedCommandsToExecute.clear();
+    }
+}
+
+let tempCommandRegistrar: TemporaryCommandRegistrar;
+
+export function initializeTemporaryCommandRegistrar(): void {
+    tempCommandRegistrar = new TemporaryCommandRegistrar();
+}
+
+export function getTemporaryCommandRegistrarInstance(): TemporaryCommandRegistrar {
+    return tempCommandRegistrar;
+}

Extension/src/common.ts

@@ -0,0 +1,623 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import * as path from 'path';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as child_process from 'child_process';
+import * as vscode from 'vscode';
+import * as Telemetry from './telemetry';
+import HttpsProxyAgent = require('https-proxy-agent');
+import * as url from 'url';
+import { PlatformInformation } from './platform';
+import { getOutputChannelLogger, showOutputChannel } from './logger';
+import * as assert from 'assert';
+import * as https from 'https';
+import { ClientRequest, OutgoingHttpHeaders } from 'http';
+
+export let extensionContext: vscode.ExtensionContext;
+export function setExtensionContext(context: vscode.ExtensionContext): void {
+    extensionContext = context;
+}
+
+// Use this package.json to read values
+export const packageJson: any = vscode.extensions.getExtension("ms-vscode.cpptools").packageJSON;
+
+// Use getRawPackageJson to read and write back to package.json
+// This prevents obtaining any of VSCode's expanded variables.
+let rawPackageJson: any = null;
+export function getRawPackageJson(): any {
+    if (rawPackageJson === null) {
+        const fileContents: Buffer = fs.readFileSync(getPackageJsonPath());
+        rawPackageJson = JSON.parse(fileContents.toString());
+    }
+    return rawPackageJson;
+}
+
+// This function is used to stringify the rawPackageJson.
+// Do not use with util.packageJson or else the expanded
+// package.json will be written back.
+export function stringifyPackageJson(packageJson: string): string {
+    return JSON.stringify(packageJson, null, 2);
+}
+
+export function getExtensionFilePath(extensionfile: string): string {
+    return path.resolve(extensionContext.extensionPath, extensionfile);
+}
+
+export function getPackageJsonPath(): string {
+    return getExtensionFilePath("package.json");
+}
+
+export function getVcpkgPathDescriptorFile(): string {
+    if (process.platform === 'win32') {
+        return path.join(process.env.LOCALAPPDATA, "vcpkg/vcpkg.path.txt");
+    } else {
+        return path.join(process.env.HOME, ".vcpkg/vcpkg.path.txt");
+    }
+}
+
+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;
+}
+
+/**
+ * This is a fuzzy determination of whether a uri represents a header file.
+ * For the purposes of this function, a header file has no extension, or an extension that begins with the letter 'h'.
+ * @param document The document to check.
+ */
+export function isHeader(document: vscode.TextDocument): boolean {
+    let ext: string = path.extname(document.uri.fsPath);
+    return !ext || ext.startsWith(".h") || ext.startsWith(".H");
+}
+
+// Extension is ready if install.lock exists and debugAdapters folder exist.
+export async function isExtensionReady(): Promise<boolean> {
+    const doesInstallLockFileExist: boolean = await checkInstallLockFile();
+
+    return doesInstallLockFileExist;
+}
+
+let isExtensionNotReadyPromptDisplayed: boolean = false;
+export const extensionNotReadyString: string = 'The C/C++ extension is still installing. See the output window for more information.';
+
+export function displayExtensionNotReadyPrompt(): void {
+
+    if (!isExtensionNotReadyPromptDisplayed) {
+        isExtensionNotReadyPromptDisplayed = true;
+        showOutputChannel();
+
+        getOutputChannelLogger().showInformationMessage(extensionNotReadyString).then(
+            () => { isExtensionNotReadyPromptDisplayed = false; },
+            () => { isExtensionNotReadyPromptDisplayed = false; }
+        );
+    }
+}
+
+// This Progress global state tracks how far users are able to get before getting blocked.
+// Users start with a progress of 0 and it increases as they get further along in using the tool.
+// This eliminates noise/problems due to re-installs, terminated installs that don't send errors,
+// errors followed by workarounds that lead to success, etc.
+const progressInstallSuccess: number = 100;
+const progressExecutableStarted: number = 150;
+const progressExecutableSuccess: number = 200;
+const progressParseRootSuccess: number = 300;
+const progressIntelliSenseNoSquiggles: number = 1000;
+// Might add more IntelliSense progress measurements later.
+// IntelliSense progress is separate from the install progress, because parse root can occur afterwards.
+
+let installProgressStr: string = "CPP." + packageJson.version + ".Progress";
+let intelliSenseProgressStr: string = "CPP." + packageJson.version + ".IntelliSenseProgress";
+
+export function getProgress(): number {
+    return extensionContext.globalState.get<number>(installProgressStr, -1);
+}
+
+export function getIntelliSenseProgress(): number {
+    return extensionContext.globalState.get<number>(intelliSenseProgressStr, -1);
+}
+
+export function setProgress(progress: number): void {
+    if (getProgress() < progress) {
+        extensionContext.globalState.update(installProgressStr, progress);
+        let telemetryProperties: { [key: string]: string } = {};
+        let progressName: string;
+        switch (progress) {
+            case 0: progressName = "install started"; break;
+            case progressInstallSuccess: progressName = "install succeeded"; break;
+            case progressExecutableStarted: progressName = "executable started"; break;
+            case progressExecutableSuccess: progressName = "executable succeeded"; break;
+            case progressParseRootSuccess: progressName = "parse root succeeded"; break;
+        }
+        telemetryProperties['progress'] = progressName;
+        Telemetry.logDebuggerEvent("progress", telemetryProperties);
+    }
+}
+
+export function setIntelliSenseProgress(progress: number): void {
+    if (getIntelliSenseProgress() < progress) {
+        extensionContext.globalState.update(intelliSenseProgressStr, progress);
+        let telemetryProperties: { [key: string]: string } = {};
+        let progressName: string;
+        switch (progress) {
+            case progressIntelliSenseNoSquiggles: progressName = "IntelliSense no squiggles"; break;
+        }
+        telemetryProperties['progress'] = progressName;
+        Telemetry.logDebuggerEvent("progress", telemetryProperties);
+    }
+}
+
+export function getProgressInstallSuccess(): number { return progressInstallSuccess; } // Download/install was successful (i.e. not blocked by component acquisition).
+export function getProgressExecutableStarted(): number { return progressExecutableStarted; } // The extension was activated and starting the executable was attempted.
+export function getProgressExecutableSuccess(): number { return progressExecutableSuccess; } // Starting the exe was successful (i.e. not blocked by 32-bit or glibc < 2.18 on Linux)
+export function getProgressParseRootSuccess(): number { return progressParseRootSuccess; } // Parse root was successful (i.e. not blocked by processing taking too long).
+export function getProgressIntelliSenseNoSquiggles(): number { return progressIntelliSenseNoSquiggles; } // IntelliSense was successful and the user got no squiggles.
+
+export function showReleaseNotes(): void {
+    vscode.commands.executeCommand('vscode.previewHtml', vscode.Uri.file(getExtensionFilePath("ReleaseNotes.html")), vscode.ViewColumn.One, "C/C++ Extension Release Notes");
+}
+
+export function isUri(input: any): input is vscode.Uri {
+    return input && input instanceof vscode.Uri;
+}
+
+export function isString(input: any): input is string {
+    return typeof(input) === "string";
+}
+
+export function isNumber(input: any): input is number {
+    return typeof(input) === "number";
+}
+
+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));
+}
+
+export function isOptionalArrayOfString(input: any): input is string[]|undefined {
+    return input === undefined || isArrayOfString(input);
+}
+
+export function resolveVariables(input: string, additionalEnvironment: {[key: string]: string | string[]}): string {
+    if (!input) {
+        return "";
+    }
+    if (!additionalEnvironment) {
+        additionalEnvironment = {};
+    }
+
+    // Replace environment and configuration variables.
+    let regexp: () => RegExp = () => /\$\{((env|config|workspaceFolder)(\.|:))?(.*?)\}/g;
+    let ret: string = input;
+    let cycleCache: Set<string> = new Set();
+    while (!cycleCache.has(ret)) {
+        cycleCache.add(ret);
+        ret = ret.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
+            if (varType === undefined) {
+                varType = "env";
+            }
+            let newValue: string;
+            switch (varType) {
+                case "env": {
+                    let v: string | string[] = additionalEnvironment[name];
+                    if (isString(v)) {
+                        newValue = v;
+                    } else if (input === match && isArrayOfString(v)) {
+                        newValue = v.join(";");
+                    }
+                    if (!isString(newValue)) {
+                        newValue = process.env[name];
+                    }
+                    break;
+                }
+                case "config": {
+                    let config: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration();
+                    if (config) {
+                        newValue = config.get<string>(name);
+                    }
+                    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 (isString(newValue)) ? newValue : match;
+        });
+    }
+
+    // Resolve '~' at the start of the path.
+    regexp = () => /^\~/g;
+    ret = ret.replace(regexp(), (match: string, name: string) => {
+        let newValue: string = (process.platform === 'win32') ? process.env.USERPROFILE : process.env.HOME;
+        return (newValue) ? newValue : match;
+    });
+
+    return ret;
+}
+
+export function asFolder(uri: vscode.Uri): string {
+    let result: string = uri.toString();
+    if (result.charAt(result.length - 1) !== '/') {
+        result += '/';
+    }
+    return result;
+}
+
+/**
+ * get the default open command for the current platform
+ */
+export function getOpenCommand(): string {
+    if (os.platform() === 'win32') {
+        return 'explorer';
+    } else if (os.platform() === 'darwin') {
+        return '/usr/bin/open';
+    } else {
+        return '/usr/bin/xdg-open';
+    }
+}
+
+export function getDebugAdaptersPath(file: string): string {
+    return path.resolve(getExtensionFilePath("debugAdapters"), file);
+}
+
+export function getHttpsProxyAgent(): HttpsProxyAgent {
+    let proxy: string = vscode.workspace.getConfiguration().get<string>('http.proxy');
+    if (!proxy) {
+        proxy = process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy;
+        if (!proxy) {
+            return null; // No proxy
+        }
+    }
+
+    // Basic sanity checking on proxy url
+    let proxyUrl: any = url.parse(proxy);
+    if (proxyUrl.protocol !== "https:" && proxyUrl.protocol !== "http:") {
+        return null;
+    }
+
+    let strictProxy: any = vscode.workspace.getConfiguration().get("http.proxyStrictSSL", true);
+    let proxyOptions: any = {
+        host: proxyUrl.hostname,
+        port: parseInt(proxyUrl.port, 10),
+        auth: proxyUrl.auth,
+        rejectUnauthorized: strictProxy
+    };
+
+    return new HttpsProxyAgent(proxyOptions);
+}
+
+/** Creates a file if it doesn't exist */
+function touchFile(file: string): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+        fs.writeFile(file, "", (err) => {
+            if (err) {
+                reject(err);
+            }
+
+            resolve();
+        });
+    });
+}
+
+export function touchInstallLockFile(): Promise<void> {
+    return touchFile(getInstallLockPath());
+}
+
+export function touchExtensionFolder(): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+        fs.utimes(path.resolve(extensionContext.extensionPath, ".."), new Date(Date.now()), new Date(Date.now()), (err) => {
+            if (err) {
+                reject(err);
+            }
+
+            resolve();
+        });
+    });
+}
+
+/** Test whether a file exists */
+export function checkFileExists(filePath: string): Promise<boolean> {
+    return new Promise((resolve, reject) => {
+        fs.stat(filePath, (err, stats) => {
+            if (stats && stats.isFile()) {
+                resolve(true);
+            } else {
+                resolve(false);
+            }
+        });
+    });
+}
+
+/** Test whether a directory exists */
+export function checkDirectoryExists(dirPath: string): Promise<boolean> {
+    return new Promise((resolve, reject) => {
+        fs.stat(dirPath, (err, stats) => {
+            if (stats && stats.isDirectory()) {
+                resolve(true);
+            } else {
+                resolve(false);
+            }
+        });
+    });
+}
+
+/** Read the files in a directory */
+export function readDir(dirPath: string): Promise<string[]> {
+    return new Promise((resolve) => {
+        fs.readdir(dirPath, (err, list) => {
+            resolve(list);
+            });
+        });
+}
+
+/** Test whether the lock file exists.*/
+export function checkInstallLockFile(): Promise<boolean> {
+    return checkFileExists(getInstallLockPath());
+}
+
+/** Reads the content of a text file */
+export function readFileText(filePath: string, encoding: string = "utf8"): Promise<string> {
+    return new Promise<string>((resolve, reject) => {
+        fs.readFile(filePath, encoding, (err, data) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+}
+
+/** Writes content to a text file */
+export function writeFileText(filePath: string, content: string, encoding: string = "utf8"): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+        fs.writeFile(filePath, content, { encoding }, (err) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve();
+            }
+        });
+    });
+}
+
+export function deleteFile(filePath: string): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+        if (fs.existsSync(filePath)) {
+            fs.unlink(filePath, (err) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve();
+                }
+            });
+        } else {
+            resolve();
+        }
+    });
+}
+
+// Get the path of the lock file. This is used to indicate that the platform-specific dependencies have been downloaded.
+export function getInstallLockPath(): string {
+    return getExtensionFilePath("install.lock");
+}
+
+export function getReadmeMessage(): string {
+    const readmePath: string = getExtensionFilePath("README.md");
+    const readmeMessage: string = `Please refer to ${readmePath} for troubleshooting information. Issues can be created at https://github.com/Microsoft/vscode-cpptools/issues`;
+    return readmeMessage;
+}
+
+/** Used for diagnostics only */
+export function logToFile(message: string): void {
+    const logFolder: string = getExtensionFilePath("extension.log");
+    fs.writeFileSync(logFolder, `${message}${os.EOL}`, { flag: 'a' });
+}
+
+export function execChildProcess(process: string, workingDirectory: string, channel?: vscode.OutputChannel): Promise<string> {
+    return new Promise<string>((resolve, reject) => {
+        child_process.exec(process, { cwd: workingDirectory, maxBuffer: 500 * 1024 }, (error: Error, stdout: string, stderr: string) => {
+            if (channel) {
+                let message: string = "";
+                let err: Boolean = false;
+                if (stdout && stdout.length > 0) {
+                    message += stdout;
+                }
+
+                if (stderr && stderr.length > 0) {
+                    message += stderr;
+                    err = true;
+                }
+
+                if (error) {
+                    message += error.message;
+                    err = true;
+                }
+
+                if (err) {
+                    channel.append(message);
+                    channel.show();
+                }
+            }
+
+            if (error) {
+                reject(error);
+                return;
+            }
+
+            if (stderr && stderr.length > 0) {
+                reject(new Error(stderr));
+                return;
+            }
+
+            resolve(stdout);
+        });
+    });
+}
+
+export function spawnChildProcess(process: string, args: string[], workingDirectory: string,
+    dataCallback: (stdout: string) => void, errorCallback: (stderr: string) => void): Promise<void> {
+
+    return new Promise<void>(function (resolve, reject): void {
+        const child: child_process.ChildProcess = child_process.spawn(process, args, { cwd: workingDirectory });
+
+        child.stdout.on('data', (data) => {
+            dataCallback(`${data}`);
+        });
+
+        child.stderr.on('data', (data) => {
+            errorCallback(`${data}`);
+        });
+
+        child.on('exit', (code: number) => {
+            if (code !== 0) {
+                reject(new Error(`${process} exited with error code ${code}`));
+            } else {
+                resolve();
+            }
+        });
+    });
+}
+
+export function allowExecution(file: string): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+        if (process.platform !== 'win32') {
+            checkFileExists(file).then((exists: boolean) => {
+                if (exists) {
+                    fs.chmod(file, '755', (err: NodeJS.ErrnoException) => {
+                        if (err) {
+                            reject(err);
+                            return;
+                        }
+                        resolve();
+                    });
+                } else {
+                    getOutputChannelLogger().appendLine("");
+                    getOutputChannelLogger().appendLine(`Warning: Expected file ${file} is missing.`);
+                    resolve();
+                }
+            });
+        } else {
+            resolve();
+        }
+    });
+}
+
+export function removePotentialPII(str: string): string {
+    let words: string[] = str.split(" ");
+    let result: string = "";
+    for (let word of words) {
+        if (word.indexOf(".") === -1 && word.indexOf("/") === -1 && word.indexOf("\\") === -1 && word.indexOf(":") === -1) {
+            result += word + " ";
+        } else {
+            result += "? ";
+        }
+    }
+    return result;
+}
+
+export function checkDistro(platformInfo: PlatformInformation): void {
+    if (platformInfo.platform !== 'win32' && platformInfo.platform !== 'linux' && platformInfo.platform !== 'darwin') {
+        // this should never happen because VSCode doesn't run on FreeBSD
+        // or SunOS (the other platforms supported by node)
+        getOutputChannelLogger().appendLine(`Warning: Debugging has not been tested for this platform. ${getReadmeMessage()}`);
+    }
+}
+
+export async function unlinkPromise(fileName: string): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+        fs.unlink(fileName, err => {
+            if (err) {
+                return reject(err);
+            }
+            return resolve();
+        });
+    });
+}
+
+export async function renamePromise(oldName: string, newName: string): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+        fs.rename(oldName, newName, err => {
+            if (err) {
+                return reject(err);
+            }
+            return resolve();
+        });
+    });
+}
+
+export function promptForReloadWindowDueToSettingsChange(): void {
+    promptReloadWindow("Reload the workspace for the settings change to take effect.");
+}
+
+export function promptReloadWindow(message: string): void {
+    let reload: string = "Reload";
+    vscode.window.showInformationMessage(message, reload).then((value: string) => {
+        if (value === reload) {
+            vscode.commands.executeCommand("workbench.action.reloadWindow");
+        }
+    });
+}
+
+export function downloadFileToDestination(urlStr: string, destinationPath: string, headers?: OutgoingHttpHeaders): Promise<void> {
+    return new Promise<void>((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(downloadFileToDestination(redirectUrl, destinationPath, headers));
+            }
+            if (response.statusCode !== 200) { // If request is not successful
+                return reject();
+            }
+            // Write file using downloaded data
+            let createdFile: fs.WriteStream = fs.createWriteStream(destinationPath);
+            createdFile.on('finish', () => { resolve(); });
+            response.on('error', (error) => { reject(); });
+            response.pipe(createdFile);
+        });
+        request.on('error', (error) => { reject(); });
+        request.end();
+    });
+}

Extension/src/cppTools.ts

@@ -0,0 +1,124 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import { CustomConfigurationProvider, Version } from 'vscode-cpptools';
+import { CppToolsTestApi, CppToolsTestHook } from 'vscode-cpptools/out/testApi';
+import { CustomConfigurationProvider1, getCustomConfigProviders, CustomConfigurationProviderCollection } from './LanguageServer/customProviders';
+import { getOutputChannel } from './logger';
+import * as LanguageServer from './LanguageServer/extension';
+import * as test from './testHook';
+
+export class CppTools implements CppToolsTestApi {
+    private version: Version;
+    private providers: CustomConfigurationProvider1[] = [];
+    private failedRegistrations: CustomConfigurationProvider[] = [];
+    private timers = new Map<string, NodeJS.Timer>();
+
+    constructor(version: Version) {
+        if (version > Version.latest) {
+            console.warn(`version ${version} is not supported by this version of cpptools`);
+            console.warn(`  using ${Version.latest} instead`);
+            version = Version.latest;
+        }
+        this.version = version;
+    }
+
+    private addNotifyReadyTimer(provider: CustomConfigurationProvider1): void {
+        if (this.version >= Version.v2) {
+            const timeout: number = 30;
+            let timer: NodeJS.Timer = setTimeout(() => {
+                console.warn(`registered provider ${provider.extensionId} did not call 'notifyReady' within ${timeout} seconds`);
+            }, timeout * 1000);
+            this.timers.set(provider.extensionId, timer);
+        }
+    }
+
+    private removeNotifyReadyTimer(provider: CustomConfigurationProvider1): void {
+        if (this.version >= Version.v2) {
+            let timer: NodeJS.Timer = this.timers.get(provider.extensionId);
+            if (timer) {
+                this.timers.delete(provider.extensionId);
+                clearTimeout(timer);
+            }
+        }
+    }
+
+    public getVersion(): Version {
+        return this.version;
+    }
+
+    public registerCustomConfigurationProvider(provider: CustomConfigurationProvider): void {
+        let providers: CustomConfigurationProviderCollection = getCustomConfigProviders();
+        if (providers.add(provider, this.version)) {
+            let added: CustomConfigurationProvider1 = providers.get(provider);
+            getOutputChannel().appendLine(`Custom configuration provider '${added.name}' registered`);
+            this.providers.push(added);
+            LanguageServer.getClients().forEach(client => client.onRegisterCustomConfigurationProvider(added));
+            this.addNotifyReadyTimer(added);
+        } else {
+            this.failedRegistrations.push(provider);
+        }
+    }
+
+    public notifyReady(provider: CustomConfigurationProvider): void {
+        let providers: CustomConfigurationProviderCollection = getCustomConfigProviders();
+        let p: CustomConfigurationProvider1 = providers.get(provider);
+
+        if (p) {
+            this.removeNotifyReadyTimer(p);
+            p.isReady = true;
+            LanguageServer.getClients().forEach(client => {
+                client.updateCustomConfigurations(p);
+                client.updateCustomBrowseConfiguration(p);
+            });
+        } else if (this.failedRegistrations.find(p => p === provider)) {
+            console.warn("provider not successfully registered, 'notifyReady' ignored");
+        } else {
+            console.warn("provider should be registered before signaling it's ready to provide configurations");
+        }
+    }
+
+    public didChangeCustomConfiguration(provider: CustomConfigurationProvider): void {
+        let providers: CustomConfigurationProviderCollection = getCustomConfigProviders();
+        let p: CustomConfigurationProvider1 = providers.get(provider);
+
+        if (p) {
+            if (!p.isReady) {
+                console.warn("didChangeCustomConfiguration was invoked before notifyReady");
+            }
+            LanguageServer.getClients().forEach(client => client.updateCustomConfigurations(p));
+        } else if (this.failedRegistrations.find(p => p === provider)) {
+            console.warn("provider not successfully registered, 'didChangeCustomConfiguration' ignored");
+        } else {
+            console.warn("provider should be registered before sending config change messages");
+        }
+    }
+
+    public didChangeCustomBrowseConfiguration(provider: CustomConfigurationProvider): void {
+        let providers: CustomConfigurationProviderCollection = getCustomConfigProviders();
+        let p: CustomConfigurationProvider1 = providers.get(provider);
+
+        if (p) {
+            LanguageServer.getClients().forEach(client => client.updateCustomBrowseConfiguration(p));
+        } else if (this.failedRegistrations.find(p => p === provider)) {
+            console.warn("provider not successfully registered, 'didChangeCustomBrowseConfiguration' ignored");
+        } else {
+            console.warn("provider should be registered before sending config change messages");
+        }
+    }
+
+    public dispose(): void {
+        this.providers.forEach(provider => {
+            getCustomConfigProviders().remove(provider);
+            provider.dispose();
+        });
+        this.providers = [];
+    }
+
+    public getTestHook(): CppToolsTestHook {
+        return test.getTestHook();
+    }
+}

Extension/src/cppTools1.ts

@@ -0,0 +1,65 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import { CustomConfigurationProvider, Version, CppToolsApi } from 'vscode-cpptools';
+import { CppToolsTestApi, CppToolsTestHook, CppToolsTestExtension } from 'vscode-cpptools/out/testApi';
+import { CppTools } from './cppTools';
+
+/**
+ * This class implements both interfaces since the extension returned CppToolsApi for v0,
+ * but returns CppToolsTestExtension for v1 and later.
+ */
+export class CppTools1 implements CppToolsTestApi, CppToolsTestExtension {
+    private backupApi: CppTools;
+
+    private get BackupApi(): CppToolsTestApi {
+        if (!this.backupApi) {
+            this.backupApi = new CppTools(Version.v0);
+        }
+        return this.backupApi;
+    }
+
+    getApi(version: Version): CppToolsApi {
+        switch (version) {
+            case Version.v0:
+                return this.BackupApi;
+
+            default:
+                return new CppTools(version);
+        }
+    }
+
+    getTestApi(version: Version): CppToolsTestApi {
+        return <CppToolsTestApi>this.getApi(version);
+    }
+
+    getVersion(): Version {
+        return this.BackupApi.getVersion();
+    }
+
+    registerCustomConfigurationProvider(provider: CustomConfigurationProvider): void {
+        this.BackupApi.registerCustomConfigurationProvider(provider);
+    }
+
+    notifyReady(provider: CustomConfigurationProvider): void {
+        this.BackupApi.notifyReady(provider);
+    }
+
+    didChangeCustomConfiguration(provider: CustomConfigurationProvider): void {
+        this.BackupApi.didChangeCustomConfiguration(provider);
+    }
+
+    didChangeCustomBrowseConfiguration(provider: CustomConfigurationProvider): void {
+        this.BackupApi.didChangeCustomBrowseConfiguration(provider);
+    }
+
+    dispose(): void {
+    }
+
+    getTestHook(): CppToolsTestHook {
+        return this.BackupApi.getTestHook();
+    }
+}

Extension/src/githubAPI.ts

@@ -0,0 +1,223 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import { PackageVersion } from './packageVersion';
+import * as util from './common';
+import * as tmp from 'tmp';
+import { PlatformInformation } from './platform';
+import { OutgoingHttpHeaders } from 'http';
+
+/**
+ * The object representation of a Build Asset. Each Asset corresponds to information about a release file on GitHub.
+ */
+interface Asset {
+    name: string;
+    browser_download_url: string;
+}
+
+/**
+ * The object representation of a release in the GitHub API's release JSON.
+ * Named Build so as to reduce confusion between a "Release" release and "Insiders" release.
+ */
+interface Build {
+    name: string;
+    assets: Asset[];
+}
+
+/**
+* Search each Asset by name to retrieve the download URL for a VSIX package
+* @param vsixName The name of the VSIX to search for
+* @return The download URL of the VSIX
+*/
+function getVsixDownloadUrl(build: Build, vsixName: string): string {
+    const downloadUrl: string = build.assets.find(asset => {
+        return asset.name === vsixName;
+    }).browser_download_url;
+    if (!downloadUrl) {
+        throw new Error('Failed to find VSIX: ' + vsixName + ' in build: ' + build.name);
+    }
+    return downloadUrl;
+}
+
+/**
+ * Determine whether an object is of type Asset.
+ * @param input Incoming object.
+ * @return Whether input is of type Asset.
+ */
+function isAsset(input: any): input is Asset {
+    return input && input.name && typeof(input.name) === "string" &&
+        input.browser_download_url && typeof(input.browser_download_url) === "string";
+}
+
+/**
+ * Determine whether an object is of type Build. Note that earlier releases of the extension
+ * do not have 4 or greater Assets (Mac, Win, Linux 32/64). Only call this on more recent Builds.
+ * @param input Incoming object.
+ * @return Whether input is of type Build.
+ */
+function isBuild(input: any): input is Build {
+    return input && input.name && typeof(input.name) === "string" && isArrayOfAssets(input.assets) && input.assets.length >= 4;
+}
+
+/**
+ * Determine whether an object is of type Asset[].
+ * @param input Incoming object.
+ * @return Whether input is of type Asset[].
+ */
+function isArrayOfAssets(input: any): input is Asset[] {
+    return input instanceof Array && input.every(item => isAsset(item));
+}
+
+/**
+ * Determine whether an object is of type Build[].
+ * @param input Incoming object.
+ * @return Whether input is of type Build[].
+ */
+function isArrayOfBuilds(input: any): input is Build[] {
+    if (!input || !(input instanceof Array) || input.length === 0) {
+        return false;
+    }
+    // Only check the five most recent builds for validity -- no need to check all of them
+    for (let i: number = 0; i < 5 && i < input.length; i++) {
+        if (!isBuild(input[i])) {
+            return false;
+        }
+    }
+    return true;
+}
+
+/**
+ * Match the user's platform information to the VSIX name relevant to them.
+ * @param info Information about the user's operating system.
+ * @return VSIX filename for the extension's releases matched to the user's platform.
+ */
+function vsixNameForPlatform(info: PlatformInformation): string {
+    const vsixName: string = function(platformInfo): string {
+        switch (platformInfo.platform) {
+            case 'win32': return 'cpptools-win32.vsix';
+            case 'darwin': return 'cpptools-osx.vsix';
+            default: {
+                switch (platformInfo.architecture) {
+                    case 'x86': return 'cpptools-linux32.vsix';
+                    case 'x86_64': return 'cpptools-linux.vsix';
+                }
+            }
+        }
+    }(info);
+    if (!vsixName) {
+        throw new Error('Failed to match VSIX name for: ' + info.platform + ':' + info.architecture);
+    }
+    return vsixName;
+}
+
+/**
+ * Interface for return value of getTargetBuildInfo containing the download URL and version of a Build.
+ */
+export interface BuildInfo {
+    downloadUrl: string;
+    name: string;
+}
+
+/**
+ * Use the GitHub API to retrieve the download URL of the extension version the user should update to, if any.
+ * @param updateChannel The user's updateChannel setting.
+ * @return Download URL for the extension VSIX package that the user should install. If the user
+ * does not need to update, resolves to undefined.
+ */
+export async function getTargetBuildInfo(updateChannel: string): Promise<BuildInfo> {
+    return getReleaseJson()
+        .then(builds => getTargetBuild(builds, updateChannel))
+        .then(async build => {
+            if (!build) {
+                return Promise.resolve(undefined);
+            }
+            try {
+                const platformInfo: PlatformInformation = await PlatformInformation.GetPlatformInformation();
+                const vsixName: string = vsixNameForPlatform(platformInfo);
+                const downloadUrl: string = getVsixDownloadUrl(build, vsixName);
+                return { downloadUrl: downloadUrl, name: build.name };
+            } catch (error) {
+                return Promise.reject(error);
+            }
+        });
+}
+
+/**
+ * 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 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 {
+    // Get predicates to determine the build to install, if any
+    let needsUpdate: (installed: PackageVersion, target: PackageVersion) => boolean;
+    let useBuild: (build: Build) => boolean;
+    if (updateChannel === 'Insiders') {
+        needsUpdate = (installed: PackageVersion, target: PackageVersion) => { return target.isGreaterThan(installed); };
+        useBuild = (build: Build): boolean => { return true; };
+    } else if (updateChannel === 'Default') {
+        needsUpdate = function(installed: PackageVersion, target: PackageVersion): boolean { return installed.isGreaterThan(target); };
+        useBuild = (build: Build): boolean => { return build.name.indexOf('-') === -1; };
+    } else {
+        throw new Error('Incorrect updateChannel setting provided');
+    }
+
+    // Get the build to install
+    const targetBuild: Build = builds.find((build) => useBuild(build));
+    if (!targetBuild) {
+        throw new Error('Failed to determine installation candidate');
+    }
+
+    // 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;
+}
+
+/**
+ * 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;
+            }
+
+            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'); });
+
+                // Read the release JSON file
+                const fileContent: string = await util.readFileText(releaseJsonPath)
+                    .catch(() => { throw new Error('Failed to read release JSON file'); } );
+
+                // Parse the file
+                let releaseJson: any;
+                try {
+                    releaseJson = JSON.parse(fileContent);
+                } catch (error) {
+                    throw new Error('Failed to parse release JSON');
+                }
+
+                // Type check
+                if (isArrayOfBuilds(releaseJson)) {
+                    resolve(releaseJson);
+                } else {
+                    reject(releaseJson);
+                }
+            } catch (error) {
+                reject(error);
+            }
+        });
+    });
+}

Extension/src/installationInformation.ts

@@ -0,0 +1,28 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+export class InstallationInformation {
+    stage: string;
+    hasError: boolean;
+    telemetryProperties: { [key: string]: string };
+
+    constructor() {
+        this.hasError = false;
+        this.telemetryProperties = {};
+    }
+}
+
+let installBlob: InstallationInformation;
+
+export function getInstallationInformation(): InstallationInformation {
+    if (!installBlob) {
+        installBlob = new InstallationInformation();
+    }
+    return installBlob;
+}
+
+export function setInstallationStage(stage: string): void {
+    getInstallationInformation().stage = stage;
+}

Extension/src/linuxDistribution.ts

@@ -0,0 +1,67 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import * as fs from 'fs';
+import * as os from 'os';
+
+export class LinuxDistribution {
+    constructor(public name, public version) { }
+
+    /**
+     * There is no standard way on Linux to find the distribution name and version.
+     * Recently, systemd has pushed to standardize the os-release file. This has
+     * seen adoption in "recent" versions of all major distributions.
+     * https://www.freedesktop.org/software/systemd/man/os-release.html
+     */
+    public static GetDistroInformation(): Promise<LinuxDistribution> {
+        let linuxDistro: Promise<LinuxDistribution>;
+
+        // First check /etc/os-release and only fallback to /usr/lib/os-release
+        // as per the os-release documentation.
+        linuxDistro = LinuxDistribution.getDistroInformationFromFile('/etc/os-release')
+            .catch(() => {
+                return LinuxDistribution.getDistroInformationFromFile('/usr/lib/os-release');
+            }).catch(() => {
+                // couldn't get distro information
+                return Promise.resolve(new LinuxDistribution('unknown', 'unknown'));
+            });
+
+        return linuxDistro;
+    }
+
+    private static getDistroInformationFromFile(path: string): Promise<LinuxDistribution> {
+        return new Promise<LinuxDistribution>((resolve, reject) => {
+            fs.readFile(path, 'utf8', (error, data) => {
+                if (error) {
+                    reject(error);
+                    return;
+                }
+                resolve(LinuxDistribution.getDistroInformation(data));
+            });
+        });
+    }
+
+    // Only public for tests.
+    public static getDistroInformation(data: string): LinuxDistribution {
+        const idKey: string = 'ID';
+        const versionKey: string = 'VERSION_ID';
+        let distroName: string = 'unknown';
+        let distroVersion: string = 'unknown';
+
+        let keyValues: string[] = data.split(os.EOL);
+        for (let i: number = 0; i < keyValues.length; i++) {
+            let keyValue: string[] = keyValues[i].split('=');
+            if (keyValue.length === 2) {
+                if (keyValue[0] === idKey) {
+                    distroName = keyValue[1];
+                } else if (keyValue[0] === versionKey) {
+                    distroVersion = keyValue[1];
+                }
+            }
+        }
+
+        return new LinuxDistribution(distroName, distroVersion);
+    }
+}

Extension/src/logger.ts

@@ -0,0 +1,76 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as vscode from 'vscode';
+import * as os from 'os';
+
+// This is used for testing purposes
+let Subscriber: (message: string) => void;
+export function subscribeToAllLoggers(subscriber: (message: string) => void): void {
+    Subscriber = subscriber;
+}
+
+export class Logger {
+    private writer: (message: string) => void;
+
+    constructor(writer: (message: string) => void) {
+        this.writer = writer;
+    }
+
+    public append(message: string): void {
+        this.writer(message);
+        if (Subscriber) {
+            Subscriber(message);
+        }
+    }
+
+    public appendLine(message: string): void {
+        this.writer(message + os.EOL);
+        if (Subscriber) {
+            Subscriber(message + os.EOL);
+        }
+    }
+
+    public showInformationMessage(message: string, items?: string[]): Thenable<string> {
+        this.appendLine(message);
+        
+        return vscode.window.showInformationMessage(message, ...items);
+    }
+
+    public showWarningMessage(message: string, items?: string[]): Thenable<string> {
+        this.appendLine(message);
+        
+        return vscode.window.showWarningMessage(message, ...items);
+    }
+
+    public showErrorMessage(message: string, items?: string[]): Thenable<string> {
+        this.appendLine(message);
+
+        return vscode.window.showErrorMessage(message, ...items);
+    }
+}
+
+let outputChannel: vscode.OutputChannel;
+
+export function getOutputChannel(): vscode.OutputChannel {
+    if (outputChannel === undefined) {
+        outputChannel = vscode.window.createOutputChannel("C/C++");
+    }
+    return outputChannel;
+}
+
+export function showOutputChannel(): void {
+    getOutputChannel().show();
+}
+
+let outputChannelLogger: Logger;
+
+export function getOutputChannelLogger(): Logger {
+    if (!outputChannelLogger) {
+        outputChannelLogger = new Logger(message => getOutputChannel().append(message));
+    }
+    return outputChannelLogger;
+}

Extension/src/main.ts

@@ -0,0 +1,365 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import * as cpptoolsJsonUtils from './abTesting';
+import * as DebuggerExtension from './Debugger/extension';
+import * as fs from 'fs';
+import * as LanguageServer from './LanguageServer/extension';
+import * as os from 'os';
+import * as Telemetry from './telemetry';
+import * as util from './common';
+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 { PersistentState } from './LanguageServer/persistentState';
+import { getInstallationInformation, InstallationInformation, setInstallationStage } from './installationInformation';
+import { Logger, getOutputChannelLogger, showOutputChannel } from './logger';
+import { CppTools1 } from './cppTools1';
+
+const releaseNotesVersion: number = 3;
+const cppTools: CppTools1 = new CppTools1();
+let languageServiceDisabled: boolean = false;
+let reloadMessageShown: boolean = false;
+let disposables: vscode.Disposable[] = [];
+
+export async function activate(context: vscode.ExtensionContext): Promise<CppToolsApi & CppToolsExtension> {
+    initializeTemporaryCommandRegistrar();
+    util.setExtensionContext(context);
+    Telemetry.activate();
+    util.setProgress(0);
+
+    // Initialize the DebuggerExtension and register the related commands and providers.
+    DebuggerExtension.initialize();
+
+    await processRuntimeDependencies();
+
+    return cppTools;
+}
+
+export function deactivate(): Thenable<void> {
+    DebuggerExtension.dispose();
+    Telemetry.deactivate();
+    disposables.forEach(d => d.dispose());
+
+    if (languageServiceDisabled) {
+        return;
+    }
+    return LanguageServer.deactivate();
+}
+
+async function processRuntimeDependencies(): Promise<void> {
+    const installLockExists: boolean = await util.checkInstallLockFile();
+
+    if (installLockExists) {
+        // Offline Scenario: Lock file exists but package.json has not had its activationEvents rewritten.
+        if (util.packageJson.activationEvents && util.packageJson.activationEvents.length === 1) {
+            try {
+                await offlineInstallation();
+            } catch (error) {
+                getOutputChannelLogger().showErrorMessage('The installation of the C/C++ extension failed. Please see the output window for more information.');
+                showOutputChannel();
+
+                // Send the failure telemetry since postInstall will not be called.
+                sendTelemetry(await PlatformInformation.GetPlatformInformation());
+            }
+        // The extension have been installed and activated before.
+        } else {
+            await finalizeExtensionActivation();
+        }
+    // No lock file, need to download and install dependencies.
+    } else {
+        try {
+            await onlineInstallation();
+        } catch (error) {
+            handleError(error);
+            
+            // Send the failure telemetry since postInstall will not be called.
+            sendTelemetry(await PlatformInformation.GetPlatformInformation());
+        }
+    }
+}
+
+async function offlineInstallation(): Promise<void> {
+    setInstallationStage('getPlatformInfo');
+    const info: PlatformInformation = await PlatformInformation.GetPlatformInformation();
+
+    setInstallationStage('makeBinariesExecutable');
+    await makeBinariesExecutable();
+
+    setInstallationStage('makeOfflineBinariesExecutable');
+    await makeOfflineBinariesExecutable(info);
+
+    setInstallationStage('removeUnnecessaryFile');
+    await removeUnnecessaryFile();
+
+    setInstallationStage('rewriteManifest');
+    await rewriteManifest();
+
+    setInstallationStage('postInstall');
+    await postInstall(info);
+}
+
+async function onlineInstallation(): Promise<void> {
+    setInstallationStage('getPlatformInfo');
+    const info: PlatformInformation = await PlatformInformation.GetPlatformInformation();
+
+    await downloadAndInstallPackages(info);
+
+    setInstallationStage('makeBinariesExecutable');
+    await makeBinariesExecutable();
+
+    setInstallationStage('removeUnnecessaryFile');
+    await removeUnnecessaryFile();
+
+    setInstallationStage('rewriteManifest');
+    await rewriteManifest();
+
+    setInstallationStage('touchInstallLockFile');
+    await touchInstallLockFile();
+
+    setInstallationStage('postInstall');
+    await postInstall(info);
+}
+
+async function downloadAndInstallPackages(info: PlatformInformation): Promise<void> {
+    let outputChannelLogger: Logger = getOutputChannelLogger();
+    outputChannelLogger.appendLine("Updating C/C++ dependencies...");
+
+    let packageManager: PackageManager = new PackageManager(info, outputChannelLogger);
+
+    return vscode.window.withProgress({
+        location: vscode.ProgressLocation.Notification,
+        title: "C/C++ Extension",
+        cancellable: false
+    }, async (progress, token) => {
+
+        outputChannelLogger.appendLine('');
+        setInstallationStage('downloadPackages');
+        await packageManager.DownloadPackages(progress);
+
+        outputChannelLogger.appendLine('');
+        setInstallationStage('installPackages');
+        await packageManager.InstallPackages(progress);
+    });
+}
+
+function makeBinariesExecutable(): Promise<void> {
+    return util.allowExecution(util.getDebugAdaptersPath("OpenDebugAD7"));
+}
+
+function makeOfflineBinariesExecutable(info: PlatformInformation): Promise<void> {
+    let promises: Thenable<void>[] = [];
+    let packages: IPackage[] = util.packageJson["runtimeDependencies"];
+    packages.forEach(p => {
+        if (p.binaries && p.binaries.length > 0 &&
+            p.platforms.findIndex(plat => plat === info.platform) !== -1 &&
+            (p.architectures === undefined || p.architectures.findIndex(arch => arch === info.architecture) !== - 1)) {
+            p.binaries.forEach(binary => promises.push(util.allowExecution(util.getExtensionFilePath(binary))));
+        }
+    });
+    return Promise.all(promises).then(() => { });
+}
+
+function removeUnnecessaryFile(): Promise<void> {
+    if (os.platform() !== 'win32') {
+        let sourcePath: string = util.getDebugAdaptersPath("bin/OpenDebugAD7.exe.config");
+        if (fs.existsSync(sourcePath)) {
+            fs.rename(sourcePath, util.getDebugAdaptersPath("bin/OpenDebugAD7.exe.config.unused"), (err: NodeJS.ErrnoException) => {
+                if (err) {
+                    getOutputChannelLogger().appendLine(`ERROR: fs.rename failed with "${err.message}". Delete ${sourcePath} manually to enable debugging.`);
+                }
+            });
+        }
+    }
+
+    return Promise.resolve();
+}
+
+function touchInstallLockFile(): Promise<void> {
+    return util.touchInstallLockFile();
+}
+
+function handleError(error: any): void {
+    let installationInformation: InstallationInformation = getInstallationInformation();
+    installationInformation.hasError = true;
+    installationInformation.telemetryProperties['stage'] = installationInformation.stage;
+    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;
+        installationInformation.telemetryProperties['error.message'] = packageError.message;
+
+        if (packageError.innerError) {
+            errorMessage = packageError.innerError.toString();
+            installationInformation.telemetryProperties['error.innerError'] = util.removePotentialPII(errorMessage);
+        } else {
+            errorMessage = packageError.message;
+        }
+
+        if (packageError.pkg) {
+            installationInformation.telemetryProperties['error.packageName'] = packageError.pkg.description;
+            installationInformation.telemetryProperties['error.packageUrl'] = packageError.pkg.url;
+        }
+
+        if (packageError.errorCode) {
+            installationInformation.telemetryProperties['error.errorCode'] = util.removePotentialPII(packageError.errorCode);
+        }
+    } else {
+        errorMessage = error.toString();
+        installationInformation.telemetryProperties['error.toString'] = util.removePotentialPII(errorMessage);
+    }
+
+    let outputChannelLogger: Logger = getOutputChannelLogger();
+    if (installationInformation.stage === 'downloadPackages') {
+        outputChannelLogger.appendLine("");
+    }
+    // Show the actual message and not the sanitized one
+    outputChannelLogger.appendLine(`Failed at stage: ${installationInformation.stage}`);
+    outputChannelLogger.appendLine(errorMessage);
+    outputChannelLogger.appendLine("");
+    outputChannelLogger.appendLine(`If you work in an offline environment or repeatedly see this error, try downloading a version of the extension with all the dependencies pre-included from https://github.com/Microsoft/vscode-cpptools/releases, then use the "Install from VSIX" command in VS Code to install it.`);
+    showOutputChannel();
+}
+
+function sendTelemetry(info: PlatformInformation): boolean {
+    let installBlob: InstallationInformation = getInstallationInformation();
+    const success: boolean = !installBlob.hasError;
+
+    installBlob.telemetryProperties['success'] = success.toString();
+
+    if (info.distribution) {
+        installBlob.telemetryProperties['linuxDistroName'] = info.distribution.name;
+        installBlob.telemetryProperties['linuxDistroVersion'] = info.distribution.version;
+    }
+
+    if (success) {
+        util.setProgress(util.getProgressInstallSuccess());
+        let versionShown: PersistentState<number> = new PersistentState<number>("CPP.ReleaseNotesVersion", -1);
+        if (versionShown.Value < releaseNotesVersion) {
+            util.showReleaseNotes();
+            versionShown.Value = releaseNotesVersion;
+        }
+    }
+
+    installBlob.telemetryProperties['osArchitecture'] = info.architecture;
+
+    Telemetry.logDebuggerEvent("acquisition", installBlob.telemetryProperties);
+
+    return success;
+}
+
+async function postInstall(info: PlatformInformation): Promise<void> {
+    let outputChannelLogger: Logger = getOutputChannelLogger();
+    outputChannelLogger.appendLine("");
+    outputChannelLogger.appendLine("Finished installing dependencies");
+    outputChannelLogger.appendLine("");
+
+    const installSuccess: boolean = sendTelemetry(info);
+
+    // If there is a download failure, we shouldn't continue activating the extension in some broken state.
+    if (!installSuccess) {
+        return Promise.reject<void>("");
+    } else {
+        // Notify user's if debugging may not be supported on their OS.
+        util.checkDistro(info);
+
+        return finalizeExtensionActivation();
+    }
+}
+
+async function finalizeExtensionActivation(): Promise<void> {
+    if (vscode.workspace.getConfiguration("C_Cpp", null).get<string>("intelliSenseEngine") === "Disabled") {
+        languageServiceDisabled = true;
+        getTemporaryCommandRegistrarInstance().disableLanguageServer();
+        disposables.push(vscode.workspace.onDidChangeConfiguration(() => {
+            if (!reloadMessageShown && vscode.workspace.getConfiguration("C_Cpp", null).get<string>("intelliSenseEngine") !== "Disabled") {
+                reloadMessageShown = true;
+                util.promptForReloadWindowDueToSettingsChange();
+            }
+        }));
+        return;
+    }
+    disposables.push(vscode.workspace.onDidChangeConfiguration(() => {
+        if (!reloadMessageShown && vscode.workspace.getConfiguration("C_Cpp", null).get<string>("intelliSenseEngine") === "Disabled") {
+            reloadMessageShown = true;
+            util.promptForReloadWindowDueToSettingsChange();
+        }
+    }));
+    getTemporaryCommandRegistrarInstance().activateLanguageServer();
+
+    // Update default for C_Cpp.intelliSenseEngine based on A/B testing settings.
+    // (this may result in rewriting the package.json file)
+    
+    let packageJsonPath: string = util.getExtensionFilePath("package.json");
+    if (!packageJsonPath.includes(".vscode-insiders")) {
+        let abTestSettings: cpptoolsJsonUtils.ABTestSettings = cpptoolsJsonUtils.getABTestSettings();
+        let packageJson: any = util.getRawPackageJson();
+        let prevIntelliSenseEngineDefault: any = packageJson.contributes.configuration.properties["C_Cpp.intelliSenseEngine"].default;
+        if (abTestSettings.UseDefaultIntelliSenseEngine) {
+            packageJson.contributes.configuration.properties["C_Cpp.intelliSenseEngine"].default = "Default";
+        } else {
+            packageJson.contributes.configuration.properties["C_Cpp.intelliSenseEngine"].default = "Tag Parser";
+        }
+        if (prevIntelliSenseEngineDefault !== packageJson.contributes.configuration.properties["C_Cpp.intelliSenseEngine"].default) {
+            return util.writeFileText(util.getPackageJsonPath(), util.stringifyPackageJson(packageJson));
+        }
+    } else {
+        let packageJson: any = util.getRawPackageJson();
+        if (packageJson.contributes.configuration.properties['C_Cpp.updateChannel'].default === 'Default') {
+            packageJson.contributes.configuration.properties['C_Cpp.updateChannel'].default = 'Insiders';
+            return util.writeFileText(util.getPackageJsonPath(), util.stringifyPackageJson(packageJson));
+        }
+    }
+}
+
+function rewriteManifest(): Promise<void> {
+    // Replace activationEvents with the events that the extension should be activated for subsequent sessions.
+    let packageJson: any = util.getRawPackageJson();
+    
+    packageJson.activationEvents = [
+        "onLanguage:cpp",
+        "onLanguage:c",
+        "onCommand:extension.pickNativeProcess",
+        "onCommand:extension.pickRemoteNativeProcess",
+        "onCommand:C_Cpp.ConfigurationEdit",
+        "onCommand:C_Cpp.ConfigurationSelect",
+        "onCommand:C_Cpp.ConfigurationProviderSelect",
+        "onCommand:C_Cpp.SwitchHeaderSource",
+        "onCommand:C_Cpp.Navigate",
+        "onCommand:C_Cpp.GoToDeclaration",
+        "onCommand:C_Cpp.PeekDeclaration",
+        "onCommand:C_Cpp.ToggleErrorSquiggles",
+        "onCommand:C_Cpp.ToggleIncludeFallback",
+        "onCommand:C_Cpp.ToggleDimInactiveRegions",
+        "onCommand:C_Cpp.ToggleSnippets",
+        "onCommand:C_Cpp.ShowReleaseNotes",
+        "onCommand:C_Cpp.ResetDatabase",
+        "onCommand:C_Cpp.PauseParsing",
+        "onCommand:C_Cpp.ResumeParsing",
+        "onCommand:C_Cpp.ShowParsingCommands",
+        "onCommand:C_Cpp.TakeSurvey",
+        "onDebug",
+        "workspaceContains:/.vscode/c_cpp_properties.json"
+    ];
+
+    return util.writeFileText(util.getPackageJsonPath(), util.stringifyPackageJson(packageJson));
+}

Extension/src/packageManager.ts

@@ -0,0 +1,423 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import * as fs from 'fs';
+import * as net from 'net';
+import * as https from 'https';
+import * as path from 'path';
+import * as vscode from 'vscode';
+import * as url from 'url';
+import * as tmp from 'tmp';
+import * as yauzl from 'yauzl';
+import * as mkdirp from 'mkdirp';
+
+import * as util from './common';
+import { PlatformInformation } from './platform';
+import * as Telemetry from './telemetry';
+import { IncomingMessage, ClientRequest } from 'http';
+import { Logger } from './logger';
+
+export interface IPackage {
+    // Description of the package
+    description: string;
+
+    // URL of the package
+    url: string;
+
+    // Platforms for which the package should be downloaded
+    platforms: string[];
+
+    // Architectures for which the package is applicable
+    architectures: string[];
+
+    // Binaries in the package that should be executable when deployed
+    binaries: string[];
+
+    // Internal location to which the package was downloaded
+    tmpFile: tmp.SyncResult;
+}
+
+export class PackageManagerError extends Error {
+    constructor(
+        public message: string,
+        public methodName: string,
+        public pkg: IPackage = null,
+        public innerError: any = null,
+        public errorCode: string = '') {
+        super(message);
+    }
+}
+
+export class PackageManagerWebResponseError extends PackageManagerError {
+    constructor(
+        public socket: net.Socket,
+        public message: string,
+        public methodName: string,
+        public pkg: IPackage = null,
+        public innerError: any = null,
+        public errorCode: string = '') {
+        super(message, methodName, pkg, innerError, errorCode);
+    }
+}
+
+export class PackageManager {
+    private allPackages: IPackage[];
+
+    public constructor(
+        private platformInfo: PlatformInformation,
+        private outputChannel?: Logger) {
+        // Ensure our temp files get cleaned up in case of error
+        tmp.setGracefulCleanup();
+    }
+
+    public DownloadPackages(progress: vscode.Progress<{message?: string; increment?: number}>): Promise<void> {
+        return this.GetPackages()
+            .then((packages) => {
+                let count: number = 1;
+                return this.BuildPromiseChain(packages, (pkg): Promise<void> => {
+                    const p: Promise<void> = this.DownloadPackage(pkg, `${count}/${packages.length}`, progress);
+                    count += 1;
+                    return p;
+                });
+            });
+    }
+
+    public InstallPackages(progress: vscode.Progress<{message?: string; increment?: number}>): Promise<void> {
+        return this.GetPackages()
+        .then((packages) => {
+            let count: number = 1;
+            return this.BuildPromiseChain(packages, (pkg): Promise<void> => {
+                const p: Promise<void> = this.InstallPackage(pkg, `${count}/${packages.length}`, progress);
+                count += 1;
+                return p;
+            });
+        });
+    }
+
+    /** Builds a chain of promises by calling the promiseBuilder function once per item in the list.
+     *  Like Promise.all, but runs the promises in sequence rather than simultaneously.
+     */
+    private BuildPromiseChain<TItem, TPromise>(items: TItem[], promiseBuilder: (TItem) => Promise<TPromise>): Promise<TPromise> {
+        let promiseChain: Promise<TPromise> = Promise.resolve<TPromise>(null);
+
+        for (let item of items) {
+            promiseChain = promiseChain.then(() => {
+                return promiseBuilder(item);
+            });
+        }
+
+        return promiseChain;
+    }
+
+    private GetPackageList(): Promise<IPackage[]> {
+        return new Promise<IPackage[]>((resolve, reject) => {
+            if (!this.allPackages) {
+                if (util.packageJson.runtimeDependencies) {
+                    this.allPackages = <IPackage[]>util.packageJson.runtimeDependencies;
+
+                    // Convert relative binary paths to absolute
+                    for (let pkg of this.allPackages) {
+                        if (pkg.binaries) {
+                            pkg.binaries = pkg.binaries.map((value) => {
+                                return util.getExtensionFilePath(value);
+                            });
+                        }
+                    }
+
+                    resolve(this.allPackages);
+                } else {
+                    reject(new PackageManagerError('Package manifest does not exist', 'GetPackageList'));
+                }
+            } else {
+                resolve(this.allPackages);
+            }
+        });
+    }
+
+    private GetPackages(): Promise<IPackage[]> {
+        return this.GetPackageList()
+            .then((list) => {
+                return list.filter((value, index, array) => {
+                    return (!value.architectures || value.architectures.indexOf(this.platformInfo.architecture) !== -1) &&
+                        (!value.platforms || value.platforms.indexOf(this.platformInfo.platform) !== -1);
+                });
+            });
+    }
+
+    private async DownloadPackage(pkg: IPackage, progressCount: string, progress: vscode.Progress<{message?: string; increment?: number}>): Promise<void> {
+        this.AppendChannel(`Downloading package '${pkg.description}' `);
+
+        progress.report({message: `Downloading ${progressCount}: ${pkg.description}`});
+
+        const tmpResult: tmp.SyncResult = await this.CreateTempFile(pkg);
+        await this.DownloadPackageWithRetries(pkg, tmpResult, progress);
+    }
+
+    private async CreateTempFile(pkg: IPackage): Promise<tmp.SyncResult> {
+        return new Promise<tmp.SyncResult>((resolve, reject) => {
+            tmp.file({ prefix: "package-" }, (err, path, fd, cleanupCallback) => {
+                if (err) {
+                    return reject(new PackageManagerError('Error from temp.file', 'DownloadPackage', pkg, err));
+                }
+
+                return resolve(<tmp.SyncResult>{ name: path, fd: fd, removeCallback: cleanupCallback });
+            });
+        });
+    }
+
+    private async DownloadPackageWithRetries(pkg: IPackage, tmpResult: tmp.SyncResult, progress: vscode.Progress<{message?: string; increment?: number}>): Promise<void> {
+        pkg.tmpFile = tmpResult;
+
+        let success: boolean = false;
+        let lastError: any = null;
+        let retryCount: number = 0;
+        const MAX_RETRIES: number = 5;
+
+        // Retry the download at most MAX_RETRIES times with 2-32 seconds delay.
+        do {
+            try {
+                await this.DownloadFile(pkg.url, pkg, retryCount, progress);
+                success = true;
+            } catch (error) {
+                retryCount += 1;
+                lastError = error;
+                if (retryCount > MAX_RETRIES) {
+                    this.AppendChannel(` Failed to download ` + pkg.url);
+                    throw error;
+                } else {
+                    this.AppendChannel(` Failed. Retrying...`);
+                    continue;
+                }
+            }
+        } while (!success && retryCount < MAX_RETRIES);
+
+        this.AppendLineChannel(" Done!");
+        if (retryCount !== 0) {
+            // Log telemetry to see if retrying helps.
+            let telemetryProperties: { [key: string]: string } = {};
+            telemetryProperties["success"] = success ? `OnRetry${retryCount}` : 'false';
+            if (lastError instanceof PackageManagerError) {
+                let packageError: PackageManagerError = lastError;
+                telemetryProperties['error.methodName'] = packageError.methodName;
+                telemetryProperties['error.message'] = packageError.message;
+                if (packageError.pkg) {
+                    telemetryProperties['error.packageName'] = packageError.pkg.description;
+                    telemetryProperties['error.packageUrl'] = packageError.pkg.url;
+                }
+                if (packageError.errorCode) {
+                    telemetryProperties['error.errorCode'] = packageError.errorCode;
+                }
+            }
+            Telemetry.logDebuggerEvent("acquisition", telemetryProperties);
+        }
+    }
+
+    // reloadCpptoolsJson in main.ts uses ~25% of this function.
+    private DownloadFile(urlString: any, pkg: IPackage, delay: number, progress: vscode.Progress<{message?: string; increment?: number}>): Promise<void> {
+        let parsedUrl: url.Url = url.parse(urlString);
+        let proxyStrictSSL: any = vscode.workspace.getConfiguration().get("http.proxyStrictSSL", true);
+
+        let options: https.RequestOptions = {
+            host: parsedUrl.host,
+            path: parsedUrl.path,
+            agent: util.getHttpsProxyAgent(),
+            rejectUnauthorized: proxyStrictSSL
+        };
+
+        return new Promise<void>((resolve, reject) => {
+            let secondsDelay: number = Math.pow(2, delay);
+            if (secondsDelay === 1) {
+                secondsDelay = 0;
+            }
+            if (secondsDelay > 4) {
+                this.AppendChannel(`Waiting ${secondsDelay} seconds...`);
+            }
+            setTimeout(() => {
+                if (!pkg.tmpFile || pkg.tmpFile.fd === 0) {
+                    return reject(new PackageManagerError('Temporary Package file unavailable', 'DownloadFile', pkg));
+                }
+
+                let handleHttpResponse: (response: IncomingMessage) => void = (response: IncomingMessage) => {
+                    if (response.statusCode === 301 || response.statusCode === 302) {
+                        // Redirect - download from new location
+                        let redirectUrl: string | string[];
+                        if (typeof response.headers.location === "string") {
+                            redirectUrl = response.headers.location;
+                        } else {
+                            redirectUrl = response.headers.location[0];
+                        }
+                        return resolve(this.DownloadFile(redirectUrl, pkg, 0, progress));
+                    } else if (response.statusCode !== 200) {
+                        // Download failed - print error message
+                        let errorMessage: string = `failed (error code '${response.statusCode}')`;
+                        return reject(new PackageManagerWebResponseError(response.socket, 'HTTP/HTTPS Response Error', 'DownloadFile', pkg, errorMessage, response.statusCode.toString()));
+                    } else {
+                        // Downloading - hook up events
+                        let contentLength: any = response.headers['content-length'];
+                        if (typeof response.headers['content-length'] === "string") {
+                            contentLength = response.headers['content-length'];
+                        } else {
+                            contentLength = response.headers['content-length'][0];
+                        }
+                        let packageSize: number = parseInt(contentLength, 10);
+                        let downloadPercentage: number = 0;
+                        let dots: number = 0;
+                        let tmpFile: fs.WriteStream = fs.createWriteStream(null, { fd: pkg.tmpFile.fd });
+
+                        this.AppendChannel(`(${Math.ceil(packageSize / 1024)} KB) `);
+
+                        response.on('data', (data) => {
+                            // Update dots after package name in output console
+                            let newDots: number = Math.ceil(downloadPercentage / 5);
+                            if (newDots > dots) {
+                                this.AppendChannel(".".repeat(newDots - dots));
+                                dots = newDots;
+                            }
+                        });
+
+                        response.on('end', () => {
+                            return resolve();
+                        });
+
+                        response.on('error', (error) => {
+                            return reject(new PackageManagerWebResponseError(response.socket, 'HTTP/HTTPS Response error', 'DownloadFile', pkg, error.stack, error.name));
+                        });
+
+                        // Begin piping data from the response to the package file
+                        response.pipe(tmpFile, { end: false });
+                    }
+                };
+
+                let request: ClientRequest = https.request(options, handleHttpResponse);
+
+                request.on('error', (error) => {
+                    return reject(new PackageManagerError('HTTP/HTTPS Request error' + (urlString.includes("fwlink") ? ": fwlink" : ""), 'DownloadFile', pkg, error.stack, error.message));
+                });
+
+                // Execute the request
+                request.end();
+            }, secondsDelay * 1000);
+        });
+    }
+
+    private InstallPackage(pkg: IPackage, progressCount: string, progress: vscode.Progress<{message?: string; increment?: number}>): Promise<void> {
+        this.AppendLineChannel(`Installing package '${pkg.description}'`);
+
+        progress.report({message: `Installing ${progressCount}: ${pkg.description}`});
+
+        return new Promise<void>((resolve, reject) => {
+            if (!pkg.tmpFile || pkg.tmpFile.fd === 0) {
+                return reject(new PackageManagerError('Downloaded file unavailable', 'InstallPackage', pkg));
+            }
+
+            yauzl.fromFd(pkg.tmpFile.fd, { lazyEntries: true }, (err, zipfile) => {
+                if (err) {
+                    return reject(new PackageManagerError('Zip file error', 'InstallPackage', pkg, err));
+                }
+
+                // setup zip file events
+                zipfile.on('end', () => {
+                    return resolve();
+                });
+
+                zipfile.on('error', err => {
+                    return reject(new PackageManagerError('Zip File Error', 'InstallPackage', pkg, err, err.code));
+                });
+
+                zipfile.readEntry();
+
+                zipfile.on('entry', (entry: yauzl.Entry) => {
+                    let absoluteEntryPath: string = util.getExtensionFilePath(entry.fileName);
+
+                    if (entry.fileName.endsWith("/")) {
+                        // Directory - create it
+                        mkdirp.mkdirp(absoluteEntryPath, { mode: 0o775 }, (err) => {
+                            if (err) {
+                                return reject(new PackageManagerError('Error creating directory', 'InstallPackage', pkg, err, err.code));
+                            }
+
+                            zipfile.readEntry();
+                        });
+                    } else {
+                        util.checkFileExists(absoluteEntryPath).then((exists: boolean) => {
+                            if (!exists) {
+                                // File - extract it
+                                zipfile.openReadStream(entry, (err, readStream: fs.ReadStream) => {
+                                    if (err) {
+                                        return reject(new PackageManagerError('Error reading zip stream', 'InstallPackage', pkg, err));
+                                    }
+
+                                    readStream.on('error', (err) => {
+                                        return reject(new PackageManagerError('Error in readStream', 'InstallPackage', pkg, err));
+                                    });
+
+                                    mkdirp.mkdirp(path.dirname(absoluteEntryPath), { mode: 0o775 }, async (err) => {
+                                        if (err) {
+                                            return reject(new PackageManagerError('Error creating directory', 'InstallPackage', pkg, err, err.code));
+                                        }
+
+                                        // Create as a .tmp file to avoid partially unzipped files 
+                                        // counting as completed files.
+                                        let absoluteEntryTempFile: string = absoluteEntryPath + ".tmp";
+                                        if (fs.existsSync(absoluteEntryTempFile)) {
+                                            try {
+                                                await util.unlinkPromise(absoluteEntryTempFile);
+                                            } catch (err) {
+                                                return reject(new PackageManagerError(`Error unlinking file ${absoluteEntryTempFile}`, 'InstallPackage', pkg, err));
+                                            }
+                                        }
+
+                                        // Make sure executable files have correct permissions when extracted
+                                        let fileMode: number = (pkg.binaries && pkg.binaries.indexOf(absoluteEntryPath) !== -1) ? 0o755 : 0o664;
+                                        let writeStream: fs.WriteStream = fs.createWriteStream(absoluteEntryTempFile, { mode: fileMode });
+
+                                        writeStream.on('close', async () => {
+                                            try {
+                                                // Remove .tmp extension from the file.
+                                                await util.renamePromise(absoluteEntryTempFile, absoluteEntryPath);
+                                            } catch (err) {
+                                                return reject(new PackageManagerError(`Error renaming file ${absoluteEntryTempFile}`, 'InstallPackage', pkg, err));
+                                            }
+                                            // Wait till output is done writing before reading the next zip entry.
+                                            // Otherwise, it's possible to try to launch the .exe before it is done being created.
+                                            zipfile.readEntry();
+                                        });
+
+                                        writeStream.on('error', (err) => {
+                                            return reject(new PackageManagerError('Error in writeStream', 'InstallPackage', pkg, err));
+                                        });
+
+                                        readStream.pipe(writeStream);
+                                    });
+                                });
+                            } else {
+                                // Skip the message for text files, because there is a duplicate text file unzipped.
+                                if (path.extname(absoluteEntryPath) !== ".txt") {
+                                    this.AppendLineChannel(`Warning: File '${absoluteEntryPath}' already exists and was not updated.`);
+                                }
+                                zipfile.readEntry();
+                            }
+                        });
+                    }
+                });
+            });
+        }).then(() => {
+            // Clean up temp file
+            pkg.tmpFile.removeCallback();
+        });
+    }
+
+    private AppendChannel(text: string): void {
+        if (this.outputChannel) {
+            this.outputChannel.append(text);
+        }
+    }
+
+    private AppendLineChannel(text: string): void {
+        if (this.outputChannel) {
+            this.outputChannel.appendLine(text);
+        }
+    }
+}

Extension/src/packageVersion.ts

@@ -0,0 +1,56 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+export class PackageVersion {
+    major: number;
+    minor: number;
+    patch: number;
+    suffix?: string;
+    suffixVersion: number;
+
+    constructor(version: string) {
+        const tokens: string[] = version.split(new RegExp('[-\\.]', 'g')); // Match against dots and dashes
+        if (tokens.length < 3) {
+            throw new Error('Failed to parse version string: ' + version);
+        }
+
+        this.major = parseInt(tokens[0]);
+        this.minor = parseInt(tokens[1]);
+        this.patch = parseInt(tokens[2]);
+
+        if (tokens.length > 3) {
+            const firstDigitOffset: number = tokens[3].search(new RegExp(/(\d)/)); // Find first occurrence of 0-9
+            if (firstDigitOffset !== -1) {
+                this.suffix = tokens[3].substring(0, firstDigitOffset);
+                this.suffixVersion = parseInt(tokens[3].substring(firstDigitOffset));
+            }
+        }
+
+        if (this.major === undefined || this.minor === undefined || this.patch === undefined) {
+            throw new Error('Failed to parse version string: ' + version);
+        }
+    }
+
+    public isGreaterThan(other: PackageVersion): boolean {
+        // PackageVersions cannot be compared if either have a suffix that is not 'insiders'
+        if ((this.suffix && !this.suffix.startsWith('insiders')) || (other.suffix && !other.suffix.startsWith('insiders'))) {
+            return false;
+        }
+
+        let diff: number = this.major - other.major;
+        if (diff) {
+            return diff > 0;
+        } else if (diff = this.minor - other.minor) {
+            return diff > 0;
+        } else if (diff = this.patch - other.patch) {
+            return diff > 0;
+        } else if (this.suffix) {
+            return (other.suffix && this.suffixVersion > other.suffixVersion);
+        } else {
+            return other.suffix ? true : false;
+        }
+    }
+}

Extension/src/platform.ts

@@ -0,0 +1,72 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import * as os from 'os';
+import * as util from './common';
+import { LinuxDistribution } from './linuxDistribution';
+
+export class PlatformInformation {
+    constructor(public platform: string, public architecture: string, public distribution: LinuxDistribution) { }
+
+    public static GetPlatformInformation(): Promise<PlatformInformation> {
+        let platform: string = os.platform();
+        let architecturePromise: Promise<string>;
+        let distributionPromise: Promise<LinuxDistribution> = Promise.resolve<LinuxDistribution>(null);
+
+        switch (platform) {
+            case "win32":
+                architecturePromise = PlatformInformation.GetWindowsArchitecture();
+                break;
+
+            case "linux":
+                architecturePromise = PlatformInformation.GetUnixArchitecture();
+                distributionPromise = LinuxDistribution.GetDistroInformation();
+                break;
+
+            case "darwin":
+                architecturePromise = PlatformInformation.GetUnixArchitecture();
+                break;
+        }
+
+        return Promise.all<string | LinuxDistribution>([architecturePromise, distributionPromise])
+            .then(([arch, distro]: [string, LinuxDistribution]) => {
+                return new PlatformInformation(platform, arch, distro);
+            });
+    }
+
+    public static GetUnknownArchitecture(): string { return "Unknown"; }
+
+    private static GetWindowsArchitecture(): Promise<string> {
+        return util.execChildProcess('wmic os get osarchitecture', util.extensionContext.extensionPath)
+            .then((architecture) => {
+                if (architecture) {
+                    let archArray: string[] = architecture.split(os.EOL);
+                    if (archArray.length >= 2) {
+                        let arch: string = archArray[1].trim();
+
+                        // Note: This string can be localized. So, we'll just check to see if it contains 32 or 64.
+                        if (arch.indexOf('64') >= 0) {
+                            return "x86_64";
+                        } else if (arch.indexOf('32') >= 0) {
+                            return "x86";
+                        }
+                    }
+                }
+                return PlatformInformation.GetUnknownArchitecture();
+            }).catch((error) => {
+                return PlatformInformation.GetUnknownArchitecture();
+            });
+    }
+
+    private static GetUnixArchitecture(): Promise<string> {
+        return util.execChildProcess('uname -m', util.packageJson.extensionFolderPath)
+            .then((architecture) => {
+                if (architecture) {
+                    return architecture.trim();
+                }
+                return null;
+            });
+    }
+}