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 defined in .editorconfig
This commit is contained in:
parent
1bb4d55a5c
commit
7b5534a267
2 changed files with 5 additions and 8 deletions
|
@ -1,7 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using SourceGit.Models;
|
|
||||||
|
|
||||||
namespace SourceGit.Commands
|
namespace SourceGit.Commands
|
||||||
{
|
{
|
||||||
|
@ -49,16 +48,14 @@ namespace SourceGit.Commands
|
||||||
{
|
{
|
||||||
if (line.StartsWith("old mode ", StringComparison.Ordinal))
|
if (line.StartsWith("old mode ", StringComparison.Ordinal))
|
||||||
{
|
{
|
||||||
_result.FileModeDiff ??= new FileModeDiff();
|
_result.FileModeDiff ??= new Models.FileModeDiff();
|
||||||
|
|
||||||
_result.FileModeDiff.Old = line.Substring(9);
|
_result.FileModeDiff.Old = line.Substring(9);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (line.StartsWith("new mode ", StringComparison.Ordinal))
|
if (line.StartsWith("new mode ", StringComparison.Ordinal))
|
||||||
{
|
{
|
||||||
_result.FileModeDiff ??= new FileModeDiff();
|
_result.FileModeDiff ??= new Models.FileModeDiff();
|
||||||
|
|
||||||
_result.FileModeDiff.New = line.Substring(9);
|
_result.FileModeDiff.New = line.Substring(9);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -531,7 +531,7 @@ namespace SourceGit.ViewModels
|
||||||
UseTheirs(changes);
|
UseTheirs(changes);
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
var useMine = new MenuItem();
|
var useMine = new MenuItem();
|
||||||
useMine.Icon = App.CreateMenuIcon("Icons.Local");
|
useMine.Icon = App.CreateMenuIcon("Icons.Local");
|
||||||
useMine.Header = App.Text("FileCM.UseMine");
|
useMine.Header = App.Text("FileCM.UseMine");
|
||||||
|
@ -641,7 +641,7 @@ namespace SourceGit.ViewModels
|
||||||
menu.Items.Add(assumeUnchanged);
|
menu.Items.Add(assumeUnchanged);
|
||||||
menu.Items.Add(new MenuItem() { Header = "-" });
|
menu.Items.Add(new MenuItem() { Header = "-" });
|
||||||
}
|
}
|
||||||
|
|
||||||
var copy = new MenuItem();
|
var copy = new MenuItem();
|
||||||
copy.Header = App.Text("CopyPath");
|
copy.Header = App.Text("CopyPath");
|
||||||
copy.Icon = App.CreateMenuIcon("Icons.Copy");
|
copy.Icon = App.CreateMenuIcon("Icons.Copy");
|
||||||
|
@ -649,7 +649,7 @@ namespace SourceGit.ViewModels
|
||||||
{
|
{
|
||||||
App.CopyText(change.Path);
|
App.CopyText(change.Path);
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
};
|
};
|
||||||
menu.Items.Add(copy);
|
menu.Items.Add(copy);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue