Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor navigation and model hierarchy. #181

Merged
merged 2 commits into from
Jan 13, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
adjust namespaces
  • Loading branch information
Mpdreamz committed Jan 13, 2025

Verified

This commit was signed with the committer’s verified signature.
Mpdreamz Martijn Laarman
commit dd7ef9a2cc28bebef2f820e46198ae1206bb3e4c
1 change: 1 addition & 0 deletions src/Elastic.Markdown/BuildContext.cs
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
using System.IO.Abstractions;
using Elastic.Markdown.Diagnostics;
using Elastic.Markdown.IO;
using Elastic.Markdown.IO.Discovery;

namespace Elastic.Markdown;

1 change: 1 addition & 0 deletions src/Elastic.Markdown/DocumentationGenerator.cs
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
using System.Reflection;
using System.Text.Json;
using Elastic.Markdown.IO;
using Elastic.Markdown.IO.State;
using Elastic.Markdown.Slices;
using Microsoft.Extensions.Logging;

2 changes: 1 addition & 1 deletion src/Elastic.Markdown/IO/Configuration/ConfigurationFile.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
using YamlDotNet.Core;
using YamlDotNet.RepresentationModel;

namespace Elastic.Markdown.IO;
namespace Elastic.Markdown.IO.Configuration;

public record ConfigurationFile : DocumentationFile
{
2 changes: 1 addition & 1 deletion src/Elastic.Markdown/IO/Configuration/ITocItem.cs
Original file line number Diff line number Diff line change
@@ -2,7 +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

namespace Elastic.Markdown.IO;
namespace Elastic.Markdown.IO.Configuration;

public interface ITocItem;

Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
using System.Text.Json.Serialization;
using SoftCircuits.IniFileParser;

namespace Elastic.Markdown.IO;
namespace Elastic.Markdown.IO.Discovery;

public record GitCheckoutInformation
{
2 changes: 2 additions & 0 deletions src/Elastic.Markdown/IO/DocumentationSet.cs
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@

using System.IO.Abstractions;
using Elastic.Markdown.Diagnostics;
using Elastic.Markdown.IO.Configuration;
using Elastic.Markdown.IO.Navigation;
using Elastic.Markdown.Myst;

namespace Elastic.Markdown.IO;
1 change: 1 addition & 0 deletions src/Elastic.Markdown/IO/MarkdownFile.cs
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information
using System.IO.Abstractions;
using Elastic.Markdown.Diagnostics;
using Elastic.Markdown.IO.Navigation;
using Elastic.Markdown.Myst;
using Elastic.Markdown.Myst.Directives;
using Elastic.Markdown.Myst.FrontMatter;
4 changes: 3 additions & 1 deletion src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs
Original file line number Diff line number Diff line change
@@ -2,7 +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

namespace Elastic.Markdown.IO;
using Elastic.Markdown.IO.Configuration;

namespace Elastic.Markdown.IO.Navigation;

public interface INavigationItem
{
4 changes: 2 additions & 2 deletions src/Elastic.Markdown/IO/State/GenerationState.cs
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@
// See the LICENSE file in the project root for more information

using System.Text.Json.Serialization;
using Elastic.Markdown.IO;
using Elastic.Markdown.IO.Discovery;

namespace Elastic.Markdown;
namespace Elastic.Markdown.IO.State;

public record GenerationState
{
3 changes: 2 additions & 1 deletion src/Elastic.Markdown/IO/State/LinkReference.cs
Original file line number Diff line number Diff line change
@@ -3,8 +3,9 @@
// See the LICENSE file in the project root for more information

using System.Text.Json.Serialization;
using Elastic.Markdown.IO.Discovery;

namespace Elastic.Markdown.IO;
namespace Elastic.Markdown.IO.State;

public record LinkReference
{
1 change: 1 addition & 0 deletions src/Elastic.Markdown/Myst/Directives/IncludeBlock.cs
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
using System.IO.Abstractions;
using Elastic.Markdown.Diagnostics;
using Elastic.Markdown.IO;
using Elastic.Markdown.IO.Configuration;
using Elastic.Markdown.Myst.FrontMatter;

namespace Elastic.Markdown.Myst.Directives;
1 change: 1 addition & 0 deletions src/Elastic.Markdown/Myst/Directives/SettingsBlock.cs
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
using System.IO.Abstractions;
using Elastic.Markdown.Diagnostics;
using Elastic.Markdown.IO;
using Elastic.Markdown.IO.Configuration;
using Elastic.Markdown.Myst.FrontMatter;

namespace Elastic.Markdown.Myst.Directives;
1 change: 1 addition & 0 deletions src/Elastic.Markdown/Myst/MarkdownParser.cs
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
using System.IO.Abstractions;
using Cysharp.IO;
using Elastic.Markdown.IO;
using Elastic.Markdown.IO.Configuration;
using Elastic.Markdown.Myst.CodeBlocks;
using Elastic.Markdown.Myst.Comments;
using Elastic.Markdown.Myst.Directives;
1 change: 1 addition & 0 deletions src/Elastic.Markdown/Myst/ParserContext.cs
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
using System.IO.Abstractions;
using Elastic.Markdown.Diagnostics;
using Elastic.Markdown.IO;
using Elastic.Markdown.IO.Configuration;
using Elastic.Markdown.Myst.FrontMatter;
using Markdig;
using Markdig.Parsers;
2 changes: 1 addition & 1 deletion src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using Elastic.Markdown.IO
@using Elastic.Markdown.IO.Navigation
@inherits RazorSlice<NavigationTreeItem>
@foreach (var item in Model.SubTree.NavigationItems)
{
1 change: 1 addition & 0 deletions src/Elastic.Markdown/Slices/_ViewModels.cs
Original file line number Diff line number Diff line change
@@ -2,6 +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 Elastic.Markdown.IO;
using Elastic.Markdown.IO.Navigation;
using Elastic.Markdown.Myst.FrontMatter;

namespace Elastic.Markdown.Slices;
2 changes: 2 additions & 0 deletions src/Elastic.Markdown/SourceGenerationContext.cs
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@

using System.Text.Json.Serialization;
using Elastic.Markdown.IO;
using Elastic.Markdown.IO.Discovery;
using Elastic.Markdown.IO.State;

namespace Elastic.Markdown;

2 changes: 2 additions & 0 deletions tests/Elastic.Markdown.Tests/DocSet/LinkReferenceTests.cs
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@
// See the LICENSE file in the project root for more information

using Elastic.Markdown.IO;
using Elastic.Markdown.IO.Discovery;
using Elastic.Markdown.IO.State;
using FluentAssertions;
using Xunit.Abstractions;

1 change: 1 addition & 0 deletions tests/Elastic.Markdown.Tests/DocSet/NavigationTestsBase.cs
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
using System.IO.Abstractions.TestingHelpers;
using Elastic.Markdown.Diagnostics;
using Elastic.Markdown.IO;
using Elastic.Markdown.IO.Configuration;
using FluentAssertions;
using Xunit.Abstractions;