Recursive includePath changes. (#1896)

* Recursive includePath changes.
* Keep config/icons visible with settings json files.

Author: sean-mcmanus

Extension/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 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/), [#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)

Extension/src/LanguageServer/configurations.ts

@@ -201,7 +201,7 @@ export class CppProperties {
 
             if (!settings.defaultIncludePath) {
                 // We don't add system includes to the includePath anymore. The language server has this information.
-                configuration.includePath = ["${workspaceFolder}"].concat(this.vcpkgIncludes);
+                configuration.includePath = ["${workspaceFolder}/**"].concat(this.vcpkgIncludes);
             }
             if (!settings.defaultBrowsePath) {
                 // We don't add system includes to the includePath anymore. The language server has this information.

Extension/src/LanguageServer/ui.ts

@@ -110,12 +110,15 @@ export class UI {
 
     public activeDocumentChanged(): void {
         let activeEditor: vscode.TextEditor = vscode.window.activeTextEditor;
-        let show: boolean = (activeEditor && (activeEditor.document.languageId === "cpp" || activeEditor.document.languageId === "c"));
+        let isCpp: boolean = (activeEditor && (activeEditor.document.languageId === "cpp" || activeEditor.document.languageId === "c"));
 
-        this.ShowConfiguration = show;
-        this.ShowDBIcon = show;
-        this.ShowFlameIcon = show;
-        this.ShowNavigation = show;
+        // 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 {