[pull] master from violentmonkey:master

package.json

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

src/_locales/es_419/messages.yml

@@ -152,10 +152,10 @@ editNavValues:
   message: Valores
 editValueAll:
   description: Button to show/edit the entire script value storage.
-  message: ''
+  message: Todo
 editValueAllHint:
   description: Tooltip for the 'all' button.
-  message: ''
+  message: Mostrar/editar todo los valores de almacenamiento del script
 editValueCancel:
   description: Button to cancel modification of a script value.
   message: Cancelar
@@ -200,10 +200,10 @@ filterScopeName:
   message: Nombre
 genericOff:
   description: 'To indicate something is turned off or disabled, similar to "no".'
-  message: desactivado
+  message: deshabilitado
 genericOn:
   description: 'To indicate something is turned on or enabled, similar to "yes".'
-  message: activado
+  message: habilitado
 genericUseGlobal:
   description: To indicate some per-script option will use its analog in global settings.
   message: usar configuración global
@@ -303,7 +303,7 @@ labelEditValue:
   message: Editar el valor del script
 labelEditValueAll:
   description: Label shown in the panel to edit the entire script value storage.
-  message: ''
+  message: Editar almacenamiento del script
 labelEditor:
   description: Label for Editor settings
   message: Editor
@@ -648,7 +648,7 @@ valueLabelValue:
   message: Valor (serializado como JSON)
 valueLabelValueAll:
   description: Label for input of entire script value storage.
-  message: ''
+  message: Todos los valores (serializados como JSON)
 visitWebsite:
   description: Label for link to open Violentmonkey website.
   message: Visitar sitio web

src/common/ui/code.vue

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

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"
   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:
   version "5.57.0"
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.57.0.tgz#d26365b72f909f5d2dbb6b1209349ca1daeb2d50"