Remove whitespace if the includePath exists + minor fix (#11911)

* Remove whitespace if the includePath exists + minor fix

* fix lint issues

* Move includePath validation to config.ts

* fix lint issues

* small fixes

* fix lint issues

Author: browntarik

Extension/src/LanguageServer/configurations.ts

@@ -808,6 +808,9 @@ export class CppProperties {
                 const matches: string[] = fastGlob.isDynamicPattern(normalized) ?
                     fastGlob.sync(normalized, { onlyDirectories: true, cwd, suppressErrors: true, deep: 15 }) : [res];
                 resolvedGlob.push(...matches.map(s => s + suffix));
+                if (resolvedGlob.length === 0) {
+                    resolvedGlob.push(normalized);
+                }
             } else {
                 resolvedGlob.push(normalized + suffix);
             }
@@ -1253,11 +1256,28 @@ export class CppProperties {
         }
     }
 
+    private trimPathWhitespace(paths: string[] | undefined): string[] | undefined {
+        if (paths === undefined) {
+            return undefined;
+        }
+        const trimmedPaths = [];
+        for (const value of paths) {
+            const fullPath = this.resolvePath(value);
+            if (fs.existsSync(fullPath.trim()) && !fs.existsSync(fullPath)) {
+                trimmedPaths.push(value.trim());
+            } else {
+                trimmedPaths.push(value);
+            }
+        }
+        return trimmedPaths;
+    }
+
     private saveConfigurationUI(): void {
         this.parsePropertiesFile(); // Clear out any modifications we may have made internally.
         if (this.settingsPanel && this.configurationJson) {
             const config: Configuration = this.settingsPanel.getLastValuesFromConfigUI();
             this.configurationJson.configurations[this.settingsPanel.selectedConfigIndex] = config;
+            this.configurationJson.configurations[this.settingsPanel.selectedConfigIndex].includePath = this.trimPathWhitespace(this.configurationJson.configurations[this.settingsPanel.selectedConfigIndex].includePath);
             this.settingsPanel.updateErrors(this.getErrorsForConfigUI(this.settingsPanel.selectedConfigIndex));
             this.writeToJson();
         }