Extract local functions to make project updating simpler to understand. #74878
Conversation
dotnet-issue-labeler
bot
added
Area-IDE
untriaged
| Id, solutionChanges.Solution.AddAnalyzerReferences(Id, _analyzersAddedInBatch)); | ||
| } | ||
| projectUpdateState = UpdateAnalyzerReferences( | ||
| Id, solutionChanges, projectUpdateState, _analyzersRemovedInBatch, _analyzersAddedInBatch); |
There was a problem hiding this comment.
Three simple helpers now: Update metadata references. Update project references. Update analyzer references.
| @@ -709,6 +632,118 @@ await _projectSystemProjectFactory.ApplyBatchChangeToWorkspaceMaybeAsync(useAsyn | |||
| if (hasAnalyzerChanges) | |||
| _projectSystemProjectFactory.Workspace.EnqueueUpdateSourceGeneratorVersion(projectId: null, forceRegeneration: true); | |||
| } | |||
|
|
|||
| static ProjectUpdateState UpdateMetadataReferences( | |||
| Project projectBeforeMutation, | |||
There was a problem hiding this comment.
this guy is interesting in that we pass in the prior project state. that's needed as it is used to find teh MetadataRef instance associated with teh file path we want to remove.
| else | ||
| { | ||
| // TODO: find a cleaner way to fetch this | ||
| var metadataReference = _projectSystemProjectFactory.Workspace.CurrentSolution.GetRequiredProject(Id).MetadataReferences |
There was a problem hiding this comment.
the prior logic seems terrible/broken. We were accessing the mutable current soltuion of the workspace to make this decisino? That just seems never good. I changes to pass in the current 'immutable project state' that we're performing the mutation on as that seems sane and reasonavble.
| // TODO: find a cleaner way to fetch this | ||
| var metadataReference = projectBeforeMutation.MetadataReferences | ||
| .OfType<PortableExecutableReference>() | ||
| .Single(m => m.FilePath == path && m.Properties == properties); |
There was a problem hiding this comment.
note: this logic seems odd to me. doing a == properties check here seems unnecessary and probably wrong too. you can't add the same filepath with different properties afaict. but i'm not changing that now. it just seems wonky.
| List<ProjectReference> projectReferencesRemovedInBatch, | ||
| List<ProjectReference> _projectReferencesAddedInBatch) | ||
| { | ||
| // Project reference adding... |
There was a problem hiding this comment.
note: project references swap the normal order. instead of remove/add, it's add/remove. I wasn't certain if it was safe to change that, so i kept it as is.
src/Workspaces/Core/Portable/Workspace/ProjectSystem/ProjectSystemProject.cs
Outdated
Show resolved
Hide resolved
…roslyn into extractFunctions
No description provided.