refactor: revamp configuration file discovering and custom language registration

HerringtonDarkholme · HerringtonDarkholme · commit e6c87dda3c53 · 2024-10-24T01:26:15.000-04:00
fix ast-grep#1553
diff --git a/crates/cli/src/config.rs b/crates/cli/src/config.rs
@@ -97,9 +97,9 @@ pub fn find_rules(
   read_directory_yaml(&project_config, global_rules, rule_overwrite)
 }
 
-pub fn register_custom_language(config_path: Option<PathBuf>) -> Result<()> {
+pub fn register_custom_language(project_config: Option<ProjectConfig>) -> Result<()> {
   // do not report error if no sgconfig.yml is found
-  let Some(project_config) = ProjectConfig::by_config_path(config_path)? else {
+  let Some(project_config) = project_config else {
     return Ok(());
   };
   let ProjectConfig {
diff --git a/crates/cli/src/lsp.rs b/crates/cli/src/lsp.rs
@@ -1,4 +1,4 @@
-use crate::config::{find_config_path_with_default, find_rules, register_custom_language};
+use crate::config::{find_rules, register_custom_language, ProjectConfig};
 use crate::utils::ErrorContext as EC;
 use anyhow::{Context, Result};
 use ast_grep_lsp::{Backend, LspService, Server};
@@ -12,18 +12,15 @@ pub struct LspArg {
   config: Option<PathBuf>,
 }
 
-fn find_config_base(config: Option<PathBuf>) -> Result<PathBuf> {
-  let mut config_path = find_config_path_with_default(config, None)?;
-  config_path.pop();
-  Ok(config_path)
-}
-
 async fn run_language_server_impl(arg: LspArg) -> Result<()> {
   // env_logger::init();
-  register_custom_language(arg.config.clone())?;
+  let project_config = ProjectConfig::by_config_path(arg.config.clone())?;
+  // TODO: move this error to client
+  let project_config = project_config.ok_or_else(|| anyhow::anyhow!(EC::ProjectNotExist))?;
+  let config_base = project_config.project_dir.clone();
+  register_custom_language(Some(project_config))?;
   let stdin = tokio::io::stdin();
   let stdout = tokio::io::stdout();
-  let config_base = find_config_base(arg.config.clone())?;
   let config_result = find_rules(arg.config, Default::default());
   let config_result_std: std::result::Result<_, String> = config_result
     .map_err(|e| {
diff --git a/crates/cli/src/new.rs b/crates/cli/src/new.rs
@@ -1,6 +1,5 @@
 use crate::config::{
-  find_config_path_with_default, read_config_from_dir, register_custom_language, AstGrepConfig,
-  ProjectConfig, TestConfig,
+  read_config_from_dir, register_custom_language, AstGrepConfig, ProjectConfig, TestConfig,
 };
 use crate::lang::SgLang;
 use crate::utils::ErrorContext as EC;
@@ -147,8 +146,8 @@ impl Display for Entity {
 }
 
 pub fn run_create_new(mut arg: NewArg) -> Result<()> {
-  let config_path = find_config_path_with_default(None, Some(arg.base_dir.as_path()))?;
-  register_custom_language(Some(config_path))?;
+  let config_path = ProjectConfig::by_project_dir(&arg.base_dir)?;
+  register_custom_language(config_path)?;
   if let Some(entity) = arg.entity.take() {
     run_create_entity(entity, arg)
   } else {
diff --git a/crates/cli/src/scan.rs b/crates/cli/src/scan.rs
@@ -9,7 +9,7 @@ use ast_grep_core::{NodeMatch, StrDoc};
 use clap::Args;
 use ignore::WalkParallel;
 
-use crate::config::{find_rules, read_rule_file, register_custom_language};
+use crate::config::{find_rules, read_rule_file, register_custom_language, ProjectConfig};
 use crate::lang::SgLang;
 use crate::print::{
   CloudPrinter, ColoredPrinter, Diff, InteractivePrinter, JSONPrinter, Platform, Printer,
@@ -68,7 +68,8 @@ pub struct ScanArg {
 }
 
 pub fn run_with_config(arg: ScanArg) -> Result<()> {
-  register_custom_language(arg.config.clone())?;
+  let project_config = ProjectConfig::by_config_path(arg.config.clone())?;
+  register_custom_language(project_config)?;
   let context = arg.context.get();
   if let Some(_format) = &arg.format {
     let printer = CloudPrinter::stdout();
diff --git a/crates/cli/src/verify.rs b/crates/cli/src/verify.rs
@@ -4,7 +4,7 @@ mod reporter;
 mod snapshot;
 mod test_case;
 
-use crate::config::{find_rules, register_custom_language};
+use crate::config::{find_rules, register_custom_language, ProjectConfig};
 use crate::lang::SgLang;
 use crate::utils::ErrorContext;
 use anyhow::{anyhow, Result};
@@ -183,7 +183,8 @@ pub struct TestArg {
 }
 
 pub fn run_test_rule(arg: TestArg) -> Result<()> {
-  register_custom_language(arg.config.clone())?;
+  let project_config = ProjectConfig::by_config_path(arg.config.clone())?;
+  register_custom_language(project_config)?;
   if arg.interactive {
     let reporter = InteractiveReporter {
       output: std::io::stdout(),
