Skip to content

Move async utils to Microsoft.CodeAnalysis.Threading source package #76937

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

Merged
merged 7 commits into from
Feb 5, 2025
Merged

Move async utils to Microsoft.CodeAnalysis.Threading source package #76937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d924c3a
Move to Threading namespace
tmat Jan 27, 2025
4504ed3
Microsoft.CodeAnalysis.Threading.Package source package
tmat Jan 27, 2025
5bf302a
Fix
tmat Jan 28, 2025
1217a14
Feedback
tmat Feb 4, 2025
35a8e57
Fix
tmat Feb 5, 2025
aed80d7
Fix
tmat Feb 5, 2025
3d56f57
Fix
tmat Feb 5, 2025
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
17 changes: 17 additions & 0 deletions Roslyn.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ExternalAccess", "ExternalA
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.LanguageServer.Protocol.Test.Utilities", "src\LanguageServer\Protocol.TestUtilities\Microsoft.CodeAnalysis.LanguageServer.Protocol.Test.Utilities.csproj", "{7465CE63-A7B7-475F-8C57-48D2F8BC665A}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.CodeAnalysis.Threading", "src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.shproj", "{967723E8-4FDD-447B-99F6-4F8C47CB5433}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Threading.Package", "src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.Package.csproj", "{2559DAF9-784E-4C29-E0E1-70204B1FD56E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1399,6 +1403,10 @@ Global
{7465CE63-A7B7-475F-8C57-48D2F8BC665A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7465CE63-A7B7-475F-8C57-48D2F8BC665A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7465CE63-A7B7-475F-8C57-48D2F8BC665A}.Release|Any CPU.Build.0 = Release|Any CPU
{2559DAF9-784E-4C29-E0E1-70204B1FD56E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2559DAF9-784E-4C29-E0E1-70204B1FD56E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2559DAF9-784E-4C29-E0E1-70204B1FD56E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2559DAF9-784E-4C29-E0E1-70204B1FD56E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1661,6 +1669,8 @@ Global
{1AE9182D-B03E-4B00-B32E-37AE01715F57} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}
{806F0C6F-3640-4C92-8D55-6767B1535467} = {D449D505-CC6A-4E0B-AF1B-976E2D0AE67A}
{7465CE63-A7B7-475F-8C57-48D2F8BC665A} = {D449D505-CC6A-4E0B-AF1B-976E2D0AE67A}
{967723E8-4FDD-447B-99F6-4F8C47CB5433} = {C2D1346B-9665-4150-B644-075CF1636BAA}
{2559DAF9-784E-4C29-E0E1-70204B1FD56E} = {C2D1346B-9665-4150-B644-075CF1636BAA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29}
Expand All @@ -1679,9 +1689,12 @@ Global
src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 5
src\Analyzers\VisualBasic\Analyzers\VisualBasicAnalyzers.projitems*{2531a8c4-97dd-47bc-a79c-b7846051e137}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{2531a8c4-97dd-47bc-a79c-b7846051e137}*SharedItemsImports = 5
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{2559daf9-784e-4c29-e0e1-70204b1fd56e}*SharedItemsImports = 5
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{2559daf9-784e-4c29-e0e1-70204b1fd56e}*SharedItemsImports = 5
src\Analyzers\Core\Analyzers\Analyzers.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{3140fe61-0856-4367-9aa3-8081b9a80e35}*SharedItemsImports = 13
src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{3140fe61-0856-4367-9aa3-8081b9a80e36}*SharedItemsImports = 13
Expand All @@ -1697,6 +1710,7 @@ Global
src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{58969243-7f59-4236-93d0-c93b81f569b3}*SharedItemsImports = 13
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Analyzers\Core\CodeFixes\CodeFixes.projitems*{5ff1e493-69cc-4d0b-83f2-039f469a04e1}*SharedItemsImports = 5
Expand All @@ -1709,8 +1723,11 @@ Global
src\Analyzers\Core\Analyzers\Analyzers.projitems*{76e96966-4780-4040-8197-bde2879516f4}*SharedItemsImports = 13
src\Analyzers\VisualBasic\Tests\VisualBasicAnalyzers.UnitTests.projitems*{7b7f4153-ae93-4908-b8f0-430871589f83}*SharedItemsImports = 13
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{810b02ad-2ea5-4422-88ac-b71b8ab0df0b}*SharedItemsImports = 13
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{8e2a252e-a140-45a6-a81a-2652996ea589}*SharedItemsImports = 5
src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems*{8e2a252e-a140-45a6-a81a-2652996ea589}*SharedItemsImports = 5
src\Analyzers\VisualBasic\Analyzers\VisualBasicAnalyzers.projitems*{94faf461-2e74-4dbb-9813-6b2cde6f1880}*SharedItemsImports = 13
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 5
src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems*{967723e8-4fdd-447b-99f6-4f8c47cb5433}*SharedItemsImports = 13
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{975cd834-45f4-4ea0-a395-cb60dbd0e214}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{99f594b1-3916-471d-a761-a6731fc50e9a}*SharedItemsImports = 13
src\Analyzers\VisualBasic\CodeFixes\VisualBasicCodeFixes.projitems*{9f9ccc78-7487-4127-9d46-db23e501f001}*SharedItemsImports = 13
Expand Down
1 change: 1 addition & 0 deletions eng/config/PublishData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Microsoft.CodeAnalysis.Debugging": "arcade",
"Microsoft.CodeAnalysis.PooledObjects": "arcade",
"Microsoft.CodeAnalysis.Collections": "arcade",
"Microsoft.CodeAnalysis.Threading": "arcade",
"Microsoft.CodeAnalysis.Features": "arcade",
"Microsoft.CodeAnalysis.EditorFeatures": "vssdk",
"Microsoft.CodeAnalysis.EditorFeatures.Common": "vssdk",
Expand Down
1 change: 1 addition & 0 deletions eng/test-rebuild.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ try {
" --exclude netstandard2.0\Microsoft.CodeAnalysis.Collections.Package.dll" +
" --exclude netstandard2.0\Microsoft.CodeAnalysis.Debugging.Package.dll" +
" --exclude netstandard2.0\Microsoft.CodeAnalysis.PooledObjects.Package.dll" +
" --exclude netstandard2.0\Microsoft.CodeAnalysis.Threading.Package.dll" +
" --exclude netcoreapp3.1\Microsoft.CodeAnalysis.Workspaces.UnitTests.dll" +
" --exclude net472\Zip\tools\vsixexpinstaller\System.ValueTuple.dll" +
" --exclude net472\Zip\tools\vsixexpinstaller\VSIXExpInstaller.exe" +
Expand Down
36 changes: 18 additions & 18 deletions src/Analyzers/VisualBasic/Tests/OrderModifiers/OrderModifiersTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ end class
End Function

<Fact>
public async Function TestStruct() As Threading.Tasks.Task
Public Async Function TestStruct() As Task
Await TestInRegularAndScript1Async(
"[|friend|] protected structure C

Expand All @@ -40,7 +40,7 @@ end structure")
End Function

<Fact>
Public Async Function TestInterface() As Threading.Tasks.Task
Public Async Function TestInterface() As Task
Await TestInRegularAndScript1Async(
"[|friend|] protected interface C
end interface",
Expand All @@ -49,7 +49,7 @@ end interface")
End Function

<Fact>
Public Async Function TestEnum() As Threading.Tasks.Task
Public Async Function TestEnum() As Task
Await TestInRegularAndScript1Async(
"[|friend|] protected enum C
end enum",
Expand All @@ -58,14 +58,14 @@ end enum")
End Function

<Fact>
Public Async Function TestDelegate() As Threading.Tasks.Task
Public Async Function TestDelegate() As Task
Await TestInRegularAndScript1Async(
"[|friend|] protected delegate sub D()",
"protected friend delegate sub D()")
End Function

<Fact>
Public Async Function TestMethodStatement() As Threading.Tasks.Task
Public Async Function TestMethodStatement() As Task
Await TestInRegularAndScript1Async(
"class C
[|mustoverride|] protected sub M()
Expand All @@ -76,7 +76,7 @@ end class")
End Function

<Fact>
Public Async Function TestMethodBlock() As Threading.Tasks.Task
Public Async Function TestMethodBlock() As Task
Await TestInRegularAndScript1Async(
"class C
[|friend|] protected sub M()
Expand All @@ -89,7 +89,7 @@ end class")
End Function

<Fact>
Public Async Function TestField() As Threading.Tasks.Task
Public Async Function TestField() As Task
Await TestInRegularAndScript1Async(
"class C
[|friend|] protected dim a as integer
Expand All @@ -100,7 +100,7 @@ end class")
End Function

<Fact>
Public Async Function TestConstructor() As Threading.Tasks.Task
Public Async Function TestConstructor() As Task
Await TestInRegularAndScript1Async(
"class C
[|friend|] protected sub new()
Expand All @@ -113,7 +113,7 @@ end class")
End Function

<Fact>
Public Async Function TestPropertyStatement() As Threading.Tasks.Task
Public Async Function TestPropertyStatement() As Task
Await TestInRegularAndScript1Async(
"class C
[|readonly|] protected property P as integer
Expand All @@ -124,7 +124,7 @@ end class")
End Function

<Fact>
Public Async Function TestPropertyBlock() As Threading.Tasks.Task
Public Async Function TestPropertyBlock() As Task
Await TestInRegularAndScript1Async(
"class C
[|readonly|] protected property P as integer
Expand All @@ -141,7 +141,7 @@ end class")
End Function

<Fact>
Public Async Function TestAccessor() As Threading.Tasks.Task
Public Async Function TestAccessor() As Task
Await TestInRegularAndScript1Async(
"class C
public property P as integer
Expand All @@ -160,7 +160,7 @@ end class
End Function

<Fact>
Public Async Function TestPropertyEvent() As Threading.Tasks.Task
Public Async Function TestPropertyEvent() As Task
Await TestInRegularAndScript1Async(
"class C
[|friend|] protected custom event E as Action
Expand All @@ -173,7 +173,7 @@ end class")
End Function

<Fact>
Public Async Function TestFieldEvent() As Threading.Tasks.Task
Public Async Function TestFieldEvent() As Task
Await TestInRegularAndScript1Async(
"class C
[|friend|] protected event E as Action
Expand All @@ -184,7 +184,7 @@ end class")
End Function

<Fact>
Public Async Function TestOperator() As Threading.Tasks.Task
Public Async Function TestOperator() As Task
Await TestInRegularAndScript1Async(
"class C
[|shared|] public operator +(c1 as integer, c2 as integer) as integer
Expand All @@ -199,7 +199,7 @@ end class
End Function

<Fact>
Public Async Function TestConversionOperator() As Threading.Tasks.Task
Public Async Function TestConversionOperator() As Task
Await TestInRegularAndScript1Async(
"class C
[|shared|] public widening operator CType(x as integer) as boolean
Expand All @@ -212,7 +212,7 @@ end class")
End Function

<Fact>
Public Async Function TestFixAll1() As Threading.Tasks.Task
Public Async Function TestFixAll1() As Task
Await TestInRegularAndScript1Async(
"{|FixAllInDocument:friend|} protected class C
friend protected class Nested
Expand All @@ -225,7 +225,7 @@ end class")
End Function

<Fact>
Public Async Function TestFixAll2() As Threading.Tasks.Task
Public Async Function TestFixAll2() As Task
Await TestInRegularAndScript1Async(
"friend protected class C
{|FixAllInDocument:friend|} protected class Nested
Expand All @@ -240,7 +240,7 @@ end class
End Function

<Fact>
Public Async Function TestTrivia1() As Threading.Tasks.Task
Public Async Function TestTrivia1() As Task
Await TestInRegularAndScript1Async(
"
''' Doc comment
Expand Down
1 change: 1 addition & 0 deletions src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@
<Import Project="..\..\..\Analyzers\Core\Analyzers\Analyzers.projitems" Label="Shared" />
<Import Project="..\..\..\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems" Label="Shared" />
<Import Project="..\..\..\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems" Label="Shared" />
<Import Project="..\..\..\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems" Label="Shared" />
<Import Project="..\..\..\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems" Label="Shared" />
</Project>
2 changes: 1 addition & 1 deletion src/Compilers/CSharp/Portable/Compilation/CSharpSemanticModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1679,7 +1679,7 @@ private ImmutableArray<ISymbol> LookupSymbolsInternal(
}

if (name == null)
results.RemoveWhere(static (symbol, _, _) => !symbol.CanBeReferencedByName, arg: default(VoidResult));
results.RemoveWhere(static (symbol, _, _) => !symbol.CanBeReferencedByName, arg: 0);

return results.ToImmutableAndFree();
}
Expand Down
23 changes: 0 additions & 23 deletions src/Compilers/Core/Portable/InternalUtilities/VoidResult.cs
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions src/Compilers/Core/Portable/InternalUtilities/YieldAwaitableExtensions.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/Compilers/Core/Portable/Text/CompositeText.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ private static void RemoveSplitLineBreaksAndEmptySegments(ArrayBuilder<SourceTex
if (segments.Count > 1)
{
// Remove empty segments before checking for split line breaks
segments.RemoveWhere(static (s, _, _) => s.Length == 0, default(VoidResult));
segments.RemoveWhere(static (s, _, _) => s.Length == 0, arg: 0);

var splitLineBreakFound = false;
for (int i = 1; i < segments.Count; i++)
Expand All @@ -230,7 +230,7 @@ private static void RemoveSplitLineBreaksAndEmptySegments(ArrayBuilder<SourceTex
{
// If a split line break was present, ensure there aren't any empty lines again
// due to the sourcetexts created from the GetSubText calls.
segments.RemoveWhere(static (s, _, _) => s.Length == 0, default(VoidResult));
segments.RemoveWhere(static (s, _, _) => s.Length == 0, arg: 0);
}
}
}
Expand Down
Loading