Rough version of this working

Src/CSharpier.Cli/CommandLineFormatter.cs

@@ -65,18 +65,21 @@ CancellationToken cancellationToken
  );
 
  var printerOptions = optionsProvider.GetPrinterOptionsFor(filePath);
- printerOptions.IncludeGenerated = commandLineOptions.IncludeGenerated;
-
- await PerformFormattingSteps(
- fileToFormatInfo,
- new StdOutFormattedFileWriter(console),
- commandLineFormatterResult,
- fileIssueLogger,
- printerOptions,
- commandLineOptions,
- FormattingCacheFactory.NullCache,
- cancellationToken
- );
+ if (printerOptions is not null)
+ {
+ printerOptions.IncludeGenerated = commandLineOptions.IncludeGenerated;
+
+ await PerformFormattingSteps(
+ fileToFormatInfo,
+ new StdOutFormattedFileWriter(console),
+ commandLineFormatterResult,
+ fileIssueLogger,
+ printerOptions,
+ commandLineOptions,
+ FormattingCacheFactory.NullCache,
+ cancellationToken
+ );
+ }
  }
  }
  else
@@ -206,20 +209,23 @@ async Task FormatFile(string actualFilePath, string originalFilePath)
  }
 
  var printerOptions = optionsProvider.GetPrinterOptionsFor(actualFilePath);
- printerOptions.IncludeGenerated = commandLineOptions.IncludeGenerated;
 
- await FormatPhysicalFile(
- actualFilePath,
- originalFilePath,
- fileSystem,
- logger,
- commandLineFormatterResult,
- writer,
- commandLineOptions,
- printerOptions,
- formattingCache,
- cancellationToken
- );
+ if (printerOptions is not null)
+ {
+ printerOptions.IncludeGenerated = commandLineOptions.IncludeGenerated;
+ await FormatPhysicalFile(
+ actualFilePath,
+ originalFilePath,
+ fileSystem,
+ logger,
+ commandLineFormatterResult,
+ writer,
+ commandLineOptions,
+ printerOptions,
+ formattingCache,
+ cancellationToken
+ );
+ }
  }
 
  if (isFile)
@@ -246,7 +252,6 @@ await FormatPhysicalFile(
  "*.*",
  SearchOption.AllDirectories
  )
