diff --git a/crates/lsp/src/providers/initialization.rs b/crates/lsp/src/providers/initialization.rs index 947526c..169f535 100644 --- a/crates/lsp/src/providers/initialization.rs +++ b/crates/lsp/src/providers/initialization.rs @@ -13,10 +13,7 @@ use crate::{notifications, Backend}; #[serde(rename_all = "camelCase")] struct InitializationOptions { rayon_threads: i32, - native_content_path: PathBuf, - game_directory: PathBuf, - content_repositories: Vec, - enable_syntax_analysis: bool + native_content_path: PathBuf } impl Backend { @@ -55,11 +52,6 @@ impl Backend { self.reporter.log_error("Invalid native_content_path").await; } } - - let mut config = self.config.write().await; - config.game_directory = val.game_directory; - config.content_repositories = val.content_repositories; - config.enable_syntax_analysis = val.enable_syntax_analysis; }, Err(err) => { self.reporter.log_error(format!("InitializationOptions deserialization fail: {}", err)).await; @@ -162,6 +154,8 @@ impl Backend { register_options: None } ]).await.unwrap(); + + self.fetch_config().await; self.setup_workspace_content_scanners().await; self.setup_repository_content_scanners().await; diff --git a/editors/vscode/src/lsp/lang_client.ts b/editors/vscode/src/lsp/lang_client.ts index 49b5ef9..1a43ccd 100644 --- a/editors/vscode/src/lsp/lang_client.ts +++ b/editors/vscode/src/lsp/lang_client.ts @@ -33,10 +33,7 @@ export async function createLanguageClient(ctx: vscode.ExtensionContext, cfg: co const initializationOptions: InitializationOptions = { rayonThreads: cfg.rayonThreads, - nativeContentPath: nativeContentPath, - gameDirectory: cfg.gameDirectory, - contentRepositories: cfg.contentRepositories, - enableSyntaxAnalysis: cfg.enableSyntaxAnalysis + nativeContentPath: nativeContentPath }; const clientOptions: lsp.LanguageClientOptions = { @@ -93,10 +90,7 @@ export async function createLanguageClient(ctx: vscode.ExtensionContext, cfg: co // Configuration needed by the server. The format in both client and server must match! interface InitializationOptions { rayonThreads: number, - nativeContentPath: string, - gameDirectory: string, - contentRepositories: string[] - enableSyntaxAnalysis: boolean + nativeContentPath: string }