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 2 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
14 changes: 6 additions & 8 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,12 @@
"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": "storage.type.annotation.kotlin"
},
"2": {
"name": "punctuation.definition.arguments.begin.kotlin"
}
},
Expand All @@ -32,8 +30,8 @@
]
},
{
"match": "@[a-zA-Z_]\\w*",
"name": "meta.annotation.kotlin"
"match": "@(?:(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:\\s*)?[a-zA-Z_]\\w*",
"name": "storage.type.annotation.kotlin"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've left a comment for discussion here #42 (comment). That would need to be addressed before this gets merged

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any updates? 🤔

}
]
},
Expand Down
13 changes: 5 additions & 8 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,10 @@ 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: storage.type.annotation.kotlin}
'2': {name: punctuation.definition.arguments.begin.kotlin}
end: \)
endCaptures:
'0': {name: punctuation.definition.arguments.end.kotlin}
Expand All @@ -17,8 +14,8 @@ repository:
- {include: '#code'}
- {match: ',', name: punctuation.seperator.property.kotlin}
-
match: '@[a-zA-Z_]\w*'
name: meta.annotation.kotlin
match: '@(?:(?:file|property|field|get|set|receiver|param|setparam|delegate)\s*:\s*)?[a-zA-Z_]\w*'
name: storage.type.annotation.kotlin
class-literal:
patterns:
-
Expand Down
19 changes: 8 additions & 11 deletions dist/Kotlin.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,17 @@
<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>storage.type.annotation.kotlin</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>punctuation.definition.arguments.begin.kotlin</string>
Expand Down Expand Up @@ -55,9 +52,9 @@
</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>name</key>
<string>meta.annotation.kotlin</string>
<string>storage.type.annotation.kotlin</string>
</dict>
</array>
</dict>
Expand Down
28 changes: 14 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,7 @@
# ^ 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 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 +165,7 @@
# ^^ source.kotlin constant.numeric.integer.kotlin
>
>@get:Rule
#^^^^^^^^^ source.kotlin meta.annotation.kotlin
#^^^^^^^^^ source.kotlin storage.type.annotation.kotlin
>val activityRule = ActivityTestRule(SplashActivity::class.java)
#^^^ source.kotlin storage.type.kotlin
# ^^^^^^^^^^^^^^ source.kotlin
Expand Down Expand Up @@ -350,7 +350,7 @@
# ^ 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 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 +840,12 @@
#^^ 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 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 +861,7 @@
# ^ 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 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 +959,7 @@
# ^^^ source.kotlin
# ^ source.kotlin keyword.operator.assignment.kotlin
# ^ source.kotlin
# ^^^^^^^^^^^^ source.kotlin meta.annotation.kotlin
# ^^^^^^^^^^^^ source.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 +1022,7 @@
# ^ 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 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 +1038,7 @@
# ^ 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 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 +1054,7 @@
# ^ 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 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
12 changes: 5 additions & 7 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,11 @@ 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: storage.type.annotation.kotlin
'2':
name: punctuation.definition.arguments.begin.kotlin
end: \)
endCaptures:
Expand All @@ -22,5 +20,5 @@ repository:
match: ','
name: punctuation.seperator.property.kotlin
-
match: '@[a-zA-Z_]\w*'
name: meta.annotation.kotlin
match: '@(?:(?:file|property|field|get|set|receiver|param|setparam|delegate)\s*:\s*)?[a-zA-Z_]\w*'
name: storage.type.annotation.kotlin
2 changes: 1 addition & 1 deletion test/Functions.test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//^^^ keyword.other.kotlin
// ^^^^ entity.name.function.kotlin
// ^ meta.parameters.kotlin punctuation.section.group.begin.kotlin punctuation.definition.parameters.begin.kotlin
// ^^^^^^^^ meta.parameters.kotlin meta.annotation.kotlin
// ^^^^^^^^ meta.parameters.kotlin storage.type.annotation.kotlin
// ^ meta.parameters.kotlin
// ^^^^ meta.parameters.kotlin variable.parameter.function.kotlin
// ^ meta.parameters.kotlin keyword.operator.declaration.kotlin
Expand Down
25 changes: 13 additions & 12 deletions test/annotations.test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
// SYNTAX TEST "source.kotlin" "Annotations"

