Fix Keyword token

JetBrains · Dec 8, 2023 · 32a2741 · 32a2741
1 parent 99b74fd
commit 32a2741
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/...gine/src/main/kotlin/com/maddyhome/idea/vim/regexp/engine/nfa/matcher/PredicateMatcher.kt b/...gine/src/main/kotlin/com/maddyhome/idea/vim/regexp/engine/nfa/matcher/PredicateMatcher.kt
@@ -32,4 +32,26 @@ internal class PredicateMatcher(val predicate: (Char) -> Boolean) : Matcher {
   override fun isEpsilon(): Boolean {
     return false
   }
-}
+}
+
+/**
+ * Matcher used to match a character against a predicate
+ *
+ * @param predicate The predicate used to check if the character should be accepted
+ */
+internal class EditorAwarePredicateMatcher(val predicate: (VimEditor, Char) -> Boolean) : Matcher {
+  override fun matches(
+    editor: VimEditor,
+    index: Int, groups:
+    VimMatchGroupCollection,
+    isCaseInsensitive: Boolean,
+    possibleCursors: MutableList<VimCaret>
+  ): MatcherResult {
+    return if (index < editor.text().length && predicate(editor, editor.text()[index])) MatcherResult.Success(1)
+    else MatcherResult.Failure
+  }
+
+  override fun isEpsilon(): Boolean {
+    return false
+  }
+}
diff --git a/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/regexp/parser/visitors/PatternVisitor.kt b/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/regexp/parser/visitors/PatternVisitor.kt
@@ -8,6 +8,8 @@
 
 package com.maddyhome.idea.vim.regexp.parser.visitors
 
+import com.maddyhome.idea.vim.api.VimEditor
+import com.maddyhome.idea.vim.options.helpers.KeywordOptionHelper
 import com.maddyhome.idea.vim.regexp.engine.nfa.NFA
 import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.AfterColumnCursorMatcher
 import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.AfterColumnMatcher
@@ -30,6 +32,7 @@ import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.CollectionMatcher
 import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.CollectionRange
 import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.CursorMatcher
 import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.DotMatcher
+import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.EditorAwarePredicateMatcher
 import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.EndOfFileMatcher
 import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.EndOfLineMatcher
 import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.EndOfWordMatcher
@@ -181,27 +184,19 @@ internal object PatternVisitor : RegexParserBaseVisitor<NFA>() {
   }
 
   override fun visitKeyword(ctx: RegexParser.KeywordContext): NFA {
-    val base = { char: Char -> char.isLetterOrDigit() || char == '_' }
+    val base = { editor: VimEditor, char: Char -> KeywordOptionHelper.isKeyword(editor, char) }
     return if (ctx.text.contains('_'))
-      NFA.fromMatcher(
-        PredicateMatcher { char -> char == '\n' || base(char) }
-      )
+      NFA.fromMatcher(EditorAwarePredicateMatcher { editor, char -> char == '\n' || base(editor, char) })
     else
-      NFA.fromMatcher(
-        PredicateMatcher { char -> base(char) }
-      )
+      NFA.fromMatcher(EditorAwarePredicateMatcher { editor, char -> base(editor, char) })
   }
 
   override fun visitKeywordNotDigit(ctx: RegexParser.KeywordNotDigitContext): NFA {
-    val base = { char: Char -> char.isLetter() || char == '_' }
+    val base = { editor: VimEditor, char: Char -> !char.isDigit() && KeywordOptionHelper.isKeyword(editor, char) }
     return if (ctx.text.contains('_'))
-      NFA.fromMatcher(
-        PredicateMatcher { char -> char == '\n' || base(char) }
-      )
+      NFA.fromMatcher(EditorAwarePredicateMatcher { editor, char -> char == '\n' || base(editor, char) })
     else
-      NFA.fromMatcher(
-        PredicateMatcher { char -> base(char) }
-      )
+      NFA.fromMatcher(EditorAwarePredicateMatcher { editor, char -> base(editor, char) })
   }
 
   override fun visitFilename(ctx: RegexParser.FilenameContext): NFA {