Merge pull request #2697 from Microsoft/seanmcm/0_19_1_insiders3_merge

Seanmcm/0 19 1 insiders3 merge

Author: sean-mcmanus

.travis.yml

@@ -35,7 +35,9 @@ script:
   - npm run tslint
   # pr-check needs to run before test. test modifies package.json.
   - npm run pr-check
-  - npm run test
+  - npm run unitTests
+  # TODO: Merge tests into one group due to Gulp 4.0
+  - npm run integrationTests
   # Dump integrationTest.log output
   - find ~ -name "integrationTests.log" -type f -exec cat {} \;
 

Extension/CHANGELOG.md

@@ -1,15 +1,21 @@
 # C/C++ for Visual Studio Code Change Log
 
+## Version 0.19.1-insiders3: October 19, 2018
+* Fix `#include` completion not working with `compile_commands.json` or custom configuration providers. [#2242](https://github.com/Microsoft/vscode-cpptools/issues/2242)
+* Fix `-isystem` without a space after getting ignored in `compile_comamands.json`. [#2629](https://github.com/Microsoft/vscode-cpptools/issues/2629)
+* Fix the `Disabled` `intelliSenseEngine` setting not working with custom configuration providers. [#2656](https://github.com/Microsoft/vscode-cpptools/issues/2656)
+* Fix IntelliSense-based `Go to Definition` returning results with non-matching signatures. [#2677](https://github.com/Microsoft/vscode-cpptools/issues/2677)
+* Fix Insiders update channel not working for `0.19.1-insiders`. [#2685](https://github.com/Microsoft/vscode-cpptools/issues/2685)
+
 ## Version 0.19.1-insiders2: October 16, 2018
 * Add IntegratedTerminal support for Linux and Windows. [#35](https://github.com/microsoft/vscode-cpptools/issues/35)
 * Unify Visual Studio Code debug protocol parsing by using a shared library with Visual Studio.
 * Fix Intellisense-based `Go to Definition` falling back to the Tag Parser for definitions not in the TU. [#2536](https://github.com/Microsoft/vscode-cpptools/issues/2536)
-* Fix `-isystem` without a space after getting ignored in `compile_comamands.json`. [#2629](https://github.com/Microsoft/vscode-cpptools/issues/2629)
 * Fix Insiders update channel installation failure on Windows/Mac. [#2636](https://github.com/Microsoft/vscode-cpptools/issues/2636)
 * Fix IntelliSense-based `Go to Declaration` falling back to the Tag Parser if the definition is also in the TU. [#2642](https://github.com/Microsoft/vscode-cpptools/issues/2642)
 
 ## Version 0.19.1-insiders: October 9, 2018
-* Fix IntelliSense-based `Go to Definition` on overloads. [#1071](https://github.com/Microsoft/vscode-cpptools/issues/1071)
+* Fix IntelliSense-based `Go to Definition` on overloads (in the same TU). [#1071](https://github.com/Microsoft/vscode-cpptools/issues/1071)
 * Fix IntelliSense failing if recursive includes removes all paths. [#2442](https://github.com/Microsoft/vscode-cpptools/issues/2442)
 * Fix incorrect IntelliSense errors with MinGW (stop using `-fms-extensions` by default). [#2443](https://github.com/Microsoft/vscode-cpptools/issues/2443), [#2623](https://github.com/Microsoft/vscode-cpptools/issues/2623)
 * Fix error squiggles sometimes not updating after typing. [#2448](https://github.com/Microsoft/vscode-cpptools/issues/2448)
@@ -20,7 +26,7 @@
 * Fix empty `C_Cpp.default.*` settings not being used. [#2584](https://github.com/Microsoft/vscode-cpptools/issues/2584)
 * Fix quoting around `ssh`'s command (for the debugger). [#2585](https://github.com/Microsoft/vscode-cpptools/issues/2585)
 * Fix crash on hover (and `Go to Definition`) when using the `Tag Parser`. [#2586](https://github.com/Microsoft/vscode-cpptools/issues/2586)
-* Fix errors when a workspace folder isn't open. [#2613](https://github.com/Microsoft/vscode-cpptools/issues/2613)
+* Fix errors when a workspace folder isn't open. [#2613](https://github.com/Microsoft/vscode-cpptools/issues/2613), [#2691](https://github.com/Microsoft/vscode-cpptools/issues/2691)
 
 ## 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)

Extension/gulpfile.js

@@ -12,31 +12,41 @@ const mocha = require('gulp-mocha');
 const fs = require('fs');
 const optionsSchemaGenerator = require('./out/tools/GenerateOptionsSchema');
 
-gulp.task('unitTests', () => {
+gulp.task('unitTests', (done) => {
     env.set({
             CODE_TESTS_PATH: "./out/test/unitTests",
         });
 
-    gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
+    return gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
         .pipe(mocha({ ui: "tdd" }))
-        .once('error', err => process.exit(1))
-        .once('end', () => process.exit())
+        .once('error', err => {
+            done();
+            process.exit(1);
+        })
+        .once('end', () => {
+            done();
+            process.exit();
+        });
 });
 
-gulp.task('integrationTests', () => {
+gulp.task('integrationTests', (done) => {
     env.set({
             CODE_TESTS_PATH: "./out/test/integrationTests",
             CODE_TESTS_WORKSPACE: "./test/integrationTests/testAssets/SimpleCppProject"
         });
 
-    gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
+    return gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
         .pipe(mocha({ ui: "tdd" }))
-        .once('error', err => process.exit(1))
-        .once('end', () => process.exit())
+        .once('error', err => {
+            done();
+            process.exit(1);
+        })
+        .once('end', () => {
+            done();
+            process.exit();
+        });
 });
 
-gulp.task('allTests', ['unitTests', 'integrationTests']);
-
 /// Misc Tasks
 const allTypeScript = [
     'src/**/*.ts',
@@ -55,7 +65,7 @@ const lintReporter = (output, file, options) => {
 };
 
 gulp.task('tslint', () => {
-    gulp.src(allTypeScript)
+    return gulp.src(allTypeScript)
         .pipe(tslint({
             program: require('tslint').Linter.createProgram("./tsconfig.json"),
             configuration: "./tslint.json"
@@ -66,14 +76,19 @@ gulp.task('tslint', () => {
         }))
 });
 
-gulp.task('pr-check', () => {
+gulp.task('pr-check', (done) => {
     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`.');
+        done();
         process.exit(1);
     }
+
+    done();
 });
 
-gulp.task('generateOptionsSchema', () => {
+gulp.task('generateOptionsSchema', (done) => {
     optionsSchemaGenerator.generateOptionsSchema();
+
+    done();
 });