fix(prompts): before and after are swapped in preview

Closes: #119
Blarc · Jan 27, 2024 · c5e3e25 · c5e3e25
1 parent be0550d
commit c5e3e25
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+### Fixed
+- Diff "before" and "after" is swapped in "Edit Prompt" settings window.
+
 ## [1.5.0] - 2023-12-26
 
 ### Added

diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/AICommitAction.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/AICommitAction.kt
@@ -33,7 +33,7 @@ class AICommitAction : AnAction(), DumbAware {
         val commitMessage = VcsDataKeys.COMMIT_MESSAGE_CONTROL.getData(e.dataContext)
 
         runBackgroundableTask(message("action.background"), project) {
-            val diff = computeDiff(includedChanges, project)
+            val diff = computeDiff(includedChanges, false, project)
             if (diff.isBlank()) {
                 sendNotification(Notification.emptyDiff())
                 return@runBackgroundableTask

diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/AICommitsUtils.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/AICommitsUtils.kt
@@ -60,6 +60,7 @@ object AICommitsUtils {
 
     fun computeDiff(
             includedChanges: List<Change>,
+            reversePatch: Boolean,
             project: Project
     ): String {
 
@@ -89,7 +90,7 @@ object AICommitsUtils {
                         val filePatches = IdeaTextPatchBuilder.buildPatch(
                                 project,
                                 changes,
-                                repository.root.toNioPath(), false, true
+                                repository.root.toNioPath(), reversePatch, true
                         )
 
                         val stringWriter = StringWriter()

diff --git a/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/prompt/PromptTable.kt b/src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/prompt/PromptTable.kt
@@ -145,7 +145,7 @@ class PromptTable {
                         .toList()
 
                 branch = commonBranch(changes, project)
-                diff = computeDiff(changes, project)
+                diff = computeDiff(changes, true, project)
                 setPreview(prompt.content)
             }