Skip to content
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

Adding cohost completion handler #11048

Merged
merged 63 commits into from
Nov 5, 2024
Merged

Adding cohost completion handler #11048

Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
a53d3a6
Basic infrastructure and HTML completion
alexgav Sep 17, 2024
627c7e7
Moving CompletionListCache into common code
alexgav Sep 19, 2024
ecd74a4
Moved RazorCompletionListProvider and supporting infrustructure to co…
alexgav Sep 21, 2024
ba4b5ec
Adding OOPRazorCompletionFactsService and moving MarkupTransitionComp…
alexgav Sep 24, 2024
d9220c8
Moving LspTagHelperCompletionService to common layer
alexgav Sep 24, 2024
018b57d
Move RazorCompletionListProvider to the Workspaces layer
alexgav Sep 28, 2024
909c3aa
Add OOP MEF exports for completion services from Workspaces layer nee…
alexgav Oct 2, 2024
f3a44db
Hook up RazorComplelistListProvider in the RemoteCompletionService
alexgav Oct 5, 2024
f120c08
Bump Roslyn version to get new CSharp completion APIs
alexgav Oct 10, 2024
74fc3c6
Hooking up C# completion API
alexgav Oct 10, 2024
5cc1400
Common code for completion trigger characters and correct character s…
alexgav Oct 11, 2024
198b404
Respect AutoShowCompletion setting in cohosting
alexgav Oct 11, 2024
6265966
Move IsValidTrigger method to CompletionTriggerCharacters class in th…
alexgav Oct 11, 2024
cf7a94a
Call HTML completion only if we are in HTML and pass a set of existin…
alexgav Oct 11, 2024
f2f7e9c
Pass C# existing completion item labels to RazorCompletionListProvide…
alexgav Oct 11, 2024
311973b
Final completion list merge logic
alexgav Oct 11, 2024
d17c36d
Merge with main
alexgav Oct 11, 2024
bcf2080
Move delegated completion helper RewriteContext method into Workspace…
alexgav Oct 12, 2024
598686b
Provisional completion support
alexgav Oct 13, 2024
62ced4e
Moving delegated response rewriters to the common layer
alexgav Oct 14, 2024
3070b26
Consuming delegated completion response re-writers in C#
alexgav Oct 14, 2024
15be771
Switch to Roslyn CompletionParams as request input so converters are …
alexgav Oct 14, 2024
d25ab7e
Splitting delegated response rewriters into C# and HTML and simplifyi…
alexgav Oct 15, 2024
605b8b0
Moving ShouldIncludeSnippets helper into the common layer and hooking…
alexgav Oct 15, 2024
252d4ac
Adding snippets completion support to cohosting
alexgav Oct 15, 2024
8f94a13
First part of completion options clean-up
alexgav Oct 17, 2024
f5c7633
Second part of completion options clean-up - fixing options values in…
alexgav Oct 17, 2024
95f9410
First set of tests
alexgav Oct 18, 2024
9505241
Adding directives completion provider and test to cohost
alexgav Oct 18, 2024
a0514fa
Adding directive and directive attribute completion providers and tests
alexgav Oct 19, 2024
f646b03
Adding test for CommitElementsWithSpace option
alexgav Oct 19, 2024
6d29f9c
Adding test for AutoInsertAttributeQuotes
alexgav Oct 19, 2024
3312cea
Moved most of the tests for moved code from LanguageServer to Workspa…
alexgav Oct 19, 2024
81a1124
Fixing delegated response re-writer tests.
alexgav Oct 19, 2024
82d275c
Merge with main
alexgav Oct 19, 2024
bbea1db
Add required cancellation token argument to GetGeneratedDocumentAsync…
alexgav Oct 20, 2024
c5722bc
Simplifying trigger character data
alexgav Oct 20, 2024
ec28f9f
Serialization attribute clean-up
alexgav Oct 21, 2024
7129038
Converting DelegatedCSharpCompletionResponseRewriter to interface per…
alexgav Oct 21, 2024
538e3be
Changing ShouldIncludeSnippets to take in RazorCodeDocument per CR su…
alexgav Oct 21, 2024
c744e13
Removed unnecessary null checks per CR suggestion
alexgav Oct 21, 2024
ab716b2
PR feedback - ConfigureAwait(false), shared code for commit character…
alexgav Oct 22, 2024
bc996ed
Simplify applying provisional text edit
alexgav Oct 22, 2024
423252b
PR test suggestions
alexgav Oct 22, 2024
27b8473
Adding a comment clarifying the reasoning about the return value of O…
alexgav Oct 22, 2024
30467a9
Removing item count verification and retries per PR feedback
alexgav Oct 23, 2024
f05e730
Switching to hardcoded directive list in tests per PR feedback
alexgav Oct 24, 2024
13ba925
Moving TagHelperServiceTestBase back to LanguageServer.Test project
alexgav Oct 24, 2024
32bb9f5
Cleanup per PR feedback
alexgav Oct 24, 2024
46ff4ce
Merge with main
alexgav Oct 25, 2024
2d09a20
Fixing build post-merge
alexgav Oct 25, 2024
9377f9c
Pass argument for supportsVsExtensions in RemoteDocumentSymbolService
alexgav Oct 25, 2024
46facea
Add Debug.Fail to make the intent of returning null vs empy completio…
alexgav Oct 27, 2024
2b09ee4
Cleanup and comments per PR feedback
alexgav Oct 28, 2024
64f0ea2
One more comment per PR feedback
alexgav Oct 28, 2024
7c0cfa6
Don't avertise Resolve until we provide it
alexgav Oct 28, 2024
bb32ada
Merge with main and fix-up
alexgav Oct 31, 2024
b14e4dc
Merge with main
alexgav Oct 31, 2024
75061a0
Removing unnecessary async
alexgav Nov 1, 2024
a2c3279
C# override test
alexgav Nov 1, 2024
16ca3da
Merge remote-tracking branch 'origin/main' into dev/alexgav/CohostCom…
alexgav Nov 1, 2024
62df8df
Use remote IClientCapabilitiesService
alexgav Nov 1, 2024
8161ba6
Misc cleanup per PR feedback
alexgav Nov 5, 2024
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
4 changes: 2 additions & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.11.0</_MicrosoftCodeAnalysisAnalyzersPackageVersion>
<_RoslynDiagnosticAnalyzersPackageVersion>3.11.0-beta1.24508.2</_RoslynDiagnosticAnalyzersPackageVersion>
<_MicrosoftVisualStudioLanguageServicesPackageVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</_MicrosoftVisualStudioLanguageServicesPackageVersion>
<_XunitPackageVersion>2.6.3</_XunitPackageVersion>
<_XunitPackageVersion>2.6.6</_XunitPackageVersion>
alexgav marked this conversation as resolved.
Show resolved Hide resolved
<_MicrosoftBuildPackageVersion>17.11.0-preview-24309-01</_MicrosoftBuildPackageVersion>
</PropertyGroup>

Expand Down Expand Up @@ -117,7 +117,7 @@
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageVersion Include="xunit" Version="$(_XunitPackageVersion)" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.5.25" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
alexgav marked this conversation as resolved.
Show resolved Hide resolved
<PackageVersion Include="xunit.extensibility.execution" Version="$(_XunitPackageVersion)" />
<PackageVersion Include="xunit.runner.utility" Version="2.4.1" />
<PackageVersion Include="Xunit.StaFact" Version="1.2.46-alpha" />
Expand Down
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,82 +11,82 @@
<Sha>4660d88cf953fbbd14192c787053a20246ce1aeb</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.24466.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-1.24505.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7b7951aa13c50ad768538e58ed3805898b058928</Sha>
<Sha>e2d4e372f19c16f9b3dea06f7ca857ed5d42bc09</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
Expand Down
40 changes: 20 additions & 20 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,25 @@
<MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.24516.2</MicrosoftSourceBuildIntermediatearcadePackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>1.0.0-beta.23475.1</MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.12.0-3.24466.4</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.12.0-3.24466.4</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.24466.4</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.12.0-3.24466.4</MicrosoftSourceBuildIntermediateroslynPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.12.0-3.24466.4</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.13.0-1.24505.1</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.13.0-1.24505.1</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-1.24505.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.13.0-1.24505.1</MicrosoftSourceBuildIntermediateroslynPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.13.0-1.24505.1</MicrosoftVisualStudioLanguageServicesPackageVersion>
<!--
Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.
Expand All @@ -97,7 +97,7 @@
PackageReference versions directly in arcade.
-->
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
<XUnitVersion>2.6.3</XUnitVersion>
<XUnitVersion>2.6.6</XUnitVersion>
<XUnitAnalyzersVersion>1.7.0</XUnitAnalyzersVersion>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions eng/targets/Services.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@
<ServiceHubService Include="Microsoft.VisualStudio.Razor.GoToImplementation" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteGoToImplementationService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.Razor.SpellCheck" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteSpellCheckService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.Razor.Diagnostics" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteDiagnosticsService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.Razor.Completion" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteCompletionService+Factory" />
</ItemGroup>
</Project>
18 changes: 12 additions & 6 deletions ...rks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCompletionBenchmark.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the MIT license. See License.txt in the project root for license information.

using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Threading;
Expand All @@ -13,6 +12,7 @@
using Microsoft.AspNetCore.Razor.LanguageServer.Completion.Delegation;
using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
using Microsoft.CodeAnalysis.Razor.Completion;
using Microsoft.CodeAnalysis.Razor.DocumentMapping;
using Microsoft.CodeAnalysis.Razor.Logging;
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
Expand All @@ -37,13 +37,12 @@ public async Task SetupAsync()
{
var razorCompletionListProvider = RazorLanguageServerHost.GetRequiredService<RazorCompletionListProvider>();
var lspServices = RazorLanguageServerHost.GetRequiredService<ILspServices>();
var responseRewriters = lspServices.GetRequiredServices<DelegatedCompletionResponseRewriter>();
var documentMappingService = lspServices.GetRequiredService<IDocumentMappingService>();
var clientConnection = lspServices.GetRequiredService<IClientConnection>();
var completionListCache = lspServices.GetRequiredService<CompletionListCache>();
var loggerFactory = lspServices.GetRequiredService<ILoggerFactory>();

var delegatedCompletionListProvider = new TestDelegatedCompletionListProvider(responseRewriters, documentMappingService, clientConnection, completionListCache);
var delegatedCompletionListProvider = new TestDelegatedCompletionListProvider(documentMappingService, clientConnection, completionListCache);
var completionListProvider = new CompletionListProvider(razorCompletionListProvider, delegatedCompletionListProvider);
var configurationService = new DefaultRazorConfigurationService(clientConnection, loggerFactory);
var optionsMonitor = new RazorLSPOptionsMonitor(configurationService, RazorLSPOptions.Default);
Expand Down Expand Up @@ -141,12 +140,19 @@ public async Task RazorCompletionAsync()

private class TestDelegatedCompletionListProvider : DelegatedCompletionListProvider
{
public TestDelegatedCompletionListProvider(IEnumerable<DelegatedCompletionResponseRewriter> responseRewriters, IDocumentMappingService documentMappingService, IClientConnection clientConnection, CompletionListCache completionListCache)
: base(responseRewriters, documentMappingService, clientConnection, completionListCache)
public TestDelegatedCompletionListProvider(IDocumentMappingService documentMappingService, IClientConnection clientConnection, CompletionListCache completionListCache)
: base(documentMappingService, clientConnection, completionListCache)
{
}

public override Task<VSInternalCompletionList?> GetCompletionListAsync(int absoluteIndex, VSInternalCompletionContext completionContext, DocumentContext documentContext, VSInternalClientCapabilities clientCapabilities, Guid correlationId, CancellationToken cancellationToken)
public override Task<VSInternalCompletionList?> GetCompletionListAsync(
int absoluteIndex,
VSInternalCompletionContext completionContext,
DocumentContext documentContext,
VSInternalClientCapabilities clientCapabilities,
RazorCompletionOptions completionOptions,
Guid correlationId,
CancellationToken cancellationToken)
{
return Task.FromResult<VSInternalCompletionList?>(
new VSInternalCompletionList
Expand Down
4 changes: 2 additions & 2 deletions ...Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/TagHelperCompletionBenchmark.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class TagHelperCompletionBenchmark
[Benchmark]
public object GetAttributeCompletions()
{
var tagHelperCompletionService = new LspTagHelperCompletionService();
var tagHelperCompletionService = new TagHelperCompletionService();
var context = new AttributeCompletionContext(
TagHelperDocumentContext.Create(prefix: null, CommonResources.TelerikTagHelpers),
existingCompletions: [],
Expand All @@ -46,7 +46,7 @@ public object GetAttributeCompletions()
[Benchmark]
public object GetElementCompletions()
{
var tagHelperCompletionService = new LspTagHelperCompletionService();
var tagHelperCompletionService = new TagHelperCompletionService();
var context = new ElementCompletionContext(
TagHelperDocumentContext.Create(prefix: null, CommonResources.TelerikTagHelpers),
existingCompletions: s_existingElementCompletions,
Expand Down
Loading
Loading