fix: dont trash the document when removing clutter (#818)

Signed-off-by: Andre Dietisheim <[email protected]>

Author: adietish

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/editor/EditorResourceSerialization.kt

@@ -64,17 +64,19 @@ object EditorResourceSerialization {
         return resource
     }
 
-    fun serialize(resources: Collection<HasMetadata>, fileType: FileType?): String? {
+    fun serialize(resources: List<HasMetadata>, fileType: FileType?): String? {
         if (fileType == null) {
             return null
         }
-        if (resources.size >=2 && fileType != YAMLFileType.YML) {
+        if (resources.size >=2
+            && fileType != YAMLFileType.YML) {
             throw UnsupportedOperationException(
                 "${fileType.name} is not supported for multi-resource documents. Only ${YAMLFileType.YML.name} is.")
         }
         return resources
             .mapNotNull { resource -> serialize(resource, fileType) }
-            .joinToString(RESOURCE_SEPARATOR_YAML)
+            .joinToString("\n")
+
     }
 
     private fun serialize(resource: HasMetadata, fileType: FileType): String? {

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditor.kt

@@ -51,7 +51,7 @@ open class ResourceEditor(
     // for mocking purposes
     private val createResources: (string: String?, fileType: FileType?, currentNamespace: String?) -> List<HasMetadata> =
         EditorResourceSerialization::deserialize,
-    private val serialize: (resources: Collection<HasMetadata>, fileType: FileType?) -> String? =
+    private val serialize: (resources: List<HasMetadata>, fileType: FileType?) -> String? =
         EditorResourceSerialization::serialize,
     // for mocking purposes
     private val createResourceFileForVirtual: (file: VirtualFile?) -> ResourceFile? =
@@ -165,7 +165,7 @@ open class ResourceEditor(
         }
     }
 
-    private fun replaceDocument(resources: Collection<HasMetadata>): Boolean {
+    private fun replaceDocument(resources: List<HasMetadata>): Boolean {
         val manager = getPsiDocumentManager.invoke(project)
         val document = getDocument.invoke(editor) ?: return false
         val jsonYaml = serialize.invoke(resources, getFileType(document, manager)) ?: return false

src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/ResourceEditorTest.kt

@@ -116,10 +116,10 @@ class ResourceEditorTest {
     private val createResources: (string: String?, fileType: FileType?, currentNamespace: String?) -> List<HasMetadata> =
         mock<(string: String?, fileType: FileType?, currentNamespace: String?) -> List<HasMetadata>>()
     private val editorResources: EditorResources = mock()
-    private val serialize: (resources: Collection<HasMetadata>, fileType: FileType?) -> String? =
-        mock<(resources: Collection<HasMetadata>, fileType: FileType?) -> String?>().apply {
+    private val serialize: (resources: List<HasMetadata>, fileType: FileType?) -> String? =
+        mock<(resources: List<HasMetadata>, fileType: FileType?) -> String?>().apply {
             doAnswer { invocation ->
-                val resources = invocation.getArgument<Collection<HasMetadata>>(0)
+                val resources = invocation.getArgument<List<HasMetadata>>(0)
                 EditorResourceSerialization.serialize(resources, YAMLFileType.YML)
             }.whenever(this).invoke(any(), any())
         }
@@ -629,7 +629,7 @@ class ResourceEditorTest {
         resourceModel: IResourceModel,
         project: Project,
         createResources: (string: String?, fileType: FileType?, currentNamespace: String?) -> List<HasMetadata>,
-        serialize: (resources: Collection<HasMetadata>, fileType: FileType?) -> String?,
+        serialize: (resources: List<HasMetadata>, fileType: FileType?) -> String?,
         resourceFileForVirtual: (file: VirtualFile?) -> ResourceFile?,
         notifications: Notifications,
         documentProvider: (FileEditor) -> Document?,