Skip to content

Commit f4572c6

Browse files
NathanBaulchNathanBaulch
committed
code_style: whitespace cleanup
1 parent dde08c5 commit f4572c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+65
-88
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
100100
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
101101

102102
dotnet_naming_style.camel_case_underscore_style.required_prefix = _
103-
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
103+
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
104104

105105
# use accessibility modifiers
106106
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion

‎src/Models/TextInlineChange.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ private static EditResult CheckModifiedEdit(List<Chunk> chunksOld, int startOld,
204204

205205
for (int i = 0; i <= half; i++)
206206
{
207-
208207
for (int j = -i; j <= i; j += 2)
209208
{
210209
var idx = j + half;

‎src/Resources/Styles.axaml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Style.Resources>
1717
<x:Double x:Key="ScrollBarSize">12</x:Double>
1818
</Style.Resources>
19-
19+
2020
<Setter Property="ShowDelay" Value="0:0:0.1"/>
2121
<Setter Property="HideDelay" Value="0:0:0.2"/>
2222
</Style>
@@ -38,7 +38,7 @@
3838
<Setter Property="BorderThickness" Value="0"/>
3939
<Setter Property="Padding" Value="0"/>
4040
</Style>
41-
41+
4242
<Style Selector="Window[WindowState=Maximized].fix_maximized_padding">
4343
<Setter Property="Padding" Value="8,6,8,8"/>
4444
</Style>
@@ -206,7 +206,7 @@
206206
<DropShadowEffect OffsetX="0" OffsetY="0" BlurRadius="4" Color="Black" Opacity=".6"/>
207207
</Border.Effect>
208208
</Border>
209-
209+
210210
<Border Name="LayoutRoot"
211211
Margin="4"
212212
Padding="12"
@@ -318,7 +318,7 @@
318318
<Setter Property="Foreground" Value="DarkOrange"/>
319319
<Setter Property="TextDecorations" Value="Underline"/>
320320
</Style>
321-
321+
322322
<Style Selector="SelectableTextBlock">
323323
<Setter Property="HorizontalAlignment" Value="Left"/>
324324
<Setter Property="VerticalAlignment" Value="Center"/>
@@ -336,7 +336,7 @@
336336
<Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/>
337337
</MenuItem.Icon>
338338
</MenuItem>
339-
339+
340340
<MenuItem Header="{DynamicResource Text.CopyAllText}"
341341
Command="{x:Static s:App.CopyTextBlockCommand}"
342342
CommandParameter="{Binding $parent[SelectableTextBlock]}">
@@ -524,7 +524,7 @@
524524
<Style Selector="Button.flat.primary ToolTip TextBlock">
525525
<Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
526526
</Style>
527-
527+
528528
<Style Selector="SplitButton">
529529
<Setter Property="MinHeight" Value="24"/>
530530
<Setter Property="Template">
@@ -569,17 +569,17 @@
569569
</Grid>
570570
</ControlTemplate>
571571
</Setter>
572-
572+
573573
<Style Selector="^:disabled /template/ Button">
574574
<Setter Property="BorderThickness" Value="1"/>
575575
<Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}"/>
576576
<Setter Property="Background" Value="Transparent"/>
577577
</Style>
578-
578+
579579
<Style Selector="^:disabled TextBlock">
580580
<Setter Property="Foreground" Value="{DynamicResource Brush.FG2}"/>
581581
</Style>
582-
582+
583583
<Style Selector="^:disabled Path">
584584
<Setter Property="Fill" Value="{DynamicResource Brush.FG2}"/>
585585
</Style>
@@ -737,7 +737,7 @@
737737
<Setter Property="Background" Value="{DynamicResource Brush.Accent}" />
738738
<Setter Property="Opacity" Value=".8"/>
739739
</Style>
740-
</Style>
740+
</Style>
741741

742742
<Style Selector="ContextMenu">
743743
<Setter Property="HorizontalOffset" Value="-4"/>
@@ -849,7 +849,7 @@
849849
</DataTemplate>
850850
</ContentPresenter.DataTemplates>
851851
</ContentPresenter>
852-
852+
853853
<TextBlock x:Name="PART_InputGestureText"
854854
Grid.Column="2"
855855
Classes="CaptionTextBlockStyle"
@@ -871,7 +871,7 @@
871871
Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
872872
FontSize="11"
873873
IsVisible="{TemplateBinding (v:MenuItemExtension.Command), Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
874-
874+
875875
<Path Name="PART_ChevronPath"
876876
Width="6"
877877
Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z"
@@ -914,7 +914,7 @@
914914
</Panel>
915915
</ControlTemplate>
916916
</Setter>
917-
917+
918918
<Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
919919
<Setter Property="IsVisible" Value="True" />
920920
</Style>
@@ -956,7 +956,7 @@
956956
<Style Selector="MenuItem.filter_mode_switcher">
957957
<Setter Property="Height" Value="48"/>
958958
<Setter Property="StaysOpenOnClick" Value="True"/>
959-
959+
960960
<Style Selector="^:selected">
961961
<Style Selector="^ /template/ Border#PART_LayoutRoot">
962962
<Setter Property="Background" Value="Transparent" />
@@ -1179,7 +1179,7 @@
11791179
<Setter Property="Data" Value="M 0 4 L 8 4 L 4 8 Z" />
11801180
</Style>
11811181
</Style>
1182-
1182+
11831183
<Style Selector="ToggleButton.folder">
11841184
<Setter Property="Margin" Value="0" />
11851185
<Setter Property="Background" Value="Transparent"/>
@@ -1252,7 +1252,7 @@
12521252
<Style Selector="ToggleButton.toggle_untracked:pointerover /template/ Path#PART_IndicatorIcon">
12531253
<Setter Property="Opacity" Value="1"/>
12541254
</Style>
1255-
1255+
12561256
<Style Selector="ToggleButton.show_as_tree">
12571257
<Setter Property="Margin" Value="0" />
12581258
<Setter Property="Background" Value="Transparent"/>
@@ -1284,7 +1284,7 @@
12841284
<Setter Property="Opacity" Value="1"/>
12851285
</Style>
12861286
</Style>
1287-
1287+
12881288
<Style Selector="Slider">
12891289
<Style.Resources>
12901290
<Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>

‎src/Resources/Themes.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<Color x:Key="Color.InlineCode">#FF383838</Color>
5656
</ResourceDictionary>
5757
</ResourceDictionary.ThemeDictionaries>
58-
58+
5959
<SolidColorBrush x:Key="Brush.Window" Color="{DynamicResource Color.Window}"/>
6060
<SolidColorBrush x:Key="Brush.WindowBorder" Color="{DynamicResource Color.WindowBorder}"/>
6161
<SolidColorBrush x:Key="Brush.TitleBar" Color="{DynamicResource Color.TitleBar}"/>

‎src/ViewModels/Blame.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void NavigateToCommit(string commitSHA)
115115
break;
116116
}
117117
}
118-
}
118+
}
119119
}
120120

