Skip to content

Commit d071e86

Browse files
aeschliaeschli
committed
[java] JavaDoc syntax coloring doesn't work on closing tags. Fixes microsoft#16041 
1 parent 629ed5e commit d071e86

3 files changed

Lines changed: 101 additions & 1 deletion

File tree

‎extensions/java/syntaxes/javadoc.tmLanguage.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
},
260260
{
261261
"comment": "This prevents < characters in commented source from starting\n\t\t\t\t\t\t\t\ta tag that will not end. List of allowed tags taken from\n\t\t\t\t\t\t\t\tjava checkstyle.",
262-
"match": "<(?!(a|abbr|acronym|address|area|b|bdo|big|blockquote|br|caption|cite|code|colgroup|dd|del|div|dfn|dl|dt|em|fieldset|font|h1toh6|hr|i|img|ins|kbd|li|ol|p|pre|q|samp|small|span|strong|sub|sup|table|tbody|td|tfoot|th|thread|tr|tt|u|ul)\\b[^>]*>)"
262+
"match": "<(?!/?(a|abbr|acronym|address|area|b|bdo|big|blockquote|br|caption|cite|code|colgroup|dd|del|div|dfn|dl|dt|em|fieldset|font|h1toh6|hr|i|img|ins|kbd|li|ol|p|pre|q|samp|small|span|strong|sub|sup|table|tbody|td|tfoot|th|thread|tr|tt|u|ul)\\b[^>]*>)"
263263
},
264264
{
265265
"include": "text.html.basic"

‎extensions/java/test/colorize-fixtures/basic.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public class TestClass {
1111
private String aString;
1212

1313
/**
14+
* <p>Note:</p> Hello
1415
* @param args
1516
*/
1617
public void doSomething(int a) {

‎extensions/java/test/colorize-results/basic_java.json‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,105 @@
461461
"hc_black": "comment: #7CA668"
462462
}
463463
},
464+
{
465+
"c": "<",
466+
"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html punctuation.definition.tag.begin.html",
467+
"r": {
468+
"dark_plus": "punctuation.definition.tag: #808080",
469+
"light_plus": "punctuation.definition.tag: #800000",
470+
"dark_vs": "punctuation.definition.tag: #808080",
471+
"light_vs": "punctuation.definition.tag: #800000",
472+
"hc_black": "punctuation.definition.tag: #808080"
473+
}
474+
},
475+
{
476+
"c": "p",
477+
"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html entity.name.tag.block.any.html",
478+
"r": {
479+
"dark_plus": "entity.name.tag: #569CD6",
480+
"light_plus": "entity.name.tag: #800000",
481+
"dark_vs": "entity.name.tag: #569CD6",
482+
"light_vs": "entity.name.tag: #800000",
483+
"hc_black": "entity.name.tag: #569CD6"
484+
}
485+
},
486+
{
487+
"c": ">",
488+
"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html punctuation.definition.tag.end.html",
489+
"r": {
490+
"dark_plus": "punctuation.definition.tag: #808080",
491+
"light_plus": "punctuation.definition.tag: #800000",
492+
"dark_vs": "punctuation.definition.tag: #808080",
493+
"light_vs": "punctuation.definition.tag: #800000",
494+
"hc_black": "punctuation.definition.tag: #808080"
495+
}
496+
},
497+
{
498+
"c": "Note:",
499+
"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html",
500+
"r": {
501+
"dark_plus": "comment: #608B4E",
502+
"light_plus": "comment: #008000",
503+
"dark_vs": "comment: #608B4E",
504+
"light_vs": "comment: #008000",
505+
"hc_black": "comment: #7CA668"
506+
}
507+
},
508+
{
509+
"c": "</",
510+
"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html punctuation.definition.tag.begin.html",
511+
"r": {
512+
"dark_plus": "punctuation.definition.tag: #808080",
513+
"light_plus": "punctuation.definition.tag: #800000",
514+
"dark_vs": "punctuation.definition.tag: #808080",
515+
"light_vs": "punctuation.definition.tag: #800000",
516+
"hc_black": "punctuation.definition.tag: #808080"
517+
}
518+
},
519+
{
520+
"c": "p",
521+
"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html entity.name.tag.block.any.html",
522+
"r": {
523+
"dark_plus": "entity.name.tag: #569CD6",
524+
"light_plus": "entity.name.tag: #800000",
525+
"dark_vs": "entity.name.tag: #569CD6",
526+
"light_vs": "entity.name.tag: #800000",
527+
"hc_black": "entity.name.tag: #569CD6"
528+
}
529+
},
530+
{
531+
"c": ">",
532+
"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html punctuation.definition.tag.end.html",
533+
"r": {
534+
"dark_plus": "punctuation.definition.tag: #808080",
535+
"light_plus": "punctuation.definition.tag: #800000",
536+
"dark_vs": "punctuation.definition.tag: #808080",
537+
"light_vs": "punctuation.definition.tag: #800000",
538+
"hc_black": "punctuation.definition.tag: #808080"
539+
}
540+
},
541+
{
542+
"c": " Hello",
543+
"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html",
544+
"r": {
545+
"dark_plus": "comment: #608B4E",
546+
"light_plus": "comment: #008000",
547+
"dark_vs": "comment: #608B4E",
548+
"light_vs": "comment: #008000",
549+
"hc_black": "comment: #7CA668"
550+
}
551+
},
552+
{
553+
"c": "\t * ",
554+
"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html",
555+
"r": {
556+
"dark_plus": "comment: #608B4E",
557+
"light_plus": "comment: #008000",
558+
"dark_vs": "comment: #608B4E",
559+
"light_vs": "comment: #008000",
560+
"hc_black": "comment: #7CA668"
561+
}
562+
},
464563
{
465564
"c": "@",
466565
"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.documentation.tag.param.javadoc keyword.other.documentation.param.javadoc punctuation.definition.keyword.javadoc",

0 commit comments

Comments
 (0)