Skip to content

修复了在UE5.8下执行Puerts.Gen命令会重复生成UE编辑器侧动态类型的bug #2351

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
easonwzs wants to merge 1 commit into
base: master
Choose a base branch
from
+56 −18
Open

修复了在UE5.8下执行Puerts.Gen命令会重复生成UE编辑器侧动态类型的bug #2351

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
74 changes: 56 additions & 18 deletions unreal/Puerts/Source/DeclarationGenerator/Private/DeclarationGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,27 @@ static FAutoConsoleVariableRef CVarSearchAllPluginBP(TEXT("bSearchAllPluginBP"),
#define GET_VERSION_ID(PD) PD->PackageGuid.ToString()
#endif

static bool ShouldSkipBlueprintDeclarationAsset(const FString& PackageNameOrPath)
{
return PackageNameOrPath.StartsWith(TEXT("/Engine/TedsDynamicColumns"));
}

static bool ShouldSkipBlueprintDeclarationAsset(const FName& PackageNameOrPath)
{
return ShouldSkipBlueprintDeclarationAsset(PackageNameOrPath.ToString());
}

static FString RestoreEscapedPackageNameFromNamespace(const FString& Namespace)
{
TArray<FString> NamespaceFrags;
Namespace.ParseIntoArray(NamespaceFrags, TEXT("."));
for (FString& NamespaceFrag : NamespaceFrags)
{
NamespaceFrag = PUERTS_NAMESPACE::TypeScriptVariableNameToFilename(NamespaceFrag);
}
return FString(TEXT("/")) + FString::Join(NamespaceFrags, TEXT("/"));
}

bool IsTypeScriptKeyword(const FString& InputString)
{
static TArray<FString> TypeScriptKeywords = {TEXT("break"), TEXT("as"), TEXT("any"), TEXT("switch"), TEXT("case"), TEXT("if"),
Expand Down Expand Up @@ -436,6 +457,10 @@ void FTypeScriptDeclarationGenerator::GenTypeScriptDeclaration(bool InGenStruct,
Begin();
for (auto& KV : BlueprintTypeDeclInfoCache)
{
if (ShouldSkipBlueprintDeclarationAsset(KV.Key))
{
continue;
}
if (KV.Value.IsExist)
{
for (auto& NameToDecl : KV.Value.NameToDecl)
Expand Down Expand Up @@ -532,6 +557,11 @@ void FTypeScriptDeclarationGenerator::WriteOutput(UObject* Obj, const FStringBuf
const UPackage* Pkg = GetPackage(Obj);
if (Pkg && !Obj->IsNative())
{
if (ShouldSkipBlueprintDeclarationAsset(Pkg->GetFName()))
{
return;
}

FStringBuffer Temp;
Temp.Prefix = Output.Prefix;
NamespaceBegin(Obj, Temp);
Expand Down Expand Up @@ -592,27 +622,29 @@ void FTypeScriptDeclarationGenerator::RestoreBlueprintTypeDeclInfos(const FStrin
FString Namespace =
TypeDecl.Mid(NamespaceStart + NS_Keyword.Len(), NamespaceEnd - NamespaceStart - NS_Keyword.Len())
.TrimStartAndEnd();
FString PackageName = FString(TEXT("/")) + Namespace.Replace(TEXT("."), TEXT("/"));

FRegexPattern Pattern(TEXT("\\{\\s+(?:(?:class)|(?:enum))\\s+([\\u4e00-\\u9fa5a-zA-Z0-9_]+)"));
FRegexMatcher Matcher(Pattern, TypeDecl.Mid(NamespaceEnd));

if (Matcher.FindNext())
FString PackageName = RestoreEscapedPackageNameFromNamespace(Namespace);
if (!ShouldSkipBlueprintDeclarationAsset(PackageName))
{
FName TypeName = *Matcher.GetCaptureGroup(1);
auto BlueprintTypeDeclInfoPtr = BlueprintTypeDeclInfoCache.Find(*PackageName);
FRegexPattern Pattern(TEXT("\\{\\s+(?:(?:class)|(?:enum))\\s+([\\u4e00-\\u9fa5a-zA-Z0-9_$]+)"));
FRegexMatcher Matcher(Pattern, TypeDecl.Mid(NamespaceEnd));

if (BlueprintTypeDeclInfoPtr)
if (Matcher.FindNext())
{
BlueprintTypeDeclInfoPtr->NameToDecl.Add(TypeName, TypeDecl);
}
else
{
TMap<FName, FString> NameToDecl;
NameToDecl.Add(TypeName, TypeDecl);
bool bIsExist = InGenFull ? false : bIsAssociation;
BlueprintTypeDeclInfoCache.Add(
FName(*PackageName), {NameToDecl, FileVersionString, bIsExist, true, bIsAssociation});
FName TypeName = *PUERTS_NAMESPACE::TypeScriptVariableNameToFilename(Matcher.GetCaptureGroup(1));
auto BlueprintTypeDeclInfoPtr = BlueprintTypeDeclInfoCache.Find(*PackageName);

if (BlueprintTypeDeclInfoPtr)
{
BlueprintTypeDeclInfoPtr->NameToDecl.Add(TypeName, TypeDecl);
}
else
{
TMap<FName, FString> NameToDecl;
NameToDecl.Add(TypeName, TypeDecl);
bool bIsExist = InGenFull ? false : bIsAssociation;
BlueprintTypeDeclInfoCache.Add(
FName(*PackageName), {NameToDecl, FileVersionString, bIsExist, true, bIsAssociation});
}
}
}
}
Expand Down Expand Up @@ -661,6 +693,12 @@ void FTypeScriptDeclarationGenerator::LoadAllWidgetBlueprint(FName InSearchPath,
AssetRegistry.GetAssets(BPFilter, AssetList);
for (FAssetData const& AssetData : AssetList)
{
if (ShouldSkipBlueprintDeclarationAsset(AssetData.PackageName) ||
ShouldSkipBlueprintDeclarationAsset(AssetData.PackagePath))
{
continue;
}

#if ENGINE_MAJOR_VERSION >= 5
const FAssetPackageData* PackageData = nullptr;
auto OptionalPackageData = AssetRegistry.GetAssetPackageDataCopy(AssetData.PackageName);
Expand Down
Loading