diff --git a/build b/build index c2f3abb2..6149ca6b 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit c2f3abb2ecd3287f90225d804132f0fd26cfb639 +Subproject commit 6149ca6b148e878d4c1341d4675ca3597d78dbdd diff --git a/lib/ace/keyboard/vim/maps/motions.js b/lib/ace/keyboard/vim/maps/motions.js index 227862b9..49b68d86 100644 --- a/lib/ace/keyboard/vim/maps/motions.js +++ b/lib/ace/keyboard/vim/maps/motions.js @@ -580,7 +580,7 @@ module.exports = { sel: function(editor, range, count, param) { keepScrollPosition(editor, editor.selectPageUp); } - }, + } }; module.exports.backspace = module.exports.left = module.exports.h; diff --git a/lib/ace/mode/diff_highlight_rules.js b/lib/ace/mode/diff_highlight_rules.js index cdb9df18..f232da31 100644 --- a/lib/ace/mode/diff_highlight_rules.js +++ b/lib/ace/mode/diff_highlight_rules.js @@ -74,14 +74,14 @@ var DiffHighlightRules = function() { "support.constant", "text", "invalid" - ], + ] }, { // removed "regex": "^([<\\-])(.*?)(\\s*)$", "token": [ "support.function", "string", "invalid" - ], + ] }, { "regex": "^(diff)(\\s+--\\w+)?(.+?)( .+)?$", "token": ["variable", "variable", "keyword", "variable"] diff --git a/lib/ace/mode/folding/pythonic_test.js b/lib/ace/mode/folding/pythonic_test.js index 04cbfdea..e30785b8 100644 --- a/lib/ace/mode/folding/pythonic_test.js +++ b/lib/ace/mode/folding/pythonic_test.js @@ -47,7 +47,7 @@ module.exports = { ']', '[ ', '{ ', - '[ #-', + '[ #-' ]); var mode = new PythonMode(); diff --git a/lib/ace/mode/jade_highlight_rules.js b/lib/ace/mode/jade_highlight_rules.js index 41042038..4f75b77f 100644 --- a/lib/ace/mode/jade_highlight_rules.js +++ b/lib/ace/mode/jade_highlight_rules.js @@ -82,7 +82,7 @@ var JadeHighlightRules = function() { }, { "token" : "punctuation.section.comment", - "regex" : "^\\s*\/\/(?:\\s*[^-\\s]|\\s+\\S)(?:.*$)", + "regex" : "^\\s*\/\/(?:\\s*[^-\\s]|\\s+\\S)(?:.*$)" }, { "token" : function(space, text) { diff --git a/lib/ace/mode/java_highlight_rules.js b/lib/ace/mode/java_highlight_rules.js index a37f9586..ab05fbde 100644 --- a/lib/ace/mode/java_highlight_rules.js +++ b/lib/ace/mode/java_highlight_rules.js @@ -55,8 +55,7 @@ var JavaHighlightRules = function() { "variable.language": "this", "keyword": keywords, "constant.language": buildinConstants, - "support.function": langClasses, - + "support.function": langClasses }, "identifier"); // regexp must not have capturing parentheses. Use (?:) instead. diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js index 3d35c075..9481cb20 100644 --- a/lib/ace/mode/javascript_highlight_rules.js +++ b/lib/ace/mode/javascript_highlight_rules.js @@ -286,7 +286,7 @@ var JavaScriptHighlightRules = function() { merge: true }, { token: "constant.language.escape", - regex: "-", + regex: "-" }, { token: "string.regexp.charachterclass", regex: /[^\]\-\\]+/, diff --git a/lib/ace/mode/latex_highlight_rules.js b/lib/ace/mode/latex_highlight_rules.js index e07024cb..3057c0de 100644 --- a/lib/ace/mode/latex_highlight_rules.js +++ b/lib/ace/mode/latex_highlight_rules.js @@ -9,7 +9,7 @@ var LatexHighlightRules = function() { "start" : [{ // A tex command e.g. \foo token : "keyword", - regex : "\\\\(?:[^a-zA-Z]|[a-zA-Z]+)", + regex : "\\\\(?:[^a-zA-Z]|[a-zA-Z]+)" }, { // Curly and square braces token : "lparen", diff --git a/lib/ace/mode/lua.js b/lib/ace/mode/lua.js index a8aefdba..efb3ffd1 100644 --- a/lib/ace/mode/lua.js +++ b/lib/ace/mode/lua.js @@ -51,7 +51,7 @@ oop.inherits(Mode, TextMode); "elseif": 1, "repeat": 1, "end": -1, - "until": -1, + "until": -1 }; var outdentKeywords = [ "else", diff --git a/lib/ace/mode/pgsql_highlight_rules.js b/lib/ace/mode/pgsql_highlight_rules.js index 5d167d93..c0a37cc2 100755 --- a/lib/ace/mode/pgsql_highlight_rules.js +++ b/lib/ace/mode/pgsql_highlight_rules.js @@ -404,7 +404,7 @@ var PgsqlHighlightRules = function() { var keywordMapper = this.createKeywordMapper({ "support.function": builtinFunctions, - "keyword": keywords, + "keyword": keywords }, "identifier", true); diff --git a/lib/ace/mode/scad_highlight_rules.js b/lib/ace/mode/scad_highlight_rules.js index 3bf4bf3a..6b98b283 100644 --- a/lib/ace/mode/scad_highlight_rules.js +++ b/lib/ace/mode/scad_highlight_rules.js @@ -40,7 +40,7 @@ var scadHighlightRules = function() { var keywordMapper = this.createKeywordMapper({ "variable.language": "this", "keyword": "module|if|else|for", - "constant.language": "NULL", + "constant.language": "NULL" }, "identifier"); // regexp must not have capturing parentheses. Use (?:) instead. diff --git a/lib/ace/mode/scala_highlight_rules.js b/lib/ace/mode/scala_highlight_rules.js index 2b905256..1277209f 100644 --- a/lib/ace/mode/scala_highlight_rules.js +++ b/lib/ace/mode/scala_highlight_rules.js @@ -126,7 +126,7 @@ var ScalaHighlightRules = function() { "string" : [ { token : "escape", - regex : '\\\\"', + regex : '\\\\"' }, { token : "string", merge : true, diff --git a/lib/ace/mode/sh_highlight_rules.js b/lib/ace/mode/sh_highlight_rules.js index d7e3185d..ebb9631a 100644 --- a/lib/ace/mode/sh_highlight_rules.js +++ b/lib/ace/mode/sh_highlight_rules.js @@ -92,7 +92,7 @@ var ShHighlightRules = function() { regex : variable }, { token : "support.function", - regex : func, + regex : func }, { token : "support.function", regex : fileDescriptor diff --git a/lib/ace/mode/svg_highlight_rules.js b/lib/ace/mode/svg_highlight_rules.js index 3d6d4161..ff03a8d3 100644 --- a/lib/ace/mode/svg_highlight_rules.js +++ b/lib/ace/mode/svg_highlight_rules.js @@ -41,7 +41,7 @@ var SvgHighlightRules = function() { this.$rules.start.splice(3, 0, { token : "meta.tag", - regex : "<(?=\s*script)", + regex : "<(?=script)", next : "script" }); diff --git a/lib/ace/search_test.js b/lib/ace/search_test.js index 942c1ec6..73d5e258 100644 --- a/lib/ace/search_test.js +++ b/lib/ace/search_test.js @@ -43,7 +43,7 @@ module.exports = { "test: configure the search object" : function() { var search = new Search(); search.set({ - needle: "juhu", + needle: "juhu" }); }, @@ -397,7 +397,7 @@ module.exports = { var search = new Search().set({ needle: "[ ]+$", regExp: true, - wrap: true, + wrap: true }); session.getSelection().moveCursorTo(1, 2); @@ -414,7 +414,7 @@ module.exports = { var search = new Search().set({ needle: "foo", wrap: true, - wholeWord: true, + wholeWord: true }); session.getSelection().moveCursorTo(0, 4); @@ -437,7 +437,7 @@ module.exports = { needle: "foo", wrap: true, wholeWord: true, - backwards: true, + backwards: true }); session.getSelection().moveCursorTo(0, 13); diff --git a/lib/ace/token_iterator_test.js b/lib/ace/token_iterator_test.js index 1b8a3b99..c7202e84 100644 --- a/lib/ace/token_iterator_test.js +++ b/lib/ace/token_iterator_test.js @@ -202,7 +202,7 @@ module.exports = { assert.equal(iterator.getCurrentToken().value, "for"); assert.equal(iterator.getCurrentTokenRow(), 1); assert.equal(iterator.getCurrentTokenColumn(), 4); - }, + } }; }); diff --git a/lib/ace/tokenizer_dev.js b/lib/ace/tokenizer_dev.js index 1972890f..53d6ea57 100644 --- a/lib/ace/tokenizer_dev.js +++ b/lib/ace/tokenizer_dev.js @@ -103,7 +103,7 @@ var Tokenizer = function(rules, flag) { var token = { type: null, value: "", - state: currentState, + state: currentState }; initState();