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

WIP - Support single file context #435

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP - Support single file context #435

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: 6 additions & 1 deletion lang/path.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ package lang
type Path struct {
Path string
LanguageID string
// If not empty, this is the file within the directory that the path points to
// This is useful for languages like Terraform Test which have a file-based scope
// instead of all files in a directory sharing the same scope
File string
}

// TODO: check whether setting File for non test files might have unintended consequences
func (path Path) Equals(p Path) bool {
return path.Path == p.Path && path.LanguageID == p.LanguageID
return path.Path == p.Path && path.LanguageID == p.LanguageID && (path.File == "" || p.File == "" || path.File == p.File)
}
1 change: 1 addition & 0 deletions reference/origins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func (ro Origins) Match(localPath lang.Path, target Target, targetPath lang.Path
for _, refOrigin := range ro {
switch origin := refOrigin.(type) {
case LocalOrigin:
// TODO: equals might do weird things for non test files, ensure this works!
if localPath.Equals(targetPath) && target.Matches(origin) {
origins = append(origins, refOrigin)
}
Expand Down
Loading