-
Notifications
You must be signed in to change notification settings - Fork 879
feat: permits to specify the placement of overwrites #9937
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
f95688d
feat: permits to specify the placement of overwrites
Patrick8639 2189e45
Merge branch 'main' into feat/merge-overwrite
Patrick8639 1a3fb35
Corrected a small bug after refactoring.
Patrick8639 d554ccb
IItemWithMetadata is now internal.
Patrick8639 466d704
Merge branch 'main' into feat/merge-overwrite
yufeih d891f3e
Merge branch 'dotnet:main' into feat/merge-overwrite
Patrick8639 9ff1f69
PolySharp is no more active for Docfx.Common
Patrick8639 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
feat: permits to specify the placement of overwrites
- Loading branch information
commit f95688d41118bd042b43b2e6e4f2a8dec1e254a7
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements.\r | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
|
|
||
| namespace Docfx.Common.EntityMergers; | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// The placement for a merge. | ||
| /// </summary> | ||
| internal enum MergePlacement | ||
| { | ||
|
|
||
| /// <summary> | ||
| /// The placement is not specified. | ||
| /// </summary> | ||
| None, | ||
|
|
||
| /// <summary> | ||
| /// The override must be placed after the original content. | ||
| /// </summary> | ||
| After, | ||
|
|
||
| /// <summary> | ||
| /// The override must be placed before the original content. | ||
| /// </summary> | ||
| Before, | ||
|
|
||
| /// <summary> | ||
| /// The override must replace the original content. | ||
| /// </summary> | ||
| Replace | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements.\r | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
|
|
||
| namespace Docfx.Common; | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// An item that contains metadate | ||
| /// </summary> | ||
| public interface IItemWithMetadata | ||
| { | ||
|
|
||
| /// <summary> | ||
| /// Gets the metadata. | ||
| /// </summary> | ||
| /// <value>The metadata.</value> | ||
| Dictionary<string, object> Metadata { get; } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.