From 909b0dcde1610518e7dddff320b6fd3e5d2d720e Mon Sep 17 00:00:00 2001
From: benweet <benoit.schweblin@gmail.com>
Date: Mon, 18 Nov 2013 19:56:11 +0000
Subject: [PATCH] Added HTML syntax highlighting in the editor

---
 public/res/libs/ace_mode_highlight_rules.js | 102 ++++++++++----------
 public/res/styles/main.less                 |  18 ++++
 2 files changed, 69 insertions(+), 51 deletions(-)

diff --git a/public/res/libs/ace_mode_highlight_rules.js b/public/res/libs/ace_mode_highlight_rules.js
index 03ef3290..e60158e4 100644
--- a/public/res/libs/ace_mode_highlight_rules.js
+++ b/public/res/libs/ace_mode_highlight_rules.js
@@ -33,14 +33,62 @@ define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop");
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
-var LatexHighlightRules = require("ace/mode/latex_highlight_rules").LatexHighlightRules;
+var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules;
 
 var MarkdownHighlightRules = function() {
+    HtmlHighlightRules.call(this);
 
     // regexp must not have capturing parentheses
     // regexps are ordered -> the first match is used
+    this.$rules["start"].unshift({
+        token : "empty_line",
+        regex : '^$',
+        next: "allowBlock"
+    }, { // h1
+        token: "markup.heading.multi.1",
+        regex: "^=+(?=\\s*$)"
+    }, { // h2
+        token: "markup.heading.multi.2",
+        regex: "^\\-+(?=\\s*$)"
+    }, {
+        token : function(value) {
+            return "markup.heading." + value.length;
+        },
+        regex : /^#{1,6}(?=\s*[^ #]|\s+#.)/,
+        next : "header"
+    },
+    { // Github style block
+        token : "code_block",
+        regex : "^```\\s*[a-zA-Z]*(?:{.*?\\})?\\s*$",
+        next  : "githubblock"
+    }, { // block quote
+        token : "blockquote",
+        regex : "^\\s*>[ ].+$",
+        next  : "blockquote"
+    }, { // HR * - _
+        token : "constant",
+        regex : "^ {0,2}(?:(?: ?\\* ?){3,}|(?: ?\\- ?){3,}|(?: ?\\_ ?){3,})\\s*$",
+        next: "allowBlock"
+    }, { // list
+        token : "markup.list",
+        regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",
+        next  : "listblock-start"
+    }, { // Math inline
+        token : ["constant.language.escape", "keyword", "constant.language.escape"],
+        regex : "(\\$)(.*)(\\$)"
+    }, { // Math block
+        token : "constant.language.escape",
+        regex : "\\$\\$|\\\\\\\\\\[|\\\\\\\\\\\\\\\\\\(",
+        next  : "mathblock"
+    }, { // LaTeX block
+        token : "keyword",
+        regex : "\\\\?\\\\begin\\{[a-z]*\\*?\\}",
+        next  : "latexblock"
+    }, {
+        include : "basic"
+    });
 
-    this.$rules = {
+    this.addRules({
         "basic" : [{
             token : "constant.language.escape",
             regex : /\\[\\`*_{}\[\]()#+\-.!]/
@@ -82,54 +130,6 @@ var MarkdownHighlightRules = function() {
             {token : "empty", regex : "", next : "start"}
         ],
 
-        "start" : [{
-            token : "empty_line",
-            regex : '^$',
-            next: "allowBlock"
-        }, { // h1
-            token: "markup.heading.multi.1",
-            regex: "^=+(?=\\s*$)"
-        }, { // h2
-            token: "markup.heading.multi.2",
-            regex: "^\\-+(?=\\s*$)"
-        }, {
-            token : function(value) {
-                return "markup.heading." + value.length;
-            },
-            regex : /^#{1,6}(?=\s*[^ #]|\s+#.)/,
-            next : "header"
-        },
-        { // Github style block
-            token : "code_block",
-            regex : "^```\\s*[a-zA-Z]*(?:{.*?\\})?\\s*$",
-            next  : "githubblock"
-        }, { // block quote
-            token : "blockquote",
-            regex : "^\\s*>[ ].+$",
-            next  : "blockquote"
-        }, { // HR * - _
-            token : "constant",
-            regex : "^ {0,2}(?:(?: ?\\* ?){3,}|(?: ?\\- ?){3,}|(?: ?\\_ ?){3,})\\s*$",
-            next: "allowBlock"
-        }, { // list
-            token : "markup.list",
-            regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",
-            next  : "listblock-start"
-        }, { // Math inline
-            token : ["constant.language.escape", "keyword", "constant.language.escape"],
-            regex : "(\\$)(.*)(\\$)"
-        }, { // Math block
-            token : "constant.language.escape",
-            regex : "\\$\\$|\\\\\\\\\\[|\\\\\\\\\\\\\\\\\\(",
-            next  : "mathblock"
-        }, { // LaTeX block
-            token : "keyword",
-            regex : "\\\\?\\\\begin\\{[a-z]*\\*?\\}",
-            next  : "latexblock"
-        }, {
-            include : "basic"
-        }],
-        
         "header" : [{
             regex: "$",
             next : "start"
@@ -211,7 +211,7 @@ var MarkdownHighlightRules = function() {
             token : "comment",
             regex : "%.*$"
         }]
-    };
+    });
 
     this.normalizeRules();
 };
diff --git a/public/res/styles/main.less b/public/res/styles/main.less
index 942cb1ac..1563d1ce 100644
--- a/public/res/styles/main.less
+++ b/public/res/styles/main.less
@@ -1003,12 +1003,30 @@ ul,ol {
 	    color: @primary-color-lightest;
 	}
 	
+	.ace_meta.ace_tag {
+		color: @primary-color;
+		font-style: italic;
+		font-weight: bold;
+		background-color: @code-bg;
+	}
+	
+	.ace_keyword.ace_operator {
+	    color: @primary-color-light;
+		background-color: transparent;
+	}
+	
 	.ace_keyword {
 		color: @primary-color;
 		background-color: @code-bg;
 		font-weight: bold;
 	}
 	
+	.ace_string {
+		color: @primary-color;
+		font-style: italic;
+		background-color: @code-bg;
+	}
+	
 	.ace_strong {
 		font-weight: bold;
 	}