Fix accent commands in math mode causing errors

Fixes valentjn/vscode-ltex#216.
valentjn · Jan 12, 2021 · 1b6d0e8 · 1b6d0e8
1 parent 314448e
commit 1b6d0e8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 ## 9.0.1 (upcoming)
 
 - Ignore `\pgfmathsetmacro`, `\setmainfont`, and `\theoremstyle`
+- Fix accent commands such as `\O` in math mode resulting in diagnostics (fixes [vscode-ltex#216](https://github.com/valentjn/vscode-ltex/issues/216))
 
 ## 9.0.0 (January 3, 2021)
 

diff --git a/ltexls-core/src/main/java/org/bsplines/ltexls/parsing/latex/LatexAnnotatedTextBuilder.java b/ltexls-core/src/main/java/org/bsplines/ltexls/parsing/latex/LatexAnnotatedTextBuilder.java
@@ -561,21 +561,21 @@ public LatexAnnotatedTextBuilder addCode(String code) {
               popMode();
               addMarkup(command, generateDummy());
             } else if (command.equals("\\AA")) {
-              addMarkup(command, "\u00c5");
+              addMarkup(command, (isMathMode(this.curMode) ? "" : "\u00c5"));
             } else if (command.equals("\\O")) {
-              addMarkup(command, "\u00d8");
+              addMarkup(command, (isMathMode(this.curMode) ? "" : "\u00d8"));
             } else if (command.equals("\\aa")) {
-              addMarkup(command, "\u00e5");
+              addMarkup(command, (isMathMode(this.curMode) ? "" : "\u00e5"));
             } else if (command.equals("\\ss")) {
-              addMarkup(command, "\u00df");
+              addMarkup(command, (isMathMode(this.curMode) ? "" : "\u00df"));
             } else if (command.equals("\\o")) {
-              addMarkup(command, "\u00f8");
+              addMarkup(command, (isMathMode(this.curMode) ? "" : "\u00f8"));
             } else if (command.equals("\\`") || command.equals("\\'") || command.equals("\\^")
                   || command.equals("\\~") || command.equals("\\\"") || command.equals("\\=")
                   || command.equals("\\.")) {
               Matcher matcher = accentPattern1.matcher(code.substring(this.pos));
 
-              if (matcher.find()) {
+              if (!isMathMode(this.curMode) && matcher.find()) {
                 @Nullable String accentCommand = matcher.group(1);
                 @Nullable String letter = ((matcher.group(3) != null)
                     ? matcher.group(3) : matcher.group(5));
@@ -588,7 +588,7 @@ public LatexAnnotatedTextBuilder addCode(String code) {
             } else if (command.equals("\\c") || command.equals("\\r")) {
               Matcher matcher = accentPattern2.matcher(code.substring(this.pos));
 
-              if (matcher.find()) {
+              if (!isMathMode(this.curMode) && matcher.find()) {
                 @Nullable String accentCommand = matcher.group(1);
                 @Nullable String letter = ((matcher.group(3) != null)
                     ? matcher.group(3) : matcher.group(4));

diff --git a/...s-core/src/test/java/org/bsplines/ltexls/parsing/latex/LatexAnnotatedTextBuilderTest.java b/...s-core/src/test/java/org/bsplines/ltexls/parsing/latex/LatexAnnotatedTextBuilderTest.java
@@ -223,6 +223,13 @@ public void testMathMode() {
         + "  a \\text{,~and} b.\n"
         + "\\end{equation*}\n",
         "This is a test: Dummy0,\u00a0and Dummy1. ");
+    assertPlainText(
+        "This is a test:\n"
+        + "\\begin{equation}\n"
+        + "    Gau\\ss{}: \\O(n^2).\n"
+        + "\\end{equation}\n"
+        + "This is another test: $Gau\\ss{}: \\O(n^2)$.\n",
+        "This is a test: Dummy0. This is another test: Dummy1. ");
     assertPlainText(
         "This is a test:\n"
         + "\\[\n"