Fix exceptions break queue, language client dispose is integrated in main config, only editorAppConfig drives text changes

- Separate language client tests / move to own files

Author: kaisalmen

packages/client/src/editorApp/editorApp.ts

@@ -272,6 +272,7 @@ export class EditorApp {
                     };
                     this.diffEditor?.setModel(model);
                     this.announceModelUpdate(model);
+                    await this.disposeModelRefs();
                 }
             } else {
                 this.logger.info('Diff Editor: Code resources were not updated. They are ether unchanged or undefined.');
@@ -284,13 +285,12 @@ export class EditorApp {
                 if (model.modified !== undefined && model.modified !== null) {
                     this.editor?.setModel(model.modified);
                     this.announceModelUpdate(model);
+                    await this.disposeModelRefs();
                 }
             } else {
                 this.logger.info('Editor: Code resources were not updated. They are either unchanged or undefined.');
             }
         }
-
-        await this.disposeModelRefs();
     }
 
     async buildModelReference(codeContent: CodeContent): Promise<IReference<ITextFileEditorModel>> {

packages/client/src/wrapper/lcconfig.ts

@@ -19,6 +19,7 @@ export interface LanguageClientConfig {
     restartOptions?: LanguageClientRestartOptions;
     disposeWorker?: boolean;
     logLevel?: LogLevel | number;
+    enforceDispose?: boolean;
 }
 
 export interface LanguageClientRestartOptions {

packages/client/src/wrapper/lcmanager.ts

@@ -69,6 +69,8 @@ export class LanguageClientManager {
     }
 
     isStarted(): boolean {
+        // fast-fail
+        if (this.languageClientWrappers.size === 0) return false;
         for (const lcw of this.languageClientWrappers.values()) {
             // as soon as one is not started return
             if (!lcw.isStarted()) {
@@ -78,7 +80,7 @@ export class LanguageClientManager {
         return true;
     }
 
-    async dispose(): Promise<void | void[]> {
+    async dispose(clearClients: boolean = false): Promise<void | void[]> {
         this.logger.debug('Disposing all LanguageClientWrappers...');
         const allPromises: Array<Promise<void>> = [];
         for (const lcw of this.languageClientWrappers.values()) {
@@ -87,5 +89,9 @@ export class LanguageClientManager {
             }
         }
         await Promise.all(allPromises);
+
+        if (clearClients) {
+            this.languageClientWrappers.clear();
+        }
     }
 }

packages/client/test/wrapper/lcmanager.test.ts

@@ -79,4 +79,12 @@ describe('Test LanguageClientWrapper', () => {
         expect(logLevel).toBe(2);
     });
 
+    test('Check started to be false if nothing is configured', async () => {
+        const lcsManager = new LanguageClientManager();
+        expect(lcsManager.haveLanguageClients()).toBe(false);
+        // eslint-disable-next-line dot-notation
+        expect(lcsManager['languageClientWrappers'].size).toBe(0);
+        expect(lcsManager.isStarted()).toBe(false);
+    });
+
 });

packages/examples/src/langium/statemachine/config/statemachineConfig.ts

@@ -43,7 +43,8 @@ export const createLangiumGlobalConfig = (params: {
                 messagePort: params.messagePort,
             },
             messageTransports: params.messageTransports
-        }
+        },
+        logLevel: LogLevel.Debug
     };
 
     const vscodeApiConfig: MonacoVscodeApiConfig = {

packages/examples/src/langium/statemachine/main-react.tsx

@@ -26,36 +26,39 @@ export const runStatemachineReact = async (noControls: boolean) => {
 
     const root = ReactDOM.createRoot(document.getElementById('react-root')!);
     const App = () => {
-        const [testState, setTestState] = useState<string>('');
-        const [testStateButton, setTestStateButton] = useState<string>(text);
+        const [debugTextState, setDebugTextState] = useState<string>('');
+        const [codeState, setCodeState] = useState<string>(text);
+        const [disposeLcState, setDisposeLcState] = useState<boolean>(false);
 
         const onTextChanged = (textChanges: TextContents) => {
-            setTestState(textChanges.modified as string);
+            setDebugTextState(textChanges.modified as string);
         };
 
         const appConfig = createLangiumGlobalConfig({
             languageServerId: 'react',
             codeContent: {
-                text,
+                text: codeState,
                 uri: '/workspace/example.statemachine'
             },
             worker,
             messageTransports: { reader, writer }
         });
+        appConfig.languageClientConfig.enforceDispose = disposeLcState;
 
         return (
             <>
                 <div>
-                    <button style={{background: 'purple'}} onClick={() => setTestStateButton(testStateButton + '\n// comment')}>Change Text</button>
+                    <button style={{background: 'purple'}} onClick={() => setCodeState(codeState + '\n// comment')}>Change Text</button>
+                    <button style={{background: 'red'}} onClick={() => setDisposeLcState(!disposeLcState)}>Swatch LC Dispose</button>
+
                     <MonacoEditorReactComp
                         style={{ 'height': '50vh' }}
                         vscodeApiConfig={appConfig.vscodeApiConfig}
                         editorAppConfig={appConfig.editorAppConfig}
                         languageClientConfig={appConfig.languageClientConfig}
                         onTextChanged={onTextChanged}
-                        modifiedTextValue={testStateButton}
                     />
-                    <b>Debug:</b><br />{testState}
+                    <b>Debug:</b><br />{debugTextState}
                 </div>
             </>
         );