File tree Expand file tree Collapse file tree 1 file changed +2
-10
lines changed
Extension/src/LanguageServer Expand file tree Collapse file tree 1 file changed +2
-10
lines changed Original file line number Diff line number Diff line change @@ -995,17 +995,9 @@ export class CppProperties {
995995 if ( ! configuration . browse . path ) {
996996 if ( settings . defaultBrowsePath ) {
997997 configuration . browse . path = settings . defaultBrowsePath ;
998- } else if ( configuration . includePath ) {
999- // If the user doesn't set browse.path, copy the includePath over. Make sure ${workspaceFolder} is in there though...
1000- configuration . browse . path = configuration . includePath . slice ( 0 ) ;
1001- if ( configuration . includePath . findIndex ( ( value : string ) =>
1002- ! ! value . match ( / ^ \$ \{ ( w o r k s p a c e R o o t | w o r k s p a c e F o l d e r ) \} ( \\ \* { 0 , 2 } | \/ \* { 0 , 2 } ) ? $ / g) ) === - 1
1003- ) {
1004- configuration . browse . path . push ( "${workspaceFolder}" ) ;
1005- }
1006- } else {
1007- configuration . browse . path = [ "${workspaceFolder}" ] ;
1008998 }
999+ // Otherwise, if the browse path is not set, let the native process populate it
1000+ // with include paths, including any parsed from compilerArgs.
10091001 } else {
10101002 configuration . browse . path = this . updateConfigurationPathsArray ( configuration . browse . path , settings . defaultBrowsePath , env ) ;
10111003 }
You can’t perform that action at this time.
0 commit comments