Skip to content

Remove EditorFeatures from OOP #78069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Apr 9, 2025
Merged

Remove EditorFeatures from OOP #78069

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a1d6105
Removed sealed from lsp types
Apr 7, 2025
6f81ae0
FileOperations comments
Apr 8, 2025
d44761f
InlineValues comments
Apr 8, 2025
fc95858
Moniker comments
Apr 8, 2025
61bcbe7
Navigation comments
Apr 8, 2025
46ca8c7
Notebook comments
Apr 8, 2025
62f4b50
SemanticTokens comments
Apr 8, 2025
68dbe9d
Protocol comments
Apr 8, 2025
0b5e826
Internal comments
Apr 8, 2025
b741f0f
Remove EditorFeatures reference from ServiceHub
CyrusNajmabadi Apr 8, 2025
f4c2d7e
Add proper reference
CyrusNajmabadi Apr 8, 2025
820f80b
Fix unit tests
CyrusNajmabadi Apr 8, 2025
9aa6ef3
Add EA.Razor.Features to VS.ExternalAPIs.Roslyn
JoeRobich Apr 8, 2025
8204eba
Undo changes
Apr 8, 2025
4846b7c
Unseal types razor derives from
Apr 8, 2025
c7882c7
Merge branch 'unseal_lsp_types' into razorEA
Apr 8, 2025
05ab759
Fix razor EA to remove shared code
Apr 8, 2025
7c4090f
Merge branch 'main' into razorEA
CyrusNajmabadi Apr 8, 2025
b604c3b
Fix authoring
CyrusNajmabadi Apr 9, 2025
5c11bd5
Delete shared project
CyrusNajmabadi Apr 9, 2025
91ecb78
Update name
CyrusNajmabadi Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Roslyn.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,9 +577,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.CodeAnalysis.Cont
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Contracts.Package", "src\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.Package.csproj", "{A8D5CFFA-7F9E-C35B-4F19-D63F6EC1D5CA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Razor", "src\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj", "{068CD9AA-CEC3-CA68-1BAB-2B1B9FD711D3}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared", "src\Tools\ExternalAccess\Razor\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.shproj", "{4853A78A-4EC4-4D86-9F02-D0DDEAE85520}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures", "src\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures.csproj", "{068CD9AA-CEC3-CA68-1BAB-2B1B9FD711D3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features", "src\Tools\ExternalAccess\Razor\Features\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj", "{D5A8E20C-E8D2-4A57-906A-263994D8731D}"
EndProject
Expand Down Expand Up @@ -2068,7 +2066,6 @@ Global
{BD974609-C68B-4BE6-9682-EB132462B50D} = {C2D1346B-9665-4150-B644-075CF1636BAA}
{A8D5CFFA-7F9E-C35B-4F19-D63F6EC1D5CA} = {C2D1346B-9665-4150-B644-075CF1636BAA}
{068CD9AA-CEC3-CA68-1BAB-2B1B9FD711D3} = {8977A560-45C2-4EC2-A849-97335B382C74}
{4853A78A-4EC4-4D86-9F02-D0DDEAE85520} = {8977A560-45C2-4EC2-A849-97335B382C74}
{D5A8E20C-E8D2-4A57-906A-263994D8731D} = {8977A560-45C2-4EC2-A849-97335B382C74}
{9EB058F3-10C9-8F3F-AD9E-72CB362A0928} = {5880FECB-91F1-4AB8-8726-75EAFA8A918E}
{8087BDE4-6707-05A5-5F84-DFE6628E8EC8} = {6FE0875A-E178-4766-BCC6-87D37F273102}
Expand Down Expand Up @@ -2151,7 +2148,6 @@ Global
src\Analyzers\VisualBasic\CodeFixes\VisualBasicCodeFixes.projitems*{0141285d-8f6c-42c7-baf3-3c0ccd61c716}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{0141285d-8f6c-42c7-baf3-3c0ccd61c716}*SharedItemsImports = 5
src\Compilers\CSharp\csc\CscCommandLine.projitems*{0161e25c-918a-4dc8-9648-30fdcc8e31e9}*SharedItemsImports = 5
src\Tools\ExternalAccess\Razor\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems*{068cd9aa-cec3-ca68-1bab-2b1b9fd711d3}*SharedItemsImports = 5
src\RoslynAnalyzers\Utilities\Compiler\Analyzer.Utilities.projitems*{08735294-3e6b-4420-9916-e7b8c4eb874d}*SharedItemsImports = 13
src\RoslynAnalyzers\Utilities\Compiler\Analyzer.Utilities.projitems*{0a1267e9-52ff-b8de-8522-802be55f41da}*SharedItemsImports = 5
src\RoslynAnalyzers\Utilities\FlowAnalysis\FlowAnalysis.Utilities.projitems*{0a1267e9-52ff-b8de-8522-802be55f41da}*SharedItemsImports = 5
Expand Down Expand Up @@ -2188,7 +2184,6 @@ Global
src\RoslynAnalyzers\Utilities\Workspaces\Workspaces.Utilities.projitems*{3f65d29d-ed95-2d6f-b927-47c5cf070aa5}*SharedItemsImports = 5
src\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems*{41ed1bfa-fdad-4fe4-8118-db23fb49b0b0}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\CSharp\CSharpWorkspaceExtensions.projitems*{438db8af-f3f0-4ed9-80b5-13fddd5b8787}*SharedItemsImports = 13
src\Tools\ExternalAccess\Razor\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems*{4853a78a-4ec4-4d86-9f02-d0ddeae85520}*SharedItemsImports = 13
src\Compilers\CSharp\csc\CscCommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 5
src\RoslynAnalyzers\Utilities\Refactoring.VisualBasic\Refactoring.VisualBasic.Utilities.projitems*{4c362c30-c4b1-4c4b-a545-dbf67c7e9153}*SharedItemsImports = 13
src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{5018d049-5870-465a-889b-c742ce1e31cb}*SharedItemsImports = 5
Expand Down Expand Up @@ -2265,7 +2260,6 @@ Global
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{cec0dce7-8d52-45c3-9295-fc7b16bd2451}*SharedItemsImports = 13
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
src\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems*{d2589bce-4f2e-4113-b7e7-37392c0c5492}*SharedItemsImports = 5
src\Tools\ExternalAccess\Razor\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems*{d5a8e20c-e8d2-4a57-906a-263994d8731d}*SharedItemsImports = 5
src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{d73adf7d-2c1c-42ae-b2ab-edc9497e4b71}*SharedItemsImports = 13
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{d8ef0777-9d65-4849-a7d6-ac81e58e2317}*SharedItemsImports = 13
src\Analyzers\CSharp\CodeFixes\CSharpCodeFixes.projitems*{da973826-c985-4128-9948-0b445e638bdb}*SharedItemsImports = 13
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Debugger" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.LanguageServer.Protocol" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests" />
Expand Down
2 changes: 1 addition & 1 deletion src/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
<!-- Full IVT is through ExternalAccess for functionality -->
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" />
<!-- Restricted IVT is direct for protocol types only -->
<RestrictedInternalsVisibleTo Include="Microsoft.AspNetCore.Razor.LanguageServer" Namespace="Roslyn.LanguageServer.Protocol" Partner="Razor" Key="$(RazorKey)" />
Expand Down
4 changes: 3 additions & 1 deletion src/NuGet/VS.ExternalAPIs.Roslyn.Package/VS.ExternalAPIs.Roslyn.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
<ProjectReference Include="..\..\Scripting\Core\Microsoft.CodeAnalysis.Scripting.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\Scripting\CSharp\Microsoft.CodeAnalysis.CSharp.Scripting.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\Tools\ExternalAccess\Extensions\Microsoft.CodeAnalysis.ExternalAccess.Extensions.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\Tools\ExternalAccess\Razor\Features\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\VisualStudio\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\VisualStudio\Core\Impl\Microsoft.VisualStudio.LanguageServices.Implementation.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\VisualStudio\CSharp\Impl\Microsoft.VisualStudio.LanguageServices.CSharp.csproj" PrivateAssets="all" />
Expand Down Expand Up @@ -87,6 +88,7 @@
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Extensions\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Extensions.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.FSharp\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.FSharp.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Razor\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Razor.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Razor.Features\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.Features\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.Features.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.InteractiveHost\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.InteractiveHost.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.LanguageServer.Protocol\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.LanguageServer.Protocol.dll" TargetDir="" />
Expand Down
5 changes: 2 additions & 3 deletions ....CodeAnalysis.ExternalAccess.Razor.csproj → ...xternalAccess.Razor.EditorFeatures.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<!-- NuGet -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.CodeAnalysis.ExternalAccess.Razor</PackageId>
<PackageId>Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures</PackageId>
<PackageDescription>
A supporting package for Razor:
https://github.com/dotnet/razor
Expand Down Expand Up @@ -46,6 +46,7 @@
<ProjectReference Include="..\..\..\..\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
<ProjectReference Include="..\..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
<ProjectReference Include="..\..\..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
<ProjectReference Include="..\Features\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj" />
</ItemGroup>

<ItemGroup>
Expand All @@ -59,6 +60,4 @@
<PublicAPI Include="InternalAPI.Unshipped.txt" />
</ItemGroup>

<Import Project="..\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems" Label="Shared" />

</Project>
0 ...nalAccess/Razor/Shared/ChecksumWrapper.cs → ...lAccess/Razor/Features/ChecksumWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...tractRazorCohostDocumentRequestHandler.cs → ...tractRazorCohostDocumentRequestHandler.cs
View file
Open in desktop
File renamed without changes.
0 .../Shared/Cohost/AbstractRazorLspService.cs → ...eatures/Cohost/AbstractRazorLspService.cs
View file
Open in desktop
File renamed without changes.
0 ...red/Cohost/AbstractRazorRequestHandler.cs → ...res/Cohost/AbstractRazorRequestHandler.cs
View file
Open in desktop
File renamed without changes.
0 ...alAccess/Razor/Shared/Cohost/Constants.cs → ...Access/Razor/Features/Cohost/Constants.cs
View file
Open in desktop
File renamed without changes.
0 ...ExportCohostLspServiceFactoryAttribute.cs → ...ExportCohostLspServiceFactoryAttribute.cs
View file
Open in desktop
File renamed without changes.
0 ...portCohostStatelessLspServiceAttribute.cs → ...portCohostStatelessLspServiceAttribute.cs
View file
Open in desktop
File renamed without changes.
0 ...zor/Shared/Cohost/Handlers/CodeActions.cs → ...r/Features/Cohost/Handlers/CodeActions.cs
View file
Open in desktop
File renamed without changes.
0 ...azor/Shared/Cohost/Handlers/Completion.cs → ...or/Features/Cohost/Handlers/Completion.cs
View file
Open in desktop
File renamed without changes.
0 ...zor/Shared/Cohost/Handlers/Diagnostics.cs → ...r/Features/Cohost/Handlers/Diagnostics.cs
View file
Open in desktop
File renamed without changes.
0 ...red/Cohost/Handlers/DocumentHighlights.cs → ...res/Cohost/Handlers/DocumentHighlights.cs
View file
Open in desktop
File renamed without changes.
0 ...red/Cohost/Handlers/DocumentSpellCheck.cs → ...res/Cohost/Handlers/DocumentSpellCheck.cs
View file
Open in desktop
File renamed without changes.
0 ...Shared/Cohost/Handlers/DocumentSymbols.cs → ...atures/Cohost/Handlers/DocumentSymbols.cs
View file
Open in desktop
File renamed without changes.
0 ...ared/Cohost/Handlers/FindAllReferences.cs → ...ures/Cohost/Handlers/FindAllReferences.cs
View file
Open in desktop
File renamed without changes.
0 ...r/Shared/Cohost/Handlers/FoldingRanges.cs → ...Features/Cohost/Handlers/FoldingRanges.cs
View file
Open in desktop
File renamed without changes.
0 .../Shared/Cohost/Handlers/GoToDefinition.cs → ...eatures/Cohost/Handlers/GoToDefinition.cs
View file
Open in desktop
File renamed without changes.
0 ...red/Cohost/Handlers/GoToImplementation.cs → ...res/Cohost/Handlers/GoToImplementation.cs
View file
Open in desktop
File renamed without changes.
0 ...ess/Razor/Shared/Cohost/Handlers/Hover.cs → ...s/Razor/Features/Cohost/Handlers/Hover.cs
View file
Open in desktop
File renamed without changes.
0 ...azor/Shared/Cohost/Handlers/InlayHints.cs → ...or/Features/Cohost/Handlers/InlayHints.cs
View file
Open in desktop
File renamed without changes.
0 ...or/Shared/Cohost/Handlers/OnAutoInsert.cs → .../Features/Cohost/Handlers/OnAutoInsert.cs
View file
Open in desktop
File renamed without changes.
0 ...ss/Razor/Shared/Cohost/Handlers/Rename.cs → .../Razor/Features/Cohost/Handlers/Rename.cs
View file
Open in desktop
File renamed without changes.
0 ...ed/Cohost/Handlers/SemanticTokensRange.cs → ...es/Cohost/Handlers/SemanticTokensRange.cs
View file
Open in desktop
File renamed without changes.
0 ...r/Shared/Cohost/Handlers/SignatureHelp.cs → ...Features/Cohost/Handlers/SignatureHelp.cs
View file
Open in desktop
File renamed without changes.
0 ...Cohost/Handlers/ValidateBreakableRange.cs → ...Cohost/Handlers/ValidateBreakableRange.cs
View file
Open in desktop
File renamed without changes.
0 ...IRazorCohostDynamicRegistrationService.cs → ...IRazorCohostDynamicRegistrationService.cs
View file
Open in desktop
File renamed without changes.
0 ...hared/Cohost/IRazorCustomMessageTarget.cs → ...tures/Cohost/IRazorCustomMessageTarget.cs
View file
Open in desktop
File renamed without changes.
0 ...ohost/IRazorSemanticTokensRefreshQueue.cs → ...ohost/IRazorSemanticTokensRefreshQueue.cs
View file
Open in desktop
File renamed without changes.
0 ...azorClientLanguageServerManagerFactory.cs → ...azorClientLanguageServerManagerFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...hostClientLanguageServerManagerFactory.cs → ...hostClientLanguageServerManagerFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...hared/Cohost/RazorCohostRequestContext.cs → ...tures/Cohost/RazorCohostRequestContext.cs
View file
Open in desktop
File renamed without changes.
0 ...zor/Shared/Cohost/RazorMethodAttribute.cs → ...r/Features/Cohost/RazorMethodAttribute.cs
View file
Open in desktop
File renamed without changes.
0 ...RazorSemanticTokensRefreshQueueWrapper.cs → ...RazorSemanticTokensRefreshQueueWrapper.cs
View file
Open in desktop
File renamed without changes.
0 .../ExternalAccess/Razor/Shared/Constants.cs → ...xternalAccess/Razor/Features/Constants.cs
View file
Open in desktop
File renamed without changes.
0 ...azor/Shared/IMefHostServicesExtensions.cs → ...or/Features/IMefHostServicesExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...onousOperationListenerProviderAccessor.cs → ...onousOperationListenerProviderAccessor.cs
View file
Open in desktop
File renamed without changes.
0 ...ared/IRazorClientLanguageServerManager.cs → ...ures/IRazorClientLanguageServerManager.cs
View file
Open in desktop
File renamed without changes.
0 ...or/Shared/IRazorDocumentExcerptService.cs → .../Features/IRazorDocumentExcerptService.cs
View file
Open in desktop
File renamed without changes.
0 .../Shared/IRazorDocumentOperationService.cs → ...eatures/IRazorDocumentOperationService.cs
View file
Open in desktop
File renamed without changes.
0 ...Shared/IRazorDocumentPropertiesService.cs → ...atures/IRazorDocumentPropertiesService.cs
View file
Open in desktop
File renamed without changes.
0 ...r/Shared/IRazorDocumentServiceProvider.cs → ...Features/IRazorDocumentServiceProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...r/Shared/IRazorDynamicFileInfoProvider.cs → ...Features/IRazorDynamicFileInfoProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...azor/Shared/IRazorLanguageServerTarget.cs → ...or/Features/IRazorLanguageServerTarget.cs
View file
Open in desktop
File renamed without changes.
0 ...cess/Razor/Shared/IRazorMappingService.cs → ...ss/Razor/Features/IRazorMappingService.cs
View file
Open in desktop
File renamed without changes.
0 .../Razor/Shared/IRazorSpanMappingService.cs → ...azor/Features/IRazorSpanMappingService.cs
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions ...ExternalAccess/Razor/Features/Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Razor.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.VisualStudioCode.RazorExtension" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" />
</ItemGroup>

<ItemGroup>
Expand All @@ -55,6 +56,4 @@
<ProjectReference Include="..\..\..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
</ItemGroup>

<Import Project="..\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems" Label="Shared" />

</Project>
0 ...r/Shared/RazorAnalyzerAssemblyResolver.cs → ...Features/RazorAnalyzerAssemblyResolver.cs
View file
Open in desktop
File renamed without changes.
0 ...onousOperationListenerProviderAccessor.cs → ...onousOperationListenerProviderAccessor.cs
View file
Open in desktop
File renamed without changes.
0 ...orAsynchronousOperationListenerWrapper.cs → ...orAsynchronousOperationListenerWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...azor/Shared/RazorAutoFormattingOptions.cs → ...or/Features/RazorAutoFormattingOptions.cs
View file
Open in desktop
File renamed without changes.
0 ...cess/Razor/Shared/RazorBreakpointSpans.cs → ...ss/Razor/Features/RazorBreakpointSpans.cs
View file
Open in desktop
File renamed without changes.
0 ...azorCSharpFormattingInteractionService.cs → ...azorCSharpFormattingInteractionService.cs
View file
Open in desktop
File renamed without changes.
0 ...harpProximityExpressionResolverService.cs → ...harpProximityExpressionResolverService.cs
View file
Open in desktop
File renamed without changes.
0 ...ared/RazorClassificationOptionsWrapper.cs → ...ures/RazorClassificationOptionsWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...s/Razor/Shared/RazorClassifierAccessor.cs → ...Razor/Features/RazorClassifierAccessor.cs
View file
Open in desktop
File renamed without changes.
0 ...hared/RazorClientLanguageServerManager.cs → ...tures/RazorClientLanguageServerManager.cs
View file
Open in desktop
File renamed without changes.
0 ...red/RazorDocumentExcerptServiceWrapper.cs → ...res/RazorDocumentExcerptServiceWrapper.cs
View file
Open in desktop
File renamed without changes.
0 .../RazorDocumentPropertiesServiceWrapper.cs → .../RazorDocumentPropertiesServiceWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...ed/RazorDocumentServiceProviderWrapper.cs → ...es/RazorDocumentServiceProviderWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...cess/Razor/Shared/RazorDynamicFileInfo.cs → ...ss/Razor/Features/RazorDynamicFileInfo.cs
View file
Open in desktop
File renamed without changes.
0 ...alAccess/Razor/Shared/RazorExcerptMode.cs → ...Access/Razor/Features/RazorExcerptMode.cs
View file
Open in desktop
File renamed without changes.
0 ...Access/Razor/Shared/RazorExcerptResult.cs → ...cess/Razor/Features/RazorExcerptResult.cs
View file
Open in desktop
File renamed without changes.
0 ...Access/Razor/Shared/RazorGlobalOptions.cs → ...cess/Razor/Features/RazorGlobalOptions.cs
View file
Open in desktop
File renamed without changes.
0 ...s/Razor/Shared/RazorIndentationOptions.cs → ...Razor/Features/RazorIndentationOptions.cs
View file
Open in desktop
File renamed without changes.
0 ...hared/RazorLanguageServerTargetWrapper.cs → ...tures/RazorLanguageServerTargetWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...ess/Razor/Shared/RazorMappedSpanResult.cs → ...s/Razor/Features/RazorMappedSpanResult.cs
View file
Open in desktop
File renamed without changes.
0 ...azor/Shared/RazorMappingServiceWrapper.cs → ...or/Features/RazorMappingServiceWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...ed/RazorPredefinedCodeFixProviderNames.cs → ...es/RazorPredefinedCodeFixProviderNames.cs
View file
Open in desktop
File renamed without changes.
0 ...PredefinedCodeRefactoringProviderNames.cs → ...PredefinedCodeRefactoringProviderNames.cs
View file
Open in desktop
File renamed without changes.
0 ...ss/Razor/Shared/RazorProjectExtensions.cs → .../Razor/Features/RazorProjectExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...zor/Shared/RazorSemanticTokensAccessor.cs → ...r/Features/RazorSemanticTokensAccessor.cs
View file
Open in desktop
File renamed without changes.
0 ...s/ExternalAccess/Razor/Shared/RazorUri.cs → ...ExternalAccess/Razor/Features/RazorUri.cs
View file
Open in desktop
File renamed without changes.
0 ...ared/Remote/JsonSerializableDocumentId.cs → ...ures/Remote/JsonSerializableDocumentId.cs
View file
Open in desktop
File renamed without changes.
0 ...alizableRazorPinnedSolutionInfoWrapper.cs → ...alizableRazorPinnedSolutionInfoWrapper.cs
View file
Open in desktop
File renamed without changes.
0 .../Remote/RazorPinnedSolutionInfoWrapper.cs → .../Remote/RazorPinnedSolutionInfoWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...ared/Remote/RazorRemoteCallbackWrapper.cs → ...ures/Remote/RazorRemoteCallbackWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...or/Shared/Remote/RazorRemoteHostClient.cs → .../Features/Remote/RazorRemoteHostClient.cs
View file
Open in desktop
File renamed without changes.
0 ...e/RazorRemoteServiceCallbackDispatcher.cs → ...e/RazorRemoteServiceCallbackDispatcher.cs
View file
Open in desktop
File renamed without changes.
0 ...emoteServiceCallbackDispatcherRegistry.cs → ...emoteServiceCallbackDispatcherRegistry.cs
View file
Open in desktop
File renamed without changes.
0 ...te/RazorRemoteServiceCallbackIdWrapper.cs → ...te/RazorRemoteServiceCallbackIdWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...te/RazorRemoteServiceConnectionWrapper.cs → ...te/RazorRemoteServiceConnectionWrapper.cs
View file
Open in desktop
File renamed without changes.
0 .../Remote/RazorServiceDescriptorsWrapper.cs → .../Remote/RazorServiceDescriptorsWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...Access/Razor/Shared/SolutionExtensions.cs → ...cess/Razor/Features/SolutionExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...tractRazorLanguageServerFactoryWrapper.cs → ...tractRazorLanguageServerFactoryWrapper.cs
View file
Open in desktop
File renamed without changes.
0 ...Testing/IRazorTestCapabilitiesProvider.cs → ...Testing/IRazorTestCapabilitiesProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...Shared/Testing/RazorTestAnalyzerLoader.cs → ...atures/Testing/RazorTestAnalyzerLoader.cs
View file
Open in desktop
File renamed without changes.
0 ...Testing/RazorTestLanguageServerFactory.cs → ...Testing/RazorTestLanguageServerFactory.cs
View file
Open in desktop
File renamed without changes.
0 .../RazorTestWorkspaceRegistrationService.cs → .../RazorTestWorkspaceRegistrationService.cs
View file
Open in desktop
File renamed without changes.
0 ...Razor/Shared/Testing/TestSolutionStore.cs → ...zor/Features/Testing/TestSolutionStore.cs
View file
Open in desktop
File renamed without changes.
0 ...ss/Razor/Shared/TextDocumentExtensions.cs → .../Razor/Features/TextDocumentExtensions.cs
View file
Open in desktop
File renamed without changes.
90 changes: 0 additions & 90 deletions .../ExternalAccess/Razor/Shared/Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,94 +8,4 @@
<PropertyGroup Label="Configuration">
<Import_RootNamespace>Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)ChecksumWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\AbstractRazorCohostDocumentRequestHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\AbstractRazorLspService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\AbstractRazorRequestHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Constants.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\ExportCohostLspServiceFactoryAttribute.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\ExportCohostStatelessLspServiceAttribute.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\CodeActions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\Completion.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\Diagnostics.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\DocumentHighlights.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\DocumentSpellCheck.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\DocumentSymbols.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\FindAllReferences.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\FoldingRanges.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\GoToDefinition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\GoToImplementation.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\Hover.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\InlayHints.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\OnAutoInsert.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\Rename.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\SemanticTokensRange.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\SignatureHelp.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\ValidateBreakableRange.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\IRazorCohostDynamicRegistrationService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\IRazorCustomMessageTarget.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\IRazorSemanticTokensRefreshQueue.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\RazorClientLanguageServerManagerFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\RazorCohostClientLanguageServerManagerFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\RazorCohostRequestContext.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\RazorMethodAttribute.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Cohost\RazorSemanticTokensRefreshQueueWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Constants.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IMefHostServicesExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IRazorAsynchronousOperationListenerProviderAccessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IRazorClientLanguageServerManager.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IRazorDocumentExcerptService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IRazorDocumentOperationService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IRazorDocumentPropertiesService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IRazorDocumentServiceProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IRazorDynamicFileInfoProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IRazorLanguageServerTarget.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IRazorMappingService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IRazorSpanMappingService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorAnalyzerAssemblyResolver.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorAsynchronousOperationListenerProviderAccessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorAsynchronousOperationListenerWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorAutoFormattingOptions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorBreakpointSpans.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorClassificationOptionsWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorClassifierAccessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorClientLanguageServerManager.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorCSharpFormattingInteractionService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorCSharpProximityExpressionResolverService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorDocumentExcerptServiceWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorDocumentPropertiesServiceWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorDocumentServiceProviderWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorDynamicFileInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorExcerptMode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorExcerptResult.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorGlobalOptions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorIndentationOptions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorLanguageServerTargetWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorMappedSpanResult.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorMappingServiceWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorPredefinedCodeFixProviderNames.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorPredefinedCodeRefactoringProviderNames.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorProjectExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorSemanticTokensAccessor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RazorUri.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Remote\JsonSerializableDocumentId.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Remote\JsonSerializableRazorPinnedSolutionInfoWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Remote\RazorPinnedSolutionInfoWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteCallbackWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteHostClient.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteServiceCallbackDispatcher.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteServiceCallbackDispatcherRegistry.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteServiceCallbackIdWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteServiceConnectionWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Remote\RazorServiceDescriptorsWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SolutionExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Testing\AbstractRazorLanguageServerFactoryWrapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Testing\IRazorTestCapabilitiesProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Testing\RazorTestAnalyzerLoader.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Testing\RazorTestLanguageServerFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Testing\RazorTestWorkspaceRegistrationService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Testing\TestSolutionStore.cs" />
<Compile Include="$(MSBuildThisFileDirectory)TextDocumentExtensions.cs" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...ols/ExternalAccess/RazorTest/Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ProjectReference Include="..\..\..\Compilers\Test\Core\Microsoft.CodeAnalysis.Test.Utilities.csproj" />
<ProjectReference Include="..\..\..\EditorFeatures\TestUtilities\Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities.csproj" Condition="'$(TargetFramework)' == 'net472'" />
<ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
<ProjectReference Include="..\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj" />
<ProjectReference Include="..\..\..\Tools\ExternalAccess\Razor\Features\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<ForceIncludeInVSIX>true</ForceIncludeInVSIX>
<PkgDefEntry>BindingRedirect</PkgDefEntry>
</ProjectReference>
<ProjectReference Include="..\..\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj">
<ProjectReference Include="..\..\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures.csproj">
<Name>Microsoft.CodeAnalysis.ExternalAccess.Razor</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX>
Expand Down
Loading
Loading