Prevent docblock parsing error for new resolver syntax in LSP

Reviewed By: evanyeung Differential Revision: D58315382 fbshipit-source-id: d57f23bef562de9205738d15ca114d57baeb0a77
facebook · Jun 12, 2024 · 5d2fa70 · 5d2fa70
1 parent 9e996c9
commit 5d2fa70
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/compiler/crates/relay-lsp/src/server/lsp_state.rs b/compiler/crates/relay-lsp/src/server/lsp_state.rs
@@ -545,7 +545,11 @@ impl<TPerfLogger: PerfLogger + 'static, TSchemaDocumentation: SchemaDocumentatio
                 Ok(())
             }
             FileGroup::Source { project_set: _ } => {
-                let embedded_sources = extract_graphql::extract(text);
+                let mut embedded_sources = extract_graphql::extract(text);
+                if text.contains("relay:enable-new-relay-resolver") {
+                    embedded_sources
+                        .retain(|source| !matches!(source, JavaScriptSourceFeature::Docblock(_)));
+                }
 
                 if !embedded_sources.is_empty() {
                     self.initialize_lsp_state_resources(project_name);

diff --git a/compiler/crates/relay-lsp/src/utils.rs b/compiler/crates/relay-lsp/src/utils.rs
@@ -191,14 +191,17 @@ pub fn extract_feature_from_text(
             Ok((Feature::ExecutableDocument(document), position_span))
         }
         JavaScriptSourceFeature::Docblock(docblock_source) => {
+            let text_source = &docblock_source.text_source();
+            let text = &text_source.text;
+            if text.contains("relay:enable-new-relay-resolver") {
+                return Err(LSPRuntimeError::ExpectedError);
+            }
+
             let executable_definitions_in_file = extract_executable_definitions_from_text_document(
                 uri,
                 js_source_feature_cache,
                 parser_features,
             )?;
-
-            let text_source = &docblock_source.text_source();
-            let text = &text_source.text;
             let docblock_ir = parse_docblock(text, source_location_key)
                 .and_then(|ast| {
                     parse_docblock_ast(