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

inherit cstyle... trying to figure out best end marker

Browse source
This commit is contained in:
sevin7676 2015-04-18 07:29:10 -04:00
commit 184df6d18e
3 changed files with 56 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

37
demo/kitchen-sink/docs/sqlserver.sqlserver
View file

@ -7,26 +7,43 @@
-- ============================================= -- =============================================
CREATE PROCEDURE dbo.TestProcedure CREATE PROCEDURE dbo.TestProcedure
--#region parameters --region parameters
@vint INT = 1, @vdate DATE = NULL, @vdatetime DATETIME = DATEADD (dd, 1, GETDATE()) @vint INT = 1
--#endregion ,@vdate DATE = NULL
,@vdatetime DATETIME = DATEADD (dd, 1, GETDATE())
,@vvarchar VARCHAR(MAX) = ''
--endregion
AS AS
BEGIN BEGIN
/*#region set statements */ /*region set statements */
SET NOCOUNT ON; SET NOCOUNT ON;
SET XACT_ABORT ON; SET XACT_ABORT ON;
SET QUOTED_IDENTIFIER ON; SET QUOTED_IDENTIFIER ON;
/*#endregion*/ /*endregion*/
/**
* These comments will produce a fold widget
*/
SET @vint = CASE SET @vint = CASE
WHEN @vdate IS NULL WHEN @vdate IS NULL
THEN 1 THEN 1
ELSE 2 ELSE 2
END END
SELECT Orders.OrderID, Customers.CompanyName, DATEFROMPARTS(YEAR(GETDATE()), 1, 1) AS FirstDayOfYear
IF @vint = 1
BEGIN
SET @vvarchar='one'
SET @vint = DATEDIFFT(dd, @vdate, @vdatetime)
END
SELECT Orders.OrderID
,Customers.CompanyName
,DATEFROMPARTS(YEAR(GETDATE()), 1, 1) AS FirstDayOfYear
FROM Orders FROM Orders
INNER JOIN Customers INNER JOIN Customers
ON Orders.CustomerID = Customers.CustomerID ON Orders.CustomerID = Customers.CustomerID

6
lib/ace/mode/folding/cstyle.js
View file

