Skip to content

Commit 9d01953

Browse files
love-lingerlove-linger
committed
code_style: remove unnecessary spaces at end of line
Signed-off-by: leo <longshuang@msn.cn>
1 parent bf7892f commit 9d01953

82 files changed

Lines changed: 146 additions & 146 deletions

File tree

Some content is hidden

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

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@
210210
<x:String x:Key="Text.Compare.Commits.Tips" xml:space="preserve">Tips: You can cherry-pick selected commits if the other side is HEAD (using context menu).</x:String>
211211
<x:String x:Key="Text.Configure" xml:space="preserve">Repository Configure</x:String>
212212
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">COMMIT TEMPLATE</x:String>
213-
<x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Built-in parameters:
214-
213+
<x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Built-in parameters:
214+
215215
${branch_name} Current local branch name.
216216
${files_num} Number of changed files
217217
${files} Paths of changed files
@@ -222,8 +222,8 @@
222222
<x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Template Name:</x:String>
223223
<x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">CUSTOM ACTION</x:String>
224224
<x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Arguments:</x:String>
225-
<x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Built-in parameters:
226-
225+
<x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Built-in parameters:
226+
227227
${REPO} Repository's path
228228
${REMOTE} Selected remote or selected branch's remote
229229
${BRANCH} Selected branch, without ${REMOTE} part for remote branches

‎src/Resources/Locales/fr_FR.axaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@
204204
<x:String x:Key="Text.Compare.Commits.Tips" xml:space="preserve">Astuce : vous pouvez cherry-pick les commits sélectionnés si l'autre côté est HEAD (via le menu contextuel).</x:String>
205205
<x:String x:Key="Text.Configure" xml:space="preserve">Configurer le dépôt</x:String>
206206
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">MODÈLE DE COMMIT</x:String>
207-
<x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Paramètres intégrés :
208-
207+
<x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Paramètres intégrés :
208+
209209
${branch_name} Nom de la branche locale actuelle.
210210
${files_num} Nombre de fichiers modifiés
211211
${files} Chemins des fichiers modifiés
@@ -216,8 +216,8 @@
216216
<x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Nom de modèle:</x:String>
217217
<x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">ACTION PERSONNALISÉE</x:String>
218218
<x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Arguments :</x:String>
219-
<x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Paramètres intégrés :
220-
219+
<x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Paramètres intégrés :
220+
221221
${REPO} Chemin du dépôt
222222
${REMOTE} Dépôt distant sélectionné ou dépôt distant de la branche sélectionnée
223223
${BRANCH} Branche sélectionnée, sans la partie ${REMOTE} pour les branches distantes

‎src/Resources/Locales/id_ID.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@
173173
<x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Nama Template:</x:String>
174174
<x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">AKSI KUSTOM</x:String>
175175
<x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Argumen:</x:String>
176-
<x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Parameter bawaan:
177-
176+
<x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Parameter bawaan:
177+
178178
${REPO} Jalur repositori
179179
${REMOTE} Remote yang dipilih atau remote dari branch yang dipilih
180180
${BRANCH} Branch yang dipilih, tanpa bagian ${REMOTE} untuk remote branch

‎src/Resources/Locales/it_IT.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ ${pure_files:N} Come ${files:N}, ma senza cartelle</x:String>
196196
<x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">AZIONE PERSONALIZZATA</x:String>
197197
<x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Argomenti:</x:String>
198198
<x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Parametri integrati:
199-
199+
200200
${REPO} Percorso del repository
201201
${REMOTE} Remoto selezionato o remoto del branch selezionato
202202
${BRANCH} Branch selezionato, senza la parte ${REMOTE} per i branch remoti

