@jupyterlab/lsp 4.0.0-alpha.11 → 4.0.0-alpha.12

package/lib/extractors/manager.d.ts

@@ -1,13 +1,30 @@
-import { CellType } from '@jupyterlab/nbformat';
 import { ILSPCodeExtractorsManager } from '../tokens';
 import { IForeignCodeExtractor } from './types';
+/**
+ * Manager for the code extractors
+ */
 export declare class CodeExtractorsManager implements ILSPCodeExtractorsManager {
-    private _extractorMap;
-    private _extractorMapAnyLanguage;
     constructor();
-    getExtractors(cellType: CellType, hostLanguage: string | null): IForeignCodeExtractor[];
+    /**
+     * Get the extractors for the input cell type and the main language of
+     * the document
+     *
+     * @param  cellType - type of cell
+     * @param  hostLanguage - main language of the document
+     */
+    getExtractors(cellType: string, hostLanguage: string | null): IForeignCodeExtractor[];
     /**
      * Register an extractor to extract foreign code from host documents of specified language.
      */
     register(extractor: IForeignCodeExtractor, hostLanguage: string | null): void;
+    /**
+     * The map with key is the type of cell, value is another map between
+     * the language of cell and its code extractor.
+     */
+    private _extractorMap;
+    /**
+     * The map with key is the cell type, value is the code extractor associated
+     * with this cell type, this is used for the non-code cell types.
+     */
+    private _extractorMapAnyLanguage;
 }

package/lib/extractors/manager.js

