Ensure documents are synced before calculating completions

facebook · Jan 11, 2024 · 01dcf08 · 01dcf08
1 parent 1384f89
commit 01dcf08
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/compiler/crates/relay-lsp/src/server/lsp_state.rs b/compiler/crates/relay-lsp/src/server/lsp_state.rs
@@ -574,3 +574,11 @@ pub(crate) fn handle_lsp_state_tasks<
         }
     }
 }
+
+struct Guard<'a>(&'a mut bool);
+
+impl<'a> Drop for Guard<'a> {
+    fn drop(&mut self) {
+        *self.0 = false;
+    }
+}
diff --git a/compiler/crates/relay-lsp/src/server/mod.rs b/compiler/crates/relay-lsp/src/server/mod.rs
@@ -191,6 +191,12 @@ fn next_task(
     }
 }
 
+static SERIAL_NOTIFICATIONS: [&str; 3] = [
+    "textDocument/didChange",
+    "textDocument/didOpen",
+    "textDocument/didClose",
+];
+
 struct LSPTaskProcessor;
 
 impl<TPerfLogger: PerfLogger + 'static, TSchemaDocumentation: SchemaDocumentation + 'static>
@@ -210,6 +216,15 @@ impl<TPerfLogger: PerfLogger + 'static, TSchemaDocumentation: SchemaDocumentatio
             }
         }
     }
+
+    fn requires_serial_execution(&self, task: &Task) -> bool {
+        match task {
+            Task::InboundMessage(Message::Notification(notification)) => {
+                SERIAL_NOTIFICATIONS.contains(&notification.method.as_str())
+            }
+            _ => false,
+        }
+    }
 }
 
 fn handle_request<TPerfLogger: PerfLogger + 'static, TSchemaDocumentation: SchemaDocumentation>(

diff --git a/compiler/crates/relay-lsp/src/server/task_queue.rs b/compiler/crates/relay-lsp/src/server/task_queue.rs
@@ -22,6 +22,8 @@ pub struct TaskQueue<S, T> {
 
 pub trait TaskProcessor<S, T>: Send + Sync + 'static {
     fn process(&self, state: Arc<S>, task: T);
+
+    fn requires_serial_execution(&self, task: &T) -> bool;
 }
 
 pub struct TaskScheduler<T> {
@@ -60,13 +62,23 @@ where
         let now = Instant::now();
         debug!("Processing task {:?}", &task_str);
         let processor = Arc::clone(&self.processor);
-        thread::spawn(move || {
+
+        if processor.requires_serial_execution(&task) {
             processor.process(state, task);
             debug!(
-                "task {} completed in {}ms",
+                "task {} completed serially in {}ms",
                 task_str,
                 now.elapsed().as_millis()
             );
-        });
+        } else {
+            thread::spawn(move || {
+                processor.process(state, task);
+                debug!(
+                    "task {} completed in {}ms",
+                    task_str,
+                    now.elapsed().as_millis()
+                );
+            });
+        }
     }
 }