Move client capabilities to features

krassowski · krassowski · commit b29f9e02f076 · 2021-12-31T03:05:07.000Z
diff --git a/packages/jupyterlab-lsp/src/adapters/adapter.ts b/packages/jupyterlab-lsp/src/adapters/adapter.ts
@@ -6,6 +6,7 @@ import { ILogPayload } from '@jupyterlab/logconsole';
 import { nullTranslator, TranslationBundle } from '@jupyterlab/translation';
 import { JSONObject } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
+import mergeWith from 'lodash.mergewith';
 
 import { ICommandContext } from '../command_manager';
 import { LSPConnection } from '../connection';
@@ -17,7 +18,7 @@ import {
 import { EditorAdapter } from '../editor_integration/editor_adapter';
 import { IFeature, IFeatureEditorIntegration } from '../feature';
 import { ILSPExtension, ILSPLogConsole } from '../index';
-import { LanguageIdentifier } from '../lsp';
+import { ClientCapabilities, LanguageIdentifier } from '../lsp';
 import { IRootPosition, IVirtualPosition } from '../positioning';
 import { IForeignContext, VirtualDocument } from '../virtual/document';
 import { IVirtualEditor } from '../virtual/editor';
@@ -632,7 +633,31 @@ export abstract class WidgetAdapter<T extends IDocumentWidget> {
 
     this.console.log(`will connect using language: ${language}`);
 
+    let capabilities: ClientCapabilities = {
+      textDocument: {
+        synchronization: {
+          dynamicRegistration: true,
+          willSave: false,
+          didSave: true,
+          willSaveWaitUntil: false
+        }
+      },
+      workspace: {
+        didChangeConfiguration: {
+          dynamicRegistration: true
+        }
+      }
+    };
+
+    for (const feature of this.extension.feature_manager.features) {
+      if (!feature.capabilities) {
+        continue;
+      }
+      capabilities = mergeWith(capabilities, feature.capabilities);
+    }
+
     let options: ISocketConnectionOptions = {
+      capabilities,
       virtual_document,
       language,
       document_path: this.document_path
diff --git a/packages/jupyterlab-lsp/src/connection.ts b/packages/jupyterlab-lsp/src/connection.ts
@@ -19,11 +19,12 @@ import type * as rpc from 'vscode-jsonrpc';
 import type * as lsp from 'vscode-languageserver-protocol';
 import type { MessageConnection } from 'vscode-ws-jsonrpc';
 
-import { CompletionItemTag, DiagnosticTag } from './lsp';
+import { ClientCapabilities } from './lsp';
 import { ILSPLogConsole } from './tokens';
 import { until_ready } from './utils';
 
 interface ILSPOptions extends ILspOptions {
+  capabilities: ClientCapabilities;
   serverIdentifier?: string;
   console: ILSPLogConsole;
 }
@@ -336,6 +337,7 @@ export class LSPConnection extends LspWsConnection {
   public clientRequests: ClientRequests;
   public serverRequests: ServerRequests;
   protected console: ILSPLogConsole;
+  private _options: ILSPOptions;
   public logAllCommunication: boolean;
 
   public log(kind: MessageKind, message: IMessageLog) {
@@ -379,6 +381,7 @@ export class LSPConnection extends LspWsConnection {
 
   constructor(options: ILSPOptions) {
     super(options);
+    this._options = options;
     this.logAllCommunication = false;
     this.serverIdentifier = options.serverIdentifier;
     this.console = options.console.scope(this.serverIdentifier + ' connection');
@@ -400,66 +403,10 @@ export class LSPConnection extends LspWsConnection {
   protected initializeParams(): lsp.InitializeParams {
     return {
       ...super.initializeParams(),
-      capabilities: {
-        textDocument: {
-          hover: {
-            dynamicRegistration: true,
-            contentFormat: ['markdown', 'plaintext']
-          },
-          synchronization: {
-            dynamicRegistration: true,
-            willSave: false,
-            didSave: true,
-            willSaveWaitUntil: false
-          },
-          completion: {
-            dynamicRegistration: true,
-            completionItem: {
-              snippetSupport: false,
-              commitCharactersSupport: true,
-              documentationFormat: ['markdown', 'plaintext'],
-              deprecatedSupport: true,
-              preselectSupport: false,
-              tagSupport: {
-                valueSet: [CompletionItemTag.Deprecated]
-              }
-            },
-            contextSupport: false
-          },
-          publishDiagnostics: {
-            tagSupport: {
-              valueSet: [DiagnosticTag.Deprecated, DiagnosticTag.Unnecessary]
-            }
-          },
-          signatureHelp: {
-            dynamicRegistration: true,
-            signatureInformation: {
-              documentationFormat: ['markdown', 'plaintext']
-            }
-          },
-          declaration: {
-            dynamicRegistration: true,
-            linkSupport: true
-          },
-          definition: {
-            dynamicRegistration: true,
-            linkSupport: true
-          },
-          typeDefinition: {
-            dynamicRegistration: true,
-            linkSupport: true
-          },
-          implementation: {
-            dynamicRegistration: true,
-            linkSupport: true
-          }
-        } as lsp.TextDocumentClientCapabilities,
-        workspace: {
-          didChangeConfiguration: {
-            dynamicRegistration: true
-          }
-        } as lsp.WorkspaceClientCapabilities
-      } as lsp.ClientCapabilities,
+      // TODO: remove as `lsp.ClientCapabilities` after upgrading to 3.17
+      // which should finally include a fix for moniker issue:
+      // https://github.com/microsoft/vscode-languageserver-node/pull/720
+      capabilities: this._options.capabilities as lsp.ClientCapabilities,
       initializationOptions: null,
       processId: null,
       workspaceFolders: null
diff --git a/packages/jupyterlab-lsp/src/connection_manager.ts b/packages/jupyterlab-lsp/src/connection_manager.ts
@@ -4,6 +4,7 @@ import type * as protocol from 'vscode-languageserver-protocol';
 
 import { AskServersToSendTraceNotifications } from './_plugin';
 import type * as ConnectionModuleType from './connection';
+import { ClientCapabilities } from './lsp';
 import {
   ILSPLogConsole,
   ILanguageServerManager,
@@ -29,6 +30,10 @@ export interface ISocketConnectionOptions {
    * Path to the document in the JupyterLab space
    */
   document_path: string;
+  /**
+   * LSP capabilities describing currently supported features
+   */
+  capabilities: ClientCapabilities;
 }
 
 /**
@@ -127,7 +132,7 @@ export class DocumentConnectionManager {
     options: ISocketConnectionOptions
   ): Promise<ConnectionModuleType.LSPConnection> {
     this.console.log('Connection Socket', options);
-    let { virtual_document, language } = options;
+    let { virtual_document, language, capabilities } = options;
 
     this.connect_document_signals(virtual_document);
 
@@ -153,7 +158,8 @@ export class DocumentConnectionManager {
       language_server_id!,
       uris,
       this.on_new_connection,
-      this.console
+      this.console,
+      capabilities
     );
 
     // if connecting for the first time, all documents subsequent documents will
@@ -469,7 +475,8 @@ namespace Private {
     language_server_id: TLanguageServerId,
     uris: DocumentConnectionManager.IURIs,
     onCreate: (connection: ConnectionModuleType.LSPConnection) => void,
-    console: ILSPLogConsole
+    console: ILSPLogConsole,
+    capabilities: ClientCapabilities
   ): Promise<ConnectionModuleType.LSPConnection> {
     if (_promise == null) {
       // TODO: consider lazy-loading _only_ the modules that _must_ be webpacked
@@ -489,7 +496,8 @@ namespace Private {
         serverUri: uris.server,
         rootUri: uris.base,
         serverIdentifier: language_server_id,
-        console: console
+        console: console,
+        capabilities: capabilities
       });
       // TODO: remove remaining unbounded users of connection.on
       connection.setMaxListeners(999);
diff --git a/packages/jupyterlab-lsp/src/editor_integration/testutils.ts b/packages/jupyterlab-lsp/src/editor_integration/testutils.ts
@@ -258,7 +258,8 @@ function FeatureSupport<TBase extends TestEnvironmentConstructor>(Base: TBase) {
         serverUri: 'ws://localhost:8080',
         rootUri: 'file:///unit-test',
         serverIdentifier: DEFAULT_SERVER_ID,
-        console: new BrowserConsole()
+        console: new BrowserConsole(),
+        capabilities: {}
       });
     }
 
diff --git a/packages/jupyterlab-lsp/src/feature.ts b/packages/jupyterlab-lsp/src/feature.ts
@@ -8,6 +8,7 @@ import { Signal } from '@lumino/signaling';
 import { StatusMessage, WidgetAdapter } from './adapters/adapter';
 import { CommandEntryPoint, ICommandContext } from './command_manager';
 import { LSPConnection } from './connection';
+import { ClientCapabilities } from './lsp';
 import { IRootPosition } from './positioning';
 import { VirtualDocument } from './virtual/document';
 import { IEditorChange, IVirtualEditor } from './virtual/editor';
@@ -123,6 +124,10 @@ export interface IFeature {
     IEditorName,
     IFeatureEditorIntegrationConstructor<IVirtualEditor<IEditor>>
   >;
+  /**
+   * LSP capabilities implemented by the feature.
+   */
+  capabilities?: ClientCapabilities;
   /**
    * Command specification, including context menu placement options.
    */
diff --git a/packages/jupyterlab-lsp/src/features/completion/index.ts b/packages/jupyterlab-lsp/src/features/completion/index.ts
@@ -11,6 +11,7 @@ import { ILSPCompletionThemeManager } from '@krassowski/completion-theme/lib/typ
 import completionSvg from '../../../style/icons/completion.svg';
 import { CodeCompletion as LSPCompletionSettings } from '../../_completion';
 import { FeatureSettings } from '../../feature';
+import { CompletionItemTag } from '../../lsp';
 import {
   ILSPAdapterManager,
   ILSPFeatureManager,
@@ -66,7 +67,25 @@ export const COMPLETION_PLUGIN: JupyterFrontEndPlugin<void> = {
         id: FEATURE_ID,
         name: 'LSP Completion',
         labIntegration: labIntegration,
-        settings: settings
+        settings: settings,
+        capabilities: {
+          textDocument: {
+            completion: {
+              dynamicRegistration: true,
+              completionItem: {
+                snippetSupport: false,
+                commitCharactersSupport: true,
+                documentationFormat: ['markdown', 'plaintext'],
+                deprecatedSupport: true,
+                preselectSupport: false,
+                tagSupport: {
+                  valueSet: [CompletionItemTag.Deprecated]
+                }
+              },
+              contextSupport: false
+            }
+          }
+        }
       }
     });
   }
diff --git a/packages/jupyterlab-lsp/src/features/diagnostics/index.ts b/packages/jupyterlab-lsp/src/features/diagnostics/index.ts
@@ -6,6 +6,7 @@ import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ITranslator, TranslationBundle } from '@jupyterlab/translation';
 
 import { FeatureSettings, IFeatureCommand } from '../../feature';
+import { DiagnosticTag } from '../../lsp';
 import { ILSPFeatureManager, PLUGIN_ID } from '../../tokens';
 
 import {
@@ -65,6 +66,15 @@ export const DIAGNOSTICS_PLUGIN: JupyterFrontEndPlugin<void> = {
           ['CodeMirrorEditor', DiagnosticsCM]
         ]),
         id: FEATURE_ID,
+        capabilities: {
+          textDocument: {
+            publishDiagnostics: {
+              tagSupport: {
+                valueSet: [DiagnosticTag.Deprecated, DiagnosticTag.Unnecessary]
+              }
+            }
+          }
+        },
         name: 'LSP Diagnostics',
         settings: settings,
         commands: COMMANDS(trans)
diff --git a/packages/jupyterlab-lsp/src/features/hover.ts b/packages/jupyterlab-lsp/src/features/hover.ts
@@ -611,7 +611,15 @@ export const HOVER_PLUGIN: JupyterFrontEndPlugin<void> = {
         id: FEATURE_ID,
         name: 'LSP Hover tooltip',
         labIntegration: labIntegration,
-        settings: settings
+        settings: settings,
+        capabilities: {
+          textDocument: {
+            hover: {
+              dynamicRegistration: true,
+              contentFormat: ['markdown', 'plaintext']
+            }
+          }
+        }
       }
     });
   }
diff --git a/packages/jupyterlab-lsp/src/features/jump_to.ts b/packages/jupyterlab-lsp/src/features/jump_to.ts
@@ -340,7 +340,27 @@ export const JUMP_PLUGIN: JupyterFrontEndPlugin<void> = {
         id: FEATURE_ID,
         name: 'Jump to definition',
         labIntegration: labIntegration,
-        settings: settings
+        settings: settings,
+        capabilities: {
+          textDocument: {
+            declaration: {
+              dynamicRegistration: true,
+              linkSupport: true
+            },
+            definition: {
+              dynamicRegistration: true,
+              linkSupport: true
+            },
+            typeDefinition: {
+              dynamicRegistration: true,
+              linkSupport: true
+            },
+            implementation: {
+              dynamicRegistration: true,
+              linkSupport: true
+            }
+          }
+        }
       }
     });
   }
diff --git a/packages/jupyterlab-lsp/src/features/signature.ts b/packages/jupyterlab-lsp/src/features/signature.ts
@@ -488,7 +488,17 @@ export const SIGNATURE_PLUGIN: JupyterFrontEndPlugin<void> = {
         id: FEATURE_ID,
         name: 'LSP Function signature',
         labIntegration: labIntegration,
-        settings: settings
+        settings: settings,
+        capabilities: {
+          textDocument: {
+            signatureHelp: {
+              dynamicRegistration: true,
+              signatureInformation: {
+                documentationFormat: ['markdown', 'plaintext']
+              }
+            }
+          }
+        }
       }
     });
   }
diff --git a/packages/jupyterlab-lsp/src/lsp.ts b/packages/jupyterlab-lsp/src/lsp.ts
@@ -1,3 +1,11 @@
+import type * as lsp from 'vscode-languageserver-protocol';
+
+/** Workaround to silence a bug in https://github.com/microsoft/vscode-languageserver-node/pull/720 */
+export type ClientCapabilities = Omit<
+  lsp.ClientCapabilities,
+  'textDocument'
+> & { textDocument?: Omit<lsp.TextDocumentClientCapabilities, 'moniker'> };
+
 export enum DiagnosticSeverity {
   Error = 1,
   Warning = 2,

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,8 @@ function FeatureSupport<TBase extends TestEnvironmentConstructor>(Base: TBase) {`
`258`	`258`	`serverUri: 'ws://localhost:8080',`
`259`	`259`	`rootUri: 'file:///unit-test',`
`260`	`260`	`serverIdentifier: DEFAULT_SERVER_ID,`
`261`		`- console: new BrowserConsole()`
	`261`	`+ console: new BrowserConsole(),`
	`262`	`+ capabilities: {}`
`262`	`263`	`});`
`263`	`264`	`}`
`264`	`265`