Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
extension_cli: Error on unrecognized files and queries in language directories (#63080)
Finn Evers5f2d7ad735c2
diff --git a/crates/extension_cli/src/main.rs b/crates/extension_cli/src/main.rsindex bf941a946c0..f31a4004673 100644--- a/crates/extension_cli/src/main.rs+++ b/crates/extension_cli/src/main.rs@@ -16,6 +16,7 @@ use extension::extension_builder::{CompileExtensionOptions, ExtensionBuilder};use extension::{ExtensionManifest, ExtensionSnippets};use http_client::Url;use language::LanguageConfig;+use language::QueryFile;use reqwest_client::ReqwestClient;use settings_content::SemanticTokenRules;use snippet_provider::file_to_snippets;@@ -24,6 +25,28 @@ use task::TaskTemplates;use tokio::process::Command;use tree_sitter::{Language, Query, WasmStore};+struct TestingContext {+ known_resources: BTreeSet<PathBuf>,+}++impl TestingContext {+ fn new(manifest: &ExtensionManifest, extension_path: &Path) -> Self {+ let known_resources = manifest+ .snippets+ .as_ref()+ .map(ExtensionSnippets::paths)+ .into_iter()+ .flatten()+ .map(|relative_path| extension_path.join(relative_path))+ .collect();+ Self { known_resources }+ }++ fn is_known_resource(&self, path: &Path) -> bool {+ self.known_resources.contains(path)+ }+}+#[derive(Parser, Debug)]#[command(name = "zed-extension")]struct Args {@@ -97,8 +120,9 @@ async fn main() -> Result<()> {let extension_provides = manifest.provides();validate_extension_features(&extension_provides)?;+ let cx = TestingContext::new(&manifest, &extension_path);let grammars = test_grammars(&manifest, &extension_path, &mut wasm_store)?;- test_languages(&manifest, &extension_path, &grammars)?;+ test_languages(&manifest, &extension_path, &grammars, &cx)?;test_themes(&manifest, &extension_path, fs.clone()).await?;test_snippets(&manifest, &extension_path, fs.clone()).await?;test_debug_adapter_schemas(&manifest, &extension_path, fs.clone()).await?;@@ -514,6 +538,7 @@ fn test_languages(manifest: &ExtensionManifest,extension_path: &Path,grammars: &HashMap<String, Language>,+ context: &TestingContext,) -> Result<()> {for relative_language_dir in &manifest.languages {let language_dir = extension_path.join(relative_language_dir);@@ -561,19 +586,26 @@ fn test_languages()})?;}- _ if file_name.ends_with(".scm") => {- let grammar = grammar.with_context(|| {- format! {- "language {} provides query {} but no grammar",- config.name,- file_path.display()- }- })?;-- let query_source = fs::read_to_string(&file_path)?;- let _query = Query::new(grammar, &query_source)?;+ _ => {+ if let Ok(_query) = file_name.parse::<QueryFile>() {+ let grammar = grammar.with_context(|| {+ format! {+ "language {} provides query {} but no grammar",+ config.name,+ file_path.display()+ }+ })?;++ let query_source = fs::read_to_string(&file_path)?;+ let _query = Query::new(grammar, &query_source)?;+ } else if file_name.ends_with(".scm") {+ bail!("query {file_name} is not supported by Zed and should be removed")+ } else if !context.is_known_resource(&file_path) {+ bail!(+ "'{file_name}' is not a supported file in a language directory and should be removed"+ )+ }}- _ => {}}}