Merge pull request #699 from lavigneer/css

Add CSS formatter

Author: Erin van der Veen

CHANGELOG.md

@@ -46,6 +46,7 @@ This name should be decided amongst the team before the release.
 
 ### Added
 - [#697](https://github.com/tweag/topiary/pull/697) Setting the log level to INFO now outputs the pattern locations in a (row, column) way.
+- [#699](https://github.com/tweag/topiary/pull/699) Added support for CSS, thanks to @lavigneer
 
 ## v0.3.0 - Dreamy Dracaena - 2023-09-22
 

Cargo.lock

@@ -75,6 +75,7 @@ tokio-test = "0.4"
 toml = "0.8"
 tree-sitter = "=0.20.10"
 tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "1b0321ee85701d5036c334a6f04761cdc672e64c" }
+tree-sitter-css = { git = "https://github.com/tree-sitter/tree-sitter-css.git", rev = "02b4ee757654b7d54fe35352fd8e53a8a4385d42" }
 tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json.git", rev = "3b129203f4b72d532f58e72c5310c0a7db3b8e6d" }
 tree-sitter-nickel = { git = "https://github.com/nickel-lang/tree-sitter-nickel", rev = "58baf89db8fdae54a84bcf22c80ff10ee3f929ed" }
 tree-sitter-ocaml = { git = "https://github.com/tree-sitter/tree-sitter-ocaml.git", rev = "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677" }

Cargo.toml

@@ -104,6 +104,7 @@ specifying the path to their query files.
 * [Rust]
 * [Bash]
 * [Tree Sitter Queries][tree-sitter-query]
+* [CSS]
 
 ## Getting Started
 
@@ -1477,6 +1478,7 @@ of choice open in another.
 [badge-release-link]: https://github.com/tweag/topiary/releases/latest
 [bash]: https://www.gnu.org/software/bash
 [contributing]: CONTRIBUTING.md
+[css]: https://en.wikipedia.org/wiki/CSS
 [difftastic]: https://difftastic.wilfred.me.uk
 [format-all]: https://melpa.org/#/format-all
 [gofmt-slides]: https://go.dev/talks/2015/gofmt-en.slide#1

README.md

@@ -123,6 +123,19 @@ tree-sitter-query() {
   echo -e "${GREEN}Query: Done${NC}"
 }
 
-(trap 'kill 0' SIGINT; json & nickel & ocaml & ocamllex & bash & rust & toml & tree-sitter-query & wait)
+css() {
+  echo -e "${BLUE}CSS: Fetching${NC}"
+  git clone --depth=1 https://github.com/tree-sitter/tree-sitter-css.git "${WORKDIR}/tree-sitter-css" &> /dev/null
+  REV=$(ref_for_language "css")
+  pushd "${WORKDIR}/tree-sitter-css" &> /dev/null
+    git checkout "$REV" &> /dev/null
+  popd &> /dev/null
+  echo -e "${ORANGE}CSS: Building${NC}"
+  tree-sitter build-wasm "${WORKDIR}/tree-sitter-css"
+  echo -e "${GREEN}CSS: Done${NC}"
+}
+
+
+(trap 'kill 0' SIGINT; json & nickel & ocaml & ocamllex & bash & rust & toml & tree-sitter-query & css & wait)
 
 echo -e "${GREEN}Done! All grammars have been updated${NC}"

bin/update-wasm-grammars.sh

@@ -44,6 +44,7 @@ topiary-queries = { path = "../topiary-queries" }
 topiary-tree-sitter-facade = { workspace = true }
 
 tree-sitter-json = { workspace = true }
+tree-sitter-css = { workspace = true }
 tree-sitter-rust = { workspace = true }
 tree-sitter-toml = { workspace = true }
 tree-sitter-bash = { workspace = true }

topiary-cli/Cargo.toml

@@ -324,6 +324,7 @@ where
 {
     match name.as_ref() {
         "bash" => Ok(topiary_queries::bash().into()),
+        "css" => Ok(topiary_queries::css().into()),
         "json" => Ok(topiary_queries::json().into()),
         "nickel" => Ok(topiary_queries::nickel().into()),
         "ocaml" => Ok(topiary_queries::ocaml().into()),