Ensure LSP uses actual signature help trigger characters #78076
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
Area-IDE
untriaged
dibarbet
commented
Apr 9, 2025
| @@ -14,11 +16,50 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; | |||
| /// </summary> | |||
| internal abstract class VSTypeScriptSignatureHelpProviderBase : ISignatureHelpProvider | |||
| { | |||
| public ImmutableArray<char> TriggerCharacters | |||
There was a problem hiding this comment.
this was the easiest way I could come up with to avoid a dual insertion.
once we have packages I'll submit a PR to TS to switch to the new properties, then we can delete the hardcoded characters.
dibarbet
commented
Apr 9, 2025
| /// <summary> | ||
| /// Hard coded from https://github.com/dotnet/fsharp/blob/main/vsintegration/src/FSharp.Editor/Completion/SignatureHelp.fs#L708 | ||
| /// </summary> | ||
| public ImmutableArray<char> TriggerCharacters => _newProvider is not null ? _newProvider.TriggerCharacters : ['(', '<', ',', ' ']; |
There was a problem hiding this comment.
this was the easiest way I could come up with to avoid a dual insertion.
once we have packages inserted I'll submit a PR to F# to switch to the new properties, then we can delete the hardcoded characters.
There was a problem hiding this comment.
yup. this makes sense to me.
dibarbet
commented
Apr 9, 2025
| @@ -66,7 +74,12 @@ public ServerCapabilities GetCapabilities(ClientCapabilities clientCapabilities) | |||
| TriggerCharacters = triggerCharacters, | |||
| }; | |||
|
|
|||
| capabilities.SignatureHelpProvider = new SignatureHelpOptions { TriggerCharacters = ["(", ","] }; | |||
| var signatureHelpTriggerCharacters = _signatureHelpProviders.SelectMany( | |||
There was a problem hiding this comment.
the main part of the fix. rest is basically just updating based on the interface changes
JoeRobich
approved these changes
Apr 9, 2025
src/VisualStudio/ExternalAccess/FSharp/SignatureHelp/IFSharpSignatureHelpProvider.cs
Outdated
Show resolved
Hide resolved
| @@ -28,20 +28,17 @@ namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp; | |||
| [ExportSignatureHelpProvider("ElementAccessExpressionSignatureHelpProvider", LanguageNames.CSharp), Shared] | |||
| internal sealed class ElementAccessExpressionSignatureHelpProvider : AbstractCSharpSignatureHelpProvider | |||
| { | |||
| private static readonly ImmutableArray<char> s_triggerCharacters = ['[', ',']; | |||
There was a problem hiding this comment.
could remove and do TriggerCharaacters { get; } = ...
There was a problem hiding this comment.
this is used in a bunch of static classes and methods - found it easier to do this than change the rest of the callers
src/Features/CSharp/Portable/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs
Show resolved
Hide resolved
Comment on lines
39
to
49
| Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) | ||
| Get | ||
| Return ImmutableArray.Create(" "c, ","c) | ||
| End Get | ||
| End Property | ||
|
|
||
| Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) | ||
| Get | ||
| Return ImmutableArray(Of Char).Empty | ||
| End Get | ||
| End Property |
There was a problem hiding this comment.
Suggested change
| Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) | |
| Get | |
| Return ImmutableArray.Create(" "c, ","c) | |
| End Get | |
| End Property | |
| Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) | |
| Get | |
| Return ImmutableArray(Of Char).Empty | |
| End Get | |
| End Property | |
| Public Overrides ReadOnly Property TriggerCharacters As ImmutableArray(Of Char) = ImmutableArray.Create(" "c, ","c) | |
| Public Overrides ReadOnly Property RetriggerCharacters As ImmutableArray(Of Char) = ImmutableArray(Of Char).Empty |
src/Features/VisualBasic/Portable/SignatureHelp/AttributeSignatureHelpProvider.vb
Outdated
Show resolved
Hide resolved
src/Features/VisualBasic/Portable/SignatureHelp/CastExpressionSignatureHelpProvider.vb
Outdated
Show resolved
Hide resolved
CyrusNajmabadi
approved these changes
Apr 9, 2025
This was referenced Apr 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves dotnet/vscode-csharp#8154