Merge pull request #856 from Davidyz/fix/analyze_after_initialized

fix: don't drop inbound `workspace/didChangeConfiguration` notifications

Author: CppCXY

crates/emmylua_ls/src/context/workspace_manager.rs

@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 use std::path::Path;
-use std::sync::atomic::{AtomicBool, AtomicI64, AtomicU8, Ordering};
+use std::sync::atomic::{AtomicI64, AtomicU8, Ordering};
 use std::{path::PathBuf, sync::Arc, time::Duration};
 
 use super::{ClientProxy, FileDiagnostic, StatusBar};
@@ -26,7 +26,6 @@ pub struct WorkspaceManager {
     pub watcher: Option<notify::RecommendedWatcher>,
     pub current_open_files: HashSet<Uri>,
     pub match_file_pattern: WorkspaceFileMatcher,
-    pub workspace_initialized: Arc<AtomicBool>,
     workspace_diagnostic_level: Arc<AtomicU8>,
     workspace_version: Arc<AtomicI64>,
 }
@@ -51,24 +50,13 @@ impl WorkspaceManager {
             watcher: None,
             current_open_files: HashSet::new(),
             match_file_pattern: WorkspaceFileMatcher::default(),
-            workspace_initialized: Arc::new(AtomicBool::new(false)),
             workspace_diagnostic_level: Arc::new(AtomicU8::new(
                 WorkspaceDiagnosticLevel::Fast.to_u8(),
             )),
             workspace_version: Arc::new(AtomicI64::new(0)),
         }
     }
 
-    pub fn is_workspace_initialized(&self) -> bool {
-        self.workspace_initialized
-            .load(std::sync::atomic::Ordering::SeqCst)
-    }
-
-    pub fn set_workspace_initialized(&self) {
-        self.workspace_initialized
-            .store(true, std::sync::atomic::Ordering::SeqCst);
-    }
-
     pub fn get_workspace_diagnostic_level(&self) -> WorkspaceDiagnosticLevel {
         let value = self.workspace_diagnostic_level.load(Ordering::Acquire);
         WorkspaceDiagnosticLevel::from_u8(value)

crates/emmylua_ls/src/handlers/configuration/mod.rs

@@ -12,18 +12,13 @@ pub async fn on_did_change_configuration(
     log::info!("on_did_change_configuration: {}", pretty_json);
 
     // Check initialization status and get client config
-    let (is_initialized, client_id, supports_config_request) = {
+    let (client_id, supports_config_request) = {
         let workspace_manager = context.workspace_manager().read().await;
-        let is_initialized = workspace_manager.is_workspace_initialized();
         let client_id = workspace_manager.client_config.client_id;
         let supports_config_request = context.lsp_features().supports_config_request();
-        (is_initialized, client_id, supports_config_request)
+        (client_id, supports_config_request)
     };
 
-    if !is_initialized {
-        return Some(());
-    }
-
     if client_id.is_vscode() {
         return Some(());
     }

crates/emmylua_ls/src/handlers/initialized/mod.rs

@@ -77,6 +77,15 @@ pub async fn initialized_handler(
     // init std lib
     init_std_lib(context.analysis(), &cmd_args, emmyrc.clone()).await;
 
+    {
+        let mut workspace_manager = context.workspace_manager().write().await;
+        workspace_manager.client_config = client_config.clone();
+        let (include, exclude, exclude_dir) = calculate_include_and_exclude(&emmyrc);
+        workspace_manager.match_file_pattern =
+            WorkspaceFileMatcher::new(include, exclude, exclude_dir);
+        log::info!("workspace manager updated with client config and watch file patterns")
+    }
+
     init_analysis(
         context.analysis(),
         context.status_bar(),
@@ -86,15 +95,7 @@ pub async fn initialized_handler(
         emmyrc.clone(),
     )
     .await;
-    {
-        let mut workspace_manager = context.workspace_manager().write().await;
-        workspace_manager.client_config = client_config.clone();
-        let (include, exclude, exclude_dir) = calculate_include_and_exclude(&emmyrc);
-        workspace_manager.match_file_pattern =
-            WorkspaceFileMatcher::new(include, exclude, exclude_dir);
-        workspace_manager.set_workspace_initialized();
-        log::info!("workspace manager initialized");
-    }
+
     register_files_watch(context.clone(), &params.capabilities).await;
     Some(())
 }

crates/emmylua_ls/src/server/message_processor.rs

@@ -30,10 +30,7 @@ impl ServerMessageProcessor {
             Message::Response(_) => true,
             // Allow specific notifications
             Message::Notification(notify) => {
-                matches!(
-                    notify.method.as_str(),
-                    "workspace/didChangeConfiguration" | "$/cancelRequest" | "initialized"
-                )
+                matches!(notify.method.as_str(), "$/cancelRequest" | "initialized")
             }
             // Don't process other requests during initialization
             Message::Request(_) => false,