+ [|hello
+
+ """,
+ expected: """
+
+
|]
+
+ hello
+
+ """,
+ otherOptions: new()
+ {
+ { "fromPaste", true }
+ });
+ }
+
+ private async Task VerifyRangeFormattingAsync(TestCode input, string expected, Dictionary
+
+ TestGeneric
+ + @code + { + [Parameter] public IEnumerableTestGeneric
+ + @code + { + [Parameter] public IEnumerable@DateTime.Now
+ } +@DateTime.Now
+ } +
+ @foreach ( var i in new int[] { 1, 23 } )
+ {
+
+ }
+
+
+ """,
+ expected: """
+
+
+ @foreach (var i in new int[] { 1, 23 })
+ {
+
+ }
+
+
+ """);
+ }
+
+ [FormattingTestFact]
+ public async Task PreprocessorDirectives()
+ {
+ await RunFormattingTestAsync(
+ input: """
+
+
+ @{
+ #if DEBUG
+ }
+
+ @{
+ #endif
+ }
+
+
+ @code {
+ private object SomeModel {get;set;}
+ }
+ """,
+ expected: """
+
+
+ @{
+ #if DEBUG
+ }
+
+ @{
+ #endif
+ }
+
+
+ @code {
+ private object SomeModel { get; set; }
+ }
+ """,
+ allowDiagnostics: true);
+ }
+
+ private Task RunFormattingTestAsync(
+ TestCode input,
+ string expected)
+ {
+ return base.RunFormattingTestAsync(
+ input,
+ expected,
+ additionalFiles: [
+ (FilePath("Components.cs"), """
+ using Microsoft.AspNetCore.Components;
+ namespace Test
+ {
+ public class GridTable : ComponentBase
+ {
+ [Parameter]
+ public RenderFragment ChildContent { get; set; }
+ }
+
+ public class GridRow : ComponentBase
+ {
+ [Parameter]
+ public RenderFragment ChildContent { get; set; }
+ }
+
+ public class GridCell : ComponentBase
+ {
+ [Parameter]
+ public RenderFragment ChildContent { get; set; }
+ }
+
+ public class Component1 : ComponentBase
+ {
+ [Parameter]
+ public string Id { get; set; }
+
+ [Parameter]
+ public string Caption { get; set; }
+
+ [Parameter]
+ public RenderFragment Frag {get;set;}
+ }
+ }
+ """),
+ (FilePath("Select.razor"), """
+ @typeparam TValue
+ @attribute [CascadingTypeParameter(nameof(TValue))]
+ @{var [|abc|] = 123;}
+ """; + + await VerifyProximityExpressionsAsync(input, ["__builder", "this"]); + } + + [Fact] + public async Task ResolveProximityExpressionsAsync_InsideExplicitStatement() + { + var input = """ + + +@{var$$ [|abc|] = 123;}
+ """; + + await VerifyProximityExpressionsAsync(input, ["__builder", "this"]); + } + [Fact] public async Task ResolveProximityExpressionsAsync_ImplicitExpression() { @@ -174,6 +208,59 @@ public async Task ResolveBreakpointRangeAsync_OutsideImplicitExpression() await VerifyBreakpointRangeAsync(input); } + [Fact] + public async Task ResolveBreakpointRangeAsync_OutsideExplicitStatement() + { + var input = """ + + + $$@{ [|var abc = 123;|] }
+ """; + + await VerifyBreakpointRangeAsync(input); + } + + [Fact] + public async Task ResolveBreakpointRangeAsync_OutsideExplicitStatement_NoCSharpOnLine() + { + var input = """ + + + $$@{ + var abc = 123; + }
+ """; + + await VerifyBreakpointRangeAsync(input); + } + + [Fact] + public async Task ResolveBreakpointRangeAsync_InsideExplicitStatement_NoCSharpOnLine() + { + var input = """ + + +@{ + $$ + var abc = 123; + }
+ """; + + await VerifyBreakpointRangeAsync(input); + } + + [Fact] + public async Task ResolveBreakpointRangeAsync_OutsideExplicitStatement_InvalidLocation() + { + var input = """ + + + $$@{ var abc; }
+ """; + + await VerifyBreakpointRangeAsync(input); + } + [Fact] public async Task ResolveBreakpointRangeAsync_ComponentStartTag() { diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions.txt new file mode 100644 index 00000000000..44e48e76d48 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions.txt @@ -0,0 +1,21 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 8 struct name [] [DateTime] +0 8 1 operator [] [.] +0 1 3 property name [static] [Now] +2 0 1 razorTransition [] [@] +0 1 1 razorTransition [] [(] +0 1 7 string [] ["hello"] +0 8 1 operator [] [+] +0 2 1 string [] ["] +0 1 2 string - escape character [] [\\] +0 2 2 string [] [n"] +0 3 1 operator [] [+] +0 2 7 string [] ["world"] +0 8 1 operator [] [+] +0 2 11 class name [static] [Environment] +0 11 1 operator [] [.] +0 1 7 property name [static] [NewLine] +0 8 1 operator [] [+] +0 2 14 string [] ["how are you?"] +0 14 1 razorTransition [] [)] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions_misc_file.txt new file mode 100644 index 00000000000..44e48e76d48 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions_misc_file.txt @@ -0,0 +1,21 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 8 struct name [] [DateTime] +0 8 1 operator [] [.] +0 1 3 property name [static] [Now] +2 0 1 razorTransition [] [@] +0 1 1 razorTransition [] [(] +0 1 7 string [] ["hello"] +0 8 1 operator [] [+] +0 2 1 string [] ["] +0 1 2 string - escape character [] [\\] +0 2 2 string [] [n"] +0 3 1 operator [] [+] +0 2 7 string [] ["world"] +0 8 1 operator [] [+] +0 2 11 class name [static] [Environment] +0 11 1 operator [] [.] +0 1 7 property name [static] [NewLine] +0 8 1 operator [] [+] +0 2 14 string [] ["how are you?"] +0 14 1 razorTransition [] [)] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions_with_background.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions_with_background.txt new file mode 100644 index 00000000000..734b8029813 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions_with_background.txt @@ -0,0 +1,29 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [razorCode] [@] +0 1 8 struct name [razorCode] [DateTime] +0 8 1 operator [razorCode] [.] +0 1 3 property name [static, razorCode] [Now] +2 0 1 razorTransition [razorCode] [@] +0 1 1 razorTransition [razorCode] [(] +0 1 7 string [razorCode] ["hello"] +0 7 1 markupTextLiteral [razorCode] [ ] +0 1 1 operator [razorCode] [+] +0 1 1 markupTextLiteral [razorCode] [ ] +0 1 1 string [razorCode] ["] +0 1 2 string - escape character [razorCode] [\\] +0 2 2 string [razorCode] [n"] +0 2 1 markupTextLiteral [razorCode] [ ] +0 1 1 operator [razorCode] [+] +0 1 1 markupTextLiteral [razorCode] [ ] +0 1 7 string [razorCode] ["world"] +0 7 1 markupTextLiteral [razorCode] [ ] +0 1 1 operator [razorCode] [+] +0 1 1 markupTextLiteral [razorCode] [ ] +0 1 11 class name [static, razorCode] [Environment] +0 11 1 operator [razorCode] [.] +0 1 7 property name [static, razorCode] [NewLine] +0 7 1 markupTextLiteral [razorCode] [ ] +0 1 1 operator [razorCode] [+] +0 1 1 markupTextLiteral [razorCode] [ ] +0 1 14 string [razorCode] ["how are you?"] +0 14 1 razorTransition [razorCode] [)] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions_with_background_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions_with_background_misc_file.txt new file mode 100644 index 00000000000..734b8029813 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Expressions_with_background_misc_file.txt @@ -0,0 +1,29 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [razorCode] [@] +0 1 8 struct name [razorCode] [DateTime] +0 8 1 operator [razorCode] [.] +0 1 3 property name [static, razorCode] [Now] +2 0 1 razorTransition [razorCode] [@] +0 1 1 razorTransition [razorCode] [(] +0 1 7 string [razorCode] ["hello"] +0 7 1 markupTextLiteral [razorCode] [ ] +0 1 1 operator [razorCode] [+] +0 1 1 markupTextLiteral [razorCode] [ ] +0 1 1 string [razorCode] ["] +0 1 2 string - escape character [razorCode] [\\] +0 2 2 string [razorCode] [n"] +0 2 1 markupTextLiteral [razorCode] [ ] +0 1 1 operator [razorCode] [+] +0 1 1 markupTextLiteral [razorCode] [ ] +0 1 7 string [razorCode] ["world"] +0 7 1 markupTextLiteral [razorCode] [ ] +0 1 1 operator [razorCode] [+] +0 1 1 markupTextLiteral [razorCode] [ ] +0 1 11 class name [static, razorCode] [Environment] +0 11 1 operator [razorCode] [.] +0 1 7 property name [static, razorCode] [NewLine] +0 7 1 markupTextLiteral [razorCode] [ ] +0 1 1 operator [razorCode] [+] +0 1 1 markupTextLiteral [razorCode] [ ] +0 1 14 string [razorCode] ["how are you?"] +0 14 1 razorTransition [razorCode] [)] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static.txt new file mode 100644 index 00000000000..1f7a70bd6f5 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static.txt @@ -0,0 +1,26 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 5 keyword [] [using] +0 6 6 namespace name [] [System] +1 0 1 razorTransition [] [@] +0 1 4 razorDirective [] [code] +1 0 1 razorTransition [] [{] +1 4 7 keyword [] [private] +0 8 6 keyword [] [static] +0 7 4 keyword [] [bool] +0 5 9 field name [static] [_isStatic] +0 9 1 punctuation [] [;] +2 4 6 keyword [] [public] +0 7 4 keyword [] [void] +0 5 1 method name [] [M] +0 1 1 punctuation [] [(] +0 1 1 punctuation [] [)] +1 4 1 punctuation [] [{] +1 8 2 keyword - control [] [if] +0 3 1 punctuation [] [(] +0 1 9 field name [static] [_isStatic] +0 9 1 punctuation [] [)] +1 8 1 punctuation [] [{] +1 8 1 punctuation [] [}] +1 4 1 punctuation [] [}] +1 0 1 razorTransition [] [}] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static_misc_file.txt new file mode 100644 index 00000000000..1f7a70bd6f5 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static_misc_file.txt @@ -0,0 +1,26 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 5 keyword [] [using] +0 6 6 namespace name [] [System] +1 0 1 razorTransition [] [@] +0 1 4 razorDirective [] [code] +1 0 1 razorTransition [] [{] +1 4 7 keyword [] [private] +0 8 6 keyword [] [static] +0 7 4 keyword [] [bool] +0 5 9 field name [static] [_isStatic] +0 9 1 punctuation [] [;] +2 4 6 keyword [] [public] +0 7 4 keyword [] [void] +0 5 1 method name [] [M] +0 1 1 punctuation [] [(] +0 1 1 punctuation [] [)] +1 4 1 punctuation [] [{] +1 8 2 keyword - control [] [if] +0 3 1 punctuation [] [(] +0 1 9 field name [static] [_isStatic] +0 9 1 punctuation [] [)] +1 8 1 punctuation [] [{] +1 8 1 punctuation [] [}] +1 4 1 punctuation [] [}] +1 0 1 razorTransition [] [}] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static_with_background.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static_with_background.txt new file mode 100644 index 00000000000..f5507df10a8 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static_with_background.txt @@ -0,0 +1,40 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 5 keyword [razorCode] [using] +0 5 1 markupTextLiteral [razorCode] [ ] +0 1 6 namespace name [razorCode] [System] +1 0 1 razorTransition [] [@] +0 1 4 razorDirective [] [code] +1 0 1 razorTransition [] [{] +1 0 4 markupTextLiteral [razorCode] [ ] +0 4 7 keyword [razorCode] [private] +0 7 1 markupTextLiteral [razorCode] [ ] +0 1 6 keyword [razorCode] [static] +0 6 1 markupTextLiteral [razorCode] [ ] +0 1 4 keyword [razorCode] [bool] +0 4 1 markupTextLiteral [razorCode] [ ] +0 1 9 field name [static, razorCode] [_isStatic] +0 9 1 punctuation [razorCode] [;] +2 0 4 markupTextLiteral [razorCode] [ ] +0 4 6 keyword [razorCode] [public] +0 6 1 markupTextLiteral [razorCode] [ ] +0 1 4 keyword [razorCode] [void] +0 4 1 markupTextLiteral [razorCode] [ ] +0 1 1 method name [razorCode] [M] +0 1 1 punctuation [razorCode] [(] +0 1 1 punctuation [razorCode] [)] +1 0 4 markupTextLiteral [razorCode] [ ] +0 4 1 punctuation [razorCode] [{] +1 0 8 markupTextLiteral [razorCode] [ ] +0 8 2 keyword - control [razorCode] [if] +0 2 1 markupTextLiteral [razorCode] [ ] +0 1 1 punctuation [razorCode] [(] +0 1 9 field name [static, razorCode] [_isStatic] +0 9 1 punctuation [razorCode] [)] +1 0 8 markupTextLiteral [razorCode] [ ] +0 8 1 punctuation [razorCode] [{] +1 0 8 markupTextLiteral [razorCode] [ ] +0 8 1 punctuation [razorCode] [}] +1 0 4 markupTextLiteral [razorCode] [ ] +0 4 1 punctuation [razorCode] [}] +1 0 1 razorTransition [] [}] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static_with_background_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static_with_background_misc_file.txt new file mode 100644 index 00000000000..f5507df10a8 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_CSharp_Static_with_background_misc_file.txt @@ -0,0 +1,40 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 5 keyword [razorCode] [using] +0 5 1 markupTextLiteral [razorCode] [ ] +0 1 6 namespace name [razorCode] [System] +1 0 1 razorTransition [] [@] +0 1 4 razorDirective [] [code] +1 0 1 razorTransition [] [{] +1 0 4 markupTextLiteral [razorCode] [ ] +0 4 7 keyword [razorCode] [private] +0 7 1 markupTextLiteral [razorCode] [ ] +0 1 6 keyword [razorCode] [static] +0 6 1 markupTextLiteral [razorCode] [ ] +0 1 4 keyword [razorCode] [bool] +0 4 1 markupTextLiteral [razorCode] [ ] +0 1 9 field name [static, razorCode] [_isStatic] +0 9 1 punctuation [razorCode] [;] +2 0 4 markupTextLiteral [razorCode] [ ] +0 4 6 keyword [razorCode] [public] +0 6 1 markupTextLiteral [razorCode] [ ] +0 1 4 keyword [razorCode] [void] +0 4 1 markupTextLiteral [razorCode] [ ] +0 1 1 method name [razorCode] [M] +0 1 1 punctuation [razorCode] [(] +0 1 1 punctuation [razorCode] [)] +1 0 4 markupTextLiteral [razorCode] [ ] +0 4 1 punctuation [razorCode] [{] +1 0 8 markupTextLiteral [razorCode] [ ] +0 8 2 keyword - control [razorCode] [if] +0 2 1 markupTextLiteral [razorCode] [ ] +0 1 1 punctuation [razorCode] [(] +0 1 9 field name [static, razorCode] [_isStatic] +0 9 1 punctuation [razorCode] [)] +1 0 8 markupTextLiteral [razorCode] [ ] +0 8 1 punctuation [razorCode] [{] +1 0 8 markupTextLiteral [razorCode] [ ] +0 8 1 punctuation [razorCode] [}] +1 0 4 markupTextLiteral [razorCode] [ ] +0 4 1 punctuation [razorCode] [}] +1 0 1 razorTransition [] [}] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model.txt new file mode 100644 index 00000000000..e830d034a27 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model.txt @@ -0,0 +1,28 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 5 keyword [] [using] +0 6 6 namespace name [] [System] +1 0 1 razorTransition [] [@] +0 1 5 razorDirective [] [model] +0 6 9 variable [] [SampleApp] +0 9 1 operator [] [.] +0 1 5 variable [] [Pages] +0 5 1 operator [] [.] +0 1 10 variable [] [ErrorModel] +2 0 1 markupTagDelimiter [] [<] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] +2 4 1 razorTransition [] [@] +0 1 1 razorTransition [] [{] +1 8 1 razorTransition [] [@] +0 1 5 property name [] [Model] +0 5 1 operator [] [.] +0 1 8 variable [] [ToString] +0 8 1 punctuation [] [(] +0 1 1 punctuation [] [)] +0 1 1 punctuation [] [;] +1 4 1 razorTransition [] [}] +2 0 1 markupTagDelimiter [] [<] +0 1 1 markupTagDelimiter [] [/] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model_misc_file.txt new file mode 100644 index 00000000000..68fbef584f4 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model_misc_file.txt @@ -0,0 +1,28 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 5 keyword [] [using] +0 6 6 namespace name [] [System] +1 0 1 razorTransition [] [@] +0 1 5 razorDirective [] [model] +0 6 9 variable [] [SampleApp] +0 9 1 operator [] [.] +0 1 5 variable [] [Pages] +0 5 1 operator [] [.] +0 1 10 variable [] [ErrorModel] +2 0 1 markupTagDelimiter [] [<] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] +2 4 1 razorTransition [] [@] +0 1 1 razorTransition [] [{] +1 8 1 razorTransition [] [@] +0 1 5 variable [] [Model] +0 5 1 operator [] [.] +0 1 8 variable [] [ToString] +0 8 1 punctuation [] [(] +0 1 1 punctuation [] [)] +0 1 1 punctuation [] [;] +1 4 1 razorTransition [] [}] +2 0 1 markupTagDelimiter [] [<] +0 1 1 markupTagDelimiter [] [/] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model_with_background.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model_with_background.txt new file mode 100644 index 00000000000..b4ce0bcab7c --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model_with_background.txt @@ -0,0 +1,29 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 5 keyword [razorCode] [using] +0 5 1 markupTextLiteral [razorCode] [ ] +0 1 6 namespace name [razorCode] [System] +1 0 1 razorTransition [] [@] +0 1 5 razorDirective [] [model] +0 6 9 variable [razorCode] [SampleApp] +0 9 1 operator [razorCode] [.] +0 1 5 variable [razorCode] [Pages] +0 5 1 operator [razorCode] [.] +0 1 10 variable [razorCode] [ErrorModel] +2 0 1 markupTagDelimiter [] [<] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] +2 4 1 razorTransition [razorCode] [@] +0 1 1 razorTransition [razorCode] [{] +1 8 1 razorTransition [razorCode] [@] +0 1 5 property name [razorCode] [Model] +0 5 1 operator [razorCode] [.] +0 1 8 variable [razorCode] [ToString] +0 8 1 punctuation [razorCode] [(] +0 1 1 punctuation [razorCode] [)] +0 1 1 punctuation [razorCode] [;] +1 4 1 razorTransition [razorCode] [}] +2 0 1 markupTagDelimiter [] [<] +0 1 1 markupTagDelimiter [] [/] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model_with_background_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model_with_background_misc_file.txt new file mode 100644 index 00000000000..2a53fba49c4 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Legacy_Model_with_background_misc_file.txt @@ -0,0 +1,29 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 5 keyword [razorCode] [using] +0 5 1 markupTextLiteral [razorCode] [ ] +0 1 6 namespace name [razorCode] [System] +1 0 1 razorTransition [] [@] +0 1 5 razorDirective [] [model] +0 6 9 variable [razorCode] [SampleApp] +0 9 1 operator [razorCode] [.] +0 1 5 variable [razorCode] [Pages] +0 5 1 operator [razorCode] [.] +0 1 10 variable [razorCode] [ErrorModel] +2 0 1 markupTagDelimiter [] [<] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] +2 4 1 razorTransition [razorCode] [@] +0 1 1 razorTransition [razorCode] [{] +1 8 1 razorTransition [razorCode] [@] +0 1 5 variable [razorCode] [Model] +0 5 1 operator [razorCode] [.] +0 1 8 variable [razorCode] [ToString] +0 8 1 punctuation [razorCode] [(] +0 1 1 punctuation [razorCode] [)] +0 1 1 punctuation [razorCode] [;] +1 4 1 razorTransition [razorCode] [}] +2 0 1 markupTagDelimiter [] [<] +0 1 1 markupTagDelimiter [] [/] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync.txt new file mode 100644 index 00000000000..387010ee930 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync.txt @@ -0,0 +1,6 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 11 razorComment [] [ A comment ] +0 11 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync_misc_file.txt new file mode 100644 index 00000000000..387010ee930 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync_misc_file.txt @@ -0,0 +1,6 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 11 razorComment [] [ A comment ] +0 11 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync_with_background.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync_with_background.txt new file mode 100644 index 00000000000..387010ee930 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync_with_background.txt @@ -0,0 +1,6 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 11 razorComment [] [ A comment ] +0 11 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync_with_background_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync_with_background_misc_file.txt new file mode 100644 index 00000000000..387010ee930 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_CommentAsync_with_background_misc_file.txt @@ -0,0 +1,6 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 11 razorComment [] [ A comment ] +0 11 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync.txt new file mode 100644 index 00000000000..a60a8821ae3 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync.txt @@ -0,0 +1,7 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 5 razorComment [] [stuff] +1 0 7 razorComment [] [things ] +0 7 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync_misc_file.txt new file mode 100644 index 00000000000..a60a8821ae3 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync_misc_file.txt @@ -0,0 +1,7 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 5 razorComment [] [stuff] +1 0 7 razorComment [] [things ] +0 7 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync_with_background.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync_with_background.txt new file mode 100644 index 00000000000..a60a8821ae3 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync_with_background.txt @@ -0,0 +1,7 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 5 razorComment [] [stuff] +1 0 7 razorComment [] [things ] +0 7 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync_with_background_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync_with_background_misc_file.txt new file mode 100644 index 00000000000..a60a8821ae3 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentAsync_with_background_misc_file.txt @@ -0,0 +1,7 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 5 razorComment [] [stuff] +1 0 7 razorComment [] [things ] +0 7 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync.txt new file mode 100644 index 00000000000..31196b3e573 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync.txt @@ -0,0 +1,12 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 markupTagDelimiter [] [<] +0 1 1 markupElement [] [a] +0 2 1 markupTagDelimiter [] [/] +0 1 1 markupTagDelimiter [] [>] +0 1 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +1 0 3 razorComment [] [skd] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync_misc_file.txt new file mode 100644 index 00000000000..31196b3e573 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync_misc_file.txt @@ -0,0 +1,12 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 markupTagDelimiter [] [<] +0 1 1 markupElement [] [a] +0 2 1 markupTagDelimiter [] [/] +0 1 1 markupTagDelimiter [] [>] +0 1 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +1 0 3 razorComment [] [skd] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync_with_background.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync_with_background.txt new file mode 100644 index 00000000000..31196b3e573 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync_with_background.txt @@ -0,0 +1,12 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 markupTagDelimiter [] [<] +0 1 1 markupElement [] [a] +0 2 1 markupTagDelimiter [] [/] +0 1 1 markupTagDelimiter [] [>] +0 1 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +1 0 3 razorComment [] [skd] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync_with_background_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync_with_background_misc_file.txt new file mode 100644 index 00000000000..31196b3e573 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentMidlineAsync_with_background_misc_file.txt @@ -0,0 +1,12 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 markupTagDelimiter [] [<] +0 1 1 markupElement [] [a] +0 2 1 markupTagDelimiter [] [/] +0 1 1 markupTagDelimiter [] [>] +0 1 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +1 0 3 razorComment [] [skd] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines.txt new file mode 100644 index 00000000000..8c8488c5abc --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines.txt @@ -0,0 +1,10 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +2 0 3 razorComment [] [skd] +1 0 4 razorComment [] [ ] +1 0 19 razorComment [] [ sdfasdfasdf] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF.txt new file mode 100644 index 00000000000..8c8488c5abc --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF.txt @@ -0,0 +1,10 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +2 0 3 razorComment [] [skd] +1 0 4 razorComment [] [ ] +1 0 19 razorComment [] [ sdfasdfasdf] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF_misc_file.txt new file mode 100644 index 00000000000..8c8488c5abc --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF_misc_file.txt @@ -0,0 +1,10 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +2 0 3 razorComment [] [skd] +1 0 4 razorComment [] [ ] +1 0 19 razorComment [] [ sdfasdfasdf] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF_with_background.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF_with_background.txt new file mode 100644 index 00000000000..8c8488c5abc --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF_with_background.txt @@ -0,0 +1,10 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +2 0 3 razorComment [] [skd] +1 0 4 razorComment [] [ ] +1 0 19 razorComment [] [ sdfasdfasdf] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF_with_background_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF_with_background_misc_file.txt new file mode 100644 index 00000000000..8c8488c5abc --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_LF_with_background_misc_file.txt @@ -0,0 +1,10 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +2 0 3 razorComment [] [skd] +1 0 4 razorComment [] [ ] +1 0 19 razorComment [] [ sdfasdfasdf] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_misc_file.txt new file mode 100644 index 00000000000..8c8488c5abc --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_misc_file.txt @@ -0,0 +1,10 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +2 0 3 razorComment [] [skd] +1 0 4 razorComment [] [ ] +1 0 19 razorComment [] [ sdfasdfasdf] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_with_background.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_with_background.txt new file mode 100644 index 00000000000..8c8488c5abc --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_with_background.txt @@ -0,0 +1,10 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +2 0 3 razorComment [] [skd] +1 0 4 razorComment [] [ ] +1 0 19 razorComment [] [ sdfasdfasdf] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_with_background_misc_file.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_with_background_misc_file.txt new file mode 100644 index 00000000000..8c8488c5abc --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_MultiLineCommentWithBlankLines_with_background_misc_file.txt @@ -0,0 +1,10 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorCommentTransition [] [@] +0 1 1 razorCommentStar [] [*] +0 1 4 razorComment [] [ kdl] +2 0 3 razorComment [] [skd] +1 0 4 razorComment [] [ ] +1 0 19 razorComment [] [ sdfasdfasdf] +1 0 3 razorComment [] [slf] +0 3 1 razorCommentStar [] [*] +0 1 1 razorCommentTransition [] [@] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_NestedTextDirectives.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_NestedTextDirectives.txt new file mode 100644 index 00000000000..84c1364073b --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/GetSemanticTokens_Razor_NestedTextDirectives.txt @@ -0,0 +1,55 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 5 keyword [] [using] +0 6 6 namespace name [] [System] +1 0 1 razorTransition [] [@] +0 1 9 razorDirective [] [functions] +0 10 1 razorTransition [] [{] +1 4 7 keyword [] [private] +0 8 4 keyword [] [void] +0 5 14 method name [] [BidsByShipment] +0 14 1 punctuation [] [(] +0 1 6 keyword [] [string] +0 7 11 parameter name [] [generatedId] +0 11 1 punctuation [] [,] +0 2 3 keyword [] [int] +0 4 4 parameter name [] [bids] +0 4 1 punctuation [] [)] +1 4 1 punctuation [] [{] +1 8 2 keyword - control [] [if] +0 3 1 punctuation [] [(] +0 1 4 parameter name [] [bids] +0 5 1 operator [] [>] +0 2 1 number [] [0] +0 1 1 punctuation [] [)] +1 8 1 punctuation [] [{] +1 12 1 markupTagDelimiter [] [<] +0 1 1 markupElement [] [a] +0 2 5 markupAttribute [] [class] +0 5 1 markupOperator [] [=] +0 1 1 markupAttributeQuote [] ["] +0 1 1 markupAttributeQuote [] ["] +0 1 7 markupAttribute [] [Thing""] +0 7 1 markupTagDelimiter [] [>] +1 16 1 razorTransition [] [@] +0 1 2 keyword - control [] [if] +0 2 1 punctuation [] [(] +0 1 4 parameter name [] [bids] +0 5 1 operator [] [>] +0 2 1 number [] [0] +0 1 1 punctuation [] [)] +1 16 1 punctuation [] [{] +1 20 6 razorDirective [] [Hello, world!
+ } + } + """, + expected: null, + codeActionName: LanguageServerConstants.CodeActions.ExtractToCodeBehind); + } + + [Fact] + public async Task NotWithoutFileCreation() + { + UpdateClientInitializationOptions(c => + { + c.SupportsFileManipulation = false; + return c; + }); + + await VerifyCodeActionAsync( + input: """ + + @$$code { + void Test() + { + } + } + """, + expected: null, + codeActionName: LanguageServerConstants.CodeActions.ExtractToCodeBehind); + } + [Fact] public async Task ExtractToCodeBehind() { @@ -47,6 +144,12 @@ public partial class File1 [InlineData("@co[||]de {")] [InlineData("@cod[||]e {")] [InlineData("@code[||] {")] + [InlineData("[||]@code\n{")] + [InlineData("@[||]code\n{")] + [InlineData("@c[||]ode\n{")] + [InlineData("@co[||]de\n{")] + [InlineData("@cod[||]e\n{")] + [InlineData("@code[||]\n{")] [InlineData("@code[||]{")] public async Task WorkAtAnyCursorPosition(string codeBlockStart) { @@ -75,4 +178,50 @@ public partial class File1 } """)]); } + + [Fact] + public async Task ExtractToCodeBehind_WithUsing() + { + await VerifyCodeActionAsync( + input: """ + @using System.Diagnostics + + + + @co[||]de + { + private int x = 1; + + private void M() + { + Debug.WriteLine(""); + } + } + """, + expected: """ + @using System.Diagnostics + + + + + """, + codeActionName: LanguageServerConstants.CodeActions.ExtractToCodeBehind, + additionalExpectedFiles: [ + (FileUri("File1.razor.cs"), $$""" + using System.Diagnostics; + + namespace SomeProject + { + public partial class File1 + { + private int x = 1; + + private void M() + { + Debug.WriteLine(""); + } + } + } + """)]); + } } diff --git a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CodeActions/ExtractToComponentTests.cs b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CodeActions/ExtractToComponentTests.cs index 6d3cb25c3d9..fed2993b16c 100644 --- a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CodeActions/ExtractToComponentTests.cs +++ b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CodeActions/ExtractToComponentTests.cs @@ -2,6 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Threading.Tasks; +using Microsoft.AspNetCore.Razor.Language; +using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis.Razor.Protocol; using Xunit; using Xunit.Abstractions; @@ -10,6 +12,21 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost.CodeActions; public class ExtractToComponentTests(ITestOutputHelper testOutputHelper) : CohostCodeActionsEndpointTestBase(testOutputHelper) { + [Fact] + public async Task NotOfferedInLegacy() + { + await VerifyCodeActionAsync( + input: """ + @co[||]de + { + private int x = 1; + } + """, + expected: null, + codeActionName: LanguageServerConstants.CodeActions.ExtractToCodeBehind, + fileKind: RazorFileKind.Legacy); + } + [Fact] public async Task ExtractToComponent() { @@ -39,6 +56,71 @@ Hello World """)]); } + [Fact] + public async Task ExtractToComponent_SinglePointSelection() + { + await VerifyCodeActionAsync( + input: """ + + + $$
+ Hello World
+
+
+
+ """,
+ expected: """
+
+
+
+ Hello World
+
+ """)]);
+ }
+
+ [Fact]
+ public async Task DontOfferOnSinglePointSelectionInElement()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+
+
+
+ Hello $$World
+
+
+
+ """,
+ expected: null,
+ codeActionName: LanguageServerConstants.CodeActions.ExtractToNewComponent);
+ }
+
+ [Fact]
+ public async Task DontOfferInCodeBlock()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+
+
+ @code
+ {
+ [|public int I { get; set; }
+ public void M()
+ {
+ }|]
+ }
+ """,
+ expected: null,
+ codeActionName: LanguageServerConstants.CodeActions.ExtractToNewComponent);
+ }
+
[Fact]
public async Task DontOfferOnNonExistentComponent()
{
@@ -131,4 +213,796 @@ Hello World
""")]);
}
+
+ [Fact]
+ public async Task SelectionEndAfterElement()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+ @namespace MarketApp.Pages.Product.Home
+
+
+ [|
+
+
+
+ Div a title
+Div a par
+
+
|]
+ Div b title
+Div b par
+Hello, world!
+ + Welcome to your new app. + """, + expected: """ + @namespace MarketApp.Pages.Product.Home + +
+
+
+ Hello, world!
+ + Welcome to your new app. + """, + codeActionName: LanguageServerConstants.CodeActions.ExtractToNewComponent, + additionalExpectedFiles: [ + (FileUri("Component.razor"), """ + @namespace MarketApp.Pages.Product.Home + +
+
+ Div a title
+Div a par
+
+
+ """)]);
+ }
+
+ [Fact]
+ public async Task SelectionEndInsideSiblingElement1()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+ @namespace MarketApp.Pages.Product.Home
+
+ Div b title
+Div b par
+
+ [|
+
+
+
+ Div a title
+Div a par
+
+
+ Div b title
|] +Div b par
+Hello, world!
+ + Welcome to your new app. + """, + expected: """ + @namespace MarketApp.Pages.Product.Home + +
+
+
+ Hello, world!
+ + Welcome to your new app. + """, + codeActionName: LanguageServerConstants.CodeActions.ExtractToNewComponent, + additionalExpectedFiles: [ + (FileUri("Component.razor"), """ + @namespace MarketApp.Pages.Product.Home + +
+
+ Div a title
+Div a par
+
+
+ """)]);
+ }
+
+ [Fact]
+ public async Task SelectionEndInsideSiblingElement2()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+ @namespace MarketApp.Pages.Product.Home
+
+ Div b title
+Div b par
+
+ [|
+
+
+
+ Div a title
+Div a par
+
+
+ Div b title|]
+Div b par
+Hello, world!
+ + Welcome to your new app. + """, + expected: """ + @namespace MarketApp.Pages.Product.Home + +
+
+
+ Hello, world!
+ + Welcome to your new app. + """, + codeActionName: LanguageServerConstants.CodeActions.ExtractToNewComponent, + additionalExpectedFiles: [ + (FileUri("Component.razor"), """ + @namespace MarketApp.Pages.Product.Home + +
+
+ Div a title
+Div a par
+
+
+ """)]);
+ }
+
+ [Fact]
+ public async Task SelectionStartInsideSiblingElement()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+ @namespace MarketApp.Pages.Product.Home
+
+ Div b title
+Div b par
+
+
+
+
+
+ [|Div a title
+Div a par
+
+
|]
+ Div b title
+Div b par
+Hello, world!
+ + Welcome to your new app. + """, + expected: """ + @namespace MarketApp.Pages.Product.Home + +
+
+
+ Hello, world!
+ + Welcome to your new app. + """, + codeActionName: LanguageServerConstants.CodeActions.ExtractToNewComponent, + additionalExpectedFiles: [ + (FileUri("Component.razor"), """ + @namespace MarketApp.Pages.Product.Home + +
+
+ Div a title
+Div a par
+
+
+ """)]);
+ }
+
+ [Fact]
+ public async Task SelectionStartAndEndInsideSiblingElement()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+ @namespace MarketApp.Pages.Product.Home
+
+ Div b title
+Div b par
+
+
+
+
+
+ [|Div a title
+Div a par
+
+
+ Div b title
+Div b par|]
+Hello, world!
+ + Welcome to your new app. + """, + expected: """ + @namespace MarketApp.Pages.Product.Home + +
+
+
+ Hello, world!
+ + Welcome to your new app. + """, + codeActionName: LanguageServerConstants.CodeActions.ExtractToNewComponent, + additionalExpectedFiles: [ + (FileUri("Component.razor"), """ + @namespace MarketApp.Pages.Product.Home + +
+
+ Div a title
+Div a par
+
+
+ """)]);
+ }
+
+ [Fact]
+ public async Task SelectionEndInsideElement()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+ @namespace MarketApp.Pages.Product.Home
+
+ Div b title
+Div b par
+
+ [|
+
+
+
+ Div a title
+Div a par
|] +
+
+ Div b title
+Div b par
+Hello, world!
+ + Welcome to your new app. + """, + expected: """ + @namespace MarketApp.Pages.Product.Home + +
+
+
+
+
+ Div b title
+Div b par
+Hello, world!
+ + Welcome to your new app. + """, + codeActionName: LanguageServerConstants.CodeActions.ExtractToNewComponent, + additionalExpectedFiles: [ + (FileUri("Component.razor"), """ + @namespace MarketApp.Pages.Product.Home + +
+
+ """)]);
+ }
+
+ [Fact]
+ public async Task SelectionStartWithSelfClosing()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+ @namespace MarketApp.Pages.Product.Home
+
+ Div a title
+Div a par
+
+ [|
+
+
+
+
+
|]
+ Div a title
+Div a par
+
+
+ Div b title
+Div b par
+Hello, world!
+ + Welcome to your new app. + """, + expected: """ + @namespace MarketApp.Pages.Product.Home + +
+
+
+
+
+ Div b title
+Div b par
+Hello, world!
+ + Welcome to your new app. + """, + codeActionName: LanguageServerConstants.CodeActions.ExtractToNewComponent, + additionalExpectedFiles: [ + (FileUri("Component.razor"), """ + @namespace MarketApp.Pages.Product.Home + +
+
+
+ """)]);
+ }
+
+ [Fact]
+ public async Task IncludeCodeBlock()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+
+
+ [|Div a title
+Div a par
+
+ Hello World
+
+
+ @code {
+ |]
+ }
+ """,
+ expected: """
+
+
+
+ Hello World
+
+
+ @code {
+
+ }
+ """)]);
+ }
+
+ [Fact]
+ public async Task IncludeIfBlock()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+
+
+ [|
+ Hello World
+
+
+ @if (true)
+ {
+ |]
+ }
+ """,
+ expected: """
+
+
+
+ Hello World
+
+
+ @if (true)
+ {
+
+ }
+ """)]);
+ }
+
+ [Fact]
+ public async Task IncludeNestedIfBlock()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+
+
+ [|
+ Hello World
+
+
+
+
+ """,
+ expected: """
+
+
+
+ @if (true) {
+ |]
+ }
+
+
+ Hello World
+
+
+
+
+ """)]);
+ }
+
+ [Fact]
+ public async Task ExplicitStatement()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+
+
+ [|
+ @if (true) {
+
+ }
+
+
+ Hello World
+
+
+ @{
+ RenderFragment fragment = @
+ Hello World
+
+
+ @{
+ RenderFragment fragment = @Hello World
|]
+
+
+ """,
+ expected: """
+
+
+ Hello World
+ """)]);
+ }
+
+ [Fact]
+ public async Task TextOnly()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+
+
+ [|Hello World|]
+
+
+ """,
+ expected: """
+
+
+
+ Hello|] World
+
+ """,
+ expected: """
+
+
+ Hello
+ Hello World
+
+ """)]);
+ }
+
+ [Fact]
+ public async Task SelectionEndInText()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+
+
+
+ Hello [|World
+
+
+ Hello |]World
+ """,
+ expected: """
+
+
+
+ Hello World
+
+
+ Hello
+ """)]);
+ }
+
+ [Fact]
+ [WorkItem("https://github.com/dotnet/razor/issues/11261")]
+ public async Task InsideElseBlock1()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+
+
+ @if (true)
+ {
+
+ Hello World
+
+ }
+ else
+ {
+ [|
+ Hello World
+
|]
+ }
+ """,
+ expected: """
+
+
+ @if (true)
+ {
+
+ Hello World
+
+ }
+ else
+ {
+
+ Hello World
+
+ """)]);
+ }
+
+ [Fact]
+ [WorkItem("https://github.com/dotnet/razor/issues/11261")]
+ public async Task InsideElseBlock2()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+
+
+ @if (true)
+ {
+
+ Hello World
+
+ }
+ else
+ {
+ $$
+ Hello World
+
+ }
+ """,
+ expected: null,
+ codeActionName: LanguageServerConstants.CodeActions.ExtractToNewComponent);
+ }
+
+ [Fact]
+ public async Task ExtractToComponent_WithUsings()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+ @using MyApp.Data
+ @using MyApp.Models
+
+ <[|div id="parent">
+
+
+
+ """,
+ expected: """
+ @using MyApp.Data
+ @using MyApp.Models
+
+
+
+
+
+ Deeply nested par +
+
+ """)]);
+ }
+
+ [Fact]
+ public async Task SelectStartWithinElement()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+ <[|div id="parent">
+
+
+
+
+
+
+ Deeply nested par
+
+
+
+ """,
+ expected: """
+
+
+
+
+ Deeply nested par +
+
+ """)]);
+ }
}
diff --git a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CodeActions/GenerateEventHandlerTests.cs b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CodeActions/GenerateEventHandlerTests.cs
index 61cd467979a..174b88248c3 100644
--- a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CodeActions/GenerateEventHandlerTests.cs
+++ b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CodeActions/GenerateEventHandlerTests.cs
@@ -56,6 +56,38 @@ private void DoesNotExist(MouseEventArgs args)
await VerifyCodeActionAsync(input, expected, LanguageServerConstants.CodeActions.GenerateEventHandler);
}
+ [Fact]
+ public async Task CodeBlock_WithExistingCode()
+ {
+ var input = """
+
+
+ @code
+ {
+ public void M()
+ {
+ }
+ }
+ """;
+
+ var expected = """
+
+
+ @code
+ {
+ public void M()
+ {
+ }
+ private void DoesNotExist(MouseEventArgs args)
+ {
+ throw new NotImplementedException();
+ }
+ }
+ """;
+
+ await VerifyCodeActionAsync(input, expected, LanguageServerConstants.CodeActions.GenerateEventHandler);
+ }
+
[Fact]
public async Task CodeBlock_Indented()
{
@@ -80,7 +112,7 @@ private void DoesNotExist(MouseEventArgs args)
await VerifyCodeActionAsync(input, expected, LanguageServerConstants.CodeActions.GenerateEventHandler);
}
- [Fact(Skip = "@bind- attribute tag helper is not being found")]
+ [Fact(Skip = "https://github.com/dotnet/razor/issues/11801")]
public async Task BindSet()
{
var input = """
@@ -108,7 +140,7 @@ private void DoesNotExist(string args)
await VerifyCodeActionAsync(input, expected, LanguageServerConstants.CodeActions.GenerateEventHandler);
}
- [Fact(Skip = "@bind- attribute tag helper is not being found")]
+ [Fact(Skip = "https://github.com/dotnet/razor/issues/11801")]
public async Task BindAfter()
{
var input = """
@@ -255,6 +287,47 @@ private void DoesNotExist(Microsoft.AspNetCore.Components.Web.MouseEventArgs arg
codeActionName: LanguageServerConstants.CodeActions.GenerateEventHandler);
}
+ [Fact]
+ public async Task CodeBehind_BlockBodiedNamespace()
+ {
+ await VerifyCodeActionAsync(
+ input: """
+
+ """,
+ expected: """
+
+ """,
+ additionalFiles: [
+ (FilePath("File1.razor.cs"), """
+ namespace SomeProject
+ {
+ public partial class File1
+ {
+ public void M()
+ {
+ }
+ }
+ }
+ """)],
+ additionalExpectedFiles: [
+ (FileUri("File1.razor.cs"), """
+ namespace SomeProject
+ {
+ public partial class File1
+ {
+ public void M()
+ {
+ }
+ private void DoesNotExist(Microsoft.AspNetCore.Components.Web.MouseEventArgs args)
+ {
+ throw new System.NotImplementedException();
+ }
+ }
+ }
+ """)],
+ codeActionName: LanguageServerConstants.CodeActions.GenerateEventHandler);
+ }
+
[Fact]
public async Task EmptyCodeBehind()
{
@@ -333,4 +406,18 @@ private Task DoesNotExist(MouseEventArgs args)
await VerifyCodeActionAsync(input, expected, LanguageServerConstants.CodeActions.GenerateAsyncEventHandler);
}
+
+ [Fact]
+ public async Task NotInRefAttribute()
+ {
+ var input = """
+
+
+ @code
+ {
+ }
+ """;
+
+ await VerifyCodeActionAsync(input, expected: null, LanguageServerConstants.CodeActions.GenerateAsyncEventHandler);
+ }
}
diff --git a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostDocumentCompletionEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostDocumentCompletionEndpointTest.cs
index 09ac5ce7446..50996fb595f 100644
--- a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostDocumentCompletionEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostDocumentCompletionEndpointTest.cs
@@ -1,8 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using System;
using System.Collections.Generic;
using System.Collections.Immutable;
+using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Text.Json;
@@ -18,11 +20,11 @@
using Microsoft.CodeAnalysis.Razor.Settings;
using Microsoft.CodeAnalysis.Razor.Telemetry;
using Microsoft.CodeAnalysis.Razor.Workspaces.Resources;
+using Microsoft.CodeAnalysis.Text;
using Roslyn.Test.Utilities;
using Roslyn.Text.Adornments;
using Xunit;
using Xunit.Abstractions;
-using Microsoft.CodeAnalysis.Text;
using WorkItemAttribute = Roslyn.Test.Utilities.WorkItemAttribute;
#if !VSCODE
@@ -34,6 +36,29 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
public partial class CohostDocumentCompletionEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper)
{
+ [Fact]
+ public async Task NotWhenAutoShowCompletionIsOff()
+ {
+ var settings = ClientSettingsManager.GetClientSettings();
+ ClientSettingsManager.Update(settings.ClientCompletionSettings with { AutoShowCompletion = false });
+
+ await VerifyCompletionListAsync(
+ input: """
+ This is a Razor document.
+
+ @$$
+
+ The end.
+ """,
+ completionContext: new VSInternalCompletionContext()
+ {
+ InvokeKind = VSInternalCompletionInvokeKind.Typing,
+ TriggerCharacter = "@",
+ TriggerKind = CompletionTriggerKind.TriggerCharacter
+ },
+ expectedItemLabels: null);
+ }
+
[Fact]
public async Task CSharpInEmptyExplicitStatement()
{
@@ -707,6 +732,33 @@ The end.
#endif
}
+ [Fact]
+ public async Task HtmlAttributeNamesAndTagHelpersCompletion_SelfClosing()
+ {
+ await VerifyCompletionListAsync(
+ input: """
+ This is a Razor document.
+
+
+
+
+
+
+
+ Deeply nested par
+
+ @if (true)
+ {
+ <{{startTag}}>$$
+ }
+
+ """,
+ output: $$"""
+
+ @if (true)
+ {
+ <{{startTag}}>$0
+ }
+
+ """,
+ triggerCharacter: ">");
+ }
+
+ [Fact]
+ public async Task EndTag_AlreadyExists()
+ {
+ await VerifyOnAutoInsertAsync(
+ input: """
+ This is a Razor document.
+
+
+ @if (true)
+ {
+ $$
+
+ The end.
+ """,
+ output: """
+ This is a Razor document.
+
+ $0
+
+ The end.
+ """,
+ triggerCharacter: ">");
+ }
+
+ [Fact]
+ public async Task EndTag_Nested_WithAttribute()
+ {
+ await VerifyOnAutoInsertAsync(
+ input: """
+ This is a Razor document.
+
+
+
+ The end.
+ """,
+ output: """
+ This is a Razor document.
+
+
+
+ The end.
+ """,
+ triggerCharacter: ">");
+ }
+
+ [Fact]
+ public async Task EndTag_Nested_WithAttribute_WithSpace()
+ {
+ await VerifyOnAutoInsertAsync(
+ input: """
+ This is a Razor document.
+
+
+
+ The end.
+ """,
+ output: """
+ This is a Razor document.
+
+
+
+ The end.
+ """,
+ triggerCharacter: ">");
+ }
+
+ [Fact]
+ public async Task EndTag_Nested_WithMinimizedAttribute()
+ {
+ await VerifyOnAutoInsertAsync(
+ input: """
+ This is a Razor document.
+
+
+
+ The end.
+ """,
+ output: """
+ This is a Razor document.
+
+
+
+ The end.
+ """,
+ triggerCharacter: ">");
+ }
+
+ [Fact]
+ public async Task EndTag_Nested_WithMinimizedAttribute_WithSpace()
+ {
+ await VerifyOnAutoInsertAsync(
+ input: """
+ This is a Razor document.
+
+
+
+ The end.
+ """,
+ output: """
+ This is a Razor document.
+
+
+
+ The end.
+ """,
+ triggerCharacter: ">");
+ }
+
+ [Fact]
+ public async Task EndTag_Nested_VoidElement()
+ {
+ await VerifyOnAutoInsertAsync(
+ input: """
+ This is a Razor document.
+
+ $$
+
+ The end.
+ """,
+ output: """
+ This is a Razor document.
+
+
+ /// This is some text
+ $$
+ ///
+ void TestMethod() {}
+ }
+ """,
+ output: """
+ @code {
+ ///
+ /// This is some text
+ /// $0
+ ///
+ void TestMethod() {}
+ }
+ """,
+ triggerCharacter: "\n");
+ }
+
[Fact]
public async Task DoNotAutoInsertCSharp_OnForwardSlashWithFormatOnTypeDisabled()
{
@@ -231,9 +546,11 @@ private async Task VerifyOnAutoInsertAsync(
bool insertSpaces = true,
int tabSize = 4,
bool formatOnType = true,
- bool autoClosingTags = true)
+ bool autoClosingTags = true,
+ RazorFileKind? fileKind = null)
{
- var document = CreateProjectAndRazorDocument(input.Text);
+ fileKind ??= RazorFileKind.Component;
+ var document = CreateProjectAndRazorDocument(input.Text, fileKind: fileKind);
var sourceText = await document.GetTextAsync(DisposalToken);
ClientSettingsManager.Update(ClientAdvancedSettings.Default with { FormatOnType = formatOnType, AutoClosingTags = autoClosingTags });
diff --git a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostSemanticTokensRangeEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostSemanticTokensRangeEndpointTest.cs
index 90bdc8130a1..b17fe22f4db 100644
--- a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostSemanticTokensRangeEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostSemanticTokensRangeEndpointTest.cs
@@ -196,6 +196,181 @@ @rendermode @(Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer)
await VerifySemanticTokensAsync(input, colorBackground, miscellaneousFile);
}
+ [Theory]
+ [CombinatorialData]
+ public async Task RenderFragment(bool colorBackground, bool miscellaneousFile)
+ {
+ var input = """
+ @DateTime.Now
+ }
+
+ }
+ }
+ }
+ """;
+
+ await VerifySemanticTokensAsync(input, colorBackground, miscellaneousFile);
+ }
+
+ [Theory]
+ [CombinatorialData]
+ public async Task GetSemanticTokens_Razor_NestedTransitions(bool colorBackground, bool miscellaneousFile)
+ {
+ var input = """
+ @using System
+ @code {
+ Action
$$
+ }
+ """,
+ output: """
+
+ @if (true)
+ {
+
+ }
+ """,
+ triggerCharacter: ">");
+ }
+
+ [Fact]
+ public async Task EndTag_VoidElement()
+ {
+ await VerifyOnAutoInsertAsync(
+ input: """
+ This is a Razor document.
+
+ $$
+
+ The end.
+ """,
+ output: """
+ This is a Razor document.
+
+
+
+ The end.
+ """,
+ triggerCharacter: ">");
+ }
+
+ [Fact]
+ public async Task EndTag_VoidElement_CaseInsensitive()
+ {
+ await VerifyOnAutoInsertAsync(
+ input: """
+ This is a Razor document.
+
+ $$
+
+ The end.
+ """,
+ output: """
+ This is a Razor document.
+
+
+
+ The end.
+ """,
+ triggerCharacter: ">");
+ }
+
+ [Fact]
+ public async Task EndTag_Nested()
+ {
+ await VerifyOnAutoInsertAsync(
+ input: """
+ This is a Razor document.
+
+ $0
This is some HTML
+ @code
+ {
+ public void M()
+ {
+ RenderFragment x = @This is some HTML
;
+ }
+ }
+ """;
+
+ await VerifySemanticTokensAsync(input, colorBackground, miscellaneousFile);
+ }
+
+ [Theory]
+ [CombinatorialData]
+ public async Task Expressions(bool colorBackground, bool miscellaneousFile)
+ {
+ var input = """
+ @DateTime.Now
+
+ @("hello" + "\\n" + "world" + Environment.NewLine + "how are you?")
+ """;
+
+ await VerifySemanticTokensAsync(input, colorBackground, miscellaneousFile);
+ }
+
+
+ [Theory]
+ [CombinatorialData]
+ public async Task GetSemanticTokens_Razor_NestedTextDirectives(bool colorBackground, bool miscellaneousFile)
+ {
+ var input = """
+ @using System
+ @functions {
+ private void BidsByShipment(string generatedId, int bids)
+ {
+ if (bids > 0)
+ {
+
+ @if(bids > 0)
+ {
+