Skip to content

Commit 9a7399c

Browse files
committed
fix: import errorHandler from monaco-vscode-api
1 parent 64e32e8 commit 9a7399c

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/languageClient.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as monaco from 'monaco-editor'
21
import {
32
CloseAction, ErrorAction, State
43
} from 'vscode-languageclient'
@@ -8,6 +7,7 @@ import {
87
import delay from 'delay'
98
import { CancellationToken, Emitter, NotificationType, RequestType, Event, LogMessageNotification } from 'vscode-languageserver-protocol'
109
import * as vscode from 'vscode'
10+
import { errorHandler } from 'vscode/monaco'
1111
import once from 'once'
1212
import { updateServices } from './services'
1313
import createLanguageClient from './createLanguageClient'
@@ -127,7 +127,7 @@ export class LanguageClientManager implements LanguageClient {
127127
}
128128

129129
private handleError = (error: Error) => {
130-
monaco.errorHandler.onUnexpectedError(new Error('[LSP] Language client error', {
130+
errorHandler.onUnexpectedError(new Error('[LSP] Language client error', {
131131
cause: error
132132
}))
133133
this.onErrorEmitter.fire(error)
@@ -160,7 +160,7 @@ export class LanguageClientManager implements LanguageClient {
160160
} catch (error) {
161161
this.languageClient = undefined
162162
this.startPromise = undefined
163-
monaco.errorHandler.onUnexpectedError(new Error(`[LSP] Unable to start language client, retrying in ${RETRY_CONNECTION_DELAY} ms`, {
163+
errorHandler.onUnexpectedError(new Error(`[LSP] Unable to start language client, retrying in ${RETRY_CONNECTION_DELAY} ms`, {
164164
cause: error as Error
165165
}))
166166
await delay(RETRY_CONNECTION_DELAY)
@@ -173,7 +173,7 @@ export class LanguageClientManager implements LanguageClient {
173173
try {
174174
await loadExtensionConfigurations([this.id], this.useMutualizedProxy)
175175
} catch (error) {
176-
monaco.errorHandler.onUnexpectedError(new Error('[LSP] Unable to load extension configuration', {
176+
errorHandler.onUnexpectedError(new Error('[LSP] Unable to load extension configuration', {
177177
cause: error as Error
178178
}))
179179
}
@@ -287,7 +287,7 @@ export class LanguageClientManager implements LanguageClient {
287287
])
288288
disposableCollection.dispose()
289289
}, (error: Error) => {
290-
monaco.errorHandler.onUnexpectedError(new Error(`[LSP] Error while waiting for the ${this.id} language client to be ready`, {
290+
errorHandler.onUnexpectedError(new Error(`[LSP] Error while waiting for the ${this.id} language client to be ready`, {
291291
cause: error
292292
}))
293293
})
@@ -311,7 +311,7 @@ export class LanguageClientManager implements LanguageClient {
311311
this.languageClient = undefined
312312
console.info('[LSP] Restarting language client', state)
313313
this.start().catch(error => {
314-
monaco.errorHandler.onUnexpectedError(new Error('[LSP] Language client stopped', {
314+
errorHandler.onUnexpectedError(new Error('[LSP] Language client stopped', {
315315
cause: error as Error
316316
}))
317317
})

src/services/CodinGameMonacoWorkspace.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {
33
} from 'monaco-languageclient'
44
import * as monaco from 'monaco-editor'
55
import * as vscode from 'vscode'
6+
import { errorHandler } from 'vscode/monaco'
67
import { Workspace } from 'vscode/services'
78
import { Event, Emitter, TextDocumentSaveReason } from 'vscode-languageserver-protocol'
89

@@ -81,7 +82,7 @@ export default class CodinGameMonacoWorkspace implements Workspace {
8182

8283
this.onDidSaveTextDocumentEmitter.fire(document)
8384
} catch (err) {
84-
monaco.errorHandler.onUnexpectedError(new Error(`[LSP] Unable to save file on language server: ${document.uri.toString()}`, {
85+
errorHandler.onUnexpectedError(new Error(`[LSP] Unable to save file on language server: ${document.uri.toString()}`, {
8586
cause: err as Error
8687
}))
8788
}
@@ -104,7 +105,7 @@ export default class CodinGameMonacoWorkspace implements Workspace {
104105
timeoutMap.set(uri, window.setTimeout(() => {
105106
timeoutMap.delete(uri)
106107
this.saveDocument(e.document, TextDocumentSaveReason.AfterDelay).catch((error: Error) => {
107-
monaco.errorHandler.onUnexpectedError(new Error(`[LSP] Unable to save the document ${uri}`, {
108+
errorHandler.onUnexpectedError(new Error(`[LSP] Unable to save the document ${uri}`, {
108109
cause: error
109110
}))
110111
})

0 commit comments

Comments
 (0)