Skip to content

Commit 75ac19d

Browse files
committed
refactor: Use disposableCollection to simplify code
1 parent b31fbb2 commit 75ac19d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/languageClient.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as monaco from 'monaco-editor'
22
import {
3-
CloseAction, ErrorAction, Disposable, MonacoLanguageClient, Emitter, Event, TextDocument, Services, State
3+
CloseAction, ErrorAction, MonacoLanguageClient, Emitter, Event, TextDocument, Services, State, DisposableCollection
44
} from '@codingame/monaco-languageclient'
55
import delay from 'delay'
66
import { Uri } from 'monaco-editor'
@@ -206,14 +206,14 @@ export class LanguageClientManager implements LanguageClient {
206206
case State.Starting: {
207207
this.updateStatus('connecting')
208208
readyPromise = languageClient.onReady().then(async () => {
209-
let disposable: Disposable | null = null
209+
const disposableCollection = new DisposableCollection()
210210
await Promise.race([
211211
new Promise<void>(resolve => {
212-
disposable = onServerResponse.event(resolve)
212+
disposableCollection.push(onServerResponse.event(resolve))
213213
}),
214214
delay(15000)
215215
])
216-
disposable!.dispose()
216+
disposableCollection.dispose()
217217
}, error => {
218218
console.error('[LSP]', 'Error while waiting for the language client to be ready', error)
219219
})

0 commit comments

Comments
 (0)