Răsfoiți Sursa

feat: syntax highlight for embedded html/css (#1040)

Co-authored-by: tophf <[email protected]>
Sam Lee 5 ani în urmă
părinte
comite
f34d75949c
3 a modificat fișierele cu 8 adăugiri și 2 ștergeri
  1. 1 0
      package.json
  2. 2 2
      src/common/ui/code.vue
  3. 5 0
      yarn.lock

+ 1 - 0
package.json

@@ -55,6 +55,7 @@
   "dependencies": {
   "dependencies": {
     "@babel/runtime": "^7.9.2",
     "@babel/runtime": "^7.9.2",
     "codemirror": "^5.57.0",
     "codemirror": "^5.57.0",
+    "codemirror-js-mixed": "^0.9.2",
     "core-js": "^3.6.4",
     "core-js": "^3.6.4",
     "tldjs": "^2.3.1",
     "tldjs": "^2.3.1",
     "vue": "^2.6.11",
     "vue": "^2.6.11",

+ 2 - 2
src/common/ui/code.vue

@@ -52,7 +52,7 @@
 <script>
 <script>
 import 'codemirror/lib/codemirror.css';
 import 'codemirror/lib/codemirror.css';
 import 'codemirror/theme/eclipse.css';
 import 'codemirror/theme/eclipse.css';
-import 'codemirror/mode/javascript/javascript';
+import 'codemirror-js-mixed/mode/javascript-mixed/javascript-mixed';
 import 'codemirror/addon/comment/continuecomment';
 import 'codemirror/addon/comment/continuecomment';
 import 'codemirror/addon/comment/comment';
 import 'codemirror/addon/comment/comment';
 import 'codemirror/addon/edit/matchbrackets';
 import 'codemirror/addon/edit/matchbrackets';
@@ -119,7 +119,7 @@ export const cmOptions = {
   foldGutter: true,
   foldGutter: true,
   gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
   gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
   theme: 'eclipse',
   theme: 'eclipse',
-  mode: 'javascript',
+  mode: 'javascript-mixed',
   lineNumbers: true,
   lineNumbers: true,
   matchBrackets: true,
   matchBrackets: true,
   autoCloseBrackets: true,
   autoCloseBrackets: true,

+ 5 - 0
yarn.lock

@@ -2410,6 +2410,11 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 
+codemirror-js-mixed@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/codemirror-js-mixed/-/codemirror-js-mixed-0.9.2.tgz#a369b03db197cf6bcc2516fa9ea3ce9d2bb2c479"
+  integrity sha512-ZmMp2/QM50CE6HoiU2CSTRwcJAamKVjXQzgbYjUjZAIZzFtrIigLwJBv8dlORYiIgpiYWIhTSR03C4i2c6zZnw==
+
 codemirror@^5.57.0:
 codemirror@^5.57.0:
   version "5.57.0"
   version "5.57.0"
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.57.0.tgz#d26365b72f909f5d2dbb6b1209349ca1daeb2d50"
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.57.0.tgz#d26365b72f909f5d2dbb6b1209349ca1daeb2d50"