Add experimental CFML support

.github/settings.yml

@@ -50,6 +50,9 @@ labels:
   - name: "language: nickel"
     color: f8451f
     description: "Nickel formatting issues"
+  - name: "language: cfml"
+    color: f8451f
+    description: "Cfml formatting issues"
   - name: "language: Tree-sitter queries"
     color: f8451f
     description: "Tree-sitter queries formatting issues"

README.md

@@ -114,6 +114,7 @@ by their individual name). Once included, they can be accessed in
 Topiary in the usual way.
 
 * [Rust]
+* [Cfml]
 
 ## Getting Started
 

bin/update-wasm-grammars.sh

@@ -61,6 +61,19 @@ nickel() {
   echo -e "${GREEN}Nickel: Done${NC}"
 }
 
+cfml() {
+  echo -e "${BLUE}CFML: Fetching${NC}"
+  REPO=$(repo_for_language "cfml")
+  git clone "${REPO}" "${WORKDIR}/tree-sitter-cfml" &> /dev/null
+  REV=$(ref_for_language "cfml")
+  pushd "${WORKDIR}/tree-sitter-cfml" &> /dev/null
+    git checkout "$REV" &> /dev/null
+  popd &> /dev/null
+  echo -e "${ORANGE}CFML: Building${NC}"
+  tree-sitter build --wasm "${WORKDIR}/tree-sitter-cfml/cfml"
+  echo -e "${GREEN}CFML: Done${NC}"
+}
+
 ocaml() {
   echo -e "${BLUE}OCaml: Fetching${NC}"
   REPO=$(repo_for_language "ocaml")

default.nix

@@ -9,6 +9,8 @@
 # be compatible with Nickel urgently (it is currently blocking for the CI), we
 # use the tree-sitter-nickel flake directly.
 , tree-sitter-nickel
+# use the tree-sitter-cfml flake directly.
+, tree-sitter-cfml
 # tree-sitter-openscad is not in nixpkgs so use flake directly
 , tree-sitter-openscad
 }:
@@ -129,6 +131,7 @@ in
       css="${pkgs.tree-sitter-grammars.tree-sitter-css}/parser" \
       json="${pkgs.tree-sitter-grammars.tree-sitter-json}/parser" \
       nickel="${tree-sitter-nickel}/parser" \
+      cfml="${tree-sitter-cfml}/parser" \
       ocaml="${pkgs.tree-sitter-grammars.tree-sitter-ocaml}/parser" \
       ocaml_interface="${pkgs.tree-sitter-grammars.tree-sitter-ocaml-interface}/parser" \
       openscad="${tree-sitter-openscad}/parser" \

flake.nix

@@ -27,6 +27,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    tree-sitter-cfml = {
+      url = "github:cfmleditor/tree-sitter-cfml";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     tree-sitter-openscad = {
       url = "github:mkatychev/tree-sitter-openscad";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -49,7 +54,7 @@
 
         topiaryPkgs = pkgs.callPackage ./default.nix {
           inherit (inputs) advisory-db crane rust-overlay;
-          inherit (pkgs.tree-sitter-grammars) tree-sitter-nickel tree-sitter-openscad;
+          inherit (pkgs.tree-sitter-grammars) tree-sitter-nickel tree-sitter-cfml tree-sitter-openscad;
           craneLib = inputs.crane.mkLib pkgs;
         };
 
@@ -69,6 +74,7 @@
           # Nickel *should* have an overlay like this already
           tree-sitter-grammars = prev.tree-sitter-grammars // {
             tree-sitter-nickel = inputs.tree-sitter-nickel.packages.${prev.system}.default;
+            tree-sitter-cfml = inputs.tree-sitter-cfml.packages.${prev.system}.default;
             tree-sitter-openscad = inputs.tree-sitter-openscad.packages.${prev.system}.default;
           };
         };

topiary-cli/Cargo.toml

@@ -48,6 +48,7 @@ topiary-tree-sitter-facade.workspace = true
 # tree-sitter-toml = { workspace = true, optional = true }
 # tree-sitter-bash = { workspace = true, optional = true }
 # tree-sitter-nickel = { workspace = true, optional = true }
+# tree-sitter-cfml = { workspace = true, optional = true }
 # tree-sitter-query = { workspace = true, optional = true }
 # tree-sitter-ocaml = { workspace = true, optional = true }
 # tree-sitter-ocamllex = { workspace = true, optional = true }
