fix merge (#11249)

Author: michelleangela

Extension/src/LanguageServer/configurations.ts

@@ -1814,8 +1814,8 @@ export class CppProperties {
         // Check for path-related squiggles.
         let paths: string[] = [];
         let compilerPath: string | undefined;
-        for (const pathArray of [(currentConfiguration.browse ? currentConfiguration.browse.path : undefined),
-            currentConfiguration.includePath, currentConfiguration.macFrameworkPath]) {
+        for (const pathArray of [ (currentConfiguration.browse ? currentConfiguration.browse.path : undefined),
+            currentConfiguration.includePath, currentConfiguration.macFrameworkPath ]) {
             if (pathArray) {
                 for (const curPath of pathArray) {
                     paths.push(`${curPath}`);
@@ -1825,7 +1825,7 @@ export class CppProperties {
         // Skip the relative forcedInclude files.
         if (currentConfiguration.forcedInclude) {
             for (const file of currentConfiguration.forcedInclude) {
-                const resolvedFilePath: string = this.resolvePath(file, isWindows);
+                const resolvedFilePath: string = this.resolvePath(file);
                 if (path.isAbsolute(resolvedFilePath)) {
                     paths.push(`${file}`);
                 }
@@ -1843,7 +1843,7 @@ export class CppProperties {
         // Resolve and split any environment variables
         paths = this.resolveAndSplit(paths, undefined, this.ExtendedEnvironment);
         compilerPath = util.resolveVariables(compilerPath, this.ExtendedEnvironment).trim();
-        compilerPath = this.resolvePath(compilerPath, isWindows);
+        compilerPath = this.resolvePath(compilerPath);
 
         // Get the start/end for properties that are file-only.
         const forcedIncludeStart: number = curText.search(/\s*\"forcedInclude\"\s*:\s*\[/);
@@ -1907,7 +1907,7 @@ export class CppProperties {
 
         dotConfigPath = currentConfiguration.dotConfig;
         dotConfigPath = util.resolveVariables(dotConfigPath, this.ExtendedEnvironment).trim();
-        dotConfigPath = this.resolvePath(dotConfigPath, isWindows);
+        dotConfigPath = this.resolvePath(dotConfigPath);
         // does not try resolve if the dotConfig property is empty
         dotConfigPath = dotConfigPath !== '' ? dotConfigPath : undefined;
 
@@ -1946,7 +1946,7 @@ export class CppProperties {
                 continue;
             }
 
-            let resolvedPath: string = this.resolvePath(curPath, isWindows);
+            let resolvedPath: string = this.resolvePath(curPath);
             if (!resolvedPath) {
                 continue;
             }
@@ -1986,15 +1986,15 @@ export class CppProperties {
                     let message: string;
                     if (!pathExists) {
                         if (curOffset >= forcedIncludeStart && curOffset <= forcedeIncludeEnd
-                            && !path.isAbsolute(resolvedPath)) {
+                                && !path.isAbsolute(resolvedPath)) {
                             continue; // Skip the error, because it could be resolved recursively.
                         }
                         message = localize('cannot.find2', "Cannot find \"{0}\".", resolvedPath);
                         newSquiggleMetrics.PathNonExistent++;
                     } else {
                         // Check for file versus path mismatches.
                         if ((curOffset >= forcedIncludeStart && curOffset <= forcedeIncludeEnd) ||
-                            (curOffset >= compileCommandsStart && curOffset <= compileCommandsEnd)) {
+                                (curOffset >= compileCommandsStart && curOffset <= compileCommandsEnd)) {
                             if (util.checkFileExistsSync(resolvedPath)) {
                                 continue;
                             }
@@ -2018,7 +2018,6 @@ export class CppProperties {
                 // TODO: This never matches. https://github.com/microsoft/vscode-cpptools/issues/9140
                 const envMatches: string[] | null = envText.match(pattern);
                 if (envMatches) {
-
                     let curOffset: number = 0;
                     let endOffset: number = 0;
                     for (const curMatch of envMatches) {
@@ -2066,7 +2065,6 @@ export class CppProperties {
             telemetry.logLanguageServerEvent("ConfigSquiggles", undefined, changedSquiggleMetrics);
         }
         this.prevSquiggleMetrics.set(currentConfiguration.name, newSquiggleMetrics);
-
     }
 
     private updateToVersion2(): void {