Changeset 3758:6338fb89e8df for admin/js/codemirror/addon/mode/multiplex.js

Timestamp:

06/13/18 12:31:58 (6 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Update Codemirror to 5.38.0

File:

• admin/js/codemirror/addon/mode/multiplex.js (modified) (1 diff)

admin/js/codemirror/addon/mode/multiplex.js

@@ -51 +51 @@
             if (!other.parseDelimiters) stream.match(other.open);
             state.innerActive = other;
-            state.inner = CodeMirror.startState(other.mode, outer.indent ? outer.indent(state.outer, "") : 0);
+
+            // Get the outer indent, making sure to handle CodeMirror.Pass
+            var outerIndent = 0;
+            if (outer.indent) {
+              var possibleOuterIndent = outer.indent(state.outer, "");
+              if (possibleOuterIndent !== CodeMirror.Pass) outerIndent = possibleOuterIndent;
+            }
+
+            state.inner = CodeMirror.startState(other.mode, outerIndent);
             return other.delimStyle && (other.delimStyle + " " + other.delimStyle + "-open");
           } else if (found != -1 && found < cutOff) {