From bbd705cd693d083ce87a728d772f6b8b109550e7 Mon Sep 17 00:00:00 2001 From: quexer Date: Thu, 6 Sep 2012 17:28:24 +0800 Subject: [PATCH 1/4] Update lib/ace/mode/markdown_highlight_rules.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit catch both text and "#" as token value for Atx style heading. todo: handle Setext style heading as well. --- lib/ace/mode/markdown_highlight_rules.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js index dc332fa6..58919be7 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.length; + return "markup.heading." + value.match(/#/g).length; }, - regex : "^#{1,6}" + regex : "^#{1,6}.+$" }, github_embed("(?:javascript|js)", "js-"), github_embed("xml", "xml-"), github_embed("html", "html-"), From 7c9cfcaf60269b9f934623c52a9e690aca7fceb8 Mon Sep 17 00:00:00 2001 From: quexer Date: Thu, 13 Sep 2012 15:18:28 +0800 Subject: [PATCH 2/4] 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 + * + * 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(); +} From 90e356be16897463abd7ecb76da318ceb9817c0f Mon Sep 17 00:00:00 2001 From: quexer Date: Thu, 13 Sep 2012 15:38:08 +0800 Subject: [PATCH 3/4] clean test log --- lib/ace/mode/markdown_highlight_rules_test.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/ace/mode/markdown_highlight_rules_test.js b/lib/ace/mode/markdown_highlight_rules_test.js index 2a9ab79e..2097e60b 100644 --- a/lib/ace/mode/markdown_highlight_rules_test.js +++ b/lib/ace/mode/markdown_highlight_rules_test.js @@ -52,14 +52,12 @@ module.exports = { "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'); }, @@ -72,7 +70,6 @@ module.exports = { "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'); }, From a68ec0b346d52c68e2fb3baa0af34fb099cb4055 Mon Sep 17 00:00:00 2001 From: quexer Date: Tue, 18 Sep 2012 15:46:36 +0800 Subject: [PATCH 4/4] update license block --- lib/ace/mode/markdown_highlight_rules_test.js | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/lib/ace/mode/markdown_highlight_rules_test.js b/lib/ace/mode/markdown_highlight_rules_test.js index 2097e60b..4c828e49 100644 --- a/lib/ace/mode/markdown_highlight_rules_test.js +++ b/lib/ace/mode/markdown_highlight_rules_test.js @@ -1,37 +1,35 @@ /* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Distributed under the BSD license: * - * 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/ + * Copyright (c) 2012, Ajax.org B.V. + * All rights reserved. * - * 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. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. * - * The Original Code is Ajax.org Code Editor (ACE). + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * 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 * - * 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. + * quexer * * ***** END LICENSE BLOCK ***** */