Merge branch 'main' of github.com:quarto-dev/quarto-cli into main

Author: jjallaire

news/changelog-1.1.md

@@ -37,6 +37,7 @@
 ## Code Blocks
 
 - Support `filename` attribute for attaching a file name header to code blocks
+- Improve YAML parse error messages in `r` code blocks using `!expr` YAML (#1949)
 
 ## OJS
 
@@ -48,6 +49,7 @@
 - Hide declarations in hugo format (#1812)
 - Enable OJS runtime in the presence of `ojs_define` (#1846)
 - Emit subcaptions correctly (#1711)
+- Use forward slashes in paths so OJS compilation works on windows (#1605)
 
 ## Websites
 

src/core/lib/yaml-intelligence/annotated-yaml.ts

@@ -11,6 +11,7 @@ import { AnnotatedParse, JSONValue } from "../yaml-schema/types.ts";
 import {
   asMappedString,
   mappedIndexToLineCol,
+  mappedLines,
   MappedString,
 } from "../mapped-text.ts";
 import { getTreeSitterSync } from "./parsing.ts";
@@ -19,6 +20,7 @@ import { load as jsYamlParse } from "../external/js-yaml.js";
 
 import { QuartoJSONSchema } from "./js-yaml-schema.ts";
 import { createSourceContext } from "../yaml-validation/errors.ts";
+import { tidyverseInfo } from "../errors.ts";
 
 // deno-lint-ignore no-explicit-any
 type TreeSitterParse = any;
@@ -64,10 +66,13 @@ export function readAnnotatedYamlFromMappedString(
   try {
     return buildJsYamlAnnotation(mappedSource);
   } catch (e) {
+    // FIXME we should convert this to a TidyverseError
+    // for now, we just use the util functions.
     const m = e.stack.split("\n")[0].match(/^.+ \((\d+):(\d+)\)$/);
     if (m) {
       const f = lineColToIndex(mappedSource.value);
-      const offset = f({ line: Number(m[1]) - 1, column: Number(m[2] - 1) });
+      const location = { line: Number(m[1]) - 1, column: Number(m[2] - 1) };
+      const offset = f(location);
       const { originalString } = mappedSource.map(offset, true)!;
       const filename = originalString.fileName!;
       const f2 = mappedIndexToLineCol(mappedSource);
@@ -80,6 +85,22 @@ export function readAnnotatedYamlFromMappedString(
         column + 1
       })\n${sourceContext}`;
       e.message = e.stack;
+      if (
+        mappedLines(mappedSource)[location.line].value.indexOf("!expr") !==
+          -1 &&
+        e.reason.match(/bad indentation of a mapping entry/)
+      ) {
+        e.message = `${e.message}\n${
+          tidyverseInfo(
+            "YAML tags like !expr must be followed by YAML strings.",
+          )
+        }\n${
+          tidyverseInfo(
+            "Is it possible you need to quote the value you passed to !expr ?",
+          )
+        }`;
+      }
+
       e.stack = "";
     }
     throw e;

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

@@ -19893,6 +19893,10 @@ function mappedIndexToLineCol(eitherText) {
     return indexToLineCol(originalString.value)(index);
   };
 }
+function mappedLines(str2, keepNewLines = false) {
+  const lines2 = rangedLines(str2.value, keepNewLines);
+  return lines2.map((v) => mappedString(str2, [v.range]));
+}
 
 // parsing.ts
 var _parser;
@@ -25509,7 +25513,8 @@ function readAnnotatedYamlFromMappedString(mappedSource2) {
     const m = e.stack.split("\n")[0].match(/^.+ \((\d+):(\d+)\)$/);
     if (m) {
       const f = lineColToIndex(mappedSource2.value);
-      const offset = f({ line: Number(m[1]) - 1, column: Number(m[2] - 1) });
+      const location = { line: Number(m[1]) - 1, column: Number(m[2] - 1) };
+      const offset = f(location);
       const { originalString } = mappedSource2.map(offset, true);
       const filename = originalString.fileName;
       const f2 = mappedIndexToLineCol(mappedSource2);
@@ -25521,6 +25526,11 @@ function readAnnotatedYamlFromMappedString(mappedSource2) {
       e.stack = `${e.reason} (${filename}, ${line + 1}:${column + 1})
 ${sourceContext}`;
       e.message = e.stack;
+      if (mappedLines(mappedSource2)[location.line].value.indexOf("!expr") !== -1 && e.reason.match(/bad indentation of a mapping entry/)) {
+        e.message = `${e.message}
+${tidyverseInfo("YAML tags like !expr must be followed by YAML strings.")}
+${tidyverseInfo("Is it possible you need to quote the value you passed to !expr ?")}`;
+      }
       e.stack = "";
     }
     throw e;

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

@@ -59,20 +59,32 @@ header.headroom--unpinned {
 }
 
 .navbar-brand {
-  text-overflow: ellipsis;
   overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.navbar-brand-container {
   max-width: calc(100% - 85px);
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  margin-right: 1em;
+}
+
+.navbar-brand.navbar-brand-logo {
+  margin-right: 4px;
+  display: inline-flex;
 }
 
 .navbar-toggler {
   flex-basis: content;
   flex-shrink: 0;
 }
 
-.navbar-brand > img {
+.navbar-logo {
   max-height: 24px;
   width: auto;
-  padding-right: 6px;
+  padding-right: 4px;
 }
 
 nav .nav-item:not(.compact) {

src/resources/projects/website/navigation/quarto-nav.scss

@@ -1,10 +1,16 @@
 <% if (navbar.title || navbar.logo) { %>
-  <a class="navbar-brand" href="<%- navbar['logo-href'] || '/index.html' %>">
+  <div class="navbar-brand-container">
   <% if (navbar.logo) { %>
-    <img src="<%- navbar.logo %>" alt="<%- navbar['logo-alt'] || '' %>" />
+    <a href="<%- navbar['logo-href'] || '/index.html' %>" class="navbar-brand navbar-brand-logo">
+    <img src="<%- navbar.logo %>" alt="<%- navbar['logo-alt'] || '' %>" class="navbar-logo" />
+    </a>
   <% } %>
+
+  
   <% if (navbar.title) { %>
+    <a class="navbar-brand" href="/index.html">
     <span class="navbar-title"><%- navbar.title %></span>
+    </a>
   <% } %>
-  </a>
+  </div>
 <% } %>