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

Jump to bottom

Add check for nil otherTypeDef #1372

Merged
merged 3 commits into from Oct 30, 2022
Merged

Add check for nil otherTypeDef #1372

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2edeb6
Add check for nil otherTypeDef
Oct 29, 2022
30e4687
Refacgtoring after review
Oct 30, 2022
6e0677a
Fix anotherTypeDef == nil
Oct 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages.go
View file
Open in desktop
Expand Up @@ -140,7 +140,10 @@ func (pkgDefs *PackagesDefinitions) parseTypesFromFile(astFile *ast.File, packag

anotherTypeDef, ok := pkgDefs.uniqueDefinitions[fullName]
if ok {
if typeSpecDef.PkgPath != anotherTypeDef.PkgPath {
if anotherTypeDef == nil {
typeSpecDef.NotUnique = true
pkgDefs.uniqueDefinitions[typeSpecDef.TypeName()] = typeSpecDef
} else if typeSpecDef.PkgPath != anotherTypeDef.PkgPath {
anotherTypeDef.NotUnique = true
typeSpecDef.NotUnique = true
pkgDefs.uniqueDefinitions[fullName] = nil
Expand Down Expand Up @@ -197,7 +200,10 @@ func (pkgDefs *PackagesDefinitions) parseFunctionScopedTypesFromFile(astFile *as

anotherTypeDef, ok := pkgDefs.uniqueDefinitions[fullName]
if ok {
if typeSpecDef.PkgPath != anotherTypeDef.PkgPath {
if anotherTypeDef == nil {
typeSpecDef.NotUnique = true
pkgDefs.uniqueDefinitions[typeSpecDef.TypeName()] = typeSpecDef
} else if typeSpecDef.PkgPath != anotherTypeDef.PkgPath {
anotherTypeDef.NotUnique = true
typeSpecDef.NotUnique = true
pkgDefs.uniqueDefinitions[fullName] = nil
Expand Down