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

Add support for data object #71

Merged
merged 1 commit into from
Nov 18, 2023
Merged

Add support for data object #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions dist/Kotlin.JSON-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@
"class-literal": {
"patterns": [
{
"begin": "(?=\\b(?:(?:(?:data|value)\\s+)?class|(?:(?:fun|value)\\s+)?interface)\\s+\\w+)\\b",
"begin": "(?=\\b(?:(?:(?:data|value)\\s+)?class|(?:data\\s+)?object|(?:(?:fun|value)\\s+)?interface)\\s+\\w+)\\b",
"end": "(?=\\}|$)",
"name": "meta.class.kotlin",
"patterns": [
{
"include": "#keywords"
},
{
"begin": "\\b((?:(?:data|value)\\s+)?class|(?:(?:fun|value)\\s+)?interface)\\b\\s+(\\w+)",
"begin": "\\b((?:(?:data|value)\\s+)?class|(?:data\\s+)?object|(?:(?:fun|value)\\s+)?interface)\\b\\s+(\\w+)",
"beginCaptures": {
"1": {
"name": "storage.modifier.kotlin"
Expand Down
4 changes: 2 additions & 2 deletions dist/Kotlin.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ repository:
class-literal:
patterns:
-
begin: '(?=\b(?:(?:(?:data|value)\s+)?class|(?:(?:fun|value)\s+)?interface)\s+\w+)\b'
begin: '(?=\b(?:(?:(?:data|value)\s+)?class|(?:data\s+)?object|(?:(?:fun|value)\s+)?interface)\s+\w+)\b'
end: '(?=\}|$)'
name: meta.class.kotlin
patterns:
- {include: '#keywords'}
- {begin: '\b((?:(?:data|value)\s+)?class|(?:(?:fun|value)\s+)?interface)\b\s+(\w+)', beginCaptures: {'1': {name: storage.modifier.kotlin}, '2': {name: entity.name.class.kotlin}}, end: '(?=\(|\{|$)', patterns: [{include: '#comments'}, {include: '#annotations'}, {include: '#types'}]}
- {begin: '\b((?:(?:data|value)\s+)?class|(?:data\s+)?object|(?:(?:fun|value)\s+)?interface)\b\s+(\w+)', beginCaptures: {'1': {name: storage.modifier.kotlin}, '2': {name: entity.name.class.kotlin}}, end: '(?=\(|\{|$)', patterns: [{include: '#comments'}, {include: '#annotations'}, {include: '#types'}]}
- {begin: (\(), beginCaptures: {'0': {name: punctuation.section.group.begin.kotlin}, '1': {name: punctuation.definition.parameters.begin.kotlin}}, end: (\)), endCaptures: {'0': {name: punctuation.section.group.end.kotlin}, '1': {name: punctuation.definition.parameters.end.kotlin}}, name: meta.parameters.kotlin, patterns: [{include: '#class-parameter-list'}, {include: '#comments'}]}
- {begin: '\{', beginCaptures: {'0': {name: punctuation.section.group.begin.kotlin}}, end: '\}', endCaptures: {'0': {name: punctuation.section.group.end.kotlin}}, name: meta.block.kotlin, patterns: [{include: '#code'}]}
repository:
Expand Down
4 changes: 2 additions & 2 deletions dist/Kotlin.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<array>
<dict>
<key>begin</key>
<string>(?=\b(?:(?:(?:data|value)\s+)?class|(?:(?:fun|value)\s+)?interface)\s+\w+)\b</string>
<string>(?=\b(?:(?:(?:data|value)\s+)?class|(?:data\s+)?object|(?:(?:fun|value)\s+)?interface)\s+\w+)\b</string>
<key>end</key>
<string>(?=\}|$)</string>
<key>name</key>
Expand All @@ -80,7 +80,7 @@
</dict>
<dict>
<key>begin</key>
<string>\b((?:(?:data|value)\s+)?class|(?:(?:fun|value)\s+)?interface)\b\s+(\w+)</string>
<string>\b((?:(?:data|value)\s+)?class|(?:data\s+)?object|(?:(?:fun|value)\s+)?interface)\b\s+(\w+)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
Expand Down
96 changes: 43 additions & 53 deletions snapshots/corpus.kt.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,15 +823,10 @@
# ^ 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 punctuation.section.group.end.kotlin punctuation.definition.parameters.end.kotlin
>object NotANumber : Expr()
#^^^^^^ source.kotlin storage.type.kotlin
# ^ source.kotlin
# ^^^^^^^^^^ source.kotlin entity.name.type.class.kotlin
# ^ source.kotlin
# ^ source.kotlin keyword.operator.declaration.kotlin
# ^ source.kotlin
# ^^^^ source.kotlin entity.name.type.class.kotlin
# ^ source.kotlin meta.group.kotlin punctuation.section.group.begin.kotlin
# ^ source.kotlin meta.group.kotlin punctuation.section.group.end.kotlin
#^^^^^^ source.kotlin meta.class.kotlin storage.type.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 punctuation.section.group.end.kotlin punctuation.definition.parameters.end.kotlin
>// #endregion
#^^ source.kotlin punctuation.definition.comment.kotlin comment.line.double-slash.kotlin
# ^^^^^^^^^^^^ source.kotlin punctuation.definition.comment.kotlin
Expand Down Expand Up @@ -1074,54 +1069,49 @@
#^ source.kotlin meta.class.kotlin meta.block.kotlin punctuation.section.group.end.kotlin
>
>object DefaultListener : MouseAdapter() {
#^^^^^^ source.kotlin storage.type.kotlin
# ^ source.kotlin
# ^^^^^^^^^^^^^^^ source.kotlin entity.name.type.class.kotlin
# ^ source.kotlin
# ^ source.kotlin keyword.operator.declaration.kotlin
# ^ source.kotlin
# ^^^^^^^^^^^^ source.kotlin entity.name.type.class.kotlin
# ^ source.kotlin meta.group.kotlin punctuation.section.group.begin.kotlin
# ^ source.kotlin meta.group.kotlin punctuation.section.group.end.kotlin
# ^ source.kotlin
# ^ source.kotlin meta.block.kotlin punctuation.section.group.begin.kotlin
#^^^^^^ source.kotlin meta.class.kotlin storage.type.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 punctuation.section.group.end.kotlin punctuation.definition.parameters.end.kotlin
# ^ source.kotlin meta.class.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin punctuation.section.group.begin.kotlin
> override fun mouseClicked(e: MouseEvent) { }
#^^^^ source.kotlin meta.block.kotlin
# ^^^^^^^^ source.kotlin meta.block.kotlin storage.modifier.kotlin
# ^ source.kotlin meta.block.kotlin
# ^^^ source.kotlin meta.block.kotlin meta.function.kotlin keyword.other.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin
# ^^^^^^^^^^^^ source.kotlin meta.block.kotlin meta.function.kotlin entity.name.function.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin punctuation.section.group.begin.kotlin punctuation.definition.parameters.begin.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin variable.parameter.function.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin keyword.operator.declaration.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin
# ^^^^^^^^^^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin entity.name.type.class.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin punctuation.section.group.end.kotlin punctuation.definition.parameters.end.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin punctuation.section.group.begin.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin punctuation.section.group.end.kotlin
#^^^^ source.kotlin meta.class.kotlin meta.block.kotlin
# ^^^^^^^^ source.kotlin meta.class.kotlin meta.block.kotlin storage.modifier.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin
# ^^^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin keyword.other.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin
# ^^^^^^^^^^^^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin entity.name.function.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin punctuation.section.group.begin.kotlin punctuation.definition.parameters.begin.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin variable.parameter.function.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin keyword.operator.declaration.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin
# ^^^^^^^^^^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin entity.name.type.class.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin punctuation.section.group.end.kotlin punctuation.definition.parameters.end.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin punctuation.section.group.begin.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin punctuation.section.group.end.kotlin
>
> override fun mouseEntered(e: MouseEvent) { }
#^^^^ source.kotlin meta.block.kotlin
# ^^^^^^^^ source.kotlin meta.block.kotlin storage.modifier.kotlin
# ^ source.kotlin meta.block.kotlin
# ^^^ source.kotlin meta.block.kotlin meta.function.kotlin keyword.other.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin
# ^^^^^^^^^^^^ source.kotlin meta.block.kotlin meta.function.kotlin entity.name.function.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin punctuation.section.group.begin.kotlin punctuation.definition.parameters.begin.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin variable.parameter.function.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin keyword.operator.declaration.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin
# ^^^^^^^^^^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin entity.name.type.class.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin punctuation.section.group.end.kotlin punctuation.definition.parameters.end.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin punctuation.section.group.begin.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin
# ^ source.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin punctuation.section.group.end.kotlin
#^^^^ source.kotlin meta.class.kotlin meta.block.kotlin
# ^^^^^^^^ source.kotlin meta.class.kotlin meta.block.kotlin storage.modifier.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin
# ^^^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin keyword.other.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin
# ^^^^^^^^^^^^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin entity.name.function.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin punctuation.section.group.begin.kotlin punctuation.definition.parameters.begin.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin variable.parameter.function.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin keyword.operator.declaration.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin
# ^^^^^^^^^^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin entity.name.type.class.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.parameters.kotlin punctuation.section.group.end.kotlin punctuation.definition.parameters.end.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin punctuation.section.group.begin.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin
# ^ source.kotlin meta.class.kotlin meta.block.kotlin meta.function.kotlin meta.block.kotlin punctuation.section.group.end.kotlin
>}
#^ source.kotlin meta.block.kotlin punctuation.section.group.end.kotlin
#^ source.kotlin meta.class.kotlin meta.block.kotlin punctuation.section.group.end.kotlin
>
>class Feature : Node("Title", "Content", "Description") {
#^^^^^ source.kotlin meta.class.kotlin storage.modifier.kotlin
Expand Down
4 changes: 2 additions & 2 deletions src/classes.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ repository:
class-literal:
patterns:
-
begin: '(?=\b(?:(?:(?:data|value)\s+)?class|(?:(?:fun|value)\s+)?interface)\s+\w+)\b'
begin: '(?=\b(?:(?:(?:data|value)\s+)?class|(?:data\s+)?object|(?:(?:fun|value)\s+)?interface)\s+\w+)\b'
end: '(?=\}|$)'
name: meta.class.kotlin
patterns:
-
include: '#keywords'
-
begin: '\b((?:(?:data|value)\s+)?class|(?:(?:fun|value)\s+)?interface)\b\s+(\w+)'
begin: '\b((?:(?:data|value)\s+)?class|(?:data\s+)?object|(?:(?:fun|value)\s+)?interface)\b\s+(\w+)'
beginCaptures:
'1':
name: storage.modifier.kotlin
Expand Down
4 changes: 4 additions & 0 deletions test/Objects.test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@
})
//^ meta.group.kotlin meta.block.kotlin punctuation.section.group.end.kotlin
// ^ meta.group.kotlin punctuation.section.group.end.kotlin

data object Foo
// <------- source.kotlin meta.class.kotlin storage.modifier.kotlin
// ^^^ source.kotlin meta.class.kotlin
Loading