config-schema: allow arrays of strings for ui.editor and `ui.diff.t…

…ool` Fixes #5617
jj-vcs · Feb 11, 2025 · a80da3a · a80da3a
1 parent c187142
commit a80da3a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,6 +35,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   expand `~/` to `$HOME/`.
   [#5626](https://github.com/jj-vcs/jj/pull/5626)
 
+* `config-schema.json` now allows arrays of strings for the settings `ui.editor`
+  and `ui.diff.tool`.
+
 ## [0.26.0] - 2025-02-05
 
 ### Release highlights

diff --git a/cli/src/config-schema.json b/cli/src/config-schema.json
@@ -98,7 +98,21 @@
                     "default": "auto"
                 },
                 "pager": {
-                    "type": "string",
+                    "type": ["array", "object", "string"],
+                    "items": {
+                        "type": "string"
+                    },
+                    "properties": {
+                        "command": {
+                            "type": ["array", "string"],
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "env": {
+                            "type": "object"
+                        }
+                    },
                     "description": "Pager to use for displaying command output",
                     "default": "less -FRX"
                 },
@@ -140,7 +154,10 @@
                             "default": "color-words"
                         },
                         "tool": {
-                            "type": "string",
+                            "type": ["array", "string"],
+                            "items": {
+                                "type": "string"
+                            },
                             "description": "External tool for generating diffs"
                         }
                     }
@@ -177,7 +194,10 @@
                     "default": true
                 },
                 "editor": {
-                    "type": "string",
+                    "type": ["array", "string"],
+                    "items": {
+                        "type": "string"
+                    },
                     "description": "Editor to use for commands that involve editing text"
                 },
                 "diff-editor": {