jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
sevin7676 2015-04-18 08:27:22 -04:00
commit a0a31e16a2
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/ace/mode/folding/sqlserver.js
View file

@ -44,16 +44,11 @@ oop.inherits(FoldMode, BaseFoldMode);
* Inheriting cstyle folding because it handles the region comment folding * Inheriting cstyle folding because it handles the region comment folding
* and special block comment folding appropriately. * and special block comment folding appropriately.
* *
* Cstyle's getCommentRegionBlock() contains the sql comment characters '--'. * Cstyle's getCommentRegionBlock() contains the sql comment characters '--' for end region block.
*/ */
this.foldingStartMarker = /(\bCASE\b|\bBEGIN\b)|^\s*(\/\*)/i; this.foldingStartMarker = /(\bCASE\b|\bBEGIN\b)|^\s*(\/\*)/i;
this.foldingStopMarker = /^(\bEND\b)|^[\s\*]*(\*\/)/i; this.foldingStopMarker = /(\bEND\b)|^[\s\*]*(\*\/)/i;
// this.foldingStopMarker = /(\bEND\b)|^[\s\*]*(\*\/)/i;?need hat?
// this.foldingStopMarker = /^(?!\bCASE\b|\bBEGIN\b)(\bEND\b)|^[\s\*]*(\*\/)/i;
// this.foldingStopMarker = /^(?!\bCASE\b|\bBEGIN\b).*(\bEND\b)|^[\s\*]*(\*\/)/i;
this.startRegionRe = /^\s*(\/\*|--)#?region\b/; this.startRegionRe = /^\s*(\/\*|--)#?region\b/;
this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) { this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
@ -65,19 +60,19 @@ oop.inherits(FoldMode, BaseFoldMode);
if (match) { if (match) {
var i = match.index; var i = match.index;
if (match[1]) return this.getBeginEndBlock(session, row, i, match[1]); if (match[1]) return this.getBeginEndBlock(session, row, i, match[1]);
var range = session.getCommentFoldRange(row, i + match[0].length, 1); var range = session.getCommentFoldRange(row, i + match[0].length, 1);
if (range && !range.isMultiLine()) { if (range && !range.isMultiLine()) {
if (forceMultiline) { if (forceMultiline) {
range = this.getSectionRange(session, row); range = this.getSectionRange(session, row);
console.log('getSectionRange',range); console.log('getSectionRange', range);
} }
else if (foldStyle != "all") range = null; else if (foldStyle != "all") range = null;
} }
return range; return range;
} }
if (foldStyle === "markbegin") return; //no support for end folding markers yet if (foldStyle === "markbegin") return; //no support for end folding markers yet
return; return;
}; };