Merge, Also updated changelog and versions.

Author: sean-mcmanus

.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,35 @@
+---
+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:
+*Provide 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).

Documentation/LanguageServer/Customizing Default Settings.md

@@ -77,21 +77,21 @@ A new setting will be added that allows you specify the system include path sepa
 C_Cpp.default.systemIncludePath                    : string[]
 ```
 
-### Include Path Resolution Strategies
+### System Include Path/Defines Resolution Strategies
 
-The extension determines the includePath to send to the IntelliSense engine in the following manner:
+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 seach for system defines).
+        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 seach for system defines).
+        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.

Documentation/LanguageServer/IntelliSense engine.md

@@ -39,6 +39,6 @@ We recommend using the "Default" engine for the best IntelliSense experience. Ho
 
 ### See Also
 
-[Configuring includePath for better IntelliSense results](https://github.com/Microsoft/vscode-cpptools/blob/master/Documentation/Getting%20started.md)
+[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/c_cpp_properties.json.md

@@ -7,17 +7,17 @@
 ```json
 {
     "env" : {
-        "defaultIncludePath": [
+        "myDefaultIncludePath": [
             "${workspaceFolder}",
             "${workspaceFolder}/include"
         ],
         "myCompilerPath": "/usr/local/bin/gcc-7"
     },
     "configurations": [
         {
-            "name": "Win32",
-            "intelliSenseMode": "msvc-x64",
-            "includePath": [ "${defaultIncludePath}", "/another/path" ],
+            "name": "Mac",
+            "intelliSenseMode": "clang-x64",
+            "includePath": [ "${myDefaultIncludePath}", "/another/path" ],
             "macFrameworkPath": [ "/System/Library/Frameworks" ],
             "defines": [ "FOO", "BAR=100" ],
             "forcedInclude": [ "${workspaceFolder}/include/config.h" ],
@@ -42,7 +42,7 @@
   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.
 
 * #### `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.
+  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.
@@ -56,13 +56,13 @@
   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.
 
 * #### `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. If a GCC/CLang compiler is specified in the `compilerPath` setting, it is not necessary to list the system include paths in this list.
+  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.
 
 * #### `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.
 
 * #### `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 `"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.

Extension/CHANGELOG.md

@@ -1,6 +1,22 @@
 # C/C++ for Visual Studio Code Change Log
 
-## Version 0.17.2: May 21, 2018
+## Version 0.17.5-insiders: June 7, 2018
+* 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 #include completion with headers in the same directory. [#2031](https://github.com/Microsoft/vscode-cpptools/issues/2031)
+* Support asm clobber registers on Windows. [#2090](https://github.com/Microsoft/vscode-cpptools/issues/2090)
+* Fix some crashes. [#2080](https://github.com/Microsoft/vscode-cpptools/issues/2080)
+
+## 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)