lsp: Do not drop lsp buffer handle from editor when a language change leads to buffer having a legit language (#44469)

Fixes a bug that led to us unnecessarily restarting a language server
when we were looking at a single file of a given language.

Release Notes:

- Fixed a bug that led to Zed sometimes starting an excessive amount of
language servers
This commit is contained in:
Piotr Osiewicz 2025-12-09 21:37:39 +01:00 committed by GitHub
parent 5dd8561b06
commit 3180f44477
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 23 additions and 16 deletions

View file

@ -807,7 +807,7 @@ impl Copilot {
.ok();
}
language::BufferEvent::FileHandleChanged
| language::BufferEvent::LanguageChanged => {
| language::BufferEvent::LanguageChanged(_) => {
let new_language_id = id_for_language(buffer.read(cx).language());
let Ok(new_uri) = uri_for_buffer(&buffer, cx) else {
return Ok(());

View file

@ -22007,8 +22007,10 @@ impl Editor {
multi_buffer::Event::DiffHunksToggled => {
self.tasks_update_task = Some(self.refresh_runnables(window, cx));
}
multi_buffer::Event::LanguageChanged(buffer_id) => {
self.registered_buffers.remove(&buffer_id);
multi_buffer::Event::LanguageChanged(buffer_id, is_fresh_language) => {
if !is_fresh_language {
self.registered_buffers.remove(&buffer_id);
}
jsx_tag_auto_close::refresh_enabled_in_any_buffer(self, multibuffer, cx);
cx.emit(EditorEvent::Reparsed(*buffer_id));
cx.notify();

View file

@ -108,7 +108,7 @@ impl FileDiffView {
for buffer in [&old_buffer, &new_buffer] {
cx.subscribe(buffer, move |this, _, event, _| match event {
language::BufferEvent::Edited
| language::BufferEvent::LanguageChanged
| language::BufferEvent::LanguageChanged(_)
| language::BufferEvent::Reparsed => {
this.buffer_changes_tx.send(()).ok();
}

View file

@ -170,7 +170,7 @@ impl TextDiffView {
cx.subscribe(&source_buffer, move |this, _, event, _| match event {
language::BufferEvent::Edited
| language::BufferEvent::LanguageChanged
| language::BufferEvent::LanguageChanged(_)
| language::BufferEvent::Reparsed => {
this.buffer_changes_tx.send(()).ok();
}

View file

@ -1,8 +1,8 @@
pub mod row_chunk;
use crate::{
DebuggerTextObject, LanguageScope, Outline, OutlineConfig, RunnableCapture, RunnableTag,
TextObject, TreeSitterOptions,
DebuggerTextObject, LanguageScope, Outline, OutlineConfig, PLAIN_TEXT, RunnableCapture,
RunnableTag, TextObject, TreeSitterOptions,
diagnostic_set::{DiagnosticEntry, DiagnosticEntryRef, DiagnosticGroup},
language_settings::{LanguageSettings, language_settings},
outline::OutlineItem,
@ -353,7 +353,8 @@ pub enum BufferEvent {
/// The buffer is in need of a reload
ReloadNeeded,
/// The buffer's language was changed.
LanguageChanged,
/// The boolean indicates whether this buffer did not have a language before, but does now.
LanguageChanged(bool),
/// The buffer's syntax trees were updated.
Reparsed,
/// The buffer's diagnostics were updated.
@ -1386,10 +1387,12 @@ impl Buffer {
) {
self.non_text_state_update_count += 1;
self.syntax_map.lock().clear(&self.text);
self.language = language;
let old_language = std::mem::replace(&mut self.language, language);
self.was_changed();
self.reparse(cx, may_block);
cx.emit(BufferEvent::LanguageChanged);
let has_fresh_language =
self.language.is_some() && old_language.is_none_or(|old| old == *PLAIN_TEXT);
cx.emit(BufferEvent::LanguageChanged(has_fresh_language));
}
/// Assign a language registry to the buffer. This allows the buffer to retrieve

View file

@ -129,7 +129,7 @@ pub enum Event {
transaction_id: TransactionId,
},
Reloaded,
LanguageChanged(BufferId),
LanguageChanged(BufferId, bool),
Reparsed(BufferId),
Saved,
FileHandleChanged,
@ -2294,7 +2294,9 @@ impl MultiBuffer {
BufferEvent::Saved => Event::Saved,
BufferEvent::FileHandleChanged => Event::FileHandleChanged,
BufferEvent::Reloaded => Event::Reloaded,
BufferEvent::LanguageChanged => Event::LanguageChanged(buffer_id),
BufferEvent::LanguageChanged(has_language) => {
Event::LanguageChanged(buffer_id, *has_language)
}
BufferEvent::Reparsed => Event::Reparsed(buffer_id),
BufferEvent::DiagnosticsUpdated => Event::DiagnosticsUpdated,
BufferEvent::CapabilityChanged => {

View file

@ -1141,7 +1141,7 @@ impl BufferStore {
})
.log_err();
}
BufferEvent::LanguageChanged => {}
BufferEvent::LanguageChanged(_) => {}
_ => {}
}
}

View file

@ -1451,7 +1451,7 @@ impl GitStore {
match event {
BufferStoreEvent::BufferAdded(buffer) => {
cx.subscribe(buffer, |this, buffer, event, cx| {
if let BufferEvent::LanguageChanged = event {
if let BufferEvent::LanguageChanged(_) = event {
let buffer_id = buffer.read(cx).remote_id();
if let Some(diff_state) = this.diffs.get(&buffer_id) {
diff_state.update(cx, |diff_state, cx| {

View file

@ -219,7 +219,7 @@ struct UnifiedLanguageServer {
project_roots: HashSet<Arc<RelPath>>,
}
#[derive(Clone, Hash, PartialEq, Eq)]
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
struct LanguageServerSeed {
worktree_id: WorktreeId,
name: LanguageServerName,

View file

@ -124,7 +124,7 @@ impl ActiveToolchain {
&buffer,
window,
|this, _, event: &BufferEvent, window, cx| {
if matches!(event, BufferEvent::LanguageChanged) {
if matches!(event, BufferEvent::LanguageChanged(_)) {
this._update_toolchain_task = Self::spawn_tracker_task(window, cx);
}
},