@jupyterlab/lsp 4.0.5 → 4.0.6

package/lib/adapters/adapter.d.ts

@@ -151,8 +151,8 @@ export declare abstract class WidgetLSPAdapter<T extends IDocumentWidget> implem
     protected abstract createVirtualDocument(): VirtualDocument;
     /**
      * Get the index of editor from the cursor position in the virtual
-     * document. Since there is only one editor, this method always return
-     * 0
+     * document.
+     * @deprecated This is error-prone and will be removed in JupyterLab 5.0, use `getEditorIndex()` with `virtualDocument.getEditorAtVirtualLine(position)` instead.
      *
      * @param position - the position of cursor in the virtual document.
      * @return - index of the virtual editor

package/lib/tokens.d.ts

@@ -499,9 +499,11 @@ export declare namespace Method {
     }
     /** Client requests */
     enum ClientRequest {
+        CODE_ACTION = "textDocument/codeAction",
         COMPLETION = "textDocument/completion",
         COMPLETION_ITEM_RESOLVE = "completionItem/resolve",
         DEFINITION = "textDocument/definition",
+        DOCUMENT_COLOR = "textDocument/documentColor",
         DOCUMENT_HIGHLIGHT = "textDocument/documentHighlight",
         DOCUMENT_SYMBOL = "textDocument/documentSymbol",
         HOVER = "textDocument/hover",
@@ -510,7 +512,14 @@ export declare namespace Method {
         REFERENCES = "textDocument/references",
         RENAME = "textDocument/rename",
         SIGNATURE_HELP = "textDocument/signatureHelp",
-        TYPE_DEFINITION = "textDocument/typeDefinition"
+        TYPE_DEFINITION = "textDocument/typeDefinition",
+        LINKED_EDITING_RANGE = "textDocument/linkedEditingRange",
+        INLINE_VALUE = "textDocument/inlineValue",
+        INLAY_HINT = "textDocument/inlayHint",
+        WORKSPACE_SYMBOL = "workspace/symbol",
+        WORKSPACE_SYMBOL_RESOLVE = "workspaceSymbol/resolve",
+        FORMATTING = "textDocument/formatting",
+        RANGE_FORMATTING = "textDocument/rangeFormatting"
     }
 }
 /**
@@ -556,9 +565,11 @@ export interface IServerResult {
  * Interface describing the request sent to the client.
  */
 export interface IClientRequestParams {
+    [Method.ClientRequest.CODE_ACTION]: lsp.CodeActionParams;
     [Method.ClientRequest.COMPLETION_ITEM_RESOLVE]: lsp.CompletionItem;
     [Method.ClientRequest.COMPLETION]: lsp.CompletionParams;
     [Method.ClientRequest.DEFINITION]: lsp.TextDocumentPositionParams;
+    [Method.ClientRequest.DOCUMENT_COLOR]: lsp.DocumentColorParams;
     [Method.ClientRequest.DOCUMENT_HIGHLIGHT]: lsp.TextDocumentPositionParams;
     [Method.ClientRequest.DOCUMENT_SYMBOL]: lsp.DocumentSymbolParams;
     [Method.ClientRequest.HOVER]: lsp.TextDocumentPositionParams;
@@ -568,14 +579,22 @@ export interface IClientRequestParams {
     [Method.ClientRequest.RENAME]: lsp.RenameParams;
     [Method.ClientRequest.SIGNATURE_HELP]: lsp.TextDocumentPositionParams;
     [Method.ClientRequest.TYPE_DEFINITION]: lsp.TextDocumentPositionParams;
+    [Method.ClientRequest.INLINE_VALUE]: lsp.InlineValueParams;
+    [Method.ClientRequest.INLAY_HINT]: lsp.InlayHintParams;
+    [Method.ClientRequest.WORKSPACE_SYMBOL]: lsp.WorkspaceSymbolParams;
+    [Method.ClientRequest.WORKSPACE_SYMBOL_RESOLVE]: lsp.WorkspaceSymbol;
+    [Method.ClientRequest.FORMATTING]: lsp.DocumentFormattingParams;
+    [Method.ClientRequest.RANGE_FORMATTING]: lsp.DocumentRangeFormattingParams;
 }
 /**
  * Interface describing the responses received from the client.
  */
 export interface IClientResult {
+    [Method.ClientRequest.CODE_ACTION]: (lsp.Command | lsp.CodeAction)[] | null;
     [Method.ClientRequest.COMPLETION_ITEM_RESOLVE]: lsp.CompletionItem;
     [Method.ClientRequest.COMPLETION]: AnyCompletion;
     [Method.ClientRequest.DEFINITION]: AnyLocation;
+    [Method.ClientRequest.DOCUMENT_COLOR]: lsp.ColorInformation[];
     [Method.ClientRequest.DOCUMENT_HIGHLIGHT]: lsp.DocumentHighlight[];
     [Method.ClientRequest.DOCUMENT_SYMBOL]: lsp.DocumentSymbol[];
     [Method.ClientRequest.HOVER]: lsp.Hover | null;
@@ -585,6 +604,12 @@ export interface IClientResult {
     [Method.ClientRequest.RENAME]: lsp.WorkspaceEdit;
     [Method.ClientRequest.SIGNATURE_HELP]: lsp.SignatureHelp;
     [Method.ClientRequest.TYPE_DEFINITION]: AnyLocation;
+    [Method.ClientRequest.INLINE_VALUE]: lsp.InlineValue[] | null;
+    [Method.ClientRequest.INLAY_HINT]: lsp.InlayHint[] | null;
+    [Method.ClientRequest.WORKSPACE_SYMBOL]: lsp.SymbolInformation[] | lsp.WorkspaceSymbol[] | null;
+    [Method.ClientRequest.WORKSPACE_SYMBOL_RESOLVE]: lsp.WorkspaceSymbol[];
+    [Method.ClientRequest.FORMATTING]: lsp.TextEdit[] | null;
+    [Method.ClientRequest.RANGE_FORMATTING]: lsp.TextEdit[] | null;
 }
 /**
  * Type of server notification handlers, it is a map between the server

package/lib/tokens.js

@@ -69,9 +69,11 @@ export var Method;
     /** Client requests */
     let ClientRequest;
     (function (ClientRequest) {
+        ClientRequest["CODE_ACTION"] = "textDocument/codeAction";
         ClientRequest["COMPLETION"] = "textDocument/completion";
         ClientRequest["COMPLETION_ITEM_RESOLVE"] = "completionItem/resolve";
         ClientRequest["DEFINITION"] = "textDocument/definition";
+        ClientRequest["DOCUMENT_COLOR"] = "textDocument/documentColor";
         ClientRequest["DOCUMENT_HIGHLIGHT"] = "textDocument/documentHighlight";
         ClientRequest["DOCUMENT_SYMBOL"] = "textDocument/documentSymbol";
         ClientRequest["HOVER"] = "textDocument/hover";
@@ -81,6 +83,13 @@ export var Method;
         ClientRequest["RENAME"] = "textDocument/rename";
         ClientRequest["SIGNATURE_HELP"] = "textDocument/signatureHelp";
         ClientRequest["TYPE_DEFINITION"] = "textDocument/typeDefinition";
+        ClientRequest["LINKED_EDITING_RANGE"] = "textDocument/linkedEditingRange";
+        ClientRequest["INLINE_VALUE"] = "textDocument/inlineValue";
+        ClientRequest["INLAY_HINT"] = "textDocument/inlayHint";
+        ClientRequest["WORKSPACE_SYMBOL"] = "workspace/symbol";
+        ClientRequest["WORKSPACE_SYMBOL_RESOLVE"] = "workspaceSymbol/resolve";
+        ClientRequest["FORMATTING"] = "textDocument/formatting";
+        ClientRequest["RANGE_FORMATTING"] = "textDocument/rangeFormatting";
     })(ClientRequest = Method.ClientRequest || (Method.ClientRequest = {}));
 })(Method || (Method = {}));
 //# sourceMappingURL=tokens.js.map

