Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(code): highlight five more languages where a grammar exists
Elian Doran53becb0fd5b2
diff --git a/packages/codemirror/src/syntax_highlighting.spec.ts b/packages/codemirror/src/syntax_highlighting.spec.tsindex 93374f4c1a..decf0defc4 100644--- a/packages/codemirror/src/syntax_highlighting.spec.ts+++ b/packages/codemirror/src/syntax_highlighting.spec.ts@@ -61,6 +61,14 @@ describe("byMimeType", () => {expect(await byMimeType["text/x-mariadb"]?.()).toBe(mariaDB);});+ it("highlights PEG.js with its grammar and Literate Haskell as Haskell", async () => {+ const { pegjs } = await import("@codemirror/legacy-modes/mode/pegjs");+ expect(await byMimeType["text/x-pegjs"]?.()).toBe(pegjs);++ const { haskell } = await import("@codemirror/legacy-modes/mode/haskell");+ expect(await byMimeType["text/x-literate-haskell"]?.()).toBe(haskell);+ });+it("highlights the statements of slow queries in the Trilium log as SQLite", async () => {const syntax = await byMimeType["text/x-trilium-log"]?.();expect(Array.isArray(syntax)).toBe(true);diff --git a/packages/codemirror/src/syntax_highlighting.ts b/packages/codemirror/src/syntax_highlighting.tsindex de466e0b4c..f04cc1e24e 100644--- a/packages/codemirror/src/syntax_highlighting.ts+++ b/packages/codemirror/src/syntax_highlighting.ts@@ -144,11 +144,11 @@ const byMimeType: Record<SupportedMimeTypes, (() => Promise<StreamParser<unknown"text/x-idl": async () => (await import('@codemirror/legacy-modes/mode/idl')).idl,"text/x-java": async () => (await import('@codemirror/legacy-modes/mode/clike')).java,"text/x-julia": async () => (await import('@codemirror/legacy-modes/mode/julia')).julia,- "text/x-pegjs": null,+ "text/x-pegjs": async () => (await import('@codemirror/legacy-modes/mode/pegjs')).pegjs,"text/x-kotlin": async () => (await import('@codemirror/legacy-modes/mode/clike')).kotlin,"text/x-latex": async () => (await import('@codemirror/legacy-modes/mode/stex')).stex,"text/x-less": async () => (await import('@codemirror/legacy-modes/mode/css')).less,- "text/x-literate-haskell": null,+ "text/x-literate-haskell": async () => (await import('@codemirror/legacy-modes/mode/haskell')).haskell,"text/x-livescript": async () => (await import('@codemirror/legacy-modes/mode/livescript')).liveScript,"text/x-lua": async () => (await import('@codemirror/legacy-modes/mode/lua')).lua,"text/x-mariadb": async () => (await import('@codemirror/legacy-modes/mode/sql')).mariaDB,diff --git a/packages/highlightjs/src/syntax_highlighting.spec.ts b/packages/highlightjs/src/syntax_highlighting.spec.tsindex 6e2a8e6669..1619d3803d 100644--- a/packages/highlightjs/src/syntax_highlighting.spec.ts+++ b/packages/highlightjs/src/syntax_highlighting.spec.ts@@ -1,5 +1,5 @@-import { describe, it } from "vitest";-import definitions from "./syntax_highlighting.js";+import { describe, expect, it } from "vitest";+import definitions, { byMimeType } from "./syntax_highlighting.js";import hljs from "highlight.js";describe("Syntax highlighting definitions", () => {@@ -17,4 +17,19 @@ describe("Syntax highlighting definitions", () => {});}});++ it("highlights languages without a grammar of their own with the closest core one", async () => {+ const closest = {+ "text/x-spreadsheet": await import("highlight.js/lib/languages/excel"),+ "text/x-stex": await import("highlight.js/lib/languages/latex"),+ "text/x-octave": await import("highlight.js/lib/languages/matlab"),+ "text/x-literate-haskell": await import("highlight.js/lib/languages/haskell")+ } as const;++ for (const [ mime, grammar ] of Object.entries(closest)) {+ const loader = byMimeType[mime as keyof typeof closest];+ expect(loader, mime).not.toBeNull();+ expect((await loader?.())?.default, mime).toBe(grammar.default);+ }+ });});diff --git a/packages/highlightjs/src/syntax_highlighting.ts b/packages/highlightjs/src/syntax_highlighting.tsindex b39fcef852..478eb88245 100644--- a/packages/highlightjs/src/syntax_highlighting.ts+++ b/packages/highlightjs/src/syntax_highlighting.ts@@ -95,7 +95,7 @@ export const byMimeType: MimeRecord = {"text/x-kotlin": () => import("highlight.js/lib/languages/kotlin"),"text/x-latex": () => import("highlight.js/lib/languages/latex"),"text/x-less": () => import("highlight.js/lib/languages/less"),- "text/x-literate-haskell": null,+ "text/x-literate-haskell": () => import("highlight.js/lib/languages/haskell"),"text/x-livescript": () => import("highlight.js/lib/languages/livescript"),"text/x-lua": () => import("highlight.js/lib/languages/lua"),"text/x-mariadb": () => import("highlight.js/lib/languages/sql"),@@ -113,7 +113,7 @@ export const byMimeType: MimeRecord = {"text/x-nsis": () => import("highlight.js/lib/languages/nsis"),"text/x-objectivec": () => import("highlight.js/lib/languages/objectivec"),"text/x-ocaml": () => import("highlight.js/lib/languages/ocaml"),- "text/x-octave": null,+ "text/x-octave": () => import("highlight.js/lib/languages/matlab"),"text/x-oz": null,"text/x-pascal": () => import("highlight.js/lib/languages/delphi"),"text/x-perl": () => import("highlight.js/lib/languages/perl"),@@ -144,12 +144,12 @@ export const byMimeType: MimeRecord = {"text/x-sml": () => import("highlight.js/lib/languages/sml"),"text/x-solr": null,"text/x-soy": null,- "text/x-spreadsheet": null,+ "text/x-spreadsheet": () => import("highlight.js/lib/languages/excel"),"text/x-sql": () => import("highlight.js/lib/languages/sql"),"text/x-sqlite;schema=trilium": () => import("highlight.js/lib/languages/sql"),"text/x-sqlite": () => import("highlight.js/lib/languages/sql"),"text/x-squirrel": null,- "text/x-stex": null,+ "text/x-stex": () => import("highlight.js/lib/languages/latex"),"text/x-stsrc": () => import("highlight.js/lib/languages/smalltalk"),"text/x-styl": () => import("highlight.js/lib/languages/stylus"),"text/x-swift": () => import("highlight.js/lib/languages/swift"),