Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not detach reparse tasks (#25934)

Browse source 
Drop previous reparse task, if a new one is spawned.

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2025-03-03 22:41:46 +02:00 • committed by GitHub
parent dc3158c8ce
commit bf6cc2697a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/language/src/buffer.rs
View file

@ -110,7 +110,7 @@ pub struct Buffer {
pending_autoindent: Option<Task<()>>, pending_autoindent: Option<Task<()>>,
sync_parse_timeout: Duration, sync_parse_timeout: Duration,
syntax_map: Mutex<SyntaxMap>, syntax_map: Mutex<SyntaxMap>,
parsing_in_background: bool, reparse: Option<Task<()>>,
parse_status: (watch::Sender<ParseStatus>, watch::Receiver<ParseStatus>), parse_status: (watch::Sender<ParseStatus>, watch::Receiver<ParseStatus>),
non_text_state_update_count: usize, non_text_state_update_count: usize,
diagnostics: SmallVec<[(LanguageServerId, DiagnosticSet); 2]>, diagnostics: SmallVec<[(LanguageServerId, DiagnosticSet); 2]>,
@ -964,7 +964,7 @@ impl Buffer {
file, file,
capability, capability,
syntax_map, syntax_map,
parsing_in_background: false, reparse: None,
non_text_state_update_count: 0, non_text_state_update_count: 0,
sync_parse_timeout: Duration::from_millis(1), sync_parse_timeout: Duration::from_millis(1),
parse_status: async_watch::channel(ParseStatus::Idle), parse_status: async_watch::channel(ParseStatus::Idle),
@ -1420,7 +1420,7 @@ impl Buffer {
/// Whether the buffer is being parsed in the background. /// Whether the buffer is being parsed in the background.
#[cfg(any(test, feature = "test-support"))] #[cfg(any(test, feature = "test-support"))]
pub fn is_parsing(&self) -> bool { pub fn is_parsing(&self) -> bool {
self.parsing_in_background self.reparse.is_some()
} }
/// Indicates whether the buffer contains any regions that may be /// Indicates whether the buffer contains any regions that may be
@ -1458,7 +1458,7 @@ impl Buffer {
/// for the same buffer, we only initiate a new parse if we are not already /// for the same buffer, we only initiate a new parse if we are not already
/// parsing in the background. /// parsing in the background.
pub fn reparse(&mut self, cx: &mut Context<Self>) { pub fn reparse(&mut self, cx: &mut Context<Self>) {
if self.parsing_in_background { if self.reparse.is_some() {
return; return;
} }
let language = if let Some(language) = self.language.clone() { let language = if let Some(language) = self.language.clone() {
@ -1492,10 +1492,10 @@ impl Buffer {
{ {
Ok(new_syntax_snapshot) => { Ok(new_syntax_snapshot) => {
self.did_finish_parsing(new_syntax_snapshot, cx); self.did_finish_parsing(new_syntax_snapshot, cx);
self.reparse = None;
} }
Err(parse_task) => { Err(parse_task) => {
self.parsing_in_background = true; self.reparse = Some(cx.spawn(move |this, mut cx| async move {
cx.spawn(move |this, mut cx| async move {
let new_syntax_map = parse_task.await; let new_syntax_map = parse_task.await;
this.update(&mut cx, move |this, cx| { this.update(&mut cx, move |this, cx| {
let grammar_changed = let grammar_changed =
@ -1511,14 +1511,13 @@ impl Buffer {
|| grammar_changed || grammar_changed
|| this.version.changed_since(&parsed_version); || this.version.changed_since(&parsed_version);
this.did_finish_parsing(new_syntax_map, cx); this.did_finish_parsing(new_syntax_map, cx);
this.parsing_in_background = false; this.reparse = None;
if parse_again { if parse_again {
this.reparse(cx); this.reparse(cx);
} }
}) })
.ok(); .ok();
}) }));
.detach();
} }
} }
} }