From 66f2aac299a0f52148c9a4dee56c9dcb06bab15d Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 10 Sep 2019 13:37:39 -0700 Subject: [PATCH 1/2] Integrate Razor LanguageServer (without plugin) into src/Razor. - Added tests for both the language server and the common language server projects. - Updated publish MSBuild bits to publish to `artifacts/LanguageServer/$(Configuration)/TFM` - Updated the language server to be netcoreapp3.0 aspnet/AspNetCoredotnet/aspnetcore-tooling#13494 \n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/984c638b37579a4ecdca4abe48fdf59e1f21ac51 --- .../src/DefaultRazorIntermediateNodeLoweringPhase.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs index f3180eb618..2e8a0368a7 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs @@ -1099,8 +1099,6 @@ namespace Microsoft.AspNetCore.Razor.Language if (node.Source != null) { - Debug.Assert(node.Source.Value.FilePath != null); - node.Source = new SourceSpan( node.Source.Value.FilePath, node.Source.Value.AbsoluteIndex, From 5bb36d86f1f8cbcef832f02c671a863288ea47cf Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Thu, 12 Sep 2019 14:27:54 -0700 Subject: [PATCH 2/2] Integrate Razor VSCode extension functional tests into src/Razor. - Added the `.vscode-test` to `.gitignore` because that's the VSCode folder that gets created when dynamically downloading VSCode for CI purposes. - Migrated functional tests to use the non-deprecated VSCode functional testing APIs. This involved creating a runTest file to control downloading VSCode and passing in appropriate parameters as well as creating an index that discovers tests that should be run. - Changed functional tests to operate on the existing Razor testapps (instead of the old ones). - Updated the "default" completion tests to be latest Razor/Blazor. - Added VSCode launch configurations to enable easy debugging via F5. aspnet/AspNetCoredotnet/aspnetcore-tooling#13494 \n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/66e4e8a16917a3b986b92d07b054d8f34bf3a979 --- .../test/testassets/MvcWithComponents/Views/Home/Index.cshtml | 2 +- .../test/testassets/MvcWithComponents/Views/_ViewImports.cshtml | 1 + src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml | 1 + src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml | 1 + src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml | 1 + src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml index 8832e1ad15..b824f4e3e8 100644 --- a/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml +++ b/src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml @@ -2,4 +2,4 @@ ViewData["Title"] = "Home Page"; } -Hello world! \ No newline at end of file +Hello world! diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml index 7e47b2893e..b570117928 100644 --- a/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml +++ b/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml @@ -1,3 +1,4 @@ @using MvcWithComponents @using MvcWithComponents.Models @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@inject DateTime TheTime diff --git a/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml index da00289ea5..26ba8ed20e 100644 --- a/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml +++ b/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml @@ -1,3 +1,4 @@ @using SimpleMvc @using SimpleMvc.Models @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@inject DateTime TheTime diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml index ab07b6cfbc..4d7ce82c24 100644 --- a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml +++ b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml @@ -1,2 +1,3 @@ @using SimpleMvc11 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@inject DateTime TheTime diff --git a/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml index 477d4ba603..c8d7fa63cc 100644 --- a/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml +++ b/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml @@ -2,3 +2,4 @@ @using SimpleMvc.Models @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @namespace SimpleMvc21 +@inject DateTime TheTime diff --git a/src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml index 477d4ba603..c8d7fa63cc 100644 --- a/src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml +++ b/src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml @@ -2,3 +2,4 @@ @using SimpleMvc.Models @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @namespace SimpleMvc21 +@inject DateTime TheTime