From 31a6da4b5f871c48878e6721d9f50c8fc0efde48 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 15 Apr 2012 14:45:08 +0400
Subject: [PATCH] fix Multiple selections only show 1 selection

---
 lib/ace/layer/marker.js                  | 6 +++---
 lib/ace/theme/clouds.js                  | 5 +++++
 lib/ace/theme/clouds_midnight.js         | 5 +++++
 lib/ace/theme/cobalt.js                  | 5 +++++
 lib/ace/theme/dawn.js                    | 5 +++++
 lib/ace/theme/idle_fingers.js            | 5 +++++
 lib/ace/theme/kr_theme.js                | 5 +++++
 lib/ace/theme/merbivore.js               | 5 +++++
 lib/ace/theme/merbivore_soft.js          | 5 +++++
 lib/ace/theme/mono_industrial.js         | 5 +++++
 lib/ace/theme/monokai.js                 | 5 +++++
 lib/ace/theme/pastel_on_dark.js          | 5 +++++
 lib/ace/theme/solarized_dark.js          | 5 +++++
 lib/ace/theme/solarized_light.js         | 5 +++++
 lib/ace/theme/textmate.js                | 5 ++++-
 lib/ace/theme/tomorrow.js                | 5 +++++
 lib/ace/theme/tomorrow_night.js          | 5 +++++
 lib/ace/theme/tomorrow_night_blue.js     | 5 +++++
 lib/ace/theme/tomorrow_night_bright.js   | 5 +++++
 lib/ace/theme/tomorrow_night_eighties.js | 5 +++++
 lib/ace/theme/twilight.js                | 5 +++++
 lib/ace/theme/vibrant_ink.js             | 5 +++++
 tool/Theme.tmpl.css                      | 7 ++++++-
 23 files changed, 113 insertions(+), 5 deletions(-)

diff --git a/lib/ace/layer/marker.js b/lib/ace/layer/marker.js
index ac361249..741a271d 100644
--- a/lib/ace/layer/marker.js
+++ b/lib/ace/layer/marker.js
@@ -99,7 +99,7 @@ var Marker = function(parentEl) {
             }
             else {
                 this.drawSingleLineMarker(
-                    html, range, marker.clazz, config,
+                    html, range, marker.clazz + " start", config,
                     null, marker.type
                 );
             }
@@ -122,7 +122,7 @@ var Marker = function(parentEl) {
             row, range.start.column,
             row, this.session.getScreenLastRowColumn(row)
         );
-        this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, "text");
+        this.drawSingleLineMarker(stringBuilder, lineRange, clazz + " start", layerConfig, 1, "text");
 
         // selection end
         row = range.end.row;
@@ -152,7 +152,7 @@ var Marker = function(parentEl) {
         );
 
         stringBuilder.push(
-            "<div class='", clazz, "' style='",
+            "<div class='", clazz, " start' style='",
             "height:", height, "px;",
             "width:", width, "px;",
             "top:", top, "px;",
diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js
index 389c82e3..11a54d3d 100644
--- a/lib/ace/theme/clouds.js
+++ b/lib/ace/theme/clouds.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #BDD5FC;\
 }\
 \
+.ace-clouds.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #FFFFFF;\
+  border-radius: 2px;\
+}\
+\
 .ace-clouds .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js
index de6fea2e..094f95de 100644
--- a/lib/ace/theme/clouds_midnight.js
+++ b/lib/ace/theme/clouds_midnight.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #000000;\
 }\
 \
+.ace-clouds-midnight.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #191919;\
+  border-radius: 2px;\
+}\
+\
 .ace-clouds-midnight .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js
index 4631fef2..0b461b39 100644
--- a/lib/ace/theme/cobalt.js
+++ b/lib/ace/theme/cobalt.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: rgba(179, 101, 57, 0.75);\
 }\
 \
+.ace-cobalt.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #002240;\
+  border-radius: 2px;\
+}\
+\
 .ace-cobalt .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js
index 3967d959..1974a94d 100644
--- a/lib/ace/theme/dawn.js
+++ b/lib/ace/theme/dawn.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: rgba(39, 95, 255, 0.30);\
 }\
 \
+.ace-dawn.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #F9F9F9;\
+  border-radius: 2px;\
+}\
+\
 .ace-dawn .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js
index 551e7811..9da3d396 100644
--- a/lib/ace/theme/idle_fingers.js
+++ b/lib/ace/theme/idle_fingers.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: rgba(90, 100, 126, 0.88);\
 }\
 \
+.ace-idle-fingers.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #323232;\
+  border-radius: 2px;\
+}\
+\
 .ace-idle-fingers .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js
index 56313438..413d55d2 100644
--- a/lib/ace/theme/kr_theme.js
+++ b/lib/ace/theme/kr_theme.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: rgba(170, 0, 255, 0.45);\
 }\
 \
+.ace-kr-theme.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #0B0A09;\
+  border-radius: 2px;\
+}\
+\
 .ace-kr-theme .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js
index ddc09766..95927960 100644
--- a/lib/ace/theme/merbivore.js
+++ b/lib/ace/theme/merbivore.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #454545;\
 }\
 \
+.ace-merbivore.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #161616;\
+  border-radius: 2px;\
+}\
+\
 .ace-merbivore .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js
index d684ff63..107d6df6 100644
--- a/lib/ace/theme/merbivore_soft.js
+++ b/lib/ace/theme/merbivore_soft.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #494949;\
 }\
 \
+.ace-merbivore-soft.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #1C1C1C;\
+  border-radius: 2px;\
+}\
+\
 .ace-merbivore-soft .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js
index ae4274cb..fdf47fa2 100644
--- a/lib/ace/theme/mono_industrial.js
+++ b/lib/ace/theme/mono_industrial.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: rgba(145, 153, 148, 0.40);\
 }\
 \
