From 620927dfea1e35ffd17c4e9f4e4a251443afc1c4 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 11 May 2025 13:15:39 +0300 Subject: [PATCH] chore(code): integrate Twig support --- packages/codemirror/package.json | 1 + .../codemirror/src/syntax_highlighting.ts | 2 +- pnpm-lock.yaml | 33 +++++++++---------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/packages/codemirror/package.json b/packages/codemirror/package.json index e95a3cc56..6de59e301 100644 --- a/packages/codemirror/package.json +++ b/packages/codemirror/package.json @@ -26,6 +26,7 @@ "@codemirror/legacy-modes": "6.5.1", "@codemirror/search": "6.5.10", "@codemirror/view": "6.36.7", + "@ssddanbrown/codemirror-lang-twig": "1.0.0", "codemirror-lang-hcl": "0.1.0" } } diff --git a/packages/codemirror/src/syntax_highlighting.ts b/packages/codemirror/src/syntax_highlighting.ts index 7f2e4c75b..81ef55ce4 100644 --- a/packages/codemirror/src/syntax_highlighting.ts +++ b/packages/codemirror/src/syntax_highlighting.ts @@ -156,7 +156,7 @@ const byMimeType: Record Promise | Language "text/x-ttcn-asn": async () => (await import('@codemirror/legacy-modes/mode/ttcn')).ttcn, "text/x-ttcn-cfg": async () => (await import('@codemirror/legacy-modes/mode/ttcn-cfg')).ttcnCfg, "text/x-ttcn": async () => (await import('@codemirror/legacy-modes/mode/ttcn')).ttcn, - "text/x-twig": null, + "text/x-twig": async () => ((await import('@ssddanbrown/codemirror-lang-twig')).twig()), "text/x-vb": async () => (await import('@codemirror/legacy-modes/mode/vb')).vb, "text/x-verilog": async () => (await import('@codemirror/legacy-modes/mode/verilog')).verilog, "text/x-vhdl": async () => (await import('@codemirror/legacy-modes/mode/vhdl')).vhdl, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4910773df..7822975da 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1175,6 +1175,9 @@ importers: '@codemirror/view': specifier: 6.36.7 version: 6.36.7 + '@ssddanbrown/codemirror-lang-twig': + specifier: 1.0.0 + version: 1.0.0 codemirror-lang-hcl: specifier: 0.1.0 version: 0.1.0 @@ -4488,6 +4491,9 @@ packages: '@socket.io/component-emitter@3.1.2': resolution: {integrity: sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==} + '@ssddanbrown/codemirror-lang-twig@1.0.0': + resolution: {integrity: sha512-7WIMIh8Ssc54TooGCY57WU2rKEqZZrcV2tZSVRPtd0gKYsrDEKCSLWpQjUWEx7bdgh3NKHUjq1O4ugIzI/+dwQ==} + '@svgr/babel-plugin-add-jsx-attribute@8.0.0': resolution: {integrity: sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==} engines: {node: '>=14'} @@ -15065,14 +15071,6 @@ snapshots: - supports-color - utf-8-validate - '@ckeditor/ckeditor5-alignment@45.0.0': - dependencies: - '@ckeditor/ckeditor5-core': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) - '@ckeditor/ckeditor5-icons': 45.0.0 - '@ckeditor/ckeditor5-ui': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) - '@ckeditor/ckeditor5-utils': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) - ckeditor5: 45.0.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) - '@ckeditor/ckeditor5-alignment@45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)': dependencies: '@ckeditor/ckeditor5-core': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) @@ -15107,13 +15105,6 @@ snapshots: - supports-color - utf-8-validate - '@ckeditor/ckeditor5-autosave@45.0.0': - dependencies: - '@ckeditor/ckeditor5-core': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) - '@ckeditor/ckeditor5-utils': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) - ckeditor5: 45.0.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41) - es-toolkit: 1.32.0 - '@ckeditor/ckeditor5-autosave@45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)': dependencies: '@ckeditor/ckeditor5-core': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) @@ -16192,7 +16183,7 @@ snapshots: '@ckeditor/ckeditor5-revision-history@45.0.0': dependencies: - '@ckeditor/ckeditor5-autosave': 45.0.0 + '@ckeditor/ckeditor5-autosave': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) '@ckeditor/ckeditor5-comments': 45.0.0 '@ckeditor/ckeditor5-core': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) '@ckeditor/ckeditor5-editor-classic': 45.0.0 @@ -19530,6 +19521,12 @@ snapshots: '@socket.io/component-emitter@3.1.2': {} + '@ssddanbrown/codemirror-lang-twig@1.0.0': + dependencies: + '@codemirror/language': 6.11.0 + '@lezer/highlight': 1.2.1 + '@lezer/lr': 1.4.2 + '@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -21770,9 +21767,9 @@ snapshots: ckeditor5@45.0.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41): dependencies: '@ckeditor/ckeditor5-adapter-ckfinder': 45.0.0 - '@ckeditor/ckeditor5-alignment': 45.0.0 + '@ckeditor/ckeditor5-alignment': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) '@ckeditor/ckeditor5-autoformat': 45.0.0 - '@ckeditor/ckeditor5-autosave': 45.0.0 + '@ckeditor/ckeditor5-autosave': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) '@ckeditor/ckeditor5-basic-styles': 45.0.0 '@ckeditor/ckeditor5-block-quote': 45.0.0 '@ckeditor/ckeditor5-bookmark': 45.0.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)