make all reported problems respect elm-analyse excluded files

Author: bonega

src/common/providers/diagnostics/diagnosticsProvider.ts

@@ -27,6 +27,7 @@ import { ElmMakeDiagnostics } from "./elmMakeDiagnostics";
 import { DiagnosticKind, FileDiagnostics } from "./fileDiagnostics";
 import { ISourceFile } from "../../../compiler/forest";
 import { ElmReviewDiagnostics } from "./elmReviewDiagnostics";
+import { IElmAnalyseJsonService } from "./elmAnalyseJsonService";
 
 export interface IElmIssueRegion {
   start: { line: number; column: number };
@@ -90,6 +91,7 @@ export class DiagnosticsProvider implements Disposable {
   private elmMakeDiagnostics: ElmMakeDiagnostics;
   private elmReviewDiagnostics: ElmReviewDiagnostics;
   private elmLsDiagnostics: ElmLsDiagnostics;
+  private elmAnalyseJsonService: IElmAnalyseJsonService;
   private currentDiagnostics: Map<string, FileDiagnostics>;
   private events: TextDocumentEvents;
   private connection: Connection;
@@ -112,6 +114,9 @@ export class DiagnosticsProvider implements Disposable {
     this.elmMakeDiagnostics = container.resolve(ElmMakeDiagnostics);
     this.elmReviewDiagnostics = container.resolve(ElmReviewDiagnostics);
     this.elmLsDiagnostics = container.resolve(ElmLsDiagnostics);
+    this.elmAnalyseJsonService = container.resolve<IElmAnalyseJsonService>(
+      "ElmAnalyseJsonService",
+    );
     this.documentEvents = container.resolve(TextDocumentEvents);
 
     this.connection = container.resolve("Connection");
@@ -446,6 +451,21 @@ export class DiagnosticsProvider implements Disposable {
               return;
             }
 
+            if (
+              this.elmAnalyseJsonService.isFileExcluded(
+                sourceFile.uri,
+                program.getRootPath().fsPath,
+              )
+            ) {
+              this.updateDiagnostics(uri, DiagnosticKind.ElmMake, []);
+              this.updateDiagnostics(uri, DiagnosticKind.Syntactic, []);
+              this.updateDiagnostics(uri, DiagnosticKind.Semantic, []);
+              this.updateDiagnostics(uri, DiagnosticKind.Suggestion, []);
+              this.updateDiagnostics(uri, DiagnosticKind.ElmLS, []);
+              goNext();
+              return;
+            }
+
             next.immediate(() => {
               this.updateDiagnostics(uri, DiagnosticKind.ElmMake, []);
               this.updateDiagnostics(

src/common/providers/diagnostics/elmAnalyseJsonService.ts

@@ -1,6 +1,7 @@
 import path from "path";
 import { container, injectable } from "tsyringe";
 import { Connection } from "vscode-languageserver";
+import { URI } from "vscode-uri";
 
 export interface IElmAnalyseJson {
   checks?: {
@@ -40,6 +41,7 @@ export interface IElmAnalyseJson {
 
 export interface IElmAnalyseJsonService {
   getElmAnalyseJson(workspacePath: string): IElmAnalyseJson;
+  isFileExcluded(fileUri: string, workspacePath: string): boolean;
 }
 
 @injectable()
@@ -72,4 +74,24 @@ export class ElmAnalyseJsonService implements IElmAnalyseJsonService {
     this.elmAnalyseJson.set(workspacePath, elmAnalyseJson);
     return elmAnalyseJson;
   }
+
+  public isFileExcluded(fileUri: string, workspacePath: string): boolean {
+    const elmAnalyseJson = this.getElmAnalyseJson(workspacePath);
+
+    if (!elmAnalyseJson.excludedPaths) {
+      return false;
+    }
+
+    return elmAnalyseJson.excludedPaths.some((excludedPath) => {
+      if (excludedPath.startsWith(workspacePath)) {
+        // absolute path
+        return fileUri.startsWith(URI.file(excludedPath).toString());
+      } else {
+        // relative path
+        return fileUri.startsWith(
+          URI.file(path.join(workspacePath, excludedPath)).toString(),
+        );
+      }
+    });
+  }
 }

src/common/providers/diagnostics/elmLsDiagnostics.ts

@@ -396,32 +396,6 @@ export class ElmLsDiagnostics {
     );
   }
 
-  private excludedFolder(
-    sourceFile: ISourceFile,
-    program: IProgram,
-    elmAnalyseJson: IElmAnalyseJson,
-  ): boolean {
-    const uri = sourceFile.uri;
-    const rootPath = program.getRootPath().fsPath;
-
-    if (
-      elmAnalyseJson.excludedPaths?.some((excludedPath) => {
-        if (excludedPath.startsWith(rootPath)) {
-          // absolute path
-          return uri.startsWith(URI.file(excludedPath).toString());
-        } else {
-          // relative path
-          return uri.startsWith(
-            URI.file(path.join(rootPath, excludedPath)).toString(),
-          );
-        }
-      })
-    ) {
-      return true;
-    }
-    return false;
-  }
-
   public createDiagnostics = (
     sourceFile: ISourceFile,
     program: IProgram,
@@ -430,7 +404,12 @@ export class ElmLsDiagnostics {
       program.getRootPath().fsPath,
     );
 
-    if (this.excludedFolder(sourceFile, program, elmAnalyseJson)) {
+    if (
+      this.elmAnalyseJsonService.isFileExcluded(
+        sourceFile.uri,
+        program.getRootPath().fsPath,
+      )
+    ) {
       return [];
     }
 
@@ -499,7 +478,12 @@ export class ElmLsDiagnostics {
       program.getRootPath().fsPath,
     );
 
-    if (this.excludedFolder(sourceFile, program, elmAnalyseJson)) {
+    if (
+      this.elmAnalyseJsonService.isFileExcluded(
+        sourceFile.uri,
+        program.getRootPath().fsPath,
+      )
+    ) {
       return [];
     }
 

src/common/providers/diagnostics/elmMakeDiagnostics.ts

@@ -17,6 +17,7 @@ import { ElmDiagnosticsHelper } from "./elmDiagnosticsHelper";
 import { IProgram } from "../../../compiler/program";
 import { IFileSystemHost } from "../../types";
 import type { ExecaReturnValue } from "execa";
+import { IElmAnalyseJsonService } from "./elmAnalyseJsonService";
 
 const ELM_MAKE = "Elm";
 export const NAMING_ERROR = "NAMING ERROR";
@@ -61,11 +62,15 @@ export class ElmMakeDiagnostics {
   private elmWorkspaceMatcher: ElmWorkspaceMatcher<URI>;
   private settings: Settings;
   private connection: Connection;
+  private elmAnalyseJsonService: IElmAnalyseJsonService;
 
   constructor(private host: IFileSystemHost) {
     this.settings = container.resolve("Settings");
     this.connection = container.resolve<Connection>("Connection");
     this.elmWorkspaceMatcher = new ElmWorkspaceMatcher((uri) => uri);
+    this.elmAnalyseJsonService = container.resolve<IElmAnalyseJsonService>(
+      "ElmAnalyseJsonService",
+    );
   }
 
   public canRun = (sourceFile: ISourceFile): boolean => {
@@ -204,7 +209,11 @@ export class ElmMakeDiagnostics {
       ? forestFiles
       : forestFiles.concat(sourceFile);
 
-    const projectFiles = allFiles.filter((file) => !file.isDependency);
+    const projectFiles = allFiles.filter(
+      (file) =>
+        !file.isDependency &&
+        !this.elmAnalyseJsonService.isFileExcluded(file.uri, workspaceRootPath),
+    );
 
     const testFilesForSure = projectFiles.filter((file) => file.isTestFile);
     const otherFiles = projectFiles.filter((file) => !file.isTestFile);