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

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

Author: adietish

src/main/.DS_Store

@@ -11,7 +11,6 @@
 package com.redhat.devtools.intellij.kubernetes.editor
 
 import com.intellij.json.JsonFileType
-import com.intellij.openapi.editor.Document
 import com.intellij.openapi.fileTypes.FileType
 import com.redhat.devtools.intellij.kubernetes.model.util.ResourceException
 import com.redhat.devtools.intellij.kubernetes.model.util.createResource
@@ -26,10 +25,13 @@ object EditorResourceSerialization {
     private const val RESOURCE_SEPARATOR_JSON = ",\n"
 
     /**
-     * Returns a [HasMetadata] for a given [Document] instance.
+     * Returns a list of [HasMetadata] for a given yaml or json string.
      *
-     * @param jsonYaml serialized resources
-     * @return [HasMetadata] for the given editor and clients
+     * @param jsonYaml string representing kubernetes resources
+     * @param fileType yaml- or json file type (no other types are supported)
+     * @return list of [HasMetadata] for the given yaml or json string
+     *
+     * @see isSupported
      */
     fun deserialize(jsonYaml: String?, fileType: FileType?, currentNamespace: String?): List<HasMetadata> {
         return if (jsonYaml == null
@@ -64,25 +66,27 @@ 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? {
         return when(fileType) {
             YAMLFileType.YML ->
                 Serialization.asYaml(resource).trim()
             JsonFileType.INSTANCE ->
-                Serialization.asYaml(resource).trim()
+                Serialization.asJson(resource).trim()
             else -> null
         }
     }

src/main/kotlin/.DS_Store

@@ -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
@@ -269,17 +269,20 @@ open class ResourceEditor(
     }
 
     fun removeClutter() {
-        val resources = editorResources.getAllResources().map { resource ->
+        val resources = createResources(
+            getDocument(editor),
+            editor.file.fileType) // don't insert namespace if not present (no namespace param)
+        val cleaned = resources.map { resource ->
             MetadataClutter.remove(resource.metadata)
             resource
         }
         runInUI {
-            replaceDocument(resources)
+            replaceDocument(cleaned)
             notifications.hideAll()
         }
     }
 
-    private fun createResources(document: Document?, fileType: FileType?, namespace: String?): List<HasMetadata> {
+    private fun createResources(document: Document?, fileType: FileType?, namespace: String? = null): List<HasMetadata> {
         return createResources.invoke(
             document?.text,
             fileType,