Snapshot tracks only visible unresolved items #4980
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Allowing non-visible items to turn this flag 'true' can produce a "Dependencies" node with a warning icon but no children with a corresponding warning to drill into.
drewnoakes
added
the
Feature-Dependency-Node
drewnoakes
commented
Jul 2, 2019
| ""Id"": ""tfm1\\yyy\\dependencyExisting"", | ||
| ""Name"":""dependencyExisting"", | ||
| ""Caption"":""DependencyExisting"", | ||
| ""HasUnresolvedDependency"":""false"", |
There was a problem hiding this comment.
This change gets rid of HasUnresolvedDependency, which isn't even on IDependency. For this simple test type I prefer the strongly typed approach.
| @@ -78,7 +78,7 @@ internal sealed class DependenciesTreeViewProvider : IDependenciesTreeViewProvid | |||
|
|
|||
| dependenciesTree = CleanupOldNodes(dependenciesTree, currentTopLevelNodes); | |||
|
|
|||
| ProjectImageMoniker rootIcon = _viewModelFactory.GetDependenciesRootIcon(snapshot.HasUnresolvedDependency).ToProjectSystemType(); | |||
| ProjectImageMoniker rootIcon = _viewModelFactory.GetDependenciesRootIcon(snapshot.HasVisibleUnresolvedDependency).ToProjectSystemType(); | |||
There was a problem hiding this comment.
This is where the icon is determined at the root level. This PR means only visible and unresolved descendents of the root can cause the root to have a yellow triangle.
| @@ -438,7 +438,7 @@ private void OnDependenciesSnapshotChanged(object sender, SnapshotChangedEventAr | |||
| { | |||
| dependenciesNode = await viewProvider.BuildTreeAsync(dependenciesNode, snapshot, cancellationToken); | |||
|
|
|||
| await _treeTelemetryService.ObserveTreeUpdateCompletedAsync(snapshot.HasUnresolvedDependency); | |||
| await _treeTelemetryService.ObserveTreeUpdateCompletedAsync(snapshot.HasVisibleUnresolvedDependency); | |||
There was a problem hiding this comment.
Note that this change will impact telemetry, in keeping with what's presented on screen.
| @@ -183,9 +183,9 @@ void Add(AddDependencyContext context, IDependencyModel dependencyModel) | |||
| string.Equals(id, dependency.Id), | |||
| "dependenciesWorld dictionary entry keys must match their value's ids."); | |||
|
|
|||
| if (!dependency.Resolved) | |||
| if (!dependency.Resolved && dependency.Visible) | |||
There was a problem hiding this comment.
Here is the additional constraint.
davidwengier
approved these changes
Jul 2, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allowing non-visible items to turn this flag 'true' can produce a "Dependencies" node with a warning icon, but no children with a corresponding warning to drill into.
Relates to #4362.