Skip to content

Add configuration prop #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@codingame/monaco-languageclient-react",
"version": "1.0.1",
"version": "1.0.2",
"description": "Monaco Editor React component",
"scripts": {
"build": "tsc"
Expand Down
25 changes: 17 additions & 8 deletions src/LanguageClient.tsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,35 @@
import { ReactElement, useEffect, useRef } from 'react'
import { createLanguageClientManager, LanguageServerConfig, StatusChangeEvent } from '@codingame/monaco-languageclient-wrapper'
import { LanguageClientManager } from '@codingame/monaco-languageclient-wrapper/dist/languageClient'

export interface LanguageClientProps {
languageServerConfig: LanguageServerConfig
languageServerUrl: string
getSecurityToken: () => Promise<string>
libraryUrls?: string[]
onError?: (error: Error) => void
onDidChangeStatus?: (status: StatusChangeEvent) => void
onDidChangeStatus?: (status: StatusChangeEvent) => void,
configuration?: any
}

const defaultLibraryUrls: string[] = []

function LanguageClient ({
languageServerConfig,
languageServerUrl,
getSecurityToken,
libraryUrls,
libraryUrls = defaultLibraryUrls,
onError,
onDidChangeStatus
onDidChangeStatus,
configuration
}: LanguageClientProps): ReactElement | null {
const onErrorRef = useRef<(error: Error) => void>()
const onDidChangeStatusRef = useRef<(status: StatusChangeEvent) => void>()
const languageClientRef = useRef<LanguageClientManager>()
useEffect(() => {
console.info(`Starting language server for language ${languageServerConfig.language}`)
const languageClient = createLanguageClientManager(languageServerUrl, getSecurityToken, languageServerConfig, libraryUrls ?? [])
const languageClient = createLanguageClientManager(languageServerUrl, getSecurityToken, languageServerConfig, libraryUrls)
languageClientRef.current = languageClient
const errorDisposable = languageClient.onError((error) => {
if (onErrorRef.current != null) {
onErrorRef.current(error)
Expand All @@ -48,6 +55,12 @@ function LanguageClient ({
}
}, [getSecurityToken, languageServerConfig, languageServerUrl, libraryUrls])

useEffect(() => {
if (configuration != null) {
languageClientRef.current!.updateConfiguration(configuration)
}
}, [configuration])

useEffect(() => {
onErrorRef.current = onError
}, [onError])
Expand All @@ -59,8 +72,4 @@ function LanguageClient ({
return null
}

LanguageClient.defaultProps = {
libraryUrls: []
}

export default LanguageClient