Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Subscribe to updates of module.calls data #909

Merged
merged 8 commits into from
May 9, 2022
Merged

Subscribe to updates of module.calls data #909

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
76b6a58
Subscribe to updates of module.calls data
jpogran May 4, 2022
08c74e0
fix test
jpogran May 4, 2022
7e39b48
Apply suggestions from code review
jpogran May 4, 2022
ace5160
rename refersh method to callClientCommand
jpogran May 4, 2022
a22615c
more renames
jpogran May 5, 2022
2bca1cf
defend against nil
jpogran May 5, 2022
8f19acf
some documentation about wiring up new client side commands
jpogran May 5, 2022
87179d7
movee documentation about wiring up new client side commands to stand…
jpogran May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions internal/langserver/handlers/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ func initializeResponse(t *testing.T, commandPrefix string) string {
"supported": true,
"changeNotifications": "workspace/didChangeWorkspaceFolders"
}
},
"experimental": {
"referenceCountCodeLens": false,
"refreshModuleProviders": false,
"refreshModuleCalls": false
radeksimko marked this conversation as resolved.
Show resolved Hide resolved
}
},
"serverInfo": {
Expand Down
2 changes: 1 addition & 1 deletion internal/langserver/handlers/hooks_module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func updateDiagnostics(ctx context.Context, notifier *diagnostics.Notifier) stat
}
}

func refreshModuleProviders(ctx context.Context, clientRequester session.ClientCaller, logger *log.Logger, commandId string) state.ModuleChangeHook {
func callClientCommand(ctx context.Context, clientRequester session.ClientCaller, logger *log.Logger, commandId string) state.ModuleChangeHook {
return func(oldMod, newMod *state.Module) {
_, err := clientRequester.Callback(ctx, commandId, nil)
if err != nil {
radeksimko marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
16 changes: 10 additions & 6 deletions internal/langserver/handlers/initialize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,22 @@ func (svc *service) Initialize(ctx context.Context, params lsp.InitializeParams)
}
}

expServerCaps := lsp.ExperimentalServerCapabilities{}

if _, ok := expClientCaps.ShowReferencesCommandId(); ok {
serverCaps.Capabilities.Experimental = lsp.ExperimentalServerCapabilities{
ReferenceCountCodeLens: true,
}
expServerCaps.ReferenceCountCodeLens = true
properties["experimentalCapabilities.referenceCountCodeLens"] = true
}
if _, ok := expClientCaps.RefreshModuleProvidersCommandId(); ok {
serverCaps.Capabilities.Experimental = lsp.ExperimentalServerCapabilities{
RefreshModuleProviders: true,
}
expServerCaps.RefreshModuleProviders = true
properties["experimentalCapabilities.refreshModuleProviders"] = true
}
if _, ok := expClientCaps.RefreshModuleCallsCommandId(); ok {
expServerCaps.RefreshModuleCalls = true
properties["experimentalCapabilities.refreshModuleCalls"] = true
}

serverCaps.Capabilities.Experimental = expServerCaps

err = ilsp.SetClientCapabilities(ctx, &clientCaps)
if err != nil {
Expand Down
7 changes: 6 additions & 1 deletion internal/langserver/handlers/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,12 @@ func (svc *service) configureSessionDependencies(ctx context.Context, cfgOpts *s

if commandId, ok := lsp.ExperimentalClientCapabilities(cc.Experimental).RefreshModuleProvidersCommandId(); ok {
svc.stateStore.Modules.ChangeHooks = append(svc.stateStore.Modules.ChangeHooks,
refreshModuleProviders(svc.sessCtx, svc.server, svc.logger, commandId))
callClientCommand(svc.sessCtx, svc.server, svc.logger, commandId))
}

if commandId, ok := lsp.ExperimentalClientCapabilities(cc.Experimental).RefreshModuleCallsCommandId(); ok {
svc.stateStore.Modules.ChangeHooks = append(svc.stateStore.Modules.ChangeHooks,
callClientCommand(svc.sessCtx, svc.server, svc.logger, commandId))
}

if cc.Workspace.SemanticTokens.RefreshSupport {
Expand Down
10 changes: 10 additions & 0 deletions internal/protocol/experimental.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package protocol
type ExperimentalServerCapabilities struct {
ReferenceCountCodeLens bool `json:"referenceCountCodeLens"`
RefreshModuleProviders bool `json:"refreshModuleProviders"`
RefreshModuleCalls bool `json:"refreshModuleCalls"`
}

type ExpClientCapabilities map[string]interface{}
Expand Down Expand Up @@ -32,6 +33,15 @@ func (cc ExpClientCapabilities) RefreshModuleProvidersCommandId() (string, bool)
return cmdId, ok
}

func (cc ExpClientCapabilities) RefreshModuleCallsCommandId() (string, bool) {
if cc == nil {
return "", false
}

cmdId, ok := cc["refereshModuleCallsCommandId"].(string)
radeksimko marked this conversation as resolved.
Show resolved Hide resolved
return cmdId, ok
}

func (cc ExpClientCapabilities) TelemetryVersion() (int, bool) {
if cc == nil {
return 0, false
Expand Down