fix: prune selections when filtering

Author: leg100

internal/tui/explorer/selector.go

@@ -36,6 +36,23 @@ func (s *selector) add(n node) error {
 	return nil
 }
 
+func (s *selector) reindex(nodes []node) {
+	if len(s.selections) == 0 {
+		return
+	}
+	selections := make(map[resource.ID]struct{}, len(s.selections))
+	for _, n := range nodes {
+		id, ok := n.ID().(resource.ID)
+		if !ok {
+			continue
+		}
+		if _, ok := s.selections[id]; ok {
+			selections[id] = struct{}{}
+		}
+	}
+	s.selections = selections
+}
+
 // addAll implements "select all" functionality with a twist: it ensures only
 // nodes of the same type of selected; the cursor node must match any existing
 // selection type, and then the nodes are filtered to only add those

internal/tui/explorer/selector_test.go

@@ -0,0 +1,36 @@
+package explorer
+
+import (
+	"testing"
+
+	"github.com/leg100/pug/internal/resource"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSelector_isSelected(t *testing.T) {
+	mod1 := moduleNode{id: resource.NewID(resource.Module)}
+	mod2 := moduleNode{id: resource.NewID(resource.Module)}
+
+	s := selector{selections: make(map[resource.ID]struct{})}
+	s.add(mod1)
+
+	assert.True(t, s.isSelected(mod1))
+	assert.False(t, s.isSelected(mod2))
+}
+
+func TestSelector_reindex(t *testing.T) {
+	mod1 := moduleNode{id: resource.NewID(resource.Module)}
+	mod2 := moduleNode{id: resource.NewID(resource.Module)}
+
+	s := selector{selections: make(map[resource.ID]struct{})}
+	s.add(mod1)
+	s.add(mod2)
+
+	assert.True(t, s.isSelected(mod1))
+	assert.True(t, s.isSelected(mod2))
+
+	s.reindex([]node{mod1})
+
+	assert.True(t, s.isSelected(mod1))
+	assert.False(t, s.isSelected(mod2))
+}

internal/tui/explorer/tracker.go

@@ -39,6 +39,7 @@ func (t *tracker) reindex(tree *tree, height int) {
 	t.totalWorkspaces = 0
 	t.cursorIndex = -1
 	t.doReindex(tree)
+	t.selector.reindex(t.nodes)
 
 	// When pug first starts up, for the user's convenience we want the cursor
 	// to be on the first module. Because modules are added asynchronously, a
@@ -74,12 +75,6 @@ func (t *tracker) doReindex(tree *tree) {
 	if t.cursorNode != nil && t.cursorNode.ID() == tree.value.ID() {
 		t.cursorIndex = len(t.nodes) - 1
 	}
-	// Track indices of selected nodes
-	if dir, ok := tree.value.(dirNode); ok {
-		if dir.closed {
-			return
-		}
-	}
 	for _, child := range tree.children {
 		t.doReindex(child)
 	}