feat: add runLanguageClient

ls-infra · Jan 16, 2024 · 0c865d1 · 0c865d1
1 parent 0b49734
commit 0c865d1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 20 deletions.
diff --git a/packages/examples/src/common/client-commons.ts b/packages/examples/src/common/client-commons.ts
@@ -15,7 +15,6 @@ import { initServices, MonacoLanguageClient } from 'monaco-languageclient';
 import { CloseAction, ErrorAction, MessageTransports } from 'vscode-languageclient';
 import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode-ws-jsonrpc';
 import { Uri } from 'vscode';
-import { LanguageClientRunConfig } from './model.js';
 
 export const createLanguageClient = (transports: MessageTransports, languageId: string): MonacoLanguageClient => {
     return new MonacoLanguageClient({
@@ -168,20 +167,3 @@ export const createMonacoEditor = async (config: {
     } as ExampleJsonEditor;
     return Promise.resolve(result);
 };
-
-export const runLanguageClient = async (config : LanguageClientRunConfig) => {
-    const languageId = config.registerConfig.id;
-    await doInit(config.vscodeApiInit, config.registerConfig);
-    const editorDom = document.getElementById(config.htmlElementId);
-    if (editorDom) {
-        await createMonacoEditor({
-            htmlElement: editorDom,
-            content: config.defaultContent,
-            languageId
-        });
-    } else {
-        console.error(`no dom element for css id: ${config.htmlElementId}`);
-    }
-    const url = createUrl(config.clientUrl, config.serverPort, config.serverPath);
-    initWebSocketAndStartClient(url, languageId);
-};
diff --git a/packages/examples/src/common/language-client-runner.ts b/packages/examples/src/common/language-client-runner.ts
@@ -0,0 +1,23 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+import { createMonacoEditor, createUrl, doInit, initWebSocketAndStartClient } from './client-commons.js';
+import { LanguageClientRunConfig } from './model.js';
+/** LSP client runner */
+export const runLanguageClient = async (config : LanguageClientRunConfig) => {
+    const languageId = config.registerConfig.id;
+    await doInit(config.vscodeApiInit, config.registerConfig);
+    const editorDom = document.getElementById(config.htmlElementId);
+    if (editorDom) {
+        await createMonacoEditor({
+            htmlElement: editorDom,
+            content: config.defaultContent,
+            languageId
+        });
+        const url = createUrl(config.clientUrl, config.serverPort, config.serverPath);
+        initWebSocketAndStartClient(url, languageId);
+    } else {
+        console.error(`no dom element for css id: ${config.htmlElementId}`);
+    }
+};
diff --git a/packages/examples/src/common/language-server-runner.ts b/packages/examples/src/common/language-server-runner.ts
@@ -9,7 +9,7 @@ import express from 'express';
 import { getLocalDirectory } from '../utils/fs-utils.js';
 import { upgradeWsServer } from './server-commons.js';
 import { LanguageServerRunConfig } from './model.js';
-
+/** LSP server runner */
 export const runLanguageServer = (
     languageServerRunConfig: LanguageServerRunConfig
 ) => {

diff --git a/packages/examples/src/groovy/client/main.ts b/packages/examples/src/groovy/client/main.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 import '@codingame/monaco-vscode-groovy-default-extension'; // this is for the syntax highlighting
-import { runLanguageClient } from '../../common/client-commons.js';
+import { runLanguageClient } from '../../common/language-client-runner.js';
 import { buildWorkerDefinition } from 'monaco-editor-workers';
 import { groovyConfig } from '../config.js';
 buildWorkerDefinition('../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false);

diff --git a/packages/examples/src/index.ts b/packages/examples/src/index.ts
@@ -4,6 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 /* client side export only */
 export * from './common/client-commons.js';
+export * from './common/language-client-runner.js';
 export * from './browser/main.js';
 export * from './json/client/main.js';
 export * from './langium/statemachineClient.js';