From 485e75b214a6ea6727f09537479094d830c45ab2 Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Wed, 6 Oct 2021 13:03:50 +0200
Subject: [PATCH] keep hidden variables out of the palette and drop-down menus

---
 HISTORY.md     |  1 +
 src/threads.js | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index d65e2565..625e9e1e 100755
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -40,6 +40,7 @@
 ### 2021-10-06
 * threads: programmatically hide individual variables in palette
 * extensions: new extension primitives for hiding and showing arbitrary blocks in the palette
+* threads: keep hidden variables out of the palette and drop-down menus
 
 ### 2021-10-05
 * threads, store: added infrastructure for hiding individual variables in palette
diff --git a/src/threads.js b/src/threads.js
index 5b19735a..6555707d 100644
--- a/src/threads.js
+++ b/src/threads.js
@@ -1844,7 +1844,7 @@ Process.prototype.doRemoveTemporaries = function () {
 Process.prototype.doChangeBlockVisibility = function (aBlock, hideIt) {
     if (aBlock.isCustomBlock) {
         this.doChangeCustomBlockVisibility(aBlock, hideIt);
-    } else if (aBlock.spec === 'reportGetVar') {
+    } else if (aBlock.selector === 'reportGetVar') {
         this.doChangeVarBlockVisibility(aBlock.blockSpec, hideIt);
     } else {
         this.doChangePrimitiveVisibility(aBlock, hideIt);
@@ -7203,17 +7203,19 @@ VariableFrame.prototype.deleteVar = function (name) {
 
 // VariableFrame tools
 
-VariableFrame.prototype.names = function () {
+VariableFrame.prototype.names = function (includeHidden) {
     var each, names = [];
     for (each in this.vars) {
         if (Object.prototype.hasOwnProperty.call(this.vars, each)) {
-            names.push(each);
+            if (!this.vars[each].isHidden || includeHidden) {
+                names.push(each);
+            }
         }
     }
     return names;
 };
 
-VariableFrame.prototype.allNamesDict = function (upTo) {
+VariableFrame.prototype.allNamesDict = function (upTo, includeHidden) {
 	// "upTo" is an optional parent frame at which to stop, e.g. globals
     var dict = {}, current = this;
 
@@ -7221,7 +7223,9 @@ VariableFrame.prototype.allNamesDict = function (upTo) {
         var eachKey;
         for (eachKey in srcDict) {
             if (Object.prototype.hasOwnProperty.call(srcDict, eachKey)) {
-                trgtDict[eachKey] = eachKey;
+                if (!srcDict[eachKey].isHidden || includeHidden) {
+                    trgtDict[eachKey] = eachKey;
+                }
             }
         }
     }
@@ -7233,13 +7237,13 @@ VariableFrame.prototype.allNamesDict = function (upTo) {
     return dict;
 };
 
-VariableFrame.prototype.allNames = function (upTo) {
+VariableFrame.prototype.allNames = function (upTo, includeHidden) {
 /*
     only show the names of the lexical scope, hybrid scoping is
     reserved to the daring ;-)
 	"upTo" is an optional parent frame at which to stop, e.g. globals
 */
-    var answer = [], each, dict = this.allNamesDict(upTo);
+    var answer = [], each, dict = this.allNamesDict(upTo, includeHidden);
 
     for (each in dict) {
         if (Object.prototype.hasOwnProperty.call(dict, each)) {