+.ace-mono-industrial.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #222C28;\
+  border-radius: 2px;\
+}\
+\
 .ace-mono-industrial .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js
index 2794ff45..ba5fca86 100644
--- a/lib/ace/theme/monokai.js
+++ b/lib/ace/theme/monokai.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #49483E;\
 }\
 \
+.ace-monokai.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #272822;\
+  border-radius: 2px;\
+}\
+\
 .ace-monokai .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js
index d0ad8bd6..3399e7ce 100644
--- a/lib/ace/theme/pastel_on_dark.js
+++ b/lib/ace/theme/pastel_on_dark.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: rgba(221, 240, 255, 0.20);\
 }\
 \
+.ace-pastel-on-dark.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #2C2828;\
+  border-radius: 2px;\
+}\
+\
 .ace-pastel-on-dark .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js
index fcf0ae42..35ff5ae9 100644
--- a/lib/ace/theme/solarized_dark.js
+++ b/lib/ace/theme/solarized_dark.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #073642;\
 }\
 \
+.ace-solarized-dark.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #002B36;\
+  border-radius: 2px;\
+}\
+\
 .ace-solarized-dark .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js
index 9191e556..1327ce64 100644
--- a/lib/ace/theme/solarized_light.js
+++ b/lib/ace/theme/solarized_light.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #073642;\
 }\
 \
+.ace-solarized-light.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #FDF6E3;\
+  border-radius: 2px;\
+}\
+\
 .ace-solarized-light .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js
index 8931e60a..76eb0673 100644
--- a/lib/ace/theme/textmate.js
+++ b/lib/ace/theme/textmate.js
@@ -169,7 +169,10 @@ exports.cssText = ".ace-tm .ace_editor {\
 .ace-tm .ace_marker-layer .ace_selection {\
   background: rgb(181, 213, 255);\
 }\
-\
+.ace-tm.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px white;\
+  border-radius: 2px;\
+}\
 .ace-tm .ace_marker-layer .ace_step {\
   background: rgb(252, 255, 0);\
 }\
diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js
index a891f06a..14e19d77 100644
--- a/lib/ace/theme/tomorrow.js
+++ b/lib/ace/theme/tomorrow.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #D6D6D6;\
 }\
 \
+.ace-tomorrow.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #FFFFFF;\
+  border-radius: 2px;\
+}\
+\
 .ace-tomorrow .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js
index bb8e3a21..621c6bb8 100644
--- a/lib/ace/theme/tomorrow_night.js
+++ b/lib/ace/theme/tomorrow_night.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #373B41;\
 }\
 \
+.ace-tomorrow-night.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #1D1F21;\
+  border-radius: 2px;\
+}\
+\
 .ace-tomorrow-night .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/tomorrow_night_blue.js b/lib/ace/theme/tomorrow_night_blue.js
index f8e5c0d8..72ffb2bc 100644
--- a/lib/ace/theme/tomorrow_night_blue.js
+++ b/lib/ace/theme/tomorrow_night_blue.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #003F8E;\
 }\
 \
+.ace-tomorrow-night-blue.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #002451;\
+  border-radius: 2px;\
+}\
+\
 .ace-tomorrow-night-blue .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/tomorrow_night_bright.js b/lib/ace/theme/tomorrow_night_bright.js
index d294cbfc..6d5f2c2f 100644
--- a/lib/ace/theme/tomorrow_night_bright.js
+++ b/lib/ace/theme/tomorrow_night_bright.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #424242;\
 }\
 \
+.ace-tomorrow-night-bright.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #000000;\
+  border-radius: 2px;\
+}\
+\
 .ace-tomorrow-night-bright .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/tomorrow_night_eighties.js b/lib/ace/theme/tomorrow_night_eighties.js
index 6c4efbd8..f6a67d4e 100644
--- a/lib/ace/theme/tomorrow_night_eighties.js
+++ b/lib/ace/theme/tomorrow_night_eighties.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #515151;\
 }\
 \
+.ace-tomorrow-night-eighties.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #2D2D2D;\
+  border-radius: 2px;\
+}\
+\
 .ace-tomorrow-night-eighties .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js
index 728b9922..842dd234 100644
--- a/lib/ace/theme/twilight.js
+++ b/lib/ace/theme/twilight.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: rgba(221, 240, 255, 0.20);\
 }\
 \
+.ace-twilight.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #141414;\
+  border-radius: 2px;\
+}\
+\
 .ace-twilight .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js
index 6ac945c3..fac89c15 100644
--- a/lib/ace/theme/vibrant_ink.js
+++ b/lib/ace/theme/vibrant_ink.js
@@ -80,6 +80,11 @@ exports.cssText = "\
   background: #6699CC;\
 }\
 \
+.ace-vibrant-ink.multiselect .ace_selection.start {\
+  box-shadow: 0 0 3px 0px #0F0F0F;\
+  border-radius: 2px;\
+}\
+\
 .ace-vibrant-ink .ace_marker-layer .ace_step {\
   background: rgb(198, 219, 174);\
 }\
diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css
index 308f63ff..1d6aca07 100644
--- a/tool/Theme.tmpl.css
+++ b/tool/Theme.tmpl.css
@@ -27,7 +27,7 @@
 }
 
 .%cssClass% .ace_cursor {
-  border-left: 1px solid %cursor%;
+  border-left: 2px solid %cursor%;
 }
 
 .%cssClass% .ace_cursor.ace_overwrite {
@@ -39,6 +39,11 @@
   background: %selection%;
 }
 
+.%cssClass%.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px %background%;
+  border-radius: 2px;
+}
+
 .%cssClass% .ace_marker-layer .ace_step {
   background: %step%;
 }