From 48aa35c08148a38abc07bfbe3539033c8b5aff7c Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 10 Apr 2013 16:19:44 +0400 Subject: [PATCH 1/4] put cursor at the end of selected line on trippleclick --- lib/ace/mouse/default_handlers.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ace/mouse/default_handlers.js b/lib/ace/mouse/default_handlers.js index af741ce6..8529c0fc 100644 --- a/lib/ace/mouse/default_handlers.js +++ b/lib/ace/mouse/default_handlers.js @@ -322,6 +322,8 @@ function calcDistance(ax, ay, bx, by) { function calcRangeOrientation(range, cursor) { if (range.start.row == range.end.row) var cmp = 2 * cursor.column - range.start.column - range.end.column; + else if (range.start.row == range.end.row - 1 && !range.start.column && !range.end.column) + var cmp = cursor.column - 4; else var cmp = 2 * cursor.row - range.start.row - range.end.row; From f3896601003a131f323d865f919d7a5d774615ee Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 10 Apr 2013 16:20:17 +0400 Subject: [PATCH 2/4] fix pasting 2 lines in multiselect mode --- lib/ace/multi_select.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/multi_select.js b/lib/ace/multi_select.js index fc07bd76..82d55972 100644 --- a/lib/ace/multi_select.js +++ b/lib/ace/multi_select.js @@ -539,7 +539,7 @@ var Editor = require("./editor").Editor; var lines = text.split(/\r\n|\r|\n/); var ranges = this.selection.rangeList.ranges; - if (lines.length > ranges.length || (lines.length <= 2 || !lines[1])) + if (lines.length > ranges.length || (lines.length <= 2 && !lines[1])) return this.commands.exec("insertstring", this, text); for (var i = ranges.length; i--; ) { From 7fa644f7c365569f930b3adbcb10aa9c04db2e1b Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 10 Apr 2013 16:21:29 +0400 Subject: [PATCH 3/4] multiselect getCopyText should be empty when all ranges are empty --- lib/ace/multi_select.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/ace/multi_select.js b/lib/ace/multi_select.js index 82d55972..c54224f6 100644 --- a/lib/ace/multi_select.js +++ b/lib/ace/multi_select.js @@ -515,11 +515,14 @@ var Editor = require("./editor").Editor; var text = ""; if (this.inMultiSelectMode) { var ranges = this.multiSelect.rangeList.ranges; - text = []; + var buf = []; for (var i = 0; i < ranges.length; i++) { - text.push(this.session.getTextRange(ranges[i])); + buf.push(this.session.getTextRange(ranges[i])); } - text = text.join(this.session.getDocument().getNewLineCharacter()); + var nl = this.session.getDocument().getNewLineCharacter(); + text = buf.join(nl); + if (text.length == (buf.length - 1) * nl.length) + text = ""; } else if (!this.selection.isEmpty()) { text = this.session.getTextRange(this.getSelectionRange()); } From fcf3330d66725ac3d0c27b8b0a0a542da5d9d5e0 Mon Sep 17 00:00:00 2001 From: nightwing Date: Fri, 12 Apr 2013 16:10:48 +0400 Subject: [PATCH 4/4] fix #1027 Eclipse XML bad color --- lib/ace/theme/eclipse.css | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/ace/theme/eclipse.css b/lib/ace/theme/eclipse.css index ce65575b..9a423e8d 100644 --- a/lib/ace/theme/eclipse.css +++ b/lib/ace/theme/eclipse.css @@ -47,7 +47,7 @@ } .ace-eclipse .ace_comment { - color: rgb(63, 127, 95); + color: rgb(113, 150, 130); } .ace-eclipse .ace_comment.ace_doc { @@ -59,10 +59,11 @@ } .ace-eclipse .ace_constant.ace_numeric { + color: darkblue; } .ace-eclipse .ace_tag { - color: rgb(63, 127, 127); + color: rgb(25, 118, 116); } .ace-eclipse .ace_type { @@ -83,7 +84,11 @@ } .ace-eclipse .ace_meta.ace_tag { - color:rgb(63, 127, 127); + color:rgb(25, 118, 116); +} + +.ace-eclipse .ace_invisible { + color: #ddd; } .ace-eclipse .ace_entity.ace_other.ace_attribute-name {