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

Author: jjallaire

src/command/serve/cmd.ts

@@ -9,6 +9,7 @@ import { Command } from "cliffy/command/mod.ts";
 
 import * as colors from "fmt/colors.ts";
 import { error } from "log/mod.ts";
+import { initYamlIntelligenceResourcesFromFilesystem } from "../../core/schema/utils.ts";
 import { projectContext } from "../../project/project-context.ts";
 
 import { serve } from "./serve.ts";
@@ -42,6 +43,7 @@ export const serveCommand = new Command()
   )
   // deno-lint-ignore no-explicit-any
   .action(async (options: any, input?: string) => {
+    await initYamlIntelligenceResourcesFromFilesystem();
     if (!input) {
       error(
         "No input passed to serve.\n" +

src/core/handlers/include.ts

@@ -16,10 +16,8 @@ import {
 } from "../lib/mapped-text.ts";
 
 import { dirname, join, normalize, relative } from "path/mod.ts";
-import { encodeMetadata } from "../encode-metadata.ts";
 import { rangedLines } from "../lib/ranged-text.ts";
 import {
-  getShortcodeNamedParams,
   getShortcodeUnnamedParams,
   isBlockShortcode,
 } from "../lib/parse-shortcode.ts";
@@ -41,36 +39,10 @@ const includeHandler: LanguageHandler = {
     const sourceDir = dirname(source);
     const retrievedFiles: string[] = [source];
     const retrievedDirectories: string[] = [sourceDir];
-    const fixups: (boolean | undefined)[] = [];
 
     const textFragments: EitherString[] = [];
 
-    const needsFixup = () => {
-      for (let i = fixups.length - 1; i >= 0; --i) {
-        if (fixups[i] !== undefined) {
-          return fixups[i];
-        }
-      }
-      return true;
-    };
-
-    const addFixup = (filename: string) => {
-      if (fixups.length > 0 && needsFixup()) {
-        let includeDir = relative(sourceDir, dirname(filename));
-        if (includeDir === "") {
-          includeDir = ".";
-        }
-        textFragments.push(encodeMetadata({
-          include_directory: includeDir,
-        }));
-      } else {
-        textFragments.push(encodeMetadata({
-          clear_include_directory: true,
-        }));
-      }
-    };
-
-    const retrieveInclude = (filename: string, fixup: boolean | undefined) => {
+    const retrieveInclude = (filename: string) => {
       const norm = relative(
         join(...retrievedDirectories),
         normalize(filename),
@@ -96,8 +68,6 @@ const includeHandler: LanguageHandler = {
 
       retrievedFiles.push(filename);
       retrievedDirectories.push(dirname(norm));
-      fixups.push(fixup);
-      addFixup(filename);
 
       let rangeStart = 0;
       for (const { substring, range } of rangedLines(includeSrc.value)) {
@@ -108,18 +78,13 @@ const includeHandler: LanguageHandler = {
           );
           rangeStart = range.end;
           const params = getShortcodeUnnamedParams(m);
-          const options = getShortcodeNamedParams(m);
           if (params.length === 0) {
             throw new Error("Include directive needs file parameter");
           }
           const file = params[0];
-          const fixup = options.fixup === undefined
-            ? undefined
-            : (options.fixup.toLocaleLowerCase() !== "false");
 
           retrieveInclude(
             join(...[...retrievedDirectories, file]),
-            fixup,
           );
         }
       }
@@ -135,22 +100,15 @@ const includeHandler: LanguageHandler = {
 
       retrievedFiles.pop();
       retrievedDirectories.pop();
-      fixups.pop();
-      addFixup(filename);
     };
 
     const params = getShortcodeUnnamedParams(directive);
-    const options = getShortcodeNamedParams(directive);
     if (params.length === 0) {
       throw new Error("Include directive needs filename as a parameter");
     }
     const includeName = join(sourceDir, params[0]);
 
-    const fixup = options.fixup === undefined
-      ? undefined
-      : (options.fixup.toLocaleLowerCase() !== "false");
-
-    retrieveInclude(includeName, fixup);
+    retrieveInclude(includeName);
 
     return Promise.resolve(mappedConcat(textFragments));
   },

tests/smoke/directives/include-fixups.test.ts

@@ -5,6 +5,8 @@
 *
 */
 
+/* Disable test for temporarily removed feature.
+
 import { ensureHtmlSelectorSatisfies } from "../../verify.ts";
 
 import { testRender } from "../render/render.ts";
@@ -35,4 +37,4 @@ testRender(test1.input, "html", false, [
       "../link.qmd",
     ]);
   }),
-]);
+]);*/