feat(query): Add OpenSCAD formatter

.editorconfig

@@ -8,6 +8,6 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.{json,nix,scm}]
+[*.{json,nix,scm,scad}]
 indent_style = space
 indent_size = 2

CHANGELOG.md

@@ -49,6 +49,7 @@ This name should be decided amongst the team before the release.
 - [#786](https://github.com/tweag/topiary/pull/786) Re-introduce tests to check that all of the language queries are useful.
 - [#747](https://github.com/tweag/topiary/pull/747) Added support for specifying paths to prebuilt grammars in Topiary's configuration
 - [#832](https://github.com/tweag/topiary/pull/832) Added `typos-cli` to workspace `Cargo.toml` for spellchecking @mkatychev
+- [#845](https://github.com/tweag/topiary/pull/747) Added support for OpenSCAD, @mkatychev
 
 ### Changed
 - [#794](https://github.com/tweag/topiary/pull/794) Bump the `tree-sitter` dependency to 0.24, thanks to @ZedThree

README.md

@@ -103,6 +103,7 @@ external contributors. They are built in, by default, so are exposed in
 the same way as supported languages.
 
 * [CSS] by @lavigneer
+* [OpenSCAD] by @mkatychev
 
 #### Experimental
 
@@ -1737,6 +1738,7 @@ of choice open in another.
 [ocamlformat]: https://github.com/ocaml-ppx/ocamlformat
 [ocamllex]: https://v2.ocaml.org/manual/lexyacc.html
 [ocp-indent]: https://www.typerex.org/ocp-indent.html
+[openscad]: https://en.wikipedia.org/wiki/OpenSCAD
 [ormolu]: https://github.com/tweag/ormolu
 [prettier]: https://prettier.io/
 [rust]: https://www.rust-lang.org

bin/update-wasm-grammars.sh

@@ -153,7 +153,20 @@ css() {
   echo -e "${GREEN}CSS: Done${NC}"
 }
 
+openscad() {
+  echo -e "${BLUE}OpenSCAD: Fetching${NC}"
+  REPO=$(repo_for_language "openscad")
+  git clone "${REPO}" "${WORKDIR}/tree-sitter-openscad" &> /dev/null
+  REV=$(ref_for_language "opescad")
+  pushd "${WORKDIR}/tree-sitter-openscad" &> /dev/null
+    git checkout "$REV" &> /dev/null
+  popd &> /dev/null
+  echo -e "${ORANGE}OpenSCAD: Building${NC}"
+  tree-sitter build --wasm "${WORKDIR}/tree-sitter-openscad"
+  echo -e "${GREEN}OpenSCAD: Done${NC}"
+}
+
 
-(trap 'kill 0' SIGINT; json & nickel & ocaml & ocamllex & bash & rust & toml & tree-sitter-query & css & wait)
+(trap 'kill 0' SIGINT; json & nickel & ocaml & ocamllex & bash & rust & toml & tree-sitter-query & css & openscad & wait)
 
 echo -e "${GREEN}Done! All grammars have been updated${NC}"

topiary-cli/Cargo.toml

@@ -66,12 +66,13 @@ default = [
   "ocaml_interface",
   "ocamllex",
   "toml",
-  "tree_sitter_query"
+  "tree_sitter_query",
 ]
 
 # Included by default
 contributed = [
-  "css"
+  "css",
+  "openscad",
 ]
 
 # Excluded by default
@@ -86,6 +87,7 @@ nickel = ["topiary-config/nickel", "topiary-queries/nickel"]
 ocaml = ["topiary-config/ocaml", "topiary-queries/ocaml"]
 ocaml_interface = ["topiary-config/ocaml_interface", "topiary-queries/ocaml_interface"]
 ocamllex = ["topiary-config/ocamllex", "topiary-queries/ocamllex"]
+openscad = ["topiary-config/openscad", "topiary-queries/openscad"]
 rust = ["topiary-config/rust", "topiary-queries/rust"]
 toml = ["topiary-config/toml", "topiary-queries/toml"]
 tree_sitter_query = ["topiary-config/tree_sitter_query", "topiary-queries/tree_sitter_query"]

topiary-cli/src/io.rs

@@ -349,6 +349,9 @@ where
         #[cfg(feature = "ocamllex")]
         "ocamllex" => Ok(topiary_queries::ocamllex().into()),
 
+        #[cfg(feature = "openscad")]
+        "openscad" => Ok(topiary_queries::openscad().into()),
+
         #[cfg(feature = "rust")]
         "rust" => Ok(topiary_queries::rust().into()),
 

topiary-cli/tests/sample-tester.rs

@@ -87,6 +87,9 @@ fn input_output_tester() {
     #[cfg(feature = "ocamllex")]
     io_test("ocamllex.mll");
 
+    #[cfg(feature = "openscad")]
+    io_test("openscad.scad");
+
     #[cfg(feature = "rust")]
     io_test("rust.rs");