Clean up parser code

sblundy · Aug 25, 2019 · 717ae9e · 717ae9e
1 parent 5c08370
commit 717ae9e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/src/main/kotlin/com/github/sblundy/elvish/lang/ElvishParserDefinition.kt b/src/main/kotlin/com/github/sblundy/elvish/lang/ElvishParserDefinition.kt
@@ -15,10 +15,7 @@ import com.intellij.psi.tree.IFileElementType
 import com.intellij.psi.tree.TokenSet
 
 
-
-/**
- */
-class ElvishParserDefinition: ParserDefinition {
+class ElvishParserDefinition : ParserDefinition {
     override fun createParser(project: Project?): PsiParser = ElvishParser()
     override fun createLexer(project: Project?): Lexer = ElvishLexerAdapter()
     override fun createFile(viewProvider: FileViewProvider): PsiFile = ElvishFile(viewProvider)
@@ -30,5 +27,17 @@ class ElvishParserDefinition: ParserDefinition {
     companion object {
         val FILE = IFileElementType(ElvishLanguage.INSTANCE)
         val COMMENT = TokenSet.create(ElvishTypes.COMMENT)
+        val KEYWORDS = TokenSet.create(
+            ElvishTypes.KEYWORD_DEL,
+            ElvishTypes.KEYWORD_ELIF,
+            ElvishTypes.KEYWORD_ELSE,
+            ElvishTypes.KEYWORD_EXCEPT,
+            ElvishTypes.KEYWORD_FINALLY,
+            ElvishTypes.KEYWORD_FN,
+            ElvishTypes.KEYWORD_FOR,
+            ElvishTypes.KEYWORD_IF,
+            ElvishTypes.KEYWORD_TRY,
+            ElvishTypes.KEYWORD_WHILE
+        )
     }
 }
diff --git a/src/main/kotlin/com/github/sblundy/elvish/lang/parserUtils.kt b/src/main/kotlin/com/github/sblundy/elvish/lang/parserUtils.kt
@@ -4,21 +4,10 @@ package com.github.sblundy.elvish.lang
 
 import com.github.sblundy.elvish.psi.ElvishTypes
 import com.intellij.lang.PsiBuilder
+import com.intellij.lang.parser.GeneratedParserUtilBase
 
-private val keywords = setOf(
-    ElvishTypes.KEYWORD_DEL,
-    ElvishTypes.KEYWORD_ELIF,
-    ElvishTypes.KEYWORD_ELSE,
-    ElvishTypes.KEYWORD_EXCEPT,
-    ElvishTypes.KEYWORD_FINALLY,
-    ElvishTypes.KEYWORD_FN,
-    ElvishTypes.KEYWORD_FOR,
-    ElvishTypes.KEYWORD_IF,
-    ElvishTypes.KEYWORD_TRY,
-    ElvishTypes.KEYWORD_WHILE)
-
-fun parseKeywordAsBareword(builder: PsiBuilder, level: Int): Boolean {
-    if (!(builder.tokenType in keywords)) return false
+fun parseKeywordAsBareword(builder: PsiBuilder, @Suppress("UNUSED_PARAMETER") level: Int): Boolean {
+    if (builder.tokenType !in ElvishParserDefinition.KEYWORDS) return false
     builder.remapCurrentToken(ElvishTypes.BAREWORD_CHAR)
-    return true
+    return GeneratedParserUtilBase.consumeToken(builder, ElvishTypes.BAREWORD_CHAR)
 }