This repository was archived by the owner on Dec 19, 2018. It is now read-only.
New baselines for RazorDirectivesTest #2621
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
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 |
|---|---|---|
| @@ -1,15 +1,19 @@ | ||
| RazorDocument - [0..18)::18 - [@addTagHelper Foo"] | ||
| MarkupBlock - [0..18)::18 | ||
| MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; | ||
| CSharpCodeBlock - [0..18)::18 | ||
| RazorDirective - [0..18)::18 | ||
| CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Transition;[@]; | ||
| RazorDirectiveBody - [1..18)::17 | ||
| RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Identifier;[addTagHelper]; | ||
| CSharpCodeBlock - [13..18)::5 | ||
| MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None | ||
| Whitespace;[ ]; | ||
| CSharpStatementLiteral - [14..18)::4 - [Foo"] - Gen<AddTagHelper:{Foo";Foo";;} [RZ1000(17:0,17 [1] ), RZ1019(14:0,14 [4] ), RZ1036(14:0,14 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline | ||
| Identifier;[Foo]; | ||
| StringLiteral;["];RZ1000(17:0,17 [1] ) | ||
| MarkupTextLiteral - [18..18)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; |
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 |
|---|---|---|
| @@ -1,14 +1,18 @@ | ||
| RazorDocument - [0..17)::17 - [@addTagHelper Foo] | ||
| MarkupBlock - [0..17)::17 | ||
| MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; | ||
| CSharpCodeBlock - [0..17)::17 | ||
| RazorDirective - [0..17)::17 | ||
| CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Transition;[@]; | ||
| RazorDirectiveBody - [1..17)::16 | ||
| RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Identifier;[addTagHelper]; | ||
| CSharpCodeBlock - [13..17)::4 | ||
| MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None | ||
| Whitespace;[ ]; | ||
| CSharpStatementLiteral - [14..17)::3 - [Foo] - Gen<AddTagHelper:{Foo;Foo;;} [RZ1036(14:0,14 [3] )]> - SpanEditHandler;Accepts:AnyExceptNewline | ||
| Identifier;[Foo]; | ||
| MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; | ||
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 |
|---|---|---|
| @@ -1,14 +1,18 @@ | ||
| RazorDocument - [0..16)::16 - [@addTagHelper ""] | ||
| MarkupBlock - [0..16)::16 | ||
| MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; | ||
| CSharpCodeBlock - [0..16)::16 | ||
| RazorDirective - [0..16)::16 | ||
| CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Transition;[@]; | ||
| RazorDirectiveBody - [1..16)::15 | ||
| RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Identifier;[addTagHelper]; | ||
| CSharpCodeBlock - [13..16)::3 | ||
| MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None | ||
| Whitespace;[ ]; | ||
| CSharpStatementLiteral - [14..16)::2 - [""] - Gen<AddTagHelper:{"";;;} [RZ1036(15:0,15 [1] )]> - SpanEditHandler;Accepts:AnyExceptNewline | ||
| StringLiteral;[""]; | ||
| MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; |
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 |
|---|---|---|
| @@ -1,14 +1,18 @@ | ||
| RazorDocument - [0..14)::14 - [@addTagHelper ] | ||
| MarkupBlock - [0..14)::14 | ||
| MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; | ||
| CSharpCodeBlock - [0..14)::14 | ||
| RazorDirective - [0..14)::14 | ||
| CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Transition;[@]; | ||
| RazorDirectiveBody - [1..14)::13 | ||
| RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Identifier;[addTagHelper]; | ||
| CSharpCodeBlock - [13..14)::1 | ||
| MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None | ||
| Whitespace;[ ]; | ||
| CSharpStatementLiteral - [14..14)::0 - [] - Gen<AddTagHelper:{;;;} [RZ1018(1:0,1 [13] ), RZ1036(14:0,14 [1] )]> - SpanEditHandler;Accepts:AnyExceptNewline | ||
| Marker;[]; | ||
| MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; |
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 |
|---|---|---|
| @@ -1,14 +1,18 @@ | ||
| RazorDocument - [0..22)::22 - [@addTagHelper '*, Foo'] | ||
| MarkupBlock - [0..22)::22 | ||
| MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; | ||
| CSharpCodeBlock - [0..22)::22 | ||
| RazorDirective - [0..22)::22 | ||
| CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Transition;[@]; | ||
| RazorDirectiveBody - [1..22)::21 | ||
| RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Identifier;[addTagHelper]; | ||
| CSharpCodeBlock - [13..22)::9 | ||
| MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None | ||
| Whitespace;[ ]; | ||
| CSharpStatementLiteral - [14..22)::8 - ['*, Foo'] - Gen<AddTagHelper:{'*, Foo';'*, Foo';;} [RZ1036(14:0,14 [8] )]> - SpanEditHandler;Accepts:AnyExceptNewline | ||
| CharacterLiteral;['*, Foo']; | ||
| MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; |
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 |
|---|---|---|
| @@ -1,14 +1,18 @@ | ||
| RazorDocument - [0..18)::18 - [@addTagHelper "Foo] | ||
| MarkupBlock - [0..18)::18 | ||
| MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; | ||
| CSharpCodeBlock - [0..18)::18 | ||
| RazorDirective - [0..18)::18 | ||
| CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Transition;[@]; | ||
| RazorDirectiveBody - [1..18)::17 | ||
| RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Identifier;[addTagHelper]; | ||
| CSharpCodeBlock - [13..18)::5 | ||
| MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None | ||
| Whitespace;[ ]; | ||
| CSharpStatementLiteral - [14..18)::4 - ["Foo] - Gen<AddTagHelper:{"Foo;"Foo;;} [RZ1000(14:0,14 [1] ), RZ1019(14:0,14 [4] ), RZ1036(14:0,14 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline | ||
| StringLiteral;["Foo];RZ1000(14:0,14 [1] ) | ||
| MarkupTextLiteral - [18..18)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; |
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 |
|---|---|---|
| @@ -1,18 +1,22 @@ | ||
| RazorDocument - [0..32)::32 - [@addTagHelper Foo, Bar ] | ||
| MarkupBlock - [0..32)::32 | ||
| MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; | ||
| CSharpCodeBlock - [0..32)::32 | ||
| RazorDirective - [0..32)::32 | ||
| CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Transition;[@]; | ||
| RazorDirectiveBody - [1..32)::31 | ||
| RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Identifier;[addTagHelper]; | ||
| CSharpCodeBlock - [13..32)::19 | ||
| MarkupTextLiteral - [13..18)::5 - [ ] - Gen<None> - SpanEditHandler;Accepts:None | ||
| Whitespace;[ ]; | ||
| CSharpStatementLiteral - [18..32)::14 - [Foo, Bar ] - Gen<AddTagHelper:{Foo, Bar;Foo, Bar;Foo;Bar}> - SpanEditHandler;Accepts:AnyExceptNewline | ||
| Identifier;[Foo]; | ||
| Comma;[,]; | ||
| Whitespace;[ ]; | ||
| Identifier;[Bar]; | ||
| Whitespace;[ ]; | ||
| MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; |
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 |
|---|---|---|
| @@ -1,14 +1,18 @@ | ||
| RazorDocument - [0..19)::19 - [@addTagHelper "Foo"] | ||
| MarkupBlock - [0..19)::19 | ||
| MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; | ||
| CSharpCodeBlock - [0..19)::19 | ||
| RazorDirective - [0..19)::19 | ||
| CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Transition;[@]; | ||
| RazorDirectiveBody - [1..19)::18 | ||
| RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None | ||
| Identifier;[addTagHelper]; | ||
| CSharpCodeBlock - [13..19)::6 | ||
| MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None | ||
| Whitespace;[ ]; | ||
| CSharpStatementLiteral - [14..19)::5 - ["Foo"] - Gen<AddTagHelper:{"Foo";Foo;;} [RZ1036(15:0,15 [3] )]> - SpanEditHandler;Accepts:AnyExceptNewline | ||
| StringLiteral;["Foo"]; | ||
| MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any | ||
| Marker;[]; |
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 |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] ) | ||
|
Contributor
Author
There was a problem hiding this comment. Can I fight for this? I don't get why the whitespace prior to a directive needs to be part of the directive. The way I designed it, the directive starts with a transition There was a problem hiding this comment. How do you plan to implement trivia for directives? In my mind the leading whitespace of a directive should have the following characteristics:
With whatever trivia approach you have in mind would it make the above characteristics easy to implement/understand?
Contributor
Author
There was a problem hiding this comment. From what I understand from Roslyn, "trivia" is generally associated with tokens rather than specific nodes. Leading trivia of any node is basically the leading trivia of its first token. https://github.com/dotnet/roslyn/blob/master/src/Compilers/Core/Portable/Syntax/SyntaxNode.cs#L911. There was a problem hiding this comment.
Nah
Do you think it makes sense to design (not implement) the plans for trivia now so we can make better choices with the SyntaxTree? Or does it make sense to wait and do reactive changes later?
Contributor
Author
There was a problem hiding this comment. Spoke to @NTaylorMullen offline. We are not going to make this consistent with the old world because the old world already has different behavior depending on the contents of the previous line. I plan to keep this change and test this in the editor to make sure we didn't break anything. |
||
| Code span at (2:1,0 [2] ) (Accepts:Any) - Parent: Statement block at (2:1,0 [24] ) | ||
| Transition span at (4:1,2 [1] ) (Accepts:None) - Parent: Directive block at (4:1,2 [22] ) | ||
| MetaCode span at (5:1,3 [12] ) (Accepts:None) - Parent: Directive block at (4:1,2 [22] ) | ||
| Markup span at (17:1,15 [1] ) (Accepts:None) - Parent: Directive block at (4:1,2 [22] ) | ||
| Code span at (18:1,16 [8] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (4:1,2 [22] ) | ||
| Markup span at (26:1,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] ) | ||
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.
Might eventually make sense to lift this outside of the directive body since it represents the directive identifier.
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.
Added to https://github.com/aspnet/Razor/issues/2619#issue-364659549