Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-02 23:03:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Determin fold type by { char existence

Browse Source 
If we have a brace char on the line in question, we want to fold on
braces not tags
On change, if we have typed or just removed a } char, scan upwards to
find the previous { char
Then perform a refresh on all the lines in that range and redo the fold
type
This commit is contained in:
Matt Pass
2013-06-29 17:29:32 +01:00
parent 5b32c96f1d
commit 72ab42e7bf
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
editor.php
View File

@@ -227,7 +227,22 @@ function createNewCMInstance(num) {
var filename = filepath.substr(filepath.lastIndexOf("/")+1);
var fileExt = filename.substr(filename.lastIndexOf(".")+1);
for (var i=changeObj.from.line; i<changeObj.from.line+changeObj.text.length; i++) {
top.ICEcoder.content.contentWindow.CodeMirror.newFoldFunction(top.ICEcoder.content.contentWindow.CodeMirror[["coffee","css","js","less","php","py","rb","ruby"].indexOf(fileExt) > -1 ? "braceRangeFinder" : "tagRangeFinder"],null,"+","-",true)(thisCM, i);
top.ICEcoder.content.contentWindow.CodeMirror.newFoldFunction(top.ICEcoder.content.contentWindow.CodeMirror[
window['cM'+num].getLine(i).indexOf("{")>-1
? "braceRangeFinder"
: "tagRangeFinder"
],null,"+","-",true)(thisCM, i);
}
if (changeObj.text[0] == "}" || changeObj.removed && changeObj.removed[0] == "}") {
cursor = window['cM'+num].getSearchCursor("{",window['cM'+num].getCursor(),false);
cursor.findPrevious();
for (var i=cursor.from().line; i<window['cM'+num].getCursor().line; i++) {
top.ICEcoder.content.contentWindow.CodeMirror.newFoldFunction(top.ICEcoder.content.contentWindow.CodeMirror[
window['cM'+num].getLine(i).indexOf("{")>-1
? "braceRangeFinder"
: "tagRangeFinder"
],null,"+","-",true)(thisCM, i);
}
}
}
// Update HTML edited files live
@@ -267,7 +282,7 @@ function createNewCMInstance(num) {
window['cM'+num].on("gutterClick", function(thisCM, line, gutter, clickEvent) {
var filepath = top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1];
var fileExt = filepath.substr(filepath.lastIndexOf(".")+1);
["coffee","css","js","less","php","py","rb","ruby"].indexOf(fileExt) > -1
window['cM'+num].getLine(line).indexOf("{")>-1
? codeFoldBrace(window['cM'+num], line) : codeFoldTag(window['cM'+num], line);
}
);