Quick cleanup: Address compiler hints (#836)

Mpdreamz · web-flow · commit c0e720497a76 · 2025-03-25T10:09:27.000+01:00
diff --git a/src/Elastic.Markdown/BuildContext.cs b/src/Elastic.Markdown/BuildContext.cs
@@ -4,7 +4,6 @@
 
 using System.IO.Abstractions;
 using Elastic.Markdown.Diagnostics;
-using Elastic.Markdown.Extensions;
 using Elastic.Markdown.IO;
 using Elastic.Markdown.IO.Configuration;
 using Elastic.Markdown.IO.Discovery;
diff --git a/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRule.cs b/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRule.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
 using Tomlet;
 using Tomlet.Models;
@@ -82,7 +81,7 @@ public static DetectionRule From(IFileInfo source)
 			throw new Exception($"Could not parse toml in: {source.FullName}", e);
 		}
 
-		if (!model.TryGetValue("metadata", out var node) || node is not TomlTable metadata)
+		if (!model.TryGetValue("metadata", out var node) || node is not TomlTable)
 			throw new Exception($"Could not find metadata section in {source.FullName}");
 
 		if (!model.TryGetValue("rule", out node) || node is not TomlTable rule)
diff --git a/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRulesDocsBuilderExtension.cs b/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRulesDocsBuilderExtension.cs
@@ -4,7 +4,6 @@
 
 using System.IO.Abstractions;
 using Elastic.Markdown.Exporters;
-using Elastic.Markdown.Helpers;
 using Elastic.Markdown.IO;
 using Elastic.Markdown.IO.Configuration;
 using Elastic.Markdown.IO.Navigation;
diff --git a/src/Elastic.Markdown/Helpers/Htmx.cs b/src/Elastic.Markdown/Helpers/Htmx.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Text;
-using Elastic.Markdown.IO.Configuration;
 
 namespace Elastic.Markdown.Helpers;
 
diff --git a/src/Elastic.Markdown/Helpers/Preloader.cs b/src/Elastic.Markdown/Helpers/Preloader.cs
@@ -2,16 +2,14 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Collections.Immutable;
-using System.Diagnostics;
 using System.Reflection;
 using System.Text.RegularExpressions;
 
 namespace Elastic.Markdown.Helpers;
 
 public static partial class FontPreloader
 {
-	private static IReadOnlyCollection<string>? FontUriCache = null!;
+	private static IReadOnlyCollection<string>? FontUriCache;
 
 	public static async Task<IReadOnlyCollection<string>> GetFontUrisAsync(string? urlPrefix) => FontUriCache ??= await LoadFontUrisAsync(urlPrefix);
 	private static async Task<IReadOnlyCollection<string>> LoadFontUrisAsync(string? urlPrefix)
diff --git a/src/Elastic.Markdown/Myst/CodeBlocks/CodeBlockArguments.cs b/src/Elastic.Markdown/Myst/CodeBlocks/CodeBlockArguments.cs
@@ -2,9 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
-using Elastic.Markdown.Diagnostics;
 
 namespace Elastic.Markdown.Myst.CodeBlocks;
 
diff --git a/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockHtmlRenderer.cs b/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockHtmlRenderer.cs
@@ -108,14 +108,7 @@ private static int CountIndentation(StringSlice slice)
 		return indentCount;
 	}
 
