improve type handling

idleberg · Jul 9, 2023 · dc4fe33 · dc4fe33
1 parent 84fb255
commit dc4fe33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/diagnostics.ts b/src/diagnostics.ts
@@ -1,8 +1,7 @@
-import { compile } from 'makensis';
+import * as NSIS from 'makensis';
 import { findErrors, findWarnings, getMakensisPath, getNullDevice, getPreprocessMode, getOverrideCompression, getSpawnEnv } from './util';
 import { getConfig } from 'vscode-get-config';
 import micromatch from 'micromatch';
-import type { CompilerOptions } from 'makensis';
 import vscode from 'vscode';
 import type { DiagnosticCollection } from '../types';
 
@@ -38,7 +37,7 @@ export async function updateDiagnostics(document: vscode.TextDocument | null, co
       return;
     }
 
-    const options: CompilerOptions = {
+    const options: NSIS.CompilerOptions = {
       verbose: 2,
       pathToMakensis,
       postExecute: [
@@ -63,7 +62,7 @@ export async function updateDiagnostics(document: vscode.TextDocument | null, co
     let output;
 
     try {
-      output = await compile(document.fileName, options, await getSpawnEnv());
+      output = await NSIS.compile(document.fileName, options, await getSpawnEnv());
     } catch (error) {
       console.error('[vscode-nsis]', error instanceof Error ? error.message : error);
     }
@@ -84,4 +83,6 @@ export async function updateDiagnostics(document: vscode.TextDocument | null, co
   } else {
     collection.clear();
   }
+
+  NSIS.events.removeAllListeners();
 }
diff --git a/src/makensis.ts b/src/makensis.ts
@@ -85,6 +85,7 @@ export async function compile(strictMode: boolean): Promise<void> {
       hasErrors
     });
   }
+
   NSIS.events.removeAllListeners();
 }
 
@@ -113,6 +114,7 @@ export async function showVersion(): Promise<void> {
     });
   }
 
+  NSIS.events.removeAllListeners();
 }
 
 export async function showCompilerFlags(): Promise<void> {
@@ -143,6 +145,7 @@ export async function showCompilerFlags(): Promise<void> {
     });
   }
 
+  NSIS.events.removeAllListeners();
 }
 
 export async function showHelp(): Promise<void> {
@@ -184,4 +187,6 @@ export async function showHelp(): Promise<void> {
       hasErrors
     });
   }
+
+  NSIS.events.removeAllListeners();
 }