Skip to content

Commit 954ddfb

Browse files
committed
feat: Remove configuration/language server config props
And replace it by the language server id
1 parent 0a7a3dc commit 954ddfb

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

src/LanguageClient.tsx

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,39 @@
11
import { ReactElement, useEffect, useRef } from 'react'
2-
import { createLanguageClientManager, LanguageServerConfig, StatusChangeEvent } from '@codingame/monaco-languageclient-wrapper'
2+
import { createLanguageClientManager, StatusChangeEvent } from '@codingame/monaco-languageclient-wrapper'
33
import { LanguageClientManager } from '@codingame/monaco-languageclient-wrapper/dist/languageClient'
44

55
export interface LanguageClientProps {
6-
languageServerConfig: LanguageServerConfig
6+
id: string
77
languageServerUrl: string
88
getSecurityToken: () => Promise<string>
99
libraryUrls?: string[]
1010
onError?: (error: Error) => void
11-
onDidChangeStatus?: (status: StatusChangeEvent) => void,
12-
configuration?: any
11+
onDidChangeStatus?: (status: StatusChangeEvent) => void
1312
}
1413

1514
const defaultLibraryUrls: string[] = []
1615

1716
function LanguageClient ({
18-
languageServerConfig,
17+
id,
1918
languageServerUrl,
2019
getSecurityToken,
2120
libraryUrls = defaultLibraryUrls,
2221
onError,
23-
onDidChangeStatus,
24-
configuration
22+
onDidChangeStatus
2523
}: LanguageClientProps): ReactElement | null {
2624
const onErrorRef = useRef<(error: Error) => void>()
2725
const onDidChangeStatusRef = useRef<(status: StatusChangeEvent) => void>()
2826
const languageClientRef = useRef<LanguageClientManager>()
2927
useEffect(() => {
30-
console.info(`Starting language server for language ${languageServerConfig.language}`)
31-
const languageClient = createLanguageClientManager(languageServerUrl, getSecurityToken, languageServerConfig, libraryUrls)
28+
console.info(`Starting language server for language ${id}`)
29+
const languageClient = createLanguageClientManager(id, languageServerUrl, getSecurityToken, libraryUrls)
3230
languageClientRef.current = languageClient
33-
const errorDisposable = languageClient.onError((error) => {
31+
const errorDisposable = languageClient.onError((error: Error) => {
3432
if (onErrorRef.current != null) {
3533
onErrorRef.current(error)
3634
}
3735
})
38-
const statusChangeDisposable = languageClient.onDidChangeStatus(status => {
36+
const statusChangeDisposable = languageClient.onDidChangeStatus((status: StatusChangeEvent) => {
3937
if (onDidChangeStatusRef.current != null) {
4038
onDidChangeStatusRef.current(status)
4139
}
@@ -53,13 +51,7 @@ function LanguageClient ({
5351
console.error('Unable to dispose language client', err)
5452
})
5553
}
56-
}, [getSecurityToken, languageServerConfig, languageServerUrl, libraryUrls])
57-
58-
useEffect(() => {
59-
if (configuration != null) {
60-
languageClientRef.current!.updateConfiguration(configuration)
61-
}
62-
}, [configuration])
54+
}, [getSecurityToken, id, languageServerUrl, libraryUrls])
6355

6456
useEffect(() => {
6557
onErrorRef.current = onError

0 commit comments

Comments
 (0)