🐛 [2.1.71] Fix multi-line value handling

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 The following enhancements and changes have been made to ***Auto Build Marlin***.
 
+## 2.1.71
+- Fix handling of multi-line value replacement
+
 ## 2.1.70
 - Improve Config Editor layout
 - Update Config Editors for external edits

abm/editor.js

@@ -217,7 +217,7 @@ class ConfigEditorProvider {
 
       if (wasDirty != doc.isDirty) {
         wasDirty = doc.isDirty;
-        abm.log(`Document dirty: ${wasDirty}`);
+        abm.log(`${wasDirty ? "" : "(Saved?) "}Document dirty:${wasDirty} closed:${doc.isClosed}`);
       }
 
       const changes = e.contentChanges;
@@ -275,6 +275,7 @@ class ConfigEditorProvider {
         return;
       }
 
+      // Init the new text as the existing text of the line
       let newtext = text;
 
       // Update the value of non-switch options
@@ -286,6 +287,7 @@ class ConfigEditorProvider {
         }
       }
 
+      // Update un/commenting of #define, as needed
       if (changes.enabled)
         newtext = newtext.replace(/^(\s*)\/\/+\s*(#define)(\s{1,3})?(\s*)/, '$1$2 $4');
       else
@@ -302,8 +304,20 @@ class ConfigEditorProvider {
       const inplace = edit === null;
       if (inplace) edit = new vscode.WorkspaceEdit();
 
+      // Replace the line with the new text
       edit.replace(document.uri, range, newtext);
 
+      // Pad a multi-line value with blank lines to keep line numbers from shifting
+      let multiline = (myschema.bysid[changes.sid].line_end ?? changes.line) - changes.line;
+      if (multiline > 0) {
+        let clrline = line;
+        while (multiline--) {
+          ++clrline;
+          const range = new vscode.Range(clrline, 0, clrline, Number.MAX_VALUE);
+          edit.replace(document.uri, range, "");
+        }
+      }
+
       if (inplace) ws.applyEdit(edit);
     }
 

abm/js/schema.js

@@ -1451,7 +1451,8 @@ class ConfigSchema {
             'orig': { enabled },
           };
 
-          if (val !== '') { define_info.value = val; define_info.orig.value = val; }
+          if (line_end !== line_start) define_info.line_end = line_end;
+          if (val !== '') define_info.value = define_info.orig.value = val;
           if (value_type !== '') define_info.type = value_type;
           if (options) define_info.options = options;
 

package.json

@@ -2,7 +2,7 @@
   "name": "auto-build",
   "displayName": "Auto Build Marlin",
   "description": "Provides an interface to configure, build, and upload Marlin Firmware.",
-  "version": "2.1.70",
+  "version": "2.1.71",
   "preview": false,
   "publisher": "marlinfirmware",
   "icon": "icon.png",