fix: solved a problem with applying patch

snyk · Sep 16, 2024 · 16ae0a1 · 16ae0a1
1 parent 097875a
commit 16ae0a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/main/kotlin/io/snyk/plugin/ui/jcef/ApplyFixHandler.kt b/src/main/kotlin/io/snyk/plugin/ui/jcef/ApplyFixHandler.kt
@@ -48,7 +48,7 @@ class ApplyFixHandler(private val project: Project) {
         logger.info("[generateApplyFixCommand] calling applyPatchAndSave")
 
         applyFixQuery.addHandler { value ->
-            val params = value.split(":")
+            val params = value.split("|@", limit = 2)
             val filePath = params[0]  // Path to the file that needs to be patched
             val patch = params[1]      // The patch we received from LS
 
@@ -63,6 +63,7 @@ class ApplyFixHandler(private val project: Project) {
                     """.trimIndent()
 
                     jbCefBrowser.cefBrowser.executeJavaScript(script, jbCefBrowser.cefBrowser.url, 0)
+                    JBCefJSQuery.Response("success")
                 } catch (e: Exception) {
                     log("Error applying fix: ${e.message}")
                 }
@@ -100,22 +101,24 @@ class ApplyFixHandler(private val project: Project) {
 
         val diffPatch = parseDiff(patch)
         val patchedContent = applyPatch(fileContent, diffPatch)
-        var result = false
 
         // Apply the patch inside a WriteCommandAction
-        result = try {
+        val result = try {
+            var appliedPatchSuccessfully = true
             WriteCommandAction.runWriteCommandAction(project) {
                 val document = FileDocumentManager.getInstance().getDocument(virtualFile)
-                if (document != null) {
+                if (document != null && fileContent != patchedContent) {
                     document.setText(patchedContent)
 
                     //temporary logs
                     logger.info("[applyPatchAndSave] Content after applying patch:${document.text}")
+                    appliedPatchSuccessfully = true
                 } else {
                     log("[applyPatchAndSave] Failed to find document for saving patched content.")
+                    appliedPatchSuccessfully = false
                 }
             }
-            true // Success
+            appliedPatchSuccessfully
         } catch (e: Exception) {
             log("[applyPatchAndSave] Error applying patch: ${e.message}")
             false // Failure

diff --git a/src/main/kotlin/io/snyk/plugin/ui/toolwindow/panels/JCEFDescriptionPanel.kt b/src/main/kotlin/io/snyk/plugin/ui/toolwindow/panels/JCEFDescriptionPanel.kt
@@ -302,7 +302,8 @@ class SuggestionDescriptionPanelFromLS(
                 const filePath = getFilePathFromFix(currentFix);
                 const patch = currentFix.unifiedDiffsPerFile[filePath];
 
-                window.applyFixQuery(filePath + ':' + patch);
+
+                window.applyFixQuery(filePath + '|@' + patch);
 
                 // Following VSCode logic, the steps are:
                 // 1. Read the current file content.