8065 lsp front end

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/lsp/LSPWebServerSesssionProvider.java → server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/lsp/LSPWebServerSessionProvider.java

@@ -23,12 +23,12 @@
 import org.jkiss.dbeaver.model.auth.impl.AbstractSessionPersistent;
 import org.jkiss.dbeaver.model.lsp.DBLServerSessionProvider;
 
-public class LSPWebServerSesssionProvider implements DBLServerSessionProvider {
+public class LSPWebServerSessionProvider implements DBLServerSessionProvider {
 
     @NotNull
     private final BaseWebSession session;
 
-    public LSPWebServerSesssionProvider(@NotNull BaseWebSession session) {
+    public LSPWebServerSessionProvider(@NotNull BaseWebSession session) {
         this.session = session;
     }
 

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/lsp/LSPWebSocketEndpoint.java

@@ -44,13 +44,13 @@ public void onOpen(Session wsSession, EndpointConfig endpointConfig) {
         wsSession.setMaxTextMessageBufferSize(Integer.MAX_VALUE);
         wsSession.setMaxBinaryMessageBufferSize(Integer.MAX_VALUE);
 
-        LSPWebServerSesssionProvider sessionProvider = new LSPWebServerSesssionProvider(webSession);
+        LSPWebServerSessionProvider sessionProvider = new LSPWebServerSessionProvider(webSession);
         DBLServer server = new DBLServer(sessionProvider);
-        var builder = new WebSocketLauncherBuilder<LanguageClient>();
-        builder.setSession(wsSession);
-        builder.setLocalService(server);
-        builder.setRemoteInterface(LanguageClient.class);
-        Launcher<LanguageClient> launcher = builder.create();
+        Launcher<LanguageClient> launcher = new WebSocketLauncherBuilder<LanguageClient>()
+            .setSession(wsSession)
+            .setLocalService(server)
+            .setRemoteInterface(LanguageClient.class)
+            .create();
         server.connect(launcher.getRemoteProxy());
     }
 

webapp/packages/core-connections/src/ConnectionDialectResource.ts

@@ -12,7 +12,6 @@ import { CachedMapAllKey, CachedMapResource, type ResourceKey, resourceKeyList,
 import { GraphQLService, type SqlDialectInfo } from '@cloudbeaver/core-sdk';
 
 import type { IConnectionInfoParams } from './CONNECTION_INFO_PARAM_SCHEMA.js';
-import type { IConnectionExecutionContextInfo } from './ConnectionExecutionContext/ConnectionExecutionContextResource.js';
 import {
   ConnectionInfoActiveProjectKey,
   ConnectionInfoProjectKey,
@@ -42,17 +41,6 @@ export class ConnectionDialectResource extends CachedMapResource<IConnectionInfo
     this.before(ExecutorInterrupter.interrupter(key => !connectionInfoResource.isConnected(key)));
   }
 
-  async formatScript(context: IConnectionExecutionContextInfo, query: string): Promise<string> {
-    const result = await this.graphQLService.sdk.formatSqlQuery({
-      projectId: context.projectId,
-      connectionId: context.connectionId,
-      contextId: context.id,
-      query,
-    });
-
-    return result.query;
-  }
-
   protected async loader(
     originalKey: ResourceKey<IConnectionInfoParams>,
     includes: string[],

webapp/packages/plugin-codemirror6/package.json

@@ -35,6 +35,7 @@
     "@codemirror/lang-sql": "^6",
     "@codemirror/lang-xml": "^6",
     "@codemirror/language": "^6",
+    "@codemirror/lsp-client": "^6",
     "@codemirror/merge": "^6",
     "@codemirror/search": "^6",
     "@codemirror/state": "^6",

webapp/packages/plugin-codemirror6/src/index.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -9,7 +9,7 @@
 import './module.js';
 import { createLazyLoader } from '@cloudbeaver/core-blocks';
 
 export * from './ReactCodemirrorPanel.js';
 export * from './EditorLoader.js';
 export * from './IEditorProps.js';
 export * from './IEditorRef.js';
@@ -24,6 +24,7 @@
 export * from '@codemirror/view';
 export * from '@codemirror/state';
 export * from '@codemirror/autocomplete';
+export * from '@codemirror/lsp-client';
 export * from './highlightNewLine.js';
 
 export { html as HTML_EDITOR } from '@codemirror/lang-html';

webapp/packages/plugin-set-common/package.json

@@ -110,6 +110,7 @@
     "@cloudbeaver/plugin-settings-panel": "workspace:*",
     "@cloudbeaver/plugin-sql-async-task-confirmation": "workspace:^",
     "@cloudbeaver/plugin-sql-editor": "workspace:*",
+    "@cloudbeaver/plugin-sql-editor-codemirror": "workspace:*",
     "@cloudbeaver/plugin-sql-editor-navigation-tab": "workspace:*",
     "@cloudbeaver/plugin-sql-editor-navigation-tab-script": "workspace:*",
     "@cloudbeaver/plugin-sql-editor-new": "workspace:*",

webapp/packages/plugin-set-common/src/index.ts

@@ -90,6 +90,7 @@ import pluginSettingsPanel from '@cloudbeaver/plugin-settings-panel/module';
 import pluginSqlEditor from '@cloudbeaver/plugin-sql-editor/module';
 import pluginSqlEditorNavigationTab from '@cloudbeaver/plugin-sql-editor-navigation-tab/module';
 import pluginSqlEditorNavigationTabScript from '@cloudbeaver/plugin-sql-editor-navigation-tab-script/module';
+import pluginSqlEditorCodemirror from '@cloudbeaver/plugin-sql-editor-codemirror/module';
 import pluginSqlEditorNew from '@cloudbeaver/plugin-sql-editor-new/module';
 import pluginSqlEditorScreen from '@cloudbeaver/plugin-sql-editor-screen/module';
 import pluginSqlGenerator from '@cloudbeaver/plugin-sql-generator/module';
@@ -175,6 +176,7 @@ export const commonSet = [
   pluginSqlEditorNavigationTab,
   pluginSqlEditorScreen,
   pluginSqlEditorNew,
+  pluginSqlEditorCodemirror,
   pluginSqlGenerator,
   pluginUserProfile,
   pluginUserProfileAdministration,

webapp/packages/plugin-set-common/tsconfig.json

@@ -274,6 +274,9 @@
     {
       "path": "../plugin-sql-editor"
     },
+    {
+      "path": "../plugin-sql-editor-codemirror"
+    },
     {
       "path": "../plugin-sql-editor-navigation-tab"
     },

webapp/packages/plugin-sql-editor-codemirror/package.json

@@ -23,7 +23,9 @@
   },
   "dependencies": {
     "@cloudbeaver/core-blocks": "workspace:*",
+    "@cloudbeaver/core-di": "workspace:*",
     "@cloudbeaver/core-sdk": "workspace:*",
+    "@cloudbeaver/core-utils": "workspace:*",
     "@cloudbeaver/plugin-codemirror6": "workspace:*",
     "mobx": "^6",
     "mobx-react-lite": "^4",

webapp/packages/plugin-sql-editor-codemirror/src/LSPConnectionService.ts

@@ -0,0 +1,183 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { injectable } from '@cloudbeaver/core-di';
+import { GlobalConstants } from '@cloudbeaver/core-utils';
+import { type Transport, LSPClient, languageServerExtensions } from '@cloudbeaver/plugin-codemirror6';
+
+const LSP_ENDPOINT = 'ws/lsp';
+const RECONNECT_BASE_DELAY = 1000;
+const MAX_RECONNECT_ATTEMPTS = 5;
+
+interface IReconnectingTransport extends Transport {
+  dispose(): void;
+}
+
+interface ILSPPosition {
+  line: number;
+  character: number;
+}
+
+interface ILSPTextEdit {
+  range: { start: ILSPPosition; end: ILSPPosition };
+  newText: string;
+}
+
+interface IDocumentFormattingParams {
+  textDocument: { uri: string };
+  options: { tabSize: number; insertSpaces: boolean };
+}
+
+function createReconnectingTransport(uri: string): { ready: Promise<IReconnectingTransport>; dispose(): void } {
+  let handlers: ((value: string) => void)[] = [];
+  let sock: WebSocket | null = null;
+  let reconnectAttempts = 0;
+  let reconnectTimeout: ReturnType<typeof setTimeout> | null = null;
+  let disposed = false;
+  let connected = false;
+
+  const { promise: ready, resolve: resolveReady, reject: rejectReady } = Promise.withResolvers<IReconnectingTransport>();
+
+  const transport: IReconnectingTransport = {
+    send(message: string) {
+      if (sock?.readyState === WebSocket.OPEN) {
+        sock.send(message);
+      }
+    },
+    subscribe(handler) {
+      handlers.push(handler);
+    },
+    unsubscribe(handler) {
+      handlers = handlers.filter(h => h !== handler);
+    },
+    dispose() {
+      disposed = true;
+
+      if (reconnectTimeout !== null) {
+        clearTimeout(reconnectTimeout);
+      }
+
+      if (sock) {
+        sock.onopen = null;
+        sock.onmessage = null;
+        sock.onclose = null;
+        sock.onerror = null;
+        sock.close();
+        sock = null;
+      }
+
+      handlers = [];
+    },
+  };
+
+  function connect() {
+    if (disposed) {
+      return;
+    }
+
+    sock = new WebSocket(uri);
+
+    sock.onopen = () => {
+      reconnectAttempts = 0;
+
+      if (!connected) {
+        connected = true;
+        resolveReady(transport);
+      }
+    };
+
+    sock.onmessage = e => {
+      handlers.forEach(h => h(e.data as string));
+    };
+
+    sock.onclose = () => {
+      if (disposed) {
+        return;
+      }
+
+      if (reconnectAttempts < MAX_RECONNECT_ATTEMPTS) {
+        reconnectAttempts++;
+        const delay = RECONNECT_BASE_DELAY * 2 ** (reconnectAttempts - 1);
+        console.warn(`[LSP] WebSocket closed, reconnecting in ${delay}ms (${reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS})...`);
+        reconnectTimeout = setTimeout(connect, delay);
+      } else {
+        console.error('[LSP] Max reconnect attempts reached');
+        rejectReady(new Error('LSP WebSocket connection failed after max reconnect attempts'));
+      }
+    };
+
+    sock.onerror = e => {
+      console.error('[LSP] WebSocket error:', e);
+    };
+  }
+
+  connect();
+
+  return { ready, dispose: transport.dispose };
+}
+
+@injectable()
+export class LSPConnectionService {
+  private client: LSPClient | null = null;
+  private disposeTransport: (() => void) | null = null;
+  private refCount = 0;
+
+  acquire(): LSPClient {
+    if (!this.client) {
+      this.client = new LSPClient({
+        extensions: languageServerExtensions(),
+      });
+
+      const url = GlobalConstants.absoluteServiceWSUrl(LSP_ENDPOINT);
+      const { ready, dispose } = createReconnectingTransport(url);
+      this.disposeTransport = dispose;
+
+      ready
+        .then(transport => {
+          if (this.client) {
+            this.client.connect(transport);
+          }
+        })
+        .catch(error => {
+          console.error(error);
+        });
+    }
+
+    this.refCount++;
+    return this.client;
+  }
+
+  async formatDocument(documentUri: string): Promise<string | null> {
+    if (!this.client) {
+      return null;
+    }
+
+    this.client.sync();
+
+    const result = await this.client.request<IDocumentFormattingParams, ILSPTextEdit[] | null>('textDocument/formatting', {
+      textDocument: { uri: documentUri },
+      options: { tabSize: 4, insertSpaces: true },
+    });
+
+    if (!result?.length) {
+      return null;
+    }
+
+    return result[0]!.newText;
+  }
+
+  release(): void {
+    this.refCount--;
+
+    if (this.refCount <= 0) {
+      this.client = null;
+      this.refCount = 0;
+      this.disposeTransport?.();
+      this.disposeTransport = null;
+    }
+  }
+}

webapp/packages/plugin-sql-editor-codemirror/src/index.ts

@@ -9,5 +9,7 @@
 export * from './SQLCodeEditor/SQLCodeEditorLoader.js';
 export * from './SQLCodeEditor/useSQLCodeEditor.js';
 export * from './useSqlDialectExtension.js';
+export * from './useLSPExtension.js';
+export * from './LSPConnectionService.js';
 export * from './ACTIVE_QUERY_EXTENSION.js';
 export * from './QUERY_STATUS_GUTTER_EXTENSION.js';

webapp/packages/plugin-sql-editor-codemirror/src/module.ts

@@ -0,0 +1,18 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { ModuleRegistry } from '@cloudbeaver/core-di';
+
+import { LSPConnectionService } from './LSPConnectionService.js';
+
+export default ModuleRegistry.add({
+  name: '@cloudbeaver/plugin-sql-editor-codemirror',
+
+  configure: serviceCollection => {
+    serviceCollection.addSingleton(LSPConnectionService);
+  },
+});

webapp/packages/plugin-sql-editor-codemirror/src/useLSPExtension.ts

@@ -0,0 +1,45 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { useEffect, useMemo } from 'react';
+
+import { createLazyLoader, useLazyImport } from '@cloudbeaver/core-blocks';
+import { useService } from '@cloudbeaver/core-di';
+import { type Compartment, type Extension } from '@cloudbeaver/plugin-codemirror6';
+
+import { LSPConnectionService } from './LSPConnectionService.js';
+
+const codemirrorPluginLoader = createLazyLoader(() => import('@cloudbeaver/plugin-codemirror6'));
+
+export interface ILSPExtensionOptions {
+  documentUri: string | null | undefined;
+}
+
+export function useLSPExtension(options: ILSPExtensionOptions): [Compartment, Extension] | null {
+  const { documentUri } = options;
+  const codemirror = useLazyImport(codemirrorPluginLoader);
+  const lspConnectionService = useService(LSPConnectionService);
+
+  const LSP_COMPARTMENT = useMemo(() => {
+    if (!codemirror) {
+      return null;
+    }
+    return new codemirror.Compartment();
+  }, [codemirror]);
+
+  const client = useMemo(() => lspConnectionService.acquire(), [lspConnectionService]);
+
+  useEffect(() => () => lspConnectionService.release(), [lspConnectionService]);
+
+  return useMemo(() => {
+    if (!LSP_COMPARTMENT || !client || !codemirror || !documentUri) {
+      return null;
+    }
+
+    return [LSP_COMPARTMENT, client.plugin(documentUri)];
+  }, [LSP_COMPARTMENT, client, codemirror, documentUri]);
+}