From fa0a9ad9e49da81460bbc021462ee60d921f04ae Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 9 Nov 2024 15:57:52 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20[2.1.60]=20Tweak=20data=20detail?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md       | 30 ++++++++++++++++++++----------
 abm/js/editview.js | 17 +++++++++++------
 abm/js/schema.js   |  1 +
 package.json       |  4 ++--
 4 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59f3959..945d203 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,29 +2,39 @@
 
 The following enhancements and changes have been made to ***Auto Build Marlin***.
 
+## 2.1.60
+- Config Editor:
+  - Group sequential items with the same name
+  - Provide standard options for 'state' and 'dir' types
+  - More mutual-exclusive checkbox groups
+  - Preserve collapsed sections on show/hide document
+  - Clean up and document some code
+
 ## 2.1.59
-- Fix handling of #undef
-- Identify macro defines
-- Use checkbox groups for optional items
-- Add checkbox groups for like-named items
+- Config Editor:
+  - Fix handling of `#undef`
+  - Identify macro defines
+  - Use checkbox groups for optional distinct items
+  - Add checkbox groups for like-named items
 
 ## 2.1.58
-- Fix filtering options by axis
-- Implement radio grouping for LCD items
+- Config Editor:
+  - Fix filtering options by axis
+  - Implement radio grouping for LCD items
 
 ## 2.1.57
-- Config Editor "Show Disabled" checkbox
+- Config Editor: "Show Disabled" checkbox
 
 ## 2.1.56
-- Handle `MB(...)` in schema
+- Config Editor: Handle `MB(...)` in schema
 
 ## 2.1.55
 - Update for new `Conditionals-#-abc.h` files
 
 ## 2.1.54
-- Fix parsing of `defined()` in `schema.js`
+- Config Editor: Fix parsing of `defined()` in `schema.js`
 - Alt/Option changes "Clean" to "Purge" to delete build and libdeps
-- Add on-the-fly log_() function to `editview.js`
+- Config Editor: Add on-the-fly `log_()` function to `editview.js`
 
 ## 2.1.53
 - Prevent `platformio.ini` from opening by overriding a PlatformIO IDE setting.
diff --git a/abm/js/editview.js b/abm/js/editview.js
index a1d655a..81d877b 100755
--- a/abm/js/editview.js
+++ b/abm/js/editview.js
@@ -182,8 +182,9 @@ $(function () {
     changes = [];
   }
   function end_multi_update() {
-    vscode.postMessage({ type:'multi-change', changes });
     multi_update = false;
+    ignore_update = true;
+    vscode.postMessage({ type:'multi-change', changes }); // editor.js:handleMessage
   }
 
   // A filter text box to filter the list of options.
@@ -285,13 +286,14 @@ $(function () {
     refreshVisibleItems();
     saveWebViewState();
 
-    // Handle message posting
-    ignore_update = true;
+    // This update should be ignored when it comes back from onDidChangeTextDocument -> updateWebview
     const msg = { type: 'change', data: optref };
     if (multi_update)
       changes.push(msg);
-    else
-      vscode.postMessage(msg);
+    else {
+      ignore_update = true;
+      vscode.postMessage(msg); // editor.js:handleMessage
+    }
   }
 
   /**
@@ -794,7 +796,10 @@ $(function () {
           ignore_update = false;
         else
           buildConfigFormWithData(message.schema);  // Use the provided data to rebuild the form.
-          //buildConfigFormWithText(message.text);
+        break;
+
+      case 'text-update':
+        buildConfigFormWithText(message.text);  // Use the provided text to rebuild the form.
         break;
 
       // Display an error message
diff --git a/abm/js/schema.js b/abm/js/schema.js
index febba40..e4a5d0f 100755
--- a/abm/js/schema.js
+++ b/abm/js/schema.js
@@ -68,6 +68,7 @@ class ConfigSchema {
     const instance = new ConfigSchema();
     instance.data = data;
     instance.bysid = ConfigSchema.getIndexBySID(data);
+    instance.refreshAllRequires();
     return instance;
   }
   static getIndexBySID(data) {
diff --git a/package.json b/package.json
index 808b932..eccc80d 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "auto-build",
   "displayName": "Auto Build Marlin",
-  "description": "Provides an interface to quickly build and upload Marlin Firmware.",
-  "version": "2.1.59",
+  "description": "Provides an interface to configure, build, and upload Marlin Firmware.",
+  "version": "2.1.60",
   "preview": false,
   "publisher": "marlinfirmware",
   "icon": "icon.png",