121121
private void SetBlameData(string commitSHA)
@@ -145,7 +145,7 @@ private void SetBlameData(string commitSHA)
145145
}
146146
});
147147
}, token);
148-
}
148+
}
149149

150150
Task.Run(() =>
151151
{

‎src/ViewModels/Histories.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public void DoubleTapped(Models.Commit commit)
244244
return;
245245
}
246246
}
247-
247+
248248
if (firstRemoteBranch == null)
249249
firstRemoteBranch = remoteBranch;
250250
}

‎src/ViewModels/Repository.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@ public void CheckoutBranch(Models.Branch branch)
13391339
{
13401340
foreach (var b in _branches)
13411341
{
1342-
if (b.IsLocal &&
1342+
if (b.IsLocal &&
13431343
b.Upstream.Equals(branch.FullName, StringComparison.Ordinal) &&
13441344
b.TrackStatus.Ahead.Count == 0)
13451345
{

‎src/Views/About.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
</Button>
6363
</StackPanel>
6464

65-
6665
<TextBlock x:Name="TxtCopyright" Margin="0,40,0,0" Foreground="{DynamicResource Brush.FG2}"/>
6766
</StackPanel>
6867
</Grid>

‎src/Views/ApplyStash.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ public ApplyStash()
1010
}
1111
}
1212
}
13-

‎src/Views/Blame.axaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<Path Grid.Column="0"
4949
Width="14" Height="14"
5050
Data="{StaticResource Icons.File}"/>
51-
51+
5252
<TextBlock Grid.Column="1"
5353
Margin="4,0,0,0"
5454
VerticalAlignment="Center"
@@ -61,7 +61,7 @@
6161
Command="{Binding Back}">
6262
<Path Width="12" Height="12" Data="{StaticResource Icons.TriangleLeft}"/>
6363
</Button>
64-
64+
6565
<Button Grid.Column="3"
6666
Classes="icon_button"
6767
IsEnabled="{Binding CanForward}"
@@ -80,7 +80,7 @@
8080
<TextBlock Grid.Column="1"
8181
Text="{Binding Revision.Subject}"
8282
TextTrimming="CharacterEllipsis"/>
83-
</Grid>
83+
</Grid>
8484
</Border>
8585
</Grid>
8686
</Border>

‎src/Views/BranchTree.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,3 @@
9696
</ListBox.ItemTemplate>
9797
</ListBox>
9898
</UserControl>
99-

‎src/Views/BranchTree.axaml.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,12 +479,12 @@ private void OnTreeKeyDown(object _, KeyEventArgs e)
479479

480480
if (branches.Find(x => x.IsCurrent) != null)
481481
return;
482-
482+
483483
if (branches.Count == 1)
484484
repo.DeleteBranch(branches[0]);
485485
else
486486
repo.DeleteMultipleBranches(branches, branches[0].IsLocal);
487-
487+
488488
e.Handled = true;
489489
}
490490

