Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use storage scope for annotations's text part and improve annotation regex. #43

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Use storage scope for annotations's text part and improve annotation regex. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8351e04
Use storage scope for annotations's text part and improve annotation …
Animeshz Feb 9, 2021
db251e1
Fix failing tests, due to change in scopes.
Animeshz Feb 9, 2021
aff0bab
Changes on annotation captures, assign proper scopes to annotation el…
Animeshz Feb 16, 2021
eee9ebc
Rename annotation start keyword.
Animeshz Feb 16, 2021
d4bd045
Merge branch 'master' of https://github.com/nishtahir/language-kotlin
Animeshz Feb 16, 2021
46e2761
Rename use-site scope of annotation.
Animeshz Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions dist/Kotlin.JSON-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,19 @@
"annotations": {
"patterns": [
{
"comment": "Use-site annotation",
"match": "@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:\\s*?[a-zA-Z_]\\w*",
"name": "meta.annotation.kotlin"
},
{
"begin": "@[a-zA-Z_]\\w*\\s*(\\()",
"begin": "(@)((?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:\\s*)?([a-zA-Z_]\\w*)(\\()",
"beginCaptures": {
"1": {
"name": "keyword.control.annotation.kotlin"
},
"2": {
"name": "keyword.annotation.target.kotlin",
"comment": "Use-Site Annotation Target"
},
"3": {
"name": "storage.type.annotation.kotlin"
},
"4": {
"name": "punctuation.definition.arguments.begin.kotlin"
}
},
Expand All @@ -32,7 +37,19 @@
]
},
{
"match": "@[a-zA-Z_]\\w*",
"match": "(@)((?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:\\s*)?([a-zA-Z_]\\w*)",
"captures": {
"1": {
"name": "keyword.control.annotation.kotlin"
},
"2": {
"name": "keyword.annotation.target.kotlin",
"comment": "Use-Site Annotation Target"
},
"3": {
"name": "storage.type.annotation.kotlin"
}
},
"name": "meta.annotation.kotlin"
}
]
Expand Down
17 changes: 10 additions & 7 deletions dist/Kotlin.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ repository:
annotations:
patterns:
-
comment: 'Use-site annotation'
match: '@(?:file|property|field|get|set|receiver|param|setparam|delegate)\s*:\s*?[a-zA-Z_]\w*'
name: meta.annotation.kotlin
-
begin: '@[a-zA-Z_]\w*\s*(\()'
begin: '(@)((?:file|property|field|get|set|receiver|param|setparam|delegate)\s*:\s*)?([a-zA-Z_]\w*)(\()'
beginCaptures:
'1': {name: punctuation.definition.arguments.begin.kotlin}
'1': {name: keyword.control.annotation.kotlin}
'2': {name: keyword.annotation.target.kotlin, comment: 'Use-Site Annotation Target'}
'3': {name: storage.type.annotation.kotlin}
'4': {name: punctuation.definition.arguments.begin.kotlin}
end: \)
endCaptures:
'0': {name: punctuation.definition.arguments.end.kotlin}
Expand All @@ -17,7 +16,11 @@ repository:
- {include: '#code'}
- {match: ',', name: punctuation.seperator.property.kotlin}
-
match: '@[a-zA-Z_]\w*'
match: '(@)((?:file|property|field|get|set|receiver|param|setparam|delegate)\s*:\s*)?([a-zA-Z_]\w*)'
captures:
'1': {name: keyword.control.annotation.kotlin}
'2': {name: keyword.annotation.target.kotlin, comment: 'Use-Site Annotation Target'}
'3': {name: storage.type.annotation.kotlin}
name: meta.annotation.kotlin
class-literal:
patterns:
Expand Down
49 changes: 39 additions & 10 deletions dist/Kotlin.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,29 @@
<dict>
<key>patterns</key>
<array>
<dict>
<key>comment</key>
<string>Use-site annotation</string>
<key>match</key>
<string>@(?:file|property|field|get|set|receiver|param|setparam|delegate)\s*:\s*?[a-zA-Z_]\w*</string>
<key>name</key>
<string>meta.annotation.kotlin</string>
</dict>
<dict>
<key>begin</key>
<string>@[a-zA-Z_]\w*\s*(\()</string>
<string>(@)((?:file|property|field|get|set|receiver|param|setparam|delegate)\s*:\s*)?([a-zA-Z_]\w*)(\()</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>keyword.control.annotation.kotlin</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>keyword.annotation.target.kotlin</string>
<key>comment</key>
<string>Use-Site Annotation Target</string>
</dict>
<key>3</key>
<dict>
<key>name</key>
<string>storage.type.annotation.kotlin</string>
</dict>
<key>4</key>
<dict>
<key>name</key>
<string>punctuation.definition.arguments.begin.kotlin</string>
Expand Down Expand Up @@ -55,7 +64,27 @@
</dict>
<dict>
<key>match</key>
<string>@[a-zA-Z_]\w*</string>
<string>(@)((?:file|property|field|get|set|receiver|param|setparam|delegate)\s*:\s*)?([a-zA-Z_]\w*)</string>
<key>captures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>keyword.control.annotation.kotlin</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>keyword.annotation.target.kotlin</string>
<key>comment</key>
<string>Use-Site Annotation Target</string>
</dict>
<key>3</key>
<dict>
<key>name</key>
<string>storage.type.annotation.kotlin</string>
</dict>
</dict>
<key>name</key>
<string>meta.annotation.kotlin</string>
</dict>
Expand Down
39 changes: 25 additions & 14 deletions snapshots/corpus.kt.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
# ^ source.kotlin meta.function.kotlin
# ^^^^ source.kotlin meta.function.kotlin entity.name.function.kotlin
# ^ source.kotlin meta.function.kotlin meta.parameters.kotlin punctuation.section.group.begin.kotlin punctuation.definition.parameters.begin.kotlin
# ^^^^^^^^ source.kotlin meta.function.kotlin meta.parameters.kotlin meta.annotation.kotlin
# ^ source.kotlin meta.function.kotlin meta.parameters.kotlin meta.annotation.kotlin keyword.control.annotation.kotlin
# ^^^^^^^ source.kotlin meta.function.kotlin meta.parameters.kotlin meta.annotation.kotlin storage.type.annotation.kotlin
# ^ source.kotlin meta.function.kotlin meta.parameters.kotlin
# ^^^^ source.kotlin meta.function.kotlin meta.parameters.kotlin variable.parameter.function.kotlin
# ^ source.kotlin meta.function.kotlin meta.parameters.kotlin keyword.operator.declaration.kotlin
Expand Down Expand Up @@ -165,7 +166,9 @@
# ^^ source.kotlin constant.numeric.integer.kotlin
>
>@get:Rule
#^^^^^^^^^ source.kotlin meta.annotation.kotlin
#^ source.kotlin meta.annotation.kotlin keyword.control.annotation.kotlin
# ^^^^ source.kotlin meta.annotation.kotlin keyword.annotation.target.kotlin
# ^^^^ source.kotlin meta.annotation.kotlin storage.type.annotation.kotlin
>val activityRule = ActivityTestRule(SplashActivity::class.java)
#^^^ source.kotlin storage.type.kotlin
# ^^^^^^^^^^^^^^ source.kotlin
Expand Down Expand Up @@ -350,7 +353,8 @@
# ^ source.kotlin
# ^^^ source.kotlin meta.function.kotlin keyword.other.kotlin
# ^ source.kotlin meta.function.kotlin meta.parameters.kotlin punctuation.section.group.begin.kotlin punctuation.definition.parameters.begin.kotlin
# ^^^^^^^ source.kotlin meta.function.kotlin meta.parameters.kotlin meta.annotation.kotlin
# ^ source.kotlin meta.function.kotlin meta.parameters.kotlin meta.annotation.kotlin keyword.control.annotation.kotlin
# ^^^^^^ source.kotlin meta.function.kotlin meta.parameters.kotlin meta.annotation.kotlin storage.type.annotation.kotlin
# ^ source.kotlin meta.function.kotlin meta.parameters.kotlin
# ^ source.kotlin meta.function.kotlin meta.parameters.kotlin variable.parameter.function.kotlin
# ^ source.kotlin meta.function.kotlin meta.parameters.kotlin keyword.operator.declaration.kotlin
Expand Down Expand Up @@ -840,12 +844,14 @@
#^^ source.kotlin punctuation.definition.comment.kotlin comment.line.double-slash.kotlin
# ^^^^^^^^^^^^^^^^^^^^ source.kotlin punctuation.definition.comment.kotlin
>@file:JvmName("Foo")
#^^^^^^^^^^^^^ source.kotlin meta.annotation.kotlin
# ^ source.kotlin meta.group.kotlin punctuation.section.group.begin.kotlin
# ^ source.kotlin meta.group.kotlin string.quoted.double.kotlin punctuation.definition.string.begin.kotlin
# ^^^ source.kotlin meta.group.kotlin string.quoted.double.kotlin
# ^ source.kotlin meta.group.kotlin string.quoted.double.kotlin punctuation.definition.string.end.kotlin
# ^ source.kotlin meta.group.kotlin punctuation.section.group.end.kotlin
#^ source.kotlin meta.annotation.kotlin keyword.control.annotation.kotlin
# ^^^^^^^^^^^^ source.kotlin meta.annotation.kotlin keyword.annotation.target.kotlin
# ^^^^^^^ source.kotlin meta.annotation.kotlin storage.type.annotation.kotlin
# ^ source.kotlin meta.annotation.kotlin punctuation.definition.arguments.begin.kotlin
# ^ source.kotlin meta.annotation.kotlin string.quoted.double.kotlin punctuation.definition.string.begin.kotlin
# ^^^ source.kotlin meta.annotation.kotlin string.quoted.double.kotlin
# ^ source.kotlin meta.annotation.kotlin string.quoted.double.kotlin punctuation.definition.string.end.kotlin
# ^ source.kotlin meta.annotation.kotlin punctuation.definition.arguments.end.kotlin
>private sealed class InjectedClass<T, U> @Inject constructor(val test: Int = 50, var anotherVar: String = "hello world") : SomeSuperClass(test, anotherVar) {
#^^^^^^^ source.kotlin storage.modifier.kotlin
# ^ source.kotlin
Expand All @@ -861,7 +867,8 @@
# ^ source.kotlin meta.class.kotlin entity.name.type.class.kotlin
# ^ source.kotlin meta.class.kotlin punctuation.bracket.angle.end.kotlin
# ^ source.kotlin meta.class.kotlin
# ^^^^^^^ source.kotlin meta.class.kotlin meta.annotation.kotlin
# ^ source.kotlin meta.class.kotlin meta.annotation.kotlin keyword.control.annotation.kotlin
# ^^^^^^ source.kotlin meta.class.kotlin meta.annotation.kotlin storage.type.annotation.kotlin
# ^^^^^^^^^^^^ source.kotlin meta.class.kotlin
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin punctuation.section.group.begin.kotlin punctuation.definition.parameters.begin.kotlin
# ^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin storage.type.kotlin
Expand Down Expand Up @@ -959,7 +966,8 @@
# ^^^ source.kotlin
# ^ source.kotlin keyword.operator.assignment.kotlin
# ^ source.kotlin
# ^^^^^^^^^^^^ source.kotlin meta.annotation.kotlin
# ^ source.kotlin meta.annotation.kotlin keyword.control.annotation.kotlin
# ^^^^^^^^^^^ source.kotlin meta.annotation.kotlin storage.type.annotation.kotlin
# ^ source.kotlin
# ^ source.kotlin meta.block.kotlin punctuation.section.group.begin.kotlin
# ^ source.kotlin meta.block.kotlin
Expand Down Expand Up @@ -1022,7 +1030,8 @@
# ^ source.kotlin meta.class.kotlin
# ^^^^^^^^ source.kotlin meta.class.kotlin entity.name.class.kotlin
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin punctuation.section.group.begin.kotlin punctuation.definition.parameters.begin.kotlin
# ^^^^^^^^^^^^^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin keyword.control.annotation.kotlin
# ^^^^^^^^^^^^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin storage.type.annotation.kotlin
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin punctuation.definition.arguments.begin.kotlin
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin punctuation.definition.string.begin.kotlin
# ^^^^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin
Expand All @@ -1038,7 +1047,8 @@
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin punctuation.seperator.kotlin
> @SerializedName("param2") val param2: String,
#^^^^^^^^^^^^^^^^^^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin
# ^^^^^^^^^^^^^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin keyword.control.annotation.kotlin
# ^^^^^^^^^^^^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin storage.type.annotation.kotlin
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin punctuation.definition.arguments.begin.kotlin
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin punctuation.definition.string.begin.kotlin
# ^^^^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin
Expand All @@ -1054,7 +1064,8 @@
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin punctuation.seperator.kotlin
> @SerializedName("param3") val param3: String) {
#^^^^^^^^^^^^^^^^^^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin
# ^^^^^^^^^^^^^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin keyword.control.annotation.kotlin
# ^^^^^^^^^^^^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin storage.type.annotation.kotlin
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin punctuation.definition.arguments.begin.kotlin
# ^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin punctuation.definition.string.begin.kotlin
# ^^^^^^ source.kotlin meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin
Expand Down
23 changes: 17 additions & 6 deletions src/annotations.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ repository:
annotations:
patterns:
-
comment: 'Use-site annotation'
match: '@(?:file|property|field|get|set|receiver|param|setparam|delegate)\s*:\s*?[a-zA-Z_]\w*'
name: meta.annotation.kotlin
-
begin: '@[a-zA-Z_]\w*\s*(\()'
begin: '(@)((?:file|property|field|get|set|receiver|param|setparam|delegate)\s*:\s*)?([a-zA-Z_]\w*)(\()'
beginCaptures:
'1':
name: keyword.control.annotation.kotlin
'2':
name: keyword.annotation.target.kotlin
comment: 'Use-Site Annotation Target'
'3':
name: storage.type.annotation.kotlin
'4':
name: punctuation.definition.arguments.begin.kotlin
end: \)
endCaptures:
Expand All @@ -22,5 +25,13 @@ repository:
match: ','
name: punctuation.seperator.property.kotlin
-
match: '@[a-zA-Z_]\w*'
match: '(@)((?:file|property|field|get|set|receiver|param|setparam|delegate)\s*:\s*)?([a-zA-Z_]\w*)'
captures:
'1':
name: keyword.control.annotation.kotlin
'2':
name: keyword.annotation.target.kotlin
comment: 'Use-Site Annotation Target'
'3':
name: storage.type.annotation.kotlin
name: meta.annotation.kotlin
75 changes: 37 additions & 38 deletions src/generic.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,37 @@
repository:
generic:
patterns:
-
begin: '(?=\<(?:[A-Z_]|\*|in|out))'
end: '(?<=\>)(?!\>)'
patterns:
-
match: '<'
name: punctuation.bracket.angle.begin.kotlin
-
match: '>'
name: punctuation.bracket.angle.end.kotlin
-
match: '\*'
name: entity.name.type.generic.wildcard.kotlin
-
include: '#generic-parameter-list'
-
match: ','
name: punctuation.seperator.kotlin

repository:
generic-parameter-list:
patterns:
-
include: '#annotations'
-
match: '\b(in|out)\b'
name: storage.modifier.generic.variance.kotlin
-
include: '#built-in-types'
-
include: '#class-ident'
-
include: '#generic'
-
include: '#operators'
repository:
generic:
patterns:
-
begin: '(?=\<(?:[A-Z_]|\*|in|out))'
end: '(?<=\>)(?!\>)'
patterns:
-
match: '<'
name: punctuation.bracket.angle.begin.kotlin
-
match: '>'
name: punctuation.bracket.angle.end.kotlin
-
match: '\*'
name: entity.name.type.generic.wildcard.kotlin
-
include: '#generic-parameter-list'
-
match: ','
name: punctuation.seperator.kotlin
repository:
generic-parameter-list:
patterns:
-
include: '#annotations'
-
match: \b(in|out)\b
name: storage.modifier.generic.variance.kotlin
-
include: '#built-in-types'
-
include: '#class-ident'
-
include: '#generic'
-
include: '#operators'
2 changes: 0 additions & 2 deletions src/ident.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# remove match to original master branch

repository:
class-ident:
patterns:
Expand Down
1 change: 0 additions & 1 deletion src/keywords.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ repository:
-
match: \b(companion|object)\b
name: storage.type.kotlin

operators:
patterns:
-
Expand Down
Loading