- .Where(o => o.EndsWithIgnoreCase(".cs") || o.EndsWithIgnoreCase(".csx"))
  .Select(o =>
  {
  var normalizedPath = o.Replace("\\", "/");

Src/CSharpier.Cli/EditorConfig/EditorConfigSections.cs

@@ -13,7 +13,8 @@ public PrinterOptions ConvertToPrinterOptions(string filePath)
  {
  var sections = this.SectionsIncludingParentFiles.Where(o => o.IsMatch(filePath)).ToList();
  var resolvedConfiguration = new ResolvedConfiguration(sections);
- var printerOptions = new PrinterOptions();
+ // TODO overrides always this?
+ var printerOptions = new PrinterOptions { Formatter = "csharp" };
 
  if (resolvedConfiguration.MaxLineLength is { } maxLineLength)
  {

Src/CSharpier.Cli/EditorConfig/Section.cs

@@ -4,15 +4,6 @@ namespace CSharpier.Cli.EditorConfig;
 
 internal class Section
 {
- private static readonly GlobMatcherOptions globOptions =
- new()
- {
- MatchBase = true,
- Dot = true,
- AllowWindowsPaths = true,
- AllowSingleBraceSets = true,
- };
-
  private readonly GlobMatcher matcher;
 
  public string? IndentStyle { get; }
@@ -23,8 +14,7 @@ internal class Section
 
  public Section(SectionData section, string directory)
  {
- var pattern = FixGlob(section.SectionName, directory);
- this.matcher = GlobMatcher.Create(pattern, globOptions);
+ this.matcher = Globber.Create(section.SectionName, directory);
  this.IndentStyle = section.Keys["indent_style"];
  this.IndentSize = section.Keys["indent_size"];
  this.TabWidth = section.Keys["tab_width"];
@@ -36,21 +26,4 @@ public bool IsMatch(string fileName)
  {
  return this.matcher.IsMatch(fileName);
  }
-
- private static string FixGlob(string glob, string directory)
- {
- glob = glob.IndexOf('/') switch
- {
- -1 => "**/" + glob,
- 0 => glob[1..],
- _ => glob
- };
- directory = directory.Replace(@"\", "/");
- if (!directory.EndsWith("/"))
- {
- directory += "/";
- }
-
- return directory + glob;
- }
 }

Src/CSharpier.Cli/Options/ConfigurationFileOptions.cs

@@ -14,7 +14,7 @@ internal class ConfigurationFileOptions
 
  public Override[] Overrides { get; init; } = [];
 
- public PrinterOptions ConvertToPrinterOptions(string filePath)
+ public PrinterOptions? ConvertToPrinterOptions(string filePath)
  {
  var matchingOverride = this.Overrides.LastOrDefault(o => o.IsMatch(filePath));
  if (matchingOverride is not null)
@@ -24,17 +24,24 @@ public PrinterOptions ConvertToPrinterOptions(string filePath)
  TabWidth = matchingOverride.TabWidth,
  UseTabs = matchingOverride.UseTabs,
  Width = matchingOverride.PrintWidth,
- EndOfLine = matchingOverride.EndOfLine
+ EndOfLine = matchingOverride.EndOfLine,
+ Formatter = matchingOverride.Formatter
  };
  }
 
- return new PrinterOptions
+ if (filePath.EndsWith(".cs") || filePath.EndsWith(".csx"))
  {
- TabWidth = this.TabWidth,
- UseTabs = this.UseTabs,
- Width = this.PrintWidth,
- EndOfLine = this.EndOfLine
- };
+ return new PrinterOptions
+ {
+ TabWidth = this.TabWidth,
+ UseTabs = this.UseTabs,
+ Width = this.PrintWidth,
+ EndOfLine = this.EndOfLine,
+ Formatter = "csharp"
+ };
+ }
+
+ return null;
  }
 
  public void Init(string directory)

Src/CSharpier.Cli/Options/OptionsProvider.cs

@@ -4,7 +4,6 @@ namespace CSharpier.Cli.Options;
 using System.Text.Json;
 using CSharpier.Cli.EditorConfig;
 using Microsoft.Extensions.Logging;
-using PrinterOptions = CSharpier.PrinterOptions;
 
 internal class OptionsProvider
 {
@@ -82,7 +81,7 @@ public static async Task<OptionsProvider> Create(
  );
  }
 
- public PrinterOptions GetPrinterOptionsFor(string filePath)
+ public PrinterOptions? GetPrinterOptionsFor(string filePath)
  {
  if (this.specifiedConfigFile is not null)
  {
@@ -110,7 +109,13 @@ public PrinterOptions GetPrinterOptionsFor(string filePath)
  return resolvedEditorConfig.ConvertToPrinterOptions(filePath);
  }
 
- return new PrinterOptions();
+ // TODO overrides I should see how prettier deals with some of this
+ if (filePath.EndsWith(".cs") || filePath.EndsWith(".csx"))
+ {
+ return new PrinterOptions { Formatter = "csharp" };
+ }
+
+ return null;
  }
 
  public bool IsIgnored(string actualFilePath)

Src/CSharpier.Cli/Server/CSharpierServiceImplementation.cs

@@ -50,7 +50,8 @@ CancellationToken cancellationToken
 
  var result = await CSharpFormatter.FormatAsync(
  formatFileParameter.fileContents,
- optionsProvider.GetPrinterOptionsFor(formatFileParameter.fileName),
+ // TODO overrides really?
+ optionsProvider.GetPrinterOptionsFor(formatFileParameter.fileName)!,
  cancellationToken
  );
 

Src/CSharpier.Tests/Cli/Options/ConfigurationFileParserTests.cs → Src/CSharpier.Tests/Cli/Options/ConfigFileParserTests.cs

@@ -5,7 +5,7 @@ namespace CSharpier.Tests.Cli.Options;
 using NUnit.Framework;
 
 [TestFixture]
-public class ConfigurationFileParserTests
+public class ConfigFileParserTests
 {
  [Test]
  public void Should_Parse_Yaml_With_Overrides()

Src/CSharpier.Tests/CommandLineFormatterTests.cs

@@ -88,13 +88,14 @@ public void Format_Writes_Unsupported()
  result
  .OutputLines.First()
  .Should()
- .Be(@"Warning ./Unsupported.js - Is an unsupported file type.");
+ .Be("Warning ./Unsupported.js - Is an unsupported file type.");
  }
 
+ [Test]
  public void Format_Writes_File_With_Directory_Path()
  {
  var context = new TestContext();
- var unformattedFilePath = $"Unformatted.cs";
+ var unformattedFilePath = "Unformatted.cs";
  context.WhenAFileExists(unformattedFilePath, UnformattedClassContent);
 
  this.Format(context);
@@ -134,6 +135,29 @@ public static void Run() { }
  );
  }
 
+ [Test]
+ public void Formats_Overrides_File()
+ {
+ var context = new TestContext();
+ var unformattedFilePath = "Unformatted.cst";
+ context.WhenAFileExists(unformattedFilePath, UnformattedClassContent);
+ context.WhenAFileExists(
+ ".csharpierrc",
+ """
+ overrides:
+ - files: "*.cst"
+ formatter: "csharp"
+ """
+ );
+
+ var result = this.Format(context);
+ result.OutputLines.First().Should().StartWith("Formatted 1 files");
+
+ context.GetFileContent(unformattedFilePath).Should().Be(FormattedClassContent);
+ }
+
+ // TODO overrides more tests?
+
  [TestCase("0.9.0", false)]
  [TestCase("9999.0.0", false)]
  [TestCase("current", true)]

Src/CSharpier.Tests/OptionsProviderTests.cs

@@ -752,7 +752,8 @@ public async Task<PrinterOptions> CreateProviderAndGetOptionsFor(
  limitEditorConfigSearch
  );
 
- return provider.GetPrinterOptionsFor(filePath);
+ // TODO overrides, ugh
+ return provider.GetPrinterOptionsFor(filePath)!;
  }
  }
 }

