Merge branch '2.0-disable-si' into 2.0

neo4j · Dec 7, 2016 · cb83e51 · cb83e51
2 parents d9fd591 + 964b777
commit cb83e51
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/app/components/codemirror-cypher/index.js b/app/components/codemirror-cypher/index.js
@@ -118,7 +118,18 @@
         return style;
       },
       indent: function(state, textAfter) {
-        return 0;
+        var firstChar = textAfter && textAfter.charAt(0);
+        var context = state.context;
+        if (/[\]\}]/.test(firstChar)) {
+          while (context && context.type === "pattern") {
+            context = context.prev;
+          }
+        }
+        var closing = context && firstChar === context.type;
+        if (!context) return 0;
+        if (context.type === "keywords") return CodeMirror.commands.newlineAndIndent;
+        if (context.align) return context.col + (closing ? 0 : 1);
+        return context.indent + (closing ? 0 : indentUnit);
       }
     };
   });

diff --git a/app/views/partials/editor.jade b/app/views/partials/editor.jade
@@ -21,7 +21,7 @@
   .view-editor
     span(ng-class="{'one-line': editorOneLine, 'disable-highlighting': disableHighlighting}")
       .prompt.code-style $
-      ui-codemirror('ui-codemirror-opts'="{gutters:['cypher-hints'], theme: 'neo', mode: 'cypher', autofocus: true, lineNumbers: true, lineWrapping: true, onLoad: codemirrorLoaded}",
+      ui-codemirror('ui-codemirror-opts'="{gutters:['cypher-hints'], theme: 'neo', mode: 'cypher', autofocus: true, lineNumbers: true, lineWrapping: true, onLoad: codemirrorLoaded, smartIndent: false}",
         ng-model='editor.content',
         placeholder='{{motd.tip}}'
         )