‎src/Resources/Locales/ru_RU.axaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@
214214
<x:String x:Key="Text.Compare.Commits.Tips" xml:space="preserve">Подсказка: Если другая сторона является ГОЛОВОЙ (используя контекстное меню), вы можете использовать частично выбранные ревизии (cherry-pick).</x:String>
215215
<x:String x:Key="Text.Configure" xml:space="preserve">Настройка репозитория</x:String>
216216
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">ШАБЛОН РЕВИЗИИ</x:String>
217-
<x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Встроенные параметры:
218-
217+
<x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Встроенные параметры:
218+
219219
${branch_name} Имя текущей локальной ветки
220220
${files_num} Количество изменённых файлов
221221
${files} Пути изменённых файлов
@@ -226,8 +226,8 @@
226226
<x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Название:</x:String>
227227
<x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">ПОЛЬЗОВАТЕЛЬСКОЕ ДЕЙСТВИЕ</x:String>
228228
<x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Аргументы:</x:String>
229-
<x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Встроенные параметры:
230-
229+
<x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Встроенные параметры:
230+
231231
${REPO} Путь репозитория
232232
${REMOTE} Выбранная удаённая ветка
233233
${BRANCH} Выбранная ветка, без ${REMOTE} удалённых веток

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
<x:String x:Key="Text.Configure" xml:space="preserve">仓库配置</x:String>
216216
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">提交信息模板</x:String>
217217
<x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">内置变量：
218-
218+
219219
${branch_name} 当前分支名
220220
${files_num} 变更文件数量
221221
${files} 变更文件路径列表
@@ -227,7 +227,7 @@
227227
<x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">自定义操作</x:String>
228228
<x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">命令行参数 ：</x:String>
229229
<x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">内置变量：
230-
230+
231231
${REPO} 仓库路径
232232
${REMOTE} 选中的远程仓库或选中分支所属的远程仓库
233233
${BRANCH} 选中的分支，对于远程分支不包含远程名

‎src/Resources/Styles.axaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="Red"/>
1717
<Color x:Key="SystemErrorTextColor">Red</Color>
1818
</Style.Resources>
19-
19+
2020
<Setter Property="Background" Value="{DynamicResource Brush.Window}"/>
2121
<Setter Property="BorderBrush" Value="{DynamicResource Brush.WindowBorder}"/>
2222
<Setter Property="SystemDecorations" Value="Full"/>
@@ -48,7 +48,7 @@
4848
</VisualLayerManager>
4949
</Border>
5050
</Border>
51-
</ControlTemplate>
51+
</ControlTemplate>
5252
</Setter>
5353
</Style>
5454

@@ -403,11 +403,11 @@
403403
<Style Selector="^ /template/ RepeatButton:pointerover > Path">
404404
<Setter Property="Fill" Value="{DynamicResource Brush.FG1}" />
405405
</Style>
406-
406+
407407
<Style Selector="^ /template/ Thumb:pointerover">
408408
<Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
409409
</Style>
410-
410+
411411
<Style Selector="^[IsExpanded=False]">
412412
<Style Selector="^ /template/ RepeatButton">
413413
<Setter Property="IsVisible" Value="False" />
@@ -426,7 +426,7 @@
426426
</Style>
427427

428428
<Style Selector="ScrollViewer.static_scrollbar">
429-
<Setter Property="AllowAutoHide" Value="False"/>
429+
<Setter Property="AllowAutoHide" Value="False"/>
430430
<Style Selector="^ /template/ ScrollContentPresenter#PART_ContentPresenter">
431431
<Setter Property="Grid.RowSpan" Value="1"/>
432432
<Setter Property="Grid.ColumnSpan" Value="1"/>
@@ -1016,7 +1016,7 @@
10161016
<Border/>
10171017
</FocusAdornerTemplate>
10181018
</Setter>
1019-
1019+
10201020
<Setter Property="VerticalAlignment" Value="Center"/>
10211021
<Setter Property="Template">
10221022
<ControlTemplate>
@@ -1051,7 +1051,7 @@
10511051
</Style>
10521052
<Style Selector="^:focus-visible:checked /template/ Path#Icon">
10531053
<Setter Property="Fill" Value="White"/>
1054-
</Style>
1054+
</Style>
10551055
</Style>
10561056

