[comment-fold addon] Fix bug that broke folding of comments at start of line

marijnh · marijnh · commit 8eb158835014 · 2016-06-07T12:30:53.000+02:00
Closes codemirror#4056
diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
@@ -29,7 +29,7 @@ CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
     }
     if (pass == 1 && found < start.ch) return;
     if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1))) &&
-        (lineText.slice(found - endToken.length, found) == endToken ||
+        (found == 0 || lineText.slice(found - endToken.length, found) == endToken ||
          !/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found))))) {
       startCh = found + startToken.length;
       break;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {`
`29`	`29`	`}`
`30`	`30`	`if (pass == 1 && found < start.ch) return;`
`31`	`31`	`if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1))) &&`
`32`		`- (lineText.slice(found - endToken.length, found) == endToken \|\|`
	`32`	`+ (found == 0 \|\| lineText.slice(found - endToken.length, found) == endToken \|\|`
`33`	`33`	`!/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found))))) {`
`34`	`34`	`startCh = found + startToken.length;`
`35`	`35`	`break;`