From 3f7b2a13d39bf2193441b079cd98f3ca718c00ae Mon Sep 17 00:00:00 2001 From: Edward Beazer Date: Tue, 19 Sep 2023 16:17:50 -0400 Subject: [PATCH] 5.3 update (#5) Co-authored-by: Edward Beazer --- .idea/.idea.ue5-linter.dir/.idea/.gitignore | 13 +++++++++++++ .idea/.idea.ue5-linter.dir/.idea/indexLayout.xml | 8 ++++++++ .idea/.idea.ue5-linter.dir/.idea/vcs.xml | 6 ++++++ Linter.uplugin | 2 +- Source/Linter/Private/LintRule.cpp | 5 ++--- Source/Linter/Private/LintRuleSet.cpp | 5 ++++- Source/Linter/Private/Linter.cpp | 4 +--- Source/Linter/Private/LinterCommandlet.cpp | 3 +-- Source/Linter/Private/UI/LintReportAssetDetails.cpp | 2 +- .../Linter/Private/UI/LintReportAssetErrorList.cpp | 1 - Source/Linter/Private/UI/LintReportRuleDetails.cpp | 3 +-- Source/Linter/Private/UI/LintReportRuleError.cpp | 5 +++++ .../Linter/Private/UI/LintReportRuleErrorList.cpp | 2 +- Source/Linter/Private/UI/LintWizard.cpp | 4 +--- Source/Linter/Public/LintRunner.h | 2 +- Source/Linter/Public/TooltipEditor/TooltipTool.h | 1 - Source/Linter/Public/UI/LintReportAssetErrorList.h | 1 + Source/Linter/Public/UI/LintReportRuleErrorList.h | 1 + 18 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 .idea/.idea.ue5-linter.dir/.idea/.gitignore create mode 100644 .idea/.idea.ue5-linter.dir/.idea/indexLayout.xml create mode 100644 .idea/.idea.ue5-linter.dir/.idea/vcs.xml diff --git a/.idea/.idea.ue5-linter.dir/.idea/.gitignore b/.idea/.idea.ue5-linter.dir/.idea/.gitignore new file mode 100644 index 0000000..3fa2783 --- /dev/null +++ b/.idea/.idea.ue5-linter.dir/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/.idea.ue5-linter.iml +/contentModel.xml +/modules.xml +/projectSettingsUpdater.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.ue5-linter.dir/.idea/indexLayout.xml b/.idea/.idea.ue5-linter.dir/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/.idea/.idea.ue5-linter.dir/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.ue5-linter.dir/.idea/vcs.xml b/.idea/.idea.ue5-linter.dir/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/.idea.ue5-linter.dir/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Linter.uplugin b/Linter.uplugin index a4b9e02..7cee39d 100644 --- a/Linter.uplugin +++ b/Linter.uplugin @@ -10,7 +10,7 @@ "DocsURL": "http://discord.gamemak.in", "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/ca0639af6339476da86fa3bcf15de8ec", "SupportURL": "http://discord.gamemak.in", - "EngineVersion": "5.2.0", + "EngineVersion": "5.3.0", "CanContainContent": true, "Installed": true, "Modules": [ diff --git a/Source/Linter/Private/LintRule.cpp b/Source/Linter/Private/LintRule.cpp index 64ab5d4..9ea7986 100644 --- a/Source/Linter/Private/LintRule.cpp +++ b/Source/Linter/Private/LintRule.cpp @@ -5,12 +5,11 @@ #include "Materials/Material.h" #include "Kismet2/BlueprintEditorUtils.h" #include "Engine/Blueprint.h" -#include "AssetData.h" #include "Modules/ModuleManager.h" -#include "IAssetRegistry.h" #include "IAssetTools.h" -#include "AssetRegistryModule.h" #include "MaterialDomain.h" +#include "AssetRegistry/AssetRegistryModule.h" +#include "AssetRegistry/IAssetRegistry.h" ULintRule::ULintRule(const FObjectInitializer& ObjectInitializer) diff --git a/Source/Linter/Private/LintRuleSet.cpp b/Source/Linter/Private/LintRuleSet.cpp index e52ae60..a95a7bc 100644 --- a/Source/Linter/Private/LintRuleSet.cpp +++ b/Source/Linter/Private/LintRuleSet.cpp @@ -1,7 +1,10 @@ #include "LintRuleSet.h" + +#include "AnyObject_LinterDummyClass.h" +#include "LinterNamingConvention.h" #include "LintRunner.h" +#include "AssetRegistry/AssetRegistryModule.h" -#include "AssetRegistryModule.h" #include "Modules/ModuleManager.h" #include "HAL/RunnableThread.h" diff --git a/Source/Linter/Private/Linter.cpp b/Source/Linter/Private/Linter.cpp index 42f4b26..64b18f1 100644 --- a/Source/Linter/Private/Linter.cpp +++ b/Source/Linter/Private/Linter.cpp @@ -6,9 +6,6 @@ #include "LevelEditor.h" #include "Widgets/Input/SButton.h" #include "Styling/SlateStyle.h" -#include "AssetRegistryModule.h" -#include "IAssetRegistry.h" -#include "AssetData.h" #include "ContentBrowserModule.h" #include "PropertyEditorModule.h" @@ -18,6 +15,7 @@ #include "LinterSettings.h" #include "UI/LintWizard.h" #include "LintRuleSet.h" +#include "AssetRegistry/AssetRegistryModule.h" #define LOCTEXT_NAMESPACE "FLinterModule" diff --git a/Source/Linter/Private/LinterCommandlet.cpp b/Source/Linter/Private/LinterCommandlet.cpp index 63d6dbd..c46be9e 100644 --- a/Source/Linter/Private/LinterCommandlet.cpp +++ b/Source/Linter/Private/LinterCommandlet.cpp @@ -2,8 +2,6 @@ #include "LinterCommandlet.h" #include "Editor.h" -#include "AssetRegistryModule.h" -#include "AssetData.h" #include "Engine/ObjectLibrary.h" #include "Dom/JsonObject.h" #include "Dom/JsonValue.h" @@ -16,6 +14,7 @@ #include "LinterSettings.h" #include "LintRule.h" #include "LintRuleSet.h" +#include "AssetRegistry/AssetRegistryModule.h" DEFINE_LOG_CATEGORY_STATIC(LinterCommandlet, All, All); diff --git a/Source/Linter/Private/UI/LintReportAssetDetails.cpp b/Source/Linter/Private/UI/LintReportAssetDetails.cpp index 4a71133..d220178 100644 --- a/Source/Linter/Private/UI/LintReportAssetDetails.cpp +++ b/Source/Linter/Private/UI/LintReportAssetDetails.cpp @@ -7,7 +7,6 @@ #include "Widgets/Layout/SExpandableArea.h" #include "ContentBrowserModule.h" #include "IContentBrowserSingleton.h" -#include "AssetRegistryModule.h" #include "Widgets/Input/SHyperlink.h" #include "Widgets/Layout/SSpacer.h" #include "IAssetTools.h" @@ -19,6 +18,7 @@ #include "UI/LintReportAssetError.h" #include "LintRule.h" #include "AssetThumbnail.h" +#include "AssetRegistry/AssetRegistryModule.h" #include "UI/LintReportAssetErrorList.h" diff --git a/Source/Linter/Private/UI/LintReportAssetErrorList.cpp b/Source/Linter/Private/UI/LintReportAssetErrorList.cpp index 1d1bf8c..a7af784 100644 --- a/Source/Linter/Private/UI/LintReportAssetErrorList.cpp +++ b/Source/Linter/Private/UI/LintReportAssetErrorList.cpp @@ -6,7 +6,6 @@ #include "Widgets/Layout/SExpandableArea.h" #include "ContentBrowserModule.h" #include "IContentBrowserSingleton.h" -#include "AssetRegistryModule.h" #include "Widgets/Input/SHyperlink.h" #include "Widgets/Layout/SSpacer.h" #include "IAssetTools.h" diff --git a/Source/Linter/Private/UI/LintReportRuleDetails.cpp b/Source/Linter/Private/UI/LintReportRuleDetails.cpp index d729fad..c23336b 100644 --- a/Source/Linter/Private/UI/LintReportRuleDetails.cpp +++ b/Source/Linter/Private/UI/LintReportRuleDetails.cpp @@ -7,7 +7,6 @@ #include "Widgets/Layout/SExpandableArea.h" #include "ContentBrowserModule.h" #include "IContentBrowserSingleton.h" -#include "AssetRegistryModule.h" #include "Widgets/Input/SHyperlink.h" #include "Widgets/Layout/SSpacer.h" #include "IAssetTools.h" @@ -19,7 +18,7 @@ #include "UI/LintReportRuleErrorList.h" #include "LintRule.h" #include "AssetThumbnail.h" - +#include "AssetRegistry/AssetRegistryModule.h" #define LOCTEXT_NAMESPACE "LintReport" diff --git a/Source/Linter/Private/UI/LintReportRuleError.cpp b/Source/Linter/Private/UI/LintReportRuleError.cpp index b8d22a6..6443b06 100644 --- a/Source/Linter/Private/UI/LintReportRuleError.cpp +++ b/Source/Linter/Private/UI/LintReportRuleError.cpp @@ -1,10 +1,15 @@ // Copyright 2019-2020 Gamemakin LLC. All Rights Reserved. #include "UI/LintReportRuleError.h" + +#include "ContentBrowserModule.h" +#include "IContentBrowserSingleton.h" +#include "LinterStyle.h" #include "Widgets/Layout/SBorder.h" #include "Widgets/SBoxPanel.h" #include "Widgets/Layout/SExpandableArea.h" #include "Widgets/Input/SHyperlink.h" #include "LintRule.h" +#include "AssetRegistry/AssetRegistryModule.h" #include "Widgets/Views/SListView.h" #include "Widgets/Views/STableRow.h" #include "Widgets/Layout/SBox.h" diff --git a/Source/Linter/Private/UI/LintReportRuleErrorList.cpp b/Source/Linter/Private/UI/LintReportRuleErrorList.cpp index 4f411a5..c79c577 100644 --- a/Source/Linter/Private/UI/LintReportRuleErrorList.cpp +++ b/Source/Linter/Private/UI/LintReportRuleErrorList.cpp @@ -8,7 +8,6 @@ #include "Widgets/Layout/SExpandableArea.h" #include "ContentBrowserModule.h" #include "IContentBrowserSingleton.h" -#include "AssetRegistryModule.h" #include "Widgets/Input/SHyperlink.h" #include "Widgets/Layout/SSpacer.h" #include "IAssetTools.h" @@ -19,6 +18,7 @@ #include "Framework/Views/ITypedTableView.h" #include "UI/LintReportAssetError.h" #include "LintRule.h" +#include "UI/LintReportRuleError.h" #define LOCTEXT_NAMESPACE "LintReport" diff --git a/Source/Linter/Private/UI/LintWizard.cpp b/Source/Linter/Private/UI/LintWizard.cpp index a17d873..0243313 100644 --- a/Source/Linter/Private/UI/LintWizard.cpp +++ b/Source/Linter/Private/UI/LintWizard.cpp @@ -3,9 +3,6 @@ #include "CoreGlobals.h" #include "Delegates/Delegate.h" -#include "AssetRegistryModule.h" -#include "IAssetRegistry.h" -#include "AssetData.h" #include "SlateOptMacros.h" #include "Widgets/Layout/SSeparator.h" #include "Widgets/Views/SListView.h" @@ -27,6 +24,7 @@ #include "LinterStyle.h" #include "LintRuleSet.h" #include "LinterSettings.h" +#include "AssetRegistry/AssetRegistryModule.h" #include "UI/SAssetLinkWidget.h" // This is only valid within a single file, and must be undefined before the end of the file diff --git a/Source/Linter/Public/LintRunner.h b/Source/Linter/Public/LintRunner.h index 0150aa3..6b5345a 100644 --- a/Source/Linter/Public/LintRunner.h +++ b/Source/Linter/Public/LintRunner.h @@ -4,8 +4,8 @@ #include "CoreMinimal.h" #include "HAL/ThreadSafeCounter.h" #include "HAL/Runnable.h" -#include "AssetData.h" #include "Linter.h" +#include "LintRuleSet.h" class FLintRunner : public FRunnable { diff --git a/Source/Linter/Public/TooltipEditor/TooltipTool.h b/Source/Linter/Public/TooltipEditor/TooltipTool.h index 5711675..edfc842 100644 --- a/Source/Linter/Public/TooltipEditor/TooltipTool.h +++ b/Source/Linter/Public/TooltipEditor/TooltipTool.h @@ -14,7 +14,6 @@ #include "Widgets/Input/SComboBox.h" #include "Widgets/Input/SMultiLineEditableTextBox.h" #include "Widgets/Views/SListView.h" -#include "AssetData.h" #include "Engine/Blueprint.h" #include "K2Node_FunctionEntry.h" #include "K2Node_FunctionResult.h" diff --git a/Source/Linter/Public/UI/LintReportAssetErrorList.h b/Source/Linter/Public/UI/LintReportAssetErrorList.h index ec8ac0f..cc1e7ba 100644 --- a/Source/Linter/Public/UI/LintReportAssetErrorList.h +++ b/Source/Linter/Public/UI/LintReportAssetErrorList.h @@ -1,5 +1,6 @@ // Copyright 2019-2020 Gamemakin LLC. All Rights Reserved. #pragma once +#include "LintRule.h" #include "Widgets/SCompoundWidget.h" #include "Widgets/DeclarativeSyntaxSupport.h" diff --git a/Source/Linter/Public/UI/LintReportRuleErrorList.h b/Source/Linter/Public/UI/LintReportRuleErrorList.h index 233d217..4a04f22 100644 --- a/Source/Linter/Public/UI/LintReportRuleErrorList.h +++ b/Source/Linter/Public/UI/LintReportRuleErrorList.h @@ -2,6 +2,7 @@ #pragma once #include "Widgets/SCompoundWidget.h" #include "Widgets/DeclarativeSyntaxSupport.h" +struct FLintRuleViolation; class SLintReportRuleErrorList : public SCompoundWidget {