diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage b/extensions/javascript/syntaxes/JavaScript.tmLanguage index af9b89bfa38..b43a58c2f9e 100644 --- a/extensions/javascript/syntaxes/JavaScript.tmLanguage +++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage @@ -22,14 +22,14 @@ match \b(public|protected|private)\b name - storage.modifier.js + storage.modifier.ts.js arithmetic-operator match \*|/|\-\-|\-|\+\+|\+|% name - keyword.operator.arithmetic.js + keyword.operator.arithmetic.ts.js array-literal @@ -40,7 +40,7 @@ 0 name - meta.brace.square.js + meta.brace.square.ts.js end @@ -50,11 +50,11 @@ 0 name - meta.brace.square.js + meta.brace.square.ts.js name - meta.array.literal.js + meta.array.literal.ts.js patterns @@ -68,14 +68,14 @@ match <<=|>>=|>>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^= name - keyword.operator.assignment.js + keyword.operator.assignment.ts.js await-modifier match await name - storage.modifier.js + storage.modifier.ts.js block @@ -86,7 +86,7 @@ 0 name - meta.brace.curly.js + meta.brace.curly.ts.js end @@ -96,11 +96,11 @@ 0 name - meta.brace.curly.js + meta.brace.curly.ts.js name - meta.block.js + meta.block.ts.js patterns @@ -118,7 +118,7 @@ match \b(false|true)\b name - constant.language.boolean.js + constant.language.boolean.ts.js cast @@ -129,7 +129,7 @@ 1 name - meta.brace.angle.js + meta.brace.angle.ts.js end @@ -139,11 +139,11 @@ 0 name - meta.brace.angle.js + meta.brace.angle.ts.js name - cast.expr.js + cast.expr.ts.js patterns @@ -155,7 +155,7 @@ comment name - comment.js + comment.ts.js patterns @@ -179,7 +179,7 @@ end \*/ name - comment.block.js + comment.block.ts.js comment-block-doc @@ -188,21 +188,21 @@ end \*/ name - comment.block.documentation.js + comment.block.documentation.ts.js comment-line match (//).*$\n? name - comment.line.js + comment.line.ts.js control-statement match (?<!\.)\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|case|default)\b name - keyword.control.js + keyword.control.ts.js decl-block @@ -213,7 +213,7 @@ 0 name - meta.brace.curly.js + meta.brace.curly.ts.js end @@ -223,11 +223,11 @@ 0 name - meta.brace.curly.js + meta.brace.curly.ts.js name - meta.decl.block.js + meta.decl.block.ts.js patterns @@ -239,7 +239,7 @@ declaration name - meta.declaration.js + meta.declaration.ts.js patterns @@ -267,28 +267,28 @@ 1 name - storage.modifier.js + storage.modifier.ts.js 2 name - storage.type.js + storage.type.ts.js 3 name - entity.name.class.js + entity.name.class.ts.js match (?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) name - meta.enum.declaration.js + meta.enum.declaration.ts.js expression name - meta.expression.js + meta.expression.ts.js patterns @@ -382,7 +382,7 @@ match =>|\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void)\b name - keyword.operator.js + keyword.operator.ts.js field-declaration @@ -393,18 +393,18 @@ 1 name - variable.js + variable.ts.js 2 name - keyword.operator.js + keyword.operator.ts.js end (?=\}|;|,)|(?<=\}) name - meta.field.declaration.js + meta.field.declaration.ts.js patterns @@ -420,23 +420,23 @@ 1 name - storage.type.js + storage.type.ts.js 3 name - keyword.operator.js + keyword.operator.ts.js match (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(in|of)\b name - forin.expr.js + forin.expr.ts.js function-call name - functioncall.expr.js + functioncall.expr.ts.js patterns @@ -462,28 +462,28 @@ 1 name - storage.modifier.js + storage.modifier.ts.js 2 name - storage.modifier.js + storage.modifier.ts.js 3 name - storage.type.function.js + storage.type.function.ts.js 4 name - entity.name.function.js + entity.name.function.ts.js end (?=;|\})|(?<=\}) name - meta.function.js + meta.function.ts.js patterns @@ -519,23 +519,23 @@ 1 name - storage.modifier.js + storage.modifier.ts.js 2 name - storage.type.function.js + storage.type.function.ts.js 3 name - entity.name.function.js + entity.name.function.ts.js match \b(?:(export)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s* name - meta.function.overload.js + meta.function.overload.ts.js function-type-parameters @@ -546,7 +546,7 @@ 0 name - meta.brace.round.js + meta.brace.round.ts.js end @@ -556,11 +556,11 @@ 0 name - meta.brace.round.js + meta.brace.round.ts.js name - meta.function.type.parameter.js + meta.function.type.parameter.ts.js patterns @@ -590,7 +590,7 @@ 0 name - meta.brace.square.js + meta.brace.square.ts.js end @@ -600,16 +600,16 @@ 1 name - meta.brace.square.js + meta.brace.square.ts.js 2 name - keyword.operator.js + keyword.operator.ts.js name - meta.indexer.declaration.js + meta.indexer.declaration.ts.js patterns @@ -633,18 +633,18 @@ 1 name - variable.parameter.js + variable.parameter.ts.js match ([a-zA-Z_$][\w$]*)(?=\:) name - meta.indexer.parameter.js + meta.indexer.parameter.ts.js literal name - literal.js + literal.ts.js patterns @@ -678,7 +678,7 @@ match \!|&|~|\||&&|\|\| name - keyword.operator.arithmetic.js + keyword.operator.arithmetic.ts.js method-declaration @@ -689,43 +689,43 @@ 1 name - storage.modifier.js + storage.modifier.ts.js 2 name - storage.modifier.js + storage.modifier.ts.js 3 name - storage.modifier.js + storage.modifier.ts.js 4 name - storage.type.property.js + storage.type.property.ts.js 5 name - keyword.operator.js + keyword.operator.ts.js 6 name - entity.name.function.js + entity.name.function.ts.js 7 name - keyword.operator.js + keyword.operator.ts.js end (?=\}|;|,)|(?<=\}) name - meta.method.declaration.js + meta.method.declaration.ts.js patterns @@ -761,28 +761,28 @@ 1 name - storage.modifier.js + storage.modifier.ts.js 2 name - keyword.operator.js + keyword.operator.ts.js 3 name - entity.name.function.js + entity.name.function.ts.js 4 name - keyword.operator.js + keyword.operator.ts.js match \b(?:(public|private|protected)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<) name - meta.method.overload.declaration.js + meta.method.overload.declaration.ts.js new-expr @@ -793,13 +793,13 @@ 1 name - keyword.operator.js + keyword.operator.ts.js end (?=[(;]|$) name - new.expr.js + new.expr.ts.js patterns @@ -817,14 +817,14 @@ match \b(null)\b name - constant.language.null.js + constant.language.null.ts.js numeric-literal match \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b name - constant.numeric.js + constant.numeric.ts.js object-body @@ -835,7 +835,7 @@ 0 name - meta.brace.curly.js + meta.brace.curly.ts.js end @@ -845,11 +845,11 @@ 0 name - meta.brace.curly.js + meta.brace.curly.ts.js name - meta.object.body.js + meta.object.body.ts.js patterns @@ -903,17 +903,17 @@ 1 name - storage.modifier.js + storage.modifier.ts.js 2 name - storage.modifier.js + storage.modifier.ts.js 3 name - storage.type.js + storage.type.ts.js end @@ -923,11 +923,11 @@ 1 name - brace.curly.js + brace.curly.ts.js name - meta.declaration.object.js + meta.declaration.object.ts.js patterns @@ -961,7 +961,7 @@ 1 name - keyword.other.js + keyword.other.ts.js end @@ -971,11 +971,11 @@ 1 name - brace.curly.js + brace.curly.ts.js name - meta.object.heritage.js + meta.object.heritage.ts.js patterns @@ -999,13 +999,13 @@ 1 name - storage.type.js + storage.type.ts.js match (?:\s*([a-zA-Z_$][\w$]*)) name - meta.object.heritage.parent.js + meta.object.heritage.parent.ts.js object-member @@ -1014,7 +1014,7 @@ end (?=,|\}) name - meta.object.member.js + meta.object.member.ts.js patterns @@ -1030,13 +1030,13 @@ 0 name - entity.name.class.js + entity.name.class.ts.js match [a-zA-Z_$][\w$]* name - meta.object.name.js + meta.object.name.ts.js parameter-name @@ -1045,28 +1045,28 @@ 1 name - storage.modifier.js + storage.modifier.ts.js 2 name - keyword.operator.js + keyword.operator.ts.js 3 name - variable.parameter.js + variable.parameter.ts.js 4 name - keyword.operator.js + keyword.operator.ts.js match (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??) name - parameter.name.js + parameter.name.ts.js paren-expression @@ -1077,7 +1077,7 @@ 0 name - meta.brace.paren.js + meta.brace.paren.ts.js end @@ -1087,7 +1087,7 @@ 0 name - meta.brace.paren.js + meta.brace.paren.ts.js patterns @@ -1103,7 +1103,7 @@ match \b(get|set)\b name - storage.type.property.js + storage.type.property.ts.js qstring-double @@ -1112,7 +1112,7 @@ end "|(?=$) name - string.double.js + string.double.ts.js patterns @@ -1128,7 +1128,7 @@ end '|(?=$) name - string.single.js + string.single.ts.js patterns @@ -1144,20 +1144,20 @@ end $|(/)[igm]* name - string.regex.js + string.regex.ts.js patterns match \\. name - constant.character.escape.js + constant.character.escape.ts.js match \[(\\\]|[^\]])*\] name - constant.character.class.js + constant.character.class.ts.js @@ -1166,7 +1166,7 @@ match ===|==|=|!=|!==|<=|>=|<>|<|> name - keyword.operator.comparison.js + keyword.operator.comparison.ts.js return-type @@ -1175,7 +1175,7 @@ end (?=$)|(?=\{|;|//) name - meta.return.type.js + meta.return.type.ts.js patterns @@ -1189,19 +1189,19 @@ match \b(static)\b name - keyword.other.js + keyword.other.ts.js storage-keyword match \b(number|boolean|string|any|var|let|function|const)\b name - storage.type.js + storage.type.ts.js string name - string.js + string.ts.js patterns @@ -1230,13 +1230,13 @@ 1 name - keyword.control.js + keyword.control.ts.js end : name - case.expr.js + case.expr.ts.js patterns @@ -1254,7 +1254,7 @@ 0 name - string.template.js + string.template.ts.js end @@ -1264,11 +1264,11 @@ 0 name - string.template.js + string.template.ts.js name - meta.template.js + meta.template.ts.js patterns @@ -1288,7 +1288,7 @@ end (?=(\$\{|`)) name - string.template.js + string.template.ts.js patterns @@ -1306,7 +1306,7 @@ 0 name - keyword.operator.js + keyword.operator.ts.js end @@ -1316,11 +1316,11 @@ 0 name - keyword.operator.js + keyword.operator.ts.js name - template.element.js + template.element.ts.js patterns @@ -1334,12 +1334,12 @@ match \b(this)\b name - constant.language.this.js + constant.language.this.ts.js type name - meta.type.js + meta.type.ts.js patterns @@ -1383,7 +1383,7 @@ end (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{) name - meta.type.annotation.js + meta.type.annotation.ts.js patterns @@ -1409,18 +1409,18 @@ 1 name - keyword.other.js + keyword.other.ts.js 2 name - storage.type.js + storage.type.ts.js end (?=[,);>]|var|type|function|class) name - meta.type.declaration.js + meta.type.declaration.ts.js patterns @@ -1438,13 +1438,13 @@ 0 name - keyword.operator.js + keyword.operator.ts.js end (?=\s*[,\)\{=;>]|//|$) name - meta.type.function.return.js + meta.type.function.return.ts.js patterns @@ -1460,13 +1460,13 @@ 1 name - entity.name.type.js + entity.name.type.ts.js match [a-zA-Z_$][.\w$]* name - meta.type.name.js + meta.type.name.ts.js type-object @@ -1477,7 +1477,7 @@ 0 name - meta.brace.curly.js + meta.brace.curly.ts.js end @@ -1487,11 +1487,11 @@ 0 name - meta.brace.curly.js + meta.brace.curly.ts.js name - meta.object.type.js + meta.object.type.ts.js patterns @@ -1521,7 +1521,7 @@ match [.|] name - keyword.operator.type.js + keyword.operator.type.ts.js type-parameters @@ -1532,12 +1532,12 @@ 1 name - entity.name.type.js + entity.name.type.ts.js 2 name - meta.brace.angle.js + meta.brace.angle.ts.js end @@ -1547,18 +1547,18 @@ 2 name - meta.brace.angle.js + meta.brace.angle.ts.js name - meta.type.parameters.js + meta.type.parameters.ts.js patterns match \b(extends)\b name - keyword.other.js + keyword.other.ts.js include @@ -1579,13 +1579,13 @@ 1 name - keyword.control.js + keyword.control.ts.js end \) name - meta.type.paren.cover.js + meta.type.paren.cover.ts.js patterns @@ -1609,13 +1609,13 @@ 1 name - storage.type.js + storage.type.ts.js match \b(string|number|boolean|symbol|any|void)\b name - meta.type.primitive.js + meta.type.primitive.ts.js type-tuple @@ -1626,7 +1626,7 @@ 0 name - meta.brace.square.js + meta.brace.square.ts.js end @@ -1636,11 +1636,11 @@ 0 name - meta.brace.square.js + meta.brace.square.ts.js name - meta.type.tuple.js + meta.type.tuple.ts.js patterns @@ -1658,7 +1658,7 @@ match \b(undefined)\b name - constant.language.js + constant.language.ts.js var-expr @@ -1669,18 +1669,18 @@ 1 name - storage.type.js + storage.type.ts.js 2 name - variable.js + variable.ts.js end (?=$|[;=\}\{])|(?<=\}) name - meta.var.expr.js + meta.var.expr.ts.js patterns @@ -1706,7 +1706,7 @@ 1 name - keyword.operator.js + keyword.operator.ts.js end diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage index c29607cd6ab..6b6d4a30fe1 100644 --- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage +++ b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage @@ -22,14 +22,14 @@ match \b(public|protected|private)\b name - storage.modifier.jsx + storage.modifier.ts.jsx arithmetic-operator match \*|/|\-\-|\-|\+\+|\+|% name - keyword.operator.arithmetic.jsx + keyword.operator.arithmetic.ts.jsx array-literal @@ -40,7 +40,7 @@ 0 name - meta.brace.square.jsx + meta.brace.square.ts.jsx end @@ -50,11 +50,11 @@ 0 name - meta.brace.square.jsx + meta.brace.square.ts.jsx name - meta.array.literal.jsx + meta.array.literal.ts.jsx patterns @@ -68,7 +68,7 @@ match <<=|>>=|>>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^= name - keyword.operator.assignment.jsx + keyword.operator.assignment.ts.jsx block @@ -79,7 +79,7 @@ 0 name - meta.brace.curly.jsx + meta.brace.curly.ts.jsx end @@ -89,11 +89,11 @@ 0 name - meta.brace.curly.jsx + meta.brace.curly.ts.jsx name - meta.block.jsx + meta.block.ts.jsx patterns @@ -111,12 +111,12 @@ match \b(false|true)\b name - constant.language.boolean.jsx + constant.language.boolean.ts.jsx comment name - comment.jsx + comment.ts.jsx patterns @@ -140,7 +140,7 @@ end \*/ name - comment.block.jsx + comment.block.ts.jsx comment-block-doc @@ -149,21 +149,21 @@ end \*/ name - comment.block.documentation.jsx + comment.block.documentation.ts.jsx comment-line match (//).*$\n? name - comment.line.jsx + comment.line.ts.jsx control-statement match (?<!\.)\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|switch|case)\b name - keyword.control.jsx + keyword.control.ts.jsx decl-block @@ -174,7 +174,7 @@ 0 name - meta.brace.curly.jsx + meta.brace.curly.ts.jsx end @@ -184,11 +184,11 @@ 0 name - meta.brace.curly.jsx + meta.brace.curly.ts.jsx name - meta.decl.block.jsx + meta.decl.block.ts.jsx patterns @@ -200,7 +200,7 @@ declaration name - meta.declaration.jsx + meta.declaration.ts.jsx patterns @@ -228,28 +228,28 @@ 1 name - storage.modifier.jsx + storage.modifier.ts.jsx 2 name - storage.type.jsx + storage.type.ts.jsx 3 name - entity.name.class.jsx + entity.name.class.ts.jsx match (?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) name - meta.enum.declaration.jsx + meta.enum.declaration.ts.jsx expression name - meta.expression.jsx + meta.expression.ts.jsx patterns @@ -343,7 +343,7 @@ match =>|\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void|as)\b name - keyword.operator.jsx + keyword.operator.ts.jsx field-declaration @@ -354,18 +354,18 @@ 1 name - variable.jsx + variable.ts.jsx 2 name - keyword.operator.jsx + keyword.operator.ts.jsx end (?=\}|;|,)|(?<=\}) name - meta.field.declaration.jsx + meta.field.declaration.ts.jsx patterns @@ -381,23 +381,23 @@ 1 name - storage.type.jsx + storage.type.ts.jsx 3 name - keyword.operator.jsx + keyword.operator.ts.jsx match (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(in|of)\b name - forin.expr.jsx + forin.expr.ts.jsx function-call name - functioncall.expr.jsx + functioncall.expr.ts.jsx patterns @@ -419,23 +419,23 @@ 1 name - storage.modifier.jsx + storage.modifier.ts.jsx 2 name - storage.type.function.jsx + storage.type.function.ts.jsx 3 name - entity.name.function.jsx + entity.name.function.ts.jsx end (?=;|\})|(?<=\}) name - meta.function.jsx + meta.function.ts.jsx patterns @@ -471,23 +471,23 @@ 1 name - storage.modifier.jsx + storage.modifier.ts.jsx 2 name - storage.type.function.jsx + storage.type.function.ts.jsx 3 name - entity.name.function.jsx + entity.name.function.ts.jsx match \b(?:(export)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s* name - meta.function.overload.jsx + meta.function.overload.ts.jsx function-type-parameters @@ -498,7 +498,7 @@ 0 name - meta.brace.round.jsx + meta.brace.round.ts.jsx end @@ -508,11 +508,11 @@ 0 name - meta.brace.round.jsx + meta.brace.round.ts.jsx name - meta.function.type.parameter.jsx + meta.function.type.parameter.ts.jsx patterns @@ -542,7 +542,7 @@ 0 name - meta.brace.square.jsx + meta.brace.square.ts.jsx end @@ -552,16 +552,16 @@ 1 name - meta.brace.square.jsx + meta.brace.square.ts.jsx 2 name - keyword.operator.jsx + keyword.operator.ts.jsx name - meta.indexer.declaration.jsx + meta.indexer.declaration.ts.jsx patterns @@ -585,18 +585,18 @@ 1 name - variable.parameter.jsx + variable.parameter.ts.jsx match ([a-zA-Z_$][\w$]*)(?=\:) name - meta.indexer.parameter.jsx + meta.indexer.parameter.ts.jsx jsx name - meta.jsx.jsx + meta.ts.jsx.ts.jsx patterns @@ -621,7 +621,7 @@ end (?=</) name - meta.jsx.children.jsx + meta.ts.jsx.children.ts.jsx patterns @@ -672,24 +672,24 @@ 1 name - punctuation.definition.entity.jsx + punctuation.definition.entity.ts.jsx 3 name - punctuation.definition.entity.jsx + punctuation.definition.entity.ts.jsx match (&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;) name - constant.character.entity.jsx + constant.character.entity.ts.jsx match & name - invalid.illegal.bad-ampersand.jsx + invalid.illegal.bad-ampersand.ts.jsx @@ -702,7 +702,7 @@ 0 name - punctuation.definition.brace.curly.start.jsx + punctuation.definition.brace.curly.start.ts.jsx end @@ -712,11 +712,11 @@ 0 name - punctuation.definition.brace.curly.end.jsx + punctuation.definition.brace.curly.end.ts.jsx name - meta.brace.curly.jsx + meta.brace.curly.ts.jsx patterns @@ -734,7 +734,7 @@ 0 name - punctuation.definition.string.begin.jsx + punctuation.definition.string.begin.ts.jsx end @@ -744,11 +744,11 @@ 0 name - punctuation.definition.string.end.jsx + punctuation.definition.string.end.ts.jsx name - string.quoted.double.jsx + string.quoted.double.ts.jsx patterns @@ -766,7 +766,7 @@ 0 name - punctuation.definition.string.begin.jsx + punctuation.definition.string.begin.ts.jsx end @@ -776,11 +776,11 @@ 0 name - punctuation.definition.string.end.jsx + punctuation.definition.string.end.ts.jsx name - string.quoted.single.jsx + string.quoted.single.ts.jsx patterns @@ -794,7 +794,7 @@ match =(?=\s*(?:'|"|{|/\*|//|\n)) name - keyword.operator.assignment.jsx + keyword.operator.assignment.ts.jsx jsx-tag-attribute-name @@ -803,7 +803,7 @@ 1 name - entity.other.attribute-name.jsx + entity.other.attribute-name.ts.jsx match @@ -812,7 +812,7 @@ ([_$a-zA-Z][-$\w]*) (?=\s|=|/?>|/\*|//) name - meta.tag.attribute-name.jsx + meta.tag.attribute-name.ts.jsx jsx-tag-attributes @@ -845,7 +845,7 @@ match \S+ name - invalid.illegal.attribute.jsx + invalid.illegal.attribute.ts.jsx jsx-tag-close @@ -856,12 +856,12 @@ 1 name - punctuation.definition.tag.begin.jsx + punctuation.definition.tag.begin.ts.jsx 2 name - entity.name.tag.jsx + entity.name.tag.ts.jsx end @@ -871,11 +871,11 @@ 1 name - punctuation.definition.tag.end.jsx + punctuation.definition.tag.end.ts.jsx name - tag.close.jsx + tag.close.ts.jsx patterns @@ -889,7 +889,7 @@ match <\s*> name - invalid.illegal.tag.incomplete.jsx + invalid.illegal.tag.incomplete.ts.jsx jsx-tag-open @@ -903,12 +903,12 @@ 1 name - punctuation.definition.tag.begin.jsx + punctuation.definition.tag.begin.ts.jsx 2 name - entity.name.tag.jsx + entity.name.tag.ts.jsx end @@ -918,11 +918,11 @@ 1 name - punctuation.definition.tag.end.jsx + punctuation.definition.tag.end.ts.jsx name - tag.open.jsx + tag.open.ts.jsx patterns @@ -948,17 +948,17 @@ 1 name - punctuation.definition.tag.begin.jsx + punctuation.definition.tag.begin.ts.jsx 2 name - entity.name.tag.jsx + entity.name.tag.ts.jsx 3 name - punctuation.definition.tag.end.jsx + punctuation.definition.tag.end.ts.jsx end @@ -968,21 +968,21 @@ 1 name - punctuation.definition.tag.begin.jsx + punctuation.definition.tag.begin.ts.jsx 2 name - entity.name.tag.jsx + entity.name.tag.ts.jsx 3 name - punctuation.definition.tag.end.jsx + punctuation.definition.tag.end.ts.jsx name - tag.without-attributes.jsx + tag.without-attributes.ts.jsx patterns @@ -994,7 +994,7 @@ literal name - literal.jsx + literal.ts.jsx patterns @@ -1028,7 +1028,7 @@ match \!|&|~|\||&&|\|\| name - keyword.operator.arithmetic.jsx + keyword.operator.arithmetic.ts.jsx method-declaration @@ -1039,38 +1039,38 @@ 1 name - storage.modifier.jsx + storage.modifier.ts.jsx 2 name - storage.modifier.jsx + storage.modifier.ts.jsx 3 name - storage.type.property.jsx + storage.type.property.ts.jsx 4 name - keyword.operator.jsx + keyword.operator.ts.jsx 5 name - entity.name.function.jsx + entity.name.function.ts.jsx 6 name - keyword.operator.jsx + keyword.operator.ts.jsx end (?=\}|;|,)|(?<=\}) name - meta.method.declaration.jsx + meta.method.declaration.ts.jsx patterns @@ -1106,28 +1106,28 @@ 1 name - storage.modifier.jsx + storage.modifier.ts.jsx 2 name - keyword.operator.jsx + keyword.operator.ts.jsx 3 name - entity.name.function.jsx + entity.name.function.ts.jsx 4 name - keyword.operator.jsx + keyword.operator.ts.jsx match \b(?:(public|private|protected)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<) name - meta.method.overload.declaration.jsx + meta.method.overload.declaration.ts.jsx new-expr @@ -1138,13 +1138,13 @@ 1 name - keyword.operator.jsx + keyword.operator.ts.jsx end (?=[(;]|$) name - new.expr.jsx + new.expr.ts.jsx patterns @@ -1158,14 +1158,14 @@ match \b(null)\b name - constant.language.null.jsx + constant.language.null.ts.jsx numeric-literal match \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b name - constant.numeric.jsx + constant.numeric.ts.jsx object-body @@ -1176,7 +1176,7 @@ 0 name - meta.brace.curly.jsx + meta.brace.curly.ts.jsx end @@ -1186,11 +1186,11 @@ 0 name - meta.brace.curly.jsx + meta.brace.curly.ts.jsx name - meta.object.body.jsx + meta.object.body.ts.jsx patterns @@ -1244,17 +1244,17 @@ 1 name - storage.modifier.jsx + storage.modifier.ts.jsx 2 name - storage.modifier.jsx + storage.modifier.ts.jsx 3 name - storage.type.jsx + storage.type.ts.jsx end @@ -1264,11 +1264,11 @@ 1 name - brace.curly.jsx + brace.curly.ts.jsx name - meta.declaration.object.jsx + meta.declaration.object.ts.jsx patterns @@ -1302,7 +1302,7 @@ 1 name - keyword.other.jsx + keyword.other.ts.jsx end @@ -1312,11 +1312,11 @@ 1 name - brace.curly.jsx + brace.curly.ts.jsx name - meta.object.heritage.jsx + meta.object.heritage.ts.jsx patterns @@ -1340,13 +1340,13 @@ 1 name - storage.type.jsx + storage.type.ts.jsx match (?:\s*([a-zA-Z_$][\w$]*)) name - meta.object.heritage.parent.jsx + meta.object.heritage.parent.ts.jsx object-member @@ -1355,7 +1355,7 @@ end (?=,|\}) name - meta.object.member.jsx + meta.object.member.ts.jsx patterns @@ -1371,13 +1371,13 @@ 0 name - entity.name.class.jsx + entity.name.class.ts.jsx match [a-zA-Z_$][\w$]* name - meta.object.name.jsx + meta.object.name.ts.jsx parameter-name @@ -1386,28 +1386,28 @@ 1 name - storage.modifier.jsx + storage.modifier.ts.jsx 2 name - keyword.operator.jsx + keyword.operator.ts.jsx 3 name - variable.parameter.jsx + variable.parameter.ts.jsx 4 name - keyword.operator.jsx + keyword.operator.ts.jsx match (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??) name - parameter.name.jsx + parameter.name.ts.jsx paren-expression @@ -1418,7 +1418,7 @@ 0 name - meta.brace.paren.jsx + meta.brace.paren.ts.jsx end @@ -1428,7 +1428,7 @@ 0 name - meta.brace.paren.jsx + meta.brace.paren.ts.jsx patterns @@ -1444,7 +1444,7 @@ match \b(get|set)\b name - storage.type.property.jsx + storage.type.property.ts.jsx qstring-double @@ -1453,7 +1453,7 @@ end "|(?=$) name - string.double.jsx + string.double.ts.jsx patterns @@ -1469,7 +1469,7 @@ end '|(?=$) name - string.single.jsx + string.single.ts.jsx patterns @@ -1485,20 +1485,20 @@ end $|(/)[igm]* name - string.regex.jsx + string.regex.ts.jsx patterns match \\. name - constant.character.escape.jsx + constant.character.escape.ts.jsx match \[(\\\]|[^\]])*\] name - constant.character.class.jsx + constant.character.class.ts.jsx @@ -1507,7 +1507,7 @@ match ===|==|=|!=|!==|<=|>=|<>|<|> name - keyword.operator.comparison.jsx + keyword.operator.comparison.ts.jsx return-type @@ -1516,7 +1516,7 @@ end (?=$)|(?=\{|;|//) name - meta.return.type.jsx + meta.return.type.ts.jsx patterns @@ -1530,19 +1530,19 @@ match \b(static)\b name - keyword.other.jsx + keyword.other.ts.jsx storage-keyword match \b(number|boolean|string|any|var|let|function|const)\b name - storage.type.jsx + storage.type.ts.jsx string name - string.jsx + string.ts.jsx patterns @@ -1571,13 +1571,13 @@ 1 name - keyword.control.jsx + keyword.control.ts.jsx end : name - case.expr.jsx + case.expr.ts.jsx patterns @@ -1595,7 +1595,7 @@ 0 name - string.template.jsx + string.template.ts.jsx end @@ -1605,11 +1605,11 @@ 0 name - string.template.jsx + string.template.ts.jsx name - meta.template.jsx + meta.template.ts.jsx patterns @@ -1629,7 +1629,7 @@ end (?=(\$\{|`)) name - string.template.jsx + string.template.ts.jsx patterns @@ -1647,7 +1647,7 @@ 0 name - keyword.operator.jsx + keyword.operator.ts.jsx end @@ -1657,11 +1657,11 @@ 0 name - keyword.operator.jsx + keyword.operator.ts.jsx name - template.element.jsx + template.element.ts.jsx patterns @@ -1675,12 +1675,12 @@ match \b(this)\b name - constant.language.this.jsx + constant.language.this.ts.jsx type name - meta.type.jsx + meta.type.ts.jsx patterns @@ -1724,7 +1724,7 @@ end (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{) name - meta.type.annotation.jsx + meta.type.annotation.ts.jsx patterns @@ -1750,18 +1750,18 @@ 1 name - keyword.other.jsx + keyword.other.ts.jsx 2 name - storage.type.jsx + storage.type.ts.jsx end (?=[,);>]|var|type|function|class|interface) name - meta.type.declaration.jsx + meta.type.declaration.ts.jsx patterns @@ -1779,13 +1779,13 @@ 0 name - keyword.operator.jsx + keyword.operator.ts.jsx end (?=\s*[,\)\{=;>]|//|$) name - meta.type.function.return.jsx + meta.type.function.return.ts.jsx patterns @@ -1801,13 +1801,13 @@ 1 name - entity.name.type.jsx + entity.name.type.ts.jsx match [a-zA-Z_$][.\w$]* name - meta.type.name.jsx + meta.type.name.ts.jsx type-object @@ -1818,7 +1818,7 @@ 0 name - meta.brace.curly.jsx + meta.brace.curly.ts.jsx end @@ -1828,11 +1828,11 @@ 0 name - meta.brace.curly.jsx + meta.brace.curly.ts.jsx name - meta.object.type.jsx + meta.object.type.ts.jsx patterns @@ -1862,7 +1862,7 @@ match [.|] name - keyword.operator.type.jsx + keyword.operator.type.ts.jsx type-parameters @@ -1873,12 +1873,12 @@ 1 name - entity.name.type.jsx + entity.name.type.ts.jsx 2 name - meta.brace.angle.jsx + meta.brace.angle.ts.jsx end @@ -1888,18 +1888,18 @@ 2 name - meta.brace.angle.jsx + meta.brace.angle.ts.jsx name - meta.type.parameters.jsx + meta.type.parameters.ts.jsx patterns match \b(extends)\b name - keyword.other.jsx + keyword.other.ts.jsx include @@ -1920,13 +1920,13 @@ 1 name - keyword.control.jsx + keyword.control.ts.jsx end \) name - meta.type.paren.cover.jsx + meta.type.paren.cover.ts.jsx patterns @@ -1950,13 +1950,13 @@ 1 name - storage.type.jsx + storage.type.ts.jsx match \b(string|number|boolean|symbol|any|void)\b name - meta.type.primitive.jsx + meta.type.primitive.ts.jsx type-tuple @@ -1967,7 +1967,7 @@ 0 name - meta.brace.square.jsx + meta.brace.square.ts.jsx end @@ -1977,11 +1977,11 @@ 0 name - meta.brace.square.jsx + meta.brace.square.ts.jsx name - meta.type.tuple.jsx + meta.type.tuple.ts.jsx patterns @@ -1999,7 +1999,7 @@ match \b(undefined)\b name - constant.language.jsx + constant.language.ts.jsx var-expr @@ -2010,18 +2010,18 @@ 1 name - storage.type.jsx + storage.type.ts.jsx 2 name - variable.jsx + variable.ts.jsx end (?=$|[;=\}\{])|(?<=\}) name - meta.var.expr.jsx + meta.var.expr.ts.jsx patterns @@ -2047,7 +2047,7 @@ 1 name - keyword.operator.jsx + keyword.operator.ts.jsx end diff --git a/extensions/theme-colorful-defaults/package.json b/extensions/theme-colorful-defaults/package.json index a090258fecb..0ca374b23a1 100644 --- a/extensions/theme-colorful-defaults/package.json +++ b/extensions/theme-colorful-defaults/package.json @@ -3,7 +3,7 @@ "displayName": "Colorful Default Themes - Please provide feedback in issue 1849", "description": "The default VS Code Light and Dark themes with a touch of color. We are considering adding these to the default themes in the January release. Please provide feedback in issue 1849.", "categories": [ "Themes" ], - "version": "0.1.6", + "version": "0.1.7", "publisher": "aeschli", "engines": { "vscode": "*" }, "contributes": { diff --git a/extensions/theme-colorful-defaults/themes/dark_plus.tmTheme b/extensions/theme-colorful-defaults/themes/dark_plus.tmTheme index e47345be8a6..adf6178209b 100644 --- a/extensions/theme-colorful-defaults/themes/dark_plus.tmTheme +++ b/extensions/theme-colorful-defaults/themes/dark_plus.tmTheme @@ -21,13 +21,24 @@ name Types declaration and references scope - meta.parameter.type, name.class, storage.type.cs, return-type, new.storage.type, meta.cast, cast.storage.type, heritage.storage.type, annotation.storage.type, var.annotation.storage.type + meta.parameter.type, name.class, storage.type, return-type, meta.cast, new.storage.type.ts, cast.storage.type.ts, heritage.storage.type.ts, annotation.storage.type.ts, var.annotation.storage.type.ts settings foreground #4EC9B0 + + name + TS storage type workaround + scope + storage.type.ts + settings + + foreground + #569CD6 + + name Control flow keywords @@ -43,7 +54,7 @@ name Parameter name scope - meta.parameter.type.variable, variable.parameter + meta.parameter.type.variable, variable.parameter, meta.variable settings foreground diff --git a/extensions/theme-colorful-defaults/themes/light_plus.tmTheme b/extensions/theme-colorful-defaults/themes/light_plus.tmTheme index 5881cb3060e..e068b25a5f1 100644 --- a/extensions/theme-colorful-defaults/themes/light_plus.tmTheme +++ b/extensions/theme-colorful-defaults/themes/light_plus.tmTheme @@ -21,13 +21,24 @@ name Types declaration and references scope - meta.parameter.type, name.class, storage.type.cs, return-type, new.storage.type, meta.cast, cast.storage.type, heritage.storage.type, annotation.storage.type, var.annotation.storage.type settings + meta.parameter.type, name.class, storage.type, return-type, meta.cast, new.storage.type.ts, cast.storage.type.ts, heritage.storage.type.ts, annotation.storage.type.ts, var.annotation.storage.type.ts settings foreground #2B91AF + + name + TS storage type workaround + scope + storage.type.ts + settings + + foreground + #0000FF + + name Control flow keywords @@ -43,7 +54,7 @@ name Parameter name scope - meta.parameter.type.variable, variable.parameter + meta.parameter.type.variable, variable.parameter, meta.variable settings foreground diff --git a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage b/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage index 1a0c48cf5a3..2856cf93e13 100644 --- a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage +++ b/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage @@ -22,14 +22,14 @@ match \b(public|protected|private)\b name - storage.modifier.tsx + storage.modifier.ts.tsx arithmetic-operator match \*|/|\-\-|\-|\+\+|\+|% name - keyword.operator.arithmetic.tsx + keyword.operator.arithmetic.ts.tsx array-literal @@ -40,7 +40,7 @@ 0 name - meta.brace.square.tsx + meta.brace.square.ts.tsx end @@ -50,11 +50,11 @@ 0 name - meta.brace.square.tsx + meta.brace.square.ts.tsx name - meta.array.literal.tsx + meta.array.literal.ts.tsx patterns @@ -68,7 +68,7 @@ match <<=|>>=|>>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^= name - keyword.operator.assignment.tsx + keyword.operator.assignment.ts.tsx block @@ -79,7 +79,7 @@ 0 name - meta.brace.curly.tsx + meta.brace.curly.ts.tsx end @@ -89,11 +89,11 @@ 0 name - meta.brace.curly.tsx + meta.brace.curly.ts.tsx name - meta.block.tsx + meta.block.ts.tsx patterns @@ -111,12 +111,12 @@ match \b(false|true)\b name - constant.language.boolean.tsx + constant.language.boolean.ts.tsx comment name - comment.tsx + comment.ts.tsx patterns @@ -140,7 +140,7 @@ end \*/ name - comment.block.tsx + comment.block.ts.tsx comment-block-doc @@ -149,21 +149,21 @@ end \*/ name - comment.block.documentation.tsx + comment.block.documentation.ts.tsx comment-line match (//).*$\n? name - comment.line.tsx + comment.line.ts.tsx control-statement match (?<!\.)\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|switch|case)\b name - keyword.control.tsx + keyword.control.ts.tsx decl-block @@ -174,7 +174,7 @@ 0 name - meta.brace.curly.tsx + meta.brace.curly.ts.tsx end @@ -184,11 +184,11 @@ 0 name - meta.brace.curly.tsx + meta.brace.curly.ts.tsx name - meta.decl.block.tsx + meta.decl.block.ts.tsx patterns @@ -200,7 +200,7 @@ declaration name - meta.declaration.tsx + meta.declaration.ts.tsx patterns @@ -228,28 +228,28 @@ 1 name - storage.modifier.tsx + storage.modifier.ts.tsx 2 name - storage.type.tsx + storage.type.ts.tsx 3 name - entity.name.class.tsx + entity.name.class.ts.tsx match (?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) name - meta.enum.declaration.tsx + meta.enum.declaration.ts.tsx expression name - meta.expression.tsx + meta.expression.ts.tsx patterns @@ -343,7 +343,7 @@ match =>|\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void|as)\b name - keyword.operator.tsx + keyword.operator.ts.tsx field-declaration @@ -354,18 +354,18 @@ 1 name - variable.tsx + variable.ts.tsx 2 name - keyword.operator.tsx + keyword.operator.ts.tsx end (?=\}|;|,)|(?<=\}) name - meta.field.declaration.tsx + meta.field.declaration.ts.tsx patterns @@ -381,23 +381,23 @@ 1 name - storage.type.tsx + storage.type.ts.tsx 3 name - keyword.operator.tsx + keyword.operator.ts.tsx match (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(in|of)\b name - forin.expr.tsx + forin.expr.ts.tsx function-call name - functioncall.expr.tsx + functioncall.expr.ts.tsx patterns @@ -419,23 +419,23 @@ 1 name - storage.modifier.tsx + storage.modifier.ts.tsx 2 name - storage.type.function.tsx + storage.type.function.ts.tsx 3 name - entity.name.function.tsx + entity.name.function.ts.tsx end (?=;|\})|(?<=\}) name - meta.function.tsx + meta.function.ts.tsx patterns @@ -471,23 +471,23 @@ 1 name - storage.modifier.tsx + storage.modifier.ts.tsx 2 name - storage.type.function.tsx + storage.type.function.ts.tsx 3 name - entity.name.function.tsx + entity.name.function.ts.tsx match \b(?:(export)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s* name - meta.function.overload.tsx + meta.function.overload.ts.tsx function-type-parameters @@ -498,7 +498,7 @@ 0 name - meta.brace.round.tsx + meta.brace.round.ts.tsx end @@ -508,11 +508,11 @@ 0 name - meta.brace.round.tsx + meta.brace.round.ts.tsx name - meta.function.type.parameter.tsx + meta.function.type.parameter.ts.tsx patterns @@ -542,7 +542,7 @@ 0 name - meta.brace.square.tsx + meta.brace.square.ts.tsx end @@ -552,16 +552,16 @@ 1 name - meta.brace.square.tsx + meta.brace.square.ts.tsx 2 name - keyword.operator.tsx + keyword.operator.ts.tsx name - meta.indexer.declaration.tsx + meta.indexer.declaration.ts.tsx patterns @@ -585,18 +585,18 @@ 1 name - variable.parameter.tsx + variable.parameter.ts.tsx match ([a-zA-Z_$][\w$]*)(?=\:) name - meta.indexer.parameter.tsx + meta.indexer.parameter.ts.tsx jsx name - meta.jsx.tsx + meta.jsx.ts.tsx patterns @@ -621,7 +621,7 @@ end (?=</) name - meta.jsx.children.tsx + meta.jsx.children.ts.tsx patterns @@ -672,24 +672,24 @@ 1 name - punctuation.definition.entity.tsx + punctuation.definition.entity.ts.tsx 3 name - punctuation.definition.entity.tsx + punctuation.definition.entity.ts.tsx match (&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;) name - constant.character.entity.tsx + constant.character.entity.ts.tsx match & name - invalid.illegal.bad-ampersand.tsx + invalid.illegal.bad-ampersand.ts.tsx @@ -702,7 +702,7 @@ 0 name - punctuation.definition.brace.curly.start.tsx + punctuation.definition.brace.curly.start.ts.tsx end @@ -712,11 +712,11 @@ 0 name - punctuation.definition.brace.curly.end.tsx + punctuation.definition.brace.curly.end.ts.tsx name - meta.brace.curly.tsx + meta.brace.curly.ts.tsx patterns @@ -734,7 +734,7 @@ 0 name - punctuation.definition.string.begin.tsx + punctuation.definition.string.begin.ts.tsx end @@ -744,11 +744,11 @@ 0 name - punctuation.definition.string.end.tsx + punctuation.definition.string.end.ts.tsx name - string.quoted.double.tsx + string.quoted.double.ts.tsx patterns @@ -766,7 +766,7 @@ 0 name - punctuation.definition.string.begin.tsx + punctuation.definition.string.begin.ts.tsx end @@ -776,11 +776,11 @@ 0 name - punctuation.definition.string.end.tsx + punctuation.definition.string.end.ts.tsx name - string.quoted.single.tsx + string.quoted.single.ts.tsx patterns @@ -794,7 +794,7 @@ match =(?=\s*(?:'|"|{|/\*|//|\n)) name - keyword.operator.assignment.tsx + keyword.operator.assignment.ts.tsx jsx-tag-attribute-name @@ -803,7 +803,7 @@ 1 name - entity.other.attribute-name.tsx + entity.other.attribute-name.ts.tsx match @@ -812,7 +812,7 @@ ([_$a-zA-Z][-$\w]*) (?=\s|=|/?>|/\*|//) name - meta.tag.attribute-name.tsx + meta.tag.attribute-name.ts.tsx jsx-tag-attributes @@ -845,7 +845,7 @@ match \S+ name - invalid.illegal.attribute.tsx + invalid.illegal.attribute.ts.tsx jsx-tag-close @@ -856,12 +856,12 @@ 1 name - punctuation.definition.tag.begin.tsx + punctuation.definition.tag.begin.ts.tsx 2 name - entity.name.tag.tsx + entity.name.tag.ts.tsx end @@ -871,11 +871,11 @@ 1 name - punctuation.definition.tag.end.tsx + punctuation.definition.tag.end.ts.tsx name - tag.close.tsx + tag.close.ts.tsx patterns @@ -889,7 +889,7 @@ match <\s*> name - invalid.illegal.tag.incomplete.tsx + invalid.illegal.tag.incomplete.ts.tsx jsx-tag-open @@ -903,12 +903,12 @@ 1 name - punctuation.definition.tag.begin.tsx + punctuation.definition.tag.begin.ts.tsx 2 name - entity.name.tag.tsx + entity.name.tag.ts.tsx end @@ -918,11 +918,11 @@ 1 name - punctuation.definition.tag.end.tsx + punctuation.definition.tag.end.ts.tsx name - tag.open.tsx + tag.open.ts.tsx patterns @@ -948,17 +948,17 @@ 1 name - punctuation.definition.tag.begin.tsx + punctuation.definition.tag.begin.ts.tsx 2 name - entity.name.tag.tsx + entity.name.tag.ts.tsx 3 name - punctuation.definition.tag.end.tsx + punctuation.definition.tag.end.ts.tsx end @@ -968,21 +968,21 @@ 1 name - punctuation.definition.tag.begin.tsx + punctuation.definition.tag.begin.ts.tsx 2 name - entity.name.tag.tsx + entity.name.tag.ts.tsx 3 name - punctuation.definition.tag.end.tsx + punctuation.definition.tag.end.ts.tsx name - tag.without-attributes.tsx + tag.without-attributes.ts.tsx patterns @@ -994,7 +994,7 @@ literal name - literal.tsx + literal.ts.tsx patterns @@ -1028,7 +1028,7 @@ match \!|&|~|\||&&|\|\| name - keyword.operator.arithmetic.tsx + keyword.operator.arithmetic.ts.tsx method-declaration @@ -1039,38 +1039,38 @@ 1 name - storage.modifier.tsx + storage.modifier.ts.tsx 2 name - storage.modifier.tsx + storage.modifier.ts.tsx 3 name - storage.type.property.tsx + storage.type.property.ts.tsx 4 name - keyword.operator.tsx + keyword.operator.ts.tsx 5 name - entity.name.function.tsx + entity.name.function.ts.tsx 6 name - keyword.operator.tsx + keyword.operator.ts.tsx end (?=\}|;|,)|(?<=\}) name - meta.method.declaration.tsx + meta.method.declaration.ts.tsx patterns @@ -1106,28 +1106,28 @@ 1 name - storage.modifier.tsx + storage.modifier.ts.tsx 2 name - keyword.operator.tsx + keyword.operator.ts.tsx 3 name - entity.name.function.tsx + entity.name.function.ts.tsx 4 name - keyword.operator.tsx + keyword.operator.ts.tsx match \b(?:(public|private|protected)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<) name - meta.method.overload.declaration.tsx + meta.method.overload.declaration.ts.tsx new-expr @@ -1138,13 +1138,13 @@ 1 name - keyword.operator.tsx + keyword.operator.ts.tsx end (?=[(;]|$) name - new.expr.tsx + new.expr.ts.tsx patterns @@ -1158,14 +1158,14 @@ match \b(null)\b name - constant.language.null.tsx + constant.language.null.ts.tsx numeric-literal match \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b name - constant.numeric.tsx + constant.numeric.ts.tsx object-body @@ -1176,7 +1176,7 @@ 0 name - meta.brace.curly.tsx + meta.brace.curly.ts.tsx end @@ -1186,11 +1186,11 @@ 0 name - meta.brace.curly.tsx + meta.brace.curly.ts.tsx name - meta.object.body.tsx + meta.object.body.ts.tsx patterns @@ -1244,17 +1244,17 @@ 1 name - storage.modifier.tsx + storage.modifier.ts.tsx 2 name - storage.modifier.tsx + storage.modifier.ts.tsx 3 name - storage.type.tsx + storage.type.ts.tsx end @@ -1264,11 +1264,11 @@ 1 name - brace.curly.tsx + brace.curly.ts.tsx name - meta.declaration.object.tsx + meta.declaration.object.ts.tsx patterns @@ -1302,7 +1302,7 @@ 1 name - keyword.other.tsx + keyword.other.ts.tsx end @@ -1312,11 +1312,11 @@ 1 name - brace.curly.tsx + brace.curly.ts.tsx name - meta.object.heritage.tsx + meta.object.heritage.ts.tsx patterns @@ -1340,13 +1340,13 @@ 1 name - storage.type.tsx + storage.type.ts.tsx match (?:\s*([a-zA-Z_$][\w$]*)) name - meta.object.heritage.parent.tsx + meta.object.heritage.parent.ts.tsx object-member @@ -1355,7 +1355,7 @@ end (?=,|\}) name - meta.object.member.tsx + meta.object.member.ts.tsx patterns @@ -1371,13 +1371,13 @@ 0 name - entity.name.class.tsx + entity.name.class.ts.tsx match [a-zA-Z_$][\w$]* name - meta.object.name.tsx + meta.object.name.ts.tsx parameter-name @@ -1386,28 +1386,28 @@ 1 name - storage.modifier.tsx + storage.modifier.ts.tsx 2 name - keyword.operator.tsx + keyword.operator.ts.tsx 3 name - variable.parameter.tsx + variable.parameter.ts.tsx 4 name - keyword.operator.tsx + keyword.operator.ts.tsx match (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??) name - parameter.name.tsx + parameter.name.ts.tsx paren-expression @@ -1418,7 +1418,7 @@ 0 name - meta.brace.paren.tsx + meta.brace.paren.ts.tsx end @@ -1428,7 +1428,7 @@ 0 name - meta.brace.paren.tsx + meta.brace.paren.ts.tsx patterns @@ -1444,7 +1444,7 @@ match \b(get|set)\b name - storage.type.property.tsx + storage.type.property.ts.tsx qstring-double @@ -1453,7 +1453,7 @@ end "|(?=$) name - string.double.tsx + string.double.ts.tsx patterns @@ -1469,7 +1469,7 @@ end '|(?=$) name - string.single.tsx + string.single.ts.tsx patterns @@ -1485,20 +1485,20 @@ end $|(/)[igm]* name - string.regex.tsx + string.regex.ts.tsx patterns match \\. name - constant.character.escape.tsx + constant.character.escape.ts.tsx match \[(\\\]|[^\]])*\] name - constant.character.class.tsx + constant.character.class.ts.tsx @@ -1507,7 +1507,7 @@ match ===|==|=|!=|!==|<=|>=|<>|<|> name - keyword.operator.comparison.tsx + keyword.operator.comparison.ts.tsx return-type @@ -1516,7 +1516,7 @@ end (?=$)|(?=\{|;|//) name - meta.return.type.tsx + meta.return.type.ts.tsx patterns @@ -1530,19 +1530,19 @@ match \b(static)\b name - keyword.other.tsx + keyword.other.ts.tsx storage-keyword match \b(number|boolean|string|any|var|let|function|const)\b name - storage.type.tsx + storage.type.ts.tsx string name - string.tsx + string.ts.tsx patterns @@ -1571,13 +1571,13 @@ 1 name - keyword.control.tsx + keyword.control.ts.tsx end : name - case.expr.tsx + case.expr.ts.tsx patterns @@ -1595,7 +1595,7 @@ 0 name - string.template.tsx + string.template.ts.tsx end @@ -1605,11 +1605,11 @@ 0 name - string.template.tsx + string.template.ts.tsx name - meta.template.tsx + meta.template.ts.tsx patterns @@ -1629,7 +1629,7 @@ end (?=(\$\{|`)) name - string.template.tsx + string.template.ts.tsx patterns @@ -1647,7 +1647,7 @@ 0 name - keyword.operator.tsx + keyword.operator.ts.tsx end @@ -1657,11 +1657,11 @@ 0 name - keyword.operator.tsx + keyword.operator.ts.tsx name - template.element.tsx + template.element.ts.tsx patterns @@ -1675,12 +1675,12 @@ match \b(this)\b name - constant.language.this.tsx + constant.language.this.ts.tsx type name - meta.type.tsx + meta.type.ts.tsx patterns @@ -1724,7 +1724,7 @@ end (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{) name - meta.type.annotation.tsx + meta.type.annotation.ts.tsx patterns @@ -1750,18 +1750,18 @@ 1 name - keyword.other.tsx + keyword.other.ts.tsx 2 name - storage.type.tsx + storage.type.ts.tsx end (?=[,);>]|var|type|function|class|interface) name - meta.type.declaration.tsx + meta.type.declaration.ts.tsx patterns @@ -1779,13 +1779,13 @@ 0 name - keyword.operator.tsx + keyword.operator.ts.tsx end (?=\s*[,\)\{=;>]|//|$) name - meta.type.function.return.tsx + meta.type.function.return.ts.tsx patterns @@ -1801,13 +1801,13 @@ 1 name - entity.name.type.tsx + entity.name.type.ts.tsx match [a-zA-Z_$][.\w$]* name - meta.type.name.tsx + meta.type.name.ts.tsx type-object @@ -1818,7 +1818,7 @@ 0 name - meta.brace.curly.tsx + meta.brace.curly.ts.tsx end @@ -1828,11 +1828,11 @@ 0 name - meta.brace.curly.tsx + meta.brace.curly.ts.tsx name - meta.object.type.tsx + meta.object.type.ts.tsx patterns @@ -1862,7 +1862,7 @@ match [.|] name - keyword.operator.type.tsx + keyword.operator.type.ts.tsx type-parameters @@ -1873,12 +1873,12 @@ 1 name - entity.name.type.tsx + entity.name.type.ts.tsx 2 name - meta.brace.angle.tsx + meta.brace.angle.ts.tsx end @@ -1888,18 +1888,18 @@ 2 name - meta.brace.angle.tsx + meta.brace.angle.ts.tsx name - meta.type.parameters.tsx + meta.type.parameters.ts.tsx patterns match \b(extends)\b name - keyword.other.tsx + keyword.other.ts.tsx include @@ -1920,13 +1920,13 @@ 1 name - keyword.control.tsx + keyword.control.ts.tsx end \) name - meta.type.paren.cover.tsx + meta.type.paren.cover.ts.tsx patterns @@ -1950,13 +1950,13 @@ 1 name - storage.type.tsx + storage.type.ts.tsx match \b(string|number|boolean|symbol|any|void)\b name - meta.type.primitive.tsx + meta.type.primitive.ts.tsx type-tuple @@ -1967,7 +1967,7 @@ 0 name - meta.brace.square.tsx + meta.brace.square.ts.tsx end @@ -1977,11 +1977,11 @@ 0 name - meta.brace.square.tsx + meta.brace.square.ts.tsx name - meta.type.tuple.tsx + meta.type.tuple.ts.tsx patterns @@ -1999,7 +1999,7 @@ match \b(undefined)\b name - constant.language.tsx + constant.language.ts.tsx var-expr @@ -2010,18 +2010,18 @@ 1 name - storage.type.tsx + storage.type.ts.tsx 2 name - variable.tsx + variable.ts.tsx end (?=$|[;=\}\{])|(?<=\}) name - meta.var.expr.tsx + meta.var.expr.ts.tsx patterns @@ -2047,7 +2047,7 @@ 1 name - keyword.operator.tsx + keyword.operator.ts.tsx end diff --git a/src/vs/editor/browser/widget/media/tokens.css b/src/vs/editor/browser/widget/media/tokens.css index ff6a96f2023..a4e7edf3686 100644 --- a/src/vs/editor/browser/widget/media/tokens.css +++ b/src/vs/editor/browser/widget/media/tokens.css @@ -10,6 +10,8 @@ .monaco-editor.vs .token.terminal { color: #e00000; } .monaco-editor.vs .token.terminal.code1 { font-weight: bold; } .monaco-editor.vs .token.variable { color: #001188; } +.monaco-editor.vs .token.variable.name { color: #001188; } + .monaco-editor.vs .token.variable.predefined { color: #4864AA; } .monaco-editor.vs .token.constant { color: #dd0000; } .monaco-editor.vs .token.string { color: #A31515; } @@ -50,10 +52,6 @@ /* YAML */ .monaco-editor.vs .token.string.yaml { color: #0451A5; } -/* C# */ -.monaco-editor.vs .token.type { color: #008080; } -.monaco-editor.vs .token.identifier.method { color: #000000; } - /* SQL */ .monaco-editor.vs .token.string.sql { color: #FF0000; } .monaco-editor.vs .token.predefined.sql { color: #FF00FF; } @@ -100,6 +98,7 @@ .monaco-editor.vs-dark .token.terminal { color: #BD5050; } .monaco-editor.vs-dark .token.terminal.code1 { font-weight: bold; } .monaco-editor.vs-dark .token.variable { color: #74B0DF; } +.monaco-editor.vs-dark .token.variable.name { color: #74B0DF; } .monaco-editor.vs-dark .token.variable.predefined { color: #4864AA; } .monaco-editor.vs-dark .token.constant { color: #dd0000; } @@ -142,10 +141,6 @@ /* YAML */ .monaco-editor.vs-dark .token.string.yaml { color: #CE9178; } -/* C# */ -.monaco-editor.vs-dark .token.type { color: #3DC9B0; } -.monaco-editor.vs-dark .token.identifier.method { color: #D4D4D4; } - /* SQL */ .monaco-editor.vs-dark .token.string.sql { color: #FF0000; } .monaco-editor.vs-dark .token.predefined.sql { color: #FF00FF; } @@ -191,7 +186,8 @@ .monaco-editor.hc-black .token.terminal { color: #569CD6; } .monaco-editor.hc-black .token.terminal.code1 { font-weight: bold; } -.monaco-editor.hc-black .token.variable { color: #1AEBFF; } +.monaco-editor.hc-black .token.variable, +.monaco-editor.hc-black .token.variable.name, .monaco-editor.hc-black .token.variable.predefined { color: #1AEBFF; } .monaco-editor.hc-black .token.constant { color: #dd0000; } .monaco-editor.hc-black .token.string { color: #CE9178; } @@ -234,10 +230,6 @@ /* YAML */ .monaco-editor.hc-black .token.string.yaml { color: #CE9178; } -/* C# */ -.monaco-editor.hc-black .token.type { color: #3DC9B0; } -.monaco-editor.hc-black .token.identifier.method { color: #D4D4D4; } - /* SQL */ .monaco-editor.hc-black .token.string.sql { color: #FF0000; } .monaco-editor.hc-black .token.predefined.sql { color: #FF00FF; } @@ -347,6 +339,7 @@ .monaco-editor.vs .token.markup.raw .monaco-editor.vs .token.markup.other*/ +.monaco-editor.vs .token.meta.variable { color: #000000; } .monaco-editor.vs .token.meta.selector { color: #800000; } .monaco-editor.vs .token.meta.tag { color: #800000; } .monaco-editor.vs .token.meta.preprocessor { color: #0000FF; } @@ -359,14 +352,18 @@ .monaco-editor.vs .token.storage { color: #0000FF; } .monaco-editor.vs .token.storage.content { color: red; } -.monaco-editor.vs .token.storage.type { color: #0000FF; } +.monaco-editor.vs .token.storage.type { color: #000000; } .monaco-editor.vs .token.storage.modifier { color: #0000FF; } -.monaco-editor.vs .token.annotation.storage.type, -.monaco-editor.vs .token.heritage.storage.type, -.monaco-editor.vs .token.cast.storage.type, -.monaco-editor.vs .token.new.storage.type { color: #000000; } -.monaco-editor.vs .token.var.storage.type { color: #0000FF; } -.monaco-editor.vs .token.var.annotation.storage.type { color: #000000; } + +/* ts grammar workarounds*/ +.monaco-editor.vs .token.storage.type.ts { color: #0000FF; } +.monaco-editor.vs .token.storage.modifier.ts { color: #0000FF; } +.monaco-editor.vs .token.var.storage.type.ts { color: #0000FF; } +.monaco-editor.vs .token.annotation.storage.type.ts, +.monaco-editor.vs .token.heritage.storage.type.ts, +.monaco-editor.vs .token.cast.storage.type.ts, +.monaco-editor.vs .token.var.annotation.storage.type.ts, +.monaco-editor.vs .token.new.storage.type.ts { color: #000000; } .monaco-editor.vs .token.string { color: #A31515; } .monaco-editor.vs .token.string.tag { color: blue; } @@ -474,6 +471,10 @@ .monaco-editor.vs-dark .token.markup.raw .monaco-editor.vs-dark .token.markup.other*/ +/* for backward compatibility, keep variables in js/ts uncolored */ +.monaco-editor.vs-dark .token.meta.variable { color: #D4D4D4; } + + .monaco-editor.vs-dark .token.meta.selector { color: #D7BA7D; } .monaco-editor.vs-dark .token.meta.tag { color: #808080; } /* gray for html/xml-tag brackets */ .monaco-editor.vs-dark .token.meta.preprocessor { color: #569CD6; } @@ -486,14 +487,19 @@ .monaco-editor.vs-dark .token.storage { color: #569CD6; } .monaco-editor.vs-dark .token.storage.content { color: #9CDCFE; } -.monaco-editor.vs-dark .token.storage.type { color: #569CD6; } +.monaco-editor.vs-dark .token.storage.type { color: #D4D4D4; } .monaco-editor.vs-dark .token.storage.modifier { color: #569CD6; } -.monaco-editor.vs-dark .token.annotation.storage.type, -.monaco-editor.vs-dark .token.heritage.storage.type, -.monaco-editor.vs-dark .token.cast.storage.type, -.monaco-editor.vs-dark .token.new.storage.type { color: #D4D4D4; } -.monaco-editor.vs-dark .token.var.storage.type { color: #569CD6; } -.monaco-editor.vs-dark .token.var.annotation.storage.type { color: #D4D4D4; } + +/* ts grammar workarounds*/ +.monaco-editor.vs-dark .token.storage.type.ts { color: #569CD6; } +.monaco-editor.vs-dark .token.storage.modifier.ts { color: #569CD6; } +.monaco-editor.vs-dark .token.var.storage.type.ts { color: #569CD6; } +.monaco-editor.vs-dark .token.annotation.storage.type.ts, +.monaco-editor.vs-dark .token.heritage.storage.type.ts, +.monaco-editor.vs-dark .token.cast.storage.type.ts, +.monaco-editor.vs-dark .token.var.annotation.storage.type.ts, +.monaco-editor.vs-dark .token.new.storage.type.ts { color: #D4D4D4; } + .monaco-editor.vs-dark .token.string { color: #CE9178; } .monaco-editor.vs-dark .token.string.tag { color: #CE9178; } @@ -601,6 +607,9 @@ .monaco-editor.hc-black .token.markup.raw .monaco-editor.hc-black .token.markup.other*/ +/* for backward compatibility, keep variables in js/ts uncolored */ +.monaco-editor.hc-black .token.meta.variable { color: #D4D4D4; } + .monaco-editor.hc-black .token.meta.selector { color: #D7BA7D; } .monaco-editor.hc-black .token.meta.tag { color: #808080; } /* gray for html/xml-tag brackets */ .monaco-editor.hc-black .token.meta.preprocessor { color: #569CD6; } @@ -613,14 +622,18 @@ .monaco-editor.hc-black .token.storage { color: #569CD6; } .monaco-editor.hc-black .token.storage.content { color: #9CDCFE; } -.monaco-editor.hc-black .token.storage.type { color: #569CD6; } +.monaco-editor.hc-black .token.storage.type { color: #D4D4D4; } .monaco-editor.hc-black .token.storage.modifier { color: #569CD6; } -.monaco-editor.hc-black .token.annotation.storage.type, -.monaco-editor.hc-black .token.heritage.storage.type, -.monaco-editor.hc-black .token.cast.storage.type, -.monaco-editor.hc-black .token.new.storage.type { color: #D4D4D4; } -.monaco-editor.hc-black .token.var.storage.type { color: #569CD6; } -.monaco-editor.hc-black .token.var.annotation.storage.type { color: #D4D4D4; } + +/* ts grammar workarounds*/ +.monaco-editor.hc-black .token.storage.type.ts { color: #569CD6; } +.monaco-editor.hc-black .token.storage.modifier.ts { color: #569CD6; } +.monaco-editor.hc-black .token.var.storage.type.ts { color: #569CD6; } +.monaco-editor.hc-black .token.annotation.storage.type.ts, +.monaco-editor.hc-black .token.heritage.storage.type.ts, +.monaco-editor.hc-black .token.cast.storage.type.ts, +.monaco-editor.hc-black .token.var.annotation.storage.type.ts, +.monaco-editor.hc-black .token.new.storage.type.ts { color: #D4D4D4; } .monaco-editor.hc-black .token.string { color: #CE9178; } .monaco-editor.hc-black .token.string.tag { color: #CE9178; }