From 7c9cfcaf60269b9f934623c52a9e690aca7fceb8 Mon Sep 17 00:00:00 2001
From: quexer <quexer@gmail.com>
Date: Thu, 13 Sep 2012 15:18:28 +0800
Subject: [PATCH] fix bug for atx style header parsing. unittests added

---
 lib/ace/mode/markdown_highlight_rules.js      |   4 +-
 lib/ace/mode/markdown_highlight_rules_test.js | 105 ++++++++++++++++++
 2 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 lib/ace/mode/markdown_highlight_rules_test.js

diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js
index 58919be7..4f09c622 100644
--- a/lib/ace/mode/markdown_highlight_rules.js
+++ b/lib/ace/mode/markdown_highlight_rules.js
@@ -77,9 +77,9 @@ var MarkdownHighlightRules = function() {
             regex: "^\\-+(?=\\s*$)"
         }, { // header
             token : function(value) {
-                return "markup.heading." + value.match(/#/g).length;
+                return "markup.heading." + value.search(/[^#]/);
             },
-            regex : "^#{1,6}.+$"
+            regex : "^#{1,6}(?:[^ #].*| +.*(?:[^ #].*|[^ ]+.* +#+ *))$"
         }, github_embed("(?:javascript|js)", "js-"),
            github_embed("xml", "xml-"),
            github_embed("html", "html-"),
diff --git a/lib/ace/mode/markdown_highlight_rules_test.js b/lib/ace/mode/markdown_highlight_rules_test.js
new file mode 100644
index 00000000..2a9ab79e
--- /dev/null
+++ b/lib/ace/mode/markdown_highlight_rules_test.js
@@ -0,0 +1,105 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      quexer <quexer AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+if (typeof process !== "undefined") {
+    require("amd-loader");
+}
+
+define(function(require, exports, module) {
+"use strict";
+
+var Mode = require("./markdown").Mode;
+var assert = require("../test/assertions");
+
+module.exports = {
+    setUp : function() {
+        this.tokenizer = new Mode().getTokenizer();
+    },
+
+    "test: header 1 ": function() {
+        var tokens = this.tokenizer.getLineTokens("#f", "start").tokens;
+        console.log(tokens);
+        assert.equal(tokens.length, 1);
+        assert.equal(tokens[0].type, 'markup.heading.1');
+    },
+
+    "test: header 2": function() {
+        var tokens = this.tokenizer.getLineTokens("## foo", "start").tokens;
+        console.log(tokens);
+        assert.equal(tokens.length, 1);
+        assert.equal(tokens[0].type, 'markup.heading.2');
+    },
+
+    "test: header ends with ' #'": function() {
+        var tokens = this.tokenizer.getLineTokens("# # # ", "start").tokens;
+        assert.equal(tokens.length, 1);
+        assert.equal(tokens[0].type, 'markup.heading.1');
+    },
+
+    "test: header ends with '#'": function() {
+        var tokens = this.tokenizer.getLineTokens("#foo# ", "start").tokens;
+        console.log(tokens);
+        assert.equal(tokens.length, 1);
+        assert.equal(tokens[0].type, 'markup.heading.1');
+    },
+
+    "test: 6+ #s is not a valid header": function() {
+        var tokens = this.tokenizer.getLineTokens("####### foo", "start").tokens;
+        assert.equal(tokens.length, 1);
+        assert.equal(tokens[0].type, 'text');
+    },
+
+    "test: # followed be only space is not a valid header": function() {
+        var tokens = this.tokenizer.getLineTokens("#  ", "start").tokens;
+        assert.equal(tokens.length, 1);
+        assert.equal(tokens[0].type, 'text');
+    },
+
+
+
+    "test: only space between #s is not a valid header": function() {
+        var tokens = this.tokenizer.getLineTokens("#  #", "start").tokens;
+        assert.equal(tokens.length, 1);
+        assert.equal(tokens[0].type, 'text');
+    }
+};
+
+});
+
+if (typeof module !== "undefined" && module === require.main) {
+    require("asyncjs").test.testcase(module.exports).exec();
+}