diff options
| author | George Fraser <george@fivetran.com> | 2018-12-22 11:29:27 -0800 |
|---|---|---|
| committer | George Fraser <george@fivetran.com> | 2018-12-22 11:29:27 -0800 |
| commit | c7f31242c653f628902b890e2bc09090bb378e96 (patch) | |
| tree | bb7da5b43f61e5302a4410c0c1e81cbeeaad799b /lib | |
| parent | 4271e64e2ea15c2ddab5a8d727da8907bc5d7109 (diff) | |
| download | java-language-server-c7f31242c653f628902b890e2bc09090bb378e96.zip | |
Closer...
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/java.tmLanguage.json | 103 |
1 files changed, 67 insertions, 36 deletions
diff --git a/lib/java.tmLanguage.json b/lib/java.tmLanguage.json index 3d1ca8d..41aee12 100644 --- a/lib/java.tmLanguage.json +++ b/lib/java.tmLanguage.json @@ -136,11 +136,56 @@ } ] }, + "lhs": { + "patterns": [ + { + "match": "\\b([a-z]\\w*)\\b", + "name": "variable.java" + }, + { + "match": "[\\[\\]]+", + "name": "keyword.other.java" + }, + { + "match": "(?<GROUP><([^<>]|\\g<GROUP>)+>)", + "name": "meta.type-parameters.java", + "captures": { + "0": { + "patterns": [ + { + "match": "\\b\\w+\\b", + "name": "storage.type.java" + }, + { + "match": "[<>,\\.\\?]|extends|super", + "name": "keyword.other.java" + } + ] + } + } + }, + { + "begin": "=", + "end": "(?=[,;])|$", + "name": "meta.rhs.java", + "beginCaptures": { + "0": { + "name": "keyword.other.set.java" + } + }, + "patterns": [ + { + "include": "#code" + } + ] + } + ] + }, "code": { "patterns": [ { "begin": "^ *([A-Z]\\w*|byte|short|int|long|char|float|double|boolean) +(?=\\w)", - "end": "(?=[=,:;])|$", + "end": ";|$", "name": "markup.underline.simple.java", "beginCaptures": { "1": { @@ -149,14 +194,13 @@ }, "patterns": [ { - "match": "\\b([a-z]\\w*)\\b", - "name": "variable.java" + "include": "#lhs" } ] }, { "begin": "^ *([A-Z]\\w*|byte|short|int|long|char|float|double|boolean)(?=\\[\\])", - "end": "(?=[=,:;])|$", + "end": ";|$", "name": "markup.underline.array.java", "beginCaptures": { "1": { @@ -165,18 +209,13 @@ }, "patterns": [ { - "match": "[\\[\\]]+", - "name": "keyword.other.java" - }, - { - "match": "\\b([a-z]\\w*)\\b", - "name": "variable.java" + "include": "#lhs" } ] }, { "begin": "^ *([A-Z]\\w*)(?=<[^>])", - "end": "(?=[=,:;])|$", + "end": ";|$", "name": "markup.underline.parameterized.java", "beginCaptures": { "1": { @@ -185,32 +224,13 @@ }, "patterns": [ { - "match": "(?<GROUP><([^<>]|\\g<GROUP>)+>)", - "name": "meta.type-parameters.java", - "captures": { - "0": { - "patterns": [ - { - "match": "\\b\\w+\\b", - "name": "storage.type.java" - }, - { - "match": "[<>,\\.\\?]|extends|super", - "name": "keyword.other.java" - } - ] - } - } - }, - { - "match": "\\b([a-z]\\w*)\\b", - "name": "variable.java" + "include": "#lhs" } ] }, { "begin": "^ *(var)\\b", - "end": "(?=[=,:;])|$", + "end": ";|$", "name": "markup.underline.var.java", "beginCaptures": { "1": { @@ -219,14 +239,13 @@ }, "patterns": [ { - "match": "\\b([a-z]\\w*)\\b", - "name": "variable.java" + "include": "#lhs" } ] }, { "begin": "^ *(final)\\b", - "end": "(?=[=,:;])|$", + "end": ";|$", "name": "markup.underline.final.java", "beginCaptures": { "1": { @@ -234,7 +253,9 @@ } }, "patterns": [ - + { + "include": "#lhs" + } ] }, { @@ -328,6 +349,16 @@ ] }, { + "begin": "\\(", + "end": "\\)", + "name": "meta.paren.java", + "patterns": [ + { + "include": "#code" + } + ] + }, + { "begin": "\\b(catch)\\b", "end": "(?={)", "name": "meta.catch.java", |