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.

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

Extract compilation-tracker/SG-production code out of SolutionState to a new owner. #71257

Merged
merged 234 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
234 commits
Select commit Hold shift + click to select a range
b46054d
Create new class
CyrusNajmabadi Dec 13, 2023
6687ad5
Move fields and constructor
CyrusNajmabadi Dec 13, 2023
620f2df
Add comment
CyrusNajmabadi Dec 13, 2023
709831e
Update constructors
CyrusNajmabadi Dec 13, 2023
a79cd06
Move the branch method and move AddProject over to forking both state…
CyrusNajmabadi Dec 13, 2023
2b400c4
Move CreateCompilationTrackerMap over to new type
CyrusNajmabadi Dec 13, 2023
86c0fa7
Move RemoveProject over
CyrusNajmabadi Dec 13, 2023
dc1d71d
Move WithProjectAssemblyName over
CyrusNajmabadi Dec 13, 2023
618671d
Move WithProjectOutputFilePath over
CyrusNajmabadi Dec 13, 2023
0b178eb
Move WithProjectOutputRefFilePath over
CyrusNajmabadi Dec 13, 2023
5322f01
Move WithProjectCompilationOutputInfo over
CyrusNajmabadi Dec 13, 2023
8fec05f
Move WithProjectDefaultNamespace over
CyrusNajmabadi Dec 13, 2023
11f3e10
Move WithProjectChecksumAlgorithm over
CyrusNajmabadi Dec 13, 2023
963e3d8
Move WithProjectName over
CyrusNajmabadi Dec 13, 2023
2db0915
Move WithProjectFilePath over
CyrusNajmabadi Dec 13, 2023
56515ba
Move WithProjectCompilationOptions over
CyrusNajmabadi Dec 13, 2023
46451b2
Move WithProjectParseOptions over
CyrusNajmabadi Dec 13, 2023
b6363bd
Move WithHasAllInformation over
CyrusNajmabadi Dec 13, 2023
2cb5e0e
Move WithRunAnalyzers over
CyrusNajmabadi Dec 13, 2023
718f111
Move WithProjectDocumentsOrder over
CyrusNajmabadi Dec 13, 2023
80c2b6f
Move AddProjectReferences over
CyrusNajmabadi Dec 13, 2023
5ada790
Move RemoveProjectReference over
CyrusNajmabadi Dec 14, 2023
b08a242
Move WithProjectReferences over
CyrusNajmabadi Dec 14, 2023
51b80b2
Move AddMetadataReferences over
CyrusNajmabadi Dec 14, 2023
a4bd930
Move RemoveMetadataReference over
CyrusNajmabadi Dec 14, 2023
0426598
Move WithProjectMetadataReferences over
CyrusNajmabadi Dec 14, 2023
7b05adc
Move AddAnalyzerReferences over
CyrusNajmabadi Dec 14, 2023
0becfa5
Move RemoveAnalyzerReference over
CyrusNajmabadi Dec 14, 2023
daddeda
Move WithProjectAnalyzerReferencesRemoveAnalyzerReference over
CyrusNajmabadi Dec 14, 2023
ad43964
Move WithDocumentName over
CyrusNajmabadi Dec 14, 2023
28dd041
Move WithDocumentFolders over
CyrusNajmabadi Dec 14, 2023
67fe40a
Move WithDocumentFilePath over
CyrusNajmabadi Dec 14, 2023
27ea258
Move WithDocumentText over
CyrusNajmabadi Dec 14, 2023
372b6ff
Move WithAdditionalDocumentText over
CyrusNajmabadi Dec 14, 2023
c7761cf
Move WithAnalyzerConfigDocumentText over
CyrusNajmabadi Dec 14, 2023
36474fb
Move WithDocumentText over
CyrusNajmabadi Dec 14, 2023
c954b9f
Move WithAdditionalDocumentText over
CyrusNajmabadi Dec 14, 2023
4419036
Move WithAnalyzerConfigDocumentText over
CyrusNajmabadi Dec 14, 2023
19e2fca
Move WithDocumentSyntaxRoot over
CyrusNajmabadi Dec 14, 2023
17cdcc3
Move WithDocumentContentsFrom over
CyrusNajmabadi Dec 14, 2023
5404910
Move WithDocumentSourceCodeKind over
CyrusNajmabadi Dec 14, 2023
a6f3bba
Move WithDocumentTextLoader over
CyrusNajmabadi Dec 14, 2023
5112ca2
Move WithAdditionalDocumentTextLoader over
CyrusNajmabadi Dec 14, 2023
b9e7443
Move WithAnalyzerConfigDocumentTextLoader over
CyrusNajmabadi Dec 14, 2023
a571c03
Move WithNewWorkspace over
CyrusNajmabadi Dec 14, 2023
6a11820
Move WithDocumentText over
CyrusNajmabadi Dec 14, 2023
6bad662
Update WithOptions
CyrusNajmabadi Dec 14, 2023
915b7f5
Move AddDocuments over
CyrusNajmabadi Dec 14, 2023
e3101b6
Move AddAdditionalDocuments over
CyrusNajmabadi Dec 14, 2023
e70ba7f
Move AddAnalyzerConfigDocuments over
CyrusNajmabadi Dec 14, 2023
87e0a6f
Move RemoveDocuments over
CyrusNajmabadi Dec 14, 2023
249996c
Move RemoveAdditionalDocuments over
CyrusNajmabadi Dec 14, 2023
f31b230
Move RemoveAnalyzerConfigDocuments over
CyrusNajmabadi Dec 14, 2023
9697c0c
Move ICompilationTracker to new type
CyrusNajmabadi Dec 14, 2023
5692caf
Fix constructor names
CyrusNajmabadi Dec 14, 2023
69dd17e
Move type to new owner
CyrusNajmabadi Dec 14, 2023
766b7f7
Move type to new owner
CyrusNajmabadi Dec 14, 2023
0445796
Delete method
CyrusNajmabadi Dec 14, 2023
3970d61
Fix two cases where we were not passing in enough information for the…
CyrusNajmabadi Dec 14, 2023
3993d82
mvoe method to single place it is used
CyrusNajmabadi Dec 14, 2023
9a7b48e
Move type to new owner
CyrusNajmabadi Dec 14, 2023
da36976
Move type to new owner
CyrusNajmabadi Dec 14, 2023
e7faccb
Move type to new owner
CyrusNajmabadi Dec 14, 2023
31ae1c9
Move CWT from SolutionState to SolutionCompilationState
CyrusNajmabadi Dec 14, 2023
2ef560b
Move type to new owner
CyrusNajmabadi Dec 14, 2023
61c33a1
Move type to new owner
CyrusNajmabadi Dec 14, 2023
8128670
Move type to new owner
CyrusNajmabadi Dec 14, 2023
46fed76
Move symbol to project mapping code over to compilationstate
CyrusNajmabadi Dec 14, 2023
2760f24
Move type to new owner
CyrusNajmabadi Dec 14, 2023
3d70cf9
Move method from SolutioNState to SolutionCompilationState
CyrusNajmabadi Dec 14, 2023
4054e66
move methods for getting a compilation tracker over to SolutionCompil…
CyrusNajmabadi Dec 14, 2023
ba5ecdc
Move property
CyrusNajmabadi Dec 14, 2023
df63b8c
Move version methods over to SolutionCompilationState
CyrusNajmabadi Dec 14, 2023
31e7444
Remove incorrect argument
CyrusNajmabadi Dec 14, 2023
81df7f2
Move compilation methods over
CyrusNajmabadi Dec 14, 2023
7c90889
Move compilation methods over
CyrusNajmabadi Dec 14, 2023
548d5de
Pass along compilation state through tracker
CyrusNajmabadi Dec 14, 2023
d468636
Move invariant checking code
CyrusNajmabadi Dec 14, 2023
79511d4
Move test accessor code
CyrusNajmabadi Dec 14, 2023
a8e9739
Update skeletons to pass along solutionstate snapshot
CyrusNajmabadi Dec 14, 2023
36cb3c4
Pass state along through compilation tracker
CyrusNajmabadi Dec 14, 2023
81f3f7b
Pass state along through compilation tracker
CyrusNajmabadi Dec 14, 2023
01d03f0
Move type to new owner
CyrusNajmabadi Dec 14, 2023
c04281b
Update tracker to use solution snapshot
CyrusNajmabadi Dec 14, 2023
caa1b4a
Update code to use the new snapshots
CyrusNajmabadi Dec 14, 2023
a961b3e
Update code to use the new snapshots
CyrusNajmabadi Dec 14, 2023
352115f
Make type temporarily public
CyrusNajmabadi Dec 14, 2023
9aad74b
Move WithFrozenSourceGeneratedDocument SolutionCompilationState
CyrusNajmabadi Dec 14, 2023
bfbb219
Fixup WithFrozenSourceGeneratedDocument
CyrusNajmabadi Dec 14, 2023
0ed23bf
Update project code
CyrusNajmabadi Dec 14, 2023
e40be82
Fixup callsites
CyrusNajmabadi Dec 14, 2023
6584acd
Fixup WithCachedSourceGeneratorState
CyrusNajmabadi Dec 14, 2023
5f4dc27
Update method
CyrusNajmabadi Dec 14, 2023
0db4195
Remove unnecessary usings
CyrusNajmabadi Dec 14, 2023
aadf72b
Fix helpers
CyrusNajmabadi Dec 14, 2023
df99fe4
Fix helpers
CyrusNajmabadi Dec 14, 2023
d596edb
Ugh about to have my hands forced
CyrusNajmabadi Dec 14, 2023
01dc1c3
moving to a different ownership model
CyrusNajmabadi Dec 14, 2023
3ba2020
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
6ff9aa0
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
3910809
Push check inwards
CyrusNajmabadi Dec 14, 2023
5f405c9
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
ef6f3ac
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
31a08b3
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
f837ad7
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
bc4e6a3
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
653d839
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
b3151ff
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
50fa6ef
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
9db0d0a
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
f2accaa
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
dad409f
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
ee013ad
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
26ba75b
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
f0df3d5
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
b3e0863
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
d6f91e9
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
9e9257a
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
3f1d770
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
31444be
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
87b7849
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
6434369
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
e3dc2cf
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
058aa3e
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
2aa57c5
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
5c8399a
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
316780b
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
469e87d
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
2b79512
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
9391ffb
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
bc5e6f9
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
1c3ccd8
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
1e7a448
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
ad67ce5
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
e13099f
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
c413d7e
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
16720cf
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
533750b
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
69a1226
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
1cb8f6e
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
c5751dd
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
45b4fab
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
0a284bd
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
fbca2f7
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
eb5114b
Fixup WithFrozenPartialCompilationIncludingSpecificDocument
CyrusNajmabadi Dec 14, 2023
e6e14d2
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
381a0b6
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
97f4d8d
Fixup WithFrozenSourceGeneratedDocument
CyrusNajmabadi Dec 14, 2023
39875af
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
c439502
Fixup WithCachedSourceGeneratorState
CyrusNajmabadi Dec 14, 2023
65925b7
Starting to thread through the pattern
CyrusNajmabadi Dec 14, 2023
591ba5b
REmove solutions
CyrusNajmabadi Dec 14, 2023
e9e71f0
Building
CyrusNajmabadi Dec 14, 2023
eb7d6a2
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
e99005a
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
feee5fe
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
d11efaa
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
bdba394
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
01cf80d
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
4bb0bdc
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
b556344
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
140e4a6
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
4cc54c5
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
1e24976
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
2ebede2
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
85f22de
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
02f1217
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
0c346b9
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
e181573
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
d75d2ce
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
4339d62
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
29095d3
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
a496483
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
d1b29fb
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
878456d
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
4b0feed
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
679be21
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
95143b5
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
e18eb41
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
ce84379
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
b6e5726
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
346f3c0
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
2a5a721
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
9e50c79
Push mutation inwards
CyrusNajmabadi Dec 14, 2023
1c1db00
Remove unused parameter
CyrusNajmabadi Dec 14, 2023
4469fd0
Downstream fallout
CyrusNajmabadi Dec 14, 2023
27f6e5a
Downstream fallout
CyrusNajmabadi Dec 14, 2023
f017b01
Downstream fallout
CyrusNajmabadi Dec 14, 2023
3e33971
Downstream fallout
CyrusNajmabadi Dec 14, 2023
11207c9
Move off of direct access to Branch
CyrusNajmabadi Dec 14, 2023
aff3e2a
Move method to compilation state object
CyrusNajmabadi Dec 14, 2023
68a8000
Work on making 'fork' private
CyrusNajmabadi Dec 14, 2023
99cf715
Work on making 'fork' private
CyrusNajmabadi Dec 14, 2023
5ce6378
Work on making 'fork' private
CyrusNajmabadi Dec 14, 2023
1309423
Make things private again
CyrusNajmabadi Dec 14, 2023
a550e51
Make things private again
CyrusNajmabadi Dec 14, 2023
af4717e
Make things private again
CyrusNajmabadi Dec 14, 2023
68e7b77
Make things private again
CyrusNajmabadi Dec 14, 2023
47722f4
Update src/Workspaces/Core/Portable/FindSymbols/FindReferences/Depend…
CyrusNajmabadi Dec 14, 2023
5466f2a
Apply suggestions from code review
CyrusNajmabadi Dec 14, 2023
06896e8
use pattern consistently
CyrusNajmabadi Dec 14, 2023
f51e494
use pattern consistently
CyrusNajmabadi Dec 14, 2023
826669e
Merge remote-tracking branch 'upstream/main' into solutionCompilation…
CyrusNajmabadi Dec 15, 2023
a0e7637
Move method
CyrusNajmabadi Dec 15, 2023
433748d
Unify methods
CyrusNajmabadi Dec 15, 2023
a2bf2ce
Cleanup
CyrusNajmabadi Dec 15, 2023
772e4d2
Use alias
CyrusNajmabadi Dec 15, 2023
596a812
Move to callbacks
CyrusNajmabadi Dec 15, 2023
e975a4f
Move to callback functions
CyrusNajmabadi Dec 15, 2023
bc780d3
rename
CyrusNajmabadi Dec 15, 2023
d0eab38
renames
CyrusNajmabadi Dec 15, 2023
8cc113c
move members
CyrusNajmabadi Dec 15, 2023
d5414b8
simplify
CyrusNajmabadi Dec 15, 2023
d079ab7
simplify
CyrusNajmabadi Dec 15, 2023
3e22e2c
Fix
CyrusNajmabadi Dec 15, 2023
c193bc0
Use a strong type
CyrusNajmabadi Dec 15, 2023
c8b131c
rename proeprties
CyrusNajmabadi Dec 15, 2023
be106bd
Fix
CyrusNajmabadi Dec 15, 2023
dd44230
Fix
CyrusNajmabadi Dec 15, 2023
198ad12
Fix
CyrusNajmabadi Dec 15, 2023
2dde0e7
NRT
CyrusNajmabadi Dec 15, 2023
7995a90
Merge remote-tracking branch 'upstream/main' into solutionCompilation…
CyrusNajmabadi Dec 15, 2023
61122d6
Lint
CyrusNajmabadi Dec 15, 2023
c5df528
docs
CyrusNajmabadi Dec 15, 2023
2ae6602
Add todo
CyrusNajmabadi Dec 19, 2023
9af7716
rename parameter
CyrusNajmabadi Dec 19, 2023
91d7710
Fix
CyrusNajmabadi Dec 19, 2023
e7fa4f6
rename
CyrusNajmabadi Dec 19, 2023
bc1f63b
rename
CyrusNajmabadi Dec 19, 2023
a841803
Simplify
CyrusNajmabadi Dec 19, 2023
e2c6c69
Inline method
CyrusNajmabadi Dec 19, 2023
749e476
Simplify
CyrusNajmabadi Dec 19, 2023
62b1e2c
Simplify
CyrusNajmabadi Dec 20, 2023
e9bc9eb
Simplify call
CyrusNajmabadi Dec 20, 2023
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
8 changes: 4 additions & 4 deletions src/Features/Core/Portable/EditAndContinue/EditSession.cs
Original file line number Diff line number Diff line change
Expand Up @@ -424,11 +424,11 @@ internal static async Task PopulateChangedAndAddedDocumentsAsync(Project oldProj

cancellationToken.ThrowIfCancellationRequested();

var oldSourceGeneratedDocumentStates = await oldProject.Solution.State.GetSourceGeneratedDocumentStatesAsync(oldProject.State, cancellationToken).ConfigureAwait(false);
var oldSourceGeneratedDocumentStates = await oldProject.Solution.CompilationState.GetSourceGeneratedDocumentStatesAsync(oldProject.State, cancellationToken).ConfigureAwait(false);

cancellationToken.ThrowIfCancellationRequested();

var newSourceGeneratedDocumentStates = await newProject.Solution.State.GetSourceGeneratedDocumentStatesAsync(newProject.State, cancellationToken).ConfigureAwait(false);
var newSourceGeneratedDocumentStates = await newProject.Solution.CompilationState.GetSourceGeneratedDocumentStatesAsync(newProject.State, cancellationToken).ConfigureAwait(false);

foreach (var documentId in newSourceGeneratedDocumentStates.GetChangedStateIds(oldSourceGeneratedDocumentStates, ignoreUnchangedContent: true))
{
Expand Down Expand Up @@ -488,11 +488,11 @@ internal static async IAsyncEnumerable<DocumentId> GetChangedDocumentsAsync(Proj

cancellationToken.ThrowIfCancellationRequested();

var oldSourceGeneratedDocumentStates = await oldProject.Solution.State.GetSourceGeneratedDocumentStatesAsync(oldProject.State, cancellationToken).ConfigureAwait(false);
var oldSourceGeneratedDocumentStates = await oldProject.Solution.CompilationState.GetSourceGeneratedDocumentStatesAsync(oldProject.State, cancellationToken).ConfigureAwait(false);

cancellationToken.ThrowIfCancellationRequested();

var newSourceGeneratedDocumentStates = await newProject.Solution.State.GetSourceGeneratedDocumentStatesAsync(newProject.State, cancellationToken).ConfigureAwait(false);
var newSourceGeneratedDocumentStates = await newProject.Solution.CompilationState.GetSourceGeneratedDocumentStatesAsync(newProject.State, cancellationToken).ConfigureAwait(false);

foreach (var documentId in newSourceGeneratedDocumentStates.GetChangedStateIds(oldSourceGeneratedDocumentStates, ignoreUnchangedContent: true))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public async Task TryEnqueueRefreshComputationAsync(Project project, Cancellatio
{
// Determine the checksum for this project cone. Note: this should be fast in practice because this is
// the same project-cone-checksum we used to even call into OOP above when we computed semantic tokens.
var projectChecksum = await project.Solution.State.GetChecksumAsync(project.Id, cancellationToken).ConfigureAwait(false);
var projectChecksum = await project.Solution.CompilationState.GetChecksumAsync(project.Id, cancellationToken).ConfigureAwait(false);

lock (_gate)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public async Task UpdaterService()
await listener.ExpeditedWaitAsync();

// checksum should already exist
Assert.True(workspace.CurrentSolution.State.TryGetStateChecksums(out _));
Assert.True(workspace.CurrentSolution.CompilationState.TryGetStateChecksums(out _));

checksumUpdater.Shutdown();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ internal async Task<T> VerifyAssetSerializationAsync<T>(
internal async Task VerifySolutionStateSerializationAsync(Solution solution, Checksum solutionChecksum)
{
var solutionObjectFromSyncObject = await GetValueAsync<SolutionStateChecksums>(solutionChecksum);
Contract.ThrowIfFalse(solution.State.TryGetStateChecksums(out var solutionObjectFromSolution));
Contract.ThrowIfFalse(solution.CompilationState.TryGetStateChecksums(out var solutionObjectFromSolution));

SolutionStateEqual(solutionObjectFromSolution, solutionObjectFromSyncObject);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public async Task TestAssetSynchronization()
var solution = workspace.CurrentSolution;

// build checksum
await solution.State.GetChecksumAsync(CancellationToken.None);
await solution.CompilationState.GetChecksumAsync(CancellationToken.None);

var map = await solution.GetAssetMapAsync(CancellationToken.None);

Expand Down Expand Up @@ -100,7 +100,7 @@ public async Task TestSolutionSynchronization()
var solution = workspace.CurrentSolution;

// build checksum
await solution.State.GetChecksumAsync(CancellationToken.None);
await solution.CompilationState.GetChecksumAsync(CancellationToken.None);

var map = await solution.GetAssetMapAsync(CancellationToken.None);

Expand All @@ -111,7 +111,7 @@ public async Task TestSolutionSynchronization()
var assetSource = new SimpleAssetSource(workspace.Services.GetService<ISerializerService>(), map);

var service = new AssetProvider(sessionId, storage, assetSource, remoteWorkspace.Services.GetService<ISerializerService>());
await service.SynchronizeSolutionAssetsAsync(await solution.State.GetChecksumAsync(CancellationToken.None), CancellationToken.None);
await service.SynchronizeSolutionAssetsAsync(await solution.CompilationState.GetChecksumAsync(CancellationToken.None), CancellationToken.None);

TestUtils.VerifyAssetStorage(map, storage);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public async Task TestRemoteHostSynchronize()
var remoteWorkpace = client.GetRemoteWorkspace();

Assert.Equal(
await solution.State.GetChecksumAsync(CancellationToken.None),
await remoteWorkpace.CurrentSolution.State.GetChecksumAsync(CancellationToken.None));
await solution.CompilationState.GetChecksumAsync(CancellationToken.None),
await remoteWorkpace.CurrentSolution.CompilationState.GetChecksumAsync(CancellationToken.None));
}

[Fact]
Expand Down Expand Up @@ -107,7 +107,7 @@ await client.TryInvokeAsync<IRemoteAssetSynchronizationService>(
private static async Task<AssetProvider> GetAssetProviderAsync(Workspace workspace, Workspace remoteWorkspace, Solution solution, Dictionary<Checksum, object> map = null)
{
// make sure checksum is calculated
await solution.State.GetChecksumAsync(CancellationToken.None);
await solution.CompilationState.GetChecksumAsync(CancellationToken.None);

map ??= new Dictionary<Checksum, object>();
await solution.AppendAssetMapAsync(map, CancellationToken.None);
Expand Down Expand Up @@ -140,7 +140,7 @@ await client.TryInvokeAsync<IRemoteDiagnosticAnalyzerService>(

// Ensure remote workspace is in sync with normal workspace.
var assetProvider = await GetAssetProviderAsync(workspace, remoteWorkspace, solution);
var solutionChecksum = await solution.State.GetChecksumAsync(CancellationToken.None);
var solutionChecksum = await solution.CompilationState.GetChecksumAsync(CancellationToken.None);
await remoteWorkspace.UpdatePrimaryBranchSolutionAsync(assetProvider, solutionChecksum, solution.WorkspaceVersion, CancellationToken.None);

var callback = new DesignerAttributeComputerCallback();
Expand Down Expand Up @@ -196,14 +196,14 @@ public async Task TestUnknownProject()

// No serializable remote options affect options checksum, so the checksums should match.
Assert.Equal(
await solution.State.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.State.GetChecksumAsync(CancellationToken.None));
await solution.CompilationState.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.CompilationState.GetChecksumAsync(CancellationToken.None));

solution = solution.RemoveProject(solution.ProjectIds.Single());

Assert.Equal(
await solution.State.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.State.GetChecksumAsync(CancellationToken.None));
await solution.CompilationState.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.CompilationState.GetChecksumAsync(CancellationToken.None));
}

[Theory]
Expand All @@ -225,24 +225,24 @@ public async Task TestRemoteHostSynchronizeIncrementalUpdate(bool applyInBatch)
await VerifyAssetStorageAsync(client, solution);

Assert.Equal(
await solution.State.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.State.GetChecksumAsync(CancellationToken.None));
await solution.CompilationState.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.CompilationState.GetChecksumAsync(CancellationToken.None));

// incrementally update
solution = await VerifyIncrementalUpdatesAsync(
workspace, remoteWorkspace, client, solution, applyInBatch, csAddition: " ", vbAddition: " ");

Assert.Equal(
await solution.State.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.State.GetChecksumAsync(CancellationToken.None));
await solution.CompilationState.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.CompilationState.GetChecksumAsync(CancellationToken.None));

// incrementally update
solution = await VerifyIncrementalUpdatesAsync(
workspace, remoteWorkspace, client, solution, applyInBatch, csAddition: "\r\nclass Addition { }", vbAddition: "\r\nClass VB\r\nEnd Class");

Assert.Equal(
await solution.State.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.State.GetChecksumAsync(CancellationToken.None));
await solution.CompilationState.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.CompilationState.GetChecksumAsync(CancellationToken.None));
}

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/52578")]
Expand Down Expand Up @@ -270,8 +270,8 @@ public async Task TestIncrementalUpdateHandlesReferenceReversal()
await VerifyAssetStorageAsync(client, solution);

Assert.Equal(
await solution.State.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.State.GetChecksumAsync(CancellationToken.None));
await solution.CompilationState.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.CompilationState.GetChecksumAsync(CancellationToken.None));

