fix resolver for enum alias (#263)

Author: goccy

resolver/fqdn.go

@@ -32,6 +32,9 @@ func (f *OneofField) FQDN() string {
 }
 
 func (e *Enum) FQDN() string {
+	if e == nil {
+		return ""
+	}
 	if e.Message != nil {
 		return fmt.Sprintf("%s.%s", e.Message.FQDN(), e.Name)
 	}

resolver/resolver.go

@@ -2889,26 +2889,17 @@ func (r *Resolver) resolveEnumAliases(ctx *context, aliasNames []string, builder
 	}
 	var ret []*Enum
 	for _, aliasName := range aliasNames {
-		if strings.Contains(aliasName, ".") {
-			pkg, err := r.lookupPackage(aliasName)
-			if err != nil {
-				ctx.addError(
-					ErrWithLocation(
-						err.Error(),
-						builder.WithOption().Location(),
-					),
-				)
-				return nil
-			}
-			name := r.trimPackage(pkg, aliasName)
-			if alias := r.resolveEnum(ctx, pkg, name, source.NewEnumBuilder(ctx.fileName(), ctx.messageName(), name)); alias != nil {
-				ret = append(ret, alias)
-			}
-		} else {
-			if alias := r.resolveEnum(ctx, ctx.file().Package, aliasName, source.NewEnumBuilder(ctx.fileName(), ctx.messageName(), aliasName)); alias != nil {
-				ret = append(ret, alias)
-			}
+		enum, err := r.resolveEnumByName(ctx, aliasName, builder)
+		if err != nil {
+			ctx.addError(
+				ErrWithLocation(
+					err.Error(),
+					builder.WithOption().Location(),
+				),
+			)
+			continue
 		}
+		ret = append(ret, enum)
 	}
 	return ret
 }
@@ -2962,6 +2953,11 @@ func (r *Resolver) resolveEnumValueAlias(ctx *context, enumValueName, enumValueA
 				EnumAlias: alias,
 				Aliases:   []*EnumValue{value},
 			})
+		} else if value := alias.Value(ctx.file().PackageName() + "." + enumValueAlias); value != nil {
+			enumValueAliases = append(enumValueAliases, &EnumValueAlias{
+				EnumAlias: alias,
+				Aliases:   []*EnumValue{value},
+			})
 		}
 		aliasFQDNs = append(aliasFQDNs, fmt.Sprintf("%q", alias.FQDN()))
 	}