feat(gnovm): categorize imports #3323
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Norman Meier <[email protected]>
github-actions
bot
added
📦 🤖 gnovm
🛠 PR Checks SummaryAll Automated Checks passed. ✅ Manual Checks (for Reviewers):
Read More🤖 This bot helps streamline PR reviews by verifying automated checks and providing guidance for contributors and reviewers. ✅ Automated Checks (for Contributors):🟢 Maintainers must be able to edit this pull request (more info) ☑️ Contributor Actions:
☑️ Reviewer Actions:
📚 Resources:Debug
|
Codecov ReportAttention: Patch coverage is
📢 Thoughts on this report? Let us know! |
Signed-off-by: Norman Meier <[email protected]>
Signed-off-by: Norman Meier <[email protected]>
Signed-off-by: Norman Meier <[email protected]>
Signed-off-by: Norman Meier <[email protected]>
Signed-off-by: Norman Meier <[email protected]>
thehowl
approved these changes
Dec 20, 2024
gnovm/pkg/packages/filekind.go
Outdated
| type FileKind uint | ||
|
|
||
| const ( | ||
| FileKindUnknown = FileKind(iota) |
There was a problem hiding this comment.
Suggested change
| FileKindUnknown = FileKind(iota) | |
| FileKindUnknown FileKind = iota |
| @@ -13,34 +13,40 @@ import ( | |||
| ) | |||
|
|
|||
| // Imports returns the list of gno imports from a [gnovm.MemPackage]. | |||
| // fset is optional. | |||
There was a problem hiding this comment.
Would still keep it as a comment
There was a problem hiding this comment.
my bad, conflict resolution fail: 41ddaa6
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "github.com/gnolang/gno/gnovm/pkg/gnolang" | ||
| . "github.com/gnolang/gno/gnovm/pkg/packages" |
There was a problem hiding this comment.
I saw in the go standard libraries sources that they are using dot import for the current package in external tests, thus thought it was the idiomatic go way. I can use a normal import if you prefer
gnovm/pkg/packages/filekind.go
Outdated
|
|
||
| const ( | ||
| FileKindUnknown = FileKind(iota) | ||
| FileKindCompiled |
There was a problem hiding this comment.
Suggested change
| FileKindCompiled | |
| FileKindPackageSource |
gnovm/pkg/packages/filekind.go
Outdated
| FileKindUnknown = FileKind(iota) | ||
| FileKindCompiled | ||
| FileKindTest | ||
| FileKindXtest |
There was a problem hiding this comment.
Go uses XTest: https://pkg.go.dev/go/build
| "strings" | ||
| ) | ||
|
|
||
| type FileKind uint |
Co-authored-by: Morgan <[email protected]>
Signed-off-by: Norman Meier <[email protected]>
Signed-off-by: Norman Meier <[email protected]>
Signed-off-by: Norman Meier <[email protected]>
Signed-off-by: Norman Meier <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes the imports utils split imports by file kinds, allowing to make explicit decisions about what imports to use at the various callsites
FileKindenum to categorize gno files, with variantsPackageSource,Test,XTestandFiletestGetFileKindutil to derive theFileKindfrom a file name and bodyImportsMaptype that mapsFileKinds to lists of imports. It has a single methodMergeto select and merge various imports from multipleFileKindspackages.Importshelper to return anImportsMapinstead of a[]stringand adapt callsites by usingImportMap.Mergeto preserve existing behaviorThis is something I need for #3304 and #2932 but to help reviews I made an atomic PR here instead