-	private static bool IsCommentBlock(Block block)
-	{
-		if (block is CommentBlock)
-		{
-			return true;
-		}
-		return false;
-	}
+	private static bool IsCommentBlock(Block block) => block is CommentBlock;
 
 	protected override void Write(HtmlRenderer renderer, EnhancedCodeBlock block)
 	{
diff --git a/src/Elastic.Markdown/Myst/MarkdownParser.cs b/src/Elastic.Markdown/Myst/MarkdownParser.cs
@@ -4,7 +4,6 @@
 
 using System.IO.Abstractions;
 using Cysharp.IO;
-using Elastic.Markdown.IO.Configuration;
 using Elastic.Markdown.Myst.CodeBlocks;
 using Elastic.Markdown.Myst.Comments;
 using Elastic.Markdown.Myst.Directives;
diff --git a/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs b/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
@@ -4,7 +4,6 @@
 
 using Elastic.Markdown.Helpers;
 using Elastic.Markdown.IO;
-using Elastic.Markdown.IO.Configuration;
 using Elastic.Markdown.IO.Navigation;
 using Markdig;
 using Markdig.Renderers;
diff --git a/src/Elastic.Markdown/Slices/Layout/_Header.cshtml b/src/Elastic.Markdown/Slices/Layout/_Header.cshtml
@@ -10,6 +10,7 @@ else
 	<header class="sticky top-0 z-50 bg-blue-developer text-white text-lg font-semibold h-(--offset-top) flex items-center px-6">
 		<div class="container mx-auto">
 			<div class="flex justify-between items-center">
+				@* ReSharper disable once Html.IdNotResolved *@
 				<label role="button" class="md:hidden cursor-pointer" for="pages-nav-hamburger">
 					<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-8">
 						<path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25H12"/>
diff --git a/src/Elastic.Markdown/Slices/Layout/_PagesNav.cshtml b/src/Elastic.Markdown/Slices/Layout/_PagesNav.cshtml
@@ -7,12 +7,14 @@
 		data-current-navigation="@LayoutViewModel.CurrentNavigationId">
 		@(new HtmlString(Model.NavigationHtml))
 	</nav>
+	@* ReSharper disable once Html.IdNotResolved *@
 	<label role="button" for="pages-nav-hamburger" class="absolute md:hidden top-7 -right-12 bg-white p-1 rounded-full border-1 border-grey-20 cursor-pointer z-99">
 		<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
 			<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
 		</svg>
 	</label>
 </aside>
+@* ReSharper disable once Html.IdNotResolved *@
 <label for="pages-nav-hamburger" aria-hidden="true" class="hidden group-has-[#pages-nav-hamburger:checked]/body:block md:hidden! fixed top-0 left-0 right-0 bottom-0 bg-black/50 z-30 ">
 	
 </label>
diff --git a/src/Elastic.Markdown/Slices/Layout/_SecondaryNav.cshtml b/src/Elastic.Markdown/Slices/Layout/_SecondaryNav.cshtml
@@ -6,6 +6,7 @@
 		<div class="flex gap-2 flex-nowrap items-center">
 			@if (Model.CurrentDocument.YamlFrontMatter?.Layout != LayoutName.LandingPage)
 			{
+				@* ReSharper disable once Html.IdNotResolved *@
 				<label role="button" class="md:hidden cursor-pointer" for="pages-nav-hamburger">
 					<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
 						<path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25H12"/>
diff --git a/src/Elastic.Markdown/Slices/Layout/_TocTree.cshtml b/src/Elastic.Markdown/Slices/Layout/_TocTree.cshtml
@@ -52,7 +52,7 @@
 	{
 		<a
 			href="@Model.TitleUrl"
-			@Htmx.GetHxAttributes(Model.TitleUrl, current is null || Model.Tree.Id == current?.Id)
+			@Htmx.GetHxAttributes(Model.TitleUrl, current is null || Model.Tree.Id == current.Id)
 			class="inline-block mx-4 mt-6 font-semibold text-ink hover:text-black">
 			@Model.Title
 		</a>
diff --git a/src/docs-assembler/AssembleSources.cs b/src/docs-assembler/AssembleSources.cs
@@ -12,7 +12,6 @@
 using Elastic.Markdown.IO.Configuration;
 using Elastic.Markdown.IO.Navigation;
 using Microsoft.Extensions.Logging.Abstractions;
-using Spectre.Console;
 using YamlDotNet.RepresentationModel;
 
 namespace Documentation.Assembler;
diff --git a/src/docs-assembler/Building/AssemblerBuilder.cs b/src/docs-assembler/Building/AssemblerBuilder.cs
@@ -5,7 +5,6 @@
 using System.Collections.Frozen;
 using Documentation.Assembler.Navigation;
 using Elastic.Markdown;
-using Elastic.Markdown.Slices;
 using Microsoft.Extensions.Logging;
 
 namespace Documentation.Assembler.Building;
diff --git a/src/docs-assembler/Cli/RepositoryCommands.cs b/src/docs-assembler/Cli/RepositoryCommands.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
 using Actions.Core.Services;
@@ -11,8 +10,6 @@
 using Documentation.Assembler.Navigation;
 using Documentation.Assembler.Sourcing;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
-using Elastic.Markdown.CrossLinks;
-using Elastic.Markdown.IO.Navigation;
 using Microsoft.Extensions.Logging;
 
 namespace Documentation.Assembler.Cli;
diff --git a/src/docs-assembler/Configuration/AssemblyConfiguration.cs b/src/docs-assembler/Configuration/AssemblyConfiguration.cs
@@ -12,7 +12,7 @@ public static AssemblyConfiguration Deserialize(string yaml)
 	{
 		var input = new StringReader(yaml);
 
-		var deserializer = new StaticDeserializerBuilder(new Assembler.YamlStaticContext())
+		var deserializer = new StaticDeserializerBuilder(new YamlStaticContext())
 			.IgnoreUnmatchedProperties()
 			.Build();
 
diff --git a/src/docs-assembler/Navigation/GlobalNavigationFile.cs b/src/docs-assembler/Navigation/GlobalNavigationFile.cs
@@ -2,11 +2,9 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Collections.Frozen;
 using System.IO.Abstractions;
 using Documentation.Assembler.Configuration;
 using Elastic.Markdown.IO.Configuration;
-using Elastic.Markdown.IO.Navigation;
 using YamlDotNet.RepresentationModel;
 
 namespace Documentation.Assembler.Navigation;
diff --git a/src/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -4,7 +4,6 @@
 
 using System.Collections.Concurrent;
 using System.Collections.Immutable;
-using Elastic.Markdown.IO.Configuration;
 using Elastic.Markdown.IO.Navigation;
 using Elastic.Markdown.Slices;
 
@@ -16,7 +15,6 @@ public class GlobalNavigationHtmlWriter(
 	GlobalNavigation globalNavigation,
 	AssembleSources assembleSources) : INavigationHtmlWriter
 {
-	private readonly AssembleContext _assembleContext = assembleContext;
 	private readonly ConcurrentDictionary<Uri, string> _renderedNavigationCache = [];
 
 	private ImmutableHashSet<Uri> Phantoms { get; } = [.. navigationFile.Phantoms.Select(p => p.Source)];
@@ -25,13 +23,13 @@ public class GlobalNavigationHtmlWriter(
 	{
 		if (!assembleSources.TocTopLevelMappings.TryGetValue(tree.Source, out var topLevelUri))
 		{
-			_assembleContext.Collector.EmitWarning(_assembleContext.NavigationPath.FullName, $"Could not find a top level mapping for {tree.Source}");
+			assembleContext.Collector.EmitWarning(assembleContext.NavigationPath.FullName, $"Could not find a top level mapping for {tree.Source}");
 			return (tree, tree.Source);
 		}
 
 		if (!assembleSources.TreeCollector.TryGetTableOfContentsTree(topLevelUri.TopLevelSource, out var topLevel))
 		{
-			_assembleContext.Collector.EmitWarning(_assembleContext.NavigationPath.FullName, $"Could not find a toc tree for {topLevelUri.TopLevelSource}");
+			assembleContext.Collector.EmitWarning(assembleContext.NavigationPath.FullName, $"Could not find a toc tree for {topLevelUri.TopLevelSource}");
 			return (tree, tree.Source);
 
 		}
diff --git a/src/docs-assembler/Sourcing/Checkout.cs b/src/docs-assembler/Sourcing/Checkout.cs
@@ -4,7 +4,6 @@
 
 using System.IO.Abstractions;
 using Documentation.Assembler.Configuration;
-using Elastic.Markdown;
 
 namespace Documentation.Assembler.Sourcing;
 
diff --git a/src/docs-assembler/Sourcing/RepositorySourcesFetcher.cs b/src/docs-assembler/Sourcing/RepositorySourcesFetcher.cs
@@ -6,7 +6,6 @@
 using System.Diagnostics;
 using System.IO.Abstractions;
 using Documentation.Assembler.Configuration;
-using Elastic.Markdown;
 using Elastic.Markdown.IO;
 using Microsoft.Extensions.Logging;
 using ProcNet;
@@ -134,6 +133,7 @@ private void ExecIn(IDirectoryInfo? workingDirectory, string binary, params stri
 			context.Collector.EmitError("", $"Exit code: {result} while executing {binary} {string.Join(" ", args)} in {workingDirectory}");
 	}
 
+	// ReSharper disable once UnusedMember.Local
 	private string Capture(IDirectoryInfo? workingDirectory, string binary, params string[] args)
 	{
 		var arguments = new StartArguments(binary, args)
diff --git a/src/docs-lambda-index-publisher/Program.cs b/src/docs-lambda-index-publisher/Program.cs
@@ -57,10 +57,13 @@ static async Task<string> Handler(ILambdaContext context)
 				if (linkIndex.Repositories.TryGetValue(repository, out var existingEntry))
 					existingEntry[branch] = entry;
 				else
+				{
 					linkIndex.Repositories.Add(repository, new Dictionary<string, LinkIndexEntry>
 					{
 						{ branch, entry }
 					});
+				}
+
 				Console.WriteLine(entry);
 			}
 
diff --git a/tests/Elastic.Markdown.Tests/DocSet/LinkReferenceTests.cs b/tests/Elastic.Markdown.Tests/DocSet/LinkReferenceTests.cs
@@ -6,7 +6,6 @@
 using Elastic.Markdown.IO.Discovery;
 using Elastic.Markdown.IO.State;
 using FluentAssertions;
-using Microsoft.Extensions.Logging;
 
 namespace Elastic.Markdown.Tests.DocSet;
 
diff --git a/tests/docs-assembler.Tests/src/docs-assembler.Tests/GlobalNavigationTests.cs b/tests/docs-assembler.Tests/src/docs-assembler.Tests/GlobalNavigationTests.cs
@@ -78,6 +78,7 @@ public async Task ParsesReferences()
 		dotnetAgentNav.Should().NotBeNull();
 
 		var resolved = navigation.NavigationItems;
+		resolved.Should().NotBeNull();
 
 	}
 
@@ -118,6 +119,7 @@ public async Task ParsesGlobalNavigation()
 		var navigation = new GlobalNavigation(assembleSources, navigationFile);
 		navigation.TopLevelItems.Count.Should().BeLessThan(20);
 		var resolved = navigation.NavigationItems;
+		resolved.Should().NotBeNull();
 	}
 
 	private static async Task<(AssembleContext assembleContext, AssembleSources assembleSources)> Setup(FileSystem fs)
@@ -139,7 +141,7 @@ public async Task ParsesGlobalNavigation()
 		return (assembleContext, assembleSources);
 	}
 
-	public static Checkout CreateCheckout(IFileSystem fs, string name) =>
+	private static Checkout CreateCheckout(IFileSystem fs, string name) =>
 		new()
 		{
 			Repository = new Repository

Original file line number	Diff line number	Diff line change
`@@ -108,14 +108,7 @@ private static int CountIndentation(StringSlice slice)`
`108`	`108`	`return indentCount;`
`109`	`109`	`}`
`110`	`110`
`111`		`- private static bool IsCommentBlock(Block block)`
`112`		`- {`
`113`		`- if (block is CommentBlock)`
`114`		`- {`
`115`		`- return true;`
`116`		`- }`
`117`		`- return false;`
`118`		`- }`
	`111`	`+ private static bool IsCommentBlock(Block block) => block is CommentBlock;`
`119`	`112`
`120`	`113`	`protected override void Write(HtmlRenderer renderer, EnhancedCodeBlock block)`
`121`	`114`	`{`