// reverse project references and incrementally update
solution = solution.RemoveProjectReference(projectId1, project1ToProject2);
Expand All @@ -281,8 +281,8 @@ await solution.State.GetChecksumAsync(CancellationToken.None),
await UpdatePrimaryWorkspace(client, solution);

Assert.Equal(
await solution.State.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.State.GetChecksumAsync(CancellationToken.None));
await solution.CompilationState.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.CompilationState.GetChecksumAsync(CancellationToken.None));

// reverse project references again and incrementally update
solution = solution.RemoveProjectReference(projectId2, project2ToProject1);
Expand All @@ -292,8 +292,8 @@ await solution.State.GetChecksumAsync(CancellationToken.None),
await UpdatePrimaryWorkspace(client, solution);

Assert.Equal(
await solution.State.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.State.GetChecksumAsync(CancellationToken.None));
await solution.CompilationState.GetChecksumAsync(CancellationToken.None),
await remoteWorkspace.CurrentSolution.CompilationState.GetChecksumAsync(CancellationToken.None));
}

[Fact]
Expand Down Expand Up @@ -750,8 +750,8 @@ async Task UpdateAndVerifyAsync()
remoteSolution = currentRemoteSolution;

Assert.Equal(
await solution.State.GetChecksumAsync(CancellationToken.None),
await remoteSolution.State.GetChecksumAsync(CancellationToken.None));
await solution.CompilationState.GetChecksumAsync(CancellationToken.None),
await remoteSolution.CompilationState.GetChecksumAsync(CancellationToken.None));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public async Task TestSolutionKeepsAssetPinned()
{
var workspace = new RemoteWorkspace(FeaturesTestCompositions.RemoteHost.GetHostServices());
var solution = workspace.CurrentSolution;
var checksums = await solution.State.GetStateChecksumsAsync(CancellationToken.None);
var checksums = await solution.CompilationState.GetStateChecksumsAsync(CancellationToken.None);

// Ensure the lazy has computed its value.
var storage = new SolutionAssetCache(
Expand Down
Loading
Loading