RazorCodeGenerationOptions: Remove FileKind

This property is unused and it is less error-prone to only define it in a single place, i.e. RazorParserOptions.

Author: DustinCampbell

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineBuilderExtensionsTest.cs

@@ -121,7 +121,7 @@ public void SetCSharpLanguageVersion_ResolvesLatestCSharpLangVersions()
         });
 
         var features = projectEngine.Engine.GetFeatures<IConfigureRazorCodeGenerationOptionsFeature>().OrderByAsArray(static x => x.Order);
-        var builder = new RazorCodeGenerationOptions.Builder(RazorLanguageVersion.Latest, FileKinds.Legacy);
+        var builder = new RazorCodeGenerationOptions.Builder(RazorLanguageVersion.Latest);
 
         foreach (var feature in features)
         {

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/RazorCodeGenerationOptions.Builder.cs

@@ -8,7 +8,6 @@ public sealed partial class RazorCodeGenerationOptions
     public sealed class Builder
     {
         public RazorLanguageVersion LanguageVersion { get; }
-        public string FileKind { get; }
 
         private Flags _flags;
 
@@ -25,10 +24,9 @@ public sealed class Builder
         /// </summary>
         public string? SuppressUniqueIds { get; set; }
 
-        internal Builder(RazorLanguageVersion languageVersion, string fileKind)
+        internal Builder(RazorLanguageVersion languageVersion)
         {
             LanguageVersion = languageVersion ?? DefaultLanguageVersion;
-            FileKind = fileKind ?? DefaultFileKind;
             IndentSize = DefaultIndentSize;
             NewLine = DefaultNewLine;
         }
@@ -159,6 +157,6 @@ public bool RemapLinePragmaPathsOnWindows
         }
 
         public RazorCodeGenerationOptions ToOptions()
-            => new(LanguageVersion, FileKind, IndentSize, NewLine, RootNamespace, SuppressUniqueIds, _flags);
+            => new(LanguageVersion, IndentSize, NewLine, RootNamespace, SuppressUniqueIds, _flags);
     }
 }

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/RazorCodeGenerationOptions.cs

