From 255bb498342640d4f36bfc12a268498edf2132ec Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Sat, 6 Oct 2012 11:42:32 -0700 Subject: [PATCH 01/11] Fix JS highlight rules --- lib/ace/mode/jade_highlight_rules.js | 32 ++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/lib/ace/mode/jade_highlight_rules.js b/lib/ace/mode/jade_highlight_rules.js index 41042038..d5a549fb 100644 --- a/lib/ace/mode/jade_highlight_rules.js +++ b/lib/ace/mode/jade_highlight_rules.js @@ -120,11 +120,11 @@ var JadeHighlightRules = function() { "token": [ "storage.type.function.jade", "entity.name.function.jade"], "regex": "^(\\s*mixin)( [\\w\\-]+)" }, - /* { + { "token": "source.js.embedded.jade", - "regex": "^\\s*-|=|!=", - "next": "js_code" - },*/ + "regex": "^\\s*(?:-|=|!=)", + "next": "js-start" + }, /*{ "token": "entity.name.tag.script.jade", "regex": "^\\s*script", @@ -219,7 +219,21 @@ var JadeHighlightRules = function() { "next": "start" } ], - "tag_attributes": [ + "tag_attributes": [ + { + "token" : "string", + "regex" : "'(?=.)", + "next" : "qstring" + }, + { + "token" : "string", + "regex" : '"(?=.)', + "next" : "qqstring" + }, + { + "token": "entity.other.attribute-name.jade", + "regex": "\\b[a-zA-Z\\-:]+" + }, { "token": ["entity.other.attribute-name.jade", "punctuation"], "regex": "\\b([a-zA-Z:\\.-]+)(=)", @@ -284,6 +298,12 @@ var JadeHighlightRules = function() { } ] }; + + this.embedRules(JavaScriptHighlightRules, "js-", [{ + token: "text", + regex: ".$", + next: "start" + }]); /* this.embedRules(MarkdownHighlightRules, "markdown-", [{ token : "support.function", @@ -324,4 +344,4 @@ var JadeHighlightRules = function() { oop.inherits(JadeHighlightRules, TextHighlightRules); exports.JadeHighlightRules = JadeHighlightRules; -}); \ No newline at end of file +}); From b61fe0c5a4d225257f6d55d977c4e9c9b08ed7e0 Mon Sep 17 00:00:00 2001 From: Adam Jimenez Date: Tue, 9 Oct 2012 14:59:53 +0200 Subject: [PATCH 02/11] Fix double click php var selects the $ sign #2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #654: double clicking php vars selects the $ sign  --- lib/ace/mode/php.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/ace/mode/php.js b/lib/ace/mode/php.js index 4ad75de4..aeea09c6 100644 --- a/lib/ace/mode/php.js +++ b/lib/ace/mode/php.js @@ -39,6 +39,7 @@ var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutd var Range = require("../range").Range; var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var CStyleFoldMode = require("./folding/cstyle").FoldMode; +var unicode = require("../unicode"); var Mode = function() { this.$tokenizer = new Tokenizer(new PhpHighlightRules().getRules()); @@ -50,6 +51,20 @@ oop.inherits(Mode, TextMode); (function() { + this.tokenRe = new RegExp("^[" + + unicode.packages.L + + unicode.packages.Mn + unicode.packages.Mc + + unicode.packages.Nd + + unicode.packages.Pc + "\_]+", "g" + ); + + this.nonTokenRe = new RegExp("^(?:[^" + + unicode.packages.L + + unicode.packages.Mn + unicode.packages.Mc + + unicode.packages.Nd + + unicode.packages.Pc + "\_]|\s])+", "g" + ); + this.toggleCommentLines = function(state, doc, startRow, endRow) { var outdent = true; var re = /^(\s*)#/; From 446556ea4f0783c68406cdc7efb1fbdfd53d70cc Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 15 Oct 2012 14:09:49 +0400 Subject: [PATCH 03/11] missing semicolon must show info not warning --- lib/ace/mode/javascript_worker.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ace/mode/javascript_worker.js b/lib/ace/mode/javascript_worker.js index 7e101281..27baa09f 100644 --- a/lib/ace/mode/javascript_worker.js +++ b/lib/ace/mode/javascript_worker.js @@ -143,6 +143,8 @@ oop.inherits(JavaScriptWorker, Mirror); if (maxErrorLevel == "error" && str && /[\w\d{(['"]/.test(str)) { error.reason = 'Missing ";" before statement'; type = "error"; + } else { + type = "info"; } } else if (disabledWarningsRe.test(raw)) { From 7fc1944c8bec8771400e93f11cb84ceff38f27f4 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 15 Oct 2012 14:20:51 +0400 Subject: [PATCH 04/11] 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, """).replace(/'/g, "’").replace(/ Date: Mon, 15 Oct 2012 15:24:37 +0200 Subject: [PATCH 05/11] Support console.log/error with non-array arguments --- lib/ace/worker/worker.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/ace/worker/worker.js b/lib/ace/worker/worker.js index 0e7270a3..9a258575 100644 --- a/lib/ace/worker/worker.js +++ b/lib/ace/worker/worker.js @@ -2,7 +2,12 @@ var console = { log: function(msgs) { - postMessage({type: "log", data: arguments.join(" ")}); + msgs = Array.prototype.slice.call(arguments, 0); + postMessage({type: "log", data: msgs}); + }, + error: function(msgs) { + msgs = Array.prototype.slice.call(arguments, 0); + postMessage({type: "log", data: msgs}); } }; var window = { From e2bd27a5591fbed6c2921a7d64775e48eaaf46af Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Mon, 15 Oct 2012 16:02:02 +0200 Subject: [PATCH 06/11] Fix break keyword highlighting --- lib/ace/mode/javascript_highlight_rules.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js index 9481cb20..bd6f020c 100644 --- a/lib/ace/mode/javascript_highlight_rules.js +++ b/lib/ace/mode/javascript_highlight_rules.js @@ -52,7 +52,7 @@ var JavaScriptHighlightRules = function() { "invalid.deprecated": "__parent__|__count__|escape|unescape|with|__proto__", "keyword": - "const|yield|import|get|set" + + "const|yield|import|get|set|" + "break|case|catch|continue|default|delete|do|else|finally|for|function|" + "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger", "storage.type": From 08bce08db5991f3ca22e4e48ba68f92ab5195d03 Mon Sep 17 00:00:00 2001 From: Mostafa Eweda Date: Mon, 15 Oct 2012 18:12:32 +0200 Subject: [PATCH 07/11] log multiple arguments support + Remove unused msgs argument --- lib/ace/worker/worker.js | 8 ++++---- lib/ace/worker/worker_client.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ace/worker/worker.js b/lib/ace/worker/worker.js index 9a258575..faf5624e 100644 --- a/lib/ace/worker/worker.js +++ b/lib/ace/worker/worker.js @@ -1,12 +1,12 @@ "no use strict"; var console = { - log: function(msgs) { - msgs = Array.prototype.slice.call(arguments, 0); + log: function() { + var msgs = Array.prototype.slice.call(arguments, 0); postMessage({type: "log", data: msgs}); }, - error: function(msgs) { - msgs = Array.prototype.slice.call(arguments, 0); + error: function() { + var msgs = Array.prototype.slice.call(arguments, 0); postMessage({type: "log", data: msgs}); } }; diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js index 79169ea4..d3b9c3c8 100644 --- a/lib/ace/worker/worker_client.js +++ b/lib/ace/worker/worker_client.js @@ -84,7 +84,7 @@ var WorkerClient = function(topLevelNamespaces, mod, classname) { var msg = e.data; switch(msg.type) { case "log": - window.console && console.log && console.log(msg.data); + window.console && console.log && console.log.apply(console, msg.data); break; case "event": From fd3307a3a6b8ea783890f0bdab3ce0f5cee5d67a Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Tue, 16 Oct 2012 13:17:15 -0700 Subject: [PATCH 08/11] Add new sites --- doc/site/images/sassmeister-logo.png | Bin 0 -> 6293 bytes doc/site/images/spandexio-logo.png | Bin 0 -> 10621 bytes index.html | 11 ++++++++--- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 doc/site/images/sassmeister-logo.png create mode 100644 doc/site/images/spandexio-logo.png diff --git a/doc/site/images/sassmeister-logo.png b/doc/site/images/sassmeister-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..7ecc8939a0f8716404d643aff813f0d7def9a130 GIT binary patch literal 6293 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 LNkvXXu0mjfeCpyU literal 0 HcmV?d00001 diff --git a/doc/site/images/spandexio-logo.png b/doc/site/images/spandexio-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..e2fdb79d56aea5a419deb8ae1a3b8cf36f5d43dc GIT binary patch literal 10621 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 Plunker
  • - - Kera.io + + SassMeister +
    • +
  • + + SpanDeX.io
  • Sky Edit From 90c918217a8d3f2fb06b0f55a707cc31f88c0f5b Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Tue, 16 Oct 2012 13:19:46 -0700 Subject: [PATCH 09/11] Add back missing site --- index.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/index.html b/index.html index cc787a72..d9f52317 100644 --- a/index.html +++ b/index.html @@ -499,6 +499,11 @@ tests for the highlighting.

    style="position: relative; left: 13px; top: -4px; width: 75px" /> Plunker
    • +
  • + + Kera.io +
  • From 4a949a5cb1bfb83a1862e549846e11fbf7ff9fae Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Wed, 17 Oct 2012 13:14:41 -0700 Subject: [PATCH 10/11] Update doc, fix #1041 --- lib/ace/edit_session.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js index d8578d03..a951afbb 100644 --- a/lib/ace/edit_session.js +++ b/lib/ace/edit_session.js @@ -318,7 +318,7 @@ var EditSession = function(text, mode) { }; /** - * EditSession.getSelection() -> String + * EditSession.getSelection() -> Selection * * Returns the string of the current selection. **/ @@ -349,11 +349,11 @@ var EditSession = function(text, mode) { }; /** - * EditSession.getTokenAt(row, column) -> Array + * EditSession.getTokenAt(row, column) -> Object * - row (Number): The row number to retrieve from * - column (Number): The column number to retrieve from * - * Returns an array of tokens at the indicated row and column. + * Returns an object indicating the token at the current row. THe object has two properties: `index` and `start`. **/ this.getTokenAt = function(row, column) { var tokens = this.bgTokenizer.getTokens(row); @@ -1204,8 +1204,8 @@ var EditSession = function(text, mode) { }; /** related to: Document.getTextRange - * EditSession.getTextRange(range) -> Array - * - range (String): The range to work with + * EditSession.getTextRange(range) -> String + * - range (Range): The range to work with * * {:Document.getTextRange.desc} **/ From 4fee6a40346171a30fa802143175ada5916e255f Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Wed, 17 Oct 2012 13:32:51 -0700 Subject: [PATCH 11/11] Update generated API content --- api/edit_session.html | 8 ++++---- doc/resources/ace/templates/layout.jade | 2 +- lib/ace/edit_session.js | 2 +- lib/ace/tokenizer_dev.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/edit_session.html b/api/edit_session.html index 64081b69..398d61c3 100644 --- a/api/edit_session.html +++ b/api/edit_session.html @@ -136,7 +136,7 @@

    Returns the value of the distance between the left of the editor and the leftmost part of the visible content.

      • EditSession.getScrollTop()

      Returns the value of the distance between the top of the editor and the topmost part of the visible content.

      Returns the value of the distance between the top of the editor and the topmost part of the visible content.

      -
        • EditSession.getSelection()

        Returns the string of the current selection.

        +

        Returns the string of the current selection.

        Returns the string of the current selection.

        Returns the state of tokenization at the end of a row.

        Returns the state of tokenization at the end of a row.

        @@ -147,9 +147,9 @@

        Returns the current value for tabs. If the user is using soft tabs, this will be a series of spaces (defined by getTabSize()); otherwise it's simply '\t'.

          • Related to:

        Given a range within the document, this function returns all the text within that range as a single string.

        Given a range within the document, this function returns all the text within that range as a single string.

        -

        Arguments

        rangeString

        Required. The range to work with

        -

        Returns an array of tokens at the indicated row and column.

        -

        Returns an array of tokens at the indicated row and column.

        +

        Arguments

        rangeRange

        Required. The range to work with

        +

        Returns an object indicating the token at the current row. The object has two properties: index and start.

        +

        Returns an object indicating the token at the current row. The object has two properties: index and start.

        Arguments

        rowNumber

        Required. The row number to retrieve from

        columnNumber

        Required. The column number to retrieve from

        Starts tokenizing at the row indicated. Returns a list of objects of the tokenized rows.

        diff --git a/doc/resources/ace/templates/layout.jade b/doc/resources/ace/templates/layout.jade index da6c2226..68864969 100644 --- a/doc/resources/ace/templates/layout.jade +++ b/doc/resources/ace/templates/layout.jade @@ -3,7 +3,7 @@ include lib #documentation.span8 -if (isIndex) - != content + != indexContent -else mixin api() diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js index a951afbb..a739b677 100644 --- a/lib/ace/edit_session.js +++ b/lib/ace/edit_session.js @@ -353,7 +353,7 @@ var EditSession = function(text, mode) { * - row (Number): The row number to retrieve from * - column (Number): The column number to retrieve from * - * Returns an object indicating the token at the current row. THe object has two properties: `index` and `start`. + * Returns an object indicating the token at the current row. The object has two properties: `index` and `start`. **/ this.getTokenAt = function(row, column) { var tokens = this.bgTokenizer.getTokens(row); diff --git a/lib/ace/tokenizer_dev.js b/lib/ace/tokenizer_dev.js index 53d6ea57..6022c4ae 100644 --- a/lib/ace/tokenizer_dev.js +++ b/lib/ace/tokenizer_dev.js @@ -30,7 +30,7 @@ define(function(require, exports, module) { -/** +/* * version of Tokenizer with additional logging * and infinite loop checks * can be used for developing/testing new modes