do not fixup includes

Author: cscheid

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));
   },