Merge pull request #535 from icsharpcode/asyncenumerable

Async Enumerable
icsharpcode · Mar 1, 2020 · e9ec9b4 · e9ec9b4
2 parents b8d9976 + 103854c
commit e9ec9b4
Show file tree

Hide file tree

Showing 215 changed files with 2,411 additions and 5,547 deletions.
diff --git a/.gitignore b/.gitignore
@@ -286,3 +286,4 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
+/.nuget
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
diff --git a/.nuget/packages.config b/.nuget/packages.config
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+* Decrease horrendousness of performance for large projects containing large files
+
+### API
+
+* IEnumerable<Task<ConversionResult>> becomes IAsyncEnumerable<ConversionResult>
+* Upgraded target framework from netstandard 1.3 to netstandard 2.0
+* Introduced cancellation token
 
 ### Vsix
 
@@ -21,6 +28,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 * Exclude project file from conversion result if it hasn't changed
 * Further efforts to stop the roslyn library crashing Visual Studio
+* Conversion tasks are now cancellable
 
 ### VB -> C#
 
@@ -30,6 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 * Avoid incorrectly renaming symbols
 * Prevent "SyntaxTree is not part of the compilation" error [#527](https://github.com/icsharpcode/CodeConverter/issues/527)
+* Avoid incorrectly renaming symbols (#524)[https://github.com/icsharpcode/CodeConverter/issues/524]
 
 ## [7.8.0] - 2020-02-15
 

diff --git a/CodeConverter.Web/Pages/Index.cshtml.cs b/CodeConverter.Web/Pages/Index.cshtml.cs
diff --git a/CodeConverter.Web/Pages/Privacy.cshtml.cs b/CodeConverter.Web/Pages/Privacy.cshtml.cs
diff --git a/CodeConverter.sln b/CodeConverter.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29721.120
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.CodeConverter", "ICSharpCode.CodeConverter\ICSharpCode.CodeConverter.csproj", "{7EA075C6-6406-445C-AB77-6C47AFF88D58}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeConverter", "CodeConverter\CodeConverter.csproj", "{7EA075C6-6406-445C-AB77-6C47AFF88D58}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{21DBA1CE-AF55-4159-B04B-B8C621BE8921}"
 EndProject
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeConverter.Web", "CodeConverter.Web\CodeConverter.Web.csproj", "{08A20D4F-6310-43BB-B339-6317ACF3B52E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web", "Web\Web.csproj", "{08A20D4F-6310-43BB-B339-6317ACF3B52E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/CodeConverter/AssemblyInfo.cs b/CodeConverter/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("ICSharpCode.CodeConverter.Tests")]
diff --git a/...onverter/CSharp/AdditionalInitializers.cs → ...onverter/CSharp/AdditionalInitializers.cs b/...onverter/CSharp/AdditionalInitializers.cs → ...onverter/CSharp/AdditionalInitializers.cs
diff --git a/...e.CodeConverter/CSharp/AdditionalLocal.cs → CodeConverter/CSharp/AdditionalLocal.cs b/...e.CodeConverter/CSharp/AdditionalLocal.cs → CodeConverter/CSharp/AdditionalLocal.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Text;
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace ICSharpCode.CodeConverter.CSharp

diff --git a/....CodeConverter/CSharp/AdditionalLocals.cs → CodeConverter/CSharp/AdditionalLocals.cs b/....CodeConverter/CSharp/AdditionalLocals.cs → CodeConverter/CSharp/AdditionalLocals.cs
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace ICSharpCode.CodeConverter.CSharp
 {

diff --git a/...Converter/CSharp/ByRefParameterVisitor.cs → ...Converter/CSharp/ByRefParameterVisitor.cs b/...Converter/CSharp/ByRefParameterVisitor.cs → ...Converter/CSharp/ByRefParameterVisitor.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using ICSharpCode.CodeConverter.Util;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;

diff --git a/...verter/CSharp/CachedReflectedDelegates.cs → ...verter/CSharp/CachedReflectedDelegates.cs b/...verter/CSharp/CachedReflectedDelegates.cs → ...verter/CSharp/CachedReflectedDelegates.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using ICSharpCode.CodeConverter.Util;
+using System.Reflection;
 using Microsoft.CodeAnalysis;
 
 namespace ICSharpCode.CodeConverter.CSharp

diff --git a/...arp/CommentConvertingMethodBodyVisitor.cs → ...arp/CommentConvertingMethodBodyVisitor.cs b/...arp/CommentConvertingMethodBodyVisitor.cs → ...arp/CommentConvertingMethodBodyVisitor.cs
@@ -1,14 +1,10 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
-using ICSharpCode.CodeConverter.Shared;
 using ICSharpCode.CodeConverter.Util;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.VisualBasic;
-using Microsoft.CodeAnalysis.VisualBasic.Syntax;
 using CSSyntax = Microsoft.CodeAnalysis.CSharp.Syntax;
 using SyntaxFactory = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-using SyntaxNodeExtensions = ICSharpCode.CodeConverter.Util.SyntaxNodeExtensions;
 
 namespace ICSharpCode.CodeConverter.CSharp
 {

diff --git a/...r/CSharp/CommentConvertingNodesVisitor.cs → ...r/CSharp/CommentConvertingNodesVisitor.cs b/...r/CSharp/CommentConvertingNodesVisitor.cs → ...r/CSharp/CommentConvertingNodesVisitor.cs
@@ -1,17 +1,10 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using ICSharpCode.CodeConverter.Shared;
+using System.Threading.Tasks;
 using ICSharpCode.CodeConverter.Util;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.VisualBasic;
 using VbSyntax = Microsoft.CodeAnalysis.VisualBasic.Syntax;
 using CsSyntax = Microsoft.CodeAnalysis.CSharp.Syntax;
-using SyntaxFactory = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-using SyntaxKind = Microsoft.CodeAnalysis.CSharp.SyntaxKind;
-using SyntaxNodeExtensions = ICSharpCode.CodeConverter.Util.SyntaxNodeExtensions;
 
 namespace ICSharpCode.CodeConverter.CSharp
 {

diff --git a/...CSharp/CommentConvertingVisitorWrapper.cs → ...CSharp/CommentConvertingVisitorWrapper.cs b/...CSharp/CommentConvertingVisitorWrapper.cs → ...CSharp/CommentConvertingVisitorWrapper.cs
diff --git a/...CodeConverter/CSharp/CommonConversions.cs → CodeConverter/CSharp/CommonConversions.cs b/...CodeConverter/CSharp/CommonConversions.cs → CodeConverter/CSharp/CommonConversions.cs
@@ -20,7 +20,6 @@
 using ArrayTypeSyntax = Microsoft.CodeAnalysis.CSharp.Syntax.ArrayTypeSyntax;
 using CSharpExtensions = Microsoft.CodeAnalysis.CSharp.CSharpExtensions;
 using ExpressionSyntax = Microsoft.CodeAnalysis.CSharp.Syntax.ExpressionSyntax;
-using ISymbolExtensions = ICSharpCode.CodeConverter.Util.ISymbolExtensions;
 using SyntaxFactory = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 using SyntaxFacts = Microsoft.CodeAnalysis.CSharp.SyntaxFacts;
 using SyntaxKind = Microsoft.CodeAnalysis.VisualBasic.SyntaxKind;

diff --git a/...onverter/CSharp/CsSyntaxNodeExtensions.cs → ...onverter/CSharp/CsSyntaxNodeExtensions.cs b/...onverter/CSharp/CsSyntaxNodeExtensions.cs → ...onverter/CSharp/CsSyntaxNodeExtensions.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 

diff --git a/...onverter/CSharp/DeclarationNodeVisitor.cs → ...onverter/CSharp/DeclarationNodeVisitor.cs b/...onverter/CSharp/DeclarationNodeVisitor.cs → ...onverter/CSharp/DeclarationNodeVisitor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using ICSharpCode.CodeConverter.Shared;
@@ -11,10 +9,8 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editing;
-using Microsoft.VisualBasic.CompilerServices;
 using StringComparer = System.StringComparer;
 using SyntaxFactory = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-using SyntaxNodeExtensions = ICSharpCode.CodeConverter.Util.SyntaxNodeExtensions;
 using VBSyntax = Microsoft.CodeAnalysis.VisualBasic.Syntax;
 using VBasic = Microsoft.CodeAnalysis.VisualBasic;
 using SyntaxToken = Microsoft.CodeAnalysis.SyntaxToken;

diff --git a/...rter/CSharp/DefiniteAssignmentAnalyzer.cs → ...rter/CSharp/DefiniteAssignmentAnalyzer.cs b/...rter/CSharp/DefiniteAssignmentAnalyzer.cs → ...rter/CSharp/DefiniteAssignmentAnalyzer.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
+using System.Linq;
 using ICSharpCode.CodeConverter.Util;
 using Microsoft.CodeAnalysis;
 

diff --git a/...Converter/CSharp/ExpressionNodeVisitor.cs → ...Converter/CSharp/ExpressionNodeVisitor.cs b/...Converter/CSharp/ExpressionNodeVisitor.cs → ...Converter/CSharp/ExpressionNodeVisitor.cs
@@ -1,20 +1,16 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
-using System.Linq.Expressions;
 using System.Threading.Tasks;
 using ICSharpCode.CodeConverter.Shared;
 using ICSharpCode.CodeConverter.Util;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.Operations;
 using Microsoft.CodeAnalysis.Simplification;
 using Microsoft.VisualBasic.CompilerServices;
 using IOperation = Microsoft.CodeAnalysis.IOperation;
-using ISymbolExtensions = ICSharpCode.CodeConverter.Util.ISymbolExtensions;
 using SyntaxFactory = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 using SyntaxKind = Microsoft.CodeAnalysis.CSharp.SyntaxKind;
 using VBasic = Microsoft.CodeAnalysis.VisualBasic;

diff --git a/...e.CodeConverter/CSharp/LambdaConverter.cs → CodeConverter/CSharp/LambdaConverter.cs b/...e.CodeConverter/CSharp/LambdaConverter.cs → CodeConverter/CSharp/LambdaConverter.cs
@@ -5,10 +5,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.Operations;
-using ISymbolExtensions = ICSharpCode.CodeConverter.Util.ISymbolExtensions;
-using VBasic = Microsoft.CodeAnalysis.VisualBasic;
 using VBSyntax = Microsoft.CodeAnalysis.VisualBasic.Syntax;
 
 namespace ICSharpCode.CodeConverter.CSharp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		using System.Runtime.CompilerServices;

		[assembly: InternalsVisibleTo("ICSharpCode.CodeConverter.Tests")]