Fixed variable editor mode.

Closes #1266 Closes #1268
altair-graphql · Jun 13, 2020 · dd38eba · dd38eba
1 parent 0c8c153
commit dd38eba
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/packages/altair-app/src/app/components/variables-editor/variables-editor.component.ts b/packages/altair-app/src/app/components/variables-editor/variables-editor.component.ts
@@ -25,13 +25,18 @@ export class VariablesEditorComponent implements OnChanges, DoCheck {
   @ViewChild('editor', { static: true }) editor: ElementRef & { codeMirror: CodeMirror.Editor };
 
   variableEditorConfig = {
-    mode: 'javascript',
-    json: true,
+    mode: {
+      name: 'javascript',
+      json: true,
+    },
     lineWrapping: true,
     lineNumbers: true,
     foldGutter: true,
     autoRefresh: true,
     dragDrop: false,
+    tabSize: 4,
+    indentUnit: 4,
+    matchBrackets: true,
     autoCloseBrackets: true,
     theme: 'default variable-editor mousetrap',
     gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter']

diff --git a/packages/altair-app/src/scss/_codemirror.scss b/packages/altair-app/src/scss/_codemirror.scss
@@ -219,21 +219,21 @@
 .cm-s-variable-editor {
   background: var(--theme-off-bg-color);
 
-  .cm-attribute {
-    color: var(--result-default);
-  }
+  // .cm-attribute {
+  //   color: var(--result-default);
+  // }
 
-  .cm-string {
-    color: var(--result-string);
-  }
+  // .cm-string {
+  //   color: var(--result-string);
+  // }
 
-  .cm-property {
-    color: var(--result-default);
-  }
+  // .cm-property {
+  //   color: var(--result-default);
+  // }
 
-  .cm-punctuation {
-    color: var(--result-default);
-  }
+  // .cm-punctuation {
+  //   color: var(--result-default);
+  // }
 }
 
 .cm-s-pre-request-editor {