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

settings: decode deprecated ignoreDirectoryNames & warn #1009

Merged
merged 1 commit into from
Jul 22, 2022
Merged

settings: decode deprecated ignoreDirectoryNames & warn #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions internal/langserver/handlers/initialize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,13 @@ func (svc *service) setupWalker(ctx context.Context, params lsp.InitializeParams
options.XLegacyExcludeModulePaths),
})
}
if len(options.XLegacyIgnoreDirectoryNames) != 0 {
jrpc2.ServerFromContext(ctx).Notify(ctx, "window/showMessage", &lsp.ShowMessageParams{
Type: lsp.Warning,
Message: fmt.Sprintf("ignoreDirectoryNames (%q) is deprecated (no-op), use indexing.ignoreDirectoryNames instead",
options.XLegacyIgnoreDirectoryNames),
})
}

var ignoredPaths []string
for _, rawPath := range options.IgnorePaths {
Expand Down
5 changes: 3 additions & 2 deletions internal/settings/settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ type Options struct {
TerraformExecTimeout string `mapstructure:"terraformExecTimeout"`
TerraformLogFilePath string `mapstructure:"terraformLogFilePath"`

XLegacyModulePaths []string `mapstructure:"rootModulePaths"`
XLegacyExcludeModulePaths []string `mapstructure:"excludeModulePaths"`
XLegacyModulePaths []string `mapstructure:"rootModulePaths"`
XLegacyExcludeModulePaths []string `mapstructure:"excludeModulePaths"`
XLegacyIgnoreDirectoryNames []string `mapstructure:"ignoreDirectoryNames"`
}

func (o *Options) Validate() error {
Expand Down