@@ -1,16 +1,27 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+/**
+ * Manager for the code extractors
+ */
 export class CodeExtractorsManager {
     constructor() {
         this._extractorMap = new Map();
         this._extractorMapAnyLanguage = new Map();
-        ['code', 'markdown', 'raw'].forEach(cell => {
-            this._extractorMap.set(cell, new Map());
-            this._extractorMapAnyLanguage.set(cell, []);
-        });
     }
+    /**
+     * Get the extractors for the input cell type and the main language of
+     * the document
+     *
+     * @param  cellType - type of cell
+     * @param  hostLanguage - main language of the document
+     */
     getExtractors(cellType, hostLanguage) {
         var _a, _b;
         if (hostLanguage) {
             const currentMap = this._extractorMap.get(cellType);
+            if (!currentMap) {
+                return [];
+            }
             return (_a = currentMap.get(hostLanguage)) !== null && _a !== void 0 ? _a : [];
         }
         else {
@@ -24,18 +35,24 @@ export class CodeExtractorsManager {
         const cellType = extractor.cellType;
         if (hostLanguage) {
             cellType.forEach(type => {
+                if (!this._extractorMap.has(type)) {
+                    this._extractorMap.set(type, new Map());
+                }
                 const currentMap = this._extractorMap.get(type);
                 const extractorList = currentMap.get(hostLanguage);
                 if (!extractorList) {
                     currentMap.set(hostLanguage, [extractor]);
                 }
                 else {
-                    extractorList === null || extractorList === void 0 ? void 0 : extractorList.push(extractor);
+                    extractorList.push(extractor);
                 }
             });
         }
         else {
             cellType.forEach(type => {
+                if (!this._extractorMapAnyLanguage.has(type)) {
+                    this._extractorMapAnyLanguage.set(type, []);
+                }
                 this._extractorMapAnyLanguage.get(type).push(extractor);
             });
         }

package/lib/extractors/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/extractors/manager.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,qBAAqB;IAGhC;QACE,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAGzB,CAAC;QAEJ,IAAI,CAAC,wBAAwB,GAAG,IAAI,GAAG,EAGpC,CAAC;QAEH,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACzD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CACX,QAAkB,EAClB,YAA2B;;QAE3B,IAAI,YAAY,EAAE;YAChB,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC;YACrD,OAAO,MAAA,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC;SAC3C;aAAM;YACL,OAAO,MAAA,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,QAAQ,CAAC,mCAAI,EAAE,CAAC;SAC1D;IACH,CAAC;IAED;;OAEG;IACH,QAAQ,CACN,SAAgC,EAChC,YAA2B;QAE3B,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACpC,IAAI,YAAY,EAAE;YAChB,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACtB,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;gBACjD,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBACnD,IAAI,CAAC,aAAa,EAAE;oBAClB,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;iBAC3C;qBAAM;oBACL,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC,SAAS,CAAC,CAAC;iBAChC;YACH,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACtB,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;CACF"}
+{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/extractors/manager.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAK3D;;GAEG;AACH,MAAM,OAAO,qBAAqB;IAChC;QACE,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAGzB,CAAC;QAEJ,IAAI,CAAC,wBAAwB,GAAG,IAAI,GAAG,EAAmC,CAAC;IAC7E,CAAC;IAED;;;;;;OAMG;IACH,aAAa,CACX,QAAgB,EAChB,YAA2B;;QAE3B,IAAI,YAAY,EAAE;YAChB,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpD,IAAI,CAAC,UAAU,EAAE;gBACf,OAAO,EAAE,CAAC;aACX;YACD,OAAO,MAAA,UAAW,CAAC,GAAG,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC;SAC5C;aAAM;YACL,OAAO,MAAA,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,QAAQ,CAAC,mCAAI,EAAE,CAAC;SAC1D;IACH,CAAC;IAED;;OAEG;IACH,QAAQ,CACN,SAAgC,EAChC,YAA2B;QAE3B,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACpC,IAAI,YAAY,EAAE;YAChB,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACtB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBACjC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;iBACzC;gBACD,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;gBACjD,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBACnD,IAAI,CAAC,aAAa,EAAE;oBAClB,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;iBAC3C;qBAAM;oBACL,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBAC/B;YACH,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACtB,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC5C,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;iBAC7C;gBACD,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;CAaF"}

package/lib/extractors/text_extractor.d.ts

@@ -1,13 +1,34 @@
-import { CellType } from '@jupyterlab/nbformat';
 import { LanguageIdentifier } from '../lsp';
 import { IExtractedCode, IForeignCodeExtractor } from './types';
+/**
+ * The code extractor for the raw and markdown text.
+ */
 export declare class TextForeignCodeExtractor implements IForeignCodeExtractor {
-    language: LanguageIdentifier;
-    standalone: boolean;
-    fileExtension: string;
-    cellType: CellType[];
     constructor(options: TextForeignCodeExtractor.IOptions);
-    hasForeignCode(code: string, cellType: CellType): boolean;
+    /**
+     * The foreign language.
+     */
+    readonly language: LanguageIdentifier;
+    /**
+     * Should the foreign code be appended (False) to the previously established virtual document of the same language,
+     * or is it standalone snippet which requires separate connection?
+     */
+    readonly standalone: boolean;
+    /**
+     * Extension of the virtual document (some servers check extensions of files), e.g. 'py' or 'R'.
+     */
+    readonly fileExtension: string;
+    /**
+     * The supported cell types.
+     */
+    readonly cellType: string[];
+    /**
+     * Test if there is any foreign code in provided code snippet.
+     */
+    hasForeignCode(code: string, cellType: string): boolean;
+    /**
+     * Split the code into the host and foreign code (if any foreign code was detected)
+     */
     extractForeignCode(code: string): IExtractedCode[];
 }
 declare namespace TextForeignCodeExtractor {
@@ -21,8 +42,14 @@ declare namespace TextForeignCodeExtractor {
          * or is it standalone snippet which requires separate connection?
          */
         isStandalone: boolean;
+        /**
+         * Extension of the virtual document (some servers check extensions of files), e.g. 'py' or 'R'.
+         */
         file_extension: string;
-        cellType: CellType[];
+        /**
+         * The supported cell types.
+         */
+        cellType: string[];
     }
 }
 export {};

package/lib/extractors/text_extractor.js

@@ -1,4 +1,9 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
 import { positionAtOffset } from '../positioning';
+/**
+ * The code extractor for the raw and markdown text.
+ */
 export class TextForeignCodeExtractor {
     constructor(options) {
         this.language = options.language;
@@ -6,9 +11,15 @@ export class TextForeignCodeExtractor {
         this.fileExtension = options.file_extension;
         this.cellType = options.cellType;
     }
+    /**
+     * Test if there is any foreign code in provided code snippet.
+     */
     hasForeignCode(code, cellType) {
         return this.cellType.includes(cellType);
     }
+    /**
+     * Split the code into the host and foreign code (if any foreign code was detected)
+     */
     extractForeignCode(code) {
         let lines = code.split('\n');
         let extracts = new Array();

package/lib/extractors/text_extractor.js.map

@@ -1 +1 @@
-{"version":3,"file":"text_extractor.js","sourceRoot":"","sources":["../../src/extractors/text_extractor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAIlD,MAAM,OAAO,wBAAwB;IAMnC,YAAY,OAA0C;QACpD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;QAC5C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IACnC,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,QAAkB;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,kBAAkB,CAAC,IAAY;QAC7B,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,QAAQ,GAAG,IAAI,KAAK,EAAkB,CAAC;QAE3C,IAAI,mBAAmB,GAAG,IAAI,CAAC;QAE/B,IAAI,KAAK,GAAG,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACvC,IAAI,GAAG,GAAG,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAE9D,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,EAAE;YACZ,WAAW,EAAE,mBAAmB;YAChC,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACrB,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}
+{"version":3,"file":"text_extractor.js","sourceRoot":"","sources":["../../src/extractors/text_extractor.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAG3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAIlD;;GAEG;AACH,MAAM,OAAO,wBAAwB;IACnC,YAAY,OAA0C;QACpD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;QAC5C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IACnC,CAAC;IAsBD;;OAEG;IACH,cAAc,CAAC,IAAY,EAAE,QAAgB;QAC3C,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,IAAY;QAC7B,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,QAAQ,GAAG,IAAI,KAAK,EAAkB,CAAC;QAE3C,IAAI,mBAAmB,GAAG,IAAI,CAAC;QAE/B,IAAI,KAAK,GAAG,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACvC,IAAI,GAAG,GAAG,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAE9D,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,EAAE;YACZ,WAAW,EAAE,mBAAmB;YAChC,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACrB,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}

package/lib/extractors/types.d.ts

@@ -1,5 +1,4 @@
 import { CodeEditor } from '@jupyterlab/codeeditor';
-import { CellType } from '@jupyterlab/nbformat';
 import { LanguageIdentifier } from '../lsp';
 export interface IExtractedCode {
     /**
@@ -43,8 +42,11 @@ export interface IForeignCodeExtractor {
     /**
      * The foreign language.
      */
-    language: LanguageIdentifier;
-    cellType: CellType[];
+    readonly language: LanguageIdentifier;
+    /**
+     * The supported cell types.
+     */
+    readonly cellType: string[];
     /**
      * Split the code into the host and foreign code (if any foreign code was detected)
      */
@@ -53,13 +55,13 @@ export interface IForeignCodeExtractor {
      * Does the extractor produce code which should be appended to the previously established virtual document (False)
      * of the same language, or does it produce standalone snippets which require separate connections (True)?
      */
-    standalone: boolean;
+    readonly standalone: boolean;
     /**
      * Test if there is any foreign code in provided code snippet.
      */
-    hasForeignCode(code: string, cellType: CellType): boolean;
+    hasForeignCode(code: string, cellType: string): boolean;
     /**
      * Extension of the virtual document (some servers check extensions of files), e.g. 'py' or 'R'.
      */
-    fileExtension: string;
+    readonly fileExtension: string;
 }

package/lib/extractors/types.js

@@ -1,2 +1,4 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
 export {};
 //# sourceMappingURL=types.js.map

package/lib/extractors/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/extractors/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/extractors/types.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D"}

package/lib/feature.d.ts

@@ -1,11 +1,26 @@
 import { ISignal } from '@lumino/signaling';
 import { ClientCapabilities } from './lsp';
 import { IFeature, ILSPFeatureManager } from './tokens';
+/**
+ * Class to manager the registered features of the language servers.
+ */
 export declare class FeatureManager implements ILSPFeatureManager {
-    readonly features: Array<IFeature>;
-    private _featuresRegistered;
     constructor();
-    register(feature: IFeature): void;
+    /**
+     * List of registered features
+     */
+    readonly features: Array<IFeature>;
+    /**
+     * Signal emitted when a new feature is registered.
+     */
     get featuresRegistered(): ISignal<ILSPFeatureManager, IFeature>;
+    /**
+     * Register a new feature, skip if it is already registered.
+     */
+    register(feature: IFeature): void;
+    /**
+     * Get the capabilities of all clients.
+     */
     clientCapabilities(): ClientCapabilities;
+    private _featuresRegistered;
 }

package/lib/feature.js

@@ -1,10 +1,27 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
 import { Signal } from '@lumino/signaling';
 import mergeWith from 'lodash.mergewith';
+/**
+ * Class to manager the registered features of the language servers.
+ */
 export class FeatureManager {
     constructor() {
+        /**
+         * List of registered features
+         */
         this.features = [];
         this._featuresRegistered = new Signal(this);
     }
+    /**
+     * Signal emitted when a new feature is registered.
+     */
+    get featuresRegistered() {
+        return this._featuresRegistered;
+    }
+    /**
+     * Register a new feature, skip if it is already registered.
+     */
     register(feature) {
         if (this.features.some(ft => ft.id === feature.id)) {
             console.warn(`Feature with id ${feature.id} is already registered, skipping.`);
@@ -14,9 +31,9 @@ export class FeatureManager {
             this._featuresRegistered.emit(feature);
         }
     }
-    get featuresRegistered() {
-        return this._featuresRegistered;
-    }
+    /**
+     * Get the capabilities of all clients.
+     */
     clientCapabilities() {
         let capabilities = {};
         for (const feature of this.features) {

package/lib/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"feature.js","sourceRoot":"","sources":["../src/feature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAKzC,MAAM,OAAO,cAAc;IAGzB;QAFgB,aAAQ,GAAoB,EAAE,CAAC;QAG7C,IAAI,CAAC,mBAAmB,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,QAAQ,CAAC,OAAiB;QACxB,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,EAAE;YAClD,OAAO,CAAC,IAAI,CACV,mBAAmB,OAAO,CAAC,EAAE,mCAAmC,CACjE,CAAC;SACH;aAAM;YACL,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxC;IACH,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED,kBAAkB;QAChB,IAAI,YAAY,GAAuB,EAAE,CAAC;QAC1C,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YACnC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;gBACzB,SAAS;aACV;YACD,YAAY,GAAG,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;SAC9D;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;CACF"}
+{"version":3,"file":"feature.js","sourceRoot":"","sources":["../src/feature.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAW,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAKzC;;GAEG;AACH,MAAM,OAAO,cAAc;IACzB;QAGA;;WAEG;QACM,aAAQ,GAAoB,EAAE,CAAC;QALtC,IAAI,CAAC,mBAAmB,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAMD;;OAEG;IACH,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,QAAQ,CAAC,OAAiB;QACxB,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,EAAE;YAClD,OAAO,CAAC,IAAI,CACV,mBAAmB,OAAO,CAAC,EAAE,mCAAmC,CACjE,CAAC;SACH;aAAM;YACL,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxC;IACH,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,IAAI,YAAY,GAAuB,EAAE,CAAC;QAC1C,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YACnC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;gBACzB,SAAS;aACV;YACD,YAAY,GAAG,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;SAC9D;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;CAGF"}

package/lib/index.d.ts

@@ -2,16 +2,13 @@
  * @packageDocumentation
  * @module lsp
  */
+export * from './adapters/adapter';
 export * from './connection_manager';
+export * from './extractors';
+export * from './feature';
 export * from './manager';
-export * from './tokens';
-export * from './adapters/adapter';
+export * from './plugin';
 export * from './positioning';
-export * from './virtual/document';
+export * from './tokens';
 export * from './utils';
-export * from './connection';
-export * from './feature';
-export * from './extractors/manager';
-export * from './extractors/text_extractor';
-export * from './extractors/types';
-export * from './plugin';
+export * from './virtual/document';

package/lib/index.js

@@ -1,22 +1,17 @@
-/* -----------------------------------------------------------------------------
-| Copyright (c) Jupyter Development Team.
-| Distributed under the terms of the Modified BSD License.
-|----------------------------------------------------------------------------*/
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
 /**
  * @packageDocumentation
  * @module lsp
  */
+export * from './adapters/adapter';
 export * from './connection_manager';
+export * from './extractors';
+export * from './feature';
 export * from './manager';
-export * from './tokens';
-export * from './adapters/adapter';
+export * from './plugin';
 export * from './positioning';
-export * from './virtual/document';
+export * from './tokens';
 export * from './utils';
-export * from './connection';
-export * from './feature';
-export * from './extractors/manager';
-export * from './extractors/text_extractor';
-export * from './extractors/types';
-export * from './plugin';
+export * from './virtual/document';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAC/E;;;GAGG;AAEH,cAAc,sBAAsB,CAAC;AACrC,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAC3D;;;GAGG;AAEH,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,oBAAoB,CAAC"}

package/lib/lsp.d.ts

@@ -1,8 +1,5 @@
 import type * as lsp from 'vscode-languageserver-protocol';
-/** Workaround to silence a bug in https://github.com/microsoft/vscode-languageserver-node/pull/720 */
-export declare type ClientCapabilities = Omit<lsp.ClientCapabilities, 'textDocument'> & {
-    textDocument?: Omit<lsp.TextDocumentClientCapabilities, 'moniker'>;
-};
+export declare type ClientCapabilities = lsp.ClientCapabilities;
 export declare enum DiagnosticSeverity {
     Error = 1,
     Warning = 2,
@@ -127,3 +124,12 @@ export declare type RecommendedLanguageIdentifier = keyof typeof Languages;
  * the identifiers as recommended by the LSP documentation.
  */
 export declare type LanguageIdentifier = RecommendedLanguageIdentifier | string;
+/**
+ * Type represents a location inside a resource, such as a line
+ * inside a text file.
+ */
+export declare type AnyLocation = lsp.Location | lsp.Location[] | lsp.LocationLink[] | undefined | null;
+/**
+ * Type represents the completion result.
+ */
+export declare type AnyCompletion = lsp.CompletionList | lsp.CompletionItem[];

package/lib/lsp.js

@@ -1,3 +1,5 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
 export var DiagnosticSeverity;
 (function (DiagnosticSeverity) {
     DiagnosticSeverity[DiagnosticSeverity["Error"] = 1] = "Error";

package/lib/lsp.js.map

@@ -1 +1 @@
-{"version":3,"file":"lsp.js","sourceRoot":"","sources":["../src/lsp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lsp.js","sourceRoot":"","sources":["../src/lsp.ts"],"names":[],"mappings":"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"}

package/lib/manager.d.ts

@@ -1,29 +1,116 @@
-import { ISignal, Signal } from '@lumino/signaling';
+import { ISignal } from '@lumino/signaling';
 import { ILanguageServerManager, TLanguageServerConfigurations, TLanguageServerId, TSessionMap, TSpecsMap } from './tokens';
 import { ServerSpecProperties } from './schema';
 export declare class LanguageServerManager implements ILanguageServerManager {
-    protected _sessionsChanged: Signal<ILanguageServerManager, void>;
-    protected _sessions: TSessionMap;
-    protected _specs: TSpecsMap;
-    protected _version: number;
-    private _settings;
-    private _baseUrl;
-    private _statusCode;
-    private _retries;
-    private _retriesInterval;
-    private _configuration;
-    private _warningsEmitted;
     constructor(options: ILanguageServerManager.IOptions);
+    /**
+     * Check if the manager is disposed.
+     */
+    get isDisposed(): boolean;
+    /**
+     * Get the language server specs.
+     */
     get specs(): TSpecsMap;
+    /**
+     * Get the status end point.
+     */
     get statusUrl(): string;
+    /**
+     * Signal emitted when a  language server session is changed
+     */
     get sessionsChanged(): ISignal<ILanguageServerManager, void>;
+    /**
+     * Get the map of language server sessions.
+     */
     get sessions(): TSessionMap;
+    /**
+     * A promise resolved when this server manager is ready.
+     */
+    get ready(): Promise<void>;
+    /**
+     * Get the status code of server's responses.
+     */
+    get statusCode(): number;
+    /**
+     * Dispose the manager.
+     */
+    dispose(): void;
+    /**
+     * Update the language server configuration.
+     */
     setConfiguration(configuration: TLanguageServerConfigurations): void;
-    protected warnOnce(arg: string): void;
-    protected _comparePriorities(a: TLanguageServerId, b: TLanguageServerId): number;
-    protected isMatchingSpec(options: ILanguageServerManager.IGetServerIdOptions, spec: ServerSpecProperties): boolean;
+    /**
+     * Get matching language server for input language option.
+     */
     getMatchingServers(options: ILanguageServerManager.IGetServerIdOptions): TLanguageServerId[];
+    /**
+     * Get matching language server spec for input language option.
+     */
     getMatchingSpecs(options: ILanguageServerManager.IGetServerIdOptions): TSpecsMap;
-    get statusCode(): number;
+    /**
+     * Fetch the server session list from the status endpoint. The server
+     * manager is ready once this method finishes.
+     */
     fetchSessions(): Promise<void>;
+    /**
+     * Version number of sever session.
+     */
+    protected version: number;
+    /**
+     * Check if input language option maths the language server spec.
+     */
+    protected isMatchingSpec(options: ILanguageServerManager.IGetServerIdOptions, spec: ServerSpecProperties): boolean;
+    /**
+     * Helper function to warn a message only once.
+     */
+    protected warnOnce(arg: string): void;
+    /**
+     * Compare the rank of two servers with the same language.
+     */
+    protected compareRanks(a: TLanguageServerId, b: TLanguageServerId): number;
+    /**
+     * map of language server sessions.
+     */
+    private _sessions;
+    /**
+     * Map of language server specs.
+     */
+    private _specs;
+    /**
+     * Server connection setting.
+     */
+    private _settings;
+    /**
+     * Base URL to connect to the language server handler.
+     */
+    private _baseUrl;
+    /**
+     * Status code of server response
+     */
+    private _statusCode;
+    /**
+     * Number of connection retry, default to 2.
+     */
+    private _retries;
+    /**
+     * Interval between each retry, default to 10s.
+     */
+    private _retriesInterval;
+    /**
+     * Language server configuration.
+     */
+    private _configuration;
+    /**
+     * Set of emitted warning message, message in this set will not be warned again.
+     */
+    private _warningsEmitted;
+    /**
+     * A promise resolved when this server manager is ready.
+     */
+    private _ready;
+    /**
+     * Signal emitted when a  language server session is changed
+     */
+    private _sessionsChanged;
+    private _isDisposed;
 }