From f51e54b2d5ea972b9fb1ccbdb1d817f111ec3d20 Mon Sep 17 00:00:00 2001
From: Mark Peace <mark.peace@neo4j.com>
Date: Tue, 20 Feb 2018 18:37:53 +0100
Subject: [PATCH] Disable cypher syntax highlighting based on
 editorAutocomplete setting

---
 src/browser/modules/Editor/Editor.jsx    | 3 ++-
 src/browser/modules/Sidebar/Settings.jsx | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/browser/modules/Editor/Editor.jsx b/src/browser/modules/Editor/Editor.jsx
index dc9636b2318..d537f4855d2 100644
--- 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
index 6387325d780..d2d24e03660 100644
--- 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'
         }
       }