Skip to content

Commit 4f4fe8c

Browse files
CopilotCyrusNajmabadi
Copilot
and
CyrusNajmabadi
committed
Move all tests to CSharpCompletionCommandHandlerTests_Await.vb
Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>
1 parent e76dc64 commit 4f4fe8c

File tree

2 files changed

+225
-100
lines changed

2 files changed

+225
-100
lines changed

‎src/EditorFeatures/CSharpTest/Completion/CompletionProviders/AwaitCompletionProviderTests.cs‎

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -833,104 +833,4 @@ void M()
833833
else
834834
await VerifyAbsenceAsync(code);
835835
}
836-
837-
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/77848")]
838-
public Task TestEventHandlerMethod_DoesNotChangeVoidToTask()
839-
=> VerifyKeywordAsync("""
840-
using System;
841-
842-
class C
843-
{
844-
public event EventHandler MyEvent;
845-
846-
public C()
847-
{
848-
MyEvent += OnMyEvent;
849-
}
850-
851-
private void OnMyEvent(object sender, EventArgs e)
852-
{
853-
$$
854-
}
855-
}
856-
""");
857-
858-
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/77848")]
859-
public Task TestEventHandlerMethod_WithDifferentEventType()
860-
=> VerifyKeywordAsync("""
861-
using System;
862-
863-
delegate void CustomEventHandler(object sender, EventArgs e);
864-
865-
class C
866-
{
867-
public event CustomEventHandler MyEvent;
868-
869-
public C()
870-
{
871-
MyEvent += HandleMyEvent;
872-
}
873-
874-
private void HandleMyEvent(object sender, EventArgs e)
875-
{
876-
$$
877-
}
878-
}
879-
""");
880-
881-
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/77848")]
882-
public Task TestEventHandlerMethod_InDifferentMethod()
883-
=> VerifyKeywordAsync("""
884-
using System;
885-
886-
class C
887-
{
888-
public event EventHandler MyEvent;
889-
890-
public void RegisterHandler()
891-
{
892-
MyEvent += OnMyEvent;
893-
}
894-
895-
private void OnMyEvent(object sender, EventArgs e)
896-
{
897-
$$
898-
}
899-
}
900-
""");
901-
902-
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/77848")]
903-
public Task TestEventHandlerMethod_WithMinusEquals()
904-
=> VerifyKeywordAsync("""
905-
using System;
906-
907-
class C
908-
{
909-
public event EventHandler MyEvent;
910-
911-
public void UnregisterHandler()
912-
{
913-
MyEvent -= OnMyEvent;
914-
}
915-
916-
private void OnMyEvent(object sender, EventArgs e)
917-
{
918-
$$
919-
}
920-
}
921-
""");
922-
923-
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/77848")]
924-
public Task TestNonEventHandlerMethod_ChangesVoidToTask()
925-
=> VerifyKeywordAsync("""
926-
using System;
927-
928-
class C
929-
{
930-
private void RegularMethod()
931-
{
932-
$$
933-
}
934-
}
935-
""");
936836
}

‎src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests_Await.vb‎

