Don't insert \right when brace is already matched, fixes #3493 for ma…

…tched brace pairs)
Hannah-Sten · May 26, 2024 · c20606a · c20606a
1 parent 11aeebd
commit c20606a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/nl/hannahsten/texifyidea/completion/handlers/RightInsertHandler.kt b/src/nl/hannahsten/texifyidea/completion/handlers/RightInsertHandler.kt
@@ -2,8 +2,10 @@ package nl.hannahsten.texifyidea.completion.handlers
 
 import com.intellij.codeInsight.completion.InsertHandler
 import com.intellij.codeInsight.completion.InsertionContext
+import com.intellij.codeInsight.highlighting.BraceMatchingUtil
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.openapi.editor.Editor
+import nl.hannahsten.texifyidea.file.LatexFileType
 import nl.hannahsten.texifyidea.lang.commands.LatexCommand
 import nl.hannahsten.texifyidea.lang.commands.LatexDelimiterCommand
 
@@ -19,12 +21,13 @@ open class RightInsertHandler : InsertHandler<LookupElement> {
         val command = element.`object` as? LatexCommand ?: return
 
         if (command is LatexDelimiterCommand && command.isLeft) {
-            insertRightCommand(editor, command)
+            val hasMatchingBrace = BraceMatchingUtil.matchBrace(context.editor.document.text, LatexFileType, editor.highlighter.createIterator(context.editor.caretModel.offset - 1), true)
+            if (hasMatchingBrace) {
+                editor.document.insertString(editor.caretModel.offset, " ")
+            } else {
+                editor.document.insertString(editor.caretModel.offset, "  \\" + command.matchingName)
+            }
+            editor.caretModel.moveToOffset(editor.caretModel.offset + 1)
         }
     }
-
-    private fun insertRightCommand(editor: Editor, leftCommand: LatexDelimiterCommand) {
-        editor.document.insertString(editor.caretModel.offset, "  \\" + leftCommand.matchingName)
-        editor.caretModel.moveToOffset(editor.caretModel.offset + 1)
-    }
 }
diff --git a/test/nl/hannahsten/texifyidea/completion/RightInsertHandlerTest.kt b/test/nl/hannahsten/texifyidea/completion/RightInsertHandlerTest.kt
@@ -12,4 +12,11 @@ class RightInsertHandlerTest : BasePlatformTestCase() {
         myFixture.finishLookup(Lookup.NORMAL_SELECT_CHAR)
         myFixture.checkResult("""$\left( <caret> \right) $""")
     }
+
+    fun testLeftRightMatchingBraces() {
+        myFixture.configureByText(LatexFileType, """$\lef<caret> )$""")
+        myFixture.complete(CompletionType.BASIC)
+        myFixture.finishLookup(Lookup.NORMAL_SELECT_CHAR)
+        myFixture.checkResult("""$\left( <caret> )$""")
+    }
 }