remove trailing commas
This commit is contained in:
parent
b28cf374be
commit
d03889b01e
17 changed files with 21 additions and 22 deletions
2
build
2
build
|
|
@ -1 +1 @@
|
||||||
Subproject commit c2f3abb2ecd3287f90225d804132f0fd26cfb639
|
Subproject commit 6149ca6b148e878d4c1341d4675ca3597d78dbdd
|
||||||
|
|
@ -580,7 +580,7 @@ module.exports = {
|
||||||
sel: function(editor, range, count, param) {
|
sel: function(editor, range, count, param) {
|
||||||
keepScrollPosition(editor, editor.selectPageUp);
|
keepScrollPosition(editor, editor.selectPageUp);
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports.backspace = module.exports.left = module.exports.h;
|
module.exports.backspace = module.exports.left = module.exports.h;
|
||||||
|
|
|
||||||
|
|
@ -74,14 +74,14 @@ var DiffHighlightRules = function() {
|
||||||
"support.constant",
|
"support.constant",
|
||||||
"text",
|
"text",
|
||||||
"invalid"
|
"invalid"
|
||||||
],
|
]
|
||||||
}, { // removed
|
}, { // removed
|
||||||
"regex": "^([<\\-])(.*?)(\\s*)$",
|
"regex": "^([<\\-])(.*?)(\\s*)$",
|
||||||
"token": [
|
"token": [
|
||||||
"support.function",
|
"support.function",
|
||||||
"string",
|
"string",
|
||||||
"invalid"
|
"invalid"
|
||||||
],
|
]
|
||||||
}, {
|
}, {
|
||||||
"regex": "^(diff)(\\s+--\\w+)?(.+?)( .+)?$",
|
"regex": "^(diff)(\\s+--\\w+)?(.+?)( .+)?$",
|
||||||
"token": ["variable", "variable", "keyword", "variable"]
|
"token": ["variable", "variable", "keyword", "variable"]
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ module.exports = {
|
||||||
']',
|
']',
|
||||||
'[ ',
|
'[ ',
|
||||||
'{ ',
|
'{ ',
|
||||||
'[ #-',
|
'[ #-'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
var mode = new PythonMode();
|
var mode = new PythonMode();
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@ var JadeHighlightRules = function() {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"token" : "punctuation.section.comment",
|
"token" : "punctuation.section.comment",
|
||||||
"regex" : "^\\s*\/\/(?:\\s*[^-\\s]|\\s+\\S)(?:.*$)",
|
"regex" : "^\\s*\/\/(?:\\s*[^-\\s]|\\s+\\S)(?:.*$)"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"token" : function(space, text) {
|
"token" : function(space, text) {
|
||||||
|
|
|
||||||
|
|
@ -55,8 +55,7 @@ var JavaHighlightRules = function() {
|
||||||
"variable.language": "this",
|
"variable.language": "this",
|
||||||
"keyword": keywords,
|
"keyword": keywords,
|
||||||
"constant.language": buildinConstants,
|
"constant.language": buildinConstants,
|
||||||
"support.function": langClasses,
|
"support.function": langClasses
|
||||||
|
|
||||||
}, "identifier");
|
}, "identifier");
|
||||||
|
|
||||||
// regexp must not have capturing parentheses. Use (?:) instead.
|
// regexp must not have capturing parentheses. Use (?:) instead.
|
||||||
|
|
|
||||||
|
|
@ -286,7 +286,7 @@ var JavaScriptHighlightRules = function() {
|
||||||
merge: true
|
merge: true
|
||||||
}, {
|
}, {
|
||||||
token: "constant.language.escape",
|
token: "constant.language.escape",
|
||||||
regex: "-",
|
regex: "-"
|
||||||
}, {
|
}, {
|
||||||
token: "string.regexp.charachterclass",
|
token: "string.regexp.charachterclass",
|
||||||
regex: /[^\]\-\\]+/,
|
regex: /[^\]\-\\]+/,
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ var LatexHighlightRules = function() {
|
||||||
"start" : [{
|
"start" : [{
|
||||||
// A tex command e.g. \foo
|
// A tex command e.g. \foo
|
||||||
token : "keyword",
|
token : "keyword",
|
||||||
regex : "\\\\(?:[^a-zA-Z]|[a-zA-Z]+)",
|
regex : "\\\\(?:[^a-zA-Z]|[a-zA-Z]+)"
|
||||||
}, {
|
}, {
|
||||||
// Curly and square braces
|
// Curly and square braces
|
||||||
token : "lparen",
|
token : "lparen",
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ oop.inherits(Mode, TextMode);
|
||||||
"elseif": 1,
|
"elseif": 1,
|
||||||
"repeat": 1,
|
"repeat": 1,
|
||||||
"end": -1,
|
"end": -1,
|
||||||
"until": -1,
|
"until": -1
|
||||||
};
|
};
|
||||||
var outdentKeywords = [
|
var outdentKeywords = [
|
||||||
"else",
|
"else",
|
||||||
|
|
|
||||||
|
|
@ -404,7 +404,7 @@ var PgsqlHighlightRules = function() {
|
||||||
|
|
||||||
var keywordMapper = this.createKeywordMapper({
|
var keywordMapper = this.createKeywordMapper({
|
||||||
"support.function": builtinFunctions,
|
"support.function": builtinFunctions,
|
||||||
"keyword": keywords,
|
"keyword": keywords
|
||||||
}, "identifier", true);
|
}, "identifier", true);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ var scadHighlightRules = function() {
|
||||||
var keywordMapper = this.createKeywordMapper({
|
var keywordMapper = this.createKeywordMapper({
|
||||||
"variable.language": "this",
|
"variable.language": "this",
|
||||||
"keyword": "module|if|else|for",
|
"keyword": "module|if|else|for",
|
||||||
"constant.language": "NULL",
|
"constant.language": "NULL"
|
||||||
}, "identifier");
|
}, "identifier");
|
||||||
|
|
||||||
// regexp must not have capturing parentheses. Use (?:) instead.
|
// regexp must not have capturing parentheses. Use (?:) instead.
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,7 @@ var ScalaHighlightRules = function() {
|
||||||
"string" : [
|
"string" : [
|
||||||
{
|
{
|
||||||
token : "escape",
|
token : "escape",
|
||||||
regex : '\\\\"',
|
regex : '\\\\"'
|
||||||
}, {
|
}, {
|
||||||
token : "string",
|
token : "string",
|
||||||
merge : true,
|
merge : true,
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ var ShHighlightRules = function() {
|
||||||
regex : variable
|
regex : variable
|
||||||
}, {
|
}, {
|
||||||
token : "support.function",
|
token : "support.function",
|
||||||
regex : func,
|
regex : func
|
||||||
}, {
|
}, {
|
||||||
token : "support.function",
|
token : "support.function",
|
||||||
regex : fileDescriptor
|
regex : fileDescriptor
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ var SvgHighlightRules = function() {
|
||||||
|
|
||||||
this.$rules.start.splice(3, 0, {
|
this.$rules.start.splice(3, 0, {
|
||||||
token : "meta.tag",
|
token : "meta.tag",
|
||||||
regex : "<(?=\s*script)",
|
regex : "<(?=script)",
|
||||||
next : "script"
|
next : "script"
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ module.exports = {
|
||||||
"test: configure the search object" : function() {
|
"test: configure the search object" : function() {
|
||||||
var search = new Search();
|
var search = new Search();
|
||||||
search.set({
|
search.set({
|
||||||
needle: "juhu",
|
needle: "juhu"
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -397,7 +397,7 @@ module.exports = {
|
||||||
var search = new Search().set({
|
var search = new Search().set({
|
||||||
needle: "[ ]+$",
|
needle: "[ ]+$",
|
||||||
regExp: true,
|
regExp: true,
|
||||||
wrap: true,
|
wrap: true
|
||||||
});
|
});
|
||||||
|
|
||||||
session.getSelection().moveCursorTo(1, 2);
|
session.getSelection().moveCursorTo(1, 2);
|
||||||
|
|
@ -414,7 +414,7 @@ module.exports = {
|
||||||
var search = new Search().set({
|
var search = new Search().set({
|
||||||
needle: "foo",
|
needle: "foo",
|
||||||
wrap: true,
|
wrap: true,
|
||||||
wholeWord: true,
|
wholeWord: true
|
||||||
});
|
});
|
||||||
|
|
||||||
session.getSelection().moveCursorTo(0, 4);
|
session.getSelection().moveCursorTo(0, 4);
|
||||||
|
|
@ -437,7 +437,7 @@ module.exports = {
|
||||||
needle: "foo",
|
needle: "foo",
|
||||||
wrap: true,
|
wrap: true,
|
||||||
wholeWord: true,
|
wholeWord: true,
|
||||||
backwards: true,
|
backwards: true
|
||||||
});
|
});
|
||||||
|
|
||||||
session.getSelection().moveCursorTo(0, 13);
|
session.getSelection().moveCursorTo(0, 13);
|
||||||
|
|
|
||||||
|
|
@ -202,7 +202,7 @@ module.exports = {
|
||||||
assert.equal(iterator.getCurrentToken().value, "for");
|
assert.equal(iterator.getCurrentToken().value, "for");
|
||||||
assert.equal(iterator.getCurrentTokenRow(), 1);
|
assert.equal(iterator.getCurrentTokenRow(), 1);
|
||||||
assert.equal(iterator.getCurrentTokenColumn(), 4);
|
assert.equal(iterator.getCurrentTokenColumn(), 4);
|
||||||
},
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ var Tokenizer = function(rules, flag) {
|
||||||
var token = {
|
var token = {
|
||||||
type: null,
|
type: null,
|
||||||
value: "",
|
value: "",
|
||||||
state: currentState,
|
state: currentState
|
||||||
};
|
};
|
||||||
initState();
|
initState();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue