Merge pull request #703 from pe4cey/plain-editor

Disable cypher syntax highlighting based on editorAutocomplete setting
neo4j · Feb 23, 2018 · 0a727d2 · 0a727d2
2 parents 6579053 + f51e54b
commit 0a727d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/browser/modules/Editor/Editor.jsx b/src/browser/modules/Editor/Editor.jsx
@@ -348,7 +348,8 @@ export class Editor extends Component {
       },
       autoCloseBrackets: {
         explode: ''
-      }
+      },
+      ...(!this.props.enableEditorAutocomplete ? { mode: '', theme: '' } : {})
     }
 
     const updateCode = (val, change) => this.updateCode(val, change)

diff --git a/src/browser/modules/Sidebar/Settings.jsx b/src/browser/modules/Sidebar/Settings.jsx
@@ -48,9 +48,8 @@ const visualSettings = [
       },
       {
         editorAutocomplete: {
-          displayName: 'Trigger autocomplete when typing',
-          tooltip:
-            'Autocomplete written queries in editor (shortcut keys will still work)',
+          displayName: 'Enhanced query editor',
+          tooltip: 'Autocomplete and syntax highlighting in query editor',
           type: 'checkbox'
         }
       }