Completion should select IntelliCode item when possible #37066
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5057,13 +5057,112 @@ class C | |
|
|
||
| state.SendTypeChars(".len") | ||
| Await state.AssertCompletionSession() | ||
| state.AssertCompletionItemsContainAll({"Length", "★ Length", "★ Length2"}) | ||
| state.SendCommitUniqueCompletionListItem() | ||
| Await state.AssertNoCompletionSession() | ||
| Assert.Contains("s.Length", state.GetLineTextFromCaretPosition(), StringComparison.Ordinal) | ||
| End Using | ||
| End Function | ||
|
|
||
| ' Implementation for the Modern completion only | ||
| <InlineData(CompletionImplementation.Modern)> | ||
| <WpfTheory, Trait(Traits.Feature, Traits.Features.Completion)> | ||
| Public Async Function IntelliCodeItemPreferredAfterCommitingIntelliCodeItem(completionImplementation As CompletionImplementation) As Task | ||
| Dim provider = New IntelliCodeMockProvider() | ||
| Using state = TestStateFactory.CreateCSharpTestState(completionImplementation, | ||
| <Document> | ||
| class C | ||
| { | ||
| void Method() | ||
| { | ||
| var s = ""; | ||
| s$$ | ||
| } | ||
| } | ||
| </Document>, {provider}) | ||
|
|
||
| state.Workspace.Options = state.Workspace.Options.WithChangedOption( | ||
| CompletionOptions.TriggerOnDeletion, LanguageNames.CSharp, True) | ||
|
|
||
| state.SendTypeChars(".nor") | ||
| Await state.AssertCompletionSession() | ||
| state.AssertCompletionItemsContainAll({"Normalize", "★ Normalize"}) | ||
| Await state.AssertSelectedCompletionItem("★ Normalize", displayTextSuffix:="()") | ||
| state.SendTab() | ||
| Await state.AssertNoCompletionSession() | ||
| Assert.Contains("s.Normalize", state.GetLineTextFromCaretPosition(), StringComparison.Ordinal) | ||
| For i = 1 To "ze".Length | ||
| state.SendBackspace() | ||
| Next | ||
| Await state.AssertSelectedCompletionItem("★ Normalize", displayTextSuffix:="()") | ||
|
|
||
| state.SendEscape() | ||
| For i = 1 To "Normali".Length | ||
| state.SendBackspace() | ||
| Next | ||
| state.SendEscape() | ||
| Assert.Contains("s.", state.GetLineTextFromCaretPosition(), StringComparison.Ordinal) | ||
|
|
||
| state.SendInvokeCompletionList() | ||
| Await state.AssertSelectedCompletionItem("★ Normalize", displayTextSuffix:="()") | ||
| state.SendEscape() | ||
|
|
||
| state.SendTypeChars("n") | ||
| Await state.AssertSelectedCompletionItem("★ Normalize", displayTextSuffix:="()") | ||
| End Using | ||
| End Function | ||
|
|
||
| ' Implementation for the Modern completion only | ||
| <InlineData(CompletionImplementation.Modern)> | ||
| <WpfTheory, Trait(Traits.Feature, Traits.Features.Completion)> | ||
| Public Async Function IntelliCodeItemPreferredAfterCommitingNonIntelliCodeItem(completionImplementation As CompletionImplementation) As Task | ||
| Dim provider = New IntelliCodeMockProvider() | ||
| Using state = TestStateFactory.CreateCSharpTestState(completionImplementation, | ||
| <Document> | ||
| class C | ||
| { | ||
| void Method() | ||
| { | ||
| var s = ""; | ||
| s$$ | ||
| } | ||
| } | ||
| </Document>, {provider}) | ||
|
|
||
| state.Workspace.Options = state.Workspace.Options.WithChangedOption( | ||
| CompletionOptions.TriggerOnDeletion, LanguageNames.CSharp, True) | ||
|
|
||
| state.SendTypeChars(".nor") | ||
| Await state.AssertCompletionSession() | ||
| state.AssertCompletionItemsContainAll({"Normalize", "★ Normalize"}) | ||
| Await state.AssertSelectedCompletionItem("★ Normalize", displayTextSuffix:="()") | ||
|
|
||
| state.NavigateToDisplayText("Normalize") | ||
| state.SendTab() | ||
|
|
||
| Await state.AssertNoCompletionSession() | ||
| Assert.Contains("s.Normalize", state.GetLineTextFromCaretPosition(), StringComparison.Ordinal) | ||
| For i = 1 To "ze".Length | ||
| state.SendBackspace() | ||
| Next | ||
| Await state.AssertSelectedCompletionItem("★ Normalize", displayTextSuffix:="()") | ||
|
|
||
| state.SendEscape() | ||
| For i = 1 To "Normali".Length | ||
| state.SendBackspace() | ||
| Next | ||
| state.SendEscape() | ||
| Assert.Contains("s.", state.GetLineTextFromCaretPosition(), StringComparison.Ordinal) | ||
|
|
||
| state.SendInvokeCompletionList() | ||
| Await state.AssertSelectedCompletionItem("★ Normalize", displayTextSuffix:="()") | ||
| state.SendEscape() | ||
|
|
||
| state.SendTypeChars("n") | ||
| Await state.AssertSelectedCompletionItem("★ Normalize", displayTextSuffix:="()") | ||
| End Using | ||
| End Function | ||
|
|
||
| <WorkItem(35614, "https://github.com/dotnet/roslyn/issues/35614")> | ||
| <MemberData(NameOf(AllCompletionImplementations))> | ||
| <WpfTheory, Trait(Traits.Feature, Traits.Features.Completion)> | ||
|
|
@@ -5451,33 +5550,37 @@ class C | |
|
|
||
| Public Overrides Function ProvideCompletionsAsync(context As CompletionContext) As Task | ||
| context.AddItem(CompletionItem.Create(displayText:="★ Length", filterText:="Length")) | ||
| context.AddItem(CompletionItem.Create(displayText:="★ Normalize", filterText:="Normalize", displayTextSuffix:="()")) | ||
| context.AddItem(CompletionItem.Create(displayText:="Length", filterText:="Length")) | ||
| context.AddItem(CompletionItem.Create(displayText:="ToString", filterText:="ToString", displayTextSuffix:="()")) | ||
| context.AddItem(CompletionItem.Create(displayText:="First", filterText:="First", displayTextSuffix:="()")) | ||
| Return Task.CompletedTask | ||
| End Function | ||
|
|
||
| Public Overrides Function ShouldTriggerCompletion(text As SourceText, caretPosition As Integer, trigger As CompletionTrigger, options As OptionSet) As Boolean | ||
| Return True | ||
| End Function | ||
|
|
||
| Public Overrides Function GetChangeAsync(document As Document, item As CompletionItem, commitKey As Char?, cancellationToken As CancellationToken) As Task(Of CompletionChange) | ||
| Dim commitText = item.DisplayText | ||
| If commitText.StartsWith("★") Then | ||
| ' remove the star and the following space | ||
| commitText = commitText.Substring(2) | ||
| End If | ||
|
|
||
| Return Task.FromResult(CompletionChange.Create(New TextChange(item.Span, commitText))) | ||
| End Function | ||
| End Class | ||
|
|
||
| ' Simulates a situation where IntelliCode provides items not included into the Rolsyn original list. | ||
| ' We want to ignore these items in CommitIfUnique. | ||
| ' This situation should not happen. Tests with this provider were added to cover protective scenarios. | ||
| Private Class IntelliCodeMockWeirdProvider | ||
| Inherits IntelliCodeMockProvider | ||
|
|
||
| Public Overrides Async Function ProvideCompletionsAsync(context As CompletionContext) As Task | ||
| Await MyBase.ProvideCompletionsAsync(context).ConfigureAwait(False) | ||
| context.AddItem(CompletionItem.Create(displayText:="★ Length2", filterText:="Length")) | ||
| End Function | ||
| End Class | ||
| End Class | ||
|
|
||
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -153,7 +153,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense | |
| Dim completionItems = session.GetComputedItems(CancellationToken.None) | ||
| ' During the computation we can explicitly dismiss the session or we can return no items. | ||
| ' Each of these conditions mean that there is no active completion. | ||
| Assert.True(session.IsDismissed OrElse completionItems.Items.Count() = 0, "AssertNoCompletionSession") | ||
| End Function | ||
|
|
||
| Public Overrides Sub AssertNoCompletionSessionWithNoBlock() | ||
|
|
@@ -188,7 +188,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense | |
|
|
||
| Await WaitForAsynchronousOperationsAsync() | ||
| Dim session = GetExportedValue(Of IAsyncCompletionBroker)().GetSession(view) | ||
| Assert.True(session IsNot Nothing, "AssertCompletionSession") | ||
| End Function | ||
|
|
||
| Public Overrides Async Function AssertCompletionSessionAfterTypingHash() As Task | ||
|
|
@@ -291,15 +291,6 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense | |
| End If | ||
| End Sub | ||
|
|
||
| Public Overrides Function GetCompletionItems() As IList(Of CompletionItem) | ||
| WaitForAsynchronousOperationsAsync() | ||
| Dim session = GetExportedValue(Of IAsyncCompletionBroker)().GetSession(TextView) | ||
|
|
||
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -259,6 +259,31 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense | |
|
|
||
| Public MustOverride Function WaitForUIRenderedAsync() As Task | ||
|
|
||
| Public Sub NavigateToDisplayText(targetText As String) | ||
| Dim currentText = GetSelectedItem().DisplayText | ||
|
|
||
| ' GetComputedItems provided by the Editor for tests does not guarantee that | ||
| ' the order of items match the order of items actually displayed in the completion popup. | ||
| ' For example, they put starred items (intellicode) below non-starred ones. | ||
| ' And the order they display those items in the UI is opposite. | ||
| ' Therefore, we do the full traverse: down to the bottom and if not found up to the top. | ||
| Do While currentText <> targetText | ||
| SendDownKey() | ||
| Dim newText = GetSelectedItem().DisplayText | ||
| If currentText = newText Then | ||
| ' Nothing found on going down. Try going up | ||
| Do While currentText <> targetText | ||
| SendUpKey() | ||
| newText = GetSelectedItem().DisplayText | ||
| Assert.True(newText <> currentText, "Reached the bottom, then the top and didn't find the match") | ||
| currentText = newText | ||
| Loop | ||
| End If | ||
|
|
||
| currentText = newText | ||
| Loop | ||
| End Sub | ||
|
|
||
| #End Region | ||
|
|
||
| #Region "Signature Help Operations" | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❓ How is sorting performed? Can we not use the same strategy here (i.e. among two items with the same filter text, prefer to select the first one in sort order)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately, no. Editor maintains multiple items lists: full, sorted, and filtered. They ask us for sorting before. However, they send us the full unsorted list for filtering.