Skip to content

Commit

Permalink
Use the Roslyn project system for generating code for open documents (#…
Browse files Browse the repository at this point in the history
…9831)

Part of #9519

Right now code generation, in co-hosting and non, comes from document
snapshots in the Razor project system which directly call the Razor
compiler. This change means that all Html and C# code generation in
co-hosting is done based on the TextDocument, which means it will come
from the source generator when that part is ready.

This is the Razor side of, and needs a Roslyn bump to,
dotnet/roslyn#71671
  • Loading branch information
davidwengier authored Jan 26, 2024
2 parents 8e5fbd4 + 5c5b3e6 commit 46a1c23
Show file tree
Hide file tree
Showing 76 changed files with 219 additions and 299 deletions.
7 changes: 0 additions & 7 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
Expand Down Expand Up @@ -68,9 +67,6 @@
<package pattern="microsoft.net.sdk.razor" />
<package pattern="microsoft.extensions.noncapturingtimer.sources" />
</packageSource>
<packageSource key="dotnet7">
<package pattern="microsoft.ilverification" />
</packageSource>
<packageSource key="dotnet8">
<package pattern="microsoft.*" />
</packageSource>
Expand All @@ -93,7 +89,6 @@
<package pattern="messagepackanalyzer" />
<package pattern="microbuild.core" />
<package pattern="microsoft.*" />
<package pattern="microsoft.ilverification" />
<package pattern="moq" />
<package pattern="mstest.testadapter" />
<package pattern="mstest.testframework" />
Expand Down Expand Up @@ -133,12 +128,10 @@
<packageSource key="vs-impl">
<package pattern="microbuild.core.sentinel" />
<package pattern="microsoft.*" />
<package pattern="microsoft.commonlanguageserverProtocol.*" />
</packageSource>
<packageSource key="vs-impl-archived">
<package pattern="microbuild.core.sentinel" />
<package pattern="microsoft.*" />
<package pattern="microsoft.commonlanguageserverProtocol.*" />
</packageSource>
<packageSource key="benchmark-dotnet-prerelease">
<package pattern="benchmarkdotnet" />
Expand Down
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,78 +10,78 @@
<Sha>549aadff1660b230bdfffa562eea3edf59dd0bb4</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.9.0-3.23613.4">
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.10.0-1.24072.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>93677976e310e7f910f289e962566485cbabf8f3</Sha>
<Sha>fc8998c604e2aede0c3a385592ea7c1155dc978f</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
38 changes: 19 additions & 19 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -52,24 +52,24 @@
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.2-servicing.22064.6</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>9.0.0-alpha.1.24067.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.9.0-3.23613.4</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.9.0-3.23613.4</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.9.0-3.23613.4</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.9.0-3.23613.4</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-1.24072.4</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.10.0-1.24072.4</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.10.0-1.24072.4</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.10.0-1.24072.4</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
<!--
Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
Expand Down Expand Up @@ -128,7 +128,7 @@
<MicrosoftVisualStudioInteropPackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropPackageVersion>
<MicrosoftInternalVisualStudioInteropPackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropPackageVersion>
<MicrosoftVisualStudioRpcContractsPackageVersion>17.9.5-alpha</MicrosoftVisualStudioRpcContractsPackageVersion>
<MicrosoftVisualStudioTelemetryVersion>17.8.138</MicrosoftVisualStudioTelemetryVersion>
<MicrosoftVisualStudioTelemetryVersion>17.9.13</MicrosoftVisualStudioTelemetryVersion>
<MicrosoftVisualStudioTextDataPackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioTextDataPackageVersion>
<MicrosoftVisualStudioTextImplementationPackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioTextImplementationPackageVersion>
<MicrosoftVisualStudioTextLogicPackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioTextLogicPackageVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
using Microsoft.AspNetCore.Razor.LanguageServer.Protocol;
using Microsoft.CodeAnalysis.Razor.Logging;
using Microsoft.CodeAnalysis.Razor.Workspaces;
using Microsoft.CommonLanguageServerProtocol.Framework;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.VisualStudio.LanguageServer.Protocol;

namespace Microsoft.AspNetCore.Razor.LanguageServer.AutoInsert;

[LanguageServerEndpoint(VSInternalMethods.OnAutoInsertName)]
[RazorLanguageServerEndpoint(VSInternalMethods.OnAutoInsertName)]
internal class OnAutoInsertEndpoint(
LanguageServerFeatureOptions languageServerFeatureOptions,
IRazorDocumentMappingService documentMappingService,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.Language;
using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
using Microsoft.AspNetCore.Razor.LanguageServer.Common;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Text;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
using Microsoft.AspNetCore.Razor.LanguageServer.Common;
using Microsoft.AspNetCore.Razor.LanguageServer.Extensions;
using Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
using Microsoft.AspNetCore.Razor.LanguageServer.Protocol;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using Microsoft.AspNetCore.Razor.Language.Syntax;
using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Razor;
using Microsoft.AspNetCore.Razor.LanguageServer.Common;
using Microsoft.AspNetCore.Razor.LanguageServer.Extensions;
using Microsoft.CodeAnalysis.ExternalAccess.Razor;
using Microsoft.CodeAnalysis.Razor.Workspaces.Extensions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.Language;
using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
using Microsoft.AspNetCore.Razor.LanguageServer.Common;
using Microsoft.AspNetCore.Razor.LanguageServer.Extensions;
using Microsoft.AspNetCore.Razor.LanguageServer.Protocol;
using Microsoft.VisualStudio.LanguageServer.Protocol;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@
using Microsoft.CodeAnalysis.Razor.Logging;
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
using Microsoft.CodeAnalysis.Razor.Workspaces;
using Microsoft.CommonLanguageServerProtocol.Framework;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.LanguageServer.Protocol;
using Newtonsoft.Json.Linq;
using StreamJsonRpc;

namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;

[LanguageServerEndpoint(LspEndpointName)]
[RazorLanguageServerEndpoint(LspEndpointName)]
internal sealed class CodeActionEndpoint(
IRazorDocumentMappingService documentMappingService,
IEnumerable<IRazorCodeActionProvider> razorCodeActionProviders,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,16 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
using Microsoft.AspNetCore.Razor.LanguageServer.Common;
using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
using Microsoft.AspNetCore.Razor.PooledObjects;
using Microsoft.CodeAnalysis.Razor.Logging;
using Microsoft.CommonLanguageServerProtocol.Framework;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.LanguageServer.Protocol;
using Newtonsoft.Json.Linq;

namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;

[LanguageServerEndpoint(Methods.CodeActionResolveName)]
[RazorLanguageServerEndpoint(Methods.CodeActionResolveName)]
internal sealed class CodeActionResolveEndpoint : IRazorDocumentlessRequestHandler<CodeAction, CodeAction>
{
private readonly ImmutableDictionary<string, IRazorCodeActionResolver> _razorCodeActionResolvers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.Language;
using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
using Microsoft.AspNetCore.Razor.LanguageServer.Common;
using Microsoft.AspNetCore.Razor.LanguageServer.Extensions;
using Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
using Microsoft.CodeAnalysis.Razor.Workspaces.Extensions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
using Microsoft.AspNetCore.Razor.LanguageServer.Common;
using Microsoft.AspNetCore.Razor.LanguageServer.Protocol;
using Microsoft.VisualStudio.LanguageServer.Protocol;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System;
using System.Linq;
using Microsoft.AspNetCore.Razor.LanguageServer.Common;
using Microsoft.VisualStudio.LanguageServer.Protocol;
using Newtonsoft.Json.Linq;

Expand Down
Loading

0 comments on commit 46a1c23

Please sign in to comment.