Refactor TypstAnnotatedTextBuilder

Author: spitzerd

src/main/kotlin/org/bsplines/ltexls/parsing/CharacterBasedCodeAnnotatedTextBuilder.kt

@@ -19,6 +19,7 @@ abstract class CharacterBasedCodeAnnotatedTextBuilder(
   protected var curChar = '\u0000'
   protected var curString = ""
   protected var isStartOfLine = false
+  protected var characterProcessed = false
 
   protected var dummyGenerator = DummyGenerator.getInstance()
   protected var dummyCounter = 0
@@ -36,6 +37,7 @@ abstract class CharacterBasedCodeAnnotatedTextBuilder(
     if (text?.isNotEmpty() == true) {
       super.addText(text)
       this.pos += text.length
+      characterProcessed = true
     }
 
     return this
@@ -45,6 +47,7 @@ abstract class CharacterBasedCodeAnnotatedTextBuilder(
     if (markup?.isNotEmpty() == true) {
       super.addMarkup(markup)
       this.pos += markup.length
+      characterProcessed = true
     }
 
     return this
@@ -57,6 +60,7 @@ abstract class CharacterBasedCodeAnnotatedTextBuilder(
     if (interpretAs?.isNotEmpty() == true) {
       super.addMarkup((markup ?: ""), interpretAs)
       this.pos += (markup?.length ?: 0)
+      characterProcessed = true
     } else {
       addMarkup(markup)
     }
@@ -73,6 +77,7 @@ abstract class CharacterBasedCodeAnnotatedTextBuilder(
       this.curChar = this.code[this.pos]
       this.curString = this.curChar.toString()
       this.isStartOfLine = ((this.pos == 0) || this.code[this.pos - 1] == '\n')
+      characterProcessed = false
       processCharacter()
 
       if (this.pos <= lastPos) {

src/main/kotlin/org/bsplines/ltexls/parsing/typst/TypstAnnotatedTextBuilder.kt

@@ -18,90 +18,86 @@ class TypstAnnotatedTextBuilder(
   private var codeModeString = false
   private var codeModeBracketsCounter = 0
 
-  @Suppress("ReturnCount", "ComplexMethod")
   override fun processCharacter() {
-    if (processEscapeCharacter()) return
-    if (processMathBlock()) return
-    if (codeMode) {
-      processCodeMode()
-      return
-    }
-    if (addMarkupInternal(CODE_REGEX)) {
-      codeModeBracketsCounter++
-      codeMode = true
-      return
-    }
+    processEscapeCharacter()
+    processMathBlock()
+    processCodeMode()
 
     if (this.isStartOfLine) {
-      if (addMarkupInternal(LIST_REGEX)) return
-      if (addMarkupInternal(LEADING_WHITESPACE_REGEX)) return
-      if (addMarkupInternal(HEADING_REGEX)) return
+      addMarkupInternal(LIST_REGEX)
+      addMarkupInternal(LEADING_WHITESPACE_REGEX)
+      addMarkupInternal(HEADING_REGEX)
     }
 
-    if (addMarkupInternal(LINE_COMMENT_REGEX, "\n")) return
-    if (addMarkupInternal(MULTILINELINE_COMMENT_REGEX, "\n")) return
-    if (addMarkupInternal(MARKUP_REGEX)) return
-    if (addMarkupInternal(LET_REGEX)) return
-    if (addMarkupInternal(IMPORT_REGEX, "\n")) return
-
-    if (addMarkupInternal(SQUARE_BRACKETS_REGEX)) return
+    addMarkupInternal(CODE_REGEX, "", true)
+    addMarkupInternal(LINE_COMMENT_REGEX, "\n")
+    addMarkupInternal(MULTILINELINE_COMMENT_REGEX, "\n")
+    addMarkupInternal(MARKUP_REGEX)
+    addMarkupInternal(LET_REGEX)
+    addMarkupInternal(IMPORT_REGEX, "\n")
+    addMarkupInternal(SQUARE_BRACKETS_REGEX)
 
     addText(this.curString)
   }
 
+  override fun addText(text: String?): CharacterBasedCodeAnnotatedTextBuilder {
+    if (characterProcessed) return this
+    return super.addText(text)
+  }
+
   private fun addMarkupInternal(
     regex: Regex,
     interpretAs: String = "",
-  ): Boolean {
+    startofCodeBlock: Boolean = false,
+  ) {
+    if (characterProcessed) return
     var matchResult: MatchResult?
     matchResult = matchFromPosition(regex)
     if (matchResult != null) {
       addMarkup(matchResult.value, interpretAs)
-      return true
+      if (startofCodeBlock) {
+        codeModeBracketsCounter++
+        codeMode = true
+      }
     }
-    return false
   }
 
-  private fun processEscapeCharacter(): Boolean {
+  private fun processEscapeCharacter() {
+    if (characterProcessed) return
     // Check for backslash escape character
     if (this.curString == "\\") {
       addMarkup(this.curString)
       // Add subsequent char as text if available
       if (this.code.length > this.pos) {
+        characterProcessed = false
         addText(this.code[this.pos].toString())
-        return true
       }
     }
-    return false
   }
 
-  private fun processMathBlock(): Boolean {
+  private fun processMathBlock() {
+    if (characterProcessed) return
     if (this.curString == "$") {
       // Start or end of math mode
       mathMode = !mathMode
       addMarkup(this.curString)
-      return true
     } else if (mathMode) {
       if (this.curString == "\"") {
         // Start or end of String within math mode
         mathModeString = !mathModeString
         addText(this.curString)
-        return true
       }
       if (mathModeString) {
         // String within math mode to be spell checked
         addText(this.curString)
       } else {
         addMarkup(this.curString)
       }
-      return true
-    } else {
-      // No math mode
-      return false
     }
   }
 
   private fun processCodeMode() {
+    if (!codeMode || characterProcessed) return
     when (this.curString) {
       "(" -> {
         codeModeBracketsCounter++

src/test/kotlin/org/bsplines/ltexls/parsing/typst/TypstAnnotatedTextBuilderTest.kt

@@ -160,7 +160,7 @@ class TypstAnnotatedTextBuilderTest : CodeAnnotatedTextBuilderTest("typst") {
       The amount is \$5
       including VAT. This is a last backslash: \
       """.trimIndent(),
-      "The amount is $5\nincluding VAT. This is a last backslash: \\",
+      "The amount is $5\nincluding VAT. This is a last backslash: ",
     )
   }
 }