Skip to content

Commit 6dc5d31

Browse files
committed
fix wrongly initialized clike-mode top-level context
1 parent 06540e3 commit 6dc5d31

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/codemirror.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,8 @@ var CodeMirror = (function() {
880880
}
881881
else if (how == "smart") indentation = mode.indent(state, line.text.slice(curSpaceString.length));
882882
else if (how == "add") indentation = curSpace + options.indentUnit;
883-
else if (how == "subtract") indentation = Math.max(0, curSpace - options.indentUnit);
883+
else if (how == "subtract") indentation = curSpace - options.indentUnit;
884+
indentation = Math.max(0, indentation);
884885
var diff = indentation - curSpace;
885886

886887
if (!diff) {

mode/clike/clike.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
102102
startState: function(basecolumn) {
103103
return {
104104
tokenize: tokenBase,
105-
context: new Context((basecolumn || 0) - indentUnit, "top", false),
105+
context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
106106
indented: 0,
107107
startOfLine: true
108108
};

0 commit comments

Comments
 (0)