Src/CSharpier/CodeFormatter.cs

@@ -27,7 +27,8 @@ public static Task<CodeFormatterResult> FormatAsync(
  UseTabs = options.IndentStyle == IndentStyle.Tabs,
  TabWidth = options.IndentSize,
  EndOfLine = options.EndOfLine,
- IncludeGenerated = options.IncludeGenerated
+ IncludeGenerated = options.IncludeGenerated,
+ Formatter = "csharp"
  },
  cancellationToken
  );
@@ -56,7 +57,8 @@ public static Task<CodeFormatterResult> FormatAsync(
  Width = options.Width,
  UseTabs = options.IndentStyle == IndentStyle.Tabs,
  TabWidth = options.IndentSize,
- EndOfLine = options.EndOfLine
+ EndOfLine = options.EndOfLine,
+ Formatter = "csharp"
  },
  SourceCodeKind.Regular,
  cancellationToken

Src/CSharpier/DocTypes/Doc.cs

@@ -4,7 +4,11 @@ internal abstract class Doc
 {
  public string Print()
  {
- return DocPrinter.DocPrinter.Print(this, new PrinterOptions(), Environment.NewLine);
+ return DocPrinter.DocPrinter.Print(
+ this,
+ new PrinterOptions { Formatter = "csharp" },
+ Environment.NewLine
+ );
  }
 
  public override string ToString()

Src/CSharpier/PrinterOptions.cs

@@ -9,7 +9,10 @@ internal class PrinterOptions
  public int Width { get; set; } = 100;
  public EndOfLine EndOfLine { get; set; } = EndOfLine.Auto;
  public bool TrimInitialLines { get; init; } = true;
- public bool IncludeGenerated { get; set; } = false;
+ public bool IncludeGenerated { get; set; }
+
+ // TODO overrides require this?
+ public string Formatter { get; init; } = string.Empty;
 
  public const int WidthUsedByTests = 100;