update tests

This commit is contained in:
nightwing 2013-02-13 00:02:37 +04:00
commit 4bff3166bb
6 changed files with 202 additions and 198 deletions

View file

@ -20,7 +20,9 @@
["punctuation.operator","."], ["punctuation.operator","."],
["identifier","WriteLine"], ["identifier","WriteLine"],
["paren.lparen","("], ["paren.lparen","("],
["string","\"Hello World\""], ["string.start","\""],
["string","Hello World"],
["string.end","\""],
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[

View file

@ -2,7 +2,7 @@
"start", "start",
["comment","//test: tokenize 'standard' functions"] ["comment","//test: tokenize 'standard' functions"]
],[ ],[
"start", "no_regex",
["identifier","string"], ["identifier","string"],
["punctuation.operator","."], ["punctuation.operator","."],
["support.function","charCodeAt"], ["support.function","charCodeAt"],
@ -28,7 +28,7 @@
["punctuation.operator",";"], ["punctuation.operator",";"],
["string","\";"] ["string","\";"]
],[ ],[
"start", "no_regex",
["identifier","test"], ["identifier","test"],
["punctuation.operator",":"], ["punctuation.operator",":"],
["text"," "], ["text"," "],
@ -36,15 +36,15 @@
["text"," "], ["text"," "],
["identifier","comment"] ["identifier","comment"]
],[ ],[
"start", "no_regex",
["comment.doc","/**tokenize doc comment with "], ["comment.doc","/**tokenize doc comment with "],
["comment.doc.tag","@tag"], ["comment.doc.tag","@tag"],
["comment.doc"," {}*/"] ["comment.doc"," {}*/"]
],[ ],[
"start", "no_regex",
["comment","//test: tokenize parens"] ["comment","//test: tokenize parens"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
@ -58,34 +58,34 @@
"start", "start",
["comment","//test tokenize arithmetic expression which looks like a regexp"] ["comment","//test tokenize arithmetic expression which looks like a regexp"]
],[ ],[
"start", "no_regex",
["identifier","a"], ["identifier","a"],
["keyword.operator","/"], ["keyword.operator","/"],
["identifier","b"], ["identifier","b"],
["keyword.operator","/"], ["keyword.operator","/"],
["identifier","c"] ["identifier","c"]
],[ ],[
"start", "no_regex",
["identifier","a"], ["identifier","a"],
["keyword.operator","/="], ["keyword.operator","/="],
["identifier","b"], ["identifier","b"],
["keyword.operator","/"], ["keyword.operator","/"],
["identifier","c"] ["identifier","c"]
],[ ],[
"start", "no_regex",
["comment","//test tokenize reg exps"] ["comment","//test tokenize reg exps"]
],[ ],[
"start", "no_regex",
["identifier","a"], ["identifier","a"],
["keyword.operator","="], ["keyword.operator","="],
["string.regexp","/b/g"] ["string.regexp","/b/g"]
],[ ],[
"start", "no_regex",
["identifier","a"], ["identifier","a"],
["keyword.operator","+"], ["keyword.operator","+"],
["string.regexp","/b/g"] ["string.regexp","/b/g"]
],[ ],[
"start", "no_regex",
["identifier","a"], ["identifier","a"],
["text"," "], ["text"," "],
["keyword.operator","="], ["keyword.operator","="],
@ -98,7 +98,7 @@
["constant.language.escape","+"], ["constant.language.escape","+"],
["string.regexp"," 1/b"] ["string.regexp"," 1/b"]
],[ ],[
"start", "no_regex",
["identifier","a"], ["identifier","a"],
["keyword.operator","="], ["keyword.operator","="],
["string.regexp","/a/"], ["string.regexp","/a/"],
@ -107,7 +107,7 @@
["text"," "], ["text"," "],
["string.regexp","/a/"] ["string.regexp","/a/"]
],[ ],[
"start", "no_regex",
["keyword","case"], ["keyword","case"],
["text"," "], ["text"," "],
["string.regexp","/a/"], ["string.regexp","/a/"],
@ -117,31 +117,31 @@
["identifier","c"], ["identifier","c"],
["paren.rparen",")"] ["paren.rparen",")"]
],[ ],[
"start", "no_regex",
["comment","//test tokenize multi-line comment containing a single line comment"] ["comment","//test tokenize multi-line comment containing a single line comment"]
],[ ],[
"start", "no_regex",
["identifier","noRegex"] ["identifier","noRegex"]
],[ ],[
"start", "no_regex",
["comment","/* foo // bar */"] ["comment","/* foo // bar */"]
],[ ],[
"regex_allowed", "start",
["identifier","canBeRegex"], ["identifier","canBeRegex"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["comment","/* foo // bar */"] ["comment","/* foo // bar */"]
],[ ],[
"start", "start",
["comment","// test tokenize identifier with umlauts"] ["comment","// test tokenize identifier with umlauts"]
],[ ],[
"start", "no_regex",
["identifier","fu"], ["identifier","fu"],
["punctuation.operator","?"], ["punctuation.operator","?"],
["identifier","e"] ["identifier","e"]
],[ ],[
"start", "no_regex",
["comment","// test // is not a regexp"] ["comment","// test // is not a regexp"]
],[ ],[
"start", "start",
@ -152,12 +152,12 @@
"start", "start",
["comment","//test skipping escaped chars"] ["comment","//test skipping escaped chars"]
],[ ],[
"start", "no_regex",
["string","'Meh"], ["string","'Meh"],
["constant.language.escape","\\\\"], ["constant.language.escape","\\\\"],
["string","nNeh'"] ["string","nNeh'"]
],[ ],[
"start", "no_regex",
["storage.type","console"], ["storage.type","console"],
["punctuation.operator","."], ["punctuation.operator","."],
["support.function.firebug","log"], ["support.function.firebug","log"],
@ -169,10 +169,10 @@
"qqstring", "qqstring",
["string","\"test multiline\\"] ["string","\"test multiline\\"]
],[ ],[
"start", "no_regex",
["string"," strings\""] ["string"," strings\""]
],[ ],[
"start", "no_regex",
["identifier","a"], ["identifier","a"],
["keyword.operator","="], ["keyword.operator","="],
["text","'"] ["text","'"]
@ -182,16 +182,16 @@
["keyword.operator","="], ["keyword.operator","="],
["string","\"\\"] ["string","\"\\"]
],[ ],[
"start", "no_regex",
["string","still a string"] ["string","still a string"]
],[ ],[
"start", "no_regex",
["text"," "]
],[
"no_regex",
["text"," "] ["text"," "]
],[ ],[
"start", "start",
["text"," "]
],[
"regex_allowed",
["storage.type","function"], ["storage.type","function"],
["text"," "], ["text"," "],
["entity.name.function","foo"], ["entity.name.function","foo"],
@ -203,7 +203,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword","for"], ["keyword","for"],
["text"," "], ["text"," "],
@ -228,7 +228,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["support.function","alert"], ["support.function","alert"],
["paren.lparen","("], ["paren.lparen","("],
@ -245,18 +245,18 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"], ["paren.rparen","}"],
["text","\t"], ["text","\t"],
["comment","// Real Tab."] ["comment","// Real Tab."]
],[ ],[
"start", "no_regex",
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start" "no_regex"
],[ ],[
"start", "no_regex",
["identifier","regexp"], ["identifier","regexp"],
["text"," "], ["text"," "],
["keyword.operator","="], ["keyword.operator","="],
@ -267,9 +267,9 @@
["text"," "], ["text"," "],
["comment","// ends here"] ["comment","// ends here"]
],[ ],[
"start" "no_regex"
],[ ],[
"start", "no_regex",
["identifier","r"], ["identifier","r"],
["text"," "], ["text"," "],
["keyword.operator","="], ["keyword.operator","="],
@ -316,7 +316,7 @@
["text"," "], ["text"," "],
["identifier","o"] ["identifier","o"]
],[ ],[
"start", "no_regex",
["identifier","a"], ["identifier","a"],
["keyword.operator","="], ["keyword.operator","="],
["string.regexp","/a/"], ["string.regexp","/a/"],
@ -331,16 +331,16 @@
["text"," "], ["text"," "],
["string.regexp","/ /"] ["string.regexp","/ /"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["comment.doc","/************************************/"] ["comment.doc","/************************************/"]
],[ ],[
"start", "no_regex",
["comment.doc","/** total mess, tricky to highlight**/"] ["comment.doc","/** total mess, tricky to highlight**/"]
],[ ],[
"start" "no_regex"
],[ ],[
"regex_allowed", "start",
["storage.type","function"], ["storage.type","function"],
["text"," "], ["text"," "],
["paren.lparen","("], ["paren.lparen","("],
@ -355,10 +355,10 @@
"doc-start", "doc-start",
["comment.doc","\t * docComment"] ["comment.doc","\t * docComment"]
],[ ],[
"start", "no_regex",
["comment.doc","\t **/"] ["comment.doc","\t **/"]
],[ ],[
"start", "no_regex",
["text","\t"], ["text","\t"],
["identifier","r"], ["identifier","r"],
["text"," "], ["text"," "],
@ -369,7 +369,7 @@
["constant.language.escape","*"], ["constant.language.escape","*"],
["string.regexp","/"] ["string.regexp","/"]
],[ ],[
"start", "no_regex",
["text","\t"], ["text","\t"],
["identifier","g"], ["identifier","g"],
["text"," "], ["text"," "],
@ -401,7 +401,7 @@
["text"," "], ["text"," "],
["constant.numeric","0x25"] ["constant.numeric","0x25"]
],[ ],[
"start", "no_regex",
["text","\t"], ["text","\t"],
["identifier","t"], ["identifier","t"],
["text"," "], ["text"," "],
@ -414,10 +414,10 @@
["string","''"], ["string","''"],
["paren.rparen","]"] ["paren.rparen","]"]
],[ ],[
"start", "no_regex",
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"regex_allowed", "start",
["storage.type","function"], ["storage.type","function"],
["text"," "], ["text"," "],
["paren.lparen","("], ["paren.lparen","("],
@ -425,50 +425,50 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text","\t"], ["text","\t"],
["comment","/* eee */"] ["comment","/* eee */"]
],[ ],[
"start", "no_regex",
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start" "no_regex"
],[ ],[
"qqstring", "qqstring",
["string","\"s\\"] ["string","\"s\\"]
],[ ],[
"start", "no_regex",
["string","s"], ["string","s"],
["constant.language.escape","\\u7824"], ["constant.language.escape","\\u7824"],
["string","sss"], ["string","sss"],
["constant.language.escape","\\u"], ["constant.language.escape","\\u"],
["string","1\""] ["string","1\""]
],[ ],[
"start" "no_regex"
],[ ],[
"qstring", "qstring",
["string","'\\"] ["string","'\\"]
],[ ],[
"start", "no_regex",
["string","string'"] ["string","string'"]
],[ ],[
"start" "no_regex"
],[ ],[
"start", "no_regex",
["text","'"] ["text","'"]
],[ ],[
"start", "no_regex",
["identifier","string"], ["identifier","string"],
["text","'"] ["text","'"]
],[ ],[
"start" "no_regex"
],[ ],[
"start", "no_regex",
["string","\"trailing space"], ["string","\"trailing space"],
["constant.language.escape","\\ "], ["constant.language.escape","\\ "],
["string"," "] ["string"," "]
],[ ],[
"start", "no_regex",
["string","\" \""], ["string","\" \""],
["text"," "], ["text"," "],
["keyword.operator","/"], ["keyword.operator","/"],
@ -480,7 +480,7 @@
["keyword.operator","/"], ["keyword.operator","/"],
["identifier","g"] ["identifier","g"]
],[ ],[
"start" "no_regex"
],[ ],[
"doc-start", "doc-start",
["comment.doc","/**"] ["comment.doc","/**"]
@ -488,19 +488,19 @@
"doc-start", "doc-start",
["comment.doc"," *doc"] ["comment.doc"," *doc"]
],[ ],[
"start", "no_regex",
["comment.doc"," */"] ["comment.doc"," */"]
],[ ],[
"start" "no_regex"
],[ ],[
"regex_allowed", "start",
["identifier","a"], ["identifier","a"],
["text"," "], ["text"," "],
["keyword.operator","="], ["keyword.operator","="],
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text","\t"], ["text","\t"],
["string","'a'"], ["string","'a'"],
["punctuation.operator",":"], ["punctuation.operator",":"],
@ -508,7 +508,7 @@
["identifier","b"], ["identifier","b"],
["punctuation.operator",","] ["punctuation.operator",","]
],[ ],[
"start", "no_regex",
["text","\t"], ["text","\t"],
["string","'g'"], ["string","'g'"],
["text",":"], ["text",":"],
@ -518,7 +518,7 @@
["variable.parameter","t"], ["variable.parameter","t"],
["paren.rparen",")"] ["paren.rparen",")"]
],[ ],[
"start", "no_regex",
["text","\t"], ["text","\t"],
["entity.name.function","gta"], ["entity.name.function","gta"],
["punctuation.operator",":"], ["punctuation.operator",":"],
@ -529,12 +529,12 @@
["variable.parameter","b"], ["variable.parameter","b"],
["paren.rparen",")"] ["paren.rparen",")"]
],[ ],[
"start", "no_regex",
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start" "no_regex"
],[ ],[
"start" "no_regex"
],[ ],[
"function_arguments", "function_arguments",
["identifier","foo"], ["identifier","foo"],
@ -552,14 +552,14 @@
["variable.parameter","b"], ["variable.parameter","b"],
["punctuation.operator",","] ["punctuation.operator",","]
],[ ],[
"start", "no_regex",
["punctuation.operator"," "], ["punctuation.operator"," "],
["variable.parameter","c"], ["variable.parameter","c"],
["punctuation.operator",", "], ["punctuation.operator",", "],
["variable.parameter","d"], ["variable.parameter","d"],
["paren.rparen",")"] ["paren.rparen",")"]
],[ ],[
"start", "no_regex",
["storage.type","foo"], ["storage.type","foo"],
["punctuation.operator","."], ["punctuation.operator","."],
["entity.name.function","d"], ["entity.name.function","d"],
@ -572,7 +572,7 @@
["variable.parameter","b"], ["variable.parameter","b"],
["paren.rparen",")"] ["paren.rparen",")"]
],[ ],[
"start", "no_regex",
["storage.type","foo"], ["storage.type","foo"],
["punctuation.operator","."], ["punctuation.operator","."],
["entity.name.function","d"], ["entity.name.function","d"],
@ -588,5 +588,5 @@
["string","\"string\""], ["string","\"string\""],
["text"," "] ["text"," "]
],[ ],[
"start" "no_regex"
]] ]]

