Timerix/paradox-mod-merger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DiffConflicts

Browse Source
This commit is contained in:
timerix
2023-03-18 05:08:12 +06:00
parent d9f14d3c11
commit 1299e83d4e
8 changed files with 354 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
diff-text/Program.cs
View File

@@ -4,60 +4,70 @@ using System.Text;
using DiffMatchPatch;
using DTLib.Filesystem;
Console.InputEncoding=Encoding.UTF8;
Console.OutputEncoding=Encoding.UTF8;
namespace diff_text;
if (args.Length != 2)
public static class DiffText
{
Console.WriteLine("usage: [file0] [file1]");
return;
}
var _diff=FileDiff(args[0], args[1]);
PrintDiff(_diff);
List<Diff> FileDiff(string file0, string file1)
{
string fileText0 = File.ReadAllText(file0);
string fileText1 = File.ReadAllText(file1);
return TextDiff(fileText0, fileText1);
}
List<Diff> TextDiff(string text0, string text1)
{
var diff = Diff.Compute(text0, text1, checklines:true);
diff.CleanupSemantic();
return diff;
}
void PrintDiff(List<Diff> diff, bool ignoreWhitespaces=false)
{
foreach (var d in diff)
internal static void Main(string[] args)
{
bool whitespaceOnly = d.WhitespaceOnlyDiff;
if(ignoreWhitespaces && whitespaceOnly)
continue;
switch(d.Operation)
Console.InputEncoding = Encoding.UTF8;
Console.OutputEncoding = Encoding.UTF8;
if (args.Length != 2)
{
case Operation.Delete:
Console.BackgroundColor = ConsoleColor.DarkRed;
Console.ForegroundColor = ConsoleColor.Black;
Console.Write(whitespaceOnly ? d.FormattedText : d.Text);
Console.ResetColor();
break;
case Operation.Insert:
Console.BackgroundColor = ConsoleColor.DarkGreen;
Console.ForegroundColor = ConsoleColor.Black;
Console.Write(whitespaceOnly ? d.FormattedText : d.Text);
Console.ResetColor();
break;
case Operation.Equal:
Console.Write(d.Text);
break;
default:
throw new ArgumentOutOfRangeException(d.Operation.ToString());
Console.WriteLine("usage: [file0] [file1]");
return;
}
var _diff = FileDiff(args[0], args[1]);
PrintDiff(_diff);
}
public static List<Diff> FileDiff(string file0, string file1)
{
string fileText0 = File.ReadAllText(file0);
string fileText1 = File.ReadAllText(file1);
return TextDiff(fileText0, fileText1);
}
public static List<Diff> TextDiff(string text0, string text1)
{
var diff = Diff.Compute(text0, text1, checklines: true);
diff.CleanupSemantic();
return diff;
}
public static void PrintDiff(List<Diff> diff, bool ignoreWhitespaces = false)
{
Console.ResetColor();
foreach (var d in diff)
{
bool whitespaceOnly = d.WhitespaceOnlyDiff;
if (ignoreWhitespaces && whitespaceOnly)
continue;
string text;
switch (d.Operation)
{
case Operation.Delete:
Console.BackgroundColor = ConsoleColor.DarkRed;
Console.ForegroundColor = ConsoleColor.Black;
text = whitespaceOnly ? d.FormattedText : d.Text;
break;
case Operation.Insert:
Console.BackgroundColor = ConsoleColor.DarkGreen;
Console.ForegroundColor = ConsoleColor.Black;
text = whitespaceOnly ? d.FormattedText : d.Text;
break;
case Operation.Equal:
text = d.Text;
break;
default:
throw new ArgumentOutOfRangeException(d.Operation.ToString());
}
Console.Write(text);
Console.ResetColor();
}
}
}

2
diff-text/diff-text.csproj
View File

@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="google-diff-match-patch" Version="1.3.70" />
<PackageReference Include="google-diff-match-patch" Version="1.3.74" />
</ItemGroup>
<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
<ProjectReference Include="..\..\DTLib\DTLib\DTLib.csproj" />