Rich Chiodo (rchiodo) · Sep 22, 2020 · Sep 18, 2020 · Sep 21, 2020 · Sep 21, 2020 · Sep 21, 2020
diff --git a/src/client/activation/common/activatorBase.ts b/src/client/activation/common/activatorBase.ts
@@ -18,7 +18,6 @@ import {
     SignatureHelpContext,
     SymbolInformation,
     TextDocument,
-    TextDocumentContentChangeEvent,
     WorkspaceEdit
 } from 'vscode';
 import * as vscodeLanguageClient from 'vscode-languageclient/node';
@@ -72,34 +71,25 @@ export abstract class LanguageServerActivatorBase implements ILanguageServerActi
         this.manager.disconnect();
     }
 
-    public handleOpen(document: TextDocument): void {
+    public get connection() {
         const languageClient = this.getLanguageClient();
         if (languageClient) {
-            languageClient.sendNotification(
-                vscodeLanguageClient.DidOpenTextDocumentNotification.type,
-                languageClient.code2ProtocolConverter.asOpenTextDocumentParams(document)
-            );
+            // Return an object that looks like a connection
+            return {
+                sendNotification: languageClient.sendNotification.bind(languageClient),
+                sendRequest: languageClient.sendRequest.bind(languageClient),
+                sendProgress: languageClient.sendProgress.bind(languageClient),
+                onRequest: languageClient.onRequest.bind(languageClient),
+                onNotification: languageClient.onNotification.bind(languageClient),
+                onProgress: languageClient.onProgress.bind(languageClient)
+            };
         }
     }
 
-    public handleChanges(document: TextDocument, changes: TextDocumentContentChangeEvent[]): void {
+    public get capabilities() {
         const languageClient = this.getLanguageClient();
         if (languageClient) {
-            // If the language client doesn't support incremental, just send the whole document
-            if (this.textDocumentSyncKind === vscodeLanguageClient.TextDocumentSyncKind.Full) {
-                languageClient.sendNotification(
-                    vscodeLanguageClient.DidChangeTextDocumentNotification.type,
-                    languageClient.code2ProtocolConverter.asChangeTextDocumentParams(document)
-                );
-            } else {
-                languageClient.sendNotification(
-                    vscodeLanguageClient.DidChangeTextDocumentNotification.type,
-                    languageClient.code2ProtocolConverter.asChangeTextDocumentParams({
-                        document,
-                        contentChanges: changes
-                    })
-                );
-            }
+            return languageClient.initializeResult?.capabilities;
         }
     }
 
@@ -169,23 +159,6 @@ export abstract class LanguageServerActivatorBase implements ILanguageServerActi
         }
     }
 
-    private get textDocumentSyncKind(): vscodeLanguageClient.TextDocumentSyncKind {
-        const languageClient = this.getLanguageClient();
-        if (languageClient?.initializeResult?.capabilities?.textDocumentSync) {
-            const syncOptions = languageClient.initializeResult.capabilities.textDocumentSync;
-            const syncKind =
-                syncOptions !== undefined && syncOptions.hasOwnProperty('change')
-                    ? (syncOptions as vscodeLanguageClient.TextDocumentSyncOptions).change
-                    : syncOptions;
-            if (syncKind !== undefined) {
-                return syncKind as vscodeLanguageClient.TextDocumentSyncKind;
-            }
-        }
-
-        // Default is full if not provided
-        return vscodeLanguageClient.TextDocumentSyncKind.Full;
-    }
-
     private async handleProvideRenameEdits(
         document: TextDocument,
         position: Position,

diff --git a/src/client/activation/jedi/multiplexingActivator.ts b/src/client/activation/jedi/multiplexingActivator.ts
@@ -9,8 +9,7 @@ import {
     Position,
     ReferenceContext,
     SignatureHelpContext,
-    TextDocument,
-    TextDocumentContentChangeEvent
+    TextDocument
 } from 'vscode';
 // tslint:disable-next-line: import-name
 import { IWorkspaceService } from '../../common/application/types';
@@ -73,15 +72,15 @@ export class MultiplexingJediLanguageServerActivator implements ILanguageServerA
         return this.onDidChangeCodeLensesEmitter.event;
     }
 
