updates to correct linter slashes for mixed platform projects

fortran-lang · Dec 11, 2023 · d234716 · d234716
1 parent c7dd7a0
commit d234716
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/lint/provider.ts b/src/lint/provider.ts
@@ -495,6 +495,7 @@ export class FortranLintingProvider {
     if (!modout) return [];
 
     modout = resolveVariables(modout);
+    if (process.platform === 'win32') modout = modout.replace(/\//g, '\\');
     this.logger.debug(`[lint] moduleOutput: ${modFlag} ${modout}`);
     return [modFlag, modout];
   }

diff --git a/src/util/glob-paths.ts b/src/util/glob-paths.ts
@@ -34,9 +34,9 @@ export class GlobPaths {
   private globResolution(globPaths: string[]): string[] {
     if (globPaths.length === 0) return [];
     // Resolve internal variables and expand glob patterns
-    const globPathsVars = globPaths.map(e => resolveVariables(e));
+    globPaths = globPaths.map(e => resolveVariables(e));
     // fast-glob cannot work with Windows paths
-    globPaths = globPaths.map(e => e.replace('/\\/g', '/'));
+    globPaths = globPaths.map(e => e.replace(/\\/g, '/'));
     // This needs to be after the resolvevariables since {} are used in globs
     // try {
     //   const globIncPaths: string[] = fg.sync(globPathsVars, {
@@ -49,7 +49,7 @@ export class GlobPaths {
     // } catch (eacces) {
     try {
       const globIncPaths: string[] = [];
-      for (const i of globPathsVars) {
+      for (const i of globPaths) {
         // use '/' to match only directories and not files
         globIncPaths.push(...glob.sync(i + '/'));
       }