Skip to content

Commit 37993f0

Browse files
fix(config): Set built-in language configs with a priority of "default" (#1126)
* fix(config): set built-in config with a priority of "default" * updated languages.ncl to use `default` priority for all languages * Hotfix: 0.7.0 -> 0.7.1 --------- Co-authored-by: Christopher Harrison <[email protected]>
1 parent 4db4e52 commit 37993f0

File tree

6 files changed

+44
-34
lines changed

6 files changed

+44
-34
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ This name should be decided amongst the team before the release.
4242

4343
## Unreleased
4444

45-
[Full list of changes](https://github.com/tweag/topiary/compare/v0.7.0...HEAD)
45+
[Full list of changes](https://github.com/tweag/topiary/compare/v0.7.1...HEAD)
4646

4747
<!--
4848
### Added
@@ -64,6 +64,13 @@ This name should be decided amongst the team before the release.
6464
- <Vulnerabilities>
6565
-->
6666

67+
## v0.7.1 - Heavenly Hemlock - 2025-11-19
68+
69+
[Full list of changes](https://github.com/tweag/topiary/compare/v0.7.0...v0.7.1)
70+
71+
### Fixed
72+
- [#1126](https://github.com/tweag/topiary/pull/1126) Set built-in language configs with a priority of "default"
73+
6774
## v0.7.0 - Heavenly Hemlock - 2025-10-29
6875

6976
[Full list of changes](https://github.com/tweag/topiary/compare/v0.6.1...v0.7.0)

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace.package]
2-
version = "0.7.0"
2+
version = "0.7.1"
33
edition = "2024"
44
authors = ["Tweag"]
55
homepage = "https://topiary.tweag.io"
@@ -49,6 +49,7 @@ js-sys = "0.3"
4949
libloading = "0.9.0"
5050
log = "0.4"
5151
mdbook = { version = "0.4.47", default-features = false }
52+
miette = { version = "7.6.0", features = ["fancy"] }
5253
nickel-lang-core = { version = "0.15.1", default-features = false }
5354
pastey = "0.1.1"
5455
predicates = "3.0"
@@ -61,13 +62,13 @@ semver = "1.0.26"
6162
serde = { version = "1.0", features = ["derive"] }
6263
serde_json = "1.0"
6364
streaming-iterator = "0.1.9"
65+
tabled = "0.20.0"
6466
tempfile = "3.12"
6567
test-log = "0.2"
68+
thiserror = "2.0.16"
6669
tokio = "1.32"
6770
tokio-test = "0.4"
6871
toml = "0.9"
69-
tree-sitter = "0.25" # NOTE Update tree-sitter-loader to match
70-
tree-sitter-loader = "0.25" # NOTE Align with tree-sitter
7172
tree-sitter-json = "0.24"
7273
tree-sitter-language = "0.1"
7374
tree-sitter-nickel = "0.5"
@@ -78,14 +79,16 @@ wasm-bindgen-futures = "=0.4"
7879
wasm-bindgen-test = "=0.3"
7980
web-sys = "0.3"
8081

81-
topiary-web-tree-sitter-sys = { version = "0.7.0", path = "./topiary-web-tree-sitter-sys" }
82-
topiary-tree-sitter-facade = { version = "0.7.0", path = "./topiary-tree-sitter-facade" }
83-
topiary-core = { version = "0.7.0", path = "./topiary-core" }
84-
topiary-config = { version = "0.7.0", path = "./topiary-config" }
85-
topiary-queries = { version = "0.7.0", path = "./topiary-queries" }
86-
miette = { version = "7.6.0", features = ["fancy"] }
87-
tabled = "0.20.0"
88-
thiserror = "2.0.16"
82+
# NOTE Keep these versions aligned
83+
tree-sitter = "0.25" # NOTE Update tree-sitter-loader to match
84+
tree-sitter-loader = "0.25" # NOTE Align with tree-sitter
85+
86+
# NOTE Update these appropriately
87+
topiary-web-tree-sitter-sys = { version = "0.7.1", path = "./topiary-web-tree-sitter-sys" }
88+
topiary-tree-sitter-facade = { version = "0.7.1", path = "./topiary-tree-sitter-facade" }
89+
topiary-core = { version = "0.7.1", path = "./topiary-core" }
90+
topiary-config = { version = "0.7.1", path = "./topiary-config" }
91+
topiary-queries = { version = "0.7.1", path = "./topiary-queries" }
8992

9093
[profile.dev.package.lalrpop]
9194
opt-level = 3

topiary-config/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "topiary-config"
33
# The version should always be "X.Y.Z" where the workspace version is `X.Y.Z'`
44
# with `Z' <= Z`. Whenever there's a need to release an update to the config
55
# without changing the core of Topiary, just bump `Z`.
6-
version = "0.7.0"
6+
version = "0.7.1"
77
description = "Configuration parser and defaults for Topiary"
88
categories = ["development-tools", "text-processing"]
99
keywords = ["code-formatter", "formatter", "text", "tree-sitter"]

topiary-config/languages.ncl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
languages = {
3-
bash = {
3+
bash | default = {
44
extensions = ["sh", "bash"],
55
grammar.source.git = {
66
git = "https://github.com/tree-sitter/tree-sitter-bash.git",
@@ -9,7 +9,7 @@
99
}
1010
},
1111

12-
css = {
12+
css | default = {
1313
extensions = ["css"],
1414
grammar.source.git = {
1515
git = "https://github.com/tree-sitter/tree-sitter-css.git",
@@ -18,7 +18,7 @@
1818
},
1919
},
2020

21-
json = {
21+
json | default = {
2222
extensions = [
2323
"json",
2424
"avsc",
@@ -42,7 +42,7 @@
4242
},
4343
},
4444

45-
nickel = {
45+
nickel | default = {
4646
extensions = ["ncl"],
4747
grammar.source.git = {
4848
git = "https://github.com/nickel-lang/tree-sitter-nickel",
@@ -51,7 +51,7 @@
5151
},
5252
},
5353

54-
ocaml = {
54+
ocaml | default = {
5555
extensions = ["ml"],
5656
grammar.source.git = {
5757
git = "https://github.com/tree-sitter/tree-sitter-ocaml.git",
@@ -61,7 +61,7 @@
6161
},
6262
},
6363

64-
ocaml_interface = {
64+
ocaml_interface | default = {
6565
extensions = ["mli"],
6666
grammar.source.git = {
6767
git = "https://github.com/tree-sitter/tree-sitter-ocaml.git",
@@ -71,7 +71,7 @@
7171
},
7272
},
7373

74-
ocamllex = {
74+
ocamllex | default = {
7575
extensions = ["mll"],
7676
grammar.source.git = {
7777
git = "https://github.com/314eter/tree-sitter-ocamllex.git",
@@ -89,7 +89,7 @@
8989
},
9090
},
9191

92-
rust = {
92+
rust | default = {
9393
extensions = ["rs"],
9494
indent = " ", # 4 spaces
9595
grammar.source.git = {
@@ -99,7 +99,7 @@
9999
},
100100
},
101101

102-
sdml = {
102+
sdml | default = {
103103
extensions = ["sdm", "sdml"],
104104
grammar.source.git = {
105105
git = "https://github.com/sdm-lang/tree-sitter-sdml",
@@ -108,7 +108,7 @@
108108
},
109109
},
110110

111-
toml = {
111+
toml | default = {
112112
extensions = ["toml"],
113113
grammar.source.git = {
114114
git = "https://github.com/tree-sitter/tree-sitter-toml.git",
@@ -117,7 +117,7 @@
117117
},
118118
},
119119

120-
tree_sitter_query = {
120+
tree_sitter_query | default = {
121121
extensions = ["scm"],
122122
grammar = {
123123
source.git = {
@@ -129,7 +129,7 @@
129129
},
130130
},
131131

132-
wit = {
132+
wit | default = {
133133
extensions = ["wit"],
134134
indent = " ", # 4 spaces
135135
grammar = {

topiary-queries/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "topiary-queries"
33
# The version should always be "X.Y.Z" where the workspace version is `X.Y.Z'`
44
# with `Z' <= Z`. Whenever there's a need to release an update to the queries
55
# without changing the core of Topiary, just bump `Z`.
6-
version = "0.7.0"
6+
version = "0.7.1"
77
categories = ["development-tools", "text-processing"]
88
keywords = ["code-formatter", "formatter", "text", "tree-sitter"]
99
edition.workspace = true

0 commit comments

Comments
 (0)