Allow _docset.yml and _toc.yml as configuration filenames

Author: Mpdreamz

src/Elastic.Markdown/BuildContext.cs

@@ -49,29 +49,41 @@ public BuildContext(IFileSystem readFileSystem, IFileSystem writeFileSystem, str
 		var rootFolder = !string.IsNullOrWhiteSpace(source)
 			? ReadFileSystem.DirectoryInfo.New(source)
 			: ReadFileSystem.DirectoryInfo.New(Path.Combine(Paths.Root.FullName));
-		SourcePath = FindDocsFolderFromRoot(rootFolder);
+
+		(SourcePath, ConfigurationPath) = FindDocsFolderFromRoot(rootFolder);
 
 		OutputPath = !string.IsNullOrWhiteSpace(output)
 			? WriteFileSystem.DirectoryInfo.New(output)
 			: WriteFileSystem.DirectoryInfo.New(Path.Combine(Paths.Root.FullName, ".artifacts/docs/html"));
 
-		ConfigurationPath =
-			ReadFileSystem.FileInfo.New(Path.Combine(SourcePath.FullName, "docset.yml"));
-
 		if (ConfigurationPath.FullName != SourcePath.FullName)
 			SourcePath = ConfigurationPath.Directory!;
 
 		Git = GitCheckoutInformation.Create(ReadFileSystem);
 	}
 
-	private IDirectoryInfo FindDocsFolderFromRoot(IDirectoryInfo rootPath)
+	private (IDirectoryInfo, IFileInfo) FindDocsFolderFromRoot(IDirectoryInfo rootPath)
 	{
+		var configurationPath = ReadFileSystem.FileInfo.New(Path.Combine(rootPath.FullName, "docset.yml"));
 		if (rootPath.Exists &&
 			ReadFileSystem.File.Exists(Path.Combine(rootPath.FullName, "docset.yml")))
-			return rootPath;
+			return (rootPath, configurationPath);
+
+		configurationPath = ReadFileSystem.FileInfo.New(Path.Combine(rootPath.FullName, "_docset.yml"));
+		if (rootPath.Exists &&
+			ReadFileSystem.File.Exists(Path.Combine(rootPath.FullName, "_docset.yml")))
+			return (rootPath, configurationPath);
+
+		configurationPath = rootPath
+			.EnumerateFiles("docset.yml", SearchOption.AllDirectories)
+			.OrderByDescending(f => f.Name switch { "docset.yml" => 2, "_docset.yml" => 1, _ => 0 })
+			.FirstOrDefault()
+			?? throw new Exception($"Can not locate docset.yml file in '{rootPath}'");
+
+		var docsFolder = configurationPath.Directory
+			?? throw new Exception($"Can not locate docset.yml file in '{rootPath}'");
 
-		var docsFolder = rootPath.EnumerateFiles("docset.yml", SearchOption.AllDirectories).FirstOrDefault();
-		return docsFolder?.Directory ?? throw new Exception($"Can not locate docset.yml file in '{rootPath}'");
+		return (docsFolder, configurationPath);
 	}
 
 }

src/Elastic.Markdown/IO/Configuration/ConfigurationFile.cs

@@ -257,8 +257,17 @@ private Dictionary<string, string> ReadDictionary(KeyValuePair<YamlNode, YamlNod
 		var rootPath = _context.ReadFileSystem.DirectoryInfo.New(Path.Combine(_rootPath.FullName, tocPath));
 		var path = Path.Combine(rootPath.FullName, "toc.yml");
 		var source = _context.ReadFileSystem.FileInfo.New(path);
+
+		var errorMessage = $"Nested toc: '{source.Directory}' directory has no toc.yml or _toc.yml file";
+
+		if (!source.Exists)
+		{
+			path = Path.Combine(rootPath.FullName, "_toc.yml");
+			source = _context.ReadFileSystem.FileInfo.New(path);
+		}
+
 		if (!source.Exists)
-			EmitError($"Nested toc: '{source.FullName}' does not exist", entry.Key);
+			EmitError(errorMessage, entry.Key);
 		else
 			found = true;
 

src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockParser.cs

@@ -88,6 +88,10 @@ public override bool Close(BlockProcessor processor, Block block)
 			var line = lines.Lines[index];
 			var span = line.Slice.AsSpan();
 
+			var startIndex = Math.Max(span.IndexOf("//"), span.IndexOf('#'));
+			if (startIndex <= 0)
+				continue;
+
 			if (span.ReplaceSubstitutions(context.FrontMatter?.Properties, out var replacement))
 			{
 				var s = new StringSlice(replacement);