Wait for schemas to be loaded

Author: satyakigh

src/datastore/LMDB.ts

@@ -12,7 +12,6 @@ import { stats } from './lmdb/Stats';
 import { encryptionStrategy } from './lmdb/Utils';
 
 export class LMDBStoreFactory implements DataStoreFactory {
-    private isClosed: boolean = false;
     private readonly log = LoggerFactory.getLogger('LMDB.Global');
     @Telemetry({ scope: 'LMDB.Global' }) private readonly telemetry!: ScopedTelemetry;
 
@@ -87,18 +86,14 @@ export class LMDBStoreFactory implements DataStoreFactory {
     }
 
     async close(): Promise<void> {
-        if (this.isClosed) {
-            return;
-        }
+        clearInterval(this.metricsInterval);
+        clearTimeout(this.timeout);
 
         // Clear the stores map but don't close individual stores
         // LMDB will close them when we close the environment
-        clearInterval(this.metricsInterval);
-        clearTimeout(this.timeout);
         this.stores.clear();
         await this.env.flushed;
         await this.env.close();
-        this.isClosed = true;
     }
 
     private cleanupOldVersions(): void {

src/server/CfnServer.ts

@@ -61,7 +61,6 @@ import { ServerComponents } from './ServerComponents';
 
 const log = LoggerFactory.getLogger('CfnServer');
 export class CfnServer {
-    private isClosed: boolean = false;
     private readonly components: ServerComponents;
 
     constructor(
@@ -290,10 +289,6 @@ export class CfnServer {
     }
 
     async close(): Promise<void> {
-        if (this.isClosed) {
-            return;
-        }
         await closeSafely(this.providers, this.external, this.core);
-        this.isClosed = true;
     }
 }

tst/e2e/CodeLens.test.ts

@@ -1,16 +1,16 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import { CodeLens } from 'vscode-languageserver';
 import { TestExtension } from '../utils/TestExtension';
 
 describe('CodeLens', () => {
     let client: TestExtension;
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         client = new TestExtension();
         await client.ready();
     });
 
-    afterEach(async () => {
+    afterAll(async () => {
         await client.close();
     });
 

tst/e2e/Completion.test.ts

@@ -1,16 +1,16 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import { getSimpleYamlTemplateText, getSimpleJsonTemplateText } from '../utils/TemplateUtils';
 import { TestExtension } from '../utils/TestExtension';
 
 describe('Completion', () => {
     let client: TestExtension;
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         client = new TestExtension();
         await client.ready();
     });
 
-    afterEach(async () => {
+    afterAll(async () => {
         await client.close();
     });
 

tst/e2e/Completion.yaml.test.ts

@@ -1,4 +1,4 @@
-import { beforeEach, afterEach, describe, expect, test } from 'vitest';
+import { describe, expect, test, beforeAll, afterAll } from 'vitest';
 import { CompletionList } from 'vscode-languageserver';
 import { TestExtension } from '../utils/TestExtension';
 import { WaitFor } from '../utils/Utils';
@@ -7,11 +7,11 @@ describe('Completion Tests', () => {
     const documentUri = 'file:///test.yaml';
     let extension: TestExtension;
 
-    beforeEach(() => {
+    beforeAll(() => {
         extension = new TestExtension();
     });
 
-    afterEach(async () => {
+    afterAll(async () => {
         await extension.close();
     });
 

tst/e2e/DocumentHandler.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import { TestExtension } from '../utils/TestExtension';
 import { WaitFor } from '../utils/Utils';
 
@@ -7,12 +7,12 @@ describe('DocumentHandler', () => {
 
     let extension: TestExtension;
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         extension = new TestExtension();
         await extension.ready();
     });
 
-    afterEach(async () => {
+    afterAll(async () => {
         await extension.close();
     });
 

tst/e2e/DocumentSymbol.test.ts

@@ -1,16 +1,16 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import { DocumentSymbol, SymbolKind } from 'vscode-languageserver';
 import { TestExtension } from '../utils/TestExtension';
 
 describe('DocumentSymbol', () => {
     let client: TestExtension;
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         client = new TestExtension();
         await client.ready();
     });
 
-    afterEach(async () => {
+    afterAll(async () => {
         await client.close();
     });
 

tst/e2e/ExtractAllOccurrencesToParameter.test.ts

@@ -1,17 +1,17 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import { CodeAction, CodeActionKind, Range, TextEdit } from 'vscode-languageserver';
 import { TestExtension } from '../utils/TestExtension';
 import { WaitFor } from '../utils/Utils';
 
 describe('Extract All Occurrences to Parameter', () => {
     let extension: TestExtension;
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         extension = new TestExtension();
         await extension.ready();
     });
 
-    afterEach(async () => {
+    afterAll(async () => {
         await extension.close();
     });
 

tst/e2e/ExtractToParameter.json.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, afterAll, beforeAll } from 'vitest';
 import { CodeAction, CodeActionKind, Range, TextEdit } from 'vscode-languageserver';
 import { TestExtension } from '../utils/TestExtension';
 import { WaitFor } from '../utils/Utils';
@@ -7,12 +7,12 @@ import { applyWorkspaceEdit } from '../utils/WorkspaceEditUtils';
 describe('Extract to Parameter - JSON Tests', () => {
     let extension: TestExtension;
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         extension = new TestExtension();
         await extension.ready();
     });
 
-    afterEach(async () => {
+    afterAll(async () => {
         await extension.close();
     });
 

tst/e2e/ExtractToParameter.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import { CodeAction, CodeActionKind, Range, TextEdit, WorkspaceEdit } from 'vscode-languageserver';
 import { TestExtension } from '../utils/TestExtension';
 import { WaitFor } from '../utils/Utils';
@@ -7,12 +7,12 @@ import { applyWorkspaceEdit } from '../utils/WorkspaceEditUtils';
 describe('Extract to Parameter - End-to-End CodeAction Workflow Tests', () => {
     let extension: TestExtension;
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         extension = new TestExtension();
         await extension.ready();
     });
 
-    afterEach(async () => {
+    afterAll(async () => {
         await extension.close();
     });