From 3dd775cff08504e5568a375e5e13388bb94657b5 Mon Sep 17 00:00:00 2001 From: Leon Sorokin Date: Tue, 7 Jan 2025 15:14:57 -0600 Subject: [PATCH] more langs, disable some monaco --- package.json | 3 ++ public/app/core/monacoEnv.ts | 26 ++++++------ public/app/plugins/panel/text/CodeEditor2.tsx | 11 ++++- public/app/plugins/panel/text/panelcfg.gen.ts | 3 ++ yarn.lock | 42 ++++++++++++++++++- 5 files changed, 71 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 39fb0518462..7dd7a39b46d 100644 --- a/package.json +++ b/package.json @@ -252,11 +252,14 @@ "@bsull/augurs": "^0.7.0", "@codemirror/autocomplete": "^6.18.4", "@codemirror/commands": "^6.7.1", + "@codemirror/lang-css": "^6.3.1", "@codemirror/lang-go": "^6.0.1", "@codemirror/lang-html": "^6.4.9", "@codemirror/lang-javascript": "^6.2.2", "@codemirror/lang-json": "^6.0.1", + "@codemirror/lang-less": "^6.0.2", "@codemirror/lang-markdown": "^6.3.1", + "@codemirror/lang-sass": "^6.0.2", "@codemirror/lang-sql": "^6.8.0", "@codemirror/lang-xml": "^6.1.0", "@codemirror/lang-yaml": "^6.1.2", diff --git a/public/app/core/monacoEnv.ts b/public/app/core/monacoEnv.ts index db63c867a1e..39fd54ac4ab 100644 --- a/public/app/core/monacoEnv.ts +++ b/public/app/core/monacoEnv.ts @@ -6,25 +6,27 @@ export function setMonacoEnv() { getWorker(_moduleId, label) { const language = monacoLanguageRegistry.getIfExists(label); + console.log(label); + if (language) { return language.init(); } - if (label === 'json') { - return new Worker(new URL('monaco-editor/esm/vs/language/json/json.worker', import.meta.url)); - } + // if (label === 'json') { + // return new Worker(new URL('monaco-editor/esm/vs/language/json/json.worker', import.meta.url)); + // } - if (label === 'css' || label === 'scss' || label === 'less') { - return new Worker(new URL('monaco-editor/esm/vs/language/css/css.worker', import.meta.url)); - } + // if (label === 'css' || label === 'scss' || label === 'less') { + // return new Worker(new URL('monaco-editor/esm/vs/language/css/css.worker', import.meta.url)); + // } - if (label === 'html' || label === 'handlebars' || label === 'razor') { - return new Worker(new URL('monaco-editor/esm/vs/language/html/html.worker', import.meta.url)); - } + // if (label === 'html' || label === 'handlebars' || label === 'razor') { + // return new Worker(new URL('monaco-editor/esm/vs/language/html/html.worker', import.meta.url)); + // } - if (label === 'typescript' || label === 'javascript') { - return new Worker(new URL('monaco-editor/esm/vs/language/typescript/ts.worker', import.meta.url)); - } + // if (label === 'typescript' || label === 'javascript') { + // return new Worker(new URL('monaco-editor/esm/vs/language/typescript/ts.worker', import.meta.url)); + // } return new Worker(new URL('monaco-editor/esm/vs/editor/editor.worker', import.meta.url)); }, diff --git a/public/app/plugins/panel/text/CodeEditor2.tsx b/public/app/plugins/panel/text/CodeEditor2.tsx index 13a2d0b4800..cdad7392021 100644 --- a/public/app/plugins/panel/text/CodeEditor2.tsx +++ b/public/app/plugins/panel/text/CodeEditor2.tsx @@ -1,10 +1,13 @@ import { autocompletion, closeBrackets, closeBracketsKeymap, completionKeymap } from '@codemirror/autocomplete'; import { defaultKeymap, history, historyKeymap } from '@codemirror/commands'; +import { css } from '@codemirror/lang-css'; import { go } from '@codemirror/lang-go'; import { html } from '@codemirror/lang-html'; import { javascript } from '@codemirror/lang-javascript'; import { json } from '@codemirror/lang-json'; +import { less } from '@codemirror/lang-less'; import { markdown } from '@codemirror/lang-markdown'; +import { sass } from '@codemirror/lang-sass'; import { sql } from '@codemirror/lang-sql'; import { xml } from '@codemirror/lang-xml'; import { yaml } from '@codemirror/lang-yaml'; @@ -78,7 +81,13 @@ export const CodeEditor2 = ({ ? xml() : language === CodeLanguage.Html ? html() - : null; + : language === CodeLanguage.Css + ? css() + : language === CodeLanguage.Sass + ? sass() + : language === CodeLanguage.Less + ? less() + : null; const extensions: Extension[] = [ highlightActiveLineGutter(), diff --git a/public/app/plugins/panel/text/panelcfg.gen.ts b/public/app/plugins/panel/text/panelcfg.gen.ts index cf08ce24683..5975b66ace6 100644 --- a/public/app/plugins/panel/text/panelcfg.gen.ts +++ b/public/app/plugins/panel/text/panelcfg.gen.ts @@ -15,11 +15,14 @@ export enum TextMode { } export enum CodeLanguage { + Css = 'css', Go = 'go', Html = 'html', Json = 'json', + Less = 'less', Markdown = 'markdown', Plaintext = 'plaintext', + Sass = 'sass', Sql = 'sql', Typescript = 'typescript', Xml = 'xml', diff --git a/yarn.lock b/yarn.lock index 7e63ddb9075..3f4b8f0709a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1688,7 +1688,7 @@ __metadata: languageName: node linkType: hard -"@codemirror/lang-css@npm:^6.0.0": +"@codemirror/lang-css@npm:^6.0.0, @codemirror/lang-css@npm:^6.2.0, @codemirror/lang-css@npm:^6.3.1": version: 6.3.1 resolution: "@codemirror/lang-css@npm:6.3.1" dependencies: @@ -1756,6 +1756,19 @@ __metadata: languageName: node linkType: hard +"@codemirror/lang-less@npm:^6.0.2": + version: 6.0.2 + resolution: "@codemirror/lang-less@npm:6.0.2" + dependencies: + "@codemirror/lang-css": "npm:^6.2.0" + "@codemirror/language": "npm:^6.0.0" + "@lezer/common": "npm:^1.2.0" + "@lezer/highlight": "npm:^1.0.0" + "@lezer/lr": "npm:^1.0.0" + checksum: 10/233aa03e0bfb57e4f23fdb2a8d52ad3143a52553895b97cb2901f66d59fc40246b525a21b7be72d873efa98783f6da5f4e8e042da442b092fab9eb63c69524c8 + languageName: node + linkType: hard + "@codemirror/lang-markdown@npm:^6.3.1": version: 6.3.1 resolution: "@codemirror/lang-markdown@npm:6.3.1" @@ -1771,6 +1784,19 @@ __metadata: languageName: node linkType: hard +"@codemirror/lang-sass@npm:^6.0.2": + version: 6.0.2 + resolution: "@codemirror/lang-sass@npm:6.0.2" + dependencies: + "@codemirror/lang-css": "npm:^6.2.0" + "@codemirror/language": "npm:^6.0.0" + "@codemirror/state": "npm:^6.0.0" + "@lezer/common": "npm:^1.0.2" + "@lezer/sass": "npm:^1.0.0" + checksum: 10/de5c72f62714960961b616c8fe25b4f127906b0c05ec2e8e633d0b896fb2da979732cad0f51b1c0bc058494db5447664234b7910a3345fb5080d8222d4011818 + languageName: node + linkType: hard + "@codemirror/lang-sql@npm:^6.8.0": version: 6.8.0 resolution: "@codemirror/lang-sql@npm:6.8.0" @@ -5064,6 +5090,17 @@ __metadata: languageName: node linkType: hard +"@lezer/sass@npm:^1.0.0": + version: 1.0.7 + resolution: "@lezer/sass@npm:1.0.7" + dependencies: + "@lezer/common": "npm:^1.2.0" + "@lezer/highlight": "npm:^1.0.0" + "@lezer/lr": "npm:^1.0.0" + checksum: 10/a7531cbf0766d3875480c24ae8929dd56053d71f9eaef8815e6f468e2252e66e38236a3f89395463e4cee43230dc35351386bedc6138cf1a19a44a64ce58a372 + languageName: node + linkType: hard + "@lezer/xml@npm:^1.0.0": version: 1.0.6 resolution: "@lezer/xml@npm:1.0.6" @@ -17924,11 +17961,14 @@ __metadata: "@bsull/augurs": "npm:^0.7.0" "@codemirror/autocomplete": "npm:^6.18.4" "@codemirror/commands": "npm:^6.7.1" + "@codemirror/lang-css": "npm:^6.3.1" "@codemirror/lang-go": "npm:^6.0.1" "@codemirror/lang-html": "npm:^6.4.9" "@codemirror/lang-javascript": "npm:^6.2.2" "@codemirror/lang-json": "npm:^6.0.1" + "@codemirror/lang-less": "npm:^6.0.2" "@codemirror/lang-markdown": "npm:^6.3.1" + "@codemirror/lang-sass": "npm:^6.0.2" "@codemirror/lang-sql": "npm:^6.8.0" "@codemirror/lang-xml": "npm:^6.1.0" "@codemirror/lang-yaml": "npm:^6.1.2"