Fix registration options, diagnostics (one slot!), migrate hover

Author: krassowski

packages/jupyterlab-lsp/src/connection.ts

@@ -11,6 +11,10 @@ import {
   IPosition,
   LspWsConnection
 } from 'lsp-ws-connection';
+import {
+  registerServerCapability,
+  unregisterServerCapability
+} from 'lsp-ws-connection/lib/server-capability-registration';
 import type * as rpc from 'vscode-jsonrpc';
 import type * as lsp from 'vscode-languageserver-protocol';
 import type { MessageConnection } from 'vscode-ws-jsonrpc';
@@ -196,7 +200,7 @@ class ServerRequestHandler<
     protected emitter: LSPConnection
   ) {
     // on request accepts "thenable"
-    this.connection.onRequest(method, this.handle);
+    this.connection.onRequest(method, this.handle.bind(this));
     this._handler = null;
   }
 
@@ -319,12 +323,21 @@ export class LSPConnection extends LspWsConnection {
     }
   }
 
+  sendInitialize() {
+    super.sendInitialize();
+  }
+
   protected onServerInitialized(params: lsp.InitializeResult) {
     super.onServerInitialized(params);
     while (this.documentsToOpen.length) {
       this.sendOpen(this.documentsToOpen.pop());
     }
+    // TODO: move to send Initialize after disabling overwrites in ws-connection
+    //  or maybe move the code there? How to handle logging without bringing in lumino signals?
+    this.afterInitialized();
+  }
 
