Fix declaration matching for ambiguous QMNs. Ref #4814

comintern · comintern · commit b2f644f29379 · 2019-02-26T17:39:46.000-06:00
diff --git a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerItemViewModel.cs b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerItemViewModel.cs
@@ -43,7 +43,8 @@ public virtual void Synchronize(ref List<Declaration> updated)
 
             var matching = updated.FirstOrDefault(decl =>
                 Declaration.DeclarationType == decl?.DeclarationType &&
-                Declaration.QualifiedName.Equals(decl.QualifiedName));
+                Declaration.QualifiedName.Equals(decl.QualifiedName) &&
+                (Declaration.ParentDeclaration is null || Declaration.ParentDeclaration.QualifiedName.Equals(decl.ParentDeclaration?.QualifiedName)));
 
             if (matching is null)
             {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ public virtual void Synchronize(ref List<Declaration> updated)`
`43`	`43`
`44`	`44`	`var matching = updated.FirstOrDefault(decl =>`
`45`	`45`	`Declaration.DeclarationType == decl?.DeclarationType &&`
`46`		`- Declaration.QualifiedName.Equals(decl.QualifiedName));`
	`46`	`+ Declaration.QualifiedName.Equals(decl.QualifiedName) &&`
	`47`	`+ (Declaration.ParentDeclaration is null \|\| Declaration.ParentDeclaration.QualifiedName.Equals(decl.ParentDeclaration?.QualifiedName)));`
`47`	`48`
`48`	`49`	`if (matching is null)`
`49`	`50`	`{`