@@ -78,11 +79,13 @@ contributed = [
 
 # Excluded by default
 experimental = [
-  "rust"
+  "rust",
+  "cfml"
 ]
 
 bash = ["topiary-config/bash", "topiary-queries/bash"]
 css = ["topiary-config/css", "topiary-queries/css"]
+cfml = ["topiary-config/cfml", "topiary-queries/cfml"]
 json = ["topiary-config/json", "topiary-queries/json"]
 nickel = ["topiary-config/nickel", "topiary-queries/nickel"]
 ocaml = ["topiary-config/ocaml", "topiary-queries/ocaml"]

topiary-cli/src/io.rs

@@ -330,6 +330,9 @@ where
         #[cfg(feature = "css")]
         "css" => Ok(topiary_queries::css().into()),
 
+        #[cfg(feature = "cfml")]
+        "cfml" => Ok(topiary_queries::cfml().into()),
+
         #[cfg(feature = "json")]
         "json" => Ok(topiary_queries::json().into()),
 

topiary-cli/tests/sample-tester.rs

@@ -9,6 +9,7 @@ fn get_file_extension(language: &str) -> &str {
     match language {
         "bash" => "sh",
         "css" => "css",
+        "cfml" => "cfm",
         "json" => "json",
         "nickel" => "ncl",
         "ocaml" => "ml",
@@ -79,6 +80,7 @@ mod test_fmt {
     lang_test!(
         "bash",
         "css",
+        "cfml",
         "json",
         "nickel",
         "ocaml",
@@ -155,6 +157,7 @@ mod test_coverage {
     lang_test!(
         "bash",
         "css",
+        "cfml",
         "json",
         "nickel",
         "ocaml",

topiary-cli/tests/samples/expected/cfml.cfm

@@ -0,0 +1,8 @@
+<cfcomponent>
+	<cffunction>
+		<cfargument/>
+		<cfset var test = "test" />
+		<cfset test2 = "" />
+		<cfset test3 = "" />
+	</cffunction>
+</cfcomponent>

topiary-cli/tests/samples/input/cfml.cfm

@@ -0,0 +1 @@
+<cfcomponent><cffunction><cfargument><cfset var test = "test"/><cfset test2 = ""><cfset test3 = ""></cffunction></cfcomponent>

topiary-config/Cargo.toml

@@ -44,6 +44,7 @@ bash = []
 css = []
 json = []
 nickel = []
+cfml = []
 ocaml = []
 ocaml_interface = []
 ocamllex = []
@@ -59,6 +60,7 @@ all = [
   "css",
   "json",
   "nickel",
+  "cfml",
   "ocaml",
   "ocaml_interface",
   "ocamllex",

topiary-config/languages.ncl

@@ -47,6 +47,16 @@
       },
     },
 
+    cfml = {
+      extensions = ["cfm"],
+      indent = "	", # 1 tab
+      grammar.source.git = {
+        git = "https://github.com/cfmleditor/tree-sitter-cfml.git",
+        rev = "979825d2e27ac9e65a217e5132c5c7eef4004b0e",
+        subdir = "cfml",
+      },
+    },
+
     ocaml = {
       extensions = ["ml"],
       grammar.source.git = {

topiary-config/languages_nix.ncl

@@ -40,6 +40,12 @@
       grammar.source.path = "@nickel@",
     },
 
+    cfml = {
+      extensions = ["cfm"],
+      indent = "	", # 1 tab
+      grammar.source.path = "@cfml@",
+    },
+
     ocaml = {
       extensions = ["ml"],
       grammar.source.path = "@ocaml@",

topiary-queries/Cargo.toml

@@ -17,6 +17,7 @@ description = """
 [features]
 bash = []
 css = []
+cfml = []
 json = []
 nickel = []
 ocaml = []

topiary-queries/queries/cfml.scm

@@ -0,0 +1,22 @@
+(cf_tag_open) @append_hardline
+(cf_tag_close) @append_hardline
+
+(
+  (cf_tag_open) @append_indent_start
+  _
+  (cf_tag_close) @prepend_indent_end
+)
+
+(cf_set_tag) @append_hardline
+(cf_selfclose_tag) @append_hardline
+
+(cf_var) @prepend_space
+(assignment_expression) @prepend_space @append_space
+
+(assignment_expression "=" @prepend_space @append_space)
+
+(
+  (cf_selfclose_tag_end) @prepend_delimiter
+  (#delimiter! "/")
+  (#not-match? @prepend_delimiter "/")
+)

topiary-queries/src/lib.rs

@@ -10,6 +10,12 @@ pub fn css() -> &'static str {
     include_str!("../queries/css.scm")
 }
 
+/// Returns the Topiary-compatible query file for CFML.
+#[cfg(feature = "cfml")]
+pub fn cfml() -> &'static str {
+    include_str!("../queries/cfml.scm")
+}
+
 /// Returns the Topiary-compatible query file for Json.
 #[cfg(feature = "json")]
 pub fn json() -> &'static str {

web-playground/src/components/editor.tsx

@@ -58,6 +58,8 @@ function toMode(language: string) {
         case "nickel":
             // Missing highlighting for Nickel, but we know.
             return "plain_text";
+        case "cfml":
+            return "cfml";
         case "rust":
             return "rust";
         case "toml":