Skip to content

Update support for Angular component highlighting #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matschik merged 3 commits into from
Jun 15, 2026
Merged

Update support for Angular component highlighting #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11e8f0d
Update support for Angular component highlighting
dinnerhe Jun 15, 2026
33f898f
Remove the fileExt for angularHighligher as it's not used
dinnerhe Jun 15, 2026
5176a95
Remove most of angular highlighter as it's not needed
dinnerhe Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions build/lib/angularHighlighter.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
export function mustUseAngularHighlighter(fileContent: string): boolean;

export function highlightAngularComponent(
fileContent: string,
fileExt: string,
): Promise<string>;
60 changes: 0 additions & 60 deletions build/lib/angularHighlighter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,5 @@
import { codeToHighlightCodeHtml } from "./highlighter.ts";

export function mustUseAngularHighlighter(fileContent: string): boolean {
return (
fileContent.includes("@angular/core") && fileContent.includes("template")
);
}

export async function highlightAngularComponent(
fileContent: string,
fileExt: string,
): Promise<string> {
const templateCode = getAngularTemplateCode(fileContent);

let codeHighlighted;
if (templateCode) {
const componentWithEmptyTemplate =
removeAngularTemplateContent(fileContent);
const templateCodeHighlighted = await codeToHighlightCodeHtml(
templateCode,
"html",
);

const componentWithoutTemplateHighlighted = await codeToHighlightCodeHtml(
componentWithEmptyTemplate,
fileExt,
);

codeHighlighted = componentWithoutTemplateHighlighted.replace(
"template",
"template: `" + removeCodeWrapper(templateCodeHighlighted) + "`,",
);
} else {
codeHighlighted = await codeToHighlightCodeHtml(fileContent, fileExt);
}

return codeHighlighted;
}

function getAngularTemplateCode(fileContent: string): string {
// regex to grab what is inside angular component template inside backticks
const regex = /template:\s*`([\s\S]*?)`/gm;

// grab the template string
const template = regex.exec(fileContent);

if (template) return template[1];

return "";
}

function removeAngularTemplateContent(fileContent: string): string {
const componentWithoutContentInsideTemplate = fileContent.replace(
/template:\s*`([\s\S]*?)([^*])`,?/gm,
"template",
);

return componentWithoutContentInsideTemplate;
}

function removeCodeWrapper(html: string): string {
const regexForWrapper = /<pre([\s\S]*?)><code>([\s\S]*?)<\/code><\/pre>/gm;
const code = regexForWrapper.exec(html);
return code ? code[2] : "";
}
7 changes: 2 additions & 5 deletions build/lib/generateContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ import path from "node:path";
import { frameworks } from "../../frameworks.ts";
import playgroundUrlByFramework from "./playgroundUrlByFramework.ts";
import prettier from "prettier";
import {
highlightAngularComponent,
mustUseAngularHighlighter,
} from "./angularHighlighter.ts";
import { mustUseAngularHighlighter } from "./angularHighlighter.ts";
import {
codeToHighlightCodeHtml,
markdownToHighlightedHtml,
Expand Down Expand Up @@ -210,7 +207,7 @@ export default async function generateContent(
frameworkSnippet.markdownFiles.push(file);
} else {
file.contentHtml = mustUseAngularHighlighter(content)
? await highlightAngularComponent(content, ext)
? await codeToHighlightCodeHtml(content, "angular-ts")
: await codeToHighlightCodeHtml(content, ext);

frameworkSnippet.files.push(file);
Expand Down
2 changes: 2 additions & 0 deletions build/lib/highlighter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ async function getHighlighter(): Promise<
"jsx",
"vue",
"marko",
"angular-ts",
"angular-html",
],
langAlias: {
tsrx: "jsx",
Expand Down
Loading