From 6ccfb6e439d785b4e0b0b162be58083ffad4d5c3 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sun, 27 May 2012 14:50:30 +0400 Subject: [PATCH] tweak diff mode --- lib/ace/mode/diff.js | 37 +------------- lib/ace/mode/diff_highlight_rules.js | 6 +-- lib/ace/mode/folding/diff.js | 76 ++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 38 deletions(-) create mode 100644 lib/ace/mode/folding/diff.js diff --git a/lib/ace/mode/diff.js b/lib/ace/mode/diff.js index 9795f79d..2e383764 100644 --- a/lib/ace/mode/diff.js +++ b/lib/ace/mode/diff.js @@ -41,10 +41,11 @@ var oop = require("../lib/oop"); var TextMode = require("./text").Mode; var Tokenizer = require("../tokenizer").Tokenizer; var HighlightRules = require("./diff_highlight_rules").DiffHighlightRules; +var FoldMode = require("./folding/diff").FoldMode; var Mode = function() { this.$tokenizer = new Tokenizer(new HighlightRules().getRules(), "i"); - this.foldingRules = new FoldMode(); + this.foldingRules = new FoldMode(["diff", "index", "\\+{3}", "@@|\\*{5}"], "i"); }; oop.inherits(Mode, TextMode); @@ -54,38 +55,4 @@ oop.inherits(Mode, TextMode); exports.Mode = Mode; - -// folding -var BaseFoldMode = require("./folding/fold_mode").FoldMode; -var Range = require("../range").Range; - -var FoldMode = exports.FoldMode = function() {}; -oop.inherits(FoldMode, BaseFoldMode); - -(function() { - - this.foldingStartMarker = /^(diff|index|@@|\+{3}|\*{5})/; - - this.getFoldWidgetRange = function(session, foldStyle, row) { - var line = session.getLine(row); - var start = {row: row, column: line.length - 2}; - - var regList = ["diff", "index", "\\+{3}", "@@|\\*{5}"]; - for (var i = 1; i <= regList.length; i++) { - var re = RegExp("^(" + regList.slice(0, i).join("|") + ")"); - if (re.test(line)) - break; - } - - for (var l = session.getLength(); ++row < l; ) { - line = session.getLine(row); - if (re.test(line)) - break - } - - return Range.fromPoints(start, {row: row - 1, column: line.length}); - }; - -}).call(FoldMode.prototype); - }); diff --git a/lib/ace/mode/diff_highlight_rules.js b/lib/ace/mode/diff_highlight_rules.js index eb38a1d3..fbbc282f 100644 --- a/lib/ace/mode/diff_highlight_rules.js +++ b/lib/ace/mode/diff_highlight_rules.js @@ -89,10 +89,10 @@ var DiffHighlightRules = function() { "invalid" ], }, { - "regex": "^(diff)( .+)$", - "token": ["keyword", "string.regex"] + "regex": "^(diff)(\\s+--\\w+)?(.+?)( .+)?$", + "token": ["variable", "variable", "keyword", "variable"] }, { - "regex": "^Index .+$", + "regex": "^Index.+$", "token": "variable" }, { "regex": "^(.*?)(\\s*)$", diff --git a/lib/ace/mode/folding/diff.js b/lib/ace/mode/folding/diff.js new file mode 100644 index 00000000..89bea274 --- /dev/null +++ b/lib/ace/mode/folding/diff.js @@ -0,0 +1,76 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Ajax.org Code Editor (ACE). + * + * The Initial Developer of the Original Code is + * Ajax.org B.V. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Fabian Jakobs + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { +"use strict"; + +var oop = require("../../lib/oop"); +var BaseFoldMode = require("./fold_mode").FoldMode; +var Range = require("../../range").Range; + +var FoldMode = exports.FoldMode = function(levels, flag) { + this.regExpList = levels; + this.flag = flag; + this.foldingStartMarker = RegExp("^(" + levels.join("|") + ")", this.flag); +}; +oop.inherits(FoldMode, BaseFoldMode); + +(function() { + this.getFoldWidgetRange = function(session, foldStyle, row) { + var line = session.getLine(row); + var start = {row: row, column: line.length}; + + var regList = this.regExpList; + for (var i = 1; i <= regList.length; i++) { + var re = RegExp("^(" + regList.slice(0, i).join("|") + ")", this.flag); + if (re.test(line)) + break; + } + + for (var l = session.getLength(); ++row < l; ) { + line = session.getLine(row); + if (re.test(line)) + break + } + if (row == start.row + 1) + return; + return Range.fromPoints(start, {row: row - 1, column: line.length}); + }; + +}).call(FoldMode.prototype); + +});