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

Jump to bottom

Updates for Multiple Language Server CompletionOptions Support #1948

Merged
merged 3 commits into from
Jul 14, 2020
Merged

Updates for Multiple Language Server CompletionOptions Support #1948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7714430
Updates for Multiple Language Server CompletionOptions Support
TanayParikh May 29, 2020
fe1ac0e
Fix Merge Conflict
TanayParikh Jul 14, 2020
129d2bf
Merge branch 'master' into taparik/CompletionOptionsCommit-21346
TanayParikh Jul 14, 2020
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: 4 additions & 0 deletions ...Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionEndpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ public CompletionRegistrationOptions GetRegistrationOptions()
DocumentSelector = RazorDefaults.Selector,
ResolveProvider = true,
TriggerCharacters = new Container<string>("@", "<", ":"),

// NOTE: This property is *NOT* processed in O# versions < 0.16
TanayParikh marked this conversation as resolved.
Show resolved Hide resolved
// https://github.com/OmniSharp/csharp-language-server-protocol/blame/bdec4c73240be52fbb25a81f6ad7d409f77b5215/src/Protocol/Server/Capabilities/CompletionOptions.cs#L35-L44
AllCommitCharacters = new Container<string>(":", ">", " ", "=" ),
};
}

Expand Down
2 changes: 1 addition & 1 deletion ...zor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/HtmlCSharp/InitializeHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ internal class InitializeHandler : IRequestHandler<InitializeParams, InitializeR
{
CompletionProvider = new CompletionOptions()
{
AllCommitCharacters = new[] { " ", ".", ";", ">", "=", ":", "(", ")", "[", "]", "{", "}", "!" }, // This is necessary to workaround a bug where the commit character in CompletionItem is not respected. https://github.com/dotnet/aspnetcore/issues/21346
AllCommitCharacters = new[] { " ", ".", ";", ">", "=", "(", ")", "[", "]", "{", "}", "!" },
ResolveProvider = true,
TriggerCharacters = new[] { ".", "@", "<", "&", "\\", "/", "'", "\"", "=", ":", " " }
},
Expand Down