Adding the defaultFolder to the configuration.includePath (#5989)

* update description * change UI description (match with Docs description)
microsoft · Aug 21, 2020 · 4ab525f · 4ab525f
1 parent 1852c50
commit 4ab525f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Extension/c_cpp_properties.schema.json b/Extension/c_cpp_properties.schema.json
@@ -64,7 +64,7 @@
                         "type": "string"
                     },
                     "includePath": {
-                        "description": "A list of paths for the IntelliSense engine to use while searching for included headers. Searching on these paths is not recursive.",
+                        "description": "A list of paths for the IntelliSense engine to use while searching for included headers. Searching on these paths is not recursive. Specify '**' to indicate recursive search. For example, '${workspaceFolder}/**' will search through all subdirectories while '${workspaceFolder}' will not.",
                         "type": "array",
                         "items": {
                             "type": "string"

diff --git a/Extension/src/LanguageServer/configurations.ts b/Extension/src/LanguageServer/configurations.ts
@@ -308,7 +308,7 @@ export class CppProperties {
         if (isUnset(settings.defaultIncludePath)) {
             configuration.includePath = [rootFolder].concat(this.vcpkgIncludes);
         } else {
-            configuration.includePath = [rootFolder].concat(this.vcpkgIncludes).concat([defaultFolder]);
+            configuration.includePath = [defaultFolder];
         }
         // browse.path is not set by default anymore. When it is not set, the includePath will be used instead.
         if (isUnset(settings.defaultDefines)) {

diff --git a/Extension/ui/settings.html b/Extension/ui/settings.html
@@ -525,7 +525,7 @@
     <div class="section">
         <div class="section-title" data-loc-id="include.path">Include path</div>
         <div class="section-text">
-            <span data-loc-id="include.path.description">An include path is a folder that contains header files (such as <code>#include "myHeaderFile.h"</code>) that are included in a source file. Specify a list paths for the IntelliSense engine to use while searching for included header files. If a path ends with <code>/**</code> the IntelliSense engine will do a recursive search for header files starting from that directory. If on Windows with Visual Studio installed, or if a compiler is specified in the <code>compilerPath</code> setting, it is not necessary to list the system include paths in this list.</span>
+            <span data-loc-id="include.path.description">An include path is a folder that contains header files (such as <code>#include "myHeaderFile.h"</code>) that are included in a source file. Specify a list paths for the IntelliSense engine to use while searching for included header files. Searching on these paths is not recursive. Specify <code>**</code> to indicate recursive search. For example, <code>${workspaceFolder}/**</code> will search through all subdirectories while <code>${workspaceFolder}</code> will not.  If on Windows with Visual Studio installed, or if a compiler is specified in the <code>compilerPath</code> setting, it is not necessary to list the system include paths in this list.</span>
         </div>
         <div>
           <div class="section-note" data-loc-id="one.include.path.per.line">One include path per line.</div>