temp clear push diagnostic result for pull_diagnostic

Author: CppCXY

crates/emmylua_ls/src/context/file_diagnostic.rs

@@ -2,6 +2,7 @@ use std::{collections::HashMap, sync::Arc, time::Duration};
 
 use emmylua_code_analysis::{EmmyLuaAnalysis, FileId, Profile};
 use log::{debug, info};
+use lsp_types::{Diagnostic, Uri};
 use tokio::sync::{Mutex, RwLock};
 use tokio_util::sync::CancellationToken;
 
@@ -85,7 +86,7 @@ impl FileDiagnostic {
     }
 
     /// 清除指定文件的诊断信息
-    pub async fn clear_file_diagnostics(&self, uri: lsp_types::Uri) {
+    pub fn clear_file_diagnostics(&self, uri: lsp_types::Uri) {
         let diagnostic_param = lsp_types::PublishDiagnosticsParams {
             uri,
             diagnostics: vec![],
@@ -128,6 +129,22 @@ impl FileDiagnostic {
         }
         tokens.clear();
     }
+
+    pub async fn pull_file_diagnostics(
+        &self,
+        uri: Uri,
+        cancel_token: CancellationToken,
+    ) -> Vec<Diagnostic> {
+        let analysis = self.analysis.read().await;
+        let Some(file_id) = analysis.get_file_id(&uri) else {
+            return vec![];
+        };
+
+        self.clear_file_diagnostics(uri);
+
+        let diagnostics = analysis.diagnose_file(file_id, cancel_token);
+        diagnostics.unwrap_or_default()
+    }
 }
 
 async fn workspace_diagnostic(

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

@@ -15,13 +15,10 @@ pub async fn on_pull_document_diagnostic(
     token: CancellationToken,
 ) -> DocumentDiagnosticReportResult {
     let uri = params.text_document.uri;
-    let analysis = context.analysis().read().await;
-    let Some(file_id) = analysis.get_file_id(&uri) else {
-        return default_diagnostic_report();
-    };
-
-    let analysis = context.analysis().read().await;
-    let diagnostics = analysis.diagnose_file(file_id, token).unwrap_or_default();
+    let diagnostics = context
+        .file_diagnostic()
+        .pull_file_diagnostics(uri, token)
+        .await;
 
     DocumentDiagnosticReport::Full(RelatedFullDocumentDiagnosticReport {
         related_documents: None,
@@ -33,17 +30,6 @@ pub async fn on_pull_document_diagnostic(
     .into()
 }
 
-fn default_diagnostic_report() -> DocumentDiagnosticReportResult {
-    DocumentDiagnosticReport::Full(RelatedFullDocumentDiagnosticReport {
-        related_documents: None,
-        full_document_diagnostic_report: FullDocumentDiagnosticReport {
-            result_id: None,
-            items: vec![],
-        },
-    })
-    .into()
-}
-
 pub struct DocumentDiagnosticCapabilities;
 
 impl RegisterCapabilities for DocumentDiagnosticCapabilities {

crates/emmylua_ls/src/handlers/text_document/text_document_handler.rs

@@ -121,8 +121,7 @@ pub async fn on_did_close_document(
 
         context
             .file_diagnostic()
-            .clear_file_diagnostics(uri.clone())
-            .await;
+            .clear_file_diagnostics(uri.clone());
 
         return Some(());
     }
@@ -142,8 +141,7 @@ pub async fn on_did_close_document(
         // 发送空诊断消息以清除客户端显示的诊断
         context
             .file_diagnostic()
-            .clear_file_diagnostics(uri.clone())
-            .await;
+            .clear_file_diagnostics(uri.clone());
     }
 
     Some(())

crates/emmylua_ls/src/handlers/text_document/watched_file_handler.rs

@@ -23,8 +23,7 @@ pub async fn on_did_change_watched_files(
                     // 发送空诊断消息以清除客户端显示的诊断
                     context
                         .file_diagnostic()
-                        .clear_file_diagnostics(file_event.uri)
-                        .await;
+                        .clear_file_diagnostics(file_event.uri);
                     continue;
                 }