[java] switch to atom/language-java grammar
This commit is contained in:
Martin Aeschlimann
parent
795edc34d2
commit
c33d2824cc
|
|
@ -1,42 +1,9 @@
|
|||
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
|
||||
[{
|
||||
"name": "textmate/java.tmbundle",
|
||||
"name": "atom/language-java",
|
||||
"version": "0.0.0",
|
||||
"license": "TextMate Bundle License",
|
||||
"repositoryURL": "https://github.com/textmate/java.tmbundle",
|
||||
"licenseDetail": [
|
||||
"Copyright (c) textmate-java.tmbundle project authors",
|
||||
"",
|
||||
"If not otherwise specified (see below), files in this repository fall under the following license:",
|
||||
"",
|
||||
"Permission to copy, use, modify, sell and distribute this",
|
||||
"software is granted. This software is provided \"as is\" without",
|
||||
"express or implied warranty, and with no claim as to its",
|
||||
"suitability for any purpose.",
|
||||
"",
|
||||
"An exception is made for files in readable text which contain their own license information,",
|
||||
"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
|
||||
"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
|
||||
"\"tidy\" is accompanied by \"tidy-license.txt\"."
|
||||
]
|
||||
},{
|
||||
"name": "textmate/javadoc.tmbundle",
|
||||
"version": "0.0.0",
|
||||
"license": "TextMate Bundle License",
|
||||
"repositoryURL": "https://github.com/textmate/javadoc.tmbundle",
|
||||
"licenseDetail": [
|
||||
"Copyright (c) textmate-javadoc.tmbundle project authors",
|
||||
"",
|
||||
"If not otherwise specified (see below), files in this repository fall under the following license:",
|
||||
"",
|
||||
"Permission to copy, use, modify, sell and distribute this",
|
||||
"software is granted. This software is provided \"as is\" without",
|
||||
"express or implied warranty, and with no claim as to its",
|
||||
"suitability for any purpose.",
|
||||
"",
|
||||
"An exception is made for files in readable text which contain their own license information,",
|
||||
"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
|
||||
"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
|
||||
"\"tidy\" is accompanied by \"tidy-license.txt\"."
|
||||
]
|
||||
"license": "MIT",
|
||||
"repositoryURL": "https://github.com/atom/language-java",
|
||||
"description": "The file syntaxes/java.tmLanguage.json was derived from the Atom package https://github.com/atom/language-java which was originally converted from the TextMate bundle https://github.com/textmate/java.tmbundle."
|
||||
|
||||
}]
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
"publisher": "vscode",
|
||||
"engines": { "vscode": "*" },
|
||||
"scripts": {
|
||||
"update-grammar": "node ../../build/npm/update-grammar.js textmate/java.tmbundle Syntaxes/Java.plist ./syntaxes/java.tmLanguage.json && node ../../build/npm/update-grammar.js textmate/javadoc.tmbundle Syntaxes/JavaDoc.tmLanguage ./syntaxes/javadoc.tmLanguage.json"
|
||||
"update-grammar": "node ../../build/npm/update-grammar.js atom/language-java grammars/java.cson ./syntaxes/java.tmLanguage.json"
|
||||
},
|
||||
"contributes": {
|
||||
"languages": [{
|
||||
|
|
@ -17,9 +17,6 @@
|
|||
"language": "java",
|
||||
"scopeName": "source.java",
|
||||
"path": "./syntaxes/java.tmLanguage.json"
|
||||
},{
|
||||
"scopeName": "text.html.javadoc",
|
||||
"path": "./syntaxes/javadoc.tmLanguage.json"
|
||||
}]
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,432 +0,0 @@
|
|||
{
|
||||
"fileTypes": [],
|
||||
"name": "JavaDoc",
|
||||
"patterns": [
|
||||
{
|
||||
"begin": "(/\\*\\*)\\s*$",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.comment.begin.javadoc"
|
||||
}
|
||||
},
|
||||
"contentName": "text.html",
|
||||
"end": "\\*/",
|
||||
"endCaptures": {
|
||||
"0": {
|
||||
"name": "punctuation.definition.comment.end.javadoc"
|
||||
}
|
||||
},
|
||||
"name": "comment.block.documentation.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)param)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.param.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.param.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)return)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.return.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.return.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)throws)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.throws.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.throws.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)exception)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.exception.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.exception.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)author)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.author.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.author.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)version)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.version.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.version.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)see)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.see.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.see.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)since)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.since.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.since.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)serial)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.serial.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.serial.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)serialField)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.serialField.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.serialField.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)serialData)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.serialData.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.serialData.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "((\\@)deprecated)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.deprecated.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"end": "(?=^\\s*\\*?\\s*@|\\*/)",
|
||||
"name": "meta.documentation.tag.deprecated.javadoc",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "keyword.other.documentation.custom.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"match": "((\\@)\\S+)\\s"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"repository": {
|
||||
"inline": {
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#inline-formatting"
|
||||
},
|
||||
{
|
||||
"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.",
|
||||
"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[^>]*>)"
|
||||
},
|
||||
{
|
||||
"include": "text.html.basic"
|
||||
},
|
||||
{
|
||||
"match": "((https?|s?ftp|ftps|file|smb|afp|nfs|(x-)?man|gopher|txmt)://|mailto:)[-:@a-zA-Z0-9_.,~%+/?=&#;]+(?<![-.,?:#;])",
|
||||
"name": "markup.underline.link"
|
||||
}
|
||||
]
|
||||
},
|
||||
"inline-formatting": {
|
||||
"patterns": [
|
||||
{
|
||||
"begin": "(\\{)((\\@)code)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.tag.begin.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "keyword.other.documentation.directive.code.javadoc"
|
||||
},
|
||||
"3": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"contentName": "markup.raw.code.javadoc",
|
||||
"end": "\\}",
|
||||
"endCaptures": {
|
||||
"0": {
|
||||
"name": "punctuation.definition.tag.end.javadoc"
|
||||
}
|
||||
},
|
||||
"name": "meta.tag.template.code.javadoc",
|
||||
"patterns": []
|
||||
},
|
||||
{
|
||||
"begin": "(\\{)((\\@)literal)",
|
||||
"beginCaptures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.tag.begin.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "keyword.other.documentation.directive.literal.javadoc"
|
||||
},
|
||||
"3": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
}
|
||||
},
|
||||
"contentName": "markup.raw.literal.javadoc",
|
||||
"end": "\\}",
|
||||
"endCaptures": {
|
||||
"0": {
|
||||
"name": "punctuation.definition.tag.end.javadoc"
|
||||
}
|
||||
},
|
||||
"name": "meta.tag.template.literal.javadoc",
|
||||
"patterns": []
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.tag.begin.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "keyword.other.documentation.directive.docRoot.javadoc"
|
||||
},
|
||||
"3": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
},
|
||||
"4": {
|
||||
"name": "punctuation.definition.tag.end.javadoc"
|
||||
}
|
||||
},
|
||||
"match": "(\\{)((\\@)docRoot)(\\})",
|
||||
"name": "meta.tag.template.docRoot.javadoc"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.tag.begin.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "keyword.other.documentation.directive.inheritDoc.javadoc"
|
||||
},
|
||||
"3": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
},
|
||||
"4": {
|
||||
"name": "punctuation.definition.tag.end.javadoc"
|
||||
}
|
||||
},
|
||||
"match": "(\\{)((\\@)inheritDoc)(\\})",
|
||||
"name": "meta.tag.template.inheritDoc.javadoc"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.tag.begin.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "keyword.other.documentation.directive.link.javadoc"
|
||||
},
|
||||
"3": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
},
|
||||
"4": {
|
||||
"name": "markup.underline.link.javadoc"
|
||||
},
|
||||
"5": {
|
||||
"name": "string.other.link.title.javadoc"
|
||||
},
|
||||
"6": {
|
||||
"name": "punctuation.definition.tag.end.javadoc"
|
||||
}
|
||||
},
|
||||
"match": "(\\{)((\\@)link)(?:\\s+(\\S+?))?(?:\\s+(.+?))?\\s*(\\})",
|
||||
"name": "meta.tag.template.link.javadoc"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.tag.begin.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "keyword.other.documentation.directive.linkplain.javadoc"
|
||||
},
|
||||
"3": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
},
|
||||
"4": {
|
||||
"name": "markup.underline.linkplain.javadoc"
|
||||
},
|
||||
"5": {
|
||||
"name": "string.other.link.title.javadoc"
|
||||
},
|
||||
"6": {
|
||||
"name": "punctuation.definition.tag.end.javadoc"
|
||||
}
|
||||
},
|
||||
"match": "(\\{)((\\@)linkplain)(?:\\s+(\\S+?))?(?:\\s+(.+?))?\\s*(\\})",
|
||||
"name": "meta.tag.template.linkplain.javadoc"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.tag.begin.javadoc"
|
||||
},
|
||||
"2": {
|
||||
"name": "keyword.other.documentation.directive.value.javadoc"
|
||||
},
|
||||
"3": {
|
||||
"name": "punctuation.definition.keyword.javadoc"
|
||||
},
|
||||
"4": {
|
||||
"name": "variable.other.javadoc"
|
||||
},
|
||||
"5": {
|
||||
"name": "punctuation.definition.tag.end.javadoc"
|
||||
}
|
||||
},
|
||||
"match": "(\\{)((\\@)value)\\s*(\\S+?)?\\s*(\\})",
|
||||
"name": "meta.tag.template.value.javadoc"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"scopeName": "text.html.javadoc",
|
||||
"uuid": "64BB98A4-59D4-474E-9091-C1E1D04BDD03",
|
||||
"version": "https://github.com/textmate/javadoc.tmbundle/commit/5276d7a93f0cf53b7d425c39c6968b09ea9f2d40"
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -325,6 +325,7 @@
|
|||
"name": "coloring of the Java import and package identifiers",
|
||||
"scope": [
|
||||
"storage.modifier.import.java",
|
||||
"variable.language.wildcard.java",
|
||||
"storage.modifier.package.java"
|
||||
],
|
||||
"settings": {
|
||||
|
|
|
|||
|
|
@ -300,7 +300,11 @@
|
|||
},
|
||||
{
|
||||
"name": "coloring of the Java import and package identifiers",
|
||||
"scope": ["storage.modifier.import.java", "storage.modifier.package.java"],
|
||||
"scope": [
|
||||
"storage.modifier.import.java",
|
||||
"variable.language.wildcard.java",
|
||||
"storage.modifier.package.java"
|
||||
],
|
||||
"settings": {
|
||||
"foreground": "#d4d4d4"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -341,6 +341,7 @@
|
|||
"name": "coloring of the Java import and package identifiers",
|
||||
"scope": [
|
||||
"storage.modifier.import.java",
|
||||
"variable.language.wildcard.java",
|
||||
"storage.modifier.package.java"
|
||||
],
|
||||
"settings": {
|
||||
|
|
|
|||
Loading…
Reference in a new issue