Switch to Files panel after popping a stash (#3888)

stefanhaller · web-flow · commit 2d0c7cb0fc85 · 2024-09-06T13:21:49.000+02:00
#### PR Description I find myself always switching to the Files panel after popping a stash, 100% of the time, so it makes sense that lazygit does this for me. Do it for apply as well, for consistency. #### Please check if the PR fulfills these requirements * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc
diff --git a/pkg/gui/controllers/stash_controller.go b/pkg/gui/controllers/stash_controller.go
@@ -111,6 +111,7 @@ func (self *StashController) handleStashApply(stashEntry *models.StashEntry) err
 		if err != nil {
 			return err
 		}
+		self.c.Context().Push(self.c.Contexts().Files)
 		return nil
 	}
 
@@ -137,6 +138,7 @@ func (self *StashController) handleStashPop(stashEntry *models.StashEntry) error
 		if err != nil {
 			return err
 		}
+		self.c.Context().Push(self.c.Contexts().Files)
 		return nil
 	}
 
diff --git a/pkg/integration/tests/stash/apply.go b/pkg/integration/tests/stash/apply.go
@@ -36,6 +36,7 @@ var Apply = NewIntegrationTest(NewIntegrationTestArgs{
 			)
 
 		t.Views().Files().
+			IsFocused().
 			Lines(
 				Contains("file"),
 			)
diff --git a/pkg/integration/tests/stash/pop.go b/pkg/integration/tests/stash/pop.go
@@ -34,6 +34,7 @@ var Pop = NewIntegrationTest(NewIntegrationTestArgs{
 			IsEmpty()
 
 		t.Views().Files().
+			IsFocused().
 			Lines(
 				Contains("file"),
 			)

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ func (self StashController) handleStashApply(stashEntry models.StashEntry) err`
`111`	`111`	`if err != nil {`
`112`	`112`	`return err`
`113`	`113`	`}`
	`114`	`+ self.c.Context().Push(self.c.Contexts().Files)`
`114`	`115`	`return nil`
`115`	`116`	`}`
`116`	`117`
`@@ -137,6 +138,7 @@ func (self StashController) handleStashPop(stashEntry models.StashEntry) error`
`137`	`138`	`if err != nil {`
`138`	`139`	`return err`
`139`	`140`	`}`
	`141`	`+ self.c.Context().Push(self.c.Contexts().Files)`
`140`	`142`	`return nil`
`141`	`143`	`}`
`142`	`144`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ var Apply = NewIntegrationTest(NewIntegrationTestArgs{`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`t.Views().Files().`
	`39`	`+ IsFocused().`
`39`	`40`	`Lines(`
`40`	`41`	`Contains("file"),`
`41`	`42`	`)`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ var Pop = NewIntegrationTest(NewIntegrationTestArgs{`
`34`	`34`	`IsEmpty()`
`35`	`35`
`36`	`36`	`t.Views().Files().`
	`37`	`+ IsFocused().`
`37`	`38`	`Lines(`
`38`	`39`	`Contains("file"),`
`39`	`40`	`)`