codemirror-languageserver 1.9.0 → 1.11.0

package/README.md

@@ -51,9 +51,7 @@ Contributions are welcome.
 
 https://user-images.githubusercontent.com/348107/120141150-c6bb9180-c1fd-11eb-8ada-9b7b7a1e4ade.mp4
 
-| | |
-| --- | --- |
-| [Toph](https://toph.co) | Competitive programming platform |
+- [Toph](https://toph.co): Competitive programming platform. Toph uses Language Server Plugin for CodeMirror 6 with its integrated code editor.
 
 ## License
 

package/dist/index.d.ts

@@ -24,6 +24,7 @@ declare class LanguageServerClient {
     ready: boolean;
     capabilities: LSP.ServerCapabilities<any>;
     private plugins;
+    initializePromise: Promise<void>;
     constructor(options: LanguageServerClientOptions);
     initialize(): Promise<void>;
     close(): void;
@@ -39,12 +40,13 @@ declare class LanguageServerClient {
 }
 declare class LanguageServerPlugin implements PluginValue {
     private view;
+    private allowHTMLContent;
     client: LanguageServerClient;
     private documentUri;
     private languageId;
     private documentVersion;
     private changesTimeout;
-    constructor(view: EditorView);
+    constructor(view: EditorView, allowHTMLContent: boolean);
     update({ docChanged }: ViewUpdate): void;
     destroy(): void;
     initialize({ documentText }: {
@@ -80,6 +82,7 @@ interface LanguageServerClientOptions extends LanguageServerBaseOptions {
 }
 interface LanguageServerOptions extends LanguageServerClientOptions {
     client?: LanguageServerClient;
+    allowHTMLContent?: boolean;
 }
 interface LanguageServerWebsocketOptions extends LanguageServerBaseOptions {
     serverUri: `ws://${string}` | `wss://${string}`;

package/dist/index.js

@@ -1,7 +1,7 @@
 import { autocompletion } from '@codemirror/autocomplete';
 import { setDiagnostics } from '@codemirror/lint';
 import { Facet } from '@codemirror/state';
-import { EditorView, ViewPlugin, hoverTooltip } from '@codemirror/view';
+import { ViewPlugin, hoverTooltip } from '@codemirror/view';
 import { RequestManager, Client, WebSocketTransport } from '@open-rpc/client-js';
 import { CompletionItemKind, CompletionTriggerKind, DiagnosticSeverity } from 'vscode-languageserver-protocol';
 
@@ -39,7 +39,7 @@ class LanguageServerClient {
                 }
             });
         }
-        this.initialize();
+        this.initializePromise = this.initialize();
     }
     async initialize() {
         const { capabilities } = await this.request('initialize', {
@@ -143,8 +143,9 @@ class LanguageServerClient {
     }
 }
 class LanguageServerPlugin {
-    constructor(view) {
+    constructor(view, allowHTMLContent) {
         this.view = view;
+        this.allowHTMLContent = allowHTMLContent;
         this.client = this.view.state.facet(client);
         this.documentUri = this.view.state.facet(documentUri);
         this.languageId = this.view.state.facet(languageId);
@@ -170,6 +171,9 @@ class LanguageServerPlugin {
         this.client.detachPlugin(this);
     }
     async initialize({ documentText }) {
+        if (this.client.initializePromise) {
+            await this.client.initializePromise;
+        }
         this.client.textDocumentDidOpen({
             textDocument: {
                 uri: this.documentUri,
@@ -219,7 +223,10 @@ class LanguageServerPlugin {
             return null;
         const dom = document.createElement('div');
         dom.classList.add('documentation');
-        dom.textContent = formatContents(contents);
+        if (this.allowHTMLContent)
+            dom.innerHTML = formatContents(contents);
+        else
+            dom.textContent = formatContents(contents);
         return { pos, end, create: (view) => ({ dom }), above: true };
     }
     async requestCompletion(context, { line, character }, { triggerKind, triggerCharacter, }) {
@@ -334,7 +341,7 @@ function languageServerWithTransport(options) {
         client.of(options.client || new LanguageServerClient({ ...options, autoClose: true })),
         documentUri.of(options.documentUri),
         languageId.of(options.languageId),
-        ViewPlugin.define((view) => (plugin = new LanguageServerPlugin(view))),
+        ViewPlugin.define((view) => (plugin = new LanguageServerPlugin(view, options.allowHTMLContent))),
         hoverTooltip((view, pos) => {
             var _a;
             return (_a = plugin === null || plugin === void 0 ? void 0 : plugin.requestHoverTooltip(view, offsetToPos(view.state.doc, pos))) !== null && _a !== void 0 ? _a : null;
@@ -365,7 +372,6 @@ function languageServerWithTransport(options) {
                 },
             ],
         }),
-        baseTheme,
     ];
 }
 function posToOffset(doc, pos) {
@@ -417,17 +423,5 @@ function prefixMatch(options) {
     const source = toSet(first) + toSet(rest) + '*$';
     return [new RegExp('^' + source), new RegExp(source)];
 }
-const baseTheme = EditorView.baseTheme({
-    '.cm-tooltip.documentation': {
-        display: 'block',
-        marginLeft: '0',
-        padding: '3px 6px 3px 8px',
-        borderLeft: '5px solid #999',
-        whiteSpace: 'pre',
-    },
-    '.cm-tooltip.lint': {
-        whiteSpace: 'pre',
-    },
-});
 
 export { LanguageServerClient, languageServer, languageServerWithTransport };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemirror-languageserver",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "Language Server Plugin for CodeMirror 6",
   "main": "dist/index.js",
   "scripts": {