@ -158,12 +158,16 @@ oop.inherits(FoldMode, BaseFoldMode);
return new Range(startRow, startColumn, endRow, session.getLine(endRow).length); return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
}; };
/**
* gets comment region block with end region assumed to be start of comment in any cstyle mode or SQL mode (--) which inherits from this.
* There may optionally be a pound symbol before the region/endregion statement
*/
this.getCommentRegionBlock = function(session, line, row) { this.getCommentRegionBlock = function(session, line, row) {
var startColumn = line.search(/\s*$/); var startColumn = line.search(/\s*$/);
var maxRow = session.getLength(); var maxRow = session.getLength();
var startRow = row; var startRow = row;
var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/; var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
var depth = 1; var depth = 1;
while (++row < maxRow) { while (++row < maxRow) {
line = session.getLine(row); line = session.getLine(row);

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

@ -33,42 +33,28 @@ define(function(require, exports, module) {
var oop = require("../../lib/oop"); var oop = require("../../lib/oop");
var Range = require("../../range").Range; var Range = require("../../range").Range;
var BaseFoldMode = require("./fold_mode").FoldMode; var BaseFoldMode = require("./cstyle").FoldMode;
var FoldMode = exports.FoldMode = function() {}; var FoldMode = exports.FoldMode = function() {};
oop.inherits(FoldMode, BaseFoldMode); oop.inherits(FoldMode, BaseFoldMode);
(function() { (function() {
/**
* Inheriting cstyle folding because it handles the region comment folding
* and special block comment folding appropriately.
*
* Cstyle's getCommentRegionBlock() contains the sql comment characters '--'.
*/
// Currently the only supported folding is #region comments this.foldingStartMarker = /(\bCASE\b|\bBEGIN\b)|^\s*(\/\*)/i;
// TODO: add more folding (will require in depth testing because this has never existed before) for things like: this.foldingStopMarker = /^(\bEND\b)|^[\s\*]*(\*\/)/i;
// CASE ... END https://msdn.microsoft.com/en-us/library/ms181765.aspx // this.foldingStopMarker = /^(?!\bCASE\b|\bBEGIN\b)(\bEND\b)|^[\s\*]*(\*\/)/i;
// BEGIN ... END https://msdn.microsoft.com/en-us/library/ms182717.aspx // this.foldingStopMarker = /^(?!\bCASE\b|\bBEGIN\b).*(\bEND\b)|^[\s\*]*(\*\/)/i;
// -- LEFT OFF TRYING TO ADD ADVANCED FOLDING... UNCOMMENT TO CONTINUE
//this.foldingStartMarker = /\bCASE\b|\bBEGIN\b/i; this.startRegionRe = /^\s*(\/\*|--)#?region\b/;
this.foldingStartMarker = /(\bCASE\b|\bBEGIN\b)|^\s*(\/\*)/;
this.foldingStopMarker = /\bEND\b/i;
this.startRegionRe = /^\s*(\/\*|--)#region\b/;
this._getFoldWidgetBase = this.getFoldWidget;
this.getFoldWidget = function(session, foldStyle, row) {
var line = session.getLine(row);
var fw = this._getFoldWidgetBase(session, foldStyle, row);
if (!fw && this.startRegionRe.test(line))
return "start";
return fw;
};
//this is called when a fold widget is clicked
this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) { this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
var line = session.getLine(row); var line = session.getLine(row);
@ -77,17 +63,17 @@ oop.inherits(FoldMode, BaseFoldMode);
var match = line.match(this.foldingStartMarker); var match = line.match(this.foldingStartMarker);
if (match) { if (match) {
var i = match.index; var i = match.index;
//if first capturing group (CASE|BEGIN)
//if first capturing group, then match is for bracket, either '{' or '[', which match[1] will contain if (match[1]) return this.getBeginEndBlock(session, row, i, match[1]);
if (match[1]) return this.getEndBlock(session, row, i, match[1]);
//return this.openingBracketBlock(session, match[1], row, i);
//still going: match is for second capturing group, which is blockcomment //still going: match is for second capturing group, which is blockcomment
var range = session.getCommentFoldRange(row, i + match[0].length, 1); var range = session.getCommentFoldRange(row, i + match[0].length, 1);
console.log('getCommentFoldRange',range);
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);
} }
else if (foldStyle != "all") range = null; else if (foldStyle != "all") range = null;
} }
@ -95,26 +81,16 @@ oop.inherits(FoldMode, BaseFoldMode);
return range; return range;
} }
//no support for end folding markers yet
if (foldStyle === "markbegin") return; if (foldStyle === "markbegin") return;
/* this is when end fold has marker, and user clicks it, in which case we want to find the opening braket
var match = line.match(this.foldingStopMarker);
if (match) {
var i = match.index + match[0].length;
if (match[1]) return this.closingBracketBlock(session, match[1], row, i);
return session.getCommentFoldRange(row, i, - 1);
}*/
return; return;
}; };
/** /**
* finds the next 'END' for closing a fold range * @returns {range} folding block for sequence that starts with 'CASE' or 'BEGIN' and ends with 'END'
* @param {string} matchSequence - the sequence of charaters that started the fold widget, which should remain visible when the fold widget is folded * @param {string} matchSequence - the sequence of charaters that started the fold widget, which should remain visible when the fold widget is folded
*/ */
this.getEndBlock = function(session, row, column, matchSequence) { this.getBeginEndBlock = function(session, row, column, matchSequence) {
var start = { var start = {
row: row, row: row,
column: column + matchSequence.length column: column + matchSequence.length
@ -123,13 +99,13 @@ oop.inherits(FoldMode, BaseFoldMode);
var line; var line;
var depth = 1; var depth = 1;
var re = /\bEND\b/i; ///^\s*(?:\/\*|--)#(end)?region\b/; var re = /(\bCASE\b|\bBEGIN\b)|(\bEND\b)/i;
while (++row < maxRow) { while (++row < maxRow) {
line = session.getLine(row); line = session.getLine(row);
var m = re.exec(line); var m = re.exec(line);
if (!m) continue; if (!m) continue;
if (m[0]) depth--; if (m[1]) depth++;
else depth++; else depth--;
if (!depth) break; if (!depth) break;
} }
@ -137,43 +113,6 @@ oop.inherits(FoldMode, BaseFoldMode);
if (endRow > start.row) { if (endRow > start.row) {
return new Range(start.row, start.column, endRow, line.length); return new Range(start.row, start.column, endRow, line.length);
} }
/* var end = session.$findClosingBracket(bracket, start, typeRe);
if (!end) return;
var fw = session.foldWidgets[end.row];
if (fw == null) fw = session.getFoldWidget(end.row);
if (fw == "start" && end.row > start.row) {
end.row--;
end.column = session.getLine(end.row).length;
}
return Range.fromPoints(start, end);*/
};
this.getCommentRegionBlock = function(session, line, row) {
var startColumn = line.search(/\s*$/);
var maxRow = session.getLength();
var startRow = row;
var re = /^\s*(?:\/\*|--)#(end)?region\b/;
var depth = 1;
while (++row < maxRow) {
line = session.getLine(row);
var m = re.exec(line);
if (!m) continue;
if (m[1]) depth--;
else depth++;
if (!depth) break;
}
var endRow = row;
if (endRow > startRow) {
return new Range(startRow, startColumn, endRow, line.length);
}
}; };
}).call(FoldMode.prototype); }).call(FoldMode.prototype);