Skip to content

Commit

Permalink
json schema: Fix bad indentation for jj fix settings
Browse files Browse the repository at this point in the history
The fix settings weren't indented consistent with the rest of the settings,
causing them to appear in the redacted snapshot in the test_util_config_schema
test.
  • Loading branch information
emesterhazy committed Feb 13, 2025
1 parent 61cab24 commit b90e5af
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cli/src/config-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@
}
}
},
"fix": {
"fix": {
"type": "object",
"description": "Settings for jj fix",
"properties": {
Expand Down
6 changes: 2 additions & 4 deletions cli/tests/test_util_command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fn test_util_config_schema() {
let stdout = test_env.jj_cmd_success(test_env.env_root(), &["util", "config-schema"]);
// Validate partial snapshot, redacting any lines nested 2+ indent levels.
insta::with_settings!({filters => vec![(r"(?m)(^ .*$\r?\n)+", " [...]\n")]}, {
assert_snapshot!(stdout, @r#"
assert_snapshot!(stdout, @r###"
{
"$schema": "http://json-schema.org/draft-04/schema",
"$comment": "`taplo` and the corresponding VS Code plugins only support draft-04 verstion of JSON Schema, see <https://taplo.tamasfe.dev/configuration/developing-schemas.html>. draft-07 is mostly compatible with it, newer versions may not be.",
Expand All @@ -32,11 +32,9 @@ fn test_util_config_schema() {
"description": "User configuration for Jujutsu VCS. See https://jj-vcs.github.io/jj/latest/config/ for details",
"properties": {
[...]
"fix": {
[...]
}
}
"#);
"###);
});
}

Expand Down

0 comments on commit b90e5af

Please sign in to comment.