diff --git a/ChangeLog.txt b/ChangeLog.txt index 76b2313b..e5d36574 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,47 @@ +2012.09.17, Version 0.1.0 + +* New Features + - Multiple cursors and selections (https://c9.io/site/blog/2012/08/be-an-armenian-warrior-with-block-selection-on-steroids/) + - Fold buttons displayed in the gutter + - Indent Guides + - Completely reworked vim mode (Sergi Mansilla) + - Improved emacs keybindings + - Autoclosing of html tags (danyaPostfactum) + +* 20 New language modes + - Coldfusion (Russ) + - Diff + - GLSL (Ed Mackey) + - Go (Davide Saurino) + - Haxe (Jason O'Neil) + - Jade (Garen Torikian) + - jsx (Syu Kato) + - LaTeX (James Allen) + - Less (John Roepke) + - Liquid (Bernie Telles) + - Lua (Lee Gao) + - LuaPage (Choonster) + - Markdown (Chris Spencer) + - PostgreSQL (John DeSoi) + - Powershell (John Kane) + - Sh (Richo Healey) + - SQL (Jonathan Camile) + - Tcl (Cristoph Hochreiner) + - XQuery (William Candillion) + - Yaml (Meg Sharkey) + + * Live syntax checks + - for XQuery and JSON + +* New Themes + - Ambiance (Irakli Gozalishvili) + - Dreamweaver (Adam Jimenez) + - Github (bootstraponline) + - Tommorrow themes (https://github.com/chriskempson/tomorrow-theme) + - XCode + +* Many Small Enhancements and Bugfixes + 2011.08.02, Version 0.2.0 * Split view (Julian Viereck) @@ -27,15 +71,14 @@ - SCAD (Jacob Hansson) * Live syntax checks - - Lint for Css using CSS Lint + - Lint for CSS using CSS Lint - CoffeeScript * New Themes - Crimson Editor (iebuggy) - Merbivore (Michael Schwartz) - Merbivore soft (Michael Schwartz) - - Solarized dark/light (David Alan - Hjelle) + - Solarized dark/light (David Alan Hjelle) - Vibrant Ink (Michael Schwartz) * Small Features/Enhancements @@ -48,10 +91,8 @@ highlight are not affected (Irakli Gozalishvili) - Added setFontSize method - Improved vi keybindings (Trent Ogren) - - When unfocused make cursor transparent instead of removing it (Harutyun - Amirjanyan) - - Support for matching groups in tokenizer with arrays of tokens (Chris - Spencer) + - When unfocused make cursor transparent instead of removing it (Harutyun Amirjanyan) + - Support for matching groups in tokenizer with arrays of tokens (Chris Spencer) * Bug fixes - Add support for the new OSX scroll bars @@ -59,8 +100,7 @@ - Proper handling of unicode characters in JavaScript identifiers - Fix remove lines command on last line (Harutyun Amirjanyan) - Fix scroll wheel sluggishness in Safari - - Make keyboard infrastructure route keys like []^$ the right way (Julian - Viereck) + - Make keyboard infrastructure route keys like []^$ the right way (Julian Viereck) 2011.02.14, Version 0.1.6 diff --git a/lib/ace/keyboard/textinput.js b/lib/ace/keyboard/textinput.js index 0fe86f40..e41f3152 100644 --- a/lib/ace/keyboard/textinput.js +++ b/lib/ace/keyboard/textinput.js @@ -51,8 +51,10 @@ var TextInput = function(parentNode, host) { text.style.top = "-2em"; parentNode.insertBefore(text, parentNode.firstChild); - var PLACEHOLDER = useragent.isIE ? "\x01" : "\x01"; - sendText(); + var PLACEHOLDER = useragent.isIE ? "\x01" : "\x00"; + reset(true); + if (isFocused()) + host.onFocus(); var inCompostion = false; var copied = false; diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js index 276d77cc..4fbc3918 100644 --- a/lib/ace/mode/markdown_highlight_rules.js +++ b/lib/ace/mode/markdown_highlight_rules.js @@ -69,9 +69,9 @@ var MarkdownHighlightRules = function() { regex: "^\\-+(?=\\s*$)" }, { // header token : function(value) { - return "markup.heading." + value.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..4c828e49 --- /dev/null +++ b/lib/ace/mode/markdown_highlight_rules_test.js @@ -0,0 +1,100 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2012, Ajax.org B.V. + * All rights reserved. + * + * 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. + * + * 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. + * + * + * Contributor(s): + * + * quexer + * + * ***** 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; + 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; + 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; + 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(); +} diff --git a/package.json b/package.json index 1dfd461d..86b2fd8e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ace", "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE", - "version": "0.2.0", + "version": "1.0.0", "homepage" : "http://github.com/ajaxorg/ace", "engines": {"node": ">= 0.6.0"}, "author": "Fabian Jakobs ",