From c2b7d1f08274ba72a73d7a9033dce504721a9460 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 1 Jun 2013 22:32:27 +0400
Subject: [PATCH] better style for match highlight in popup

---
 lib/ace/autocomplete/popup.js   |  5 ++++-
 lib/ace/css/editor.css          | 15 ++++++++++++++-
 lib/ace/edit_session/folding.js |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lib/ace/autocomplete/popup.js b/lib/ace/autocomplete/popup.js
index c6b401b2..85a5d8b7 100644
--- a/lib/ace/autocomplete/popup.js
+++ b/lib/ace/autocomplete/popup.js
@@ -93,6 +93,7 @@ var $singleLineEditor = function(el) {
 var AcePopup = function(parentNode) {
     var el = dom.createElement("div");
     var popup = new $singleLineEditor(el);
+    
     if (parentNode)
         parentNode.appendChild(el);
     el.style.display = "none";
@@ -111,7 +112,9 @@ var AcePopup = function(parentNode) {
     popup.renderer.$keepTextAreaAtCursor = false;
 
     popup.setHighlightActiveLine(true);
-    popup.setSession(new EditSession(""));
+    // set default highlight color
+    popup.session.highlight("");
+    popup.session.$searchHighlight.clazz = "ace_highlight-marker";
 
     popup.on("mousedown", function(e) {
         var pos = e.getDocumentPosition();
diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index 4f32b905..8ebc1616 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -181,7 +181,7 @@
     white-space: nowrap;
 }
 
-.ace_marker-layer .ace_step {
+.ace_marker-layer .ace_step, .ace_marker-layer .ace_stack {
     position: absolute;
     z-index: 3;
 }
@@ -386,3 +386,16 @@
 .ace_italic {
     font-style: italic;
 }
+
+
+.ace_error-marker {
+    background-color: rgba(255, 0, 0,0.2);
+    position: absolute;
+    z-index: 9;
+}
+
+.ace_highlight-marker {
+    background-color: rgba(255, 255, 0,0.2);
+    position: absolute;
+    z-index: 8;
+}
diff --git a/lib/ace/edit_session/folding.js b/lib/ace/edit_session/folding.js
index e85d4f0c..b36857c6 100644
--- a/lib/ace/edit_session/folding.js
+++ b/lib/ace/edit_session/folding.js
@@ -639,8 +639,8 @@ function Folding() {
             if (range && range.end.row <= endRow) try {
                 var fold = this.addFold("...", range);
                 fold.collapseChildren = depth;
+                row = range.end.row;
             } catch(e) {}
-            row = range.end.row;
         }
     };