package/lib/tokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAI3D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAoQ1C,MAAM,KAAW,sBAAsB,CA0CtC;AA1CD,WAAiB,sBAAsB;IACrC;;OAEG;IACU,6BAAM,GAAG,KAAK,CAAC;AAsC9B,CAAC,EA1CgB,sBAAsB,KAAtB,sBAAsB,QA0CtC;AAsPD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,6BAA6B,GACxC,IAAI,KAAK,CACP,+CAA+C,EAC/C,yEAAyE,CAC1E,CAAC;AAEJ;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,KAAK,CACzC,oCAAoC,EACpC,2GAA2G,CAC5G,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,KAAK,CAChD,2CAA2C,EAC3C,sLAAsL,CACvL,CAAC;AAiBF;;;GAGG;AACH,MAAM,KAAW,MAAM,CA0CtB;AA1CD,WAAiB,MAAM;IACrB,2BAA2B;IAC3B,IAAY,kBAKX;IALD,WAAY,kBAAkB;QAC5B,6EAAuD,CAAA;QACvD,yDAAmC,CAAA;QACnC,8CAAwB,CAAA;QACxB,uDAAiC,CAAA;IACnC,CAAC,EALW,kBAAkB,GAAlB,yBAAkB,KAAlB,yBAAkB,QAK7B;IAED,2BAA2B;IAC3B,IAAY,kBAOX;IAPD,WAAY,kBAAkB;QAC5B,2DAAqC,CAAA;QACrC,mFAA6D,CAAA;QAC7D,uDAAiC,CAAA;QACjC,uDAAiC,CAAA;QACjC,iDAA2B,CAAA;QAC3B,8CAAwB,CAAA;IAC1B,CAAC,EAPW,kBAAkB,GAAlB,yBAAkB,KAAlB,yBAAkB,QAO7B;IAED,sBAAsB;IACtB,IAAY,aAKX;IALD,WAAY,aAAa;QACvB,kEAAiD,CAAA;QACjD,mEAAkD,CAAA;QAClD,sEAAqD,CAAA;QACrD,oEAAmD,CAAA;IACrD,CAAC,EALW,aAAa,GAAb,oBAAa,KAAb,oBAAa,QAKxB;IAED,sBAAsB;IACtB,IAAY,aAaX;IAbD,WAAY,aAAa;QACvB,uDAAsC,CAAA;QACtC,mEAAkD,CAAA;QAClD,uDAAsC,CAAA;QACtC,sEAAqD,CAAA;QACrD,gEAA+C,CAAA;QAC/C,6CAA4B,CAAA;QAC5B,+DAA8C,CAAA;QAC9C,0CAAyB,CAAA;QACzB,uDAAsC,CAAA;QACtC,+CAA8B,CAAA;QAC9B,8DAA6C,CAAA;QAC7C,gEAA+C,CAAA;IACjD,CAAC,EAbW,aAAa,GAAb,oBAAa,KAAb,oBAAa,QAaxB;AACH,CAAC,EA1CgB,MAAM,KAAN,MAAM,QA0CtB"}
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAI3D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAoQ1C,MAAM,KAAW,sBAAsB,CA0CtC;AA1CD,WAAiB,sBAAsB;IACrC;;OAEG;IACU,6BAAM,GAAG,KAAK,CAAC;AAsC9B,CAAC,EA1CgB,sBAAsB,KAAtB,sBAAsB,QA0CtC;AAsPD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,6BAA6B,GACxC,IAAI,KAAK,CACP,+CAA+C,EAC/C,yEAAyE,CAC1E,CAAC;AAEJ;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,KAAK,CACzC,oCAAoC,EACpC,2GAA2G,CAC5G,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,KAAK,CAChD,2CAA2C,EAC3C,sLAAsL,CACvL,CAAC;AAiBF;;;GAGG;AACH,MAAM,KAAW,MAAM,CAmDtB;AAnDD,WAAiB,MAAM;IACrB,2BAA2B;IAC3B,IAAY,kBAKX;IALD,WAAY,kBAAkB;QAC5B,6EAAuD,CAAA;QACvD,yDAAmC,CAAA;QACnC,8CAAwB,CAAA;QACxB,uDAAiC,CAAA;IACnC,CAAC,EALW,kBAAkB,GAAlB,yBAAkB,KAAlB,yBAAkB,QAK7B;IAED,2BAA2B;IAC3B,IAAY,kBAOX;IAPD,WAAY,kBAAkB;QAC5B,2DAAqC,CAAA;QACrC,mFAA6D,CAAA;QAC7D,uDAAiC,CAAA;QACjC,uDAAiC,CAAA;QACjC,iDAA2B,CAAA;QAC3B,8CAAwB,CAAA;IAC1B,CAAC,EAPW,kBAAkB,GAAlB,yBAAkB,KAAlB,yBAAkB,QAO7B;IAED,sBAAsB;IACtB,IAAY,aAKX;IALD,WAAY,aAAa;QACvB,kEAAiD,CAAA;QACjD,mEAAkD,CAAA;QAClD,sEAAqD,CAAA;QACrD,oEAAmD,CAAA;IACrD,CAAC,EALW,aAAa,GAAb,oBAAa,KAAb,oBAAa,QAKxB;IAED,sBAAsB;IACtB,IAAY,aAsBX;IAtBD,WAAY,aAAa;QACvB,wDAAuC,CAAA;QACvC,uDAAsC,CAAA;QACtC,mEAAkD,CAAA;QAClD,uDAAsC,CAAA;QACtC,8DAA6C,CAAA;QAC7C,sEAAqD,CAAA;QACrD,gEAA+C,CAAA;QAC/C,6CAA4B,CAAA;QAC5B,+DAA8C,CAAA;QAC9C,0CAAyB,CAAA;QACzB,uDAAsC,CAAA;QACtC,+CAA8B,CAAA;QAC9B,8DAA6C,CAAA;QAC7C,gEAA+C,CAAA;QAC/C,yEAAwD,CAAA;QACxD,0DAAyC,CAAA;QACzC,sDAAqC,CAAA;QACrC,sDAAqC,CAAA;QACrC,qEAAoD,CAAA;QACpD,uDAAsC,CAAA;QACtC,kEAAiD,CAAA;IACnD,CAAC,EAtBW,aAAa,GAAb,oBAAa,KAAb,oBAAa,QAsBxB;AACH,CAAC,EAnDgB,MAAM,KAAN,MAAM,QAmDtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/lsp",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "description": "",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -44,12 +44,12 @@
     "vscode-languageserver-protocol": "^3.17.0"
   },
   "dependencies": {
-    "@jupyterlab/apputils": "^4.1.5",
-    "@jupyterlab/codeeditor": "^4.0.5",
-    "@jupyterlab/coreutils": "^6.0.5",
-    "@jupyterlab/docregistry": "^4.0.5",
-    "@jupyterlab/services": "^7.0.5",
-    "@jupyterlab/translation": "^4.0.5",
+    "@jupyterlab/apputils": "^4.1.6",
+    "@jupyterlab/codeeditor": "^4.0.6",
+    "@jupyterlab/coreutils": "^6.0.6",
+    "@jupyterlab/docregistry": "^4.0.6",
+    "@jupyterlab/services": "^7.0.6",
+    "@jupyterlab/translation": "^4.0.6",
     "@lumino/coreutils": "^2.1.2",
     "@lumino/disposable": "^2.1.2",
     "@lumino/signaling": "^2.1.2",
@@ -59,7 +59,7 @@
     "vscode-ws-jsonrpc": "~1.0.2"
   },
   "devDependencies": {
-    "@jupyterlab/testing": "^4.0.5",
+    "@jupyterlab/testing": "^4.0.6",
     "@types/jest": "^29.2.0",
     "@types/lodash.mergewith": "^4.6.1",
     "jest": "^29.2.0",

package/src/adapters/adapter.ts

@@ -339,8 +339,8 @@ export abstract class WidgetLSPAdapter<T extends IDocumentWidget>
 
   /**
    * Get the index of editor from the cursor position in the virtual
-   * document. Since there is only one editor, this method always return
-   * 0
+   * document.
+   * @deprecated This is error-prone and will be removed in JupyterLab 5.0, use `getEditorIndex()` with `virtualDocument.getEditorAtVirtualLine(position)` instead.
    *
    * @param position - the position of cursor in the virtual document.
    * @return - index of the virtual editor

package/src/tokens.ts

@@ -638,9 +638,11 @@ export namespace Method {
 
   /** Client requests */
   export enum ClientRequest {
+    CODE_ACTION = 'textDocument/codeAction',
     COMPLETION = 'textDocument/completion',
     COMPLETION_ITEM_RESOLVE = 'completionItem/resolve',
     DEFINITION = 'textDocument/definition',
+    DOCUMENT_COLOR = 'textDocument/documentColor',
     DOCUMENT_HIGHLIGHT = 'textDocument/documentHighlight',
     DOCUMENT_SYMBOL = 'textDocument/documentSymbol',
     HOVER = 'textDocument/hover',
@@ -649,7 +651,14 @@ export namespace Method {
     REFERENCES = 'textDocument/references',
     RENAME = 'textDocument/rename',
     SIGNATURE_HELP = 'textDocument/signatureHelp',
-    TYPE_DEFINITION = 'textDocument/typeDefinition'
+    TYPE_DEFINITION = 'textDocument/typeDefinition',
+    LINKED_EDITING_RANGE = 'textDocument/linkedEditingRange',
+    INLINE_VALUE = 'textDocument/inlineValue',
+    INLAY_HINT = 'textDocument/inlayHint',
+    WORKSPACE_SYMBOL = 'workspace/symbol',
+    WORKSPACE_SYMBOL_RESOLVE = 'workspaceSymbol/resolve',
+    FORMATTING = 'textDocument/formatting',
+    RANGE_FORMATTING = 'textDocument/rangeFormatting'
   }
 }
 
@@ -700,9 +709,11 @@ export interface IServerResult {
  * Interface describing the request sent to the client.
  */
 export interface IClientRequestParams {
+  [Method.ClientRequest.CODE_ACTION]: lsp.CodeActionParams;
   [Method.ClientRequest.COMPLETION_ITEM_RESOLVE]: lsp.CompletionItem;
   [Method.ClientRequest.COMPLETION]: lsp.CompletionParams;
   [Method.ClientRequest.DEFINITION]: lsp.TextDocumentPositionParams;
+  [Method.ClientRequest.DOCUMENT_COLOR]: lsp.DocumentColorParams;
   [Method.ClientRequest.DOCUMENT_HIGHLIGHT]: lsp.TextDocumentPositionParams;
   [Method.ClientRequest.DOCUMENT_SYMBOL]: lsp.DocumentSymbolParams;
   [Method.ClientRequest.HOVER]: lsp.TextDocumentPositionParams;
@@ -712,15 +723,23 @@ export interface IClientRequestParams {
   [Method.ClientRequest.RENAME]: lsp.RenameParams;
   [Method.ClientRequest.SIGNATURE_HELP]: lsp.TextDocumentPositionParams;
   [Method.ClientRequest.TYPE_DEFINITION]: lsp.TextDocumentPositionParams;
+  [Method.ClientRequest.INLINE_VALUE]: lsp.InlineValueParams;
+  [Method.ClientRequest.INLAY_HINT]: lsp.InlayHintParams;
+  [Method.ClientRequest.WORKSPACE_SYMBOL]: lsp.WorkspaceSymbolParams;
+  [Method.ClientRequest.WORKSPACE_SYMBOL_RESOLVE]: lsp.WorkspaceSymbol;
+  [Method.ClientRequest.FORMATTING]: lsp.DocumentFormattingParams;
+  [Method.ClientRequest.RANGE_FORMATTING]: lsp.DocumentRangeFormattingParams;
 }
 
 /**
  * Interface describing the responses received from the client.
  */
 export interface IClientResult {
+  [Method.ClientRequest.CODE_ACTION]: (lsp.Command | lsp.CodeAction)[] | null;
   [Method.ClientRequest.COMPLETION_ITEM_RESOLVE]: lsp.CompletionItem;
   [Method.ClientRequest.COMPLETION]: AnyCompletion;
   [Method.ClientRequest.DEFINITION]: AnyLocation;
+  [Method.ClientRequest.DOCUMENT_COLOR]: lsp.ColorInformation[];
   [Method.ClientRequest.DOCUMENT_HIGHLIGHT]: lsp.DocumentHighlight[];
   [Method.ClientRequest.DOCUMENT_SYMBOL]: lsp.DocumentSymbol[];
   [Method.ClientRequest.HOVER]: lsp.Hover | null;
@@ -730,6 +749,15 @@ export interface IClientResult {
   [Method.ClientRequest.RENAME]: lsp.WorkspaceEdit;
   [Method.ClientRequest.SIGNATURE_HELP]: lsp.SignatureHelp;
   [Method.ClientRequest.TYPE_DEFINITION]: AnyLocation;
+  [Method.ClientRequest.INLINE_VALUE]: lsp.InlineValue[] | null;
+  [Method.ClientRequest.INLAY_HINT]: lsp.InlayHint[] | null;
+  [Method.ClientRequest.WORKSPACE_SYMBOL]:
+    | lsp.SymbolInformation[]
+    | lsp.WorkspaceSymbol[]
+    | null;
+  [Method.ClientRequest.WORKSPACE_SYMBOL_RESOLVE]: lsp.WorkspaceSymbol[];
+  [Method.ClientRequest.FORMATTING]: lsp.TextEdit[] | null;
+  [Method.ClientRequest.RANGE_FORMATTING]: lsp.TextEdit[] | null;
 }
 
 /**