Skip to content

Commit 9439d3c

Browse files
authored
Support 'homedir' ~ in root module paths (hashicorp#247)
1 parent 0eb1c74 commit 9439d3c

File tree

9 files changed

+216
-1
lines changed

9 files changed

+216
-1
lines changed

docs/SETTINGS.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ Relative paths are resolved relative to the directory opened in the editor.
1414

1515
Path separators are converted automatically to the match separators
1616
of the target platform (e.g. `\` on Windows, or `/` on Unix),
17-
symlinks are followed and trailing slashes automatically removed.
17+
symlinks are followed, trailing slashes automatically removed,
18+
and `~` is replaced with your home directory.
1819

1920
## How to pass settings
2021

go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ require (
1414
github.com/hashicorp/terraform-svchost v0.0.0-20191119180714-d2e4933b9136
1515
github.com/mh-cbon/go-fmt-fail v0.0.0-20160815164508-67765b3fbcb5
1616
github.com/mitchellh/cli v1.0.0
17+
github.com/mitchellh/go-homedir v1.1.0
1718
github.com/mitchellh/mapstructure v1.3.2
1819
github.com/pmezard/go-difflib v1.0.0
1920
github.com/sourcegraph/go-lsp v0.0.0-20200117082640-b19bb38222e2

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ github.com/mh-cbon/go-fmt-fail v0.0.0-20160815164508-67765b3fbcb5 h1:shw+DWUaHIy
6060
github.com/mh-cbon/go-fmt-fail v0.0.0-20160815164508-67765b3fbcb5/go.mod h1:nHPoxaBUc5CDAMIv0MNmn5PBjWbTs9BI/eh30/n0U6g=
6161
github.com/mitchellh/cli v1.0.0 h1:iGBIsUe3+HZ/AD/Vd7DErOt5sU9fa8Uj7A2s1aggv1Y=
6262
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
63+
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
64+
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
6365
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=
6466
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
6567
github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=

langserver/handlers/initialize.go

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
lsctx "github.com/hashicorp/terraform-ls/internal/context"
1010
ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
1111
"github.com/hashicorp/terraform-ls/internal/settings"
12+
"github.com/mitchellh/go-homedir"
1213
lsp "github.com/sourcegraph/go-lsp"
1314
)
1415

@@ -134,6 +135,11 @@ func (lh *logHandler) Initialize(ctx context.Context, params lsp.InitializeParam
134135
}
135136

136137
func resolvePath(rootDir, rawPath string) (string, error) {
138+
rawPath, err := homedir.Expand(rawPath)
139+
if err != nil {
140+
return "", err
141+
}
142+
137143
if filepath.IsAbs(rawPath) {
138144
return filepath.EvalSymlinks(rawPath)
139145
}

vendor/github.com/mitchellh/go-homedir/LICENSE

+21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/mitchellh/go-homedir/README.md

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/mitchellh/go-homedir/go.mod

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/mitchellh/go-homedir/homedir.go

+167
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ github.com/mh-cbon/go-fmt-fail
5252
github.com/mh-cbon/go-fmt-fail/hasWritten
5353
# github.com/mitchellh/cli v1.0.0
5454
github.com/mitchellh/cli
55+
# github.com/mitchellh/go-homedir v1.1.0
56+
github.com/mitchellh/go-homedir
5557
# github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7
5658
github.com/mitchellh/go-wordwrap
5759
# github.com/mitchellh/mapstructure v1.3.2

0 commit comments

Comments
 (0)