fix: avoid duplicate import aliases #2502
Merged
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
matt2e
added
the
run-all
Open
matt2e
force-pushed
the
matt2e/unique-import-aliases
branch
3 times, most recently
from
0006a28 to
a0cd423
Compare
alecthomas
approved these changes
Aug 27, 2024
This was referenced Aug 27, 2024
Open
Open
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
gak
reviewed
Aug 28, 2024
| // returns the import path and directory name for an external type | ||
| // package and directory names are the same (dir=bar, pkg=bar): "github.com/foo/bar.A" => "github.com/foo/bar", none | ||
| // package and directory names differ (dir=bar, pkg=baz): "github.com/foo/bar.baz.A" => "github.com/foo/bar", "baz" | ||
| func goImportFromQualifiedName(qualifiedName string) (importPath string, directoryName optional.Option[string], err error) { |
There was a problem hiding this comment.
Nice, named return signature helps heaps with readability in this case.
gak
reviewed
Aug 28, 2024
go-runtime/compile/build.go
Outdated
| } | ||
|
|
||
| case *schema.TypeAlias: | ||
| if !aliasesMustBeExported || n.IsExported() { |
There was a problem hiding this comment.
I am not sure about the context here, so I'm probably wrong here, but thought I'd flag it in case.
Reading this if statement makes me think this block is for exported aliases, but its checking for when aliases must not be exported? Should it be aliasesMustBeExported || n.IsExported()?
There was a problem hiding this comment.
I think what I want is:
if aliasesMustBeExported && !n.IsExported() {
// early exit
}
When i wrote the original line, it also struck me as odd / confusing, so I'll replace it with the above as it's a lot clearer
# Conflicts: # go-runtime/compile/build.go
matt2e
force-pushed
the
matt2e/unique-import-aliases
branch
from
82cbce9 to
67d63ce
Compare
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
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.
fixes #2469
When scaffolding imports for external go packages, FTL will use the shortest unique part of the path as the alias. This allows package aliases to have neat and expected aliases in simple cases, and falling back to the next best option as conflicts arise.
For example: