mchapman/ryujinx-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Ryujinx.Horizon] Address dotnet-format issues (#5381)

Browse Source 
* dotnet format style --severity info

Some changes were manually reverted.

* dotnet format analyzers --serverity info

Some changes have been minimally adapted.

* Restore a few unused methods and variables

* Silence dotnet format IDE0060 warnings

* Silence dotnet format IDE0052 warnings

* Address dotnet format CA1822 warnings

* Address most dotnet format whitespace warnings

* Apply dotnet format whitespace formatting

A few of them have been manually reverted and the corresponding warning was silenced

* Revert formatting changes for while and for-loops

* Run dotnet format whitespace after rebase

* Run dotnet format style after rebase

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Add comments to disabled warnings

* Remove a few unused parameters

* Simplify properties and array initialization, Use const when possible, Remove trailing commas

* Address IDE0251 warnings

* Silence IDE0060 in .editorconfig

* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"

This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.

* dotnet format whitespace after rebase

* First dotnet format pass

* Add trailing commas and fix formatting issues

* Convert if-else chain to switch block

* Address review feedback
This commit is contained in:
TSRBerry
2023-07-01 12:42:10 +02:00
committed by GitHub
parent 801b71a128
commit 02b5c7ea89
105 changed files with 617 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/Ryujinx.Horizon/LogManager/Ipc/LmLogger.cs
View File

@@ -95,74 +95,52 @@ namespace Ryujinx.Horizon.LogManager.Ipc
LogDataChunkKey key = (LogDataChunkKey)type;
if (key == LogDataChunkKey.Start)
switch (key)
{
reader.Skip(size);
continue;
}
else if (key == LogDataChunkKey.Stop)
{
break;
}
else if (key == LogDataChunkKey.Line)
{
if (!reader.TryRead<int>(out _logPacket.Line))
{
case LogDataChunkKey.Start:
reader.Skip(size);
continue;
case LogDataChunkKey.Stop:
break;
case LogDataChunkKey.Line when !reader.TryRead(out _logPacket.Line):
case LogDataChunkKey.DropCount when !reader.TryRead(out _logPacket.DropCount):
case LogDataChunkKey.Time when !reader.TryRead(out _logPacket.Time):
return true;
}
}
else if (key == LogDataChunkKey.DropCount)
{
if (!reader.TryRead<long>(out _logPacket.DropCount))
{
return true;
}
}
else if (key == LogDataChunkKey.Time)
{
if (!reader.TryRead<long>(out _logPacket.Time))
{
return true;
}
}
else if (key == LogDataChunkKey.Message)
{
string text = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
if (isHeadPacket && isTailPacket)
{
_logPacket.Message = text;
}
else
{
_logPacket.Message += text;
if (_logPacket.Message.Length >= MessageLengthLimit)
case LogDataChunkKey.Message:
{
isTailPacket = true;
string text = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
if (isHeadPacket && isTailPacket)
{
_logPacket.Message = text;
}
else
{
_logPacket.Message += text;
if (_logPacket.Message.Length >= MessageLengthLimit)
{
isTailPacket = true;
}
}
break;
}
}
}
else if (key == LogDataChunkKey.Filename)
{
_logPacket.Filename = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
}
else if (key == LogDataChunkKey.Function)
{
_logPacket.Function = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
}
else if (key == LogDataChunkKey.Module)
{
_logPacket.Module = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
}
else if (key == LogDataChunkKey.Thread)
{
_logPacket.Thread = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
}
else if (key == LogDataChunkKey.ProgramName)
{
_logPacket.ProgramName = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
case LogDataChunkKey.Filename:
_logPacket.Filename = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
break;
case LogDataChunkKey.Function:
_logPacket.Function = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
break;
case LogDataChunkKey.Module:
_logPacket.Module = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
break;
case LogDataChunkKey.Thread:
_logPacket.Thread = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
break;
case LogDataChunkKey.ProgramName:
_logPacket.ProgramName = Encoding.UTF8.GetString(reader.GetSpanSafe(size)).TrimEnd();
break;
}
}
@@ -177,7 +155,7 @@ namespace Ryujinx.Horizon.LogManager.Ipc
do
{
if (!reader.TryRead<byte>(out encoded))
if (!reader.TryRead(out encoded))
{
return false;
}
@@ -190,4 +168,4 @@ namespace Ryujinx.Horizon.LogManager.Ipc
return true;
}
}
}
}

2
src/Ryujinx.Horizon/LogManager/Ipc/LogService.cs
View File

@@ -17,4 +17,4 @@ namespace Ryujinx.Horizon.LogManager.Ipc
return Result.Success;
}
}
}
}