on main help sign in
chore: run `modernize` (#906)
e2e99afAndrey Nering
internal/app/app.go+2−4
@@ -235,9 +235,7 @@ func setupSubscriber[T any](
235 subscriber func(context.Context) <-chan pubsub.Event[T],
235 subscriber func(context.Context) <-chan pubsub.Event[T],
236 outputCh chan<- tea.Msg,
236 outputCh chan<- tea.Msg,
237) {
237) {
238− wg.Add(1)
239− go func() {
238+ wg.Go(func() {
240− defer wg.Done()
241 subCh := subscriber(ctx)
239 subCh := subscriber(ctx)
242 for {
240 for {
243 select {
241 select {
@@ -260,7 +258,7 @@ func setupSubscriber[T any](
260 return
258 return
261 }
259 }
262 }
260 }
263− }()
261+ })
264}
262}
265
263
266func (app *App) InitCoderAgent() error {
264func (app *App) InitCoderAgent() error {
internal/app/lsp_events.go+2−5
@@ -2,6 +2,7 @@ package app
2
2
3import (
3import (
4 "context"
4 "context"
5+ "maps"
5 "time"
6 "time"
6
7
7 "github.com/charmbracelet/crush/internal/csync"
8 "github.com/charmbracelet/crush/internal/csync"
@@ -48,11 +49,7 @@ func SubscribeLSPEvents(ctx context.Context) <-chan pubsub.Event[LSPEvent] {
48
49
49// GetLSPStates returns the current state of all LSP clients
50// GetLSPStates returns the current state of all LSP clients
50func GetLSPStates() map[string]LSPClientInfo {
51func GetLSPStates() map[string]LSPClientInfo {
51− states := make(map[string]LSPClientInfo)
52− for name, info := range lspStates.Seq2() {
52+ return maps.Collect(lspStates.Seq2())
53− states[name] = info
54− }
55− return states
56}
53}
57
54
58// GetLSPState returns the state of a specific LSP client
55// GetLSPState returns the state of a specific LSP client
internal/csync/slices.go+2−4
@@ -16,11 +16,9 @@ type LazySlice[K any] struct {
16// to populate it.
16// to populate it.
17func NewLazySlice[K any](load func() []K) *LazySlice[K] {
17func NewLazySlice[K any](load func() []K) *LazySlice[K] {
18 s := &LazySlice[K]{}
18 s := &LazySlice[K]{}
19− s.wg.Add(1)
20− go func() {
19+ s.wg.Go(func() {
21 s.inner = load()
20 s.inner = load()
22− s.wg.Done()
23− }()
21+ })
24 return s
22 return s
25}
23}
26
24
internal/permission/permission_test.go+4−8
@@ -154,12 +154,10 @@ func TestPermissionService_SequentialProperties(t *testing.T) {
154 events := service.Subscribe(t.Context())
154 events := service.Subscribe(t.Context())
155 var result1 bool
155 var result1 bool
156 var wg sync.WaitGroup
156 var wg sync.WaitGroup
157− wg.Add(1)
158
157
159− go func() {
158+ wg.Go(func() {
160− defer wg.Done()
161 result1 = service.Request(req)
159 result1 = service.Request(req)
162− }()
160+ })
163
161
164 var permissionReq PermissionRequest
162 var permissionReq PermissionRequest
165 event := <-events
163 event := <-events
@@ -170,12 +168,10 @@ func TestPermissionService_SequentialProperties(t *testing.T) {
170 assert.True(t, result1, "First request should be granted")
168 assert.True(t, result1, "First request should be granted")
171
169
172 var result2 bool
170 var result2 bool
173− wg.Add(1)
174
171
175− go func() {
172+ wg.Go(func() {
176− defer wg.Done()
177 result2 = service.Request(req)
173 result2 = service.Request(req)
178− }()
174+ })
179
175
180 event = <-events
176 event = <-events
181 permissionReq = event.Payload
177 permissionReq = event.Payload