Skip to content
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

Jump to bottom

Apply timeout to simplification #942

Merged
merged 1 commit into from
Aug 28, 2022
Merged

Apply timeout to simplification #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CodeConverter/CSharp/VBToCSConversion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public List<SyntaxNode> FindSingleImportantChild(SyntaxNode annotatedNode)

public async Task<Document> SingleSecondPassAsync(Document doc)
{
var simplifiedDocument = await doc.SimplifyStatementsAsync<UsingDirectiveSyntax>(UnresolvedNamespaceDiagnosticId, _cancellationToken);
var simplifiedDocument = await _vbToCsProjectContentsConverter.OptionalOperations.SimplifyStatementsAsync<UsingDirectiveSyntax>(doc, UnresolvedNamespaceDiagnosticId);

// Can't add a reference to Microsoft.VisualBasic if there's no project file, so hint to install the package
if (_vbToCsProjectContentsConverter.SourceProject.AssemblyName == FabricatedAssemblyName) {
Expand Down
15 changes: 15 additions & 0 deletions CodeConverter/Common/OptionalOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,19 @@ public SyntaxNode Format(SyntaxNode node, Document document)
return node.NormalizeWhitespace();
}
}

public async Task<Document> SimplifyStatementsAsync<T>(Document doc, string unresolvedNamespaceDiagnosticId) where T : SyntaxNode
{
using var cts = CancellationTokenSource.CreateLinkedTokenSource(_wholeTaskCancellationToken);
var token = cts.Token;
cts.CancelAfter(_abandonTasksIfNoActivityFor);
try {
// This sometimes gets stuck in an infinite loop within the CodeAnalysis library - https://github.com/icsharpcode/CodeConverter/issues/877#issuecomment-1221519204
return await doc.SimplifyStatementsAsync<T>(unresolvedNamespaceDiagnosticId, token);
} catch (OperationCanceledException) {
_progress.Report(new ConversionProgress($"Timeout expired - abandoning simplification for {doc.FilePath}. If within Visual Studio you can adjust the timeout in Tools -> Options -> Code Converter.", 1));
return doc;
}

}
}
3 changes: 2 additions & 1 deletion CodeConverter/VB/CSToVBConversion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Globalization;
using System.Text;
using ICSharpCode.CodeConverter.CSharp;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.VisualBasic.Syntax;
Expand Down Expand Up @@ -28,7 +29,7 @@ public async Task<IProjectContentsConverter> CreateProjectContentsConverterAsync
}
public async Task<Document> SingleSecondPassAsync(Document doc)
{
return await doc.SimplifyStatementsAsync<ImportsStatementSyntax>(UnresolvedNamespaceDiagnosticId, _cancellationToken);
return await _csToVbProjectContentsConverter.OptionalOperations.SimplifyStatementsAsync<ImportsStatementSyntax>(doc, UnresolvedNamespaceDiagnosticId);
}

public SyntaxNode GetSurroundedNode(IEnumerable<SyntaxNode> descendantNodes,
Expand Down