Merge pull request #80 from CodinGame/fix-imports

Do not import via monaco-languageclient

Author: CGNonofr

src/extensions.ts

@@ -1,9 +1,9 @@
 import { monaco, registerTextModelContentProvider } from '@codingame/monaco-editor-wrapper'
 import {
-  Disposable, MonacoLanguageClient, DisposableCollection
+  MonacoLanguageClient, DisposableCollection
 } from 'monaco-languageclient'
 import { StaticFeature, FeatureState } from 'vscode-languageclient/lib/common/api'
-import { DidSaveTextDocumentNotification, DocumentSelector, Emitter, ServerCapabilities, TextDocumentSyncOptions } from 'vscode-languageserver-protocol'
+import { DidSaveTextDocumentNotification, Disposable, DocumentSelector, Emitter, ServerCapabilities, TextDocumentSyncOptions } from 'vscode-languageserver-protocol'
 import * as vscode from 'vscode'
 import { willShutdownNotificationType, WillShutdownParams } from './customRequests'
 import { Infrastructure } from './infrastructure'

src/extensions/csharp.ts

@@ -1,5 +1,6 @@
-import { MonacoLanguageClient, ProtocolRequestType } from 'monaco-languageclient'
+import { MonacoLanguageClient } from 'monaco-languageclient'
 import { Uri, ExtensionContext, workspace, CancellationToken } from 'vscode'
+import { ProtocolRequestType } from 'vscode-languageserver-protocol'
 import { ExtensionFeature } from './tools'
 
 const OmnisharpMetadataRequestType = new ProtocolRequestType<{

src/extensions/tools.ts

@@ -1,8 +1,7 @@
-import {
-  Disposable, DocumentSelector, ServerCapabilities
-} from 'monaco-languageclient'
+
 import { ExtensionContext } from 'vscode'
 import { FeatureState, StaticFeature } from 'vscode-languageclient/lib/browser/main'
+import { Disposable, DocumentSelector, ServerCapabilities } from 'vscode-languageserver-protocol'
 
 export function unsupported (): never {
   throw new Error('unsupported')

src/languageClientOptions.ts

@@ -1,5 +1,6 @@
-import { Disposable, LanguageClientOptions as MonacoLanguageClientOptions, MonacoLanguageClient } from 'monaco-languageclient'
+import { LanguageClientOptions as MonacoLanguageClientOptions, MonacoLanguageClient } from 'monaco-languageclient'
 import { StaticFeature, DynamicFeature } from 'vscode-languageclient/lib/common/api'
+import { Disposable } from 'vscode-languageserver-protocol'
 import staticOptions, { StaticLanguageClientId } from './staticOptions'
 
 export type LanguageClientOptions = Pick<MonacoLanguageClientOptions, 'documentSelector' | 'synchronize' | 'initializationOptions' | 'middleware'> & {

src/services/CodinGameMonacoWorkspace.ts

@@ -1,11 +1,11 @@
 import {
-  Disposable, DisposableCollection
+  DisposableCollection
 } from 'monaco-languageclient'
 import * as monaco from 'monaco-editor'
 import * as vscode from 'vscode'
 import { errorHandler } from 'vscode/monaco'
 import { Workspace } from 'vscode/services'
-import { Event, Emitter, TextDocumentSaveReason } from 'vscode-languageserver-protocol'
+import { Event, Emitter, TextDocumentSaveReason, Disposable } from 'vscode-languageserver-protocol'
 
 export interface ITextModelContentSaveHandler {
   saveTextContent(document: vscode.TextDocument, reason: TextDocumentSaveReason): Promise<void>