github/SharpIDE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add more cancellation tokens

Browse Source
This commit is contained in:
Matt Parker
2025-10-19 13:20:38 +10:00
parent ce4dbb10f1
commit 302ee8edd2
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/SharpIDE.Application/Features/Analysis/RoslynAnalysis.cs
View File

@@ -261,7 +261,7 @@ public class RoslynAnalysis
}).ToImmutableArray(); }).ToImmutableArray();
} }
public async Task UpdateSolutionDiagnostics() public async Task UpdateSolutionDiagnostics(CancellationToken cancellationToken = default)
{ {
Console.WriteLine("RoslynAnalysis: Updating solution diagnostics"); Console.WriteLine("RoslynAnalysis: Updating solution diagnostics");
var timer = Stopwatch.StartNew(); var timer = Stopwatch.StartNew();
@@ -269,7 +269,7 @@ public class RoslynAnalysis
await _solutionLoadedTcs.Task; await _solutionLoadedTcs.Task;
foreach (var project in _sharpIdeSolutionModel!.AllProjects) foreach (var project in _sharpIdeSolutionModel!.AllProjects)
{ {
var projectDiagnostics = await GetProjectDiagnostics(project); var projectDiagnostics = await GetProjectDiagnostics(project, cancellationToken);
// TODO: only add and remove diffs // TODO: only add and remove diffs
project.Diagnostics.RemoveRange(project.Diagnostics); project.Diagnostics.RemoveRange(project.Diagnostics);
project.Diagnostics.AddRange(projectDiagnostics); project.Diagnostics.AddRange(projectDiagnostics);
@@ -278,11 +278,10 @@ public class RoslynAnalysis
Console.WriteLine($"RoslynAnalysis: Solution diagnostics updated in {timer.ElapsedMilliseconds}ms"); Console.WriteLine($"RoslynAnalysis: Solution diagnostics updated in {timer.ElapsedMilliseconds}ms");
} }
public async Task<ImmutableArray<Diagnostic>> GetProjectDiagnostics(SharpIdeProjectModel projectModel) public async Task<ImmutableArray<Diagnostic>> GetProjectDiagnostics(SharpIdeProjectModel projectModel, CancellationToken cancellationToken = default)
{ {
using var _ = SharpIdeOtel.Source.StartActivity($"{nameof(RoslynAnalysis)}.{nameof(GetProjectDiagnostics)}"); using var _ = SharpIdeOtel.Source.StartActivity($"{nameof(RoslynAnalysis)}.{nameof(GetProjectDiagnostics)}");
await _solutionLoadedTcs.Task; await _solutionLoadedTcs.Task;
var cancellationToken = CancellationToken.None;
var project = _workspace!.CurrentSolution.Projects.Single(s => s.FilePath == projectModel.FilePath); var project = _workspace!.CurrentSolution.Projects.Single(s => s.FilePath == projectModel.FilePath);
var compilation = await project.GetCompilationAsync(cancellationToken); var compilation = await project.GetCompilationAsync(cancellationToken);
Guard.Against.Null(compilation, nameof(compilation)); Guard.Against.Null(compilation, nameof(compilation));
@@ -292,17 +291,16 @@ public class RoslynAnalysis
return diagnostics; return diagnostics;
} }
public async Task<ImmutableArray<SharpIdeDiagnostic>> GetProjectDiagnosticsForFile(SharpIdeFile sharpIdeFile) public async Task<ImmutableArray<SharpIdeDiagnostic>> GetProjectDiagnosticsForFile(SharpIdeFile sharpIdeFile, CancellationToken cancellationToken = default)
{ {
using var _ = SharpIdeOtel.Source.StartActivity($"{nameof(RoslynAnalysis)}.{nameof(GetProjectDiagnosticsForFile)}"); using var _ = SharpIdeOtel.Source.StartActivity($"{nameof(RoslynAnalysis)}.{nameof(GetProjectDiagnosticsForFile)}");
await _solutionLoadedTcs.Task; await _solutionLoadedTcs.Task;
if (sharpIdeFile.IsRoslynWorkspaceFile is false) return []; if (sharpIdeFile.IsRoslynWorkspaceFile is false) return [];
var cancellationToken = CancellationToken.None;
var project = _workspace!.CurrentSolution.Projects.Single(s => s.FilePath == ((IChildSharpIdeNode)sharpIdeFile).GetNearestProjectNode()!.FilePath); var project = _workspace!.CurrentSolution.Projects.Single(s => s.FilePath == ((IChildSharpIdeNode)sharpIdeFile).GetNearestProjectNode()!.FilePath);
var compilation = await project.GetCompilationAsync(cancellationToken); var compilation = await project.GetCompilationAsync(cancellationToken);
Guard.Against.Null(compilation, nameof(compilation)); Guard.Against.Null(compilation, nameof(compilation));
var document = await GetDocumentForSharpIdeFile(sharpIdeFile); var document = await GetDocumentForSharpIdeFile(sharpIdeFile, cancellationToken);
var syntaxTree = compilation.SyntaxTrees.Single(s => s.FilePath == document.FilePath); var syntaxTree = compilation.SyntaxTrees.Single(s => s.FilePath == document.FilePath);
var diagnostics = compilation.GetDiagnostics(cancellationToken) var diagnostics = compilation.GetDiagnostics(cancellationToken)
@@ -319,7 +317,7 @@ public class RoslynAnalysis
await _solutionLoadedTcs.Task; await _solutionLoadedTcs.Task;
if (fileModel.IsRoslynWorkspaceFile is false) return []; if (fileModel.IsRoslynWorkspaceFile is false) return [];
var document = await GetDocumentForSharpIdeFile(fileModel); var document = await GetDocumentForSharpIdeFile(fileModel, cancellationToken);
Guard.Against.Null(document, nameof(document)); Guard.Against.Null(document, nameof(document));
var semanticModel = await document.GetSemanticModelAsync(cancellationToken); var semanticModel = await document.GetSemanticModelAsync(cancellationToken);
@@ -331,11 +329,11 @@ public class RoslynAnalysis
return result; return result;
} }
private static async Task<Document> GetDocumentForSharpIdeFile(SharpIdeFile fileModel) private static async Task<Document> GetDocumentForSharpIdeFile(SharpIdeFile fileModel, CancellationToken cancellationToken = default)
{ {
var project = _workspace!.CurrentSolution.Projects.Single(s => s.FilePath == ((IChildSharpIdeNode)fileModel).GetNearestProjectNode()!.FilePath); var project = _workspace!.CurrentSolution.Projects.Single(s => s.FilePath == ((IChildSharpIdeNode)fileModel).GetNearestProjectNode()!.FilePath);
var document = fileModel.IsCsharpFile ? project.Documents.SingleOrDefault(s => s.FilePath == fileModel.Path) var document = fileModel.IsCsharpFile ? project.Documents.SingleOrDefault(s => s.FilePath == fileModel.Path)
: await GetRazorSourceGeneratedDocumentInProjectForSharpIdeFile(project, fileModel); : await GetRazorSourceGeneratedDocumentInProjectForSharpIdeFile(project, fileModel, cancellationToken);
Guard.Against.Null(document, nameof(document)); Guard.Against.Null(document, nameof(document));
return document; return document;
} }