respond to main changes for bundling

Author: dibarbet

src/lsptoolshost/autoInsert/onAutoInsertFeature.ts

@@ -22,7 +22,7 @@ import {
 } from 'vscode-languageserver-protocol';
 
 import * as RoslynProtocol from '../server/roslynProtocol';
-import { generateUuid } from 'vscode-languageclient/lib/common/utils/uuid';
+import { generateUuid } from 'vscode-languageclient/uuid';
 
 export class OnAutoInsertFeature implements DynamicFeature<RoslynProtocol.OnAutoInsertRegistrationOptions> {
     private readonly _client: LanguageClient;

src/lsptoolshost/diagnostics/fixAllCodeAction.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import * as RoslynProtocol from '../server/roslynProtocol';
 import { LSPAny } from 'vscode-languageserver-protocol';
 import { RoslynLanguageServer } from '../server/roslynLanguageServer';
-import { URIConverter, createConverter } from 'vscode-languageclient/lib/common/protocolConverter';
+import { URIConverter, createConverter } from 'vscode-languageclient/protocolConverter';
 import { UriConverter } from '../utils/uriConverter';
 
 export function registerCodeActionFixAllCommands(

src/lsptoolshost/diagnostics/nestedCodeAction.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { CodeAction, CodeActionResolveRequest, LSPAny } from 'vscode-languageserver-protocol';
 import { RoslynLanguageServer } from '../server/roslynLanguageServer';
-import { URIConverter, createConverter } from 'vscode-languageclient/lib/common/protocolConverter';
+import { URIConverter, createConverter } from 'vscode-languageclient/protocolConverter';
 import { UriConverter } from '../utils/uriConverter';
 import { getFixAllResponse } from './fixAllCodeAction';
 

src/omnisharp/engines/lspEngine.ts

@@ -23,16 +23,16 @@ import { Command } from 'vscode-languageserver-protocol';
 import { DynamicFeature, LanguageClientOptions, StaticFeature } from 'vscode-languageclient';
 import { RequestType, Trace } from 'vscode-jsonrpc';
 import { LanguageClient, ServerOptions } from 'vscode-languageclient/node';
-import { SelectionRangeFeature } from 'vscode-languageclient/lib/common/selectionRange';
-import { ColorProviderFeature } from 'vscode-languageclient/lib/common/colorProvider';
-import { WorkspaceFoldersFeature } from 'vscode-languageclient/lib/common/workspaceFolder';
-import { DeclarationFeature } from 'vscode-languageclient/lib/common/declaration';
-import { DocumentLinkFeature } from 'vscode-languageclient/lib/common/documentLink';
-import { InlineValueFeature } from 'vscode-languageclient/lib/common/inlineValue';
-import { DiagnosticFeature } from 'vscode-languageclient/lib/common/diagnostic';
-import { NotebookDocumentSyncFeature } from 'vscode-languageclient/lib/common/notebook';
-import { TypeHierarchyFeature } from 'vscode-languageclient/lib/common/typeHierarchy';
-import { CallHierarchyFeature } from 'vscode-languageclient/lib/common/callHierarchy';
+import { SelectionRangeFeature } from 'vscode-languageclient/selectionRange';
+import { ColorProviderFeature } from 'vscode-languageclient/colorProvider';
+import { WorkspaceFoldersFeature } from 'vscode-languageclient/workspaceFolder';
+import { DeclarationFeature } from 'vscode-languageclient/declaration';
+import { DocumentLinkFeature } from 'vscode-languageclient/documentLink';
+import { InlineValueFeature } from 'vscode-languageclient/inlineValue';
+import { DiagnosticFeature } from 'vscode-languageclient/diagnostic';
+import { NotebookDocumentSyncFeature } from 'vscode-languageclient/notebook';
+import { TypeHierarchyFeature } from 'vscode-languageclient/typeHierarchy';
+import { CallHierarchyFeature } from 'vscode-languageclient/callHierarchy';
 import { Advisor } from '../features/diagnosticsProvider';
 import dotnetTest from '../features/dotnetTest';
 

src/razor/src/document/razorDocumentManager.ts

@@ -19,7 +19,7 @@ import { RazorDocumentChangeKind } from './razorDocumentChangeKind';
 import { createDocument } from './razorDocumentFactory';
 import { razorInitializeCommand } from '../../../lsptoolshost/razor/razorCommands';
 import { PlatformInformation } from '../../../shared/platform';
-import { generateUuid } from 'vscode-languageclient/lib/common/utils/uuid';
+import { generateUuid } from 'vscode-languageclient/uuid';
 
 export class RazorDocumentManager implements IRazorDocumentManager {
     public roslynActivated = false;

tsconfig.json

@@ -9,6 +9,18 @@
         ],
         "paths": {
           "vscode-languageclient": ["./node_modules/vscode-languageclient/lib/common/api"],
+          "vscode-languageclient/callHierarchy": ["./node_modules/vscode-languageclient/lib/common/callHierarchy"],
+          "vscode-languageclient/typeHierarchy": ["./node_modules/vscode-languageclient/lib/common/typeHierarchy"],
+          "vscode-languageclient/notebook": ["./node_modules/vscode-languageclient/lib/common/notebook"],
+          "vscode-languageclient/diagnostic": ["./node_modules/vscode-languageclient/lib/common/diagnostic"],
+          "vscode-languageclient/inlineValue": ["./node_modules/vscode-languageclient/lib/common/inlineValue"],
+          "vscode-languageclient/documentLink": ["./node_modules/vscode-languageclient/lib/common/documentLink"],
+          "vscode-languageclient/declaration": ["./node_modules/vscode-languageclient/lib/common/declaration"],
+          "vscode-languageclient/workspaceFolder": ["./node_modules/vscode-languageclient/lib/common/workspaceFolder"],
+          "vscode-languageclient/colorProvider": ["./node_modules/vscode-languageclient/lib/common/colorProvider"],
+          "vscode-languageclient/selectionRange": ["./node_modules/vscode-languageclient/lib/common/selectionRange"],
+          "vscode-languageclient/protocolConverter": ["./node_modules/vscode-languageclient/lib/common/protocolConverter"],
+          "vscode-languageclient/uuid": ["./node_modules/vscode-languageclient/lib/common/utils/uuid"],
           "vscode-languageclient/node": ["./node_modules/vscode-languageclient/lib/node/main"],
           "vscode-languageserver-protocol": ["./node_modules/vscode-languageserver-protocol/lib/common/api"],
           "vscode-languageserver-protocol/node": ["./node_modules/vscode-languageserver-protocol/lib/node/main"],