Issue diagnostics, even if empty. (#1478)

tweag · Jul 27, 2023 · de3d87d · de3d87d
1 parent b6646a8
commit de3d87d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/lsp/nls/src/files.rs b/lsp/nls/src/files.rs
@@ -74,9 +74,8 @@ pub fn handle_save(server: &mut Server, params: DidChangeTextDocumentParams) ->
     parse_and_typecheck(server, file_id)?;
 
     for f in &invalid {
-        if let Err(e) = typecheck(server, *f) {
-            server.issue_diagnostics(*f, e);
-        }
+        let errors = typecheck(server, *f).err().unwrap_or_default();
+        server.issue_diagnostics(*f, errors);
     }
     Trace::reply(id);
     Ok(())
@@ -105,15 +104,15 @@ fn parse_and_typecheck(server: &mut Server, file_id: FileId) -> Result<()> {
         Ok(errs) => (errs.inner(), false),
         Err(errs) => (errs, true),
     };
-    let diags = parse_errs.into_diagnostics(server.cache.files_mut(), None);
-    server.issue_diagnostics(file_id, diags);
+    let mut diags = parse_errs.into_diagnostics(server.cache.files_mut(), None);
 
     if !fatal {
         trace!("Parsed, checking types");
         if let Err(e) = typecheck(server, file_id) {
-            server.issue_diagnostics(file_id, e);
+            diags.extend_from_slice(&e);
         }
     }
+    server.issue_diagnostics(file_id, diags);
 
     Ok(())
 }
diff --git a/lsp/nls/src/server.rs b/lsp/nls/src/server.rs
@@ -284,15 +284,15 @@ impl Server {
             .flat_map(|d| lsp_types::Diagnostic::from_codespan(d, self.cache.files_mut()))
             .collect();
 
-        if !diagnostics.is_empty() {
-            self.notify(lsp_server::Notification::new(
-                "textDocument/publishDiagnostics".into(),
-                PublishDiagnosticsParams {
-                    uri,
-                    diagnostics,
-                    version: None,
-                },
-            ));
-        }
+        // Issue diagnostics even if they're empty (empty diagnostics are how the editor knows
+        // that any previous errors were resolved).
+        self.notify(lsp_server::Notification::new(
+            "textDocument/publishDiagnostics".into(),
+            PublishDiagnosticsParams {
+                uri,
+                diagnostics,
+                version: None,
+            },
+        ));
     }
 }