@@ -537,4 +537,3 @@ private void CollectBranchesInNode(List<Models.Branch> outs, ViewModels.BranchTr
537537
private bool _disableSelectionChangingEvent = false;
538538
}
539539
}
540-

‎src/Views/CommitBaseInfo.axaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/>
121121
</MultiBinding>
122122
</ToolTip.IsOpen>
123-
123+
124124
<TextBlock.DataTemplates>
125125
<DataTemplate DataType="m:Commit">
126126
<StackPanel MinWidth="400" Orientation="Vertical">
@@ -165,7 +165,7 @@
165165
<Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/>
166166
</MultiBinding>
167167
</ToolTip.IsOpen>
168-
168+
169169
<TextBlock.DataTemplates>
170170
<DataTemplate DataType="m:Commit">
171171
<StackPanel MinWidth="400" Orientation="Vertical">
@@ -209,7 +209,7 @@
209209
<Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/>
210210
</MultiBinding>
211211
</ToolTip.IsOpen>
212-
212+
213213
<v:CommitMessagePresenter.DataTemplates>
214214
<DataTemplate DataType="m:Commit">
215215
<StackPanel MinWidth="400" Orientation="Vertical">

‎src/Views/CommitMessageTextBox.axaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*" Margin="0,4">
6868
<Button Grid.Column="0"
6969
Classes="icon_button"
70-
Width="24"
70+
Width="24"
7171
Margin="0,0,4,0" Padding="0"
7272
Click="OnOpenCommitMessagePicker"
7373
IsVisible="{Binding #ThisControl.ShowAdvancedOptions}"
@@ -120,4 +120,3 @@
120120
</Grid>
121121
</Border>
122122
</UserControl>
123-