+  protected afterInitialized() {
     for (const method of Object.values(
       Method.ServerNotification
     ) as (keyof ServerNotifications)[]) {
@@ -349,6 +362,40 @@ export class LSPConnection extends LspWsConnection {
     this.serverRequests = this.constructServerRequestHandler<ServerRequests>(
       Method.ServerRequests
     );
+
+    this.serverRequests['client/registerCapability'].setHandler(
+      async (params: lsp.RegistrationParams) => {
+        params.registrations.forEach(
+          (capabilityRegistration: lsp.Registration) => {
+            try {
+              this.serverCapabilities = registerServerCapability(
+                this.serverCapabilities,
+                capabilityRegistration
+              );
+            } catch (err) {
+              console.error(err);
+            }
+          }
+        );
+
+        // TODO log event
+      }
+    );
+
+    this.serverRequests['client/unregisterCapability'].setHandler(
+      async (params: lsp.UnregistrationParams) => {
+        params.unregisterations.forEach(
+          (capabilityUnregistration: lsp.Unregistration) => {
+            this.serverCapabilities = unregisterServerCapability(
+              this.serverCapabilities,
+              capabilityUnregistration
+            );
+          }
+        );
+
+        // TODO log event
+      }
+    );
   }
 
   public sendSelectiveChange(

packages/jupyterlab-lsp/src/features/diagnostics/diagnostics.spec.ts

@@ -77,7 +77,7 @@ describe('Diagnostics', () => {
       markers = env.ce_editor.editor.getDoc().getAllMarks();
       expect(markers.length).to.equal(0);
 
-      feature.handleDiagnostic({
+      feature.handleDiagnostic(null, {
         uri: env.document_options.path,
         diagnostics: diagnostics
       });
@@ -99,7 +99,7 @@ describe('Diagnostics', () => {
       env.ce_editor.model.value.text = text;
       await env.adapter.update_documents();
 
-      feature.handleDiagnostic({
+      feature.handleDiagnostic(null, {
         uri: env.document_options.path,
         diagnostics: diagnostics
       });
@@ -124,7 +124,7 @@ describe('Diagnostics', () => {
       env.ce_editor.model.value.text = text;
       await env.adapter.update_documents();
 
-      feature.handleDiagnostic({
+      feature.handleDiagnostic(null, {
         uri: env.document_options.path,
         diagnostics: diagnostics
       });
@@ -167,7 +167,7 @@ describe('Diagnostics', () => {
       let document = env.virtual_editor.virtual_document;
       let uri = env.virtual_editor.virtual_document.uri;
 
-      feature.handleDiagnostic({
+      feature.handleDiagnostic(null, {
         uri: uri,
         diagnostics: [
           {
@@ -285,7 +285,7 @@ describe('Diagnostics', () => {
       } as lsProtocol.PublishDiagnosticsParams;
 
       // test guards against wrongly propagated responses:
-      feature.handleDiagnostic(response);
+      feature.handleDiagnostic(null, response);
       let cm_editors = env.adapter.editors.map(
         ce_editor => (ce_editor as CodeMirrorEditor).editor
       );
@@ -297,7 +297,7 @@ describe('Diagnostics', () => {
       expect(marks_cell_2.length).to.equal(0);
 
       // correct propagation
-      foreign_feature.handleDiagnostic(response);
+      foreign_feature.handleDiagnostic(null, response);
 
       marks_cell_1 = cm_editors[0].getDoc().getAllMarks();
       marks_cell_2 = cm_editors[1].getDoc().getAllMarks();
@@ -314,7 +314,7 @@ describe('Diagnostics', () => {
       expect(is_equal(mark_position.to, { line: 2, ch: 1 })).to.be.true;
 
       // the silenced diagnostic for the %%python magic should be ignored
-      feature.handleDiagnostic({
+      feature.handleDiagnostic(null, {
         uri: document.uri,
         diagnostics: [
           {

packages/jupyterlab-lsp/src/features/diagnostics/diagnostics.ts

@@ -8,6 +8,7 @@ import type * as lsProtocol from 'vscode-languageserver-protocol';
 
 import diagnosticsSvg from '../../../style/icons/diagnostics.svg';
 import { CodeDiagnostics as LSPDiagnosticsSettings } from '../../_diagnostics';
+import { LSPConnection } from '../../connection';
 import { PositionConverter } from '../../converter';
 import { CodeMirrorIntegration } from '../../editor_integration/codemirror';
 import { FeatureSettings } from '../../feature';
@@ -288,7 +289,12 @@ export class DiagnosticsCM extends CodeMirrorIntegration {
   }
 
   register(): void {
-    this.connection_handlers.set('diagnostic', this.handleDiagnostic);
+    // this.connection_handlers.set('diagnostic', this.handleDiagnostic);
+    // TODO: unregister
+    this.connection.serverNotifications[
+      'textDocument/publishDiagnostics'
+    ].connect(this.handleDiagnostic);
+
     this.wrapper_handlers.set('focusin', this.switchDiagnosticsPanelSource);
     this.unique_editor_ids = new DefaultMap(() => this.unique_editor_ids.size);
     this.settings.changed.connect(this.refreshDiagnostics, this);
@@ -606,7 +612,10 @@ export class DiagnosticsCM extends CodeMirrorIntegration {
     this.diagnostics_db.set(this.virtual_document, diagnostics_list);
   }
 
-  public handleDiagnostic = (response: lsProtocol.PublishDiagnosticsParams) => {
+  public handleDiagnostic = (
+    connection: LSPConnection,
+    response: lsProtocol.PublishDiagnosticsParams
+  ) => {
     if (!uris_equal(response.uri, this.virtual_document.document_info.uri)) {
       return;
     }

packages/jupyterlab-lsp/src/features/hover.ts

@@ -218,12 +218,25 @@ export class HoverCM extends CodeMirrorIntegration {
   }
 
   protected on_hover = async () => {
-    return await this.connection.getHoverTooltip(
-      this.virtual_position,
-      // this might be wrong - should not it be using the specific virtual document?
-      this.virtual_document.document_info,
-      false
-    );
+    if (
+      !(
+        this.connection.isReady &&
+        this.connection.serverCapabilities?.hoverProvider
+      )
+    ) {
+      return;
+    }
+    let position = this.virtual_position;
+    return await this.connection.clientRequests['textDocument/hover'].request({
+      textDocument: {
+        // this might be wrong - should not it be using the specific virtual document?
+        uri: this.virtual_document.document_info.uri
+      },
+      position: {
+        line: position.line,
+        character: position.ch
+      }
+    });
   };
 
   protected static get_markup_for_hover(