Fix completion formatter (#1271)

## Changes Fixed bug with incorrect formatting of strings with cursor in the middle of the line. Fixes #1133 ## Test plan Unit test added
sourcegraph · Apr 2, 2024 · 131daa0 · 131daa0
1 parent dcb8e02
commit 131daa0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/main/kotlin/com/sourcegraph/cody/autocomplete/CodyAutocompleteManager.kt b/src/main/kotlin/com/sourcegraph/cody/autocomplete/CodyAutocompleteManager.kt
@@ -372,7 +372,13 @@ class CodyAutocompleteManager {
     }
 
     defaultItem.insertText = formattedInsertText
-    val completionText = formattedInsertText.removePrefix(originalText)
+    val cursorPositionInOriginalText = offset - range.startOffset
+    val originalTextBeforeCursor = originalText.substring(0, cursorPositionInOriginalText)
+    val originalTextAfterCursor = originalText.substring(cursorPositionInOriginalText)
+    val completionText =
+        formattedInsertText
+            .removePrefix(originalTextBeforeCursor)
+            .removeSuffix(originalTextAfterCursor)
     if (completionText.trim().isBlank()) return
 
     val lineBreaks = listOf("\r\n", "\n", "\r")

diff --git a/src/main/kotlin/com/sourcegraph/utils/CodyFormatter.kt b/src/main/kotlin/com/sourcegraph/utils/CodyFormatter.kt
@@ -44,7 +44,7 @@ class CodyFormatter {
             existingStart + addition + psiFile.text.substring(cursor)
           } else psiFile.text
       return formattedText.substring(
-          range.startOffset, cursor + formattedText.length - document.textLength)
+          range.startOffset, range.endOffset + formattedText.length - document.textLength)
     }
   }
 }
diff --git a/src/test/kotlin/utils/CodyFormatterTest.kt b/src/test/kotlin/utils/CodyFormatterTest.kt
@@ -2,6 +2,7 @@ package utils
 
 import com.intellij.openapi.util.TextRange
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import com.intellij.util.text.findTextRange
 import com.sourcegraph.utils.CodyFormatter
 import junit.framework.TestCase
 
@@ -82,4 +83,13 @@ class CodyFormatterTest : BasePlatformTestCase() {
             .trimMargin(),
         formatText(completion, rangeEnd, TextRange(rangeStart, rangeEnd), testFileContent))
   }
+
+  fun `test formatting with cursor in the middle of the line`() {
+    val existingLine = "VirtualFile vcsRoot = VcsUtil.getVcsRootFor(project, file);"
+    val testFileContent = testFileContent.replace("// MAIN", existingLine)
+    val range = testFileContent.findTextRange(existingLine)
+    val offset = testFileContent.indexOf("file")
+
+    TestCase.assertEquals(existingLine, formatText(existingLine, offset, range, testFileContent))
+  }
 }