Fix intellij lexer (#132)

flock-community · Nov 24, 2023 · 35c3f32 · 35c3f32
1 parent 3a0fce7
commit 35c3f32
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/lsp/intellij-plugin/src/main/kotlin/Lexer.kt b/src/lsp/intellij-plugin/src/main/kotlin/Lexer.kt
@@ -96,6 +96,7 @@ class Lexer : IntellijLexer() {
 
     override fun advance() {
         index++
+        state = index
     }
 
     override fun getBufferEnd() = buffer.toString().length

diff --git a/src/lsp/intellij-plugin/src/main/kotlin/Parser.kt b/src/lsp/intellij-plugin/src/main/kotlin/Parser.kt
@@ -57,15 +57,15 @@ class Parser : PsiParser {
             }
         }
 
-        fun parseDef() {
+        fun parseRef() {
             when {
                 builder.eof() -> return
                 builder.def() -> return
                 builder.tokenType == CUSTOM_TYPE -> {
                     val customTypeMarker = builder.mark()
                     builder.advanceLexer()
-                    customTypeMarker.done(CustomTypeDef())
-                    parseDef()
+                    customTypeMarker.done(CustomTypeRef())
+                    parseRef()
                 }
 
                 builder.tokenType == LEFT_CURLY -> {
@@ -74,7 +74,25 @@ class Parser : PsiParser {
                     parseBody()
                     bodyMarker.done(Body())
                     builder.advanceLexer()
-                    parseDef()
+                    parseRef()
+                }
+
+                else -> {
+                    builder.advanceLexer()
+                    parseRef()
+                }
+            }
+        }
+
+        fun parseDef() {
+            when {
+                builder.eof() -> return
+                builder.def() -> return
+                builder.tokenType == CUSTOM_TYPE -> {
+                    val customTypeMarker = builder.mark()
+                    builder.advanceLexer()
+                    customTypeMarker.done(CustomTypeDef())
+                    parseRef()
                 }
 
                 else -> {
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,6 +96,7 @@ class Lexer : IntellijLexer() { @@
         override fun advance() {
             index++
+            state = index
         }
         override fun getBufferEnd() = buffer.toString().length
@@ Expand Down @@