Fix Slate Formatting

ue4plugins · Nov 8, 2023 · 80a20ce · 80a20ce
1 parent 77dada1
commit 80a20ce
Show file tree

Hide file tree

Showing 14 changed files with 1,044 additions and 963 deletions.
diff --git a/.clang-format b/.clang-format
@@ -2,7 +2,7 @@
 Language: Cpp
 BasedOnStyle: Google
 AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
+AlignAfterOpenBracket: BlockIndent
 AlignConsecutiveMacros: None
 AlignConsecutiveAssignments: None
 AlignConsecutiveDeclarations: None
@@ -82,8 +82,10 @@ IndentPPDirectives: None
 IndentWidth: 4
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: OuterScope
 MaxEmptyLinesToKeep: 3
 NamespaceIndentation: None
+PackConstructorInitializers: CurrentLine
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 1
 PenaltyBreakComment: 300
@@ -93,6 +95,7 @@ PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
+QualifierAlignment: Left
 RawStringFormats:
   - Language: Cpp
     Delimiters:
@@ -107,6 +110,7 @@ RawStringFormats:
     BasedOnStyle: google
 ReferenceAlignment: Left
 ReflowComments: true
+SeparateDefinitionBlocks: Always
 SortIncludes: Never
 SortUsingDeclarations: false
 SpaceAfterCStyleCast: false

diff --git a/Source/Linter/Private/BatchRenameTool/BatchRenameTool.cpp b/Source/Linter/Private/BatchRenameTool/BatchRenameTool.cpp
@@ -31,21 +31,25 @@ FDlgBatchRenameTool::FDlgBatchRenameTool(const TArray<FAssetData> Assets) :
     bRemoveSuffix(false),
     SelectedAssets(Assets) {
     if (FSlateApplication::IsInitialized()) {
+        // clang-format off
+        // @formatter:off
         DialogWindow = SNew(SWindow)
-			.Title(LOCTEXT("BatchRenameToolDlgTitle", "Batch Rename Tool"))
-			.SupportsMinimize(false).SupportsMaximize(false)
-			.SaneWindowPlacement(true)
-			.AutoCenter(EAutoCenter::PreferredWorkArea)
-			.ClientSize(FVector2D(350, 165));
+	    .Title(LOCTEXT("BatchRenameToolDlgTitle", "Batch Rename Tool"))
+	    .SupportsMinimize(false).SupportsMaximize(false)
+	    .SaneWindowPlacement(true)
+	    .AutoCenter(EAutoCenter::PreferredWorkArea)
+	    .ClientSize(FVector2D(350, 165));
 
         const TSharedPtr<SBorder> DialogWrapper =
             SNew(SBorder)
-			.BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))
-			.Padding(4.0f)
+	    .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))
+	    .Padding(4.0f)
             [
                 SAssignNew(DialogWidget, SDlgBatchRenameTool)
                 .ParentWindow(DialogWindow)
             ];
+        // clang-format on
+        // @formatter:on
 
         DialogWindow->SetContent(DialogWrapper.ToSharedRef());
     }

diff --git a/Source/Linter/Private/Linter.cpp b/Source/Linter/Private/Linter.cpp
@@ -79,9 +79,13 @@ void FLinterModule::ShutdownModule() {
 TSharedRef<SDockTab> FLinterModule::SpawnTab(const FSpawnTabArgs& TabSpawnArgs, TSharedPtr<FSlateStyleSet> StyleSet) {
     const FSlateBrush* IconBrush = StyleSet->GetBrush("Linter.Toolbar.Icon");
 
+    // clang-format off
+    // @formatter:off
     const TSharedRef<SDockTab> MajorTab =
         SNew(SDockTab)
         .TabRole(ETabRole::MajorTab);
+    // clang-format on
+    // @formatter:on
 
     MajorTab->SetContent(SNew(SLintWizard));
     MajorTab->SetTabIcon(IconBrush);

diff --git a/Source/Linter/Private/LinterNamingConvention.cpp b/Source/Linter/Private/LinterNamingConvention.cpp
@@ -36,6 +36,8 @@ void FLinterNamingConventionDetails::OnGenerateElementForDetails(const TSharedRe
         }
         ));
 
+    // clang-format off
+    // @formatter:off
     ChildrenBuilder.AddCustomRow(FText::GetEmpty())
     [
         SNew(SHorizontalBox)
@@ -66,6 +68,8 @@ void FLinterNamingConventionDetails::OnGenerateElementForDetails(const TSharedRe
             SNew(SProperty, StructProperty->GetChildHandle("Suffix"))
         ]
     ];
+    // clang-format on
+    // @formatter:on
 }
 
 ULinterNamingConvention::ULinterNamingConvention(const FObjectInitializer& ObjectInitializer) :

diff --git a/Source/Linter/Private/TooltipTool/TooltipTool.cpp b/Source/Linter/Private/TooltipTool/TooltipTool.cpp