@file:JvmName("Foo")
//<------------- meta.annotation.kotlin
// ^ punctuation.section.group.begin.kotlin
// ^ meta.group.kotlin string.quoted.double.kotlin punctuation.definition.string.begin.kotlin
// ^^^ meta.group.kotlin string.quoted.double.kotlin
// ^ meta.group.kotlin string.quoted.double.kotlin punctuation.definition.string.end.kotlin
// ^ meta.group.kotlin punctuation.section.group.end.kotlin
@file:JvmName("Foo")
//^^^^^^^^^^^^^^^^^^^^ meta.annotation.kotlin
//^^^^^^^^^^^^^ storage.type.annotation.kotlin
// ^ punctuation.definition.arguments.begin.kotlin
// ^ meta.annotation.kotlin string.quoted.double.kotlin punctuation.definition.string.begin.kotlin
// ^^^ meta.annotation.kotlin string.quoted.double.kotlin
// ^ meta.annotation.kotlin string.quoted.double.kotlin punctuation.definition.string.end.kotlin
// ^ meta.annotation.kotlin punctuation.definition.arguments.end.kotlin

data class Response(@SerializedName("param1") val param1: String,
// ^^^^^^^^^^^^^^^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin
// ^^^^^^^^^^^^^^^ meta.class.kotlin meta.parameters.kotlin storage.type.annotation.kotlin
// ^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin punctuation.definition.arguments.begin.kotlin
// ^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin punctuation.definition.string.begin.kotlin
// ^^^^^^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin
Expand All @@ -22,7 +23,7 @@ data class Response(@SerializedName("param1") val param1: String,
// ^ meta.class.kotlin meta.parameters.kotlin punctuation.seperator.kotlin

@SerializedName("param2") val param2: String,
// ^^^^^^^^^^^^^^^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin
// ^^^^^^^^^^^^^^^ meta.class.kotlin meta.parameters.kotlin storage.type.annotation.kotlin
// ^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin punctuation.definition.arguments.begin.kotlin
// ^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin punctuation.definition.string.begin.kotlin
// ^^^^^^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin
Expand All @@ -34,7 +35,7 @@ data class Response(@SerializedName("param1") val param1: String,
// ^^^^^^ meta.class.kotlin meta.parameters.kotlin support.class.kotlin
// ^ meta.class.kotlin meta.parameters.kotlin punctuation.seperator.kotlin
@SerializedName("param3") val param3: String) {
// ^^^^^^^^^^^^^^^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin
// ^^^^^^^^^^^^^^^ meta.class.kotlin meta.parameters.kotlin storage.type.annotation.kotlin
// ^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin punctuation.definition.arguments.begin.kotlin
// ^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin punctuation.definition.string.begin.kotlin
// ^^^^^^ meta.class.kotlin meta.parameters.kotlin meta.annotation.kotlin string.quoted.double.kotlin
Expand All @@ -50,13 +51,13 @@ data class Response(@SerializedName("param1") val param1: String,

class Example {
@set:Inject
// ^^^^^^^^^^^ meta.annotation.kotlin
// ^^^^^^^^^^^ storage.type.annotation.kotlin
var collaborator: Collaborator
}


@MultiLineAnnotation(
//^^^^^^^^^^^^^^^^^^^^ meta.annotation.kotlin
//^^^^^^^^^^^^^^^^^^^^ meta.annotation.kotlin storage.type.annotation.kotlin
// ^ meta.annotation.kotlin punctuation.definition.arguments.begin.kotlin
"One",
// ^ meta.annotation.kotlin string.quoted.double.kotlin punctuation.definition.string.begin.kotlin
Expand Down