This is an automated email from the ASF dual-hosted git repository.
dbalek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new d9975300bf VSCode: Java TextMate grammar updated.
new 1400bff5eb Merge pull request #6946 from
dbalek/dbalek/vscode-java-tm-grammar-update
d9975300bf is described below
commit d9975300bfd500daff772af23286eddb78d726c0
Author: Dusan Balek <[email protected]>
AuthorDate: Thu Jan 11 10:19:38 2024 +0100
VSCode: Java TextMate grammar updated.
---
java/java.lsp.server/vscode/package.json | 14 ++++-
.../vscode/syntaxes/java-st-injection.json | 26 +++++++++
.../vscode/syntaxes/java.tmLanguage.json | 65 ++++++++++++++--------
3 files changed, 79 insertions(+), 26 deletions(-)
diff --git a/java/java.lsp.server/vscode/package.json
b/java/java.lsp.server/vscode/package.json
index 4ef6aa9da5..a366f4c008 100644
--- a/java/java.lsp.server/vscode/package.json
+++ b/java/java.lsp.server/vscode/package.json
@@ -57,6 +57,16 @@
"language": "jackpot-hint",
"scopeName": "source.java",
"path": "./syntaxes/java.tmLanguage.json"
+ },
+ {
+ "injectTo": [
+ "source.java"
+ ],
+ "scopeName": "inline.java.string.template",
+ "path": "./syntaxes/java-st-injection.json",
+ "embeddedLanguages": {
+ "meta.embedded.java.string.template":
"java"
+ }
}
],
"views": {
@@ -869,12 +879,12 @@
{
"command":
"nbls:Tools:org.netbeans.modules.cloud.oracle.actions.CreateAutonomousDBAction",
"when": "viewItem =~
/class:oracle.compartment.CompartmentItem/",
- "group": "oci@100"
+ "group": "oci@100"
},
{
"command": "nbls.cloud.ocid.copy",
"when": "viewItem =~
/class:oracle.items.OCIItem/",
- "group": "oci@1000"
+ "group": "oci@1000"
},
{
"command":
"nbls:Tools:org.netbeans.modules.cloud.oracle.actions.AddRepository",
diff --git a/java/java.lsp.server/vscode/syntaxes/java-st-injection.json
b/java/java.lsp.server/vscode/syntaxes/java-st-injection.json
new file mode 100644
index 0000000000..e521c763da
--- /dev/null
+++ b/java/java.lsp.server/vscode/syntaxes/java-st-injection.json
@@ -0,0 +1,26 @@
+{
+ "injectionSelector": "L:source.java string",
+ "scopeName": "inline.java.string.template",
+ "patterns": [
+ {
+ "begin": "\\\\{",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.template.begin"
+ }
+ },
+ "contentName": "meta.embedded.java.string.template",
+ "end": "}",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.templete.end"
+ }
+ },
+ "patterns": [
+ {
+ "include": "source.java"
+ }
+ ]
+ }
+ ]
+}
diff --git a/java/java.lsp.server/vscode/syntaxes/java.tmLanguage.json
b/java/java.lsp.server/vscode/syntaxes/java.tmLanguage.json
index a0310c0525..1357aff68d 100644
--- a/java/java.lsp.server/vscode/syntaxes/java.tmLanguage.json
+++ b/java/java.lsp.server/vscode/syntaxes/java.tmLanguage.json
@@ -1,10 +1,10 @@
{
"information_for_contributors": [
- "This file has been converted from
https://github.com/atom/language-java/blob/master/grammars/java.cson";,
+ "This file has been converted from
https://github.com/redhat-developer/vscode-java/blob/master/language-support/java/java.tmLanguage.json";,
"If you want to provide a fix or improvement, please create a
pull request against the original repository.",
"Once accepted there, we are happy to receive an update
request."
],
- "version":
"https://github.com/atom/language-java/commit/29f977dc42a7e2568b39bb6fb34c4ef108eb59b3";,
+ "version":
"https://github.com/redhat-developer/vscode-java/commit/f09b712f5d6d6339e765f58c8dfab3f78a378183";,
"name": "Java",
"scopeName": "source.java",
"patterns": [
@@ -1378,6 +1378,17 @@
},
"properties": {
"patterns": [
+ {
+ "match": "(\\.)\\s*(new)",
+ "captures": {
+ "1": {
+ "name":
"punctuation.separator.period.java"
+ },
+ "2": {
+ "name":
"keyword.control.new.java"
+ }
+ }
+ },
{
"match":
"(\\.)\\s*([a-zA-Z_$][\\w$]*)(?=\\s*\\.\\s*[a-zA-Z_$][\\w$]*)",
"captures": {
@@ -1571,42 +1582,45 @@
},
"strings": {
"patterns": [
+ {
+ "begin": "\"\"\"",
+ "beginCaptures": {
+ "0": {
+ "name":
"punctuation.definition.string.begin.java"
+ }
+ },
+ "end": "\"\"\"",
+ "endCaptures": {
+ "0": {
+ "name":
"punctuation.definition.string.end.java"
+ }
+ },
+ "name": "string.quoted.triple.java",
+ "patterns": [
+ {
+ "match":
"(\\\\\"\"\")(?!\")|(\\\\.)",
+ "name":
"constant.character.escape.java"
+ }
+ ]
+ },
{
"begin": "\"",
"beginCaptures": {
"0": {
- "name":
"punctuation.definition.string.begin.java string.quoted.double.java"
+ "name":
"punctuation.definition.string.begin.java"
}
},
"end": "\"",
"endCaptures": {
"0": {
- "name":
"punctuation.definition.string.end.java string.quoted.double.java"
+ "name":
"punctuation.definition.string.end.java"
}
},
+ "name": "string.quoted.double.java",
"patterns": [
- {
- "begin": "\\\\{",
- "beginCaptures": {
- "0": {
- "name":
"punctuation.definition.string.end.java string.quoted.double.java"
- }
- },
- "end": "}",
- "endCaptures": {
- "0": {
- "name":
"punctuation.definition.string.begin.java string.quoted.double.java"
- }
- },
- "patterns":
[{"include": "#code"}]
- },
{
"match": "\\\\.",
- "name":
"constant.character.escape.java string.quoted.double.java"
- },
- {
- "match": ".",
- "name":
"string.quoted.double.java"
+ "name":
"constant.character.escape.java"
}
]
},
@@ -1650,6 +1664,9 @@
{
"match": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*",
"name": "storage.type.java"
+ },
+ {
+ "include": "#comments"
}
]
},
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