Lines changed: 225 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1703,6 +1703,231 @@ public class C
17031703
await
17041704
}
17051705
}
1706+
", state.GetDocumentText())
1707+
End Using
1708+
End Function
1709+
1710+
<WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/77848")>
1711+
Public Async Function AwaitCompletionDoesNotChangeReturnType_ForEventHandlerMethod_WithDifferentEventType() As Task
1712+
Using state = TestStateFactory.CreateCSharpTestState(
1713+
<Document><![CDATA[
1714+
using System;
1715+
1716+
delegate void CustomEventHandler(object sender, EventArgs e);
1717+
1718+
public class C
1719+
{
1720+
public event CustomEventHandler MyEvent;
1721+
1722+
public C()
1723+
{
1724+
MyEvent += HandleMyEvent;
1725+
}
1726+
1727+
private void HandleMyEvent(object sender, EventArgs e)
1728+
{
1729+
$$
1730+
}
1731+
}
1732+
]]>
1733+
</Document>)
1734+
state.SendTypeChars("aw")
1735+
Await state.AssertSelectedCompletionItem(displayText:="await", isHardSelected:=True)
1736+
1737+
state.SendTab()
1738+
Assert.Equal("
1739+
using System;
1740+
1741+
delegate void CustomEventHandler(object sender, EventArgs e);
1742+
1743+
public class C
1744+
{
1745+
public event CustomEventHandler MyEvent;
1746+
1747+
public C()
1748+
{
1749+
MyEvent += HandleMyEvent;
1750+
}
1751+
1752+
private async void HandleMyEvent(object sender, EventArgs e)
1753+
{
1754+
await
1755+
}
1756+
}
1757+
", state.GetDocumentText())
1758+
End Using
1759+
End Function
1760+
1761+
<WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/77848")>
1762+
Public Async Function AwaitCompletionDoesNotChangeReturnType_ForEventHandlerMethod_InDifferentMethod() As Task
1763+
Using state = TestStateFactory.CreateCSharpTestState(
1764+
<Document><![CDATA[
1765+
using System;
1766+
1767+
public class C
1768+
{
1769+
public event EventHandler MyEvent;
1770+
1771+
public void RegisterHandler()
1772+
{
1773+
MyEvent += OnMyEvent;
1774+
}
1775+
1776+
private void OnMyEvent(object sender, EventArgs e)
1777+
{
1778+
$$
1779+
}
1780+
}
1781+
]]>
1782+
</Document>)
1783+
state.SendTypeChars("aw")
1784+
Await state.AssertSelectedCompletionItem(displayText:="await", isHardSelected:=True)
1785+
1786+
state.SendTab()
1787+
Assert.Equal("
1788+
using System;
1789+
1790+
public class C
1791+
{
1792+
public event EventHandler MyEvent;
1793+
1794+
public void RegisterHandler()
1795+
{
1796+
MyEvent += OnMyEvent;
1797+
}
1798+
1799+
private async void OnMyEvent(object sender, EventArgs e)
1800+
{
1801+
await
1802+
}
1803+
}
1804+
", state.GetDocumentText())
1805+
End Using
1806+
End Function
1807+
1808+
<WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/77848")>
1809+
Public Async Function AwaitCompletionDoesNotChangeReturnType_ForEventHandlerMethod_WithoutConstructor() As Task
1810+
Using state = TestStateFactory.CreateCSharpTestState(
1811+
<Document><![CDATA[
1812+
using System;
1813+
1814+
class C
1815+
{
1816+
public event EventHandler MyEvent;
1817+
1818+
public C()
1819+
{
1820+
MyEvent += OnMyEvent;
1821+
}
1822+
1823+
private void OnMyEvent(object sender, EventArgs e)
1824+
{
1825+
$$
1826+
}
1827+
}
1828+
]]>
1829+
</Document>)
1830+
state.SendTypeChars("aw")
1831+
Await state.AssertSelectedCompletionItem(displayText:="await", isHardSelected:=True)
1832+
1833+
state.SendTab()
1834+
Assert.Equal("
1835+
using System;
1836+
1837+
class C
1838+
{
1839+
public event EventHandler MyEvent;
1840+
1841+
public C()
1842+
{
1843+
MyEvent += OnMyEvent;
1844+
}
1845+
1846+
private async void OnMyEvent(object sender, EventArgs e)
1847+
{
1848+
await
1849+
}
1850+
}
1851+
", state.GetDocumentText())
1852+
End Using
1853+
End Function
1854+
1855+
<WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/77848")>
1856+
Public Async Function AwaitCompletionDoesNotChangeReturnType_ForEventHandlerMethod_WithPlusEquals() As Task
1857+
Using state = TestStateFactory.CreateCSharpTestState(
1858+
<Document><![CDATA[
1859+
using System;
1860+
1861+
public class C
1862+
{
1863+
public event EventHandler MyEvent;
1864+
1865+
public void RegisterHandler()
1866+
{
1867+
MyEvent += OnMyEvent;
1868+
}
1869+
1870+
private void OnMyEvent(object sender, EventArgs e)
1871+
{
1872+
$$
1873+
}
1874+
}
1875+
]]>
1876+
</Document>)
1877+
state.SendTypeChars("aw")
1878+
Await state.AssertSelectedCompletionItem(displayText:="await", isHardSelected:=True)
1879+
1880+
state.SendTab()
1881+
Assert.Equal("
1882+
using System;
1883+
1884+
public class C
1885+
{
1886+
public event EventHandler MyEvent;
1887+
1888+
public void RegisterHandler()
1889+
{
1890+
MyEvent += OnMyEvent;
1891+
}
1892+
1893+
private async void OnMyEvent(object sender, EventArgs e)
1894+
{
1895+
await
1896+
}
1897+
}
1898+
", state.GetDocumentText())
1899+
End Using
1900+
End Function
1901+
1902+
<WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/77848")>
1903+
Public Async Function AwaitCompletionChangesVoidToTask_ForNonEventHandlerMethod_PrivateMethod() As Task
1904+
Using state = TestStateFactory.CreateCSharpTestState(
1905+
<Document><![CDATA[
1906+
using System.Threading.Tasks;
1907+
1908+
class C
1909+
{
1910+
private void RegularMethod()
1911+
{
1912+
$$
1913+
}
1914+
}
1915+
]]>
1916+
</Document>)
1917+
state.SendTypeChars("aw")
1918+
Await state.AssertSelectedCompletionItem(displayText:="await", isHardSelected:=True)
1919+
1920+
state.SendTab()
1921+
Assert.Equal("
1922+
using System.Threading.Tasks;
1923+
1924+
class C
1925+
{
1926+
private async Task RegularMethod()
1927+
{
1928+
await
1929+
}
1930+
}
17061931
", state.GetDocumentText())
17071932
End Using
17081933
End Function

0 commit comments

Comments
 (0)