The IDE you know, rebuilt in Rust. IntelliJ IDEA–style keymap, tool windows and search-everywhere in a fast native app: editor, code insight, debugger, Git, terminal, database and HTTP clients for 60+ languages.
TypeScript code-editorcross-platformdapdatabase-clientdebuggerdesktop-appdeveloper-toolsgithttp-clientideintellijlsprusttauriterminal
fix(vue): highlight SCSS in `<style lang="scss">` blocks (#2219) (#2221)
arookieofc95843ea12d0a
diff --git a/package.json b/package.jsonindex be6f3f58f..e35520a11 100644--- a/package.json+++ b/package.json@@ -46,6 +46,8 @@"@codemirror/lang-html": "^6.4.12","@codemirror/lang-java": "^6.0.2","@codemirror/lang-javascript": "^6.2.5",+ "@codemirror/lang-sass": "^6.0.2",+ "@codemirror/lang-vue": "^0.1.3","@codemirror/language": "^6.13.1","@codemirror/language-data": "^6.5.2","@codemirror/legacy-modes": "^6.5.5",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 6c8cb996b..accd1b17e 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -23,6 +23,12 @@ importers:'@codemirror/lang-javascript':specifier: ^6.2.5version: 6.2.5+ '@codemirror/lang-sass':+ specifier: ^6.0.2+ version: 6.0.2+ '@codemirror/lang-vue':+ specifier: ^0.1.3+ version: 0.1.3'@codemirror/language':specifier: ^6.13.1version: 6.13.1diff --git a/src/editor/core/cm/languages.ts b/src/editor/core/cm/languages.tsindex 4c8d78ed9..54e66b58f 100644--- a/src/editor/core/cm/languages.ts+++ b/src/editor/core/cm/languages.ts@@ -131,6 +131,12 @@ const OWN_MODES = [extensions: ["astro"],load: () => import("./astro").then((m) => m.astro()),}),+ // Overrides the language-data Vue mode so `<style lang="scss">` highlights.+ LanguageDescription.of({+ name: "Vue",+ extensions: ["vue"],+ load: () => import("./vue").then((m) => m.vueLanguage()),+ }),LanguageDescription.of({name: "YAML",alias: ["yml"],diff --git a/src/editor/core/cm/vue.test.ts b/src/editor/core/cm/vue.test.tsnew file mode 100644index 000000000..f57e62e85--- /dev/null+++ b/src/editor/core/cm/vue.test.ts@@ -0,0 +1,26 @@+import { describe, expect, it } from "vitest";+import { findLanguageDescription, loadSupport } from "./languages";++describe("vue language mode", () => {+ it('highlights SCSS inside <style lang="scss">', async () => {+ const desc = findLanguageDescription("Vue", "/p/a.vue")!;+ expect(desc?.name).toBe("Vue");+ const support = await loadSupport(desc);+ const src = `<template><div/></template>\n` + `<style lang="scss">\n.a { .b { color: red; } $c: 1; }\n</style>`;+ const tree = support!.language.parser.parse(src).toString();+ // SCSS-only syntax that plain CSS can't parse: a nested rule and a $-variable.+ expect(tree).toContain("SassVariableName");+ // The nested .b ruleset only parses under the Sass grammar.+ expect(tree).toMatch(/RuleSet\(ClassSelector.*RuleSet\(ClassSelector/s);+ });++ it("still parses a plain <style> block as CSS", async () => {+ const support = await loadSupport(findLanguageDescription("Vue", "/p/a.vue")!);+ const tree = support!.language.parser+ .parse(`<template><div/></template><style>.a { color: red; }</style>`)+ .toString();+ expect(tree).toContain("StyleSheet");+ expect(tree).toContain("Declaration");+ expect(tree).not.toContain("SassVariableName");+ });+});diff --git a/src/editor/core/cm/vue.ts b/src/editor/core/cm/vue.tsnew file mode 100644index 000000000..21d50c1f2--- /dev/null+++ b/src/editor/core/cm/vue.ts@@ -0,0 +1,27 @@+/**+ * Vue single-file components: `@codemirror/lang-vue`'s parser over an HTML+ * base that also highlights `<style lang="scss|sass">` with the Sass grammar —+ * stock `vue()` parses every `<style>` as plain CSS, which loses the SCSS+ * colours.+ */+import { LanguageSupport } from "@codemirror/language";+import { html } from "@codemirror/lang-html";+import { sassLanguage } from "@codemirror/lang-sass";+import { vue } from "@codemirror/lang-vue";++export function vueLanguage(): LanguageSupport {+ return vue({+ base: html({+ selfClosingTags: true,+ // `<style>` without `lang` (or with `lang="css"`) keeps HTML's own CSS+ // nesting; only an explicit SCSS/Sass dialect re-parses it.+ nestedLanguages: [+ {+ tag: "style",+ attrs: (a) => a.lang === "scss" || a.lang === "sass",+ parser: sassLanguage.parser,+ },+ ],+ }),+ });+}