Skip to content

Commit eaf85ae

Browse files
authored
Merge pull request #11312 from quarto-dev/knitr/new-option-support
2 parents 8851f59 + a303896 commit eaf85ae

File tree

4 files changed

+62
-20
lines changed

4 files changed

+62
-20
lines changed

src/resources/editor/tools/vs-code.mjs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8220,9 +8220,18 @@ var require_yaml_intelligence_resources = __commonJS({
82208220
tags: {
82218221
engine: "knitr"
82228222
},
8223-
schema: "boolean",
8223+
schema: {
8224+
enum: [
8225+
true,
8226+
false,
8227+
"NA"
8228+
]
8229+
},
82248230
default: true,
8225-
description: "Include messages in rendered output."
8231+
description: {
8232+
short: "Include messages in rendered output.",
8233+
long: "Include messages in rendered output. Possible values are `true`, `false`, or `NA`. \nIf `true`, messages are included in the output. If `false`, messages are not included. \nIf `NA`, messages are not included in output but shown in the knitr log to console.\n"
8234+
}
82268235
},
82278236
{
82288237
name: "results",
@@ -22035,7 +22044,10 @@ var require_yaml_intelligence_resources = __commonJS({
2203522044
short: "Location of output relative to the code that generated it\n(<code>default</code>, <code>fragment</code>, <code>slide</code>,\n<code>column</code>, or <code>column-location</code>)",
2203622045
long: "Location of output relative to the code that generated it. The\npossible values are as follows:"
2203722046
},
22038-
"Include messages in rendered output.",
22047+
{
22048+
short: "Include messages in rendered output.",
22049+
long: "Include messages in rendered output. Possible values are\n<code>true</code>, <code>false</code>, or <code>NA</code>. If\n<code>true</code>, messages are included in the output. If\n<code>false</code>, messages are not included. If <code>NA</code>,\nmessages are not included in output but shown in the knitr log to\nconsole."
22050+
},
2203922051
{
2204022052
short: "How to display text results",
2204122053
long: "How to display text results. Note that this option only applies to\nnormal text output (not warnings, messages, or errors). The possible\nvalues are as follows:"
@@ -24134,12 +24146,12 @@ var require_yaml_intelligence_resources = __commonJS({
2413424146
mermaid: "%%"
2413524147
},
2413624148
"handlers/mermaid/schema.yml": {
24137-
_internalId: 193399,
24149+
_internalId: 193475,
2413824150
type: "object",
2413924151
description: "be an object",
2414024152
properties: {
2414124153
"mermaid-format": {
24142-
_internalId: 193391,
24154+
_internalId: 193467,
2414324155
type: "enum",
2414424156
enum: [
2414524157
"png",
@@ -24155,7 +24167,7 @@ var require_yaml_intelligence_resources = __commonJS({
2415524167
exhaustiveCompletions: true
2415624168
},
2415724169
theme: {
24158-
_internalId: 193398,
24170+
_internalId: 193474,
2415924171
type: "anyOf",
2416024172
anyOf: [
2416124173
{

src/resources/editor/tools/yaml/web-worker.js

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

src/resources/editor/tools/yaml/yaml-intelligence-resources.json

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,9 +1192,18 @@
11921192
"tags": {
11931193
"engine": "knitr"
11941194
},
1195-
"schema": "boolean",
1195+
"schema": {
1196+
"enum": [
1197+
true,
1198+
false,
1199+
"NA"
1200+
]
1201+
},
11961202
"default": true,
1197-
"description": "Include messages in rendered output."
1203+
"description": {
1204+
"short": "Include messages in rendered output.",
1205+
"long": "Include messages in rendered output. Possible values are `true`, `false`, or `NA`. \nIf `true`, messages are included in the output. If `false`, messages are not included. \nIf `NA`, messages are not included in output but shown in the knitr log to console.\n"
1206+
}
11981207
},
11991208
{
12001209
"name": "results",
@@ -15007,7 +15016,10 @@
1500715016
"short": "Location of output relative to the code that generated it\n(<code>default</code>, <code>fragment</code>, <code>slide</code>,\n<code>column</code>, or <code>column-location</code>)",
1500815017
"long": "Location of output relative to the code that generated it. The\npossible values are as follows:"
1500915018
},
15010-
"Include messages in rendered output.",
15019+
{
15020+
"short": "Include messages in rendered output.",
15021+
"long": "Include messages in rendered output. Possible values are\n<code>true</code>, <code>false</code>, or <code>NA</code>. If\n<code>true</code>, messages are included in the output. If\n<code>false</code>, messages are not included. If <code>NA</code>,\nmessages are not included in output but shown in the knitr log to\nconsole."
15022+
},
1501115023
{
1501215024
"short": "How to display text results",
1501315025
"long": "How to display text results. Note that this option only applies to\nnormal text output (not warnings, messages, or errors). The possible\nvalues are as follows:"
@@ -17106,12 +17118,12 @@
1710617118
"mermaid": "%%"
1710717119
},
1710817120
"handlers/mermaid/schema.yml": {
17109-
"_internalId": 193399,
17121+
"_internalId": 193475,
1711017122
"type": "object",
1711117123
"description": "be an object",
1711217124
"properties": {
1711317125
"mermaid-format": {
17114-
"_internalId": 193391,
17126+
"_internalId": 193467,
1711517127
"type": "enum",
1711617128
"enum": [
1711717129
"png",
@@ -17127,7 +17139,7 @@
1712717139
"exhaustiveCompletions": true
1712817140
},
1712917141
"theme": {
17130-
"_internalId": 193398,
17142+
"_internalId": 193474,
1713117143
"type": "anyOf",
1713217144
"anyOf": [
1713317145
{

src/resources/schema/cell-textoutput.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,15 @@
7272
- name: message
7373
tags:
7474
engine: knitr
75-
schema: boolean
75+
schema:
76+
enum: [true, false, NA]
7677
default: true
77-
description: Include messages in rendered output.
78+
description:
79+
short: Include messages in rendered output.
80+
long: |
81+
Include messages in rendered output. Possible values are `true`, `false`, or `NA`.
82+
If `true`, messages are included in the output. If `false`, messages are not included.
83+
If `NA`, messages are not included in output but shown in the knitr log to console.
7884
7985
- name: results
8086
tags:

0 commit comments

Comments
 (0)