Skip to content

Commit b31dd2e

Browse files
committed
fix fmt
1 parent c4ef279 commit b31dd2e

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

App/Utils/ModelUpdate.cs

+10-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,11 @@ public static void ApplyLists<T>(IList<T> target, IEnumerable<T> update, Compari
7171
target.RemoveAt(i);
7272
i--;
7373

74-
OuterLoopEnd: ;
74+
// Rider fights `dotnet format` about whether there should be a
75+
// space before the semicolon or not.
76+
#pragma warning disable format
77+
OuterLoopEnd: ;
78+
#pragma warning enable format
7579
}
7680

7781
// Add any items that were missing into their correct sorted place.
@@ -91,7 +95,11 @@ public static void ApplyLists<T>(IList<T> target, IEnumerable<T> update, Compari
9195
// equal to or after every other item.
9296
target.Add(newItem);
9397

94-
OuterLoopEnd: ;
98+
// Rider fights `dotnet format` about whether there should be a
99+
// space before the semicolon or not.
100+
#pragma warning disable format
101+
OuterLoopEnd: ;
102+
#pragma warning enable format
95103
}
96104
}
97105
}

Coder.Desktop.sln.DotSettings

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_LOCK_STMT/@EntryValue">True</s:Boolean>
66
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_USINGS_STMT/@EntryValue">True</s:Boolean>
77
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_WHILE_STMT/@EntryValue">True</s:Boolean>
8+
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OUTDENT_STATEMENT_LABELS/@EntryValue">True</s:Boolean>
89
<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;
910
&lt;TypePattern DisplayName="Non-reorderable types" Priority="99999999"&gt;
1011
&lt;TypePattern.Match&gt;

0 commit comments

Comments
 (0)