Skip to content

Commit 39273f1

Browse files
authored
Merge pull request #1922 from Microsoft/master
merge master into insiders for April insiders2
2 parents 8a0fe21 + 00008a2 commit 39273f1

File tree

17 files changed

+598
-164
lines changed

17 files changed

+598
-164
lines changed

.travis.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ script:
3636
# pr-check needs to run before test. test modifies package.json.
3737
- npm run pr-check
3838
- npm run test
39-
40-
after_failure:
41-
- find ~ -name "integrationTests.log" -type f -exec cat {} \;
42-
43-
after_success:
39+
# Dump integrationTest.log output
4440
- find ~ -name "integrationTests.log" -type f -exec cat {} \;
4541

Documentation/LanguageServer/MinGW.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Starting with version 0.16.1, if you set the `compilerPath` property and change
1212
"intelliSenseMode": "clang-x64",
1313
"compilerPath": "C:/MinGW/bin/gcc.exe",
1414
"includePath": [
15-
"${workspaceRoot}",
15+
"${workspaceFolder}"
1616
],
1717
"defines": [
1818
"_DEBUG"
@@ -21,12 +21,14 @@ Starting with version 0.16.1, if you set the `compilerPath` property and change
2121
"path": [
2222
"C:/MinGW/lib/gcc/mingw32/6.3.0/include",
2323
"C:/MinGW/lib/gcc/mingw32/6.3.0/include-fixed",
24-
"C:/MinGW/include/*"
25-
"${workspaceRoot}",
24+
"C:/MinGW/include/*",
25+
"${workspaceFolder}"
2626
],
2727
"limitSymbolsToIncludedHeaders": true,
2828
"databaseFilename": ""
29-
}
29+
},
30+
"cStandard": "c11",
31+
"cppStandard": "c++17"
3032
}
3133
],
3234
"version": 3
@@ -63,8 +65,8 @@ In earlier versions of the extension, the `includePath` and a some system define
6365
"path": [
6466
"C:/MinGW/lib/gcc/mingw32/6.3.0/include",
6567
"C:/MinGW/lib/gcc/mingw32/6.3.0/include-fixed",
66-
"C:/MinGW/include/*"
67-
"${workspaceRoot}",
68+
"C:/MinGW/include/*",
69+
"${workspaceRoot}"
6870
],
6971
"limitSymbolsToIncludedHeaders": true,
7072
"databaseFilename": ""
@@ -99,8 +101,8 @@ For C projects, simply remove the C++ lines:
99101
"path": [
100102
"C:/MinGW/lib/gcc/mingw32/6.3.0/include",
101103
"C:/MinGW/lib/gcc/mingw32/6.3.0/include-fixed",
102-
"C:/MinGW/include/*"
103-
"${workspaceRoot}",
104+
"C:/MinGW/include/*",
105+
"${workspaceRoot}"
104106
],
105107
"limitSymbolsToIncludedHeaders": true,
106108
"databaseFilename": ""

Extension/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@
22

33
## Version 0.17.0: May 7, 2018
44
* Auto-complete for headers after typing `#include`. [#802](https://github.com/Microsoft/vscode-cpptools/issues/802)
5+
* Add support for recursive `includePath`, e.g. `${workspaceFolder}/**`. [#897](https://github.com/Microsoft/vscode-cpptools/issues/897)
56
* Configuration improvements. [#1338](https://github.com/Microsoft/vscode-cpptools/issues/1338)
67
* 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)
78
* 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)
9+
* Fix IntelliSense for WSL projects in Windows builds 17110 and greater. [#1694](https://github.com/Microsoft/vscode-cpptools/issues/1694)
10+
* Add snippets. [PR #1823](https://github.com/Microsoft/vscode-cpptools/pull/1823)
11+
* Add support for vcpkg. [PR #1886](https://github.com/Microsoft/vscode-cpptools/pull/1886)
812
* Stop automatically adding `/usr/include` to the `includePath`. [#1819](https://github.com/Microsoft/vscode-cpptools/issues/1819)
913
* Fix wrong configuration being used if there are four or more. [#1599](https://github.com/Microsoft/vscode-cpptools/issues/1599)
1014
* Fix `c_cpp_properties.json` requiring write access. [#1790](https://github.com/Microsoft/vscode-cpptools/issues/1790)
1115
* Change file not found in `compile_commands.json` message from an error to a warning. [#1783](https://github.com/Microsoft/vscode-cpptools/issues/1783)
1216
* Fix an IntelliSense crash during completion requests. [#1782](https://github.com/Microsoft/vscode-cpptools/issues/1782)
1317
* Update the installed clang-format to 6.0.
18+
* 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)
19+
* Fix bug with garbage data appearing in tooltips on Linux/Mac. [#1577](https://github.com/Microsoft/vscode-cpptools/issues/1577)
1420

1521
## Version 0.16.1: March 30, 2018
1622
* Fix random deadlock caused by logging code on Linux/Mac. [#1759](https://github.com/Microsoft/vscode-cpptools/issues/1759)

0 commit comments

Comments
 (0)