Merge remote-tracking branch 'upstream/main' into feat-connect-version-override

Author: juleswg23

.github/CODE_OF_CONDUCT.md

@@ -36,7 +36,9 @@ Examples of unacceptable behavior include:
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 * Providing bad information by copying output from AI assistants
-  without verifying its validity
+  without verifying its validity. This _specifically_ includes autonomous agents
+  from OpenClaw, etc. We consider these account-bannable on first offense.
+  You have been warned.
 
 ## Enforcement Responsibilities
 

news/changelog-1.9.md

@@ -178,3 +178,4 @@ All changes included in 1.9:
 - ([#13997](https://github.com/quarto-dev/quarto-cli/issues/13997)): Fix Windows dart-sass theme compilation failing when Quarto is installed in a path with spaces (e.g., `C:\Program Files\`) and the project path also contains spaces.
 - ([#13998](https://github.com/quarto-dev/quarto-cli/issues/13998)): Fix YAML validation error with CR-only line terminators (old Mac format). Documents using `\r` line endings no longer fail with "Expected YAML front matter to contain at least 2 lines".
 - ([#14012](https://github.com/quarto-dev/quarto-cli/issues/14012)): Add `fr-CA` language translation for Quebec French inclusive writing conventions, using parenthetical forms instead of middle dots for author labels. (author: @tdhock)
+- ([#14032](https://github.com/quarto-dev/quarto-cli/issues/14032)): Add `editor_options` with `chunk_output_type` to YAML schema for autocompletion and validation in RStudio and Positron.

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

@@ -14477,6 +14477,26 @@ var require_yaml_intelligence_resources = __commonJS({
           },
           description: "Visual editor configuration"
         },
+        {
+          name: "editor_options",
+          schema: {
+            object: {
+              properties: {
+                chunk_output_type: {
+                  enum: [
+                    "inline",
+                    "console"
+                  ],
+                  description: "Determines where chunk output is shown in the editor."
+                }
+              }
+            }
+          },
+          description: {
+            short: "Editor-specific options (used by RStudio and Positron).",
+            long: "Editor-specific options that control IDE behavior for this document.\nThese options are used by RStudio and Positron to configure\nper-document editor settings.\n"
+          }
+        },
         {
           name: "zotero",
           schema: {
@@ -25075,7 +25095,12 @@ var require_yaml_intelligence_resources = __commonJS({
         "Disambiguating year suffix in author-date styles (e.g. \u201Ca\u201D in \u201CDoe,\n1999a\u201D).",
         "Manuscript configuration",
         "internal-schema-hack",
-        "List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto\u2019s default order\nis \u2018knitr\u2019, \u2018jupyter\u2019, \u2018markdown\u2019, \u2018julia\u2019."
+        "List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto\u2019s default order\nis \u2018knitr\u2019, \u2018jupyter\u2019, \u2018markdown\u2019, \u2018julia\u2019.",
+        {
+          short: "Editor-specific options (used by RStudio and Positron).",
+          long: "Editor-specific options that control IDE behavior for this document.\nThese options are used by RStudio and Positron to configure per-document\neditor settings."
+        },
+        "Determines where chunk output is shown in the editor."
       ],
       "schema/external-schemas.yml": [
         {
@@ -25305,12 +25330,12 @@ var require_yaml_intelligence_resources = __commonJS({
         mermaid: "%%"
       },
       "handlers/mermaid/schema.yml": {
-        _internalId: 221789,
+        _internalId: 221795,
         type: "object",
         description: "be an object",
         properties: {
           "mermaid-format": {
-            _internalId: 221781,
+            _internalId: 221787,
             type: "enum",
             enum: [
               "png",
@@ -25326,7 +25351,7 @@ var require_yaml_intelligence_resources = __commonJS({
             exhaustiveCompletions: true
           },
           theme: {
-            _internalId: 221788,
+            _internalId: 221794,
             type: "anyOf",
             anyOf: [
               {
@@ -25623,7 +25648,7 @@ function locationString(loc) {
 
 // ../text.ts
 function lines(text) {
-  return text.split(/\r?\n/);
+  return text.split(/\r\n?|\n/);
 }
 function* matchAll(text, regexp) {
   if (!regexp.global) {
@@ -25636,7 +25661,7 @@ function* matchAll(text, regexp) {
 }
 function* lineOffsets(text) {
   yield 0;
-  for (const match of matchAll(text, /\r?\n/g)) {
+  for (const match of matchAll(text, /\r\n?|\n/g)) {
     yield match.index + match[0].length;
   }
 }
@@ -25822,7 +25847,7 @@ function matchAll2(str2, regex) {
   return result;
 }
 function rangedLines(text, includeNewLines = false) {
-  const regex = /\r?\n/g;
+  const regex = /\r\n?|\n/g;
   const result = [];
   let startOffset = 0;
   if (!includeNewLines) {
@@ -34695,7 +34720,7 @@ async function breakQuartoMd(src, validate2 = false, lenient = false, startCodeC
   };
   const yamlRegEx = /^---\s*$/;
   const startCodeCellRegEx = startCodeCellRegex || new RegExp(
-    "^\\s*(```+)\\s*\\{([=A-Za-z]+)( *[ ,].*)?\\}\\s*$"
+    "^\\s*(```+)\\s*\\{([=A-Za-z][=A-Za-z0-9._]*)( *[ ,].*)?\\}\\s*$"
   );
   const startCodeRegEx = /^```/;
   const endCodeRegEx = /^\s*(```+)\s*$/;

src/resources/editor/tools/yaml/all-schema-definitions.json

@@ -7449,6 +7449,26 @@
       },
       "description": "Visual editor configuration"
     },
+    {
+      "name": "editor_options",
+      "schema": {
+        "object": {
+          "properties": {
+            "chunk_output_type": {
+              "enum": [
+                "inline",
+                "console"
+              ],
+              "description": "Determines where chunk output is shown in the editor."
+            }
+          }
+        }
+      },
+      "description": {
+        "short": "Editor-specific options (used by RStudio and Positron).",
+        "long": "Editor-specific options that control IDE behavior for this document.\nThese options are used by RStudio and Positron to configure\nper-document editor settings.\n"
+      }
+    },
     {
       "name": "zotero",
       "schema": {
@@ -18047,7 +18067,12 @@
     "Disambiguating year suffix in author-date styles (e.g. “a” in “Doe,\n1999a”).",
     "Manuscript configuration",
     "internal-schema-hack",
-    "List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto’s default order\nis ‘knitr’, ‘jupyter’, ‘markdown’, ‘julia’."
+    "List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto’s default order\nis ‘knitr’, ‘jupyter’, ‘markdown’, ‘julia’.",
+    {
+      "short": "Editor-specific options (used by RStudio and Positron).",
+      "long": "Editor-specific options that control IDE behavior for this document.\nThese options are used by RStudio and Positron to configure per-document\neditor settings."
+    },
+    "Determines where chunk output is shown in the editor."
   ],
   "schema/external-schemas.yml": [
     {
@@ -18277,12 +18302,12 @@
     "mermaid": "%%"
   },
   "handlers/mermaid/schema.yml": {
-    "_internalId": 221789,
+    "_internalId": 221795,
     "type": "object",
     "description": "be an object",
     "properties": {
       "mermaid-format": {
-        "_internalId": 221781,
+        "_internalId": 221787,
         "type": "enum",
         "enum": [
           "png",
@@ -18298,7 +18323,7 @@
         "exhaustiveCompletions": true
       },
       "theme": {
-        "_internalId": 221788,
+        "_internalId": 221794,
         "type": "anyOf",
         "anyOf": [
           {

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

@@ -61,54 +61,61 @@
     }
    }
 
-  place(top, float: true, scope: "parent", clearance: 4mm)[
-    #if title != none {
-      align(center, block(inset: 2em)[
-        #set par(leading: heading-line-height) if heading-line-height != none
-        #set text(font: heading-family) if heading-family != none
-        #set text(weight: heading-weight)
-        #set text(style: heading-style) if heading-style != "normal"
-        #set text(fill: heading-color) if heading-color != black
+  place(
+    top,
+    float: true,
+    scope: "parent",
+    clearance: 4mm,
+    block(below: 1em, width: 100%)[
 
-        #text(size: title-size)[#title #if thanks != none {
-          footnote(thanks, numbering: "*")
-          counter(footnote).update(n => n - 1)
-        }]
-        #(if subtitle != none {
-          parbreak()
-          text(size: subtitle-size)[#subtitle]
-        })
-      ])
-    }
+      #if title != none {
+        align(center, block(inset: 2em)[
+          #set par(leading: heading-line-height) if heading-line-height != none
+          #set text(font: heading-family) if heading-family != none
+          #set text(weight: heading-weight)
+          #set text(style: heading-style) if heading-style != "normal"
+          #set text(fill: heading-color) if heading-color != black
+
+          #text(size: title-size)[#title #if thanks != none {
+            footnote(thanks, numbering: "*")
+            counter(footnote).update(n => n - 1)
+          }]
+          #(if subtitle != none {
+            parbreak()
+            text(size: subtitle-size)[#subtitle]
+          })
+        ])
+      }
 
-    #if authors != none and authors != () {
-      let count = authors.len()
-      let ncols = calc.min(count, 3)
-      grid(
-        columns: (1fr,) * ncols,
-        row-gutter: 1.5em,
-        ..authors.map(author =>
-            align(center)[
-              #author.name \
-              #author.affiliation \
-              #author.email
-            ]
+      #if authors != none and authors != () {
+        let count = authors.len()
+        let ncols = calc.min(count, 3)
+        grid(
+          columns: (1fr,) * ncols,
+          row-gutter: 1.5em,
+          ..authors.map(author =>
+              align(center)[
+                #author.name \
+                #author.affiliation \
+                #author.email
+              ]
+          )
         )
-      )
-    }
+      }
 
-    #if date != none {
-      align(center)[#block(inset: 1em)[
-        #date
-      ]]
-    }
+      #if date != none {
+        align(center)[#block(inset: 1em)[
+          #date
+        ]]
+      }
 
-    #if abstract != none {
-      block(inset: 2em)[
-      #text(weight: "semibold")[#abstract-title] #h(1em) #abstract
-      ]
-    }
-  ]
+      #if abstract != none {
+        block(inset: 2em)[
+        #text(weight: "semibold")[#abstract-title] #h(1em) #abstract
+        ]
+      }
+    ]
+  )
 
   if toc {
     let title = if toc_title == none {