Skip to content

Commit 4ab525f

Browse files
author
Elaheh Rashedi
authored
Adding the defaultFolder to the configuration.includePath (#5989)
* update description * change UI description (match with Docs description)
1 parent 1852c50 commit 4ab525f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Extension/c_cpp_properties.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"type": "string"
6565
},
6666
"includePath": {
67-
"description": "A list of paths for the IntelliSense engine to use while searching for included headers. Searching on these paths is not recursive.",
67+
"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.",
6868
"type": "array",
6969
"items": {
7070
"type": "string"

Extension/src/LanguageServer/configurations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ export class CppProperties {
308308
if (isUnset(settings.defaultIncludePath)) {
309309
configuration.includePath = [rootFolder].concat(this.vcpkgIncludes);
310310
} else {
311-
configuration.includePath = [rootFolder].concat(this.vcpkgIncludes).concat([defaultFolder]);
311+
configuration.includePath = [defaultFolder];
312312
}
313313
// browse.path is not set by default anymore. When it is not set, the includePath will be used instead.
314314
if (isUnset(settings.defaultDefines)) {

Extension/ui/settings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@
525525
<div class="section">
526526
<div class="section-title" data-loc-id="include.path">Include path</div>
527527
<div class="section-text">
528-
<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>
528+
<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>
529529
</div>
530530
<div>
531531
<div class="section-note" data-loc-id="one.include.path.per.line">One include path per line.</div>

0 commit comments

Comments
 (0)