Fix failing tests

rokucommunity · Nov 1, 2024 · 67fd120 · 67fd120
1 parent 7c4688b
commit 67fd120
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/LanguageServer.spec.ts b/src/LanguageServer.spec.ts
@@ -680,6 +680,7 @@ describe('LanguageServer', () => {
             expect(
                 filterer.filter([
                     s`${workspacePath}/src/source/file.brs`,
+                    //this file should be excluded
                     s`${workspacePath}/dist/source/file.brs`
                 ])
             ).to.eql([

diff --git a/src/lsp/PathFilterer.ts b/src/lsp/PathFilterer.ts
@@ -134,7 +134,7 @@ export class PathFilterer {
 
         const collection = new PathCollection({
             matcher: matcher,
-            isExcludePattern: true
+            isExcludePattern: false
         });
         this.excludeCollections.push(collection);
         return () => {
@@ -184,6 +184,7 @@ export class PathCollection {
                     glob
                 ).replace(/\\+/g, '/');
                 this.matchers.push({
+                    pattern: pattern,
                     isMatch: micromatch.matcher(pattern),
                     isExcludePattern: isExcludePattern
                 });
@@ -197,6 +198,7 @@ export class PathCollection {
     }
 
     private matchers: Array<{
+        pattern?: string;
         isMatch: (string) => boolean;
         isExcludePattern: boolean;
     }> = [];

diff --git a/src/lsp/ProjectManager.spec.ts b/src/lsp/ProjectManager.spec.ts
@@ -513,7 +513,7 @@ describe('ProjectManager', () => {
             await onNextDiagnostics();
 
             //there should NOT be a standalone project
-            expect(manager['standaloneProjects'].length).to.eql(0);
+            expect(manager['standaloneProjects'].size).to.eql(0);
         });
 
         it('converts a missing file to a delete', async () => {
@@ -740,13 +740,15 @@ describe('ProjectManager', () => {
                 allowStandaloneProject: true
             }]);
             await onNextDiagnostics();
-            expect(manager['standaloneProjects'][0]?.srcPath).to.eql(s`${rootDir}/source/main.brs`);
+            expect(
+                [...manager['standaloneProjects'].values()][0]?.srcPath
+            ).to.eql(s`${rootDir}/source/main.brs`);
 
             //it deletes the standalone project when the file is closed
             await manager.handleFileClose({
                 srcPath: `${rootDir}/source/main.brs`
             });
-            expect(manager['standaloneProjects']).to.be.empty;
+            expect(manager['standaloneProjects'].size).to.eql(0);
         });
     });
 });