merge master for 0.17.0 insiders build

microsoft · Apr 23, 2018 · d4e23a6 · d4e23a6
2 parents 1b218b2 + 80da21f
commit d4e23a6
Show file tree

Hide file tree

Showing 24 changed files with 854 additions and 321 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,6 +33,8 @@ script:
   - npm install
   - npm run tslint
   - npm run compile
+  # pr-check needs to run before test. test modifies package.json.
+  - npm run pr-check
   - npm run test
 
 after_failure:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 ## Contribution Steps
 
-* [Build and debug the extension](Documentation/Getting%20started.md#build-and-debug-the-cpptools-extension).
+* [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).

diff --git a/Documentation/LanguageServer/MinGW.md b/Documentation/LanguageServer/MinGW.md
@@ -1,12 +1,49 @@
 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.
 
-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/`.
+## With extension version 0.16.1 and higher:
+
+Starting with version 0.16.1, if you set the `compilerPath` property and change `intelliSenseMode` to `clang-x64`, you no longer need to copy the system include path or defines to `includePath` and `defines` to enable IntelliSense to work properly. However, `browse.path` still needs to be updated manually to add the system include paths to enable code browsing for system headers. For example:
+
+```json
+{
+    "configurations": [
+        {
+            "name": "MinGW",
+            "intelliSenseMode": "clang-x64",
+            "compilerPath": "C:/MinGW/bin/gcc.exe",
+            "includePath": [
+                "${workspaceRoot}",
+            ],
+            "defines": [
+                "_DEBUG"
+            ],
+            "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": ""
+            }
+        }
+    ],
+    "version": 3
+}
+```
+
+Note that the `browse.path` setting is not automatically updated at this time and you may have to change the MinGW version number to match what you have installed. If you are using a different MinGW distribution, the values for `compilerPath` and `browse.path` will likely be different than what is written here.
+
+## With extension version 0.16.0 and earlier:
+
+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": "Win32",
+            "name": "MinGW",
             "intelliSenseMode": "clang-x64",
             "includePath": [
                 "${workspaceRoot}",
@@ -19,7 +56,6 @@ Note that you may have to change the MinGW version number to match what you have
             ],
             "defines": [
                 "_DEBUG",
-                "UNICODE",
                 "__GNUC__=6",
                 "__cdecl=__attribute__((__cdecl__))"
             ],
@@ -28,6 +64,7 @@ Note that you may have to change the MinGW version number to match what you have
                     "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": ""
@@ -37,15 +74,15 @@ Note that you may have to change the MinGW version number to match what you have
 }
 ```
 
-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++ -`. 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).
+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": "Win32",
+            "name": "MinGW",
             "intelliSenseMode": "clang-x64",
             "includePath": [
                 "${workspaceRoot}",
@@ -55,7 +92,6 @@ For C projects, simply remove the C++ lines:
             ],
             "defines": [
                 "_DEBUG",
-                "UNICODE",
                 "__GNUC__=6",
                 "__cdecl=__attribute__((__cdecl__))"
             ],
@@ -64,6 +100,7 @@ For C projects, simply remove the C++ lines:
                     "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": ""
@@ -72,5 +109,3 @@ For C projects, simply remove the C++ lines:
     ]
 }
 ```
-
-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.
diff --git a/Documentation/LanguageServer/c_cpp_properties.json.md b/Documentation/LanguageServer/c_cpp_properties.json.md
@@ -78,7 +78,7 @@
   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`.
 
 * #### `limitSymbolsToIncludedHeaders`
-  When true, the Tag Parser will only parse code files that have been directly or indirectly included by a source file in `${workspaceRoot}`. When false, the Tag Parser will parse all code files found in the paths specified in the **path** list.
+  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`)
+  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`)
diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
@@ -1,6 +1,24 @@
 # C/C++ for Visual Studio Code Change Log
 
-## Version 0.16.0-insiders2: March 23, 2018
+## Version 0.17.0: May 7, 2018
+* Auto-complete for headers after typing `#include`. [#802](https://github.com/Microsoft/vscode-cpptools/issues/802)
+* 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/), [#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)
+* 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.
+
+## 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)

diff --git a/Extension/c_cpp_properties.schema.json b/Extension/c_cpp_properties.schema.json
@@ -11,7 +11,7 @@
                 ],
                 "properties": {
                     "name": {
-                        "description": "Configuration identifier. Mac, Linux, or Win32 are special identifiers for configurations that will be auto-selected on those platforms, but the identifier can be anything.",
+                        "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": {
@@ -24,7 +24,8 @@
                         "enum": [
                             "c89",
                             "c99",
-                            "c11"
+                            "c11",
+                            "${default}"
                         ]
                     },
                     "cppStandard": {
@@ -35,7 +36,8 @@
                             "c++03",
                             "c++11",
                             "c++14",
-                            "c++17"
+                            "c++17",
+                            "${default}"
                         ]
                     },
                     "compileCommands": {
@@ -64,12 +66,13 @@
                         }
                     },
                     "intelliSenseMode": {
+                        "description": "If set, it overrides the default mode used by the IntelliSense engine. Windows defaults to msvc-x64 and Linux/Mac default to clang-x64.",
                         "type": "string",
                         "enum": [
                             "msvc-x64",
-                            "clang-x64"
-                        ],
-                        "description": "If set, it overrides the default mode used by the IntelliSense engine. Windows defaults to msvc-x64 and Linux/Mac default to clang-x64."
+                            "clang-x64",
+                            "${default}"
+                        ]
                     },
                     "forcedInclude": {
                         "description": "A list of files that should be included before any include file in a translation unit.",
@@ -83,7 +86,10 @@
                         "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"
+                                "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.",

diff --git a/Extension/gulpfile.js b/Extension/gulpfile.js
@@ -9,6 +9,7 @@ const gulp = require('gulp');
 const env = require('gulp-env')
 const tslint = require('gulp-tslint');
 const mocha = require('gulp-mocha');
+const fs = require('fs');
 
 gulp.task('allTests', () => {
     gulp.start('unitTests');
@@ -73,4 +74,12 @@ gulp.task('tslint', () => {
             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);
+    }
 });
diff --git a/Extension/package-lock.json b/Extension/package-lock.json