-
Notifications
You must be signed in to change notification settings - Fork 191
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
Add @code directive support for Blazor #527
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
28 changes: 28 additions & 0 deletions
28
src/Razor/src/Microsoft.AspNetCore.Razor.Language/Components/ComponentCodeDirective.cs
This file contains 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,28 @@ | ||
// Copyright (c) .NET Foundation. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | ||
|
||
using System; | ||
|
||
namespace Microsoft.AspNetCore.Razor.Language.Components | ||
{ | ||
public static class ComponentCodeDirective | ||
{ | ||
public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective( | ||
"code", | ||
DirectiveKind.CodeBlock, | ||
builder => | ||
{ | ||
builder.Description = Resources.FunctionsDirective_Description; | ||
}); | ||
|
||
public static void Register(RazorProjectEngineBuilder builder) | ||
{ | ||
if (builder == null) | ||
{ | ||
throw new ArgumentNullException(nameof(builder)); | ||
} | ||
|
||
builder.AddDirective(Directive, FileKinds.Component); | ||
} | ||
} | ||
} |
This file contains 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 |
---|---|---|
@@ -1,6 +1,9 @@ | ||
// Copyright (c) .NET Foundation. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | ||
|
||
using System.Collections.Generic; | ||
using System.Linq; | ||
using Microsoft.AspNetCore.Razor.Language.Components; | ||
using Microsoft.AspNetCore.Razor.Language.Intermediate; | ||
|
||
namespace Microsoft.AspNetCore.Razor.Language.Extensions | ||
|
@@ -15,11 +18,27 @@ protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentInte | |
return; | ||
} | ||
|
||
var directiveNodes = new List<IntermediateNode>(); | ||
foreach (var functions in documentNode.FindDirectiveReferences(FunctionsDirective.Directive)) | ||
{ | ||
for (var i = 0; i < functions.Node.Children.Count; i++) | ||
directiveNodes.Add(functions.Node); | ||
} | ||
|
||
if (FileKinds.IsComponent(codeDocument.GetFileKind())) | ||
{ | ||
foreach (var code in documentNode.FindDirectiveReferences(ComponentCodeDirective.Directive)) | ||
{ | ||
directiveNodes.Add(code.Node); | ||
} | ||
} | ||
|
||
// Now we have all the directive nodes, we want to add them to the end of the class node in document order. | ||
var orderedDirectives = directiveNodes.OrderBy(n => n.Source?.AbsoluteIndex); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👏 |
||
foreach (var node in orderedDirectives) | ||
{ | ||
for (var i = 0; i < node.Children.Count; i++) | ||
{ | ||
@class.Children.Add(functions.Node.Children[i]); | ||
@class.Children.Add(node.Children[i]); | ||
} | ||
} | ||
} | ||
|
This file contains 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 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Name this
CodeDirective
and theRegister
below asRegisterForComponents
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm just following the same pattern as other component directives.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah I see, didn't realize we did that. Leave for now then, something we should revisit for all of the component like directives before RTM