-    public handleChanges(document: TextDocument, changes: TextDocumentContentChangeEvent[]) {
-        if (this.realLanguageServer && this.realLanguageServer.handleChanges) {
-            this.realLanguageServer.handleChanges(document, changes);
+    public get connection() {
+        if (this.realLanguageServer) {
+            return this.realLanguageServer.connection;
         }
     }
 
-    public handleOpen(document: TextDocument) {
-        if (this.realLanguageServer && this.realLanguageServer.handleOpen) {
-            this.realLanguageServer.handleOpen(document);
+    public get capabilities() {
+        if (this.realLanguageServer) {
+            return this.realLanguageServer.capabilities;
         }
     }
 

diff --git a/src/client/activation/refCountedLanguageServer.ts b/src/client/activation/refCountedLanguageServer.ts
@@ -17,7 +17,6 @@ import {
     SignatureHelpContext,
     SymbolInformation,
     TextDocument,
-    TextDocumentContentChangeEvent,
     WorkspaceEdit
 } from 'vscode';
 
@@ -65,12 +64,12 @@ export class RefCountedLanguageServer implements ILanguageServerActivator {
         this.impl.clearAnalysisCache ? this.impl.clearAnalysisCache() : noop();
     }
 
-    public handleChanges(document: TextDocument, changes: TextDocumentContentChangeEvent[]) {
-        this.impl.handleChanges ? this.impl.handleChanges(document, changes) : noop();
+    public get connection() {
+        return this.impl.connection;
     }
 
-    public handleOpen(document: TextDocument) {
-        this.impl.handleOpen ? this.impl.handleOpen(document) : noop();
+    public get capabilities() {
+        return this.impl.capabilities;
     }
 
     public provideRenameEdits(

diff --git a/src/client/activation/types.ts b/src/client/activation/types.ts
@@ -13,13 +13,13 @@ import {
     HoverProvider,
     ReferenceProvider,
     RenameProvider,
-    SignatureHelpProvider,
-    TextDocument,
-    TextDocumentContentChangeEvent
+    SignatureHelpProvider
 } from 'vscode';
 import { LanguageClient, LanguageClientOptions } from 'vscode-languageclient/node';
+import * as vscodeprotocol from 'vscode-languageserver-protocol';
 import { NugetPackage } from '../common/nuget/types';
 import { IDisposable, IOutputChannel, LanguageServerDownloadChannels, Resource } from '../common/types';
+import { ILanguageServerConnection } from '../datascience/api/jupyterIntegration';
 import { PythonEnvironment } from '../pythonEnvironments/info';
 
 export const IExtensionActivationManager = Symbol('IExtensionActivationManager');
@@ -73,12 +73,6 @@ export enum LanguageServerType {
 export const DotNetLanguageServerFolder = 'languageServer';
 export const NodeLanguageServerFolder = 'nodeLanguageServer';
 
-// tslint:disable-next-line: interface-name
-export interface DocumentHandler {
-    handleOpen(document: TextDocument): void;
-    handleChanges(document: TextDocument, changes: TextDocumentContentChangeEvent[]): void;
-}
-
 // tslint:disable-next-line: interface-name
 export interface LanguageServerCommandHandler {
     clearAnalysisCache(): void;
@@ -93,9 +87,11 @@ export interface ILanguageServer
         CodeLensProvider,
         DocumentSymbolProvider,
         SignatureHelpProvider,
-        Partial<DocumentHandler>,
         Partial<LanguageServerCommandHandler>,
-        IDisposable {}
+        IDisposable {
+    readonly connection?: ILanguageServerConnection;
+    readonly capabilities?: vscodeprotocol.ServerCapabilities;
+}
 
 export const ILanguageServerActivator = Symbol('ILanguageServerActivator');
 export interface ILanguageServerActivator extends ILanguageServer {