Bug Fix: Apply fix does not apply at proper line.

Author: laileni-aws

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/listeners/CodeWhispererCodeScanEditorMouseMotionListener.kt

@@ -42,7 +42,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_ISSUE_POPUP_DELAY_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_ISSUE_TITLE_MAX_LENGTH
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.runIfIdcConnectionOrTelemetryEnabled
-import software.aws.toolkits.jetbrains.utils.applyPatch
 import software.aws.toolkits.jetbrains.utils.notifyError
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.Result
@@ -397,14 +396,23 @@ class CodeWhispererCodeScanEditorMouseMotionListener(private val project: Projec
             WriteCommandAction.runWriteCommandAction(issue.project) {
                 val document = FileDocumentManager.getInstance().getDocument(issue.file) ?: return@runWriteCommandAction
 
-                val documentContent = document.text
-                val updatedContent = applyPatch(issue.suggestedFixes[0].code, documentContent, issue.file.name)
-                if (updatedContent == null) {
-//                    println(applyPatchToContent(issue.suggestedFixes[0].code, documentContent))
-                    throw Error("Patch apply failed.")
+                val linesToDelete = issue.suggestedFixes[0].code
+                    .split("\n")
+                    .count { it.startsWith("-") }
+
+                val linesToInsert = issue.suggestedFixes[0].code
+                    .split("\n")
+                    .filter { it.startsWith("+") }
+                    .map { it.removePrefix("+") }
+
+                if (document != null) {
+                    val startLineOffset = document.getLineStartOffset(issue.startLine - 1)
+                    val endLineOffset = document.getLineEndOffset(issue.startLine + linesToDelete - 2)
+                    document.replaceString(startLineOffset, endLineOffset, linesToInsert.joinToString("\n"))
+                    PsiDocumentManager.getInstance(project).commitDocument(document)
                 }
-                document.replaceString(document.getLineStartOffset(0), document.getLineEndOffset(document.lineCount - 1), updatedContent)
-                PsiDocumentManager.getInstance(issue.project).commitDocument(document)
+                FileDocumentManager.getInstance().saveDocument(document)
+
                 CodeWhispererTelemetryService.getInstance().sendCodeScanIssueApplyFixEvent(issue, Result.Succeeded)
                 hidePopup()
                 CodeWhispererCodeScanManager.getInstance(issue.project).updateScanNodesForIssuesOutOfTextRange(issue)

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/TextUtils.kt

@@ -5,9 +5,6 @@ package software.aws.toolkits.jetbrains.utils
 
 import com.intellij.lang.Language
 import com.intellij.openapi.command.CommandProcessor
-import com.intellij.openapi.diff.impl.patch.PatchReader
-import com.intellij.openapi.diff.impl.patch.TextFilePatch
-import com.intellij.openapi.diff.impl.patch.apply.PlainSimplePatchApplier
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.PsiFileFactory
@@ -30,15 +27,3 @@ fun formatText(project: Project, language: Language, content: String): String {
  * (e.g. Update Complete)
  */
 fun String.toHumanReadable() = StringUtil.toTitleCase(toLowerCase().replace('_', ' '))
-
-fun generateUnifiedPatch(patch: String, filePath: String): TextFilePatch {
-    val unifiedPatch = "--- $filePath\n+++ $filePath\n$patch"
-    val patchReader = PatchReader(unifiedPatch)
-    val patches = patchReader.readTextPatches()
-    return patches[0]
-}
-
-fun applyPatch(patch: String, fileContent: String, filePath: String): String? {
-    val unifiedPatch = generateUnifiedPatch(patch, filePath)
-    return PlainSimplePatchApplier.apply(fileContent, unifiedPatch.hunks)
-}

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/TextUtilsTest.kt

@@ -94,47 +94,4 @@ class TextUtilsTest {
         val actual = convertMarkdownToHTML(input)
         assertThat(actual).isEqualTo(expected)
     }
-
-    @Test
-    fun canApplyPatchSuccessfully() {
-        val inputPatch = "@@ -1,3 +1,3 @@\n first line\n-second line\n+third line\n forth line"
-        val inputFilePath = "dummy.py"
-        val fileContent = "first line\nsecond line\nforth line"
-        val actual = applyPatch(inputPatch, fileContent, inputFilePath)
-        val expected = "first line\nthird line\nforth line"
-        assertThat(actual).isEqualTo(expected)
-    }
-
-    @Test
-    fun canReturnNullWhenApplyPatchFails() {
-        val inputPatch = "@@ -1,3 +1,3 @@\n first line\n-second line\n+third line\n forth line"
-        val inputFilePath = "dummy.py"
-        val fileContent = "first line\nThree line\nforth line"
-        val actual = applyPatch(inputPatch, fileContent, inputFilePath)
-        val expected = null
-        assertThat(actual).isEqualTo(expected)
-    }
-
-    @Test
-    fun shouldHaveZeroHunkSizeForIncorrectPatchGenerated() {
-        val inputPatch = " first line\n-second line\n+third line\n forth line"
-        val inputFilePath = "dummy.py"
-        val actual = generateUnifiedPatch(inputPatch, inputFilePath)
-        assertThat(actual.hunks.size).isEqualTo(0)
-    }
-
-    @Test
-    fun shouldHaveHunksForCorrectPatchGenerated() {
-        val inputPatch = "@@ -1,3 +1,3 @@\n first line\n-second line\n+third line\n forth line"
-        val inputFilePath = "dummy.py"
-        val actual = generateUnifiedPatch(inputPatch, inputFilePath)
-        assertThat(actual.hunks.size).isEqualTo(1)
-        val hunk = actual.hunks[0]
-        assertThat(hunk.startLineAfter).isEqualTo(0)
-        assertThat(hunk.startLineBefore).isEqualTo(0)
-        assertThat(hunk.endLineAfter).isEqualTo(3)
-        assertThat(hunk.endLineBefore).isEqualTo(3)
-        val inputPatchLines = inputPatch.split("\n")
-        hunk.lines.forEachIndexed { index, patchLine -> assertThat(inputPatchLines[index + 1].substring(1)).isEqualTo(patchLine.text) }
-    }
 }