commit e36ecddbc99dc434f3259814d9d84fa96e509772
author Paladox none <thomasmulhall410@yahoo.com> Mon Apr 24 07:48:24 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 24 07:48:24 2023 +0000
tree 0f53e73b374d17b77555aec3104ad0579e5910fd
parent 279ea23e1b818e968d8a76b14b575fd2071e2e63
parent 6be8c0c84fcc7fbcc77fad17fdbc5a2c29faef60

Merge "Fix issue when pasting contents into textbox"

web/BUILD

diff --git a/web/BUILD b/web/BUILD
index 3c91428..5b3d662 100644
--- a/web/BUILD
+++ b/web/BUILD
@@ -67,10 +67,12 @@
         "@plugins_npm//@codemirror/lang-php",
         "@plugins_npm//@codemirror/lang-python",
         "@plugins_npm//@codemirror/lang-rust",
+        "@plugins_npm//@codemirror/lang-sass",
         "@plugins_npm//@codemirror/lang-sql",
         "@plugins_npm//@codemirror/lang-xml",
         "@plugins_npm//@codemirror/language",
         "@plugins_npm//@codemirror/language-data",
+        "@plugins_npm//@codemirror/legacy-modes",
         "@plugins_npm//@codemirror/lint",
         "@plugins_npm//@codemirror/search",
         "@plugins_npm//@codemirror/state",

web/element/language.ts

diff --git a/web/element/language.ts b/web/element/language.ts
index 0d72574..bb86da6 100644
--- a/web/element/language.ts
+++ b/web/element/language.ts
@@ -20,7 +20,7 @@
 import {coffeeScript} from '@codemirror/legacy-modes/mode/coffeescript';
 import {commonLisp} from '@codemirror/legacy-modes/mode/commonlisp';
 import {crystal} from '@codemirror/legacy-modes/mode/crystal';
-import {less, sCSS, gss} from '@codemirror/legacy-modes/mode/css';
+import {less, gss} from '@codemirror/legacy-modes/mode/css';
 import {cypher} from '@codemirror/legacy-modes/mode/cypher';
 import {d} from '@codemirror/legacy-modes/mode/d';
 import {dart} from '@codemirror/legacy-modes/mode/clike';
@@ -74,7 +74,6 @@
 import {rpmChanges, rpmSpec} from '@codemirror/legacy-modes/mode/rpm';
 import {ruby} from '@codemirror/legacy-modes/mode/ruby';
 import {sas} from '@codemirror/legacy-modes/mode/sas';
-import {sass} from '@codemirror/legacy-modes/mode/sass';
 import {scala} from '@codemirror/legacy-modes/mode/clike';
 import {scheme} from '@codemirror/legacy-modes/mode/scheme';
 import {shader} from '@codemirror/legacy-modes/mode/clike';
@@ -117,6 +116,7 @@
 import {php} from '@codemirror/lang-php';
 import {python} from '@codemirror/lang-python';
 import {rust} from '@codemirror/lang-rust';
+import {sass} from '@codemirror/lang-sass';
 import {sql} from '@codemirror/lang-sql';
 import {xml} from '@codemirror/lang-xml';
 
@@ -176,7 +176,7 @@
     case 'text/x-less':
       return StreamLanguage.define(less);
     case 'text/x-scss':
-      return StreamLanguage.define(sCSS);
+      return sass();
     case 'text/x-gss':
       return StreamLanguage.define(gss);
     case 'text/x-cassandra':
@@ -313,7 +313,7 @@
     case 'text/x-sas':
       return StreamLanguage.define(sas);
     case 'text/x-sass':
-      return StreamLanguage.define(sass);
+      return sass({indented: true});
     case 'text/x-scala':
       return StreamLanguage.define(scala);
     case 'text/x-scheme':