Merge remote-tracking branch 'origin/release/v1.1.2-221' into release…

…/v1.1.2-221 # Conflicts: # build.gradle.kts # src/main/kotlin/org/zowe/explorer/dataops/content/synchronizer/DocumentedSyncProvider.kt # src/main/resources/META-INF/plugin.xml
zowe · Dec 5, 2023 · 4c3929c · 4c3929c
2 parents a010a07 + bb0719a
commit 4c3929c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -32,7 +32,7 @@ apply(plugin = "org.jetbrains.intellij")
 apply(from = "gradle/sonar.gradle")
 
 group = "org.zowe"
-version = "1.1.1-221"
+version = "1.1.2-221"
 val remoteRobotVersion = "0.11.19"
 val okHttp3Version = "4.10.0"
 val kotestVersion = "5.6.2"

diff --git a/src/main/kotlin/org/zowe/explorer/dataops/content/synchronizer/DocumentedSyncProvider.kt b/src/main/kotlin/org/zowe/explorer/dataops/content/synchronizer/DocumentedSyncProvider.kt
@@ -100,7 +100,6 @@ class DocumentedSyncProvider(
           it.write(content)
         }
         loadNewContent(content)
-        getDocument()?.addDocumentListener(DocumentChangeListener())
       }.onFailure {
         isInitialContentSet.set(false)
       }

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/ui/ExplorerPasteProvider.kt b/src/main/kotlin/org/zowe/explorer/explorer/ui/ExplorerPasteProvider.kt
@@ -328,7 +328,7 @@ class ExplorerPasteProvider : PasteProvider {
         )
       ) {
         conflictsResolutions.addAll(
-          ussToPdsWarnings.map { ConflictResolution(it.first, it.second).apply { resolveBySkip() } }
+          ussToPdsWarnings.map { ConflictResolution(it.second, it.first).apply { resolveBySkip() } }
         )
       }
       // specific conflicts resolution end

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -376,6 +376,8 @@ Thank you for considering IBA Group for your mainframe needs.
                          enabledByDefault="true" level="WARNING"
                          implementationClass="org.zowe.explorer.editor.inspection.MFLossyEncodingInspection"/>
 
+        <editorFactoryDocumentListener implementation="org.zowe.explorer.editor.DocumentChangeListener"/>
+
     </extensions>
 
     <actions>

diff --git a/src/test/kotlin/org/zowe/explorer/explorer/ui/ExplorerPasteProviderTestSpec.kt b/src/test/kotlin/org/zowe/explorer/explorer/ui/ExplorerPasteProviderTestSpec.kt
@@ -362,7 +362,7 @@ class ExplorerPasteProviderTestSpec : WithApplicationShouldSpec({
         mockedExplorerPasteProvider.performPaste(mockedDataContext)
         assertSoftly {
           isShowYesNoDialogCalled shouldBe true
-          isPastePerformed shouldBe true
+          isPastePerformed shouldBe false
         }
       }