Use language names (#688)

uber · Sep 3, 2024 · 2d495d6 · 2d495d6
1 parent d24ceef
commit 2d495d6
Show file tree

Hide file tree

Showing 64 changed files with 14 additions and 44 deletions.
diff --git a/polyglot_piranha.pyi b/polyglot_piranha.pyi
@@ -13,7 +13,7 @@ from __future__ import annotations
 from typing import List, Optional, Literal
 
 # Languages that Piranha supports (see ./src/models/language.rs)
-PiranhaLanguage = Literal["java", "kt", "kotlin", "go", "py", "swift", "ts", "tsx", "thrift", "strings", "scm", "scala", "rb", "yaml", "yml"]
+PiranhaLanguage = Literal["java", "kt", "kotlin", "go", "python", "swift", "typescript", "tsx", "thrift", "strings", "scm", "scala", "ruby", "yaml", "yml"]
 
 
 def execute_piranha(piranha_argument: PiranhaArguments) -> list[PiranhaOutputSummary]:

diff --git a/src/models/default_configs.rs b/src/models/default_configs.rs
@@ -25,15 +25,15 @@ pub const JAVA_CS: &str = "java_cs";
 pub const KOTLIN: &str = "kt";
 pub const KOTLIN_ALIAS: &str = "kotlin";
 pub const GO: &str = "go";
-pub const PYTHON: &str = "py";
+pub const PYTHON: &str = "python";
 pub const SWIFT: &str = "swift";
-pub const TYPESCRIPT: &str = "ts";
+pub const TYPESCRIPT: &str = "typescript";
 pub const TSX: &str = "tsx";
 pub const THRIFT: &str = "thrift";
 pub const STRINGS: &str = "strings";
 pub const TS_SCHEME: &str = "scm"; // We support scheme files that contain tree-sitter query
 pub const SCALA: &str = "scala";
-pub const RUBY: &str = "rb";
+pub const RUBY: &str = "ruby";
 pub const YAML: &str = "yaml";
 pub const YAML_ALIAS: &str = "yml";
 

diff --git a/src/models/language.rs b/src/models/language.rs
@@ -193,7 +193,7 @@ impl std::str::FromStr for PiranhaLanguage {
         })
       }
       PYTHON => Ok(PiranhaLanguage {
-        extension: language.to_string(),
+        extension: "py".to_string(),
         supported_language: SupportedLanguage::Python,
         language: tree_sitter_python::language(),
         rules: None,
@@ -219,7 +219,7 @@ impl std::str::FromStr for PiranhaLanguage {
         })
       }
       TYPESCRIPT => Ok(PiranhaLanguage {
-        extension: language.to_string(),
+        extension: "ts".to_string(),
         supported_language: SupportedLanguage::Ts,
         language: tree_sitter_typescript::language_typescript(),
         rules: None,
@@ -278,7 +278,7 @@ impl std::str::FromStr for PiranhaLanguage {
         let ruby_rules: Rules = parse_toml(include_str!("../cleanup_rules/ruby/rules.toml"));
         let ruby_edges: Edges = parse_toml(include_str!("../cleanup_rules/ruby/edges.toml"));
         Ok(PiranhaLanguage {
-          extension: language.to_string(),
+          extension: "rs".to_string(),
           supported_language: SupportedLanguage::Ruby,
           language: tree_sitter_ruby::language(),
           scopes: parse_toml::<ScopeConfig>(include_str!(

diff --git a/src/tests/mod.rs b/src/tests/mod.rs
@@ -37,7 +37,6 @@ mod test_piranha_scala;
 
 mod test_piranha_thrift;
 
-mod test_piranha_ruby;
 mod test_piranha_scm;
 mod test_piranha_strings;
 mod test_piranha_yaml;

diff --git a/src/tests/test_piranha_python.rs b/src/tests/test_piranha_python.rs
@@ -34,12 +34,15 @@ fn test_delete_modify_str_literal_from_list_via_cli() {
 
   let mut cmd = Command::cargo_bin("polyglot_piranha").unwrap();
   cmd
-    .args(["-c", "test-resources/py/delete_cleanup_str_in_list/input"])
+    .args([
+      "-c",
+      "test-resources/python/delete_cleanup_str_in_list/input",
+    ])
     .args([
       "-f",
-      "test-resources/py/delete_cleanup_str_in_list/configurations",
+      "test-resources/python/delete_cleanup_str_in_list/configurations",
     ])
-    .args(["-l", "py"])
+    .args(["-l", "python"])
     .args(["-j", temp_file.to_str().unwrap()])
     .arg("--dry-run")
     .args(["-s", "str_literal=dependency2"])
@@ -50,7 +53,7 @@ fn test_delete_modify_str_literal_from_list_via_cli() {
   let content = read_file(&temp_file).unwrap();
   let output: Vec<PiranhaOutputSummary> = serde_json::from_str(&content).unwrap();
   let expected_path =
-    Path::new("test-resources/py/delete_cleanup_str_in_list/expected/only_lists.py");
+    Path::new("test-resources/python/delete_cleanup_str_in_list/expected/only_lists.py");
   let expected = read_file(&expected_path.to_path_buf()).unwrap();
   assert!(eq_without_whitespace(output[0].content(), &expected));
 

diff --git a/src/tests/test_piranha_ruby.rs b/src/tests/test_piranha_ruby.rs
diff --git a/...nup_str_in_list/configurations/edges.toml → ...nup_str_in_list/configurations/edges.toml b/...nup_str_in_list/configurations/edges.toml → ...nup_str_in_list/configurations/edges.toml
diff --git a/...nup_str_in_list/configurations/rules.toml → ...nup_str_in_list/configurations/rules.toml b/...nup_str_in_list/configurations/rules.toml → ...nup_str_in_list/configurations/rules.toml
diff --git a/...leanup_str_in_list/expected/only_lists.py → ...leanup_str_in_list/expected/only_lists.py b/...leanup_str_in_list/expected/only_lists.py → ...leanup_str_in_list/expected/only_lists.py
diff --git a/...e_cleanup_str_in_list/input/only_lists.py → ...e_cleanup_str_in_list/input/only_lists.py b/...e_cleanup_str_in_list/input/only_lists.py → ...e_cleanup_str_in_list/input/only_lists.py
diff --git a/...structural_find/configurations/rules.toml → ...structural_find/configurations/rules.toml b/...structural_find/configurations/rules.toml → ...structural_find/configurations/rules.toml
diff --git a/...s/py/structural_find/input/list_as_arg.py → ...thon/structural_find/input/list_as_arg.py b/...s/py/structural_find/input/list_as_arg.py → ...thon/structural_find/input/list_as_arg.py
diff --git a/...es/py/structural_find/input/only_lists.py → ...ython/structural_find/input/only_lists.py b/...es/py/structural_find/input/only_lists.py → ...ython/structural_find/input/only_lists.py
diff --git a/...es_after_return/configurations/rules.toml → ...es_after_return/configurations/rules.toml b/...es_after_return/configurations/rules.toml → ...es_after_return/configurations/rules.toml
diff --git a/...urn/expected/delete_lines_after_return.rb → ...urn/expected/delete_lines_after_return.rb b/...urn/expected/delete_lines_after_return.rb → ...urn/expected/delete_lines_after_return.rb
diff --git a/...return/input/delete_lines_after_return.rb → ...return/input/delete_lines_after_return.rb b/...return/input/delete_lines_after_return.rb → ...return/input/delete_lines_after_return.rb
diff --git a/...nless_statement/configurations/rules.toml → ...nless_statement/configurations/rules.toml b/...nless_statement/configurations/rules.toml → ...nless_statement/configurations/rules.toml
diff --git a/...nt/expected/test_empty_if_unless_rules.rb → ...nt/expected/test_empty_if_unless_rules.rb b/...nt/expected/test_empty_if_unless_rules.rb → ...nt/expected/test_empty_if_unless_rules.rb
diff --git a/...ement/input/test_empty_if_unless_rules.rb → ...ement/input/test_empty_if_unless_rules.rb b/...ement/input/test_empty_if_unless_rules.rb → ...ement/input/test_empty_if_unless_rules.rb
diff --git a/...ce_if_statement/configurations/rules.toml → ...ce_if_statement/configurations/rules.toml b/...ce_if_statement/configurations/rules.toml → ...ce_if_statement/configurations/rules.toml
diff --git a/...tatement/expected/test_if_rules_inline.rb → ...tatement/expected/test_if_rules_inline.rb b/...tatement/expected/test_if_rules_inline.rb → ...tatement/expected/test_if_rules_inline.rb
diff --git a/...expected/test_if_rules_with_else_block.rb → ...expected/test_if_rules_with_else_block.rb b/...expected/test_if_rules_with_else_block.rb → ...expected/test_if_rules_with_else_block.rb
diff --git a/...ected/test_if_rules_without_else_block.rb → ...ected/test_if_rules_without_else_block.rb b/...ected/test_if_rules_without_else_block.rb → ...ected/test_if_rules_without_else_block.rb
diff --git a/...f_statement/input/test_if_rules_inline.rb → ...f_statement/input/test_if_rules_inline.rb b/...f_statement/input/test_if_rules_inline.rb → ...f_statement/input/test_if_rules_inline.rb
diff --git a/...nt/input/test_if_rules_with_else_block.rb → ...nt/input/test_if_rules_with_else_block.rb b/...nt/input/test_if_rules_with_else_block.rb → ...nt/input/test_if_rules_with_else_block.rb
diff --git a/...input/test_if_rules_without_else_block.rb → ...input/test_if_rules_without_else_block.rb b/...input/test_if_rules_without_else_block.rb → ...input/test_if_rules_without_else_block.rb
diff --git a/...ernary_operator/configurations/rules.toml → ...ernary_operator/configurations/rules.toml b/...ernary_operator/configurations/rules.toml → ...ernary_operator/configurations/rules.toml
diff --git a/...perator/expected/test_if_rules_ternary.rb → ...perator/expected/test_if_rules_ternary.rb b/...perator/expected/test_if_rules_ternary.rb → ...perator/expected/test_if_rules_ternary.rb
diff --git a/...y_operator/input/test_if_rules_ternary.rb → ...y_operator/input/test_if_rules_ternary.rb b/...y_operator/input/test_if_rules_ternary.rb → ...y_operator/input/test_if_rules_ternary.rb
diff --git a/...nless_statement/configurations/rules.toml → ...nless_statement/configurations/rules.toml b/...nless_statement/configurations/rules.toml → ...nless_statement/configurations/rules.toml
diff --git a/...ment/expected/test_unless_rules_inline.rb → ...ment/expected/test_unless_rules_inline.rb b/...ment/expected/test_unless_rules_inline.rb → ...ment/expected/test_unless_rules_inline.rb
diff --git a/...cted/test_unless_rules_with_else_block.rb → ...cted/test_unless_rules_with_else_block.rb b/...cted/test_unless_rules_with_else_block.rb → ...cted/test_unless_rules_with_else_block.rb
diff --git a/...d/test_unless_rules_without_else_block.rb → ...d/test_unless_rules_without_else_block.rb b/...d/test_unless_rules_without_else_block.rb → ...d/test_unless_rules_without_else_block.rb
diff --git a/...atement/input/test_unless_rules_inline.rb → ...atement/input/test_unless_rules_inline.rb b/...atement/input/test_unless_rules_inline.rb → ...atement/input/test_unless_rules_inline.rb
diff --git a/...nput/test_unless_rules_with_else_block.rb → ...nput/test_unless_rules_with_else_block.rb b/...nput/test_unless_rules_with_else_block.rb → ...nput/test_unless_rules_with_else_block.rb
diff --git a/...t/test_unless_rules_without_else_block.rb → ...t/test_unless_rules_without_else_block.rb b/...t/test_unless_rules_without_else_block.rb → ...t/test_unless_rules_without_else_block.rb
diff --git a/...ean_expressions/configurations/rules.toml → ...ean_expressions/configurations/rules.toml b/...ean_expressions/configurations/rules.toml → ...ean_expressions/configurations/rules.toml
diff --git a/..._expressions/expected/boolean_simplify.rb → ..._expressions/expected/boolean_simplify.rb b/..._expressions/expected/boolean_simplify.rb → ..._expressions/expected/boolean_simplify.rb
diff --git a/...ean_expressions/input/boolean_simplify.rb → ...ean_expressions/input/boolean_simplify.rb b/...ean_expressions/input/boolean_simplify.rb → ...ean_expressions/input/boolean_simplify.rb
diff --git a/...onal_statements/configurations/rules.toml → ...onal_statements/configurations/rules.toml b/...onal_statements/configurations/rules.toml → ...onal_statements/configurations/rules.toml
diff --git a/...plify_if_lambda_conditional_statements.rb → ...plify_if_lambda_conditional_statements.rb b/...plify_if_lambda_conditional_statements.rb → ...plify_if_lambda_conditional_statements.rb
diff --git a/...plify_if_lambda_conditional_statements.rb → ...plify_if_lambda_conditional_statements.rb b/...plify_if_lambda_conditional_statements.rb → ...plify_if_lambda_conditional_statements.rb
diff --git a/...onal_statements/configurations/rules.toml → ...onal_statements/configurations/rules.toml b/...onal_statements/configurations/rules.toml → ...onal_statements/configurations/rules.toml
diff --git a/...implify_if_proc_conditional_statements.rb → ...implify_if_proc_conditional_statements.rb b/...implify_if_proc_conditional_statements.rb → ...implify_if_proc_conditional_statements.rb
diff --git a/...implify_if_proc_conditional_statements.rb → ...implify_if_proc_conditional_statements.rb b/...implify_if_proc_conditional_statements.rb → ...implify_if_proc_conditional_statements.rb
diff --git a/...ock_expressions/configurations/rules.toml → ...ock_expressions/configurations/rules.toml b/...ock_expressions/configurations/rules.toml → ...ock_expressions/configurations/rules.toml
diff --git a/...ected/simplify_rspec_block_expressions.rb → ...ected/simplify_rspec_block_expressions.rb b/...ected/simplify_rspec_block_expressions.rb → ...ected/simplify_rspec_block_expressions.rb
diff --git a/...input/simplify_rspec_block_expressions.rb → ...input/simplify_rspec_block_expressions.rb b/...input/simplify_rspec_block_expressions.rb → ...input/simplify_rspec_block_expressions.rb
diff --git a/...onal_statements/configurations/rules.toml → ...onal_statements/configurations/rules.toml b/...onal_statements/configurations/rules.toml → ...onal_statements/configurations/rules.toml
diff --git a/...y_unless_lambda_conditional_statements.rb → ...y_unless_lambda_conditional_statements.rb b/...y_unless_lambda_conditional_statements.rb → ...y_unless_lambda_conditional_statements.rb
diff --git a/...y_unless_lambda_conditional_statements.rb → ...y_unless_lambda_conditional_statements.rb b/...y_unless_lambda_conditional_statements.rb → ...y_unless_lambda_conditional_statements.rb
diff --git a/...onal_statements/configurations/rules.toml → ...onal_statements/configurations/rules.toml b/...onal_statements/configurations/rules.toml → ...onal_statements/configurations/rules.toml
diff --git a/...ify_unless_proc_conditional_statements.rb → ...ify_unless_proc_conditional_statements.rb b/...ify_unless_proc_conditional_statements.rb → ...ify_unless_proc_conditional_statements.rb
diff --git a/...ify_unless_proc_conditional_statements.rb → ...ify_unless_proc_conditional_statements.rb b/...ify_unless_proc_conditional_statements.rb → ...ify_unless_proc_conditional_statements.rb
diff --git a/...gned_flag_check/configurations/edges.toml → ...gned_flag_check/configurations/edges.toml b/...gned_flag_check/configurations/edges.toml → ...gned_flag_check/configurations/edges.toml
diff --git a/...gned_flag_check/configurations/rules.toml → ...gned_flag_check/configurations/rules.toml b/...gned_flag_check/configurations/rules.toml → ...gned_flag_check/configurations/rules.toml
diff --git a/.../simplify_variable_assigned_flag_check.rb → .../simplify_variable_assigned_flag_check.rb b/.../simplify_variable_assigned_flag_check.rb → .../simplify_variable_assigned_flag_check.rb
diff --git a/.../simplify_variable_assigned_flag_check.rb → .../simplify_variable_assigned_flag_check.rb b/.../simplify_variable_assigned_flag_check.rb → .../simplify_variable_assigned_flag_check.rb
diff --git a/..._find/find_fors/configurations/rules.toml → ..._find/find_fors/configurations/rules.toml b/..._find/find_fors/configurations/rules.toml → ..._find/find_fors/configurations/rules.toml
diff --git a/...structural_find/find_fors/input/sample.ts → ...structural_find/find_fors/input/sample.ts b/...structural_find/find_fors/input/sample.ts → ...structural_find/find_fors/input/sample.ts
diff --git a/...ithin_functions/configurations/rules.toml → ...ithin_functions/configurations/rules.toml b/...ithin_functions/configurations/rules.toml → ...ithin_functions/configurations/rules.toml
diff --git a/...ind_fors_within_functions/input/sample.ts → ...ind_fors_within_functions/input/sample.ts b/...ind_fors_within_functions/input/sample.ts → ...ind_fors_within_functions/input/sample.ts
diff --git a/...t_within_whiles/configurations/rules.toml → ...t_within_whiles/configurations/rules.toml b/...t_within_whiles/configurations/rules.toml → ...t_within_whiles/configurations/rules.toml
diff --git a/...nctions_not_within_whiles/input/sample.ts → ...nctions_not_within_whiles/input/sample.ts b/...nctions_not_within_whiles/input/sample.ts → ...nctions_not_within_whiles/input/sample.ts