WIP #768

belav · Nov 28, 2022 · bee5848 · bee5848
1 parent 7cea674
commit bee5848
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 2 deletions.
diff --git a/Src/CSharpier.Cli/CSharpier.Cli.csproj b/Src/CSharpier.Cli/CSharpier.Cli.csproj
@@ -16,7 +16,7 @@
  <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="13.2.29" />
  <PackageReference Include="System.IO.Hashing" Version="7.0.0-preview.7.22375.6" />
  <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
- <PackageReference Include="UTF.Unknown" Version="2.3.0" />
+ <PackageReference Include="UTF.Unknown" Version="2.5.1" />
  <PackageReference Include="YamlDotNet" Version="11.1.1" />
  </ItemGroup>
 

diff --git a/Src/CSharpier.Cli/CommandLineFormatter.cs b/Src/CSharpier.Cli/CommandLineFormatter.cs
@@ -367,6 +367,10 @@ CancellationToken cancellationToken
  if (codeFormattingResult.Errors.Any())
  {
  fileIssueLogger.WriteError("Failed to compile so was not formatted.");
+ foreach (var message in codeFormattingResult.Errors)
+ {
+ fileIssueLogger.WriteError(message.GetMessage());
+ }
  Interlocked.Increment(ref commandLineFormatterResult.FailedCompilation);
  return;
  }

diff --git a/Src/CSharpier.Cli/FileReader.cs b/Src/CSharpier.Cli/FileReader.cs
@@ -26,7 +26,21 @@ CancellationToken cancellationToken
  {
  await using var fileStream = fileSystem.File.OpenRead(filePath);
  var detectionResult = CharsetDetector.DetectFromStream(fileStream);
+ // with net6 System.Text.SBCSCodePageEncoding
  var encoding = detectionResult?.Detected?.Encoding;
+ DebugLogger.Log(filePath);
+ var message = "";
+ foreach (var detection in detectionResult.Details)
+ {
+ message +=
+ detection.EncodingName
+ + " "
+ + detection.Encoding
+ + " "
+ + detection.Confidence
+ + Environment.NewLine;
+ }
+ DebugLogger.Log(message);
  if (encoding == null)
  {
  unableToDetectEncoding = true;

diff --git a/Src/CSharpier.Tests/CSharpier.Tests.csproj b/Src/CSharpier.Tests/CSharpier.Tests.csproj
@@ -12,7 +12,7 @@
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
  <PackageReference Include="NUnit" Version="3.12.0" />
  <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
- <PackageReference Include="UTF.Unknown" Version="2.3.0" />
+ <PackageReference Include="UTF.Unknown" Version="2.5.1" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/FileEncoding_UTF8.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/FileEncoding_UTF8.cst
@@ -2,3 +2,9 @@ public class ClassName
 {
  public void MethodName() { }
 }
+
+public enum MeetingLocation
+{
+ Café,
+ Restaurant
+}
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/FileEncoding_UTF8BOM.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/FileEncoding_UTF8BOM.cst
@@ -2,3 +2,9 @@
 {
  public void MethodName() { }
 }
+
+public enum MeetingLocation
+{
+ Café,
+ Restaurant
+}