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

jjallaire · jjallaire · commit 9bb23f205cff · 2022-05-18T14:22:18.000-04:00
diff --git a/src/core/handlers/dot.ts b/src/core/handlers/dot.ts
@@ -14,7 +14,7 @@ import {
   isRevealjsOutput,
 } from "../../config/format.ts";
 import { QuartoMdCell } from "../lib/break-quarto-md.ts";
-import { mappedConcat, mappedIndexToRowCol } from "../lib/mapped-text.ts";
+import { mappedConcat, mappedIndexToLineCol } from "../lib/mapped-text.ts";
 
 import { lineOffsets } from "../lib/text.ts";
 import {
@@ -79,7 +79,7 @@ const dotHandler: LanguageHandler = {
       );
       if (m) {
         const number = Number(m[2]) - 1;
-        const locF = mappedIndexToRowCol(cellContent);
+        const locF = mappedIndexToLineCol(cellContent);
         const offsets = Array.from(lineOffsets(cellContent.value));
         const offset = offsets[number];
         const mapResult = cellContent.map(offset, true);
diff --git a/src/core/lib/mapped-text.ts b/src/core/lib/mapped-text.ts
@@ -9,7 +9,7 @@ import { glb } from "./binary-search.ts";
 import { rangedLines } from "./ranged-text.ts";
 
 import {
-  indexToRowCol as unmappedIndexToRowCol,
+  indexToLineCol as unmappedIndexToLineCol,
   lineBreakPositions,
   matchAll,
 } from "./text.ts";
@@ -204,8 +204,8 @@ export function mappedConcat(strings: EitherString[]): MappedString {
   };
 }
 
-// mapped version of text.ts:indexToRowCol
-export function mappedIndexToRowCol(eitherText: EitherString) {
+// mapped version of text.ts:indexToLineCol
+export function mappedIndexToLineCol(eitherText: EitherString) {
   const text = asMappedString(eitherText);
 
   return function (offset: number) {
@@ -215,7 +215,7 @@ export function mappedIndexToRowCol(eitherText: EitherString) {
     }
     const { index, originalString } = mapResult;
 
-    return unmappedIndexToRowCol(originalString.value)(index);
+    return unmappedIndexToLineCol(originalString.value)(index);
   };
 }
 
diff --git a/src/core/lib/text.ts b/src/core/lib/text.ts
@@ -43,7 +43,7 @@ export function* lineBreakPositions(text: string) {
   }
 }
 
-export function indexToRowCol(text: string) {
+export function indexToLineCol(text: string) {
   const offsets = Array.from(lineOffsets(text));
   return function (offset: number) {
     if (offset === 0) {
@@ -61,10 +61,10 @@ export function indexToRowCol(text: string) {
   };
 }
 
-export function rowColToIndex(text: string) {
+export function lineColToIndex(text: string) {
   const offsets = Array.from(lineOffsets(text));
-  return function (position: { row: number; column: number }) {
-    return offsets[position.row] + position.column;
+  return function (position: { line: number; column: number }) {
+    return offsets[position.line] + position.column;
   };
 }
 
diff --git a/src/core/lib/yaml-intelligence/annotated-yaml.ts b/src/core/lib/yaml-intelligence/annotated-yaml.ts
@@ -5,12 +5,12 @@
 *
 */
 
-import { lines, matchAll, rowColToIndex } from "../text.ts";
+import { lineColToIndex, lines, matchAll } from "../text.ts";
 import { AnnotatedParse, JSONValue } from "../yaml-schema/types.ts";
 
 import {
   asMappedString,
-  mappedIndexToRowCol,
+  mappedIndexToLineCol,
   MappedString,
 } from "../mapped-text.ts";
 import { getTreeSitterSync } from "./parsing.ts";
@@ -52,11 +52,11 @@ export function readAnnotatedYamlFromMappedString(
   } catch (e) {
     const m = e.stack.split("\n")[0].match(/^.+ \((\d+):(\d+)\)$/);
     if (m) {
-      const f = rowColToIndex(mappedSource.value);
-      const offset = f({ row: Number(m[1]) - 1, column: Number(m[2] - 1) });
+      const f = lineColToIndex(mappedSource.value);
+      const offset = f({ line: Number(m[1]) - 1, column: Number(m[2] - 1) });
       const { originalString } = mappedSource.map(offset, true)!;
       const filename = originalString.fileName!;
-      const f2 = mappedIndexToRowCol(mappedSource);
+      const f2 = mappedIndexToLineCol(mappedSource);
       const { line, column } = f2(offset);
       const sourceContext = createSourceContext(mappedSource, {
         start: offset,
diff --git a/src/core/lib/yaml-intelligence/hover.ts b/src/core/lib/yaml-intelligence/hover.ts
@@ -11,7 +11,7 @@ import { asMappedString } from "../mapped-text.ts";
 import { MappedString } from "../text-types.ts";
 import { kLangCommentChars } from "../partition-cell-options.ts";
 import { rangedLines } from "../ranged-text.ts";
-import { indexToRowCol, lines } from "../text.ts";
+import { indexToLineCol, lines } from "../text.ts";
 import { navigateSchemaByInstancePath } from "../yaml-validation/schema-navigation.ts";
 import {
   AnnotatedParse,
@@ -78,7 +78,7 @@ function buildLineMap(
     }
   };
 
-  const f = indexToRowCol(document.value);
+  const f = indexToLineCol(document.value);
   const state: State = {
     annotation,
     path: [],
diff --git a/src/core/lib/yaml-intelligence/parsing.ts b/src/core/lib/yaml-intelligence/parsing.ts
@@ -7,7 +7,7 @@
 
 import { asMappedString, MappedString, mappedString } from "../mapped-text.ts";
 import { rangedLines } from "../ranged-text.ts";
-import { lines, rowColToIndex } from "../text.ts";
+import { lineColToIndex, lines } from "../text.ts";
 import {
   LocateFromIndentationContext,
   YamlIntelligenceContext,
@@ -112,7 +112,7 @@ export function* attemptParsesAtLine(
   const currentLine = codeLines[position.row].substring;
   let currentColumn = position.column;
   let deletions = 0;
-  const locF = rowColToIndex(code.value);
+  const locF = lineColToIndex(code.value);
 
   while (currentColumn > 0) {
     currentColumn--;
@@ -128,15 +128,15 @@ export function* attemptParsesAtLine(
 
     if (position.column > deletions) {
       chunks.push({
-        start: locF({ row: position.row, column: 0 }),
-        end: locF({ row: position.row, column: position.column - deletions }),
+        start: locF({ line: position.row, column: 0 }),
+        end: locF({ line: position.row, column: position.column - deletions }),
       });
     }
 
     if (position.row + 1 < codeLines.length) {
       chunks.push({
-        start: locF({ row: position.row, column: currentLine.length - 1 }),
-        end: locF({ row: position.row + 1, column: 0 }),
+        start: locF({ line: position.row, column: currentLine.length - 1 }),
+        end: locF({ line: position.row + 1, column: 0 }),
       });
       chunks.push({
         start: codeLines[position.row + 1].range.start,
diff --git a/src/core/lib/yaml-intelligence/yaml-intelligence.ts b/src/core/lib/yaml-intelligence/yaml-intelligence.ts
@@ -20,7 +20,7 @@ import { initState, setInitializer } from "../yaml-validation/state.ts";
 
 import { guessChunkOptionsFormat } from "../guess-chunk-options-format.ts";
 import { asMappedString, MappedString, mappedString } from "../mapped-text.ts";
-import { lines, rowColToIndex } from "../text.ts";
+import { lineColToIndex, lines } from "../text.ts";
 import { breakQuartoMd, QuartoMdCell } from "../break-quarto-md.ts";
 import { rangedLines } from "../ranged-text.ts";
 import {
@@ -45,7 +45,7 @@ import {
   walkSchema,
 } from "../yaml-validation/schema-utils.ts";
 
-import { mappedIndexToRowCol } from "../mapped-text.ts";
+import { mappedIndexToLineCol } from "../mapped-text.ts";
 
 import { lineOffsets } from "../text.ts";
 
@@ -207,7 +207,7 @@ export async function validationFromGoodParseYAML(
   if (code.value === "") {
     return [];
   }
-  const locF = mappedIndexToRowCol(code);
+  const locF = mappedIndexToLineCol(code);
 
   // ignore bad lookups (from empty lines at the end of file)
   const ls = Array
@@ -327,8 +327,8 @@ async function completionsFromGoodParseYAML(context: YamlIntelligenceContext) {
       if (doc === null) {
         continue;
       }
-      const index = rowColToIndex(mappedCode.value)({
-        row: position.row,
+      const index = lineColToIndex(mappedCode.value)({
+        line: position.row,
         column: position.column - deletions,
       });
       let { withError: locateFailed, value: maybePath } = locateCursor(
diff --git a/src/core/lib/yaml-validation/errors.ts b/src/core/lib/yaml-validation/errors.ts
@@ -20,7 +20,7 @@ import {
 } from "../errors.ts";
 
 import {
-  mappedIndexToRowCol,
+  mappedIndexToLineCol,
   MappedString,
   mappedString,
   Range,
@@ -378,7 +378,7 @@ function expandEmptySpan(
     parse,
     true,
   )!;
-  const locF = mappedIndexToRowCol(parse.source);
+  const locF = mappedIndexToLineCol(parse.source);
   try {
     const location = {
       start: locF(lastKey.start),
@@ -769,7 +769,7 @@ export function createSourceContext(
   const startMapResult = src.map(location.start, true);
   const endMapResult = src.map(location.end, true);
 
-  const locF = mappedIndexToRowCol(src);
+  const locF = mappedIndexToLineCol(src);
 
   let sourceLocation;
   try {
@@ -856,7 +856,7 @@ export function createLocalizedError(obj: {
     message,
     schema,
   } = obj;
-  const locF = mappedIndexToRowCol(source);
+  const locF = mappedIndexToLineCol(source);
 
   let location;
   try {
diff --git a/src/core/mapped-text.ts b/src/core/mapped-text.ts
@@ -21,7 +21,7 @@ export type StringChunk = mt.StringChunk;
 export {
   asMappedString,
   mappedConcat,
-  mappedIndexToRowCol,
+  mappedIndexToLineCol,
   mappedNormalizeNewlines,
   mappedString,
   skipRegexp,
diff --git a/src/core/text.ts b/src/core/text.ts
@@ -12,7 +12,7 @@ import { lines } from "./lib/text.ts";
 
 // reexports from lib
 export {
-  indexToRowCol,
+  indexToLineCol,
   lineBreakPositions,
   lineOffsets,
   lines,
diff --git a/src/execute/ojs/errors.ts b/src/execute/ojs/errors.ts
@@ -6,7 +6,7 @@
 */
 
 import { error } from "log/mod.ts";
-import { mappedIndexToRowCol } from "../../core/lib/mapped-text.ts";
+import { mappedIndexToLineCol } from "../../core/lib/mapped-text.ts";
 import { MappedString } from "../../core/lib/text-types.ts";
 
 export function ojsParseError(
@@ -24,9 +24,9 @@ export function ojsParseError(
   //   pos: acornError.pos
   // });
 
-  const { line, column } = mappedIndexToRowCol(ojsSource)(acornError.pos)!;
+  const { line, column } = mappedIndexToLineCol(ojsSource)(acornError.pos)!;
   /*const { index, originalString } = ojsSource.map(acornError.pos, true)!;
-  const { line, column } = indexToRowCol(
+  const { line, column } = indexToLineCol(
     originalString.value,
   )(index);*/
 
diff --git a/src/execute/rmd.ts b/src/execute/rmd.ts
@@ -37,7 +37,8 @@ import {
 } from "./types.ts";
 import { postProcessRestorePreservedHtml } from "./engine-shared.ts";
 import { mappedStringFromFile } from "../core/mapped-text.ts";
-import { MappedString } from "../core/lib/mapped-text.ts";
+import { mappedIndexToLineCol, MappedString } from "../core/lib/mapped-text.ts";
+import { lineColToIndex } from "../core/lib/text.ts";
 
 const kRmdExtensions = [".rmd", ".rmarkdown"];
 
@@ -98,7 +99,24 @@ export const knitrEngine: ExecutionEngine = {
       options.quiet,
       // fixup .rmarkdown file references
       (output) => {
-        return output.replaceAll(`${inputStem}.rmarkdown`, inputBasename);
+        output = output.replaceAll(`${inputStem}.rmarkdown`, inputBasename);
+
+        const m = output.match(/^Quitting from lines (\d+)-(\d+)/m);
+        if (m) {
+          const f1 = lineColToIndex(options.target.markdown.value);
+          const f2 = mappedIndexToLineCol(options.target.markdown);
+
+          const newLine1 = f2(f1({ line: Number(m[1]) - 1, column: 0 })).line +
+            1;
+          const newLine2 = f2(f1({ line: Number(m[2]) - 1, column: 0 })).line +
+            1;
+          output = output.replace(
+            /^Quitting from lines (\d+)-(\d+)/m,
+            `Quitting from lines ${newLine1}-${newLine2}`,
+          );
+        }
+
+        return output;
       },
     );
     const includes = result.includes as unknown;
diff --git a/src/format/html/format-html-appendix.ts b/src/format/html/format-html-appendix.ts
@@ -111,7 +111,7 @@ export async function processDocumentAppendix(
             parentEl && parentEl.tagName === "SECTION" &&
             parentEl.childElementCount === 2 // The section has only the heading + the refs div
           ) {
-            const headingEl = parentEl.querySelector("h2, h3, h4, h5, h6");
+            const headingEl = parentEl.querySelector("h1, h2, h3, h4, h5, h6");
             if (headingEl) {
               headingEl.remove();
               return headingEl.innerText;
diff --git a/src/resources/editor/tools/vs-code.mjs b/src/resources/editor/tools/vs-code.mjs
diff --git a/src/resources/editor/tools/yaml/web-worker.js b/src/resources/editor/tools/yaml/web-worker.js
diff --git a/src/resources/editor/tools/yaml/yaml-intelligence-resources.json b/src/resources/editor/tools/yaml/yaml-intelligence-resources.json

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export function* lineBreakPositions(text: string) {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`-export function indexToRowCol(text: string) {`
	`46`	`+export function indexToLineCol(text: string) {`
`47`	`47`	`const offsets = Array.from(lineOffsets(text));`
`48`	`48`	`return function (offset: number) {`
`49`	`49`	`if (offset === 0) {`
`@@ -61,10 +61,10 @@ export function indexToRowCol(text: string) {`
`61`	`61`	`};`
`62`	`62`	`}`
`63`	`63`
`64`		`-export function rowColToIndex(text: string) {`
	`64`	`+export function lineColToIndex(text: string) {`
`65`	`65`	`const offsets = Array.from(lineOffsets(text));`
`66`		`- return function (position: { row: number; column: number }) {`
`67`		`- return offsets[position.row] + position.column;`
	`66`	`+ return function (position: { line: number; column: number }) {`
	`67`	`+ return offsets[position.line] + position.column;`
`68`	`68`	`};`
`69`	`69`	`}`
`70`	`70`