b9819977a5
Includes prior-session patches (carry forward so the app compiles): - crates/gpui/build.rs: cross-compile manifest fix - crates/gpui/src/platform.rs: PlatformWindow::activate_with_token trait method - crates/gpui/src/window.rs: Window::activate_with_token public API - crates/gpui_linux/src/linux/wayland/window.rs: WaylandWindow::activate_with_token + activate() keyboard-serial fix Plus the focus-serial fix: - serial.rs: SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; latest_serial_of() Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
3.3 KiB
3.3 KiB
+++ repository_url = "https://github.com/hashicorp/terraform" revision = "a3dc571150a7651a1a4a8b302342d26089c97795" +++
Edit History
--- a/internal/actions/actions.go
+++ b/internal/actions/actions.go
@@ -63,6 +63,7 @@
a.mu.Lock()
defer a.mu.Unlock()
+ /
result := []addrs.AbsActionInstance{}
for _, data := range a.actionInstances.Elements() {
if data.Key.ContainingAction().Equal(addr) {
Cursor Position
defer a.mu.Unlock()
data, ok := a.actionInstances.GetOk(addr)
if !ok {
return nil, false
}
return &data, true
}
func (a *Actions) GetActionInstanceKeys(addr addrs.AbsAction) []addrs.AbsActionInstance {
a.mu.Lock()
defer a.mu.Unlock()
/
// <[CURSOR_POSITION]
result := []addrs.AbsActionInstance{}
for _, data := range a.actionInstances.Elements() {
if data.Key.ContainingAction().Equal(addr) {
result = append(result, data.Key)
}
}
return result
}
Expected Patch
--- a/internal/actions/actions.go
+++ b/internal/actions/actions.go
@@ -51,26 +51,26 @@
func (a *Actions) GetActionInstanceKeys(addr addrs.AbsAction) []addrs.AbsActionInstance {
a.mu.Lock()
defer a.mu.Unlock()
- /
+ // Filter action instances by the given action.
result := []addrs.AbsActionInstance{}
for _, data := range a.actionInstances.Elements() {
if data.Key.ContainingAction().Equal(addr) {
result = append(result, data.Key)
}
}
--- a/internal/actions/actions.go
+++ b/internal/actions/actions.go
@@ -54,25 +54,25 @@
func (a *Actions) GetActionInstanceKeys(addr addrs.AbsAction) []addrs.AbsActionInstance {
a.mu.Lock()
defer a.mu.Unlock()
- /
+ // Filter action instances that belong to the given action
result := []addrs.AbsActionInstance{}
for _, data := range a.actionInstances.Elements() {
if data.Key.ContainingAction().Equal(addr) {
result = append(result, data.Key)
}
}
--- a/internal/actions/actions.go
+++ b/internal/actions/actions.go
@@ -54,25 +54,25 @@
func (a *Actions) GetActionInstanceKeys(addr addrs.AbsAction) []addrs.AbsActionInstance {
a.mu.Lock()
defer a.mu.Unlock()
- /
+ // Iterate through all action instances and filter by the containing action
result := []addrs.AbsActionInstance{}
for _, data := range a.actionInstances.Elements() {
if data.Key.ContainingAction().Equal(addr) {
result = append(result, data.Key)
}
}
--- a/internal/actions/actions.go
+++ b/internal/actions/actions.go
func (a *Actions) GetActionInstanceKeys(addr addrs.AbsAction) []addrs.AbsActionInstance {
a.mu.Lock()
defer a.mu.Unlock()
- /
+ // Iterate through all action instances and return those that belong to the given action
result := []addrs.AbsActionInstance{}
for _, data := range a.actionInstances.Elements() {
if data.Key.ContainingAction().Equal(addr) {
result = append(result, data.Key)
}
}
--- a/internal/actions/actions.go
+++ b/internal/actions/actions.go
func (a *Actions) GetActionInstanceKeys(addr addrs.AbsAction) []addrs.AbsActionInstance {
a.mu.Lock()
defer a.mu.Unlock()
- /
+ // Collect all action instances that belong to the given action
result := []addrs.AbsActionInstance{}
for _, data := range a.actionInstances.Elements() {
if data.Key.ContainingAction().Equal(addr) {
result = append(result, data.Key)
}
}