diff --git a/src/Docfx.Build.Common/ModelAttributeHandlers/ReflectionHelper.cs b/src/Docfx.Build.Common/ModelAttributeHandlers/ReflectionHelper.cs index 41667a65bbb..1a04794eccc 100644 --- a/src/Docfx.Build.Common/ModelAttributeHandlers/ReflectionHelper.cs +++ b/src/Docfx.Build.Common/ModelAttributeHandlers/ReflectionHelper.cs @@ -36,7 +36,7 @@ public static object CreateInstance(Type type, Type[] typeArguments, Type[] argu ArgumentNullException.ThrowIfNull(arguments); var func = _createInstanceCache.GetOrAdd( - Tuple.Create(type, typeArguments ?? Type.EmptyTypes, argumentTypes), + Tuple.Create(type, typeArguments ?? [], argumentTypes), GetCreateInstanceFunc); return func(arguments); } @@ -150,7 +150,7 @@ public static IEnumerable GetPublicProperties(Type type) { if (!type.IsVisible) { - return Enumerable.Empty(); + return []; } return GetProperties(type, BindingFlags.Public | BindingFlags.Instance); } diff --git a/src/Docfx.Build.Common/Reference/OverwriteDocumentModel.cs b/src/Docfx.Build.Common/Reference/OverwriteDocumentModel.cs index 7d412822293..8ac8f568cbb 100644 --- a/src/Docfx.Build.Common/Reference/OverwriteDocumentModel.cs +++ b/src/Docfx.Build.Common/Reference/OverwriteDocumentModel.cs @@ -81,7 +81,7 @@ public class OverwriteDocumentModel [YamlIgnore] [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] - public ImmutableArray Dependency { get; set; } = ImmutableArray.Empty; + public ImmutableArray Dependency { get; set; } = []; public T ConvertTo() where T : class { diff --git a/src/Docfx.Build.Common/YamlHtmlPart.cs b/src/Docfx.Build.Common/YamlHtmlPart.cs index cfc5d680e56..62e6649e4fb 100644 --- a/src/Docfx.Build.Common/YamlHtmlPart.cs +++ b/src/Docfx.Build.Common/YamlHtmlPart.cs @@ -21,9 +21,9 @@ public class YamlHtmlPart public int EndLine { get; set; } - public ImmutableArray LinkToFiles { get; set; } = ImmutableArray.Empty; + public ImmutableArray LinkToFiles { get; set; } = []; - public ImmutableHashSet LinkToUids { get; set; } = ImmutableHashSet.Empty; + public ImmutableHashSet LinkToUids { get; set; } = []; public ImmutableDictionary YamlHeader { get; set; } = ImmutableDictionary.Empty; diff --git a/src/Docfx.Build/DocumentBuildContext.cs b/src/Docfx.Build/DocumentBuildContext.cs index ba2d30408d6..3bdff81d6e8 100644 --- a/src/Docfx.Build/DocumentBuildContext.cs +++ b/src/Docfx.Build/DocumentBuildContext.cs @@ -55,7 +55,7 @@ from u in parameters.XRefMaps #region Constructors that used by test code. internal DocumentBuildContext(string buildOutputFolder) - : this(buildOutputFolder, Enumerable.Empty(), ImmutableArray.Empty, ImmutableArray.Empty, 1, Directory.GetCurrentDirectory(), string.Empty, null, null) { } + : this(buildOutputFolder, [], [], [], 1, Directory.GetCurrentDirectory(), string.Empty, null, null) { } private DocumentBuildContext(string buildOutputFolder, IEnumerable allSourceFiles, ImmutableArray externalReferencePackages, ImmutableArray xrefMaps, int maxParallelism, string baseFolder, string versionName, ApplyTemplateSettings applyTemplateSetting, string rootTocPath) : this(buildOutputFolder, allSourceFiles, externalReferencePackages, xrefMaps, maxParallelism, baseFolder, versionName, applyTemplateSetting, rootTocPath, null, null) { } @@ -114,7 +114,7 @@ from u in xrefMaps public ApplyTemplateSettings ApplyTemplateSettings { get; set; } - public ImmutableArray ExternalReferencePackages { get; } = ImmutableArray.Empty; + public ImmutableArray ExternalReferencePackages { get; } = []; public ImmutableDictionary AllSourceFiles { get; } diff --git a/src/Docfx.Build/DocumentBuildParameters.cs b/src/Docfx.Build/DocumentBuildParameters.cs index 84a1a33b355..2356909b93e 100644 --- a/src/Docfx.Build/DocumentBuildParameters.cs +++ b/src/Docfx.Build/DocumentBuildParameters.cs @@ -13,13 +13,13 @@ public class DocumentBuildParameters public string OutputBaseDir { get; set; } - public ImmutableArray XRefMaps { get; set; } = ImmutableArray.Empty; + public ImmutableArray XRefMaps { get; set; } = []; public ImmutableDictionary Metadata { get; set; } = ImmutableDictionary.Empty; public FileMetadata FileMetadata { get; set; } - public ImmutableArray PostProcessors { get; set; } = ImmutableArray.Empty; + public ImmutableArray PostProcessors { get; set; } = []; public TemplateManager TemplateManager { get; set; } diff --git a/src/Docfx.Build/ResourceFiles/ResourceDocumentProcessor.cs b/src/Docfx.Build/ResourceFiles/ResourceDocumentProcessor.cs index 683d7044e3c..f3d5d736fd6 100644 --- a/src/Docfx.Build/ResourceFiles/ResourceDocumentProcessor.cs +++ b/src/Docfx.Build/ResourceFiles/ResourceDocumentProcessor.cs @@ -43,7 +43,7 @@ public override FileModel Load(FileAndType file, ImmutableDictionary()) { - Uids = ImmutableArray.Empty, + Uids = [], LocalPathFromRoot = PathUtility.MakeRelativePath( EnvironmentContext.BaseDirectory, EnvironmentContext.FileAbstractLayer.GetPhysicalPath(file.File)), diff --git a/src/Docfx.Common/CompositeDictionary.cs b/src/Docfx.Common/CompositeDictionary.cs index 9077f5fdfa2..5415854b216 100644 --- a/src/Docfx.Common/CompositeDictionary.cs +++ b/src/Docfx.Common/CompositeDictionary.cs @@ -13,7 +13,7 @@ public class CompositeDictionary public CompositeDictionary() { - _entries = ImmutableArray.Empty; + _entries = []; } private CompositeDictionary(ImmutableArray entries) diff --git a/src/Docfx.Dotnet/SymbolFormatter.Symbols.cs b/src/Docfx.Dotnet/SymbolFormatter.Symbols.cs index 21144613837..35024286f7a 100644 --- a/src/Docfx.Dotnet/SymbolFormatter.Symbols.cs +++ b/src/Docfx.Dotnet/SymbolFormatter.Symbols.cs @@ -36,9 +36,9 @@ private class ParameterSymbol : IParameterSymbol public NullableAnnotation NullableAnnotation => default; - public ImmutableArray CustomModifiers => ImmutableArray.Empty; + public ImmutableArray CustomModifiers => []; - public ImmutableArray RefCustomModifiers => ImmutableArray.Empty; + public ImmutableArray RefCustomModifiers => []; public int Ordinal => 0; diff --git a/src/Docfx.Dotnet/SymbolFormatter.Syntax.cs b/src/Docfx.Dotnet/SymbolFormatter.Syntax.cs index d7929ea7e06..737ab8e086d 100644 --- a/src/Docfx.Dotnet/SymbolFormatter.Syntax.cs +++ b/src/Docfx.Dotnet/SymbolFormatter.Syntax.cs @@ -181,7 +181,7 @@ private void AddModifiersIfNeeded(ISymbol symbol) private ImmutableArray RemoveNamedTypeConstraints(ISymbol symbol) { if (symbol.Kind is not SymbolKind.NamedType) - return ImmutableArray.Empty; + return []; var result = ImmutableArray.CreateBuilder(); @@ -524,7 +524,7 @@ private ImmutableArray GetDisplayParts(ISymbol symbol, Symbol } catch { - return ImmutableArray.Empty; + return []; } } } diff --git a/src/Docfx.Dotnet/SymbolFormatter.cs b/src/Docfx.Dotnet/SymbolFormatter.cs index 514031f94fa..bc20ed4c83e 100644 --- a/src/Docfx.Dotnet/SymbolFormatter.cs +++ b/src/Docfx.Dotnet/SymbolFormatter.cs @@ -108,7 +108,7 @@ public static ImmutableArray GetSyntaxParts(ISymbol symbol, S } catch (InvalidOperationException) { - return ImmutableArray.Empty; + return []; } } @@ -168,7 +168,7 @@ private static ImmutableArray GetDisplayParts( } catch { - return ImmutableArray.Empty; + return []; } static ImmutableArray GetCastOperatorOverloadDisplayParts(ImmutableArray parts) diff --git a/src/Docfx.Plugins/FileModel.cs b/src/Docfx.Plugins/FileModel.cs index ef1131c8616..7cfdb3c6369 100644 --- a/src/Docfx.Plugins/FileModel.cs +++ b/src/Docfx.Plugins/FileModel.cs @@ -85,5 +85,5 @@ public string File public string DocumentType { get; set; } - public ImmutableArray Uids { get; set; } = ImmutableArray.Empty; + public ImmutableArray Uids { get; set; } = []; } diff --git a/src/Docfx.Plugins/MarkupResult.cs b/src/Docfx.Plugins/MarkupResult.cs index d2772b65560..3715d4a8d23 100644 --- a/src/Docfx.Plugins/MarkupResult.cs +++ b/src/Docfx.Plugins/MarkupResult.cs @@ -9,9 +9,9 @@ public class MarkupResult { public string Html { get; set; } public ImmutableDictionary YamlHeader { get; set; } = ImmutableDictionary.Empty; - public ImmutableArray LinkToFiles { get; set; } = ImmutableArray.Empty; - public ImmutableHashSet LinkToUids { get; set; } = ImmutableHashSet.Empty; - public ImmutableArray Dependency { get; set; } = ImmutableArray.Empty; + public ImmutableArray LinkToFiles { get; set; } = []; + public ImmutableHashSet LinkToUids { get; set; } = []; + public ImmutableArray Dependency { get; set; } = []; public ImmutableDictionary> UidLinkSources { get; set; } = ImmutableDictionary>.Empty; public ImmutableDictionary> FileLinkSources { get; set; } = ImmutableDictionary>.Empty; diff --git a/src/Docfx.Plugins/SaveResult.cs b/src/Docfx.Plugins/SaveResult.cs index 93d9a5b8283..ae1b7083b26 100644 --- a/src/Docfx.Plugins/SaveResult.cs +++ b/src/Docfx.Plugins/SaveResult.cs @@ -10,10 +10,10 @@ public class SaveResult public string DocumentType { get; set; } public string FileWithoutExtension { get; set; } public string ResourceFile { get; set; } - public ImmutableHashSet LinkToUids { get; set; } = ImmutableHashSet.Empty; - public ImmutableArray LinkToFiles { get; set; } = ImmutableArray.Empty; - public ImmutableArray XRefSpecs { get; set; } = ImmutableArray.Empty; - public ImmutableArray ExternalXRefSpecs { get; set; } = ImmutableArray.Empty; + public ImmutableHashSet LinkToUids { get; set; } = []; + public ImmutableArray LinkToFiles { get; set; } = []; + public ImmutableArray XRefSpecs { get; set; } = []; + public ImmutableArray ExternalXRefSpecs { get; set; } = []; public ImmutableDictionary> UidLinkSources { get; set; } = ImmutableDictionary>.Empty; public ImmutableDictionary> FileLinkSources { get; set; } = ImmutableDictionary>.Empty; } diff --git a/test/Docfx.Build.ManagedReference.Tests/ManagedReferenceDocumentProcessorTest.cs b/test/Docfx.Build.ManagedReference.Tests/ManagedReferenceDocumentProcessorTest.cs index 2e2aee978c5..61db56b0608 100644 --- a/test/Docfx.Build.ManagedReference.Tests/ManagedReferenceDocumentProcessorTest.cs +++ b/test/Docfx.Build.ManagedReference.Tests/ManagedReferenceDocumentProcessorTest.cs @@ -30,14 +30,14 @@ public ManagedReferenceDocumentProcessorTest() _outputFolder = GetRandomFolder(); string inputFolder = GetRandomFolder(); _defaultFiles = new FileCollection(Directory.GetCurrentDirectory()); - _defaultFiles.Add(DocumentType.Article, new[] { "TestData/mref/CatLibrary.Cat-2.yml" }, "TestData/"); + _defaultFiles.Add(DocumentType.Article, ["TestData/mref/CatLibrary.Cat-2.yml"], "TestData/"); _applyTemplateSettings = new ApplyTemplateSettings(inputFolder, _outputFolder) { RawModelExportSettings = { Export = true }, TransformDocument = true, }; - _templateManager = new TemplateManager(new List { "template" }, null, "TestData/"); + _templateManager = new TemplateManager(["template"], null, "TestData/"); } [Fact] @@ -93,7 +93,7 @@ public void ProcessMrefWithComplexFileNameShouldSucceed() { FileCollection files = new(_defaultFiles); files.RemoveAll(s => true); - files.Add(DocumentType.Article, new string[] { "TestData/mref/Namespace1.Class1`2.yml", "TestData/mref/Namespace1.Class1`2.#ctor.yml" }, "TestData/"); + files.Add(DocumentType.Article, ["TestData/mref/Namespace1.Class1`2.yml", "TestData/mref/Namespace1.Class1`2.#ctor.yml"], "TestData/"); BuildDocument(files); var outputRawModelPath = GetRawModelFilePath("Namespace1.Class1`2.yml"); @@ -129,7 +129,7 @@ public void ProcessMrefWithXRefMapShouldSucceed() public void ProcessMrefWithDefaultOverwriteShouldSucceed() { FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/mref.overwrite.default.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/mref.overwrite.default.md"]); BuildDocument(files); { var outputRawModelPath = GetRawModelFilePath("CatLibrary.Cat-2.yml"); @@ -144,7 +144,7 @@ public void ProcessMrefWithDefaultOverwriteShouldSucceed() public void ProcessMrefWithSimpleOverwriteShouldSucceed() { FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/mref.overwrite.simple.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/mref.overwrite.simple.md"]); BuildDocument(files); var outputRawModelPath = GetRawModelFilePath("CatLibrary.Cat-2.yml"); Assert.True(File.Exists(outputRawModelPath)); @@ -157,7 +157,7 @@ public void ProcessMrefWithSimpleOverwriteShouldSucceed() public void ProcessMrefWithParametersOverwriteShouldSucceed() { var files = new FileCollection(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/mref.overwrite.parameters.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/mref.overwrite.parameters.md"]); BuildDocument(files); var outputRawModelPath = GetRawModelFilePath("CatLibrary.Cat-2.yml"); Assert.True(File.Exists(outputRawModelPath)); @@ -176,7 +176,7 @@ public void ProcessMrefWithParametersOverwriteShouldSucceed() public void ProcessMrefWithNotPredefinedOverwriteShouldSucceed() { FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/mref.overwrite.not.predefined.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/mref.overwrite.not.predefined.md"]); BuildDocument(files); { var outputRawModelPath = GetRawModelFilePath("CatLibrary.Cat-2.yml"); @@ -193,7 +193,7 @@ public void ProcessMrefWithDynamicDevLangsShouldSucceed() { FileCollection files = new(_defaultFiles); files.RemoveAll(s => true); - files.Add(DocumentType.Article, new[] { "TestData/mref/System.String.yml" }, "TestData/"); + files.Add(DocumentType.Article, ["TestData/mref/System.String.yml"], "TestData/"); BuildDocument(files); @@ -214,8 +214,8 @@ public void ProcessMrefWithDynamicDevLangsShouldSucceed() public void ProcessMrefWithInvalidCrossReferenceShouldWarn() { var files = new FileCollection(Directory.GetCurrentDirectory()); - files.Add(DocumentType.Article, new[] { "TestData/mref/System.String.yml" }, "TestData/"); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/mref.overwrite.invalid.ref.md" }); + files.Add(DocumentType.Article, ["TestData/mref/System.String.yml"], "TestData/"); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/mref.overwrite.invalid.ref.md"]); using var listener = new TestListenerScope(LogLevel.Info); @@ -238,7 +238,7 @@ public void ProcessMrefWithInvalidCrossReferenceShouldWarn() public void ProcessMrefWithInvalidOverwriteShouldFail() { FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/mref.overwrite.invalid.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/mref.overwrite.invalid.md"]); Assert.Throws(() => BuildDocument(files)); } @@ -246,7 +246,7 @@ public void ProcessMrefWithInvalidOverwriteShouldFail() public void ProcessMrefWithRemarksOverwriteShouldSucceed() { var files = new FileCollection(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/mref.overwrite.remarks.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/mref.overwrite.remarks.md"]); BuildDocument(files); { var outputRawModelPath = GetRawModelFilePath("CatLibrary.Cat-2.yml"); @@ -261,7 +261,7 @@ public void ProcessMrefWithRemarksOverwriteShouldSucceed() public void ProcessMrefWithMultiUidOverwriteShouldSucceed() { var files = new FileCollection(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/mref.overwrite.multi.uid.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/mref.overwrite.multi.uid.md"]); BuildDocument(files); { var outputRawModelPath = GetRawModelFilePath("CatLibrary.Cat-2.yml"); @@ -323,7 +323,7 @@ private void BuildDocument(FileCollection files) TemplateManager = _templateManager }; - using var builder = new DocumentBuilder(LoadAssemblies(), ImmutableArray.Empty); + using var builder = new DocumentBuilder(LoadAssemblies(), []); builder.Build(parameters); } diff --git a/test/Docfx.Build.RestApi.Tests/RestApiDocumentProcessorTest.cs b/test/Docfx.Build.RestApi.Tests/RestApiDocumentProcessorTest.cs index be4f94df864..b4bd7927a0a 100644 --- a/test/Docfx.Build.RestApi.Tests/RestApiDocumentProcessorTest.cs +++ b/test/Docfx.Build.RestApi.Tests/RestApiDocumentProcessorTest.cs @@ -154,7 +154,7 @@ public void ProcessSwaggerWithExternalReferenceShouldSucceed() public void ProcessSwaggerWithExternalEmbeddedReferenceShouldSucceed() { var files = new FileCollection(Directory.GetCurrentDirectory()); - files.Add(DocumentType.Article, new[] { "TestData/swagger/contactsForExternalRef.json" }, "TestData/"); + files.Add(DocumentType.Article, ["TestData/swagger/contactsForExternalRef.json"], "TestData/"); BuildDocument(files); var outputRawModelPath = GetRawModelFilePath("contactsForExternalRef.json"); @@ -188,7 +188,7 @@ public void ProcessSwaggerWithNotExistedExternalReferenceShouldFail() public void ProcessSwaggerWithExternalReferenceHasRefInsideShouldFail() { var files = new FileCollection(Directory.GetCurrentDirectory()); - files.Add(DocumentType.Article, new[] { "TestData/swagger/externalRefWithRefInside.json" }, "TestData/"); + files.Add(DocumentType.Article, ["TestData/swagger/externalRefWithRefInside.json"], "TestData/"); var listener = TestLoggerListener.CreateLoggerListenerWithCodeFilter("InvalidInputFile"); Logger.RegisterListener(listener); @@ -227,7 +227,7 @@ public void ProcessSwaggerWithXRefMapShouldSucceed() public void ProcessSwaggerWithTagsOverwriteShouldSucceed() { FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/rest.overwrite.tags.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/rest.overwrite.tags.md"]); BuildDocument(files); { @@ -247,7 +247,7 @@ public void ProcessSwaggerWithTagsOverwriteShouldSucceed() public void ProcessSwaggerWithDefaultOverwriteShouldSucceed() { FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/rest.overwrite.default.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/rest.overwrite.default.md"]); BuildDocument(files); { @@ -278,9 +278,9 @@ public void ProcessSwaggerWithInvalidLinksOverwriteShouldSucceedWithWarning() using var listener = new TestListenerScope(); var files = new FileCollection(_defaultFiles); - files.Add(DocumentType.Article, new[] { "TestData/swagger/tag_swagger2.json" }, "TestData/"); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/rest.overwrite.invalid.links.first.md" }); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/rest.overwrite.invalid.links.second.md" }); + files.Add(DocumentType.Article, ["TestData/swagger/tag_swagger2.json"], "TestData/"); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/rest.overwrite.invalid.links.first.md"]); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/rest.overwrite.invalid.links.second.md"]); BuildDocument(files); Assert.Equal(7, listener.Items.Count); // Additional warning for "There is no template processing document type(s): RestApi" @@ -322,7 +322,7 @@ public void ProcessSwaggerWithInvalidLinksOverwriteShouldSucceedWithWarning() public void ProcessSwaggerWithParametersOverwriteShouldSucceed() { var files = new FileCollection(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/rest.overwrite.parameters.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/rest.overwrite.parameters.md"]); BuildDocument(files); var outputRawModelPath = GetRawModelFilePath("contacts.json"); Assert.True(File.Exists(outputRawModelPath)); @@ -364,7 +364,7 @@ public void ProcessSwaggerWithParametersOverwriteShouldSucceed() public void ProcessSwaggerWithNotPredefinedOverwriteShouldSucceed() { FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/rest.overwrite.not.predefined.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/rest.overwrite.not.predefined.md"]); BuildDocument(files); { var outputRawModelPath = GetRawModelFilePath("contacts.json"); @@ -387,7 +387,7 @@ public void ProcessSwaggerWithInvalidOverwriteShouldFail() public void ProcessSwaggerWithUnmergeableOverwriteShouldSucceed() { FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/rest.overwrite.unmergeable.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/rest.overwrite.unmergeable.md"]); BuildDocument(files); { var outputRawModelPath = GetRawModelFilePath("contacts.json"); @@ -401,7 +401,7 @@ public void ProcessSwaggerWithUnmergeableOverwriteShouldSucceed() public void ProcessSwaggerWithRemarksOverwriteShouldSucceed() { var files = new FileCollection(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/rest.overwrite.remarks.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/rest.overwrite.remarks.md"]); BuildDocument(files); { var outputRawModelPath = GetRawModelFilePath("contacts.json"); @@ -415,8 +415,8 @@ public void ProcessSwaggerWithRemarksOverwriteShouldSucceed() public void ProcessSwaggerWithMultiUidOverwriteShouldSucceed() { var files = new FileCollection(_defaultFiles); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/rest.overwrite.multi.uid.md" }); - files.Add(DocumentType.Overwrite, new[] { "TestData/overwrite/rest.overwrite.unmergeable.md" }); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/rest.overwrite.multi.uid.md"]); + files.Add(DocumentType.Overwrite, ["TestData/overwrite/rest.overwrite.unmergeable.md"]); BuildDocument(files); { var outputRawModelPath = GetRawModelFilePath("contacts.json"); @@ -460,7 +460,7 @@ private void BuildDocument(FileCollection files) }.ToImmutableDictionary() }; - using var builder = new DocumentBuilder(LoadAssemblies(), ImmutableArray.Empty); + using var builder = new DocumentBuilder(LoadAssemblies(), []); builder.Build(parameters); } diff --git a/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToOperationLevelTest.cs b/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToOperationLevelTest.cs index 1e0dd40bc2e..4f9f8656300 100644 --- a/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToOperationLevelTest.cs +++ b/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToOperationLevelTest.cs @@ -242,7 +242,7 @@ private void BuildDocument(FileCollection files, bool enableTagLevel = false) TemplateManager = _templateManager }; - using var builder = new DocumentBuilder(LoadAssemblies(enableTagLevel), ImmutableArray.Empty); + using var builder = new DocumentBuilder(LoadAssemblies(enableTagLevel), []); builder.Build(parameters); } diff --git a/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToTagLevelTest.cs b/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToTagLevelTest.cs index dd4b1a1604e..22a06714040 100644 --- a/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToTagLevelTest.cs +++ b/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToTagLevelTest.cs @@ -31,13 +31,13 @@ public SplitRestApiToTagLevelTest() string inputFolder = GetRandomFolder(); _outputFolder = GetRandomFolder(); _defaultFiles = new FileCollection(Directory.GetCurrentDirectory()); - _defaultFiles.Add(DocumentType.Article, new[] { "TestData/swagger/petstore.json" }, "TestData/"); + _defaultFiles.Add(DocumentType.Article, ["TestData/swagger/petstore.json"], "TestData/"); _applyTemplateSettings = new ApplyTemplateSettings(inputFolder, _outputFolder) { RawModelExportSettings = { Export = true }, TransformDocument = true, }; - _templateManager = new TemplateManager(new List { "template" }, null, "TestData/"); + _templateManager = new TemplateManager(["template"], null, "TestData/"); } [Fact] @@ -142,7 +142,7 @@ private void BuildDocument(FileCollection files) TemplateManager = _templateManager }; - using var builder = new DocumentBuilder(LoadAssemblies(), ImmutableArray.Empty); + using var builder = new DocumentBuilder(LoadAssemblies(), []); builder.Build(parameters); } diff --git a/test/Docfx.Build.SchemaDriven.Tests/MarkdownFragmentsValidationTest.cs b/test/Docfx.Build.SchemaDriven.Tests/MarkdownFragmentsValidationTest.cs index 0fbfee19ba1..a04406a268e 100644 --- a/test/Docfx.Build.SchemaDriven.Tests/MarkdownFragmentsValidationTest.cs +++ b/test/Docfx.Build.SchemaDriven.Tests/MarkdownFragmentsValidationTest.cs @@ -36,7 +36,7 @@ public void OverwriteUnEditableTest() _defaultFiles = new FileCollection(Directory.GetCurrentDirectory()); _applyTemplateSettings = new ApplyTemplateSettings(_inputFolder, _outputFolder) { RawModelExportSettings = { Export = true }, TransformDocument = true, }; - _templateManager = new TemplateManager(new List { "template" }, null, _templateFolder); + _templateManager = new TemplateManager(["template"], null, _templateFolder); _rawModelFilePath = GetRawModelFilePath("FragmentsValidation.yml"); @@ -44,7 +44,7 @@ public void OverwriteUnEditableTest() var yamlFile = CreateFile("FragmentsValidation.yml", File.ReadAllText("TestData/inputs/FragmentsValidation.yml"), _inputFolder); var mdFile = CreateFile("FragmentsValidation.yml.md", File.ReadAllText("TestData/inputs/FragmentsValidation.yml.md"), _inputFolder); _files = new FileCollection(_defaultFiles); - _files.Add(DocumentType.Article, new[] { yamlFile }, _inputFolder); + _files.Add(DocumentType.Article, [yamlFile], _inputFolder); // Act Logger.RegisterListener(_listener); @@ -83,7 +83,7 @@ private void BuildDocument(FileCollection files) TemplateManager = _templateManager, }; - using var builder = new DocumentBuilder(LoadAssemblies(), ImmutableArray.Empty); + using var builder = new DocumentBuilder(LoadAssemblies(), []); builder.Build(parameters); } diff --git a/test/Docfx.Build.SchemaDriven.Tests/MergeMarkdownFragmentsTest.cs b/test/Docfx.Build.SchemaDriven.Tests/MergeMarkdownFragmentsTest.cs index 3d20881d3e9..714326d5e42 100644 --- a/test/Docfx.Build.SchemaDriven.Tests/MergeMarkdownFragmentsTest.cs +++ b/test/Docfx.Build.SchemaDriven.Tests/MergeMarkdownFragmentsTest.cs @@ -34,14 +34,14 @@ public MergeMarkdownFragmentsTest() var defaultFiles = new FileCollection(Directory.GetCurrentDirectory()); _applyTemplateSettings = new ApplyTemplateSettings(_inputFolder, _outputFolder) { RawModelExportSettings = { Export = true }, TransformDocument = true, }; - _templateManager = new TemplateManager(new List { "template" }, null, templateFolder); + _templateManager = new TemplateManager(["template"], null, templateFolder); _rawModelFilePath = GetRawModelFilePath("Suppressions.yml"); var schemaFile = CreateFile("template/schemas/rest.mixed.schema.json", File.ReadAllText("TestData/schemas/rest.mixed.schema.json"), templateFolder); var yamlFile = CreateFile("Suppressions.yml", File.ReadAllText("TestData/inputs/Suppressions.yml"), _inputFolder); _files = new FileCollection(defaultFiles); - _files.Add(DocumentType.Article, new[] { yamlFile }, _inputFolder); + _files.Add(DocumentType.Article, [yamlFile], _inputFolder); } [Fact] @@ -352,11 +352,12 @@ I add a summary. // modify fragments UpdateFile( "Suppressions.yml.md", - new string[] { "# `management.azure.com.advisor.suppressions`", + [ + "# `management.azure.com.advisor.suppressions`", "## ``summary``", "I update a summary.", - "With [!include[invalid](invalid.md)]", - }, + "With [!include[invalid](invalid.md)]" + ], _inputFolder); BuildDocument(_files); @@ -402,7 +403,7 @@ private void BuildDocument(FileCollection files) TemplateManager = _templateManager, }; - using var builder = new DocumentBuilder(LoadAssemblies(), ImmutableArray.Empty); + using var builder = new DocumentBuilder(LoadAssemblies(), []); builder.Build(parameters); } diff --git a/test/Docfx.Build.SchemaDriven.Tests/SchemaDrivenProcessorTest.cs b/test/Docfx.Build.SchemaDriven.Tests/SchemaDrivenProcessorTest.cs index b17f774dafc..bdb5e1b1175 100644 --- a/test/Docfx.Build.SchemaDriven.Tests/SchemaDrivenProcessorTest.cs +++ b/test/Docfx.Build.SchemaDriven.Tests/SchemaDrivenProcessorTest.cs @@ -40,7 +40,7 @@ public SchemaDrivenProcessorTest() TransformDocument = true, }; - _templateManager = new TemplateManager(new List { "template" }, null, _templateFolder); + _templateManager = new TemplateManager(["template"], null, _templateFolder); } [Fact] @@ -84,7 +84,7 @@ public void TestRef() - description: ""**outside**"" ", _inputFolder); FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Article, new[] { inputFile }, _inputFolder); + files.Add(DocumentType.Article, [inputFile], _inputFolder); BuildDocument(files); Assert.Single(listener.Items); @@ -111,7 +111,7 @@ public void TestRef()

3.1.1Hello

outside

" - .Split(new string[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries), + .Split(["\r\n", "\n"], StringSplitOptions.RemoveEmptyEntries), File.ReadAllLines(outputFilePath).Where(s => !string.IsNullOrWhiteSpace(s)).Select(s => s.Trim()).ToArray()); } @@ -134,7 +134,7 @@ public void TestXrefResolver() var inputFileName = "inputs/CatLibrary.ICat.yml"; var inputFile = CreateFile(inputFileName, File.ReadAllText("TestData/inputs/CatLibrary.ICat.yml"), _inputFolder); FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Article, new[] { inputFile }, _inputFolder); + files.Add(DocumentType.Article, [inputFile], _inputFolder); // act BuildDocument(files); @@ -161,7 +161,7 @@ public void TestXrefResolver() Assert.Equal(@" eat:

eat event of cat. Every cat must implement this event. This method is within ICat

-|666|net472netstandard2_0".Split(new string[] { "\r\n", "\n" }, StringSplitOptions.None), +|666|net472netstandard2_0".Split(["\r\n", "\n"], StringSplitOptions.None), outputFileContent); } @@ -232,7 +232,7 @@ public void TestValidMetadataReferenceWithIncremental() ", _inputFolder); FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Article, new[] { inputFile1, inputFile2, dependentMarkdown }, _inputFolder); + files.Add(DocumentType.Article, [inputFile1, inputFile2, dependentMarkdown], _inputFolder); BuildDocument(files); @@ -258,7 +258,7 @@ public void TestValidMetadataReferenceWithIncremental() Assert.Equal("postbuild2", rawModel2["metadata"]["postMeta"].ToString()); // change dependent markdown - UpdateFile("toc.md", new string[] { "# Updated" }, _inputFolder); + UpdateFile("toc.md", ["# Updated"], _inputFolder); BuildDocument(files); rawModel = JsonUtility.Deserialize(rawModelFilePath); @@ -333,7 +333,7 @@ public void TestInvalidObjectAgainstSchema() ", _inputFolder); FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Article, new[] { inputFile }, _inputFolder); + files.Add(DocumentType.Article, [inputFile], _inputFolder); BuildDocument(files); var errors = listener.Items.Where(s => s.Code == "ViolateSchema").ToList(); Assert.Single(errors); @@ -376,7 +376,7 @@ public void TestInvalidMetadataReference() ", _inputFolder); FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Article, new[] { inputFile1 }, _inputFolder); + files.Add(DocumentType.Article, [inputFile1], _inputFolder); Assert.Throws(() => BuildDocument(files)); } @@ -394,7 +394,7 @@ private void BuildDocument(FileCollection files, DocumentBuildParameters dbp = n TemplateManager = _templateManager, }; - using var builder = new DocumentBuilder(LoadAssemblies(), ImmutableArray.Empty); + using var builder = new DocumentBuilder(LoadAssemblies(), []); builder.Build(parameters); } diff --git a/test/Docfx.Build.SchemaDriven.Tests/SchemaFragmentsIteratorTest.cs b/test/Docfx.Build.SchemaDriven.Tests/SchemaFragmentsIteratorTest.cs index e8f76657d87..079dbc809f5 100644 --- a/test/Docfx.Build.SchemaDriven.Tests/SchemaFragmentsIteratorTest.cs +++ b/test/Docfx.Build.SchemaDriven.Tests/SchemaFragmentsIteratorTest.cs @@ -36,11 +36,11 @@ public void TestSchemaFragmentsIterator() private class UidPropertyCounter : ISchemaFragmentsHandler { - public List ExistingMarkdownProperties { get; private set; } = new(); + public List ExistingMarkdownProperties { get; private set; } = []; - public List MissingMarkdownProperties { get; private set; } = new(); + public List MissingMarkdownProperties { get; private set; } = []; - public List ExistingUids { get; private set; } = new(); + public List ExistingUids { get; private set; } = []; public void HandleUid(string uidKey, YamlMappingNode node, Dictionary fragments, BaseSchema schema, string oPathPrefix, string uid) { diff --git a/test/Docfx.Build.SchemaDriven.Tests/SchemaMergerTest.cs b/test/Docfx.Build.SchemaDriven.Tests/SchemaMergerTest.cs index a33b88b301d..ee3515821c9 100644 --- a/test/Docfx.Build.SchemaDriven.Tests/SchemaMergerTest.cs +++ b/test/Docfx.Build.SchemaDriven.Tests/SchemaMergerTest.cs @@ -36,7 +36,7 @@ public SchemaMergerTest() TransformDocument = true, }; - _templateManager = new TemplateManager(new List { "template" }, null, _templateFolder); + _templateManager = new TemplateManager(["template"], null, _templateFolder); } [Fact] @@ -216,8 +216,8 @@ public void TestSchemaOverwriteWithGeneralMergeTypes() Overwrite with content ", _inputFolder); FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Article, new[] { inputFile }, _inputFolder); - files.Add(DocumentType.Overwrite, new[] { overwriteFile }, _inputFolder); + files.Add(DocumentType.Article, [inputFile], _inputFolder); + files.Add(DocumentType.Overwrite, [overwriteFile], _inputFolder); BuildDocument(files); // One plugin warning for yml and one plugin warning for overwrite file @@ -343,8 +343,8 @@ public void TestSchemaOverwriteWithGeneralSchemaOptions() Nice ", _inputFolder); FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Article, new[] { inputFile }, _inputFolder); - files.Add(DocumentType.Overwrite, new[] { overwriteFile }, _inputFolder); + files.Add(DocumentType.Article, [inputFile], _inputFolder); + files.Add(DocumentType.Overwrite, [overwriteFile], _inputFolder); BuildDocument(files); // One plugin warning for yml and one plugin warning for overwrite file @@ -378,7 +378,7 @@ private void BuildDocument(FileCollection files) TemplateManager = _templateManager, }; - using var builder = new DocumentBuilder(LoadAssemblies(), ImmutableArray.Empty); + using var builder = new DocumentBuilder(LoadAssemblies(), []); builder.Build(parameters); } diff --git a/test/Docfx.Build.Tests/ConceptualDocumentProcessorTest.cs b/test/Docfx.Build.Tests/ConceptualDocumentProcessorTest.cs index 51051ed04ca..9348bfbfb01 100644 --- a/test/Docfx.Build.Tests/ConceptualDocumentProcessorTest.cs +++ b/test/Docfx.Build.Tests/ConceptualDocumentProcessorTest.cs @@ -417,7 +417,7 @@ private void BuildDocument(FileCollection files, Dictionary meta TemplateManager = _templateManager }; - using var builder = new DocumentBuilder(Array.Empty(), ImmutableArray.Empty); + using var builder = new DocumentBuilder([], []); builder.Build(parameters); } diff --git a/test/Docfx.Build.Tests/DocumentBuilderTest.cs b/test/Docfx.Build.Tests/DocumentBuilderTest.cs index 0b23fdb7ced..67b4ae138f4 100644 --- a/test/Docfx.Build.Tests/DocumentBuilderTest.cs +++ b/test/Docfx.Build.Tests/DocumentBuilderTest.cs @@ -728,7 +728,7 @@ private void BuildDocument( string templateFolder = null, string versionDir = null) { - using var builder = new DocumentBuilder(LoadAssemblies(), ImmutableArray.Empty); + using var builder = new DocumentBuilder(LoadAssemblies(), []); if (applyTemplateSettings == null) { applyTemplateSettings = new ApplyTemplateSettings(_inputFolder, _outputFolder); diff --git a/test/Docfx.Build.Tests/TocDocumentProcessorTest.cs b/test/Docfx.Build.Tests/TocDocumentProcessorTest.cs index c654e1ef350..727a6126e5f 100644 --- a/test/Docfx.Build.Tests/TocDocumentProcessorTest.cs +++ b/test/Docfx.Build.Tests/TocDocumentProcessorTest.cs @@ -927,7 +927,7 @@ private void BuildDocument(FileCollection files) }.ToImmutableDictionary(), }; - using var builder = new DocumentBuilder(Array.Empty(), ImmutableArray.Empty); + using var builder = new DocumentBuilder([], []); builder.Build(parameters); } diff --git a/test/Docfx.Build.UniversalReference.Tests/UniversalReferenceDocumentProcessorTest.cs b/test/Docfx.Build.UniversalReference.Tests/UniversalReferenceDocumentProcessorTest.cs index 2ec94eb53f6..04240ae3d34 100644 --- a/test/Docfx.Build.UniversalReference.Tests/UniversalReferenceDocumentProcessorTest.cs +++ b/test/Docfx.Build.UniversalReference.Tests/UniversalReferenceDocumentProcessorTest.cs @@ -193,7 +193,7 @@ private void BuildDocument(FileCollection files) TemplateManager = _templateManager }; - using var builder = new DocumentBuilder(LoadAssemblies(), ImmutableArray.Empty); + using var builder = new DocumentBuilder(LoadAssemblies(), []); builder.Build(parameters); } diff --git a/test/Docfx.Dotnet.Tests/GenerateMetadataFromCSUnitTest.cs b/test/Docfx.Dotnet.Tests/GenerateMetadataFromCSUnitTest.cs index 5ea684af187..f36db495322 100644 --- a/test/Docfx.Dotnet.Tests/GenerateMetadataFromCSUnitTest.cs +++ b/test/Docfx.Dotnet.Tests/GenerateMetadataFromCSUnitTest.cs @@ -475,16 +475,16 @@ public interface IFooBar : IFoo, IBar { } Assert.Equal("Test1", item.Parent); Assert.Equal( - new[] { "Test1.Bar`1", null, "System.String", null }, + ["Test1.Bar`1", null, "System.String", null], item.NameParts[SyntaxLanguage.CSharp].Select(p => p.Name)); Assert.Equal( - new[] { "Bar", "<", "string", ">" }, + ["Bar", "<", "string", ">"], item.NameParts[SyntaxLanguage.CSharp].Select(p => p.DisplayName)); Assert.Equal( - new[] { "Bar", "<", "string", ">" }, + ["Bar", "<", "string", ">"], item.NameWithTypeParts[SyntaxLanguage.CSharp].Select(p => p.DisplayName)); Assert.Equal( - new[] { "Test1", ".", "Bar", "<", "string", ">" }, + ["Test1", ".", "Bar", "<", "string", ">"], item.QualifiedNameParts[SyntaxLanguage.CSharp].Select(p => p.DisplayName)); } { @@ -496,16 +496,16 @@ public interface IFooBar : IFoo, IBar { } Assert.Equal(6, item.NameParts[SyntaxLanguage.CSharp].Count); Assert.Equal( - new[] { "Test1.Foo`1", null, null, null, null, null }, + ["Test1.Foo`1", null, null, null, null, null], item.NameParts[SyntaxLanguage.CSharp].Select(p => p.Name)); Assert.Equal( - new[] { "Foo", "<", "T", "[", "]", ">" }, + ["Foo", "<", "T", "[", "]", ">"], item.NameParts[SyntaxLanguage.CSharp].Select(p => p.DisplayName)); Assert.Equal( - new[] { "Foo", "<", "T", "[", "]", ">" }, + ["Foo", "<", "T", "[", "]", ">"], item.NameWithTypeParts[SyntaxLanguage.CSharp].Select(p => p.DisplayName)); Assert.Equal( - new[] { "Test1", ".", "Foo", "<", "T", "[", "]", ">" }, + ["Test1", ".", "Foo", "<", "T", "[", "]", ">"], item.QualifiedNameParts[SyntaxLanguage.CSharp].Select(p => p.DisplayName)); } { @@ -515,16 +515,16 @@ public interface IFooBar : IFoo, IBar { } Assert.Equal("Test1", item.Parent); Assert.Equal( - new[] { "Test1.Foo`1", null, "System.String", null, null, null }, + ["Test1.Foo`1", null, "System.String", null, null, null], item.NameParts[SyntaxLanguage.CSharp].Select(p => p.Name)); Assert.Equal( - new[] { "Foo", "<", "string", "[", "]", ">" }, + ["Foo", "<", "string", "[", "]", ">"], item.NameParts[SyntaxLanguage.CSharp].Select(p => p.DisplayName)); Assert.Equal( - new[] { "Foo", "<", "string", "[", "]", ">" }, + ["Foo", "<", "string", "[", "]", ">"], item.NameWithTypeParts[SyntaxLanguage.CSharp].Select(p => p.DisplayName)); Assert.Equal( - new[] { "Test1", ".", "Foo", "<", "string", "[", "]", ">" }, + ["Test1", ".", "Foo", "<", "string", "[", "]", ">"], item.QualifiedNameParts[SyntaxLanguage.CSharp].Select(p => p.DisplayName)); } } @@ -3612,45 +3612,40 @@ public class Bar var output = Verify(code); var type = output.Items[0].Items[0]; - Assert.Equal(new[] - { + Assert.Equal([ "Test.Bar.op_Implicit(System.UInt32)~Test.Bar", "Test.Bar.op_Implicit(System.String)~Test.Bar", "Test.Bar.op_CheckedExplicit(Test.Bar)~System.UInt32", - "Test.Bar.op_CheckedExplicit(Test.Bar)~System.String[]", - }, type.Items.Select(item => item.Name)); + "Test.Bar.op_CheckedExplicit(Test.Bar)~System.String[]" + ], type.Items.Select(item => item.Name)); - Assert.Equal(new[] - { + Assert.Equal([ "implicit operator Bar(uint)", "implicit operator Bar(string)", "explicit operator checked uint(Bar)", - "explicit operator checked string[](Bar)", - }, type.Items.Select(item => item.DisplayNames[SyntaxLanguage.CSharp])); + "explicit operator checked string[](Bar)" + ], type.Items.Select(item => item.DisplayNames[SyntaxLanguage.CSharp])); - Assert.Equal(new[] - { + Assert.Equal([ "Bar.implicit operator Bar(uint)", "Bar.implicit operator Bar(string)", "Bar.explicit operator checked uint(Bar)", - "Bar.explicit operator checked string[](Bar)", - }, type.Items.Select(item => item.DisplayNamesWithType[SyntaxLanguage.CSharp])); + "Bar.explicit operator checked string[](Bar)" + ], type.Items.Select(item => item.DisplayNamesWithType[SyntaxLanguage.CSharp])); - Assert.Equal(new[] - { + Assert.Equal([ "Test.Bar.implicit operator Test.Bar(uint)", "Test.Bar.implicit operator Test.Bar(string)", "Test.Bar.explicit operator checked uint(Test.Bar)", - "Test.Bar.explicit operator checked string[](Test.Bar)", - }, type.Items.Select(item => item.DisplayQualifiedNames[SyntaxLanguage.CSharp])); + "Test.Bar.explicit operator checked string[](Test.Bar)" + ], type.Items.Select(item => item.DisplayQualifiedNames[SyntaxLanguage.CSharp])); - Assert.Equal(new[] - { + Assert.Equal([ "Test.Bar.op_Implicit*", "Test.Bar.op_Implicit*", "Test.Bar.op_CheckedExplicit*", - "Test.Bar.op_CheckedExplicit*", - }, type.Items.Select(item => item.Overload)); + "Test.Bar.op_CheckedExplicit*" + ], type.Items.Select(item => item.Overload)); Assert.Equal("implicit operator", string.Concat(output.References["Test.Bar.op_Implicit*"].NameParts[SyntaxLanguage.CSharp].Select(p => p.DisplayName))); Assert.Equal("explicit operator checked", string.Concat(output.References["Test.Bar.op_CheckedExplicit*"].NameParts[SyntaxLanguage.CSharp].Select(p => p.DisplayName))); @@ -3678,13 +3673,12 @@ internal interface IFoo { } var output = Verify(code, new() { IncludePrivateMembers = true }); var foo = output.Items[0].Items[0]; Assert.Equal("internal class Foo : IFoo", foo.Syntax.Content[SyntaxLanguage.CSharp]); - Assert.Equal(new[] - { + Assert.Equal([ "internal void M1()", "protected internal void M2()", "private protected void M3()", - "private void M4()", - }, foo.Items.Select(item => item.Syntax.Content[SyntaxLanguage.CSharp])); + "private void M4()" + ], foo.Items.Select(item => item.Syntax.Content[SyntaxLanguage.CSharp])); } [Fact] diff --git a/test/Docfx.Glob.Tests/GlobFileTest.cs b/test/Docfx.Glob.Tests/GlobFileTest.cs index aa42185b374..da22b713f17 100644 --- a/test/Docfx.Glob.Tests/GlobFileTest.cs +++ b/test/Docfx.Glob.Tests/GlobFileTest.cs @@ -51,33 +51,33 @@ public void TestGlobGetFilesShouldAbleToGetFiles() CreateFilesOrFolders(_workingDirectory, files); var result = FileGlob.GetFiles( _workingDirectory, - new string[] { "**.md" }, + ["**.md"], null).ToArray(); Assert.Equal(3, result.Length); result = FileGlob.GetFiles( _workingDirectory, null, - new string[] { "**.md" }).ToArray(); + ["**.md"]).ToArray(); Assert.Empty(result); result = FileGlob.GetFiles( _workingDirectory, - new string[] { "**" }, - new string[] { "**.md" }).ToArray(); + ["**"], + ["**.md"]).ToArray(); Assert.Equal(6, result.Length); result = FileGlob.GetFiles( _workingDirectory, - new string[] { "**.md" }, - new string[] { "**{J,L}/**" }).ToArray(); + ["**.md"], + ["**{J,L}/**"]).ToArray(); Assert.Single(result); result = FileGlob.GetFiles( _workingDirectory, - new string[] { "**.md", "**.csproj" }, - new string[] { "**J/**", "**/M/**" }).ToArray(); + ["**.md", "**.csproj"], + ["**J/**", "**/M/**"]).ToArray(); Assert.Single(result); result = FileGlob.GetFiles( _workingDirectory + "/Root", - new string[] { "[EJ]/*.{md,cs,csproj}" }, - new string[] { "**.cs" }).ToArray(); + ["[EJ]/*.{md,cs,csproj}"], + ["**.cs"]).ToArray(); Assert.Equal(2, result.Length); }