@@ -9,13 +9,11 @@ namespace Microsoft.AspNetCore.Razor.Language;
 public sealed partial class RazorCodeGenerationOptions
 {
     private static RazorLanguageVersion DefaultLanguageVersion => RazorLanguageVersion.Latest;
-    private static string DefaultFileKind => FileKinds.Legacy;
     private static int DefaultIndentSize => 4;
     private static string DefaultNewLine => Environment.NewLine;
 
     public static RazorCodeGenerationOptions Default { get; } = new(
         languageVersion: DefaultLanguageVersion,
-        fileKind: DefaultFileKind,
         indentSize: DefaultIndentSize,
         newLine: DefaultNewLine,
         rootNamespace: null,
@@ -24,15 +22,13 @@ public sealed partial class RazorCodeGenerationOptions
 
     public static RazorCodeGenerationOptions DesignTimeDefault { get; } = new(
         languageVersion: DefaultLanguageVersion,
-        fileKind: DefaultFileKind,
         indentSize: DefaultIndentSize,
         newLine: DefaultNewLine,
         rootNamespace: null,
         suppressUniqueIds: null,
         flags: Flags.DefaultDesignTimeFlags);
 
     public RazorLanguageVersion LanguageVersion { get; }
-    internal string FileKind { get; }
 
     public int IndentSize { get; }
     public string NewLine { get; }
@@ -51,15 +47,13 @@ public sealed partial class RazorCodeGenerationOptions
 
     private RazorCodeGenerationOptions(
         RazorLanguageVersion languageVersion,
-        string fileKind,
         int indentSize,
         string newLine,
         string? rootNamespace,
         string? suppressUniqueIds,
         Flags flags)
     {
         LanguageVersion = languageVersion ?? DefaultLanguageVersion;
-        FileKind = fileKind ?? DefaultFileKind;
         IndentSize = indentSize;
         NewLine = newLine;
         RootNamespace = rootNamespace;
@@ -159,22 +153,22 @@ public bool RemapLinePragmaPathsOnWindows
     public RazorCodeGenerationOptions WithIndentSize(int value)
         => IndentSize == value
             ? this
-            : new(LanguageVersion, FileKind, value, NewLine, RootNamespace, SuppressUniqueIds, _flags);
+            : new(LanguageVersion, value, NewLine, RootNamespace, SuppressUniqueIds, _flags);
 
     public RazorCodeGenerationOptions WithNewLine(string value)
         => NewLine == value
             ? this
-            : new(LanguageVersion, FileKind, IndentSize, value, RootNamespace, SuppressUniqueIds, _flags);
+            : new(LanguageVersion, IndentSize, value, RootNamespace, SuppressUniqueIds, _flags);
 
     public RazorCodeGenerationOptions WithRootNamespace(string? value)
         => RootNamespace == value
             ? this
-            : new(LanguageVersion, FileKind, IndentSize, NewLine, value, SuppressUniqueIds, _flags);
+            : new(LanguageVersion, IndentSize, NewLine, value, SuppressUniqueIds, _flags);
 
     public RazorCodeGenerationOptions WithSuppressUniqueIds(string? value)
         => RootNamespace == value
             ? this
-            : new(LanguageVersion, FileKind, IndentSize, NewLine, RootNamespace, value, _flags);
+            : new(LanguageVersion, IndentSize, NewLine, RootNamespace, value, _flags);
 
     public RazorCodeGenerationOptions WithFlags(
         Optional<bool> designTime = default,
@@ -254,6 +248,6 @@ public RazorCodeGenerationOptions WithFlags(
 
         return flags == _flags
             ? this
-            : new(LanguageVersion, FileKind, IndentSize, NewLine, RootNamespace, SuppressUniqueIds, flags);
+            : new(LanguageVersion, IndentSize, NewLine, RootNamespace, SuppressUniqueIds, flags);
     }
 }

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/RazorProjectEngine.cs

@@ -191,7 +191,7 @@ private RazorCodeDocument CreateCodeDocumentCore(
         Action<RazorCodeGenerationOptions.Builder>? configureCodeGeneration)
     {
         var parserOptions = ComputeParserOptions(fileKind, configureParser);
-        var codeGenerationOptions = ComputeCodeGenerationOptions(fileKind, configureCodeGeneration);
+        var codeGenerationOptions = ComputeCodeGenerationOptions(configureCodeGeneration);
 
         var codeDocument = RazorCodeDocument.Create(source, importSources, parserOptions, codeGenerationOptions);
 
@@ -233,7 +233,7 @@ private RazorCodeDocument CreateCodeDocumentDesignTimeCore(
             configureParser?.Invoke(builder);
         });
 
-        var codeGenerationOptions = ComputeCodeGenerationOptions(fileKind, builder =>
+        var codeGenerationOptions = ComputeCodeGenerationOptions(builder =>
         {
             builder.DesignTime = true;
             builder.SuppressChecksum = true;
@@ -263,10 +263,10 @@ private RazorParserOptions ComputeParserOptions(string fileKind, Action<RazorPar
         return builder.ToOptions();
     }
 
-    private RazorCodeGenerationOptions ComputeCodeGenerationOptions(string fileKind, Action<RazorCodeGenerationOptions.Builder>? configure)
+    private RazorCodeGenerationOptions ComputeCodeGenerationOptions(Action<RazorCodeGenerationOptions.Builder>? configure)
     {
         var configuration = Configuration;
-        var builder = new RazorCodeGenerationOptions.Builder(configuration.LanguageVersion, fileKind)
+        var builder = new RazorCodeGenerationOptions.Builder(configuration.LanguageVersion)
         {
             SuppressAddComponentParameter = configuration.SuppressAddComponentParameter
         };