‎src/Views/ConfigureWorkspace.axaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<Grid RowDefinitions="30,32,30,32,30,Auto,32">
122122
<TextBlock Grid.Row="0" Margin="0,0,0,4" Text="{DynamicResource Text.ConfigureWorkspace.Name}" VerticalAlignment="Bottom"/>
123123
<TextBox Grid.Row="1" CornerRadius="3" Height="28" Text="{Binding Name, Mode=TwoWay}"/>
124-
124+
125125
<TextBlock Grid.Row="2" Margin="0,0,0,4" Text="{DynamicResource Text.Preferences.Git.DefaultCloneDir}" VerticalAlignment="Bottom"/>
126126
<TextBox Grid.Row="3" CornerRadius="3" Height="28" Text="{Binding DefaultCloneDir, Mode=TwoWay}">
127127
<TextBox.InnerRightContent>
@@ -130,10 +130,10 @@
130130
</Button>
131131
</TextBox.InnerRightContent>
132132
</TextBox>
133-
133+
134134
<TextBlock Grid.Row="4" Margin="0,0,0,4" Text="{DynamicResource Text.ConfigureWorkspace.Color}" VerticalAlignment="Bottom"/>
135135
<v:ColorPicker Grid.Row="5" HorizontalAlignment="Left" Value="{Binding Color, Mode=TwoWay}"/>
136-
136+
137137
<CheckBox Grid.Row="6"
138138
Content="{DynamicResource Text.ConfigureWorkspace.Restore}"
139139
IsChecked="{Binding RestoreOnStartup, Mode=TwoWay}"/>

‎src/Views/Conflict.axaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<StackPanel Orientation="Vertical" IsVisible="{Binding !IsResolved}">
1515
<Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
1616
<TextBlock Margin="0,16" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
17-
17+
1818
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,8">
1919
<Border Height="16" VerticalAlignment="Center" Background="Red" CornerRadius="8">
2020
<TextBlock Classes="primary" Text="{Binding Marker}" Foreground="White" FontWeight="Bold" Margin="8,0" FontSize="10"/>
2121
</Border>
22-
22+
2323
<TextBlock Margin="8,0,0,0" VerticalAlignment="Center" Text="{Binding Description}"/>
2424
</StackPanel>
25-
25+
2626
<Border Margin="16,0" Padding="8" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
2727
<Border.DataTemplates>
2828
<DataTemplate DataType="vm:ConflictSourceBranch">
@@ -96,7 +96,7 @@
9696
</StackPanel>
9797
</DataTemplate>
9898
</Border.DataTemplates>
99-
99+
100100
<Border.IsVisible>
101101
<MultiBinding Converter="{x:Static BoolConverters.And}">
102102
<Binding Path="Theirs" Converter="{x:Static ObjectConverters.IsNotNull}"/>

‎src/Views/ConventionalCommitMessageBuilder.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@
5656
<TextBlock Text="{Binding Name}" Margin="0,0,8,0"/>
5757
<Border Height="16" CornerRadius="8" Padding="8,0" VerticalAlignment="Center" Background="Green">
5858
<TextBlock Text="{Binding Type}" VerticalAlignment="Center" FontSize="11" Foreground="White"/>
59-
</Border>
59+
</Border>
6060
</StackPanel>
6161
</DataTemplate>
6262
</ComboBox.SelectionBoxItemTemplate>
63-
63+
6464
<ComboBox.ItemTemplate>
6565
<DataTemplate DataType="m:ConventionalCommitType">
6666
<Grid Height="22">

‎src/Views/DeleteMultipleBranches.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ public DeleteMultipleBranches()
1010
}
1111
}
1212
}
13-

‎src/Views/FilterModeSwitchButton.axaml.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,3 @@ private void OnChangeFilterModeButtonClicked(object sender, RoutedEventArgs e)
163163
}
164164
}
165165
}
166-
167-

‎src/Views/Histories.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
AheadBrush="{DynamicResource Brush.Accent}"
134134
BehindBrush="{DynamicResource Brush.FG1}"
135135
VerticalAlignment="Center"/>
136-
136+
137137
<v:BisectStateIndicator Grid.Column="1"
138138
Background="{DynamicResource Brush.Contents}"
139139
Foreground="{DynamicResource Brush.FG1}"

0 commit comments

Comments
 (0)