From 28e2ee832e7ec23e18a535e172d64b8f343a40e8 Mon Sep 17 00:00:00 2001 From: nightwing Date: Fri, 12 Feb 2016 02:52:29 +0400 Subject: [PATCH] update ace --- node_modules/ace/lib/ace/ace.js | 2 +- .../ace/lib/ace/autocomplete/popup.js | 5 +- node_modules/ace/lib/ace/editor.js | 12 +- node_modules/ace/lib/ace/ext/modelist.js | 5 +- node_modules/ace/lib/ace/keyboard/sublime.js | 4 +- .../ace/lib/ace/keyboard/textinput.js | 4 +- .../lib/ace/mode/_test/text_javascript.txt | 2 +- .../ace/lib/ace/mode/_test/tokens_abap.json | 24 ++ .../ace/lib/ace/mode/_test/tokens_haml.json | 192 ++++++++------- .../lib/ace/mode/_test/tokens_javascript.json | 2 +- .../ace/lib/ace/mode/_test/tokens_less.json | 56 +++-- .../ace/lib/ace/mode/_test/tokens_lua.json | 2 +- .../ace/lib/ace/mode/_test/tokens_mask.json | 2 +- .../lib/ace/mode/_test/tokens_objectivec.json | 14 +- .../lib/ace/mode/_test/tokens_vbscript.json | 108 ++++++--- .../ace/lib/ace/mode/abap_highlight_rules.js | 6 +- .../lib/ace/mode/c9search_highlight_rules.js | 39 ++- .../ace/lib/ace/mode/c_cpp_highlight_rules.js | 4 +- node_modules/ace/lib/ace/mode/css/csslint.js | 36 +-- node_modules/ace/lib/ace/mode/haml.js | 2 +- .../ace/lib/ace/mode/haml_highlight_rules.js | 49 ++-- .../ace/mode/javascript_highlight_rules.js | 8 +- .../ace/lib/ace/mode/less_highlight_rules.js | 18 +- .../ace/lib/ace/mode/lua_highlight_rules.js | 5 +- .../ace/mode/powershell_highlight_rules.js | 222 +++++++++++++----- node_modules/ace/lib/ace/mode/ruby.js | 2 +- .../ace/lib/ace/mode/text_highlight_rules.js | 19 +- .../lib/ace/mode/vbscript_highlight_rules.js | 121 ++++------ .../ace/lib/ace/mouse/mouse_handler.js | 6 +- node_modules/ace/lib/ace/placeholder.js | 2 +- node_modules/ace/lib/ace/undomanager.js | 6 + node_modules/ace/lib/ace/virtual_renderer.js | 13 +- 32 files changed, 599 insertions(+), 393 deletions(-) diff --git a/node_modules/ace/lib/ace/ace.js b/node_modules/ace/lib/ace/ace.js index 3c464b96..803f8379 100644 --- a/node_modules/ace/lib/ace/ace.js +++ b/node_modules/ace/lib/ace/ace.js @@ -126,5 +126,5 @@ exports.createEditSession = function(text, mode) { } exports.EditSession = EditSession; exports.UndoManager = UndoManager; -exports.version = "1.2.2"; +exports.version = "1.2.3"; }); diff --git a/node_modules/ace/lib/ace/autocomplete/popup.js b/node_modules/ace/lib/ace/autocomplete/popup.js index 925ea7ab..9a66bd40 100644 --- a/node_modules/ace/lib/ace/autocomplete/popup.js +++ b/node_modules/ace/lib/ace/autocomplete/popup.js @@ -260,12 +260,15 @@ var AcePopup = function(parentNode) { // var maxLines = Math.min(renderer.$maxLines, this.session.getLength()); var maxH = renderer.$maxLines * lineHeight * 1.4; var top = pos.top + this.$borderSize; - if (top + maxH > screenHeight - lineHeight && !topdownOnly) { + var allowTopdown = top > screenHeight / 2 && !topdownOnly; + if (allowTopdown && top + lineHeight + maxH > screenHeight) { + renderer.$maxPixelHeight = top - 2 * this.$borderSize; el.style.top = ""; el.style.bottom = screenHeight - top + "px"; popup.isTopdown = false; } else { top += lineHeight; + renderer.$maxPixelHeight = screenHeight - top - 0.2 * lineHeight; el.style.top = top + "px"; el.style.bottom = ""; popup.isTopdown = true; diff --git a/node_modules/ace/lib/ace/editor.js b/node_modules/ace/lib/ace/editor.js index d3984ca3..b130df22 100644 --- a/node_modules/ace/lib/ace/editor.js +++ b/node_modules/ace/lib/ace/editor.js @@ -1035,8 +1035,8 @@ var Editor = function(renderer, session) { }; /** - * Pass in `true` to enable overwrites in your session, or `false` to disable. If overwrites is enabled, any text you enter will type over any text after it. If the value of `overwrite` changes, this function also emites the `changeOverwrite` event. - * @param {Boolean} overwrite Defines wheter or not to set overwrites + * Pass in `true` to enable overwrites in your session, or `false` to disable. If overwrites is enabled, any text you enter will type over any text after it. If the value of `overwrite` changes, this function also emits the `changeOverwrite` event. + * @param {Boolean} overwrite Defines whether or not to set overwrites * * * @related EditSession.setOverwrite @@ -1833,7 +1833,7 @@ var Editor = function(renderer, session) { }; /** - * Returns the number of currently visibile rows. + * Returns the number of currently visible rows. * @returns {Number} **/ this.$getVisibleRowCount = function() { @@ -2179,7 +2179,7 @@ var Editor = function(renderer, session) { }; /** - * Moves the cursor to the specified line number, and also into the indiciated column. + * Moves the cursor to the specified line number, and also into the indicated column. * @param {Number} lineNumber The line number to go to * @param {Number} column A column number to go to * @param {Boolean} animate If `true` animates scolling @@ -2334,7 +2334,7 @@ var Editor = function(renderer, session) { }; /** - * Replaces the first occurance of `options.needle` with the value in `replacement`. + * Replaces the first occurrence of `options.needle` with the value in `replacement`. * @param {String} replacement The text to replace with * @param {Object} options The [[Search `Search`]] options to use * @@ -2361,7 +2361,7 @@ var Editor = function(renderer, session) { }; /** - * Replaces all occurances of `options.needle` with the value in `replacement`. + * Replaces all occurrences of `options.needle` with the value in `replacement`. * @param {String} replacement The text to replace with * @param {Object} options The [[Search `Search`]] options to use * diff --git a/node_modules/ace/lib/ace/ext/modelist.js b/node_modules/ace/lib/ace/ext/modelist.js index 5eba862b..fcd0b150 100644 --- a/node_modules/ace/lib/ace/ext/modelist.js +++ b/node_modules/ace/lib/ace/ext/modelist.js @@ -75,6 +75,7 @@ var supportedModes = { Elm: ["elm"], Erlang: ["erl|hrl"], Forth: ["frt|fs|ldr"], + Fortran: ["f|f90"], FTL: ["ftl"], Gcode: ["gcode"], Gherkin: ["feature"], @@ -135,8 +136,10 @@ var supportedModes = { Protobuf: ["proto"], Python: ["py"], R: ["r"], + Razor: ["cshtml"], RDoc: ["Rd"], RHTML: ["Rhtml"], + RST: ["rst"], Ruby: ["rb|ru|gemspec|rake|^Guardfile|^Rakefile|^Gemfile"], Rust: ["rs"], SASS: ["sass"], @@ -201,4 +204,4 @@ module.exports = { modesByName: modesByName }; -}); +}); diff --git a/node_modules/ace/lib/ace/keyboard/sublime.js b/node_modules/ace/lib/ace/keyboard/sublime.js index 006dc391..88b81871 100644 --- a/node_modules/ace/lib/ace/keyboard/sublime.js +++ b/node_modules/ace/lib/ace/keyboard/sublime.js @@ -33,7 +33,7 @@ var commandMap = { "commit_completion": false, "context_menu" : false, "decrease_font_size" : "smallerfont", - "increase_font_size" : "largerfont", + "increase_font_size" : "largerfont" // "copy" // "cut" // "delete_to_mark" @@ -259,7 +259,7 @@ function SublimeHandler() { keypad_plus: "+", keypad_enter: "numpadEnter", equals: "=", - plus: "+", + plus: "+" }; this.setKeyMap = function(keyMap) { diff --git a/node_modules/ace/lib/ace/keyboard/textinput.js b/node_modules/ace/lib/ace/keyboard/textinput.js index b6a3b8ae..cb6dc6b0 100644 --- a/node_modules/ace/lib/ace/keyboard/textinput.js +++ b/node_modules/ace/lib/ace/keyboard/textinput.js @@ -79,11 +79,11 @@ var TextInput = function(parentNode, host) { if (tempStyle) return text.focus(); var top = text.style.top; text.style.position = "fixed"; - text.style.top = "-1000px"; + text.style.top = "0px"; text.focus(); setTimeout(function() { text.style.position = ""; - if (text.style.top == "-1000px") + if (text.style.top == "0px") text.style.top = top; }, 0); }; diff --git a/node_modules/ace/lib/ace/mode/_test/text_javascript.txt b/node_modules/ace/lib/ace/mode/_test/text_javascript.txt index d65f3fb4..55940662 100644 --- a/node_modules/ace/lib/ace/mode/_test/text_javascript.txt +++ b/node_modules/ace/lib/ace/mode/_test/text_javascript.txt @@ -3,7 +3,7 @@ string.charCodeAt(23); document.getElementById('test'); console.log('Here it is' test: /**tokenize doc*/ comment /**tokenize doc comment with @tag {}*/ //test: tokenize parens - var line = "[{( )}]"; + var $line$ = "[{( )}]"; //test tokenize arithmetic expression which looks like a regexp a/b/c a/=b/c diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_abap.json b/node_modules/ace/lib/ace/mode/_test/tokens_abap.json index 95f2f811..2afe165d 100644 --- a/node_modules/ace/lib/ace/mode/_test/tokens_abap.json +++ b/node_modules/ace/lib/ace/mode/_test/tokens_abap.json @@ -186,4 +186,28 @@ ["keyword","END OF"], ["text"," I_VBRK"], ["keyword.operator","."] +],[ + "start" +],[ + "start", + ["keyword","SORT"], + ["text"," i_vbrk "], + ["keyword","BY"], + ["text"," vbeln "], + ["keyword","ASCENDING"], + ["keyword.operator","."] +],[ + "start", + ["keyword","SORT"], + ["text"," i_vbrk "], + ["keyword","BY"], + ["text"," vbeln "], + ["keyword","DESCENDING"], + ["keyword.operator","."] +],[ + "start" +],[ + "start", + ["keyword","RETURN"], + ["keyword.operator","."] ]] \ No newline at end of file diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_haml.json b/node_modules/ace/lib/ace/mode/_test/tokens_haml.json index 423c3bd5..2f6a3555 100644 --- a/node_modules/ace/lib/ace/mode/_test/tokens_haml.json +++ b/node_modules/ace/lib/ace/mode/_test/tokens_haml.json @@ -2,21 +2,39 @@ "start", ["keyword.other.doctype","!!!5"] ],[ - "start" + "tag_single" ],[ "start", - ["punctuation.section.comment","# "] + ["text","# "], + ["comment.xml",""] ],[ "start", - ["punctuation.section.comment","# "] + ["text","# "], + ["comment.xml",""] ],[ "start", - ["punctuation.section.comment","# "] + ["text","# "], + ["comment.xml",""] ],[ "start", - ["punctuation.section.comment","# "] + ["text","# "], + ["comment.xml",""], + ["text.xml"," "], + ["meta.tag.punctuation.tag-open.xml","<"], + ["meta.tag.tag-name.xml","html"], + ["text.tag-whitespace.xml"," "], + ["entity.other.attribute-name.xml","class"], + ["keyword.operator.attribute-equals.xml","="], + ["string.attribute-value.xml","\"no-js\""], + ["text.tag-whitespace.xml"," "], + ["entity.other.attribute-name.xml","lang"], + ["keyword.operator.attribute-equals.xml","="], + ["string.attribute-value.xml","\"en\""], + ["meta.tag.punctuation.tag-close.xml",">"], + ["text.xml"," "], + ["comment.xml",""] ],[ - "start" + "tag_single" ],[ "start" ],[ @@ -24,7 +42,7 @@ ["punctuation.section.comment","/adasdasdad"] ],[ "start", - ["entity.name.tag.haml","%div"], + ["meta.tag.haml","%div"], ["punctuation.section","{"], ["constant.other.symbol.ruby",":id"], ["text"," => "], @@ -43,10 +61,10 @@ ["punctuation.section.comment","/ file: app/views/movies/index.html.haml"] ],[ "start", - ["meta.escape.haml","\\d"] + ["character.escape.haml","\\d"] ],[ "start", - ["entity.name.tag.haml","%ads:"], + ["meta.tag.haml","%ads:"], ["punctuation.section","{"], ["constant.other.symbol.ruby",":bleh"], ["text"," => "], @@ -54,121 +72,123 @@ ["punctuation.section","}"] ],[ "embedded_ruby", - ["entity.name.tag.haml","%p"], - ["text","==ddd=="] + ["meta.tag.haml","%p"], + ["text","=="], + ["text.xml","ddd"], + ["text","=="] ],[ "start", - ["text"," Date/Time:"] + ["text"," "], + ["text.xml","Date/Time:"] ],[ "embedded_ruby", ["text"," - "], - ["identifier","now"], - ["text"," = "], + ["text.xml","now "], + ["text","= "], ["support.class","DateTime"], ["text","."], ["identifier","now"], ["text"," "] ],[ "start", - ["entity.name.tag.haml"," %strong"], - ["text","= now"] -],[ - "embedded_ruby", - ["text"," = "], - ["keyword","if"], - ["text"," "], - ["identifier","now"], ["text"," "], - ["support.class","DateTime"], - ["text","."], - ["identifier","parse"], - ["text","(\""], - ["support.class","December"], - ["text"," "], - ["constant.numeric","31"], - ["text",", "], - ["constant.numeric","2006"], - ["text","\")"] -],[ - "embedded_ruby", - ["text"," = \""], - ["support.class","Happy"], - ["text"," "], - ["identifier","new"], - ["text"," \" + \""], - ["identifier","year"], - ["text","!\""] + ["meta.tag.haml","%strong"], + ["text","= "], + ["text.xml","now"] ],[ "start", - ["entity.name.tag.haml","%sfd"], - ["entity.other.attribute-name.class.haml",".dfdfg"] -],[ - "start", - ["punctuation.section.comment","#content"] -],[ - "start", - ["text"," .title"] -],[ - "start", - ["entity.name.tag.haml"," %h1"], - ["text","= @title"] -],[ - "embedded_ruby", ["text"," = "], - ["support.function","link_to"], - ["text"," '"], - ["support.class","Home"], - ["text","', "], - ["identifier","home_url"] -],[ - "start" + ["text.xml","if now DateTime.parse("], + ["string","\"December 31, 2006\""], + ["text.xml",")"] ],[ "start", - ["punctuation.section.comment"," #contents"] + ["text"," = "], + ["string","\"Happy new \""], + ["text.xml"," + "], + ["string","\"year!\""] ],[ "start", - ["entity.name.tag.haml","%div"], - ["entity.other.attribute-name.id.haml","#content"] + ["meta.tag.haml","%sfd"], + ["keyword.attribute-name.class.haml",".dfdfg"] ],[ "start", - ["entity.name.tag.haml"," %div"], - ["entity.other.attribute-name.class.haml",".articles"] + ["keyword.attribute-name.id.haml","#content"] ],[ "start", - ["entity.name.tag.haml"," %div"], - ["entity.other.attribute-name.class.haml",".article.title"], - ["text"," Blah"] + ["text"," "], + ["keyword.attribute-name.class.haml",".title"] ],[ "start", - ["entity.name.tag.haml"," %div"], - ["entity.other.attribute-name.class.haml",".article.date"], + ["text"," "], + ["meta.tag.haml","%h1"], + ["text","= "], + ["text.xml","@title"] +],[ + "start", + ["text"," = "], + ["text.xml","link_to "], + ["string","'Home'"], + ["text.xml",", home_url"] +],[ + "tag_single" +],[ + "start", + ["text"," "], + ["text.xml"," #contents"] +],[ + "start", + ["meta.tag.haml","%div"], + ["keyword.attribute-name.id.haml","#content"] +],[ + "start", + ["text"," "], + ["meta.tag.haml","%div"], + ["keyword.attribute-name.class.haml",".articles"] +],[ + "start", + ["text"," "], + ["meta.tag.haml","%div"], + ["keyword.attribute-name.class.haml",".article.title"], + ["text"," "], + ["text.xml","Blah"] +],[ + "start", + ["text"," "], + ["meta.tag.haml","%div"], + ["keyword.attribute-name.class.haml",".article.date"], ["text"," "], ["constant.numeric","2006-11-05"] ],[ "start", - ["entity.name.tag.haml"," %div"], - ["entity.other.attribute-name.class.haml",".article.entry"] + ["text"," "], + ["meta.tag.haml","%div"], + ["keyword.attribute-name.class.haml",".article.entry"] ],[ "start", - ["text"," Neil Patrick Harris "] + ["text"," "], + ["text.xml","Neil Patrick Harris "] ],[ - "start" + "tag_single" ],[ "start", - ["entity.name.tag.haml","%div"], - ["text","[@user, "], - ["constant.other.symbol.ruby",":greeting"], - ["text","]"] -],[ - "start", - ["entity.name.tag.haml"," %bar"], + ["meta.tag.haml","%div"], ["text","["], - ["constant.numeric","290"], - ["text","]/"] + ["text.xml","@user, "], + ["constant.other.symbol.ruby",":greeting"], + ["text.xml","]"] ],[ "start", ["text"," "], - ["string.quoted.double","==Hello!=="] + ["meta.tag.haml","%bar"], + ["text","["], + ["constant.numeric","290"], + ["text.xml","]/"] +],[ + "embedded_ruby", + ["text"," =="], + ["text.xml","Hello!"], + ["text","=="] ],[ "start" ]] \ No newline at end of file diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json b/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json index 388c2639..1e8ef34c 100644 --- a/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json +++ b/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json @@ -48,7 +48,7 @@ ["text"," "], ["storage.type","var"], ["text"," "], - ["identifier","line"], + ["identifier","$line$"], ["text"," "], ["keyword.operator","="], ["text"," "], diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_less.json b/node_modules/ace/lib/ace/mode/_test/tokens_less.json index 6c3936e4..5e7f60bf 100644 --- a/node_modules/ace/lib/ace/mode/_test/tokens_less.json +++ b/node_modules/ace/lib/ace/mode/_test/tokens_less.json @@ -12,7 +12,7 @@ ],[ "start" ],[ - "ruleset", + "start", ["variable.language",".box-shadow"], ["paren.lparen","("], ["variable","@style"], @@ -27,9 +27,10 @@ ["paren.lparen","("], ["variable","@c"], ["paren.rparen","))"], - ["paren.lparen"," {"] + ["text"," "], + ["paren.lparen","{"] ],[ - "ruleset", + "start", ["text"," "], ["support.type.property","box-shadow"], ["text",":"], @@ -39,7 +40,7 @@ ["variable","@c"], ["text",";"] ],[ - "ruleset", + "start", ["text"," "], ["support.type.unknownProperty","-webkit-box-shadow"], ["text",":"], @@ -49,7 +50,7 @@ ["variable","@c"], ["text",";"] ],[ - "ruleset", + "start", ["text"," "], ["support.type.unknownProperty","-moz-box-shadow"], ["text",":"], @@ -62,7 +63,7 @@ "start", ["paren.rparen","}"] ],[ - "ruleset", + "start", ["variable.language",".box-shadow"], ["paren.lparen","("], ["variable","@style"], @@ -80,9 +81,10 @@ ["paren.lparen","("], ["variable","@alpha"], ["paren.rparen","))"], - ["paren.lparen"," {"] + ["text"," "], + ["paren.lparen","{"] ],[ - "ruleset", + "start", ["text"," "], ["variable.language",".box-shadow"], ["paren.lparen","("], @@ -108,12 +110,13 @@ "start", ["comment","// Box styles"] ],[ - "ruleset", + "start", ["variable.language",".box"], - ["paren.lparen"," {"], + ["text"," "], + ["paren.lparen","{"], ["text"," "] ],[ - "ruleset", + "start", ["text"," "], ["support.type.property","color"], ["text",":"], @@ -127,7 +130,7 @@ ["paren.rparen",")"], ["text",";"] ],[ - "ruleset", + "start", ["text"," "], ["support.type.property","border-color"], ["text",":"], @@ -141,13 +144,14 @@ ["paren.rparen",")"], ["text",";"] ],[ - "ruleset", + "start", ["text"," "] ],[ - "ruleset", + "start", ["text"," "], ["identifier","div"], - ["paren.lparen"," {"], + ["text"," "], + ["paren.lparen","{"], ["text"," "], ["variable.language",".box-shadow"], ["paren.lparen","("], @@ -164,15 +168,16 @@ ["text"," "], ["paren.rparen","}"] ],[ - "ruleset", + "start", ["text"," "] ],[ - ["ruleset","ruleset"], + "start", ["text"," "], ["identifier","a"], - ["paren.lparen"," {"] + ["text"," "], + ["paren.lparen","{"] ],[ - ["ruleset","ruleset"], + "start", ["text"," "], ["support.type.property","color"], ["text",":"], @@ -180,16 +185,17 @@ ["variable","@base"], ["text",";"] ],[ - ["ruleset","ruleset"], + "start", ["text"," "] ],[ - ["ruleset","ruleset","ruleset","ruleset"], + "start", ["text"," "], ["keyword","&"], ["variable.language",":hover"], - ["paren.lparen"," {"] + ["text"," "], + ["paren.lparen","{"] ],[ - ["ruleset","ruleset","ruleset","ruleset"], + "start", ["text"," "], ["support.type.property","color"], ["text",":"], @@ -203,11 +209,11 @@ ["paren.rparen",")"], ["text",";"] ],[ - ["ruleset","ruleset"], + "start", ["text"," "], ["paren.rparen","}"] ],[ - "ruleset", + "start", ["text"," "], ["paren.rparen","}"] ],[ diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_lua.json b/node_modules/ace/lib/ace/mode/_test/tokens_lua.json index b60c7cb1..2a02e584 100644 --- a/node_modules/ace/lib/ace/mode/_test/tokens_lua.json +++ b/node_modules/ace/lib/ace/mode/_test/tokens_lua.json @@ -315,7 +315,7 @@ ["paren.lparen","("], ["constant.library","table"], ["text","."], - ["invalid.deprecated","maxn"], + ["keyword.deprecated","maxn"], ["paren.lparen","{"], ["constant.numeric","1"], ["text",","], diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_mask.json b/node_modules/ace/lib/ace/mode/_test/tokens_mask.json index 5f2b9762..058bebb5 100644 --- a/node_modules/ace/lib/ace/mode/_test/tokens_mask.json +++ b/node_modules/ace/lib/ace/mode/_test/tokens_mask.json @@ -262,7 +262,7 @@ ["text"," "], ["keyword.operator","="], ["text"," "], - ["paren","{"] + ["paren.lparen","{"] ],[ ["#tmp","js-statement-no_regex","start","js-statement-no_regex","constant.language53","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"], ["text"," "], diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_objectivec.json b/node_modules/ace/lib/ace/mode/_test/tokens_objectivec.json index 9d86bf82..c50da438 100644 --- a/node_modules/ace/lib/ace/mode/_test/tokens_objectivec.json +++ b/node_modules/ace/lib/ace/mode/_test/tokens_objectivec.json @@ -325,19 +325,19 @@ "start", ["text"," "], ["storage.type.objc","IBOutlet"], - ["text","|"], + ["keyword.operator","|"], ["storage.type.objc","IBAction"], - ["text","|"], + ["keyword.operator","|"], ["storage.type.objc","BOOL"], - ["text","|"], + ["keyword.operator","|"], ["storage.type.objc","SEL"], - ["text","|"], + ["keyword.operator","|"], ["storage.type.id.objc","id"], - ["text","|"], + ["keyword.operator","|"], ["storage.type.objc","unichar"], - ["text","|"], + ["keyword.operator","|"], ["storage.type.objc","IMP"], - ["text","|"], + ["keyword.operator","|"], ["storage.type.objc","Class"], ["text"," "] ],[ diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_vbscript.json b/node_modules/ace/lib/ace/mode/_test/tokens_vbscript.json index 05d5dd22..b06c245b 100644 --- a/node_modules/ace/lib/ace/mode/_test/tokens_vbscript.json +++ b/node_modules/ace/lib/ace/mode/_test/tokens_vbscript.json @@ -1,13 +1,16 @@ [[ "start", - ["text","myfilename "], + ["identifier","myfilename"], + ["text"," "], ["keyword.operator.asp","="], ["text"," "], ["punctuation.definition.string.begin.asp","\""], ["string.quoted.double.asp","C:\\Wikipedia - VBScript - Example - Hello World.txt\""] ],[ "start", - ["text","MakeHelloWorldFile myfilename"] + ["identifier","MakeHelloWorldFile"], + ["text"," "], + ["identifier","myfilename"] ],[ "state_4", ["meta.leading-space"," "] @@ -29,10 +32,12 @@ ["meta.odd-tab.spaces"," "], ["meta.leading-space"," "], ["storage.type.asp","Set"], - ["text"," FSO "], + ["text"," "], + ["identifier","FSO"], + ["text"," "], ["keyword.operator.asp","="], ["text"," "], - ["support.function.asp","CreateObject"], + ["support.function.vb.asp","CreateObject"], ["text","("], ["punctuation.definition.string.begin.asp","\""], ["string.quoted.double.asp","Scripting.FileSystemObject\""], @@ -42,9 +47,13 @@ ["meta.odd-tab.spaces"," "], ["meta.leading-space"," "], ["keyword.control.asp","If"], - ["text"," FSO."], - ["entity.name.function.asp","FileExists"], - ["text","(FileName) "], + ["text"," "], + ["identifier","FSO"], + ["text","."], + ["identifier","FileExists"], + ["text","("], + ["identifier","FileName"], + ["text",") "], ["keyword.control.asp","Then"], ["text"," "] ],[ @@ -52,7 +61,8 @@ ["meta.odd-tab.spaces"," "], ["meta.even-tab.spaces"," "], ["meta.odd-tab.spaces"," "], - ["text","Answer "], + ["identifier","Answer"], + ["text"," "], ["keyword.operator.asp","="], ["text"," "], ["support.function.vb.asp","MsgBox"], @@ -61,12 +71,16 @@ ["string.quoted.double.asp","File \""], ["text"," "], ["keyword.operator.asp","&"], - ["text"," FileName "], + ["text"," "], + ["identifier","FileName"], + ["text"," "], ["keyword.operator.asp","&"], ["text"," "], ["punctuation.definition.string.begin.asp","\""], ["string.quoted.double.asp"," exists ... OK to overwrite?\""], - ["text",", vbOKCancel)"] + ["text",", "], + ["identifier","vbOKCancel"], + ["text",")"] ],[ "start", ["meta.odd-tab.spaces"," "], @@ -87,12 +101,18 @@ ["meta.even-tab.spaces"," "], ["meta.odd-tab.spaces"," "], ["keyword.control.asp","If"], - ["text"," Answer "], + ["text"," "], + ["identifier","Answer"], + ["text"," "], ["keyword.operator.asp","<>"], - ["text"," vbOK "], + ["text"," "], + ["identifier","vbOK"], + ["text"," "], ["keyword.control.asp","Then"], ["text"," "], - ["keyword.control.asp","Exit Sub"] + ["keyword.control.asp","Exit"], + ["text"," "], + ["keyword.control.asp","Sub"] ],[ "start", ["meta.odd-tab.spaces"," "], @@ -110,7 +130,8 @@ ["meta.odd-tab.spaces"," "], ["meta.even-tab.spaces"," "], ["meta.odd-tab.spaces"," "], - ["text","Answer "], + ["identifier","Answer"], + ["text"," "], ["keyword.operator.asp","="], ["text"," "], ["support.function.vb.asp","MsgBox"], @@ -119,29 +140,41 @@ ["string.quoted.double.asp","File \""], ["text"," "], ["keyword.operator.asp","&"], - ["text"," FileName "], + ["text"," "], + ["identifier","FileName"], + ["text"," "], ["keyword.operator.asp","&"], ["text"," "], ["punctuation.definition.string.begin.asp","\""], ["string.quoted.double.asp"," ... OK to create?\""], - ["text",", vbOKCancel)"] + ["text",", "], + ["identifier","vbOKCancel"], + ["text",")"] ],[ "start", ["meta.odd-tab.spaces"," "], ["meta.even-tab.spaces"," "], ["meta.odd-tab.spaces"," "], ["keyword.control.asp","If"], - ["text"," Answer "], + ["text"," "], + ["identifier","Answer"], + ["text"," "], ["keyword.operator.asp","<>"], - ["text"," vbOK "], + ["text"," "], + ["identifier","vbOK"], + ["text"," "], ["keyword.control.asp","Then"], ["text"," "], - ["keyword.control.asp","Exit Sub"] + ["keyword.control.asp","Exit"], + ["text"," "], + ["keyword.control.asp","Sub"] ],[ "start", ["meta.odd-tab.spaces"," "], ["meta.leading-space"," "], - ["keyword.control.asp","End If"] + ["keyword.control.asp","End"], + ["text"," "], + ["keyword.control.asp","If"] ],[ "start", ["meta.odd-tab.spaces"," "], @@ -153,14 +186,25 @@ ["meta.odd-tab.spaces"," "], ["meta.leading-space"," "], ["storage.type.asp","Set"], - ["text"," FileObject "], + ["text"," "], + ["identifier","FileObject"], + ["text"," "], ["keyword.operator.asp","="], - ["text"," FSO.CreateTextFile (FileName)"] + ["text"," "], + ["identifier","FSO"], + ["text","."], + ["identifier","CreateTextFile"], + ["text"," ("], + ["identifier","FileName"], + ["text",")"] ],[ "start", ["meta.odd-tab.spaces"," "], ["meta.leading-space"," "], - ["text","FileObject.WriteLine "], + ["identifier","FileObject"], + ["text","."], + ["identifier","WriteLine"], + ["text"," "], ["punctuation.definition.string.begin.asp","\""], ["string.quoted.double.asp","Time ... \""], ["text"," "], @@ -172,15 +216,19 @@ "start", ["meta.odd-tab.spaces"," "], ["meta.leading-space"," "], - ["text","FileObject.WriteLine "], + ["identifier","FileObject"], + ["text","."], + ["identifier","WriteLine"], + ["text"," "], ["punctuation.definition.string.begin.asp","\""], ["string.quoted.double.asp","Hello World\""] ],[ "start", ["meta.odd-tab.spaces"," "], ["meta.leading-space"," "], - ["text","FileObject."], - ["entity.name.function.asp","Close"], + ["identifier","FileObject"], + ["text","."], + ["identifier","Close"], ["text","()"] ],[ "start", @@ -192,12 +240,16 @@ ["string.quoted.double.asp","File \""], ["text"," "], ["keyword.operator.asp","&"], - ["text"," FileName "], + ["text"," "], + ["identifier","FileName"], + ["text"," "], ["keyword.operator.asp","&"], ["text"," "], ["punctuation.definition.string.begin.asp","\""], ["string.quoted.double.asp"," ... updated.\""] ],[ "start", - ["storage.type.asp","End Sub"] + ["keyword.control.asp","End"], + ["text"," "], + ["keyword.control.asp","Sub"] ]] \ No newline at end of file diff --git a/node_modules/ace/lib/ace/mode/abap_highlight_rules.js b/node_modules/ace/lib/ace/mode/abap_highlight_rules.js index bab1e504..1a0aa963 100644 --- a/node_modules/ace/lib/ace/mode/abap_highlight_rules.js +++ b/node_modules/ace/lib/ace/mode/abap_highlight_rules.js @@ -48,9 +48,9 @@ var AbapHighlightRules = function() { var keywordMapper = this.createKeywordMapper({ "variable.language": "this", "keyword": - "ADD ALIAS ALIASES ASSERT ASSIGN ASSIGNING AT BACK" + + "ADD ALIAS ALIASES ASCENDING ASSERT ASSIGN ASSIGNING AT BACK" + " CALL CASE CATCH CHECK CLASS CLEAR CLOSE CNT COLLECT COMMIT COMMUNICATION COMPUTE CONCATENATE CONDENSE CONSTANTS CONTINUE CONTROLS CONVERT CREATE CURRENCY" + - " DATA DEFINE DEFINITION DEFERRED DELETE DESCRIBE DETAIL DIVIDE DO" + + " DATA DEFINE DEFINITION DEFERRED DELETE DESCENDING DESCRIBE DETAIL DIVIDE DO" + " ELSE ELSEIF ENDAT ENDCASE ENDCLASS ENDDO ENDEXEC ENDFORM ENDFUNCTION ENDIF ENDIFEND ENDINTERFACE ENDLOOP ENDMETHOD ENDMODULE ENDON ENDPROVIDE ENDSELECT ENDTRY ENDWHILE EVENT EVENTS EXEC EXIT EXPORT EXPORTING EXTRACT" + " FETCH FIELDS FORM FORMAT FREE FROM FUNCTION" + " GENERATE GET" + @@ -60,7 +60,7 @@ var AbapHighlightRules = function() { " MESSAGE METHOD METHODS MODIFY MODULE MOVE MULTIPLY" + " ON OVERLAY OPTIONAL OTHERS" + " PACK PARAMETERS PERFORM POSITION PROGRAM PROVIDE PUT" + - " RAISE RANGES READ RECEIVE RECEIVING REDEFINITION REFERENCE REFRESH REJECT REPLACE REPORT RESERVE RESTORE RETURNING ROLLBACK" + + " RAISE RANGES READ RECEIVE RECEIVING REDEFINITION REFERENCE REFRESH REJECT REPLACE REPORT RESERVE RESTORE RETURN RETURNING ROLLBACK" + " SCAN SCROLL SEARCH SELECT SET SHIFT SKIP SORT SORTED SPLIT STANDARD STATICS STEP STOP SUBMIT SUBTRACT SUM SUMMARY SUPPRESS" + " TABLES TIMES TRANSFER TRANSLATE TRY TYPE TYPES" + " UNASSIGN ULINE UNPACK UPDATE" + diff --git a/node_modules/ace/lib/ace/mode/c9search_highlight_rules.js b/node_modules/ace/lib/ace/mode/c9search_highlight_rules.js index 43ec4bf8..df8c4be5 100644 --- a/node_modules/ace/lib/ace/mode/c9search_highlight_rules.js +++ b/node_modules/ace/lib/ace/mode/c9search_highlight_rules.js @@ -49,20 +49,26 @@ var C9SearchHighlightRules = function() { "start" : [ { tokenNames : ["c9searchresults.constant.numeric", "c9searchresults.text", "c9searchresults.text", "c9searchresults.keyword"], - regex : "(^\\s+[0-9]+)(:\\s)(.+)", + regex : /(^\s+[0-9]+)(:)(\d*\s?)([^\r\n]+)/, onMatch : function(val, state, stack) { var values = this.splitRegex.exec(val); var types = this.tokenNames; var tokens = [{ type: types[0], value: values[1] - },{ + }, { type: types[1], value: values[2] }]; + if (values[3]) { + if (values[3] == " ") + tokens[1] = { type: types[1], value: values[2] + " " }; + else + tokens.push({ type: types[1], value: values[3] }); + } var regex = stack[1]; - var str = values[3]; + var str = values[4]; var m; var last = 0; @@ -85,11 +91,7 @@ var C9SearchHighlightRules = function() { } }, { - token : ["string", "text"], // single line - regex : "(\\S.*)(:$)" - }, - { - regex : "Searching for .*$", + regex : "^Searching for [^\\r\\n]*$", onMatch: function(val, state, stack) { var parts = val.split("\x01"); if (parts.length < 3) @@ -168,11 +170,26 @@ var C9SearchHighlightRules = function() { } }, { - regex : "\\d+", - token: "constant.numeric" + regex : "^(?=Found \\d+ matches)", + token : "text", + next : "numbers" + }, + { + token : "string", // single line + regex : "^\\S:?[^:]+", + next : "numbers" } - ] + ], + numbers:[{ + regex : "\\d+", + token : "constant.numeric" + }, { + regex : "$", + token : "text", + next : "start" + }] }; + this.normalizeRules(); }; oop.inherits(C9SearchHighlightRules, TextHighlightRules); diff --git a/node_modules/ace/lib/ace/mode/c_cpp_highlight_rules.js b/node_modules/ace/lib/ace/mode/c_cpp_highlight_rules.js index ca817b4d..3b662289 100644 --- a/node_modules/ace/lib/ace/mode/c_cpp_highlight_rules.js +++ b/node_modules/ace/lib/ace/mode/c_cpp_highlight_rules.js @@ -107,10 +107,10 @@ var c_cppHighlightRules = function() { regex : cFunctions }, { token : keywordMapper, - regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b" + regex : "[a-zA-Z_$][a-zA-Z0-9_$]*" }, { token : "keyword.operator", - regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)" + regex : /--|\+\+|<<=|>>=|>>>=|<>|&&|\|\||\?:|[*%\/+\-&\^|~!<>=]=?/ }, { token : "punctuation.operator", regex : "\\?|\\:|\\,|\\;|\\." diff --git a/node_modules/ace/lib/ace/mode/css/csslint.js b/node_modules/ace/lib/ace/mode/css/csslint.js index c3c79a80..635c481b 100644 --- a/node_modules/ace/lib/ace/mode/css/csslint.js +++ b/node_modules/ace/lib/ace/mode/css/csslint.js @@ -2812,7 +2812,7 @@ Parser.prototype = function(){ var tokenStream = this._tokenStream, values = [], - //valueParts = [], + //valueParts = [], value = null, operator = null; @@ -2829,9 +2829,9 @@ Parser.prototype = function(){ values.push(operator); } /*else { //if there's not an operator, you have a full value - values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col)); - valueParts = []; - }*/ + values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col)); + valueParts = []; + }*/ value = this._term(inFunction); @@ -2843,7 +2843,7 @@ Parser.prototype = function(){ } while(true); } - //cleanup + //cleanup /*if (valueParts.length){ values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col)); }*/ @@ -3558,7 +3558,7 @@ var Properties = { "alignment-baseline" : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical", "animation" : 1, "animation-delay" : { multi: "