Merge branch 'main' into window_context_2

2023-04-21 10:58:08 +02:00
parent d32a7218cd 8e4cc549dc
commit c76b9794e4
45 changed files with 1760 additions and 882 deletions
@@ -436,6 +436,7 @@ mod tests {
    use indoc::indoc;

    use language::{Diagnostic, DiagnosticSet};
+    use lsp::LanguageServerId;
    use project::HoverBlock;
    use smol::stream::StreamExt;

@@ -620,7 +621,7 @@ mod tests {
                }],
                &snapshot,
            );
-            buffer.update_diagnostics(set, cx);
+            buffer.update_diagnostics(LanguageServerId(0), set, cx);
        });

        // Hover pops diagnostic immediately