From 7fc1944c8bec8771400e93f11cb84ceff38f27f4 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 15 Oct 2012 14:20:51 +0400
Subject: [PATCH] allow multiline annotations

---
 lib/ace/css/editor.css  |  2 ++
 lib/ace/layer/gutter.js | 10 +++++++---
 lib/ace/lib/lang.js     |  4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index 1b63ee16..c3a7fc8e 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -242,6 +242,8 @@
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
     cursor: default;
+    white-space: pre-line;
+    word-wrap: break-word;
 }
 
 .ace_folding-enabled > .ace_gutter-cell {
diff --git a/lib/ace/layer/gutter.js b/lib/ace/layer/gutter.js
index 558cd026..99fec7b6 100644
--- a/lib/ace/layer/gutter.js
+++ b/lib/ace/layer/gutter.js
@@ -33,6 +33,7 @@ define(function(require, exports, module) {
 
 var dom = require("../lib/dom");
 var oop = require("../lib/oop");
+var lang = require("../lib/lang");
 var EventEmitter = require("../lib/event_emitter").EventEmitter;
 
 var Gutter = function(parentEl) {
@@ -78,12 +79,15 @@ var Gutter = function(parentEl) {
             var annotation = annotations[i];
             var row = annotation.row;
             var rowInfo = this.$annotations[row];
-            if (!rowInfo) {
+            if (!rowInfo)
                 rowInfo = this.$annotations[row] = {text: []};
-            }
-            var annoText = annotation.text.replace(/"/g, "&quot;").replace(/'/g, "&#8217;").replace(/</g, "&lt;");
+           
+            var annoText = annotation.text;
+            annoText = annoText ? lang.escapeHTML(annoText) : annotation.html || "";
+
             if (rowInfo.text.indexOf(annoText) === -1)
                 rowInfo.text.push(annoText);
+
             var type = annotation.type;
             if (type == "error")
                 rowInfo.className = " ace_error";
diff --git a/lib/ace/lib/lang.js b/lib/ace/lib/lang.js
index dd398676..e9585dca 100644
--- a/lib/ace/lib/lang.js
+++ b/lib/ace/lib/lang.js
@@ -117,6 +117,10 @@ exports.escapeRegExp = function(str) {
     return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
 };
 
+exports.escapeHTML = function(str) {
+    return str.replace(/&/g, "&#38;").replace(/"/g, "&#34;").replace(/'/g, "&#39;").replace(/</g, "&#60;");
+};
+
 exports.getMatchOffsets = function(string, regExp) {
     var matches = [];