test upgrading

Author: dibarbet

package-lock.json

@@ -113,9 +113,9 @@
     "tmp": "0.0.33",
     "uuid": "^9.0.0",
     "vscode-html-languageservice": "^5.0.1",
-    "vscode-jsonrpc": "8.2.0-next.0",
-    "vscode-languageclient": "8.2.0-next.1",
-    "vscode-languageserver-protocol": "3.17.4-next.1",
+    "vscode-jsonrpc": "8.2.1",
+    "vscode-languageclient": "9.0.1",
+    "vscode-languageserver-protocol": "3.17.5",
     "vscode-languageserver-textdocument": "^1.0.5",
     "vscode-nls": "5.0.1",
     "yauzl": "2.10.0"

package.json

@@ -39,6 +39,9 @@ export class OnAutoInsertFeature implements DynamicFeature<RoslynProtocol.OnAuto
             RoslynProtocol.OnAutoInsertRegistrationOptions
         >(RoslynProtocol.OnAutoInsertRequest.method);
     }
+    clear(): void {
+        this._registrations.clear();
+    }
     fillInitializeParams?: ((params: InitializeParams) => void) | undefined;
     preInitialize?:
         | ((capabilities: ServerCapabilities<any>, documentSelector: DocumentSelector | undefined) => void)

src/lsptoolshost/onAutoInsertFeature.ts

@@ -5,7 +5,6 @@
 
 import { Command } from 'vscode';
 import * as lsp from 'vscode-languageserver-protocol';
-import { CodeAction, TextDocumentRegistrationOptions } from 'vscode-languageserver-protocol';
 import { ProjectConfigurationMessage } from '../shared/projectConfiguration';
 
 export interface VSProjectContextList {
@@ -95,7 +94,7 @@ export interface OnAutoInsertOptions {
 /**
  * Registration options for an {@link OnAutoInsertRequest}.
  */
-export interface OnAutoInsertRegistrationOptions extends TextDocumentRegistrationOptions, OnAutoInsertOptions {}
+export interface OnAutoInsertRegistrationOptions extends lsp.TextDocumentRegistrationOptions, OnAutoInsertOptions {}
 
 export interface RegisterSolutionSnapshotResponseItem {
     /**
@@ -185,7 +184,7 @@ export interface BuildOnlyDiagnosticIdsResult {
     ids: string[];
 }
 
-export interface RoslynFixAllCodeAction extends CodeAction {
+export interface RoslynFixAllCodeAction extends lsp.CodeAction {
     scope: string;
 }
 

src/lsptoolshost/roslynProtocol.ts

@@ -405,7 +405,7 @@ export class LspEngine implements IEngine {
                     registrations: true,
                 };
             },
-            dispose() {
+            clear() {
                 /* empty */
             },
             fillClientCapabilities(_) {

src/omnisharp/engines/lspEngine.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Range } from 'vscode-languageserver-types';
+import { Range } from 'vscode-languageserver-protocol';
 
 export class ColorPresentationContext {
     constructor(public readonly uri: vscode.Uri, public readonly range: Range) {}

src/razor/src/colorPresentation/colorPresentationContext.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { integer } from 'vscode-languageserver-types';
+import { integer } from 'vscode-languageserver-protocol';
 import { SerializableTextDocumentIdentifier } from '../rpc/serializableTextDocumentIdentifier';
 
 export interface SerializableFoldingRangeParams {

src/razor/src/folding/serializableFoldingRangeParams.ts

@@ -6,8 +6,14 @@
 import * as cp from 'child_process';
 import { EventEmitter } from 'events';
 import * as vscode from 'vscode';
-import { RequestHandler, RequestType } from 'vscode-jsonrpc';
-import { GenericNotificationHandler, InitializeResult, LanguageClientOptions, State } from 'vscode-languageclient';
+import { RequestHandler } from 'vscode-jsonrpc';
+import {
+    GenericNotificationHandler,
+    InitializeResult,
+    LanguageClientOptions,
+    RequestType,
+    State,
+} from 'vscode-languageclient';
 import { ServerOptions } from 'vscode-languageclient/node';
 import { RazorLanguage } from './razorLanguage';
 import { RazorLanguageServerOptions } from './razorLanguageServerOptions';

src/razor/src/razorLanguageServerClient.ts

@@ -322,7 +322,6 @@ async function getCodeActions(
 ): Promise<vscode.CodeAction[]> {
     const uri = vscode.window.activeTextEditor!.document.uri;
     console.log(`Getting actions for ${uri.toString()}`);
-    await new Promise((r) => setTimeout(r, 5000));
     const codeActions = await vscode.commands.executeCommand<vscode.CodeAction[]>(
         'vscode.executeCodeActionProvider',
         uri,

test/lsptoolshost/integrationTests/codeactions.integration.test.ts

@@ -25,7 +25,9 @@ const config = {
         '@opentelemetry/tracing': 'commonjs @opentelemetry/tracing', // optional
     },
     resolve: { // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader
-        extensions: ['.ts', '.js']
+        extensions: ['.ts', '.js'],
+        conditionNames: ['import', 'require'],
+        mainFields: ['module', 'main'],
     },
     node: {
         __dirname: false //preserve the default node.js behavior for __dirname