Skip to content

Commit 50aa336

Browse files
committed
Fixes "broken" settings in vsc settings ui
1 parent 4d53258 commit 50aa336

File tree

1 file changed

+44
-21
lines changed

1 file changed

+44
-21
lines changed

package.json

Lines changed: 44 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@
5454
"title": "GitLens — Use 'GitLens: Open Settings' for a richer, interactive experience",
5555
"properties": {
5656
"gitlens.autolinks": {
57-
"type": "array",
57+
"type": [
58+
"array",
59+
"null"
60+
],
61+
"default": null,
5862
"items": {
5963
"type": "object",
6064
"required": [
@@ -72,19 +76,21 @@
7276
"default": false
7377
},
7478
"title": {
75-
"type": "string",
76-
"description": "Specifies an optional title for the generated autolink. Use `<num>` as the variable for the reference number",
77-
"default": null
79+
"type": [
80+
"string",
81+
"null"
82+
],
83+
"default": null,
84+
"description": "Specifies an optional title for the generated autolink. Use `<num>` as the variable for the reference number"
7885
},
7986
"url": {
8087
"type": "string",
8188
"description": "Specifies the url of the external resource you want to link to. Use `<num>` as the variable for the reference number"
8289
}
83-
},
84-
"default": null
90+
}
8591
},
8692
"uniqueItems": true,
87-
"markdownDescription": "Specifies autolinks to external resources in commit messages. Use <num> as the variable for the reference number",
93+
"markdownDescription": "Specifies autolinks to external resources in commit messages. Use `<num>` as the variable for the reference number",
8894
"scope": "window"
8995
},
9096
"gitlens.blame.avatars": {
@@ -100,7 +106,10 @@
100106
"scope": "window"
101107
},
102108
"gitlens.blame.dateFormat": {
103-
"type": "string",
109+
"type": [
110+
"string",
111+
"null"
112+
],
104113
"default": null,
105114
"markdownDescription": "Specifies how to format absolute dates (e.g. using the `${date}` token) in gutter blame annotations. See the [Moment.js docs](https://momentjs.com/docs/#/displaying/format/) for valid formats",
106115
"scope": "window"
@@ -432,7 +441,10 @@
432441
"scope": "resource"
433442
},
434443
"gitlens.currentLine.dateFormat": {
435-
"type": "string",
444+
"type": [
445+
"string",
446+
"null"
447+
],
436448
"default": null,
437449
"markdownDescription": "Specifies how to format absolute dates (e.g. using the `${date}` token) for the current line blame annotation. See the [Moment.js docs](https://momentjs.com/docs/#/displaying/format/) for valid formats",
438450
"scope": "window"
@@ -462,13 +474,19 @@
462474
"scope": "window"
463475
},
464476
"gitlens.defaultDateFormat": {
465-
"type": "string",
477+
"type": [
478+
"string",
479+
"null"
480+
],
466481
"default": null,
467482
"markdownDescription": "Specifies how absolute dates will be formatted by default. See the [Moment.js docs](https://momentjs.com/docs/#/displaying/format/) for valid formats",
468483
"scope": "window"
469484
},
470485
"gitlens.defaultDateShortFormat": {
471-
"type": "string",
486+
"type": [
487+
"string",
488+
"null"
489+
],
472490
"default": null,
473491
"markdownDescription": "Specifies how short absolute dates will be formatted by default. See the [Moment.js docs](https://momentjs.com/docs/#/displaying/format/) for valid formats",
474492
"scope": "window"
@@ -1221,7 +1239,10 @@
12211239
"scope": "window"
12221240
},
12231241
"gitlens.remotes": {
1224-
"type": "array",
1242+
"type": [
1243+
"array",
1244+
"null"
1245+
],
12251246
"default": null,
12261247
"items": {
12271248
"type": "object",
@@ -1400,7 +1421,10 @@
14001421
"scope": "window"
14011422
},
14021423
"gitlens.statusBar.dateFormat": {
1403-
"type": "string",
1424+
"type": [
1425+
"string",
1426+
"null"
1427+
],
14041428
"default": null,
14051429
"markdownDescription": "Specifies how to format absolute dates (e.g. using the `${date}` token) in the blame information in the status bar. See the [Moment.js docs](https://momentjs.com/docs/#/displaying/format/) for valid formats",
14061430
"scope": "window"
@@ -1817,7 +1841,10 @@
18171841
"scope": "window"
18181842
},
18191843
"gitlens.advanced.blame.customArguments": {
1820-
"type": "array",
1844+
"type": [
1845+
"array",
1846+
"null"
1847+
],
18211848
"default": null,
18221849
"items": {
18231850
"type": "string"
@@ -1923,13 +1950,9 @@
19231950
"scope": "resource"
19241951
},
19251952
"gitlens.advanced.similarityThreshold": {
1926-
"anyOf": [
1927-
{
1928-
"type": "number"
1929-
},
1930-
{
1931-
"type": "null"
1932-
}
1953+
"type": [
1954+
"number",
1955+
"null"
19331956
],
19341957
"default": null,
19351958
"markdownDescription": "Specifies the amount (percent) of similarity a deleted and added file pair must have to be considered a rename",

0 commit comments

Comments
 (0)