Skip to content

Commit c33d282

Browse files
aeschliaeschli
committed
[java] switch to atom/language-java grammar
1 parent 795edc3 commit c33d282

8 files changed

Lines changed: 1085 additions & 1113 deletions

File tree

‎extensions/java/OSSREADME.json‎

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,9 @@
11
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
22
[{
3-
"name": "textmate/java.tmbundle",
3+
"name": "atom/language-java",
44
"version": "0.0.0",
5-
"license": "TextMate Bundle License",
6-
"repositoryURL": "https://github.com/textmate/java.tmbundle",
7-
"licenseDetail": [
8-
"Copyright (c) textmate-java.tmbundle project authors",
9-
"",
10-
"If not otherwise specified (see below), files in this repository fall under the following license:",
11-
"",
12-
"Permission to copy, use, modify, sell and distribute this",
13-
"software is granted. This software is provided \"as is\" without",
14-
"express or implied warranty, and with no claim as to its",
15-
"suitability for any purpose.",
16-
"",
17-
"An exception is made for files in readable text which contain their own license information,",
18-
"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
19-
"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
20-
"\"tidy\" is accompanied by \"tidy-license.txt\"."
21-
]
22-
},{
23-
"name": "textmate/javadoc.tmbundle",
24-
"version": "0.0.0",
25-
"license": "TextMate Bundle License",
26-
"repositoryURL": "https://github.com/textmate/javadoc.tmbundle",
27-
"licenseDetail": [
28-
"Copyright (c) textmate-javadoc.tmbundle project authors",
29-
"",
30-
"If not otherwise specified (see below), files in this repository fall under the following license:",
31-
"",
32-
"Permission to copy, use, modify, sell and distribute this",
33-
"software is granted. This software is provided \"as is\" without",
34-
"express or implied warranty, and with no claim as to its",
35-
"suitability for any purpose.",
36-
"",
37-
"An exception is made for files in readable text which contain their own license information,",
38-
"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
39-
"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
40-
"\"tidy\" is accompanied by \"tidy-license.txt\"."
41-
]
5+
"license": "MIT",
6+
"repositoryURL": "https://github.com/atom/language-java",
7+
"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."
8+
429
}]

‎extensions/java/package.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"publisher": "vscode",
55
"engines": { "vscode": "*" },
66
"scripts": {
7-
"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"
7+
"update-grammar": "node ../../build/npm/update-grammar.js atom/language-java grammars/java.cson ./syntaxes/java.tmLanguage.json"
88
},
99
"contributes": {
1010
"languages": [{
@@ -17,9 +17,6 @@
1717
"language": "java",
1818
"scopeName": "source.java",
1919
"path": "./syntaxes/java.tmLanguage.json"
20-
},{
21-
"scopeName": "text.html.javadoc",
22-
"path": "./syntaxes/javadoc.tmLanguage.json"
2320
}]
2421
}
2522
}

0 commit comments

Comments
 (0)