Skip to content

Commit 06ccaae

Browse files
committed
chore: re-use token sets
1 parent e7c7dc5 commit 06ccaae

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/main/kotlin/com/github/xepozz/toon/language/ToonParserDefinition.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@ import com.intellij.psi.tree.IFileElementType
1212
class ToonParserDefinition : ParserDefinition {
1313
override fun createLexer(project: com.intellij.openapi.project.Project?) = ToonIndentingLexer()
1414

15-
override fun getWhitespaceTokens() = TokenSet.WHITE_SPACE
15+
override fun getWhitespaceTokens() = ToonTokenSets.WHITESPACES
1616

1717
override fun createParser(project: com.intellij.openapi.project.Project?) = ToonParser()
18-
// override fun createParser(project: com.intellij.openapi.project.Project?) = YAMLParser()
1918

2019
override fun getFileNodeType() = FILE
2120

2221
override fun getCommentTokens() = ToonTokenSets.COMMENTS
2322

24-
override fun getStringLiteralElements() = TokenSet.EMPTY
23+
override fun getStringLiteralElements() = ToonTokenSets.STRING_LITERALS
2524

2625
override fun createElement(node: ASTNode) = ToonTypes.Factory.createElement(node)
2726

src/main/kotlin/com/github/xepozz/toon/language/psi/ToonTokenSets.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ object ToonTokenSets {
66
val EMPTY_SET = TokenSet.EMPTY
77

88
val COMMENTS = TokenSet.create(ToonTypes.COMMENT)
9-
val STRING_LITERALS = TokenSet.create(ToonTypes.KEY, ToonTypes.VALUE)
10-
val WHITESPACES = TokenSet.WHITE_SPACE
9+
val STRING_LITERALS = TokenSet.create(ToonTypes.VALUE)
10+
val WHITESPACES = TokenSet.create(*TokenSet.WHITE_SPACE.types)
1111
}

0 commit comments

Comments
 (0)