From 6be79429387bea411b6abfee29ba048b00fb8f13 Mon Sep 17 00:00:00 2001 From: Casey Occhialini <1508707+littlespex@users.noreply.github.com> Date: Mon, 14 Apr 2025 19:55:18 -0700 Subject: [PATCH 1/3] Add mts and cts file extension aliases see: https://github.com/TypeStrong/typedoc/issues/2935 --- src/lib/converter/plugins/IncludePlugin.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/converter/plugins/IncludePlugin.ts b/src/lib/converter/plugins/IncludePlugin.ts index 29a4cfea3..4228418e3 100644 --- a/src/lib/converter/plugins/IncludePlugin.ts +++ b/src/lib/converter/plugins/IncludePlugin.ts @@ -428,3 +428,5 @@ regionTagREsByExt["php"] = regionTagREsByExt["cs"]; regionTagREsByExt["ps1"] = regionTagREsByExt["cs"]; regionTagREsByExt["py"] = regionTagREsByExt["cs"]; regionTagREsByExt["js"] = regionTagREsByExt["ts"]; +regionTagREsByExt["mts"] = regionTagREsByExt["ts"]; +regionTagREsByExt["cts"] = regionTagREsByExt["ts"]; From ea6f853b10d51afa9690cdcf1a3cb22964ce611d Mon Sep 17 00:00:00 2001 From: Casey Occhialini <1508707+littlespex@users.noreply.github.com> Date: Mon, 14 Apr 2025 20:41:26 -0700 Subject: [PATCH 2/3] update highlighter to include file extension aliases --- src/lib/utils/highlighter.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/utils/highlighter.tsx b/src/lib/utils/highlighter.tsx index 0041a2ccc..f8eb2c011 100644 --- a/src/lib/utils/highlighter.tsx +++ b/src/lib/utils/highlighter.tsx @@ -2,7 +2,7 @@ import * as shiki from "@gerrit0/mini-shiki"; import { JSX, unique } from "#utils"; import assert from "assert"; -const aliases = new Map(); +const aliases = new Map([['mts', 'typescript'], ['cts', 'typescript']]); for (const lang of shiki.bundledLanguagesInfo) { for (const alias of lang.aliases || []) { aliases.set(alias, lang.id); @@ -175,7 +175,7 @@ export function getSupportedThemes(): string[] { export function isLoadedLanguage(lang: string): boolean { return ( - plaintextLanguages.includes(lang) || ignoredLanguages?.includes(lang) || highlighter?.supports(lang) || false + isSupportedLanguage(lang) || highlighter?.supports(lang) || false ); } From bbc3e1c436009f52c9a112a52e3405e9e15634e0 Mon Sep 17 00:00:00 2001 From: Casey Occhialini <1508707+littlespex@users.noreply.github.com> Date: Mon, 14 Apr 2025 20:58:10 -0700 Subject: [PATCH 3/3] - add changelog - fix lint errors --- CHANGELOG.md | 1 + src/lib/utils/highlighter.tsx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd81c5959..b9aa0e1a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ title: Changelog - `@inline` now functions when referencing tuple types, #2932. - `@link` links to the current page are now rendered, #2934. +- `@includeCode` does not allow regions in typescript files with `.mts` file extension, #2935. ## v0.28.2 (2025-04-07) diff --git a/src/lib/utils/highlighter.tsx b/src/lib/utils/highlighter.tsx index f8eb2c011..4ccc0d5b8 100644 --- a/src/lib/utils/highlighter.tsx +++ b/src/lib/utils/highlighter.tsx @@ -2,7 +2,8 @@ import * as shiki from "@gerrit0/mini-shiki"; import { JSX, unique } from "#utils"; import assert from "assert"; -const aliases = new Map([['mts', 'typescript'], ['cts', 'typescript']]); +const tsAliases: [string, string][] = [["mts", "typescript"], ["cts", "typescript"]]; +const aliases = new Map(tsAliases); for (const lang of shiki.bundledLanguagesInfo) { for (const alias of lang.aliases || []) { aliases.set(alias, lang.id);