Make LatexCommandSignature check for end of string

Fixes valentjn/vscode-ltex#341.
valentjn · Jul 4, 2021 · 20ea024 · 20ea024
1 parent 943f1e6
commit 20ea024
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ## 12.2.1 (upcoming)
 
+- Fix error when checking L<sup>A</sup>T<sub>E</sub>X documents ending with specific commands (fixes [vscode-ltex#341](https://github.com/valentjn/vscode-ltex/issues/341))
 - Fix name of Portuguese babel language names, add support for Brazilian Portuguese babel language names (fixes [#72](https://github.com/valentjn/ltex-ls/issues/72))
 
 ## 12.2.0 (June 5, 2021)

diff --git a/ltexls/src/main/java/org/bsplines/ltexls/parsing/latex/LatexCommandSignature.java b/ltexls/src/main/java/org/bsplines/ltexls/parsing/latex/LatexCommandSignature.java
@@ -104,12 +104,14 @@ public LatexCommandSignature(String commandPrototype, Action action,
   }
 
   private static String matchPatternFromPosition(String code, int fromPos, Pattern pattern) {
+    if (fromPos >= code.length()) return "";
     Matcher matcher = pattern.matcher(code.substring(fromPos));
     return (matcher.find() ? matcher.group() : "");
   }
 
   public static String matchArgumentFromPosition(
         String code, int fromPos, ArgumentType argumentType) {
+    if (fromPos >= code.length()) return "";
     int pos = fromPos;
     char openChar = '\0';
 

diff --git a/ltexls/src/test/java/org/bsplines/ltexls/parsing/latex/LatexAnnotatedTextBuilderTest.java b/ltexls/src/test/java/org/bsplines/ltexls/parsing/latex/LatexAnnotatedTextBuilderTest.java
@@ -131,6 +131,9 @@ public void testTextMode() {
         "This is a test: Dummy0, Dummy1, Dummy2. "
         + "Dummies shows that this should be plural. "
         + "Dummies proves another error. ");
+    assertPlainText(
+        "\\cites{test}",
+        "Dummies");
     assertPlainText(
         "This is a test, \\egc an actual test \\eg{} test.\n"
         + "This is a test, \\iec an actual test \\ie{} test.\n",