fix: avoid directories ending in .sol (#285)

* fix: avoid directories ending in .sol * test: fix missing `isFile` in test mocks Co-authored-by: John Kane <john@kanej.me>
NomicFoundation · Nov 24, 2022 · b60d161 · b60d161
1 parent 882d6dc
commit b60d161
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/server/src/services/initialization/indexWorkspaceFolders.ts b/server/src/services/initialization/indexWorkspaceFolders.ts
@@ -148,6 +148,10 @@ export async function indexSolidityFiles(
   const indexedProjects = Object.values(serverState.projects);
 
   for (const fileUri of fileUris) {
+    if (!(await serverState.workspaceFileRetriever.isFile(fileUri))) {
+      continue;
+    }
+
     let project: Project = new ProjectlessProject(
       serverState,
       path.dirname(fileUri)

diff --git a/server/src/utils/WorkspaceFileRetriever.ts b/server/src/utils/WorkspaceFileRetriever.ts
@@ -32,4 +32,8 @@ export class WorkspaceFileRetriever {
   public async readFile(documentUri: string): Promise<string> {
     return (await fs.promises.readFile(documentUri)).toString();
   }
+
+  public async isFile(fsPath: string) {
+    return (await fs.promises.stat(fsPath)).isFile();
+  }
 }
diff --git a/server/test/helpers/setupMockWorkspaceFileRetriever.ts b/server/test/helpers/setupMockWorkspaceFileRetriever.ts
@@ -43,9 +43,14 @@ export function setupMockWorkspaceFileRetriever(
     return false;
   };
 
+  const isFile = async () => {
+    return false;
+  };
+
   return {
     findFiles: sinon.spy(findFiles),
     readFile: sinon.spy(readFile),
     fileExists: sinon.spy(fileExists),
+    isFile: sinon.spy(isFile),
   };
 }
diff --git a/server/test/parser/analyzer.ts b/server/test/parser/analyzer.ts
@@ -81,6 +81,7 @@ async function runIndexing(
     },
     readFile: async () => "",
     fileExists: async () => false,
+    isFile: async () => false,
   };
 
   await indexWorkspaceFolders(