View file

@ -15,7 +15,7 @@
["meta.tag.tag-name.script","script"], ["meta.tag.tag-name.script","script"],
["meta.tag.r",">"] ["meta.tag.r",">"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
@ -26,7 +26,7 @@
["string","\"abc\""], ["string","\"abc\""],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["storage.type","function"], ["storage.type","function"],
["text"," "], ["text"," "],
@ -34,7 +34,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"js-start", "js-no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[

View file

@ -50,7 +50,7 @@
],[ ],[
"start" "start"
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["meta.tag","<"], ["meta.tag","<"],
["meta.tag.tag-name","script"], ["meta.tag.tag-name","script"],
@ -64,7 +64,7 @@
["identifier","CDATA"], ["identifier","CDATA"],
["paren.lparen","["] ["paren.lparen","["]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
@ -75,7 +75,7 @@
["constant.numeric","0"], ["constant.numeric","0"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
@ -86,7 +86,7 @@
["constant.numeric","1"], ["constant.numeric","1"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
@ -97,28 +97,28 @@
["constant.numeric","100"], ["constant.numeric","100"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
["identifier","hickory"], ["identifier","hickory"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
["identifier","dickory"], ["identifier","dickory"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
["identifier","dock"], ["identifier","dock"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
@ -127,7 +127,7 @@
],[ ],[
"js-start" "js-start"
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["storage.type","function"], ["storage.type","function"],
["text"," "], ["text"," "],
@ -138,7 +138,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","hickory"], ["identifier","hickory"],
["text"," "], ["text"," "],
@ -156,7 +156,7 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","dickory"], ["identifier","dickory"],
["text"," "], ["text"," "],
@ -174,7 +174,7 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","dock"], ["identifier","dock"],
["text"," "], ["text"," "],
@ -194,18 +194,18 @@
],[ ],[
"js-start" "js-start"
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","ShowAndGrowElement"], ["identifier","ShowAndGrowElement"],
["paren.lparen","("], ["paren.lparen","("],
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-start", "js-no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["storage.type","function"], ["storage.type","function"],
["text"," "], ["text"," "],
@ -215,7 +215,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","timevalue"], ["identifier","timevalue"],
["text"," "], ["text"," "],
@ -228,7 +228,7 @@
["identifier","timer_increment"], ["identifier","timer_increment"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-start", "js-no_regex",
["text"," "], ["text"," "],
["keyword","if"], ["keyword","if"],
["text"," "], ["text"," "],
@ -240,7 +240,7 @@
["identifier","max_time"], ["identifier","max_time"],
["paren.rparen",")"] ["paren.rparen",")"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["keyword","return"], ["keyword","return"],
["punctuation.operator",";"] ["punctuation.operator",";"]
@ -249,7 +249,7 @@
["text"," "], ["text"," "],
["comment","// Scale the text string gradually until it is 20 times larger"] ["comment","// Scale the text string gradually until it is 20 times larger"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","scalefactor"], ["identifier","scalefactor"],
["text"," "], ["text"," "],
@ -270,7 +270,7 @@
],[ ],[
"js-start" "js-start"
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["keyword","if"], ["keyword","if"],
["text"," "], ["text"," "],
@ -284,7 +284,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","hickory"], ["identifier","hickory"],
["punctuation.operator","."], ["punctuation.operator","."],
@ -297,7 +297,7 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","hickory"], ["identifier","hickory"],
["punctuation.operator","."], ["punctuation.operator","."],
@ -327,13 +327,13 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-start", "js-no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"js-start" "js-no_regex"
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["keyword","if"], ["keyword","if"],
["text"," "], ["text"," "],
@ -355,7 +355,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","dickory"], ["identifier","dickory"],
["punctuation.operator","."], ["punctuation.operator","."],
@ -368,7 +368,7 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","dickory"], ["identifier","dickory"],
["punctuation.operator","."], ["punctuation.operator","."],
@ -395,11 +395,11 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-start", "js-no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["keyword","if"], ["keyword","if"],
["text"," "], ["text"," "],
@ -413,7 +413,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","dock"], ["identifier","dock"],
["punctuation.operator","."], ["punctuation.operator","."],
@ -426,7 +426,7 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-regex_allowed", "js-start",
["text"," "], ["text"," "],
["identifier","dock"], ["identifier","dock"],
["punctuation.operator","."], ["punctuation.operator","."],
@ -455,17 +455,17 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"js-start", "js-no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"js-start" "js-no_regex"
],[ ],[
"js-start", "js-no_regex",
["text"," "], ["text"," "],
["comment","// Call ShowAndGrowElement again <timer_increment> milliseconds later."] ["comment","// Call ShowAndGrowElement again <timer_increment> milliseconds later."]
],[ ],[
"js-start", "js-no_regex",
["text"," "], ["text"," "],
["identifier","setTimeout"], ["identifier","setTimeout"],
["paren.lparen","("], ["paren.lparen","("],
@ -475,11 +475,11 @@
["identifier","timer_increment"], ["identifier","timer_increment"],
["paren.rparen",")"] ["paren.rparen",")"]
],[ ],[
"js-start", "js-no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"js-start", "js-no_regex",
["text"," "], ["text"," "],
["variable.language","window"], ["variable.language","window"],
["punctuation.operator","."], ["punctuation.operator","."],

View file

@ -1,19 +1,19 @@
[[ [[
"regex_allowed", "start",
["keyword.operator.ts","class"], ["keyword.operator.ts","class"],
["text"," "], ["text"," "],
["identifier","Greeter"], ["identifier","Greeter"],
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text","\t"], ["text","\t"],
["variable.parameter.function.ts","greeting"], ["variable.parameter.function.ts","greeting"],
["text",": "], ["text",": "],
["variable.parameter.function.ts","string"], ["variable.parameter.function.ts","string"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text","\t"], ["text","\t"],
["keyword.operator.ts","constructor"], ["keyword.operator.ts","constructor"],
["text"," "], ["text"," "],
@ -25,7 +25,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text","\t\t"], ["text","\t\t"],
["storage.type.variable.ts","this."], ["storage.type.variable.ts","this."],
["identifier","greeting"], ["identifier","greeting"],
@ -35,19 +35,19 @@
["identifier","message"], ["identifier","message"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"start", "no_regex",
["text","\t"], ["text","\t"],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"regex_allowed", "start",
["text","\t"], ["text","\t"],
["entity.name.function.ts","greet"], ["identifier","greet"],
["paren.lparen","("], ["paren.lparen","("],
["paren.rparen",")"], ["paren.rparen",")"],
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text","\t\t"], ["text","\t\t"],
["keyword","return"], ["keyword","return"],
["text"," "], ["text"," "],
@ -59,17 +59,17 @@
["identifier","greeting"], ["identifier","greeting"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"start", "no_regex",
["text","\t"], ["text","\t"],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start", "no_regex",
["paren.rparen","}"], ["paren.rparen","}"],
["text"," "] ["text"," "]
],[ ],[
"start" "no_regex"
],[ ],[
"regex_allowed", "start",
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
["identifier","greeter"], ["identifier","greeter"],
@ -86,7 +86,7 @@
],[ ],[
"start" "start"
],[ ],[
"start", "no_regex",
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
["identifier","button"], ["identifier","button"],
@ -100,7 +100,7 @@
["string","'button'"], ["string","'button'"],
["paren.rparen",")"] ["paren.rparen",")"]
],[ ],[
"start", "no_regex",
["identifier","button"], ["identifier","button"],
["punctuation.operator","."], ["punctuation.operator","."],
["identifier","innerText"], ["identifier","innerText"],
@ -109,7 +109,7 @@
["text"," "], ["text"," "],
["string","\"Say Hello\""] ["string","\"Say Hello\""]
],[ ],[
"regex_allowed", "start",
["storage.type","button"], ["storage.type","button"],
["punctuation.operator","."], ["punctuation.operator","."],
["entity.name.function","onclick"], ["entity.name.function","onclick"],
@ -122,7 +122,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"start", "no_regex",
["text","\t"], ["text","\t"],
["support.function","alert"], ["support.function","alert"],
["paren.lparen","("], ["paren.lparen","("],
@ -131,12 +131,12 @@
["paren.rparen",")"], ["paren.rparen",")"],
["paren.rparen",")"] ["paren.rparen",")"]
],[ ],[
"start", "no_regex",
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start" "no_regex"
],[ ],[
"start", "no_regex",
["variable.language","document"], ["variable.language","document"],
["punctuation.operator","."], ["punctuation.operator","."],
["identifier","body"], ["identifier","body"],
@ -146,20 +146,20 @@
["identifier","button"], ["identifier","button"],
["paren.rparen",")"] ["paren.rparen",")"]
],[ ],[
"start" "no_regex"
],[ ],[
"regex_allowed", "start",
["keyword.operator.ts","class"], ["keyword","class"],
["text"," "], ["text"," "],
["identifier","Snake"], ["identifier","Snake"],
["text"," "], ["text"," "],
["keyword.operator.ts","extends"], ["keyword","extends"],
["text"," "], ["text"," "],
["identifier","Animal"], ["identifier","Animal"],
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["entity.name.function.ts","move"], ["entity.name.function.ts","move"],
["paren.lparen","("], ["paren.lparen","("],
@ -167,7 +167,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["support.function","alert"], ["support.function","alert"],
["paren.lparen","("], ["paren.lparen","("],
@ -175,7 +175,7 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["storage.type.variable.ts","super"], ["storage.type.variable.ts","super"],
["text","("], ["text","("],
@ -183,27 +183,27 @@
["text",")"], ["text",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start", "no_regex",
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start" "no_regex"
],[ ],[
"regex_allowed", "start",
["keyword.operator.ts","class"], ["keyword","class"],
["text"," "], ["text"," "],
["identifier","Horse"], ["identifier","Horse"],
["text"," "], ["text"," "],
["keyword.operator.ts","extends"], ["keyword","extends"],
["text"," "], ["text"," "],
["identifier","Animal"], ["identifier","Animal"],
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["entity.name.function.ts","move"], ["entity.name.function.ts","move"],
["paren.lparen","("], ["paren.lparen","("],
@ -211,7 +211,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["support.function","alert"], ["support.function","alert"],
["paren.lparen","("], ["paren.lparen","("],
@ -219,7 +219,7 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword.operator.ts","super"], ["keyword.operator.ts","super"],
["punctuation.operator","."], ["punctuation.operator","."],
@ -229,22 +229,23 @@
["paren.rparen",")"], ["paren.rparen",")"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start", "no_regex",
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start" "no_regex"
],[ ],[
"start", "start",
["keyword.operator.ts","module"], ["identifier","module"],
["text"," "], ["text"," "],
["variable.parameter.function.ts","Sayings"], ["identifier","Sayings"],
["text"," {"] ["text"," "],
["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword.operator.ts","export"], ["keyword.operator.ts","export"],
["text"," "], ["text"," "],
@ -254,14 +255,14 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["variable.parameter.function.ts","greeting"], ["variable.parameter.function.ts","greeting"],
["text",": "], ["text",": "],
["variable.parameter.function.ts","string"], ["variable.parameter.function.ts","string"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword.operator.ts","constructor"], ["keyword.operator.ts","constructor"],
["text"," "], ["text"," "],
@ -273,7 +274,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["storage.type.variable.ts","this."], ["storage.type.variable.ts","this."],
["identifier","greeting"], ["identifier","greeting"],
@ -283,19 +284,19 @@
["identifier","message"], ["identifier","message"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["entity.name.function.ts","greet"], ["identifier","greet"],
["paren.lparen","("], ["paren.lparen","("],
["paren.rparen",")"], ["paren.rparen",")"],
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword","return"], ["keyword","return"],
["text"," "], ["text"," "],
@ -307,24 +308,25 @@
["identifier","greeting"], ["identifier","greeting"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start", "no_regex",
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start", "start",
["keyword.operator.ts","module"], ["identifier","module"],
["text"," "], ["text"," "],
["variable.parameter.function.ts","Mankala"], ["identifier","Mankala"],
["text"," {"] ["text"," "],
["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword.operator.ts","export"], ["keyword.operator.ts","export"],
["text"," "], ["text"," "],
@ -334,7 +336,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword.operator.ts","public"], ["keyword.operator.ts","public"],
["text"," "], ["text"," "],
@ -345,7 +347,7 @@
["constant.language.boolean","false"], ["constant.language.boolean","false"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword.operator.ts","public"], ["keyword.operator.ts","public"],
["text"," "], ["text"," "],
@ -356,7 +358,7 @@
["constant.numeric","0"], ["constant.numeric","0"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword.operator.ts","public"], ["keyword.operator.ts","public"],
["text"," "], ["text"," "],
@ -367,7 +369,7 @@
["constant.numeric","0"], ["constant.numeric","0"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword.operator.ts","public"], ["keyword.operator.ts","public"],
["text"," "], ["text"," "],
@ -380,7 +382,7 @@
],[ ],[
"start" "start"
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword.operator.ts","public"], ["keyword.operator.ts","public"],
["text"," "], ["text"," "],
@ -390,7 +392,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["storage.type.variable.ts","this."], ["storage.type.variable.ts","this."],
["identifier","turnContinues"], ["identifier","turnContinues"],
@ -400,7 +402,7 @@
["constant.language.boolean","false"], ["constant.language.boolean","false"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["storage.type.variable.ts","this."], ["storage.type.variable.ts","this."],
["identifier","seedStoredCount"], ["identifier","seedStoredCount"],
@ -410,7 +412,7 @@
["constant.numeric","0"], ["constant.numeric","0"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["storage.type.variable.ts","this."], ["storage.type.variable.ts","this."],
["identifier","capturedCount"], ["identifier","capturedCount"],
@ -420,7 +422,7 @@
["constant.numeric","0"], ["constant.numeric","0"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["storage.type.variable.ts","this."], ["storage.type.variable.ts","this."],
["identifier","spaceCaptured"], ["identifier","spaceCaptured"],
@ -430,23 +432,23 @@
["identifier","NoSpace"], ["identifier","NoSpace"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start" "no_regex"
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword.operator.ts","public"], ["keyword","public"],
["text"," "], ["text"," "],
["entity.name.function.ts","toString"], ["identifier","toString"],
["paren.lparen","("], ["paren.lparen","("],
["paren.rparen",")"], ["paren.rparen",")"],
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["storage.type","var"], ["storage.type","var"],
["text"," "], ["text"," "],
@ -457,7 +459,7 @@
["string","\"\""], ["string","\"\""],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword","if"], ["keyword","if"],
["text"," "], ["text"," "],
@ -468,7 +470,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["identifier","stringBuilder"], ["identifier","stringBuilder"],
["text"," "], ["text"," "],
@ -477,11 +479,11 @@
["string","\" turn continues,\""], ["string","\" turn continues,\""],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["identifier","stringBuilder"], ["identifier","stringBuilder"],
["text"," "], ["text"," "],
@ -495,7 +497,7 @@
["identifier","seedStoredCount"], ["identifier","seedStoredCount"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword","if"], ["keyword","if"],
["text"," "], ["text"," "],
@ -510,7 +512,7 @@
["text"," "], ["text"," "],
["paren.lparen","{"] ["paren.lparen","{"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["identifier","stringBuilder"], ["identifier","stringBuilder"],
["text"," "], ["text"," "],
@ -533,25 +535,25 @@
["identifier","spaceCaptured"], ["identifier","spaceCaptured"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"regex_allowed", "start",
["text"," "], ["text"," "],
["keyword","return"], ["keyword","return"],
["text"," "], ["text"," "],
["identifier","stringBuilder"], ["identifier","stringBuilder"],
["punctuation.operator",";"] ["punctuation.operator",";"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start", "no_regex",
["text"," "], ["text"," "],
["paren.rparen","}"] ["paren.rparen","}"]
],[ ],[
"start", "no_regex",
["paren.rparen","}"] ["paren.rparen","}"]
]] ]]

View file

@ -139,7 +139,7 @@ var Tokenizer = function(rules) {
}; };
this.createSplitterRegexp = function(src, flag) { this.createSplitterRegexp = function(src, flag) {
src = src.replace(/\(\?=([^()]|\\.|\(([^()]|\\.)*?\))*?\)$/, ""); src = src.replace(/\(\?=([^()]|\\.|\(([^()]|\\.)*?\))*\)(?=\)*$)/, "");
return new RegExp(src, flag); return new RegExp(src, flag);
}; };