Changed workspace diagnostics eventlistener implementation to instead use a EventEmitter instance on Workspace

Author: genius257

server/src/autoit/Script.ts

@@ -182,9 +182,12 @@ export default class Script {
     public triggerDiagnostics(): void {
         this.debouncedTriggerDiagnostics ??= debounce(() => {
             if (this.uri !== undefined) {
-                this.workspace?.triggerDiagnostics(
-                    this.uri.toString(),
-                    this.getDiagnostics(),
+                this.workspace?.eventEmitter.emit(
+                    'diagnostics',
+                    {
+                        uri: this.uri.toString(),
+                        diagnostics: this.getDiagnostics()
+                    },
                 );
             }
         }, 100);

server/src/autoit/Workspace.ts

@@ -4,15 +4,13 @@ import { URI, Utils } from 'vscode-uri';
 import Script from './Script';
 import native from './native.au3?raw';
 import { isAbsolutePath } from './Path';
+import EventEmitter from '@utils/EventEmitter';
 
 /** The key is the script URI */
 export type ScriptList = Map<string, Script>;
 
 type uri = string | URI | { toString: () => string };
 
-export type diagnosticsListner = (
-    uri: string, diagnostics: Diagnostic[]) => void;
-
 export type IncludeResolve = { uri: URI, text: string | null };
 
 export type IncludePromise = Promise<IncludeResolve | null>;
@@ -35,8 +33,8 @@ export class Workspace {
     protected scripts: ScriptList = new Map();
     protected resolvingIncludes = new Map<string, IncludePromise>();
     protected connection: Connection | null;
-    protected diagnosticsListners: diagnosticsListner[] = [];
     protected configuration: AutoIt3Configuration | null = null;
+    public readonly eventEmitter: EventEmitter<{diagnostics: {uri: string, diagnostics: Diagnostic[]}}> = new EventEmitter();
 
     constructor(connection: Connection | null = null) {
         this.connection = connection;
@@ -60,25 +58,6 @@ export class Workspace {
         return this.connection;
     }
 
-    public onDiagnostics(fn: diagnosticsListner): void {
-        this.diagnosticsListners.push(fn);
-    }
-
-    /**
-     * function for removing a diagnostics listner
-     */
-    public offDiagnostics(fn: diagnosticsListner): void {
-        this.diagnosticsListners = this.diagnosticsListners.filter(
-            (x) => x !== fn,
-        );
-    }
-
-    public triggerDiagnostics(uri: string, diagnostics: Diagnostic[]): void {
-        for (const fn of this.diagnosticsListners) {
-            fn.call(this, uri, diagnostics);
-        }
-    }
-
     public add(script: Script): void {
         const uri = script.getUri();
 

server/src/main.ts

@@ -68,7 +68,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
  */
 
 const workspace = new Workspace(connection);
-workspace.onDiagnostics(function (uri, diagnostics) {
+workspace.eventEmitter.on('diagnostics', function ({uri, diagnostics}) {
     // connection.window.showWarningMessage("onDiagnostics");
     connection.sendDiagnostics({
         uri,