From 7e90789fafd6357b98a45cdc3ca0da9ec5a5253a Mon Sep 17 00:00:00 2001 From: Keith Hill Date: Sat, 17 Jun 2017 13:11:27 -0600 Subject: [PATCH 1/2] Add settings for Stroustrup style. This is a copy of OTBS with just the PlaceOpenBrace.OnSameLine set to $false. --- Engine/Settings/CodeFormattingStroustrup.psd1 | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Engine/Settings/CodeFormattingStroustrup.psd1 diff --git a/Engine/Settings/CodeFormattingStroustrup.psd1 b/Engine/Settings/CodeFormattingStroustrup.psd1 new file mode 100644 index 000000000..7742fce09 --- /dev/null +++ b/Engine/Settings/CodeFormattingStroustrup.psd1 @@ -0,0 +1,44 @@ +# Inspired by http://eslint.org/docs/rules/brace-style#stroustrup +@{ + IncludeRules = @( + 'PSPlaceOpenBrace', + 'PSPlaceCloseBrace', + 'PSUseConsistentWhitespace', + 'PSUseConsistentIndentation', + 'PSAlignAssignmentStatement' + ) + + Rules = @{ + PSPlaceOpenBrace = @{ + Enable = $true + OnSameLine = $false + NewLineAfter = $true + IgnoreOneLineBlock = $true + } + + PSPlaceCloseBrace = @{ + Enable = $true + NewLineAfter = $false + IgnoreOneLineBlock = $true + NoEmptyLineBefore = $false + } + + PSUseConsistentIndentation = @{ + Enable = $true + IndentationSize = 4 + } + + PSUseConsistentWhitespace = @{ + Enable = $true + CheckOpenBrace = $true + CheckOpenParen = $true + CheckOperator = $true + CheckSeparator = $true + } + + PSAlignAssignmentStatement = @{ + Enable = $true + CheckHashtable = $true + } + } +} From 1006ceea95a8fcf0b12c4c1aacc2281c53ffbc94 Mon Sep 17 00:00:00 2001 From: Keith Hill Date: Sat, 17 Jun 2017 14:03:45 -0600 Subject: [PATCH 2/2] Set the right settings for Stroustrup. --- Engine/Settings/CodeFormattingStroustrup.psd1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/Settings/CodeFormattingStroustrup.psd1 b/Engine/Settings/CodeFormattingStroustrup.psd1 index 7742fce09..8640f6761 100644 --- a/Engine/Settings/CodeFormattingStroustrup.psd1 +++ b/Engine/Settings/CodeFormattingStroustrup.psd1 @@ -11,14 +11,14 @@ Rules = @{ PSPlaceOpenBrace = @{ Enable = $true - OnSameLine = $false + OnSameLine = $true NewLineAfter = $true IgnoreOneLineBlock = $true } PSPlaceCloseBrace = @{ Enable = $true - NewLineAfter = $false + NewLineAfter = $true IgnoreOneLineBlock = $true NoEmptyLineBefore = $false }