10571057
<Style Selector="RadioButton">
@@ -1060,9 +1060,9 @@
10601060
<Border/>
10611061
</FocusAdornerTemplate>
10621062
</Setter>
1063-
1063+
10641064
<Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
1065-
1065+
10661066
<Setter Property="Template">
10671067
<ControlTemplate>
10681068
<Grid ColumnDefinitions="16,*" Background="Transparent">
@@ -1362,7 +1362,7 @@
13621362
<Style Selector="NumericUpDown">
13631363
<Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
13641364
<Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
1365-
1365+
13661366
<Style Selector="^ /template/ ButtonSpinner#PART_Spinner">
13671367
<Setter Property="MinHeight" Value="0"/>
13681368
<Setter Property="Height" Value="28"/>

‎src/ViewModels/DiffContext.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ private void LoadContent()
167167
}
168168
else if (latest.IsSubmoduleChange)
169169
{
170-
rs = await CreateSubmoduleDiffAsync(latest).ConfigureAwait(false);
170+
rs = await CreateSubmoduleDiffAsync(latest.OldHash, latest.NewHash).ConfigureAwait(false);
171171
}
172172
else if (IsEmptyFileHash(latest.OldHash) || IsEmptyFileHash(latest.NewHash))
173173
{
@@ -276,19 +276,19 @@ private void LoadContent()
276276
return binaryDiff;
277277
}
278278

279-
private async Task<Models.SubmoduleDiff> CreateSubmoduleDiffAsync(Models.DiffResult result)
279+
private async Task<Models.SubmoduleDiff> CreateSubmoduleDiffAsync(string oldRevision, string newRevision)
280280
{
281281
var submoduleDiff = new Models.SubmoduleDiff();
282282
var submoduleRoot = $"{_repo}/{_option.Path}".Replace('\\', '/').TrimEnd('/');
283283
submoduleDiff.FullPath = submoduleRoot;
284284

285-
if (IsValidSubmoduleHash(result.OldHash))
286-
submoduleDiff.Old = await new Commands.QuerySubmoduleRevision(submoduleRoot, result.OldHash)
285+
if (IsValidSubmoduleHash(oldRevision))
286+
submoduleDiff.Old = await new Commands.QuerySubmoduleRevision(submoduleRoot, oldRevision)
287287
.GetResultAsync()
288288
.ConfigureAwait(false);
289289

290-
if (IsValidSubmoduleHash(result.NewHash))
291-
submoduleDiff.New = await new Commands.QuerySubmoduleRevision(submoduleRoot, result.NewHash)
290+
if (IsValidSubmoduleHash(newRevision))
291+
submoduleDiff.New = await new Commands.QuerySubmoduleRevision(submoduleRoot, newRevision)
292292
.GetResultAsync()
293293
.ConfigureAwait(false);
294294

‎src/Views/AIAssistant.axaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<TextBlock Grid.Column="0"
5050
Classes="group_header_label"
5151
Text="{DynamicResource Text.AIAssistant.Model}"/>
52-
52+
5353
<ComboBox Grid.Column="1"
5454
Height="28"
5555
Margin="6,0" Padding="4,0"
@@ -59,7 +59,7 @@
5959
ItemsSource="{Binding AvailableModels, Mode=OneWay}"
6060
SelectedItem="{Binding CurrentModel, Mode=TwoWay}"
6161
SelectionChanged="OnModelChanged"/>
62-
62+
6363
<v:LoadingIcon Grid.Column="2"
6464
Width="14" Height="14"
6565
IsVisible="{Binding IsGenerating}"/>
@@ -71,7 +71,7 @@
7171
Content="{DynamicResource Text.AIAssistant.Use}"
7272
IsEnabled="{Binding Response, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
7373
Click="OnUseClicked"/>
74-
74+
7575
<Button Grid.Column="4"
7676
Classes="flat"
7777
Height="28"

‎src/Views/AddRemote.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<Path Width="16" Height="16"
1313
Margin="0,2,0,0"
1414
Data="{StaticResource Icons.Remote.Add}"/>
15-
15+
1616
<TextBlock FontSize="18"
1717
Margin="8,0,0,0"
1818
Classes="bold"
1919
Text="{DynamicResource Text.Remote.AddTitle}"/>
2020
</StackPanel>
21-
21+
2222
<Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto" ColumnDefinitions="120,*">
2323
<TextBlock Grid.Row="0" Grid.Column="0"
2424
HorizontalAlignment="Right" VerticalAlignment="Center"

0 commit comments

Comments
 (0)