Merge pull request #13 from CodinGame/add-dynamic-options

Add dynamic options and simplify status

Author: CGNonofr

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-languageclient-wrapper",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "private": false,
   "description": "Enhanced Monaco editor with TextMate grammars and more",
   "scripts": {
@@ -21,7 +21,7 @@
   ],
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@codingame/monaco-editor-wrapper": "^1.5.0",
+    "@codingame/monaco-editor-wrapper": "^1.6.0",
     "once": "^1.4.0",
     "sweetalert": "^2.1.2"
   },
@@ -35,25 +35,23 @@
     "@codingame/monaco-jsonrpc": "^0.3.1",
     "@codingame/monaco-languageclient": "^0.17.4",
     "@rollup/plugin-alias": "3.1.9",
-    "@rollup/plugin-babel": "5.3.0",
-    "@rollup/plugin-commonjs": "21.0.1",
+    "@rollup/plugin-babel": "5.3.1",
+    "@rollup/plugin-commonjs": "21.0.2",
     "@rollup/plugin-eslint": "8.0.1",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.1.3",
-    "@rollup/plugin-typescript": "^8.3.0",
+    "@rollup/plugin-typescript": "^8.3.1",
     "@types/once": "^1.4.0",
     "@types/rollup-plugin-node-builtins": "^2.1.2",
     "@types/vscode": "^1.64.0",
     "@typescript-eslint/eslint-plugin": "5.12.1",
     "@typescript-eslint/parser": "5.12.1",
-    "babel-eslint": "10.1.0",
     "eslint": "8.9.0",
     "eslint-config-standard": "16.0.3",
     "eslint-config-standard-jsx": "10.0.0",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "6.0.0",
-    "eslint-plugin-standard": "5.0.0",
     "eslint-plugin-unused-imports": "2.0.0",
     "proxy-polyfill": "^0.3.2",
     "rollup": "2.68.0",

package.json

@@ -2,11 +2,11 @@ import { createWebSocketConnection, ConsoleLogger, toSocket, MessageSignature }
 import { Uri } from 'monaco-editor'
 import {
   MonacoLanguageClient,
-  createConnection, ConnectionErrorHandler, ConnectionCloseHandler, IConnection, Middleware, ErrorHandler, IConnectionProvider, InitializeParams, RegistrationRequest, RegistrationParams, UnregistrationRequest, UnregistrationParams
+  createConnection, ConnectionErrorHandler, ConnectionCloseHandler, IConnection, Middleware, ErrorHandler, IConnectionProvider, InitializeParams, RegistrationRequest, RegistrationParams, UnregistrationRequest, UnregistrationParams, LanguageClientOptions
 } from '@codingame/monaco-languageclient'
 import once from 'once'
 import { registerExtensionFeatures } from './extensions'
-import { LanguageClientId, StaticLanguageClientOptions } from './staticOptions'
+import { LanguageClientId } from './languageClientOptions'
 
 async function openConnection (url: URL | string, errorHandler: ConnectionErrorHandler, closeHandler: () => void): Promise<IConnection> {
   return new Promise((resolve, reject) => {
@@ -128,7 +128,7 @@ function createLanguageClient (
     documentSelector,
     synchronize,
     initializationOptions
-  }: StaticLanguageClientOptions,
+  }: LanguageClientOptions,
   languageServerAddress: string,
   getSecurityToken: () => Promise<string>,
   libraryUrls: string[],

src/createLanguageClient.ts

@@ -1,5 +1,5 @@
 import { loadConfigurationForExtension } from '@codingame/monaco-editor-wrapper/dist/features/extensionConfigurations'
-import staticOptions, { LanguageClientId } from './staticOptions'
+import { getLanguageClientOptions, LanguageClientId } from './languageClientOptions'
 
 /**
  * Load the configuration schemas from vscode extensions
@@ -9,7 +9,7 @@ import staticOptions, { LanguageClientId } from './staticOptions'
 export async function loadExtensionConfigurations (forLanguageClientIds: LanguageClientId[], useMutualizedProxy: boolean): Promise<void> {
   const extensionConfigurationToLoad = new Set<string>()
   for (const languageClientId of forLanguageClientIds) {
-    const config = staticOptions[languageClientId]
+    const config = getLanguageClientOptions(languageClientId)
     if (!config.mutualizable || !useMutualizedProxy) {
       config.vscodeExtensionIds?.forEach(extensionId => {
         extensionConfigurationToLoad.add(extensionId)