Skip to content

fix(protobuf): handle same package proto type reference #507

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

Open
Rainfisher wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(protobuf): handle same package proto type reference #507

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
9 changes: 7 additions & 2 deletions .../light-jprotobuf/src/main/java/com/iohao/game/widget/light/protobuf/ProtoJavaAnalyse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,13 @@ private String fieldProtoTypeToString(ProtoJavaField protoJavaField, Class<?> fi
ProtoJavaRegionKey regionKey = protoJavaParent.getProtoJavaRegionKey();
ProtoJavaRegion protoJavaRegion = this.getProtoJavaRegion(regionKey);
protoJavaRegion.addOtherProtoFile(protoJavaFieldType);
// 不在同一个文件中
fieldProtoType = StrKit.format("{}.{}", filePackage, className);
if (Objects.equals(protoJavaParent.getFilePackage(), filePackage)) {
// 不在同一个文件夹，但是在同一个包下
fieldProtoType = className;
} else {
// 不在同一个文件中
fieldProtoType = StrKit.format("{}.{}", filePackage, className);
}
}

return fieldProtoType;
Expand Down