mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-12-23 20:47:25 -08:00
code_style: run dotnet format
to apply rules
This commit is contained in:
parent
e0319e3f9b
commit
40d5a7c7f3
6 changed files with 15 additions and 16 deletions
|
@ -92,7 +92,7 @@ namespace SourceGit
|
|||
var toplevel = GetTopLevel() as Window;
|
||||
if (toplevel == null)
|
||||
return;
|
||||
|
||||
|
||||
var dialog = new Views.Preference();
|
||||
dialog.ShowDialog(toplevel);
|
||||
});
|
||||
|
@ -102,7 +102,7 @@ namespace SourceGit
|
|||
var toplevel = GetTopLevel() as Window;
|
||||
if (toplevel == null)
|
||||
return;
|
||||
|
||||
|
||||
var dialog = new Views.Hotkeys();
|
||||
dialog.ShowDialog(toplevel);
|
||||
});
|
||||
|
@ -112,7 +112,7 @@ namespace SourceGit
|
|||
var toplevel = GetTopLevel() as Window;
|
||||
if (toplevel == null)
|
||||
return;
|
||||
|
||||
|
||||
var dialog = new Views.About();
|
||||
dialog.ShowDialog(toplevel);
|
||||
});
|
||||
|
@ -247,7 +247,7 @@ namespace SourceGit
|
|||
var geo = Current?.FindResource(key) as StreamGeometry;
|
||||
if (geo != null)
|
||||
icon.Data = geo;
|
||||
|
||||
|
||||
return icon;
|
||||
}
|
||||
|
||||
|
@ -257,7 +257,7 @@ namespace SourceGit
|
|||
{
|
||||
return desktop.MainWindow;
|
||||
}
|
||||
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
@ -14,7 +14,8 @@ namespace SourceGit.Commands
|
|||
|
||||
public Diff(string repo, Models.DiffOption opt, int unified)
|
||||
{
|
||||
_result.TextDiff = new Models.TextDiff() {
|
||||
_result.TextDiff = new Models.TextDiff()
|
||||
{
|
||||
Repo = repo,
|
||||
Option = opt,
|
||||
};
|
||||
|
|
|
@ -38,7 +38,5 @@ namespace SourceGit.Commands
|
|||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@ namespace SourceGit.Commands
|
|||
{
|
||||
public class QueryTrackStatus : Command
|
||||
{
|
||||
public QueryTrackStatus(string repo, string local, string upstream)
|
||||
public QueryTrackStatus(string repo, string local, string upstream)
|
||||
{
|
||||
WorkingDirectory = repo;
|
||||
Context = repo;
|
||||
|
|
|
@ -106,7 +106,7 @@ namespace SourceGit.Views
|
|||
if (ShowAsDateTime)
|
||||
StopTimer();
|
||||
else
|
||||
StartTimer();
|
||||
StartTimer();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -37,9 +37,9 @@ namespace SourceGit.Views
|
|||
if (old == null)
|
||||
return true;
|
||||
|
||||
return Math.Abs(Y - old.Y) > 0.001 ||
|
||||
Math.Abs(Height - old.Height) > 0.001 ||
|
||||
StartIdx != old.StartIdx ||
|
||||
return Math.Abs(Y - old.Y) > 0.001 ||
|
||||
Math.Abs(Height - old.Height) > 0.001 ||
|
||||
StartIdx != old.StartIdx ||
|
||||
EndIdx != old.EndIdx ||
|
||||
Combined != Combined ||
|
||||
IsOldSide != IsOldSide;
|
||||
|
@ -1217,7 +1217,7 @@ namespace SourceGit.Views
|
|||
}
|
||||
}
|
||||
|
||||
private void OnDiscardChunk(object sender, RoutedEventArgs e)
|
||||
private void OnDiscardChunk(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var chunk = SelectedChunk;
|
||||
if (chunk == null)
|
||||
|
@ -1260,12 +1260,12 @@ namespace SourceGit.Views
|
|||
if (change.Index == Models.ChangeState.Added)
|
||||
{
|
||||
diff.GenerateNewPatchFromSelection(change, null, selection, true, tmpFile);
|
||||
}
|
||||
}
|
||||
else if (chunk.Combined)
|
||||
{
|
||||
var treeGuid = new Commands.QueryStagedFileBlobGuid(diff.Repo, change.Path).Result();
|
||||
diff.GeneratePatchFromSelection(change, treeGuid, selection, true, tmpFile);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var treeGuid = new Commands.QueryStagedFileBlobGuid(diff.Repo, change.Path).Result();
|
||||
|
|
Loading…
Reference in a new issue