traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(cli)!: remove migration code for tree-sitter.json

Browse source
This commit is contained in:
Amaan Qureshi 2025-01-11 17:13:43 -05:00
parent 344a88c4fb
commit 24f51518d1
2 changed files with 5 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cli/src/main.rs
View file

@ -19,7 +19,7 @@ use tree_sitter_cli::{
LOG_GRAPH_ENABLED, START_SEED,
},
highlight::{self, HighlightOptions},
init::{generate_grammar_files, get_root_path, migrate_package_json, JsonConfigOpts},
init::{generate_grammar_files, get_root_path, JsonConfigOpts},
input::{get_input, get_tmp_source_file, CliInput},
logger,
parse::{self, ParseFileOptions, ParseOutput, ParseTheme},
@ -497,9 +497,8 @@ impl InitConfig {
}
impl Init {
fn run(self, current_dir: &Path, migrated: bool) -> Result<()> {
let configure_json = !current_dir.join("tree-sitter.json").exists()
&& (!current_dir.join("package.json").exists() || !migrated);
fn run(self, current_dir: &Path) -> Result<()> {
let configure_json = !current_dir.join("tree-sitter.json").exists();
let (language_name, json_config_opts) = if configure_json {
let mut opts = JsonConfigOpts::default();
@ -1676,17 +1675,9 @@ fn run() -> Result<()> {
let current_dir = env::current_dir().unwrap();
let loader = loader::Loader::new()?;
let migrated = if !current_dir.join("tree-sitter.json").exists()
&& current_dir.join("package.json").exists()
{
migrate_package_json(&current_dir).unwrap_or(false)
} else {
false
};
match command {
Commands::InitConfig(_) => InitConfig::run()?,
Commands::Init(init_options) => init_options.run(&current_dir, migrated)?,
Commands::Init(init_options) => init_options.run(&current_dir)?,
Commands::Generate(generate_options) => generate_options.run(loader, &current_dir)?,
Commands::Build(build_options) => build_options.run(loader, &current_dir)?,
Commands::Parse(parse_options) => parse_options.run(loader, &current_dir)?,