Skip to content

Commit e8f9d75

Browse files
authored
Adopt new Java grammar! (microsoft#188361)
1 parent da7ab49 commit e8f9d75

File tree

3 files changed

+36
-7
lines changed

3 files changed

+36
-7
lines changed

extensions/java/cgmanifest.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
"component": {
55
"type": "git",
66
"git": {
7-
"name": "atom/language-java",
8-
"repositoryUrl": "https://github.com/atom/language-java",
9-
"commitHash": "29f977dc42a7e2568b39bb6fb34c4ef108eb59b3"
7+
"name": "redhat-developer/vscode-java",
8+
"repositoryUrl": "https://github.com/redhat-developer/vscode-java",
9+
"commitHash": "7a770ab6750b4b09173d98de14eb9792e3432b36"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "0.32.1"
13+
"description": "This grammar was derived from https://github.com/atom/language-java/blob/master/grammars/java.cson.",
14+
"version": "1.21.0"
1415
}
1516
],
1617
"version": 1

extensions/java/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"vscode": "*"
1010
},
1111
"scripts": {
12-
"update-grammar": "node ../node_modules/vscode-grammar-updater/bin atom/language-java grammars/java.cson ./syntaxes/java.tmLanguage.json"
12+
"update-grammar": "node ../node_modules/vscode-grammar-updater/bin redhat-developer/vscode-java language-support/java/java.tmLanguage.json ./syntaxes/java.tmLanguage.json"
1313
},
1414
"contributes": {
1515
"languages": [

extensions/java/syntaxes/java.tmLanguage.json

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"information_for_contributors": [
3-
"This file has been converted from https://github.com/atom/language-java/blob/master/grammars/java.cson",
3+
"This file has been converted from https://github.com/redhat-developer/vscode-java/blob/master/language-support/java/java.tmLanguage.json",
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/atom/language-java/commit/29f977dc42a7e2568b39bb6fb34c4ef108eb59b3",
7+
"version": "https://github.com/redhat-developer/vscode-java/commit/7a770ab6750b4b09173d98de14eb9792e3432b36",
88
"name": "Java",
99
"scopeName": "source.java",
1010
"patterns": [
@@ -1571,6 +1571,31 @@
15711571
},
15721572
"strings": {
15731573
"patterns": [
1574+
{
1575+
"begin": "\"\"\"",
1576+
"beginCaptures": {
1577+
"0": {
1578+
"name": "punctuation.definition.string.begin.java"
1579+
}
1580+
},
1581+
"end": "\"\"\"",
1582+
"endCaptures": {
1583+
"0": {
1584+
"name": "punctuation.definition.string.end.java"
1585+
}
1586+
},
1587+
"name": "string.quoted.triple.java",
1588+
"patterns": [
1589+
{
1590+
"match": "\\\\\"\"\"",
1591+
"name": "constant.character.escape.java"
1592+
},
1593+
{
1594+
"match": "\\\\.",
1595+
"name": "constant.character.escape.java"
1596+
}
1597+
]
1598+
},
15741599
{
15751600
"begin": "\"",
15761601
"beginCaptures": {
@@ -1632,6 +1657,9 @@
16321657
{
16331658
"match": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*",
16341659
"name": "storage.type.java"
1660+
},
1661+
{
1662+
"include": "#comments"
16351663
}
16361664
]
16371665
},

0 commit comments

Comments
 (0)