Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 dad8f4d6 编写于 作者: C Cyrus Najmabadi
浏览文件
操作

Remove ConfigureAwait(true) from test code.

上级 c1338281
展开全部 隐藏空白更改
内联 并排
Showing with 706 addition and 706 deletion
src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests_Projections.vb
浏览文件 @ dad8f4d6
......@@ -26,8 +26,8 @@ public override void Execute() {
}]]></Document>)
state.SendTypeChars(".Curr")
Await state.WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await state.AssertSelectedCompletionItem(displayText:="CurrentDomain").ConfigureAwait(True)
Await state.WaitForAsynchronousOperationsAsync()
Await state.AssertSelectedCompletionItem(displayText:="CurrentDomain")
state.SendTab()
Assert.Contains("__o = AppDomain.CurrentDomain", state.GetLineTextFromCaretPosition(), StringComparison.Ordinal)
End Using
......@@ -64,11 +64,11 @@ class C
Dim buffer = subjectDocument.GetTextBuffer()
state.SendTypeCharsToSpecificViewAndBuffer(".", view, buffer)
Await state.AssertCompletionSession().ConfigureAwait(True)
Await state.AssertCompletionSession()
state.SendTypeCharsToSpecificViewAndBuffer("Cons", view, buffer)
Await state.WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await state.AssertSelectedCompletionItem(displayText:="Console").ConfigureAwait(True)
Await state.WaitForAsynchronousOperationsAsync()
Await state.AssertSelectedCompletionItem(displayText:="Console")
End Using
End Function
......@@ -103,8 +103,8 @@ class C
Dim buffer = subjectDocument.GetTextBuffer()
state.SendTypeCharsToSpecificViewAndBuffer(" ", view, buffer)
Await state.WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await state.AssertSelectedCompletionItem(displayText:="string", isHardSelected:=True).ConfigureAwait(True)
Await state.WaitForAsynchronousOperationsAsync()
Await state.AssertSelectedCompletionItem(displayText:="string", isHardSelected:=True)
End Using
End Function
......@@ -140,8 +140,8 @@ class C
Dim buffer = subjectDocument.GetTextBuffer()
state.SendTypeCharsToSpecificViewAndBuffer("#reg", view, buffer)
Await state.WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await state.AssertSelectedCompletionItem(displayText:="region", shouldFormatOnCommit:=True).ConfigureAwait(True)
Await state.WaitForAsynchronousOperationsAsync()
Await state.AssertSelectedCompletionItem(displayText:="region", shouldFormatOnCommit:=True)
End Using
End Function
......
src/EditorFeatures/Test2/IntelliSense/CSharpIntelliSenseCommandHandlerTests.vb
浏览文件 @ dad8f4d6
......@@ -23,12 +23,12 @@ class C
</Document>)
state.SendTypeChars("Fo")
Await state.AssertCompletionSession().ConfigureAwait(True)
Await state.AssertNoSignatureHelpSession().ConfigureAwait(True)
Await state.AssertCompletionSession()
Await state.AssertNoSignatureHelpSession()
state.SendTypeChars("(")
Await state.AssertNoCompletionSession().ConfigureAwait(True)
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo()").ConfigureAwait(True)
Await state.AssertNoCompletionSession()
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo()")
Assert.Contains("Foo(", state.GetLineTextFromCaretPosition(), StringComparison.Ordinal)
End Using
End Function
......@@ -48,16 +48,16 @@ class C
</Document>)
state.SendTypeChars("Foo(a")
Await state.AssertCompletionSession().ConfigureAwait(True)
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await state.AssertCompletionSession()
Await state.AssertSignatureHelpSession()
Await state.WaitForAsynchronousOperationsAsync()
state.SendEscape()
Await state.AssertNoCompletionSession().ConfigureAwait(True)
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await state.AssertNoCompletionSession()
Await state.AssertSignatureHelpSession()
Await state.WaitForAsynchronousOperationsAsync()
state.SendEscape()
Await state.AssertNoCompletionSession().ConfigureAwait(True)
Await state.AssertNoSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoCompletionSession()
Await state.AssertNoSignatureHelpSession()
End Using
End Function
......@@ -75,12 +75,12 @@ class C
}
</Document>)
state.SendTypeChars("Foo(a")
Await state.AssertCompletionSession().ConfigureAwait(True)
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await state.AssertCompletionSession()
Await state.AssertSignatureHelpSession()
Await state.WaitForAsynchronousOperationsAsync()
state.SendCut()
Await state.AssertNoCompletionSession().ConfigureAwait(True)
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoCompletionSession()
Await state.AssertSignatureHelpSession()
End Using
End Function
......@@ -99,12 +99,12 @@ class C
</Document>)
state.SendTypeChars("Foo(a")
Await state.AssertCompletionSession().ConfigureAwait(True)
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await state.AssertCompletionSession()
Await state.AssertSignatureHelpSession()
Await state.WaitForAsynchronousOperationsAsync()
state.SendPaste()
Await state.AssertNoCompletionSession().ConfigureAwait(True)
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoCompletionSession()
Await state.AssertSignatureHelpSession()
End Using
End Function
End Class
......
src/EditorFeatures/Test2/IntelliSense/CSharpSignatureHelpCommandHandlerTests.vb
浏览文件 @ dad8f4d6
......@@ -20,9 +20,9 @@ class C
</Document>)
state.SendTypeChars("(")
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo()")
state.SendTypeChars(")")
Await state.AssertNoSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoSignatureHelpSession()
End Using
End Function
......@@ -40,9 +40,9 @@ class C
</Document>)
state.SendTypeChars("(")
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo(int i, string j)", selectedParameter:="int i").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo(int i, string j)", selectedParameter:="int i")
state.SendTypeChars("1,")
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo(int i, string j)", selectedParameter:="string j").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo(int i, string j)", selectedParameter:="string j")
End Using
End Function
......@@ -60,11 +60,11 @@ class C
</Document>)
state.SendTypeChars(",")
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo(int i, string j)", selectedParameter:="string j").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo(int i, string j)", selectedParameter:="string j")
state.SendLeftKey()
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo(int i, string j)", selectedParameter:="int i").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo(int i, string j)", selectedParameter:="int i")
state.SendRightKey()
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo(int i, string j)", selectedParameter:="string j").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo(int i, string j)", selectedParameter:="string j")
End Using
End Function
......@@ -82,9 +82,9 @@ class C
</Document>)
state.SendInvokeSignatureHelp()
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo()")
state.SendRightKey()
Await state.AssertNoSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoSignatureHelpSession()
End Using
End Function
......@@ -103,11 +103,11 @@ class C
</Document>)
state.SendTypeChars("(")
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo()")
state.SendTypeChars("Bar(")
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Bar()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Bar()")
state.SendTypeChars(")")
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem(displayText:="void C.Foo()")
End Using
End Function
......@@ -120,7 +120,7 @@ namespace global::F$$
</Document>)
state.SendTypeChars("<")
Await state.AssertNoSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoSignatureHelpSession()
End Using
End Function
......@@ -141,7 +141,7 @@ class C
</Document>)
state.SendInvokeSignatureHelp()
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
End Using
End Function
......@@ -167,20 +167,20 @@ class Program
</Document>)
state.SendInvokeSignatureHelp()
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void C.M(int third)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("void C.M(int third)")
Assert.Equal(2, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
state.SendTypeChars(":")
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void C.M(int first, int second)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("void C.M(int first, int second)")
Assert.Equal(1, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
' Keep the same item selected when the colon is deleted, but now both items are
' available again.
state.SendBackspace()
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void C.M(int first, int second)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("void C.M(int first, int second)")
Assert.Equal(2, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
End Using
End Function
......@@ -202,13 +202,13 @@ class Program
]]></Document>)
state.SendTypeChars("(")
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void Program.F(int i)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("void Program.F(int i)")
Assert.Equal(2, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
state.SendTypeChars(""""",")
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void Program.F(int i)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("void Program.F(int i)")
Assert.Equal(2, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
End Using
End Function
......@@ -232,15 +232,15 @@ class C
]]></Document>)
state.SendTypeChars("(")
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void C.M()").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("void C.M()")
Assert.Equal(4, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
state.SendUpKey()
Await state.AssertSelectedSignatureHelpItem("void C.M(int i, int j, int k)").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void C.M(int i, int j, int k)")
state.SendTypeChars("1, ")
Await state.AssertSelectedSignatureHelpItem("void C.M(int i, int j, int k)").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void C.M(int i, int j, int k)")
End Using
End Function
......@@ -262,12 +262,12 @@ class Program
]]></Document>)
state.SendTypeChars("[")
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("char string[int index]").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("char string[int index]")
state.SendTypeChars("x")
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("char string[int index]").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("char string[int index]")
End Using
End Function
......@@ -302,11 +302,11 @@ class C
Dim linkDocument = documents.Single(Function(d) d.IsLinkFile)
state.SendInvokeSignatureHelp()
Await state.AssertSelectedSignatureHelpItem("void C.M2(int x)").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void C.M2(int x)")
state.SendEscape()
state.Workspace.SetDocumentContext(linkDocument.Id)
state.SendInvokeSignatureHelp()
Await state.AssertSelectedSignatureHelpItem("void C.M2(string x)").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void C.M2(string x)")
End Using
End Function
......@@ -329,10 +329,10 @@ class C
]]></Document>)
state.SendInvokeSignatureHelp()
Await state.AssertSelectedSignatureHelpItem("void C.M()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void C.M()")
state.SendTypeChars("""")
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void C.M(string s)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("void C.M(string s)")
End Using
End Function
......@@ -355,9 +355,9 @@ class C
]]></Document>)
state.SendInvokeSignatureHelp()
Await state.AssertSelectedSignatureHelpItem("void C.M()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("void C.M()")
state.SendTypeChars("//")
Await state.AssertNoSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoSignatureHelpSession()
End Using
End Function
......@@ -380,7 +380,7 @@ class C
]]></Document>)
state.SendTypeChars("<")
Await state.AssertSelectedSignatureHelpItem($"({CSharpFeaturesResources.Extension}) IEnumerable<TResult> IEnumerable.OfType<TResult>()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem($"({CSharpFeaturesResources.Extension}) IEnumerable<TResult> IEnumerable.OfType<TResult>()")
End Using
End Function
......@@ -403,7 +403,7 @@ class C
]]></Document>)
state.SendTypeChars("<")
Await state.AssertSelectedSignatureHelpItem($"({CSharpFeaturesResources.Extension}) IEnumerable<TResult> IEnumerable.OfType<TResult>()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem($"({CSharpFeaturesResources.Extension}) IEnumerable<TResult> IEnumerable.OfType<TResult>()")
End Using
End Function
......@@ -426,7 +426,7 @@ class C
]]></Document>)
state.SendTypeChars("<")
Await state.AssertSelectedSignatureHelpItem($"({CSharpFeaturesResources.Extension}) IEnumerable<TResult> IEnumerable.OfType<TResult>()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem($"({CSharpFeaturesResources.Extension}) IEnumerable<TResult> IEnumerable.OfType<TResult>()")
End Using
End Function
......@@ -449,7 +449,7 @@ class C
]]></Document>)
state.SendTypeChars("<")
Await state.AssertSelectedSignatureHelpItem($"({CSharpFeaturesResources.Extension}) IEnumerable<TResult> IEnumerable.OfType<TResult>()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem($"({CSharpFeaturesResources.Extension}) IEnumerable<TResult> IEnumerable.OfType<TResult>()")
End Using
End Function
......@@ -470,11 +470,11 @@ class C
' disable implicit sig help then type a trigger character -> no session should be available
state.Workspace.Options = state.Workspace.Options.WithChangedOption(SignatureHelpOptions.ShowSignatureHelp, "C#", False)
state.SendTypeChars("(")
Await state.AssertNoSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoSignatureHelpSession()
' force-invoke -> session should be available
state.SendInvokeSignatureHelp()
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
End Using
End Function
End Class
......
src/EditorFeatures/Test2/IntelliSense/ModelTests.vb
浏览文件 @ dad8f4d6
......@@ -100,10 +100,10 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
c.ThrowIfCancellationRequested()
Return Task.FromResult(model)
End Function)
Await checkpoint1.Task.ConfigureAwait(True)
Await checkpoint1.Task
modelComputation.Stop()
checkpoint2.Release()
Await checkpoint3.Task.ConfigureAwait(True)
Await checkpoint3.Task
controller.Verify(Sub(c) c.OnModelUpdated(model), Times.Never)
End Function
......
src/EditorFeatures/Test2/IntelliSense/TestState.vb
浏览文件 @ dad8f4d6
......@@ -215,13 +215,13 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
Public Async Function AssertNoCompletionSession(Optional block As Boolean = True) As Task
If block Then
Await WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await WaitForAsynchronousOperationsAsync()
End If
Assert.Null(Me.CurrentCompletionPresenterSession)
End Function
Public Async Function AssertCompletionSession() As Task
Await WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await WaitForAsynchronousOperationsAsync()
Assert.NotNull(Me.CurrentCompletionPresenterSession)
End Function
......@@ -242,7 +242,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
Optional isSoftSelected As Boolean? = Nothing,
Optional isHardSelected As Boolean? = Nothing,
Optional shouldFormatOnCommit As Boolean? = Nothing) As Task
Await WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await WaitForAsynchronousOperationsAsync()
If isSoftSelected.HasValue Then
Assert.Equal(isSoftSelected.Value, Me.CurrentCompletionPresenterSession.IsSoftSelected)
End If
......@@ -312,14 +312,14 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
Public Async Function AssertNoSignatureHelpSession(Optional block As Boolean = True) As Task
If block Then
Await WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await WaitForAsynchronousOperationsAsync()
End If
Assert.Null(Me.CurrentSignatureHelpPresenterSession)
End Function
Public Async Function AssertSignatureHelpSession() As Task
Await WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await WaitForAsynchronousOperationsAsync()
Assert.NotNull(Me.CurrentSignatureHelpPresenterSession)
End Function
......@@ -356,7 +356,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
Public Async Function AssertSelectedSignatureHelpItem(Optional displayText As String = Nothing,
Optional documentation As String = Nothing,
Optional selectedParameter As String = Nothing) As Task
Await WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await WaitForAsynchronousOperationsAsync()
If displayText IsNot Nothing Then
Assert.Equal(displayText, GetDisplayText(Me.CurrentSignatureHelpPresenterSession.SelectedItem, Me.CurrentSignatureHelpPresenterSession.SelectedParameter.Value))
......
src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests_Projections.vb
浏览文件 @ dad8f4d6
......@@ -33,10 +33,10 @@ End Namespace
]]></Document>)
state.SendTypeChars(".")
Await state.AssertCompletionSession().ConfigureAwait(True)
Await state.AssertCompletionSession()
state.SendTypeChars("Curr")
Await state.WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await state.AssertSelectedCompletionItem(displayText:="CurrentDomain").ConfigureAwait(True)
Await state.WaitForAsynchronousOperationsAsync()
Await state.AssertSelectedCompletionItem(displayText:="CurrentDomain")
state.SendTab()
Assert.Contains("__o = AppDomain.CurrentDomain", state.GetLineTextFromCaretPosition(), StringComparison.Ordinal)
End Using
......@@ -71,11 +71,11 @@ End Class
Dim buffer = subjectDocument.GetTextBuffer()
state.SendTypeCharsToSpecificViewAndBuffer(".", view, buffer)
Await state.AssertCompletionSession().ConfigureAwait(True)
Await state.AssertCompletionSession()
state.SendTypeCharsToSpecificViewAndBuffer("Cons", view, buffer)
Await state.WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await state.AssertSelectedCompletionItem(displayText:="Console").ConfigureAwait(True)
Await state.WaitForAsynchronousOperationsAsync()
Await state.AssertSelectedCompletionItem(displayText:="Console")
End Using
End Function
......@@ -108,11 +108,11 @@ End Class
Dim buffer = subjectDocument.GetTextBuffer()
state.SendTypeCharsToSpecificViewAndBuffer(" ", view, buffer)
Await state.AssertCompletionSession().ConfigureAwait(True)
Await state.AssertCompletionSession()
state.SendTypeCharsToSpecificViewAndBuffer("Str", view, buffer)
Await state.WaitForAsynchronousOperationsAsync().ConfigureAwait(True)
Await state.AssertSelectedCompletionItem(displayText:="String", isHardSelected:=True).ConfigureAwait(True)
Await state.WaitForAsynchronousOperationsAsync()
Await state.AssertSelectedCompletionItem(displayText:="String", isHardSelected:=True)
End Using
End Function
End Class
......
src/EditorFeatures/Test2/IntelliSense/VisualBasicSignatureHelpCommandHandlerTests.vb
浏览文件 @ dad8f4d6
......@@ -29,20 +29,20 @@ End Class
</Document>)
state.SendInvokeSignatureHelp()
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M(third As Integer)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("C.M(third As Integer)")
Assert.Equal(2, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
state.SendTypeChars(":=")
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M(first As Integer, second As Integer)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("C.M(first As Integer, second As Integer)")
Assert.Equal(1, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
' Keep the same item selected when the colon is deleted, but now both items are
' available again.
state.SendBackspace()
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M(first As Integer, second As Integer)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("C.M(first As Integer, second As Integer)")
Assert.Equal(2, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
End Using
End Function
......@@ -69,18 +69,18 @@ End Class
</Document>)
state.SendInvokeSignatureHelp()
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M(third As Integer)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("C.M(third As Integer)")
Assert.Equal(2, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
state.SendTypeChars(":=")
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M(first As Integer, second As Integer)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("C.M(first As Integer, second As Integer)")
Assert.Equal(1, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
state.SendTypeChars("0,")
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M(first As Integer, second As Integer)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("C.M(first As Integer, second As Integer)")
Assert.Equal(1, state.CurrentSignatureHelpPresenterSession.SignatureHelpItems.Count)
End Using
End Function
......@@ -99,10 +99,10 @@ End Module
</Document>)
state.SendInvokeSignatureHelp()
Await state.AssertNoSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoSignatureHelpSession()
state.SendBackspace()
Await state.AssertNoSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoSignatureHelpSession()
End Using
End Function
......@@ -137,11 +137,11 @@ End Class
Dim linkDocument = documents.Single(Function(d) d.IsLinkFile)
state.SendInvokeSignatureHelp()
Await state.AssertSelectedSignatureHelpItem("C.M2(x As Integer)").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M2(x As Integer)")
state.SendEscape()
state.Workspace.SetDocumentContext(linkDocument.Id)
state.SendInvokeSignatureHelp()
Await state.AssertSelectedSignatureHelpItem("C.M2(x As String)").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M2(x As String)")
End Using
End Function
......@@ -161,10 +161,10 @@ End Class
]]></Document>)
state.SendInvokeSignatureHelp()
Await state.AssertSelectedSignatureHelpItem("C.M()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M()")
state.SendTypeChars("""")
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M(s As String)").ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
Await state.AssertSelectedSignatureHelpItem("C.M(s As String)")
End Using
End Function
......@@ -184,9 +184,9 @@ End Class
]]></Document>)
state.SendInvokeSignatureHelp()
Await state.AssertSelectedSignatureHelpItem("C.M()").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M()")
state.SendTypeChars("'")
Await state.AssertNoSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoSignatureHelpSession()
End Using
End Function
......@@ -204,7 +204,7 @@ End Class
state.SendInvokeSignatureHelp()
state.SendTypeChars(" ")
Await state.AssertSelectedSignatureHelpItem("C.M(a As String, b As String)").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem("C.M(a As String, b As String)")
End Using
End Function
......@@ -224,7 +224,7 @@ End Class
]]></Document>)
state.SendTypeChars("(")
Await state.AssertSelectedSignatureHelpItem($"<{Extension}> Enumerable.OfType(Of TResult)() As IEnumerable(Of TResult)").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem($"<{Extension}> Enumerable.OfType(Of TResult)() As IEnumerable(Of TResult)")
End Using
End Function
......@@ -244,7 +244,7 @@ End Class
]]></Document>)
state.SendTypeChars("(")
Await state.AssertSelectedSignatureHelpItem($"<{Extension}> Enumerable.OfType(Of TResult)() As IEnumerable(Of TResult)").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem($"<{Extension}> Enumerable.OfType(Of TResult)() As IEnumerable(Of TResult)")
End Using
End Function
......@@ -264,7 +264,7 @@ End Class
]]></Document>)
state.SendTypeChars("(")
Await state.AssertSelectedSignatureHelpItem($"<{Extension}> Enumerable.OfType(Of TResult)() As IEnumerable(Of TResult)").ConfigureAwait(True)
Await state.AssertSelectedSignatureHelpItem($"<{Extension}> Enumerable.OfType(Of TResult)() As IEnumerable(Of TResult)")
End Using
End Function
......@@ -283,11 +283,11 @@ End Class
' disable implicit sig help then type a trigger character -> no session should be available
state.Workspace.Options = state.Workspace.Options.WithChangedOption(SignatureHelpOptions.ShowSignatureHelp, "Visual Basic", False)
state.SendTypeChars("(")
Await state.AssertNoSignatureHelpSession().ConfigureAwait(True)
Await state.AssertNoSignatureHelpSession()
' force-invoke -> session should be available
state.SendInvokeSignatureHelp()
Await state.AssertSignatureHelpSession().ConfigureAwait(True)
Await state.AssertSignatureHelpSession()
End Using
End Function
End Class
......
src/EditorFeatures/Test2/NavigationBar/NavigationBarPresenterTests.vb
浏览文件 @ dad8f4d6
......@@ -78,7 +78,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.NavigationBar
Dim controller = controllerFactory.CreateController(mockPresenter, subjectDocument.TextBuffer)
Dim waiters = workspace.ExportProvider.GetExportedValues(Of IAsynchronousOperationWaiter)
Await waiters.WaitAllAsync().ConfigureAwait(True)
Await waiters.WaitAllAsync()
Assert.True(presentItemsCalled)
End Using
......@@ -318,9 +318,9 @@ End Class
workspace.OnProjectNameChanged(workspace.Projects.Single().Id, "VBProj2", "VBProj2.vbproj")
Await workspace.ExportProvider.GetExports(Of IAsynchronousOperationWaiter, FeatureMetadata)().Where(Function(l) l.Metadata.FeatureName = FeatureAttribute.Workspace).Single().Value.CreateWaitTask().ConfigureAwait(True)
Await workspace.ExportProvider.GetExports(Of IAsynchronousOperationWaiter, FeatureMetadata)().Where(Function(l) l.Metadata.FeatureName = FeatureAttribute.NavigationBar).Single().Value.CreateWaitTask().ConfigureAwait(True)
Await workspace.ExportProvider.GetExportedValues(Of IAsynchronousOperationWaiter).WaitAllAsync().ConfigureAwait(True)
Await workspace.ExportProvider.GetExports(Of IAsynchronousOperationWaiter, FeatureMetadata)().Where(Function(l) l.Metadata.FeatureName = FeatureAttribute.Workspace).Single().Value.CreateWaitTask()
Await workspace.ExportProvider.GetExports(Of IAsynchronousOperationWaiter, FeatureMetadata)().Where(Function(l) l.Metadata.FeatureName = FeatureAttribute.NavigationBar).Single().Value.CreateWaitTask()
Await workspace.ExportProvider.GetExportedValues(Of IAsynchronousOperationWaiter).WaitAllAsync()
Assert.Equal("VBProj2", projectName)
End Using
End Function
......
src/EditorFeatures/Test2/Rename/DashboardTests.vb
浏览文件 @ dad8f4d6
......@@ -35,7 +35,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
</Workspace>),
newName:="",
searchResultText:=EditorFeaturesResources.RenameWillUpdateReferenceInFile,
changedOptionSet:=changingOptions).ConfigureAwait(True)
changedOptionSet:=changingOptions)
End Function
<WpfFact>
......@@ -68,7 +68,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
newName:="",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 2),
hasRenameOverload:=True,
changedOptionSet:=changingOptions).ConfigureAwait(True)
changedOptionSet:=changingOptions)
End Function
<WpfFact>
......@@ -99,7 +99,7 @@ class Program
changedOptionSet:=changingOptions,
hasRenameOverload:=True,
unresolvableConflictText:=String.Format(EditorFeaturesResources.UnresolvableConflicts, 1),
severity:=DashboardSeverity.Error).ConfigureAwait(True)
severity:=DashboardSeverity.Error)
End Function
<WpfFact>
......@@ -119,7 +119,7 @@ class AttributeAttribute : System.Attribute { }
newName:="AttributeAttributeAttribute",
searchResultText:=EditorFeaturesResources.RenameWillUpdateReferenceInFile,
resolvableConflictText:=String.Format(EditorFeaturesResources.ConflictsWillBeResolved, 1),
severity:=DashboardSeverity.Info).ConfigureAwait(True)
severity:=DashboardSeverity.Info)
End Function
<WpfFact>
......@@ -158,7 +158,7 @@ class AttributeAttribute : System.Attribute { }
newName:="",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 5),
hasRenameOverload:=True,
changedOptionSet:=changingOptions).ConfigureAwait(True)
changedOptionSet:=changingOptions)
End Function
<WpfFact>
......@@ -198,7 +198,7 @@ class $$Program
</Workspace>),
newName:="P",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 6),
changedOptionSet:=changingOptions).ConfigureAwait(True)
changedOptionSet:=changingOptions)
End Function
<WpfFact>
......@@ -238,7 +238,7 @@ class $$Program
</Workspace>),
newName:="P",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 2),
changedOptionSet:=changingOptions).ConfigureAwait(True)
changedOptionSet:=changingOptions)
End Function
<WpfFact>
......@@ -279,7 +279,7 @@ class $$Program
</Workspace>),
newName:="P",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 7),
changedOptionSet:=changingOptions).ConfigureAwait(True)
changedOptionSet:=changingOptions)
End Function
<WpfFact>
......@@ -300,7 +300,7 @@ class $$Program
</Project>
</Workspace>),
newName:="",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 3)).ConfigureAwait(True)
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 3))
End Function
<WpfFact>
......@@ -321,7 +321,7 @@ class $$Program
</Project>
</Workspace>),
newName:="",
searchResultText:=EditorFeaturesResources.RenameWillUpdateReferenceInFile).ConfigureAwait(True)
searchResultText:=EditorFeaturesResources.RenameWillUpdateReferenceInFile)
End Function
<WpfFact>
......@@ -345,7 +345,7 @@ class $$Program
newName:="foo",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 2),
resolvableConflictText:=String.Format(EditorFeaturesResources.ConflictsWillBeResolved, 1),
severity:=DashboardSeverity.Info).ConfigureAwait(True)
severity:=DashboardSeverity.Info)
End Function
<WorkItem(5923, "DevDiv_Projects/Roslyn")>
......@@ -370,7 +370,7 @@ class $$Program
newName:="foo",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 2),
resolvableConflictText:=String.Format(EditorFeaturesResources.ConflictsWillBeResolved, 2),
severity:=DashboardSeverity.Info).ConfigureAwait(True)
severity:=DashboardSeverity.Info)
End Function
<WpfFact>
......@@ -393,7 +393,7 @@ class $$Program
newName:="foo",
searchResultText:=EditorFeaturesResources.RenameWillUpdateReferenceInFile,
unresolvableConflictText:=String.Format(EditorFeaturesResources.UnresolvableConflicts, 1),
severity:=DashboardSeverity.Error).ConfigureAwait(True)
severity:=DashboardSeverity.Error)
End Function
<WpfFact>
......@@ -418,7 +418,7 @@ class $$Program
newName:="foo",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 3),
unresolvableConflictText:=String.Format(EditorFeaturesResources.UnresolvableConflicts, 3),
severity:=DashboardSeverity.Error).ConfigureAwait(True)
severity:=DashboardSeverity.Error)
End Function
<WpfFact>
......@@ -455,7 +455,7 @@ class $$Program
newName:="Bar",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInMultipleFiles, 4, 2),
resolvableConflictText:=String.Format(EditorFeaturesResources.ConflictsWillBeResolved, 1),
severity:=DashboardSeverity.Info).ConfigureAwait(True)
severity:=DashboardSeverity.Info)
End Function
<WpfFact>
......@@ -479,7 +479,7 @@ class C
newName:="Mo",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferenceInFile),
hasRenameOverload:=True,
isRenameOverloadsEditable:=True).ConfigureAwait(True)
isRenameOverloadsEditable:=True)
End Function
<WpfFact>
......@@ -503,7 +503,7 @@ class C
newName:="Mo",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 3),
hasRenameOverload:=True,
isRenameOverloadsEditable:=False).ConfigureAwait(True)
isRenameOverloadsEditable:=False)
End Function
<WpfFact>
......@@ -540,7 +540,7 @@ class D : B
newName:="Mo",
searchResultText:=String.Format(EditorFeaturesResources.RenameWillUpdateReferencesInFile, 5),
changedOptionSet:=changingOptions,
hasRenameOverload:=True).ConfigureAwait(True)
hasRenameOverload:=True)
End Function
Friend Shared Async Function VerifyDashboard(
......@@ -594,7 +594,7 @@ class D : B
Dim renameListener = New AggregateAsynchronousOperationListener(listeners, FeatureAttribute.Rename)
Using dashboard = New Dashboard(New DashboardViewModel(DirectCast(sessionInfo.Session, InlineRenameSession)), cursorDocument.GetTextView())
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Dim model = DirectCast(dashboard.DataContext, DashboardViewModel)
......
src/EditorFeatures/Test2/Rename/RenameCommandHandlerTests.vb
浏览文件 @ dad8f4d6
......@@ -127,7 +127,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
view.Selection.Select(selectedSpan, isReversed:=True)
CreateCommandHandler(workspace).ExecuteCommand(New RenameCommandArgs(view, view.TextBuffer), Sub() Throw New Exception("The operation should have been handled."))
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Assert.Equal(selectedSpan.Span, view.Selection.SelectedSpans.Single().Span)
End Using
End Function
......@@ -248,7 +248,7 @@ End Class
Dim session = StartSession(workspace)
' TODO: should we make tab wait instead?
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
' Unfocus the dashboard
Dim dashboard = DirectCast(view.GetAdornmentLayer("RoslynRenameDashboard").Elements(0).Adornment, Dashboard)
......@@ -292,7 +292,7 @@ Foo f;
Assert.True(view.Selection.IsEmpty())
Dim session = StartSession(workspace)
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Assert.Equal(identifierSpan, view.Selection.SelectedSpans.Single().Span)
Assert.Equal(identifierSpan.End, view.Caret.Position.BufferPosition.Position)
......@@ -334,16 +334,16 @@ class [|$$Foo|] // comment
workspace.GetService(Of IWaitIndicator))
Dim session = StartSession(workspace)
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
view.Selection.Clear()
view.Caret.MoveTo(New SnapshotPoint(view.TextSnapshot, startPosition))
' with the caret at the start, this should delete the whole identifier
commandHandler.ExecuteCommand(New WordDeleteToEndCommandArgs(view, view.TextBuffer), Sub() AssertEx.Fail("Command should not have been passed to the editor."))
Await VerifyTagsAreCorrect(workspace, "").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "")
editorOperations.InsertText("this")
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Assert.Equal("@this", view.TextSnapshot.GetText(startPosition, 5))
' with a selection, we should delete the from the beginning of the rename span to the end of the selection
......@@ -351,7 +351,7 @@ class [|$$Foo|] // comment
' that '@' character is in a read only region during rename.
view.Selection.Select(New SnapshotSpan(view.TextSnapshot, Span.FromBounds(startPosition + 2, startPosition + 4)), isReversed:=True)
commandHandler.ExecuteCommand(New WordDeleteToStartCommandArgs(view, view.TextBuffer), Sub() AssertEx.Fail("Command should not have been passed to the editor."))
Await VerifyTagsAreCorrect(workspace, "s").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "s")
End Using
End Function
......@@ -388,7 +388,7 @@ Foo f;
workspace.GetService(Of IWaitIndicator))
Dim session = StartSession(workspace)
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
#Region "LineStart"
' we start with the identifier selected
......@@ -469,7 +469,7 @@ Foo f;
editorOperations.MoveToNextCharacter(extendSelection:=False)
commandHandler.ExecuteCommand(New TypeCharCommandArgs(view, view.TextBuffer, "$"c), Sub() editorOperations.InsertText("$"))
Await VerifyTagsAreCorrect(workspace, "Foo").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "Foo")
session.Cancel()
End Using
......@@ -497,7 +497,7 @@ Foo f;
workspace.GetService(Of IWaitIndicator))
Dim session = StartSession(workspace)
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Dim editorOperations = workspace.GetService(Of IEditorOperationsFactoryService).GetEditorOperations(view)
' Type first in the main identifier
......@@ -513,7 +513,7 @@ Foo f;
' Now let's type and that should commit Rename
commandHandler.ExecuteCommand(New TypeCharCommandArgs(view, view.TextBuffer, "Z"c), Sub() editorOperations.InsertText("Z"))
Await VerifyTagsAreCorrect(workspace, "BFoo").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "BFoo")
' Rename session was indeed committed and is no longer active
Assert.Null(workspace.GetService(Of IInlineRenameService).ActiveSession)
......@@ -547,14 +547,14 @@ Foo f;
Dim session = StartSession(workspace)
view.Selection.Clear()
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Dim editorOperations = workspace.GetService(Of IEditorOperationsFactoryService).GetEditorOperations(view)
' Delete the first identifier char
view.Caret.MoveTo(New SnapshotPoint(view.TextBuffer.CurrentSnapshot, workspace.Documents.Single(Function(d) d.CursorPosition.HasValue).CursorPosition.Value))
commandHandler.ExecuteCommand(New DeleteKeyCommandArgs(view, view.TextBuffer), Sub() editorOperations.Delete())
Await VerifyTagsAreCorrect(workspace, "oo").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "oo")
Assert.NotNull(workspace.GetService(Of IInlineRenameService).ActiveSession)
session.Cancel()
......@@ -585,14 +585,14 @@ Foo f;
Dim session = StartSession(workspace)
view.Selection.Clear()
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Dim editorOperations = workspace.GetService(Of IEditorOperationsFactoryService).GetEditorOperations(view)
' Delete the first identifier char
view.Caret.MoveTo(New SnapshotPoint(view.TextBuffer.CurrentSnapshot, workspace.Documents.Single(Function(d) d.CursorPosition.HasValue).CursorPosition.Value))
commandHandler.ExecuteCommand(New BackspaceKeyCommandArgs(view, view.TextBuffer), Sub() editorOperations.Backspace())
Await VerifyTagsAreCorrect(workspace, "Fo").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "Fo")
Assert.NotNull(workspace.GetService(Of IInlineRenameService).ActiveSession)
session.Cancel()
......@@ -622,7 +622,7 @@ Foo f;
Dim session = StartSession(workspace)
view.Selection.Clear()
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Dim editorOperations = workspace.GetService(Of IEditorOperationsFactoryService).GetEditorOperations(view)
' Type first in the main identifier
......@@ -637,7 +637,7 @@ Foo f;
' Now let's type and that should commit Rename
commandHandler.ExecuteCommand(New DeleteKeyCommandArgs(view, view.TextBuffer), Sub() editorOperations.Delete())
Await VerifyTagsAreCorrect(workspace, "BFoo").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "BFoo")
' Rename session was indeed committed and is no longer active
Assert.Null(workspace.GetService(Of IInlineRenameService).ActiveSession)
......@@ -674,7 +674,7 @@ Foo f;
Dim session = StartSession(workspace)
view.Selection.Clear()
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Dim editorOperations = workspace.GetService(Of IEditorOperationsFactoryService).GetEditorOperations(view)
' Type first in the main identifier
......@@ -689,7 +689,7 @@ Foo f;
' Type the char at the beginning of the file
commandHandler.ExecuteCommand(New TypeCharCommandArgs(newview, newview.TextBuffer, "Z"c), Sub() editorOperations.InsertText("Z"))
Await VerifyTagsAreCorrect(workspace, "BFoo").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "BFoo")
' Rename session was indeed committed and is no longer active
Assert.Null(workspace.GetService(Of IInlineRenameService).ActiveSession)
......@@ -737,7 +737,7 @@ Foo f;
Dim session = StartSession(workspace)
view.Selection.Clear()
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Dim editorOperations = workspace.GetService(Of IEditorOperationsFactoryService).GetEditorOperations(view)
' Type first in the main identifier
......@@ -752,7 +752,7 @@ Foo f;
' Type the char at the beginning of the file
commandHandler.ExecuteCommand(New TypeCharCommandArgs(newview, newview.TextBuffer, "Z"c), Sub() editorOperations.InsertText("Z"))
Await VerifyTagsAreCorrect(workspace, "BB").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "BB")
' Rename session was indeed committed and is no longer active
Assert.Null(workspace.GetService(Of IInlineRenameService).ActiveSession)
......@@ -794,7 +794,7 @@ class Program
commandHandler.ExecuteCommand(New TypeCharCommandArgs(view, view.TextBuffer, "Z"c), Sub() editorOperations.InsertText("Z"))
commandHandler.ExecuteCommand(New ReturnKeyCommandArgs(view, view.TextBuffer), Sub() Exit Sub)
Await VerifyTagsAreCorrect(workspace, "Z").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "Z")
End Using
End Function
......@@ -835,7 +835,7 @@ partial class [|Program|]
commandHandler.ExecuteCommand(New RenameCommandArgs(view, view.TextBuffer), Sub() Exit Sub)
commandHandler.ExecuteCommand(New TypeCharCommandArgs(view, view.TextBuffer, "Z"c), Sub() editorOperations.InsertText("Z"))
Await VerifyTagsAreCorrect(workspace, "Z").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "Z")
End Using
End Function
......@@ -1054,7 +1054,7 @@ partial class [|Program|]
workspace.GetService(Of IWaitIndicator))
Dim session = StartSession(workspace)
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Dim editorOperations = workspace.GetService(Of IEditorOperationsFactoryService).GetEditorOperations(view)
' Type first in the main identifier
......@@ -1065,7 +1065,7 @@ partial class [|Program|]
' Now save the document, which should commit Rename
commandHandler.ExecuteCommand(New SaveCommandArgs(view, view.TextBuffer), Sub() Exit Sub)
Await VerifyTagsAreCorrect(workspace, "BFoo").ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, "BFoo")
' Rename session was indeed committed and is no longer active
Assert.Null(workspace.GetService(Of IInlineRenameService).ActiveSession)
......@@ -1138,7 +1138,7 @@ partial class [|Program|]
Await VerifySessionActiveAfterCutPasteInsideIdentifier(
Sub(commandHandler As RenameCommandHandler, view As IWpfTextView, nextHandler As Action)
commandHandler.ExecuteCommand(New CutCommandArgs(view, view.TextBuffer), nextHandler)
End Sub).ConfigureAwait(True)
End Sub)
End Function
<WpfFact>
......@@ -1147,7 +1147,7 @@ partial class [|Program|]
Await VerifySessionActiveAfterCutPasteInsideIdentifier(
Sub(commandHandler As RenameCommandHandler, view As IWpfTextView, nextHandler As Action)
commandHandler.ExecuteCommand(New PasteCommandArgs(view, view.TextBuffer), nextHandler)
End Sub).ConfigureAwait(True)
End Sub)
End Function
<WpfFact>
......@@ -1244,7 +1244,7 @@ class [|C$$|]
' Verify rename session is still active
Assert.NotNull(workspace.GetService(Of IInlineRenameService).ActiveSession)
Await VerifyTagsAreCorrect(workspace, commandInvokedString).ConfigureAwait(True)
Await VerifyTagsAreCorrect(workspace, commandInvokedString)
End Using
End Function
......
src/EditorFeatures/Test2/Rename/RenameTestHelpers.vb
浏览文件 @ dad8f4d6
......@@ -80,7 +80,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
End Sub
Public Async Function VerifyTagsAreCorrect(workspace As TestWorkspace, newIdentifierName As String) As Task
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
For Each document In workspace.Documents
For Each selectedSpan In document.SelectedSpans
Dim trackingSpan = document.InitialTextSnapshot.CreateTrackingSpan(selectedSpan.ToSpan(), SpanTrackingMode.EdgeInclusive)
......@@ -112,7 +112,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
Public Async Function WaitForRename(workspace As TestWorkspace) As Task
Dim waiters = workspace.ExportProvider.GetExportedValues(Of IAsynchronousOperationWaiter)
Await waiters.WaitAllAsync().ConfigureAwait(True)
Await waiters.WaitAllAsync()
End Function
Public Function CreateRenameTrackingTagger(workspace As TestWorkspace, document As TestHostDocument) As ITagger(Of RenameTrackingTag)
......@@ -128,17 +128,17 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
End Function
Public Async Function VerifyNoRenameTrackingTags(tagger As ITagger(Of RenameTrackingTag), workspace As TestWorkspace, document As TestHostDocument) As Task
Dim tags = Await GetRenameTrackingTags(tagger, workspace, document).ConfigureAwait(True)
Dim tags = Await GetRenameTrackingTags(tagger, workspace, document)
Assert.Equal(0, tags.Count())
End Function
Public Async Function VerifyRenameTrackingTags(tagger As ITagger(Of RenameTrackingTag), workspace As TestWorkspace, document As TestHostDocument, expectedTagCount As Integer) As Task
Dim tags = Await GetRenameTrackingTags(tagger, workspace, document).ConfigureAwait(True)
Dim tags = Await GetRenameTrackingTags(tagger, workspace, document)
Assert.Equal(expectedTagCount, tags.Count())
End Function
Public Async Function GetRenameTrackingTags(tagger As ITagger(Of RenameTrackingTag), workspace As TestWorkspace, document As TestHostDocument) As Task(Of IEnumerable(Of ITagSpan(Of RenameTrackingTag)))
Await WaitForRename(workspace).ConfigureAwait(True)
Await WaitForRename(workspace)
Dim view = document.GetTextView()
Return tagger.GetTags(view.TextBuffer.CurrentSnapshot.GetSnapshotSpanCollection())
End Function
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或