Merge 92170540c6 into a65a9f5549

common/util-common.ts

@@ -236,25 +236,31 @@ export function copyYAMLComments(doc : Document, src : Document) {
 
 /**
  * Copy yaml comments from srcItems to items
- * Typescript is super annoying here, so I have to use any here
+ * Attempts to preserve comments by matching content rather than just array indices
- * TODO: Since comments are belong to the array index, the comments will be lost if the order of the items is changed or removed or added.
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function copyYAMLCommentsItems(items : any, srcItems : any) {
+function copyYAMLCommentsItems(items: any, srcItems: any) {
     if (!items || !srcItems) {
         return;
     }
 
+    // First pass - try to match items by their content
     for (let i = 0; i < items.length; i++) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const item : any = items[i];
+        const item: any = items[i];
 
+        // Try to find matching source item by content
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const srcItem : any = srcItems[i];
+        const srcIndex = srcItems.findIndex((srcItem: any) =>
+            JSON.stringify(srcItem.value) === JSON.stringify(item.value) &&
+            JSON.stringify(srcItem.key) === JSON.stringify(item.key)
+        );
 
-        if (!srcItem) {
+        if (srcIndex !== -1) {
-            continue;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        }
+            const srcItem: any = srcItems[srcIndex];
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const nextSrcItem: any = srcItems[srcIndex + 1];
 
             if (item.key && srcItem.key) {
                 item.key.comment = srcItem.key.comment;
@@ -265,6 +271,20 @@ function copyYAMLCommentsItems(items : any, srcItems : any) {
                 item.comment = srcItem.comment;
             }
 
+            // Handle comments between array items
+            if (nextSrcItem && nextSrcItem.commentBefore) {
+                if (items[i + 1]) {
+                    items[i + 1].commentBefore = nextSrcItem.commentBefore;
+                }
+            }
+
+            // Handle trailing comments after array items
+            if (srcItem.value && srcItem.value.comment) {
+                if (item.value) {
+                    item.value.comment = srcItem.value.comment;
+                }
+            }
+
             if (item.value && srcItem.value) {
                 if (typeof item.value === "object" && typeof srcItem.value === "object") {
                     item.value.comment = srcItem.value.comment;
@@ -276,6 +296,7 @@ function copyYAMLCommentsItems(items : any, srcItems : any) {
                 }
             }
         }
+    }
 }
 
 /**

frontend/src/components/Terminal.vue

@@ -247,7 +247,6 @@ export default {
 <style scoped lang="scss">
 .main-terminal {
     height: 100%;
-    overflow-x: scroll;
 }
 </style>