Skip to content

Port inline completion to cohosting #11277

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 9 commits into from
Dec 16, 2024
Merged

Port inline completion to cohosting #11277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
43895fb
Port inline completion to cohosting
davidwengier Dec 6, 2024
ed40963
Unused usings....
davidwengier Dec 6, 2024
36345f6
PR Feedback
davidwengier Dec 9, 2024
ef0d973
Bump Roslyn
davidwengier Dec 11, 2024
4f65601
Bump dependencies
davidwengier Dec 12, 2024
729096d
Merge remote-tracking branch 'upstream/main' into CohostInlineCompletion
davidwengier Dec 12, 2024
0260d15
Update tests after absorbing Roslyn changes
davidwengier Dec 12, 2024
a94045f
Update language server tests after absorbing Roslyn changes
davidwengier Dec 12, 2024
7bc9e51
Wait for server shut down before exiting test
davidwengier Dec 16, 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.6</_XunitPackageVersion>
<_XunitPackageVersion>2.9.2</_XunitPackageVersion>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be needed once we get the Roslyn bump, but you'll just have to trust me for now

<_MicrosoftBuildPackageVersion>17.12.0-preview-24426-07</_MicrosoftBuildPackageVersion>
</PropertyGroup>

Expand Down Expand Up @@ -114,7 +114,7 @@
<PackageVersion Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
<PackageVersion Include="System.Security.Cryptography.Xml" Version="7.0.1" />
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
<PackageVersion Include="xunit" Version="$(_XunitPackageVersion)" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
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>dd1d66ed9123ad8f993b1c00711f2c50f7f48a96</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.24576.11">
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.24610.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f2ed01d1af9429d874aca1eea60d3212167bc40</Sha>
<Sha>7997469057f8c288101885070a51a599be24e7da</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.24572.2</MicrosoftSourceBuildIntermediatearcadePackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>1.0.0-beta.23475.1</MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.13.0-3.24576.11</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.13.0-3.24576.11</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.24576.11</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.13.0-3.24576.11</MicrosoftSourceBuildIntermediateroslynPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.13.0-3.24576.11</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.13.0-3.24610.5</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.13.0-3.24610.5</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.24610.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.13.0-3.24610.5</MicrosoftSourceBuildIntermediateroslynPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.13.0-3.24610.5</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.6</XUnitVersion>
<XUnitVersion>2.9.2</XUnitVersion>
<XUnitAnalyzersVersion>1.7.0</XUnitAnalyzersVersion>
</PropertyGroup>

Expand Down
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 @@ -37,5 +37,6 @@
<ServiceHubService Include="Microsoft.VisualStudio.Razor.Completion" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteCompletionService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.Razor.CodeActions" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteCodeActionsService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.Razor.FindAllReferences" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteFindAllReferencesService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.Razor.InlineCompletion" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteInlineCompletionService+Factory" />
</ItemGroup>
</Project>
17 changes: 17 additions & 0 deletions src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hosting/LspInitializationHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using Microsoft.CodeAnalysis.Razor.Formatting;
using Microsoft.CodeAnalysis.Razor.SemanticTokens;
using Microsoft.VisualStudio.LanguageServer.Protocol;
Expand Down Expand Up @@ -111,4 +112,20 @@ public static DocumentOnTypeFormattingOptions EnableOnTypeFormattingTriggerChara

return options;
}

public static void EnableInlineCompletion(
this VSInternalServerCapabilities serverCapabilities)
{
serverCapabilities.InlineCompletionOptions = new VSInternalInlineCompletionOptions().EnableInlineCompletion();
}

public static VSInternalInlineCompletionOptions EnableInlineCompletion(this VSInternalInlineCompletionOptions options)
{
options.Pattern = new Regex(string.Join("|",
["~", "Attribute", "checked", "class", "ctor", "cw", "do", "else", "enum", "equals", "Exception", "for", "foreach", "forr",
"if", "indexer", "interface", "invoke", "iterator", "iterindex", "lock", "mbox", "namespace", "#if", "#region", "prop",
"propfull", "propg", "sim", "struct", "svm", "switch", "try", "tryf", "unchecked", "unsafe", "using", "while"]));

return options;
}
}
Loading
Loading