Filter symbol first before creating InheritanceMargin target

src/EditorFeatures/Test/InheritanceMargin/InheritanceMarginTests.cs

@@ -124,6 +124,7 @@ private static async Task VerifyTestMemberInDocumentAsync(
 
         private static async Task VerifyInheritanceMemberAsync(TestWorkspace testWorkspace, TestInheritanceMemberItem expectedItem, InheritanceMarginItem actualItem)
         {
+            Assert.True(!actualItem.TargetItems.IsEmpty);
             Assert.Equal(expectedItem.LineNumber, actualItem.LineNumber);
             Assert.Equal(expectedItem.MemberName, actualItem.DisplayTexts.JoinText());
             Assert.Equal(expectedItem.Targets.Length, actualItem.TargetItems.Length);
@@ -2279,5 +2280,21 @@ public class {|target3:Bar|}
                 new[] { itemForIBar, itemForBarInMarkup2 },
                 testHost);
         }
+
+        [Theory, CombinatorialData]
+        public async Task TestHiddenLocationSymbol(TestHost testHost)
+        {
+            await VerifyNoItemForDocumentAsync(@"
+public class {|target2:B|} : C
+{
+}
+
+#line hidden
+public class {|target1:C|}
+{
+}",
+                LanguageNames.CSharp,
+                testHost);
+        }
     }
 }

src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.IO;
@@ -382,7 +383,7 @@ private static async ValueTask AddInheritanceMemberItemsForMembersAsync(
             }
         }
 
-        private static async ValueTask<InheritanceMarginItem> CreateInheritanceMemberItemForInterfaceAsync(
+        private static async ValueTask<InheritanceMarginItem?> CreateInheritanceMemberItemForInterfaceAsync(
             Solution solution,
             INamedTypeSymbol interfaceSymbol,
             int lineNumber,
@@ -392,7 +393,6 @@ private static async ValueTask<InheritanceMarginItem> CreateInheritanceMemberIte
         {
             var baseSymbolItems = await baseSymbols
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
-                .WhereAsArray(IsNavigableSymbol)
                 .Distinct()
                 .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
                     solution,
@@ -403,23 +403,25 @@ private static async ValueTask<InheritanceMarginItem> CreateInheritanceMemberIte
 
             var derivedTypeItems = await derivedTypesSymbols
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
-                .WhereAsArray(IsNavigableSymbol)
                 .Distinct()
                 .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(solution,
                     symbol,
                     InheritanceRelationship.ImplementingType,
                     cancellationToken), cancellationToken)
                 .ConfigureAwait(false);
 
+            var nonNullBaseSymbolItems = GetNonNullTargetItems(baseSymbolItems);
+            var nonNullDerivedTypeItems = GetNonNullTargetItems(derivedTypeItems);
+
             return InheritanceMarginItem.CreateOrdered(
                 lineNumber,
                 topLevelDisplayText: null,
                 FindUsagesHelpers.GetDisplayParts(interfaceSymbol),
                 interfaceSymbol.GetGlyph(),
-                baseSymbolItems.Concat(derivedTypeItems));
+                nonNullBaseSymbolItems.Concat(nonNullDerivedTypeItems));
         }
 
-        private static async ValueTask<InheritanceMarginItem> CreateInheritanceMemberItemForInterfaceMemberAsync(
+        private static async ValueTask<InheritanceMarginItem?> CreateInheritanceMemberItemForInterfaceMemberAsync(
             Solution solution,
             ISymbol memberSymbol,
             int lineNumber,
@@ -428,23 +430,23 @@ private static async ValueTask<InheritanceMarginItem> CreateInheritanceMemberIte
         {
             var implementedMemberItems = await implementingMembers
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
-                .WhereAsArray(IsNavigableSymbol)
                 .Distinct()
                 .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
                     solution,
                     symbol,
                     InheritanceRelationship.ImplementingMember,
                     cancellationToken), cancellationToken).ConfigureAwait(false);
 
+            var nonNullImplementedMemberItems = GetNonNullTargetItems(implementedMemberItems);
             return InheritanceMarginItem.CreateOrdered(
                 lineNumber,
                 topLevelDisplayText: null,
                 FindUsagesHelpers.GetDisplayParts(memberSymbol),
                 memberSymbol.GetGlyph(),
-                implementedMemberItems);
+                nonNullImplementedMemberItems);
         }
 
-        private static async ValueTask<InheritanceMarginItem> CreateInheritanceItemForClassAndStructureAsync(
+        private static async ValueTask<InheritanceMarginItem?> CreateInheritanceItemForClassAndStructureAsync(
             Solution solution,
             INamedTypeSymbol memberSymbol,
             int lineNumber,
@@ -456,7 +458,6 @@ private static async ValueTask<InheritanceMarginItem> CreateInheritanceItemForCl
             // and if it is an class/struct, it whould be shown as 'Base Type'
             var baseSymbolItems = await baseSymbols
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
-                .WhereAsArray(IsNavigableSymbol)
                 .Distinct()
                 .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
                     solution,
@@ -466,23 +467,25 @@ private static async ValueTask<InheritanceMarginItem> CreateInheritanceItemForCl
 
             var derivedTypeItems = await derivedTypesSymbols
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
-                .WhereAsArray(IsNavigableSymbol)
                 .Distinct()
                 .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(solution,
                     symbol,
                     InheritanceRelationship.DerivedType,
                     cancellationToken), cancellationToken)
                 .ConfigureAwait(false);
 
+            var nonNullBaseSymbolItems = GetNonNullTargetItems(baseSymbolItems);
+            var nonNullDerivedTypeItems = GetNonNullTargetItems(derivedTypeItems);
+
             return InheritanceMarginItem.CreateOrdered(
                 lineNumber,
                 topLevelDisplayText: null,
                 FindUsagesHelpers.GetDisplayParts(memberSymbol),
                 memberSymbol.GetGlyph(),
-                baseSymbolItems.Concat(derivedTypeItems));
+                nonNullBaseSymbolItems.Concat(nonNullDerivedTypeItems));
         }
 
-        private static async ValueTask<InheritanceMarginItem> CreateInheritanceMemberItemForClassOrStructMemberAsync(
+        private static async ValueTask<InheritanceMarginItem?> CreateInheritanceMemberItemForClassOrStructMemberAsync(
             Solution solution,
             ISymbol memberSymbol,
             int lineNumber,
@@ -493,17 +496,15 @@ private static async ValueTask<InheritanceMarginItem> CreateInheritanceMemberIte
         {
             var implementedMemberItems = await implementedMembers
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
-                .WhereAsArray(IsNavigableSymbol)
                 .Distinct()
                 .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
                     solution,
                     symbol,
                     InheritanceRelationship.ImplementedMember,
                     cancellationToken), cancellationToken).ConfigureAwait(false);
 
-            var overridenMemberItems = await overriddenMembers
+            var overriddenMemberItems = await overriddenMembers
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
-                .WhereAsArray(IsNavigableSymbol)
                 .Distinct()
                 .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
                     solution,
@@ -513,23 +514,26 @@ private static async ValueTask<InheritanceMarginItem> CreateInheritanceMemberIte
 
             var overridingMemberItems = await overridingMembers
                 .SelectAsArray(symbol => symbol.OriginalDefinition)
-                .WhereAsArray(IsNavigableSymbol)
                 .Distinct()
                 .SelectAsArrayAsync((symbol, _) => CreateInheritanceItemAsync(
                     solution,
                     symbol,
                     InheritanceRelationship.OverridingMember,
                     cancellationToken), cancellationToken).ConfigureAwait(false);
 
+            var nonNullImplementedMemberItems = GetNonNullTargetItems(implementedMemberItems);
+            var nonNullOverriddenMemberItems = GetNonNullTargetItems(overriddenMemberItems);
+            var nonNullOverridingMemberItems = GetNonNullTargetItems(overridingMemberItems);
+
             return InheritanceMarginItem.CreateOrdered(
                 lineNumber,
                 topLevelDisplayText: null,
                 FindUsagesHelpers.GetDisplayParts(memberSymbol),
                 memberSymbol.GetGlyph(),
-                implementedMemberItems.Concat(overridenMemberItems).Concat(overridingMemberItems));
+                nonNullImplementedMemberItems.Concat(nonNullOverriddenMemberItems).Concat(nonNullOverridingMemberItems));
         }
 
-        private static async ValueTask<InheritanceTargetItem> CreateInheritanceItemAsync(
+        private static async ValueTask<InheritanceTargetItem?> CreateInheritanceItemAsync(
             Solution solution,
             ISymbol targetSymbol,
             InheritanceRelationship inheritanceRelationship,
@@ -540,6 +544,10 @@ private static async ValueTask<InheritanceTargetItem> CreateInheritanceItemAsync
 
             // Right now the targets are not shown in a classified way.
             var definition = ToSlimDefinitionItem(targetSymbol, solution);
+            if (definition == null)
+            {
+                return null;
+            }
 
             var displayName = targetSymbol.ToDisplayString(s_displayFormat);
 
@@ -689,9 +697,8 @@ private static async Task<ImmutableArray<INamedTypeSymbol>> GetDerivedTypesAndIm
         /// Otherwise, create the full non-classified DefinitionItem. Because in such case we want to display all the locations to the user
         /// by reusing the FAR window.
         /// </summary>
-        private static DefinitionItem ToSlimDefinitionItem(ISymbol symbol, Solution solution)
+        private static DefinitionItem? ToSlimDefinitionItem(ISymbol symbol, Solution solution)
         {
-            RoslynDebug.Assert(IsNavigableSymbol(symbol));
             var locations = symbol.Locations;
             if (locations.Length > 1)
             {
@@ -728,19 +735,21 @@ private static DefinitionItem ToSlimDefinitionItem(ISymbol symbol, Solution solu
                 }
             }
 
-            throw ExceptionUtilities.Unreachable;
+            return null;
         }
 
-        private static bool IsNavigableSymbol(ISymbol symbol)
+        private static ImmutableArray<InheritanceTargetItem> GetNonNullTargetItems(ImmutableArray<InheritanceTargetItem?> inheritanceTargetItems)
         {
-            var locations = symbol.Locations;
-            if (locations.Length == 1)
+            using var _ = ArrayBuilder<InheritanceTargetItem>.GetInstance(out var builder);
+            foreach (var item in inheritanceTargetItems)
             {
-                var location = locations[0];
-                return location.IsInMetadata || (location.IsInSource && location.IsVisibleSourceLocation());
+                if (item.HasValue)
+                {
+                    builder.Add(item.Value);
+                }
             }
 
-            return !locations.IsEmpty;
+            return builder.ToImmutable();
         }
     }
 }

src/Features/Core/Portable/InheritanceMargin/InheritanceMarginItem.cs

@@ -58,15 +58,13 @@ public InheritanceMarginItem(
             TargetItems = targetItems;
         }
 
-        public static InheritanceMarginItem CreateOrdered(
+        public static InheritanceMarginItem? CreateOrdered(
             int lineNumber,
             string? topLevelDisplayText,
             ImmutableArray<TaggedText> displayTexts,
             Glyph glyph,
             ImmutableArray<InheritanceTargetItem> targetItems)
-        {
-            return new(lineNumber, topLevelDisplayText, displayTexts, glyph, Order(targetItems));
-        }
+            => targetItems.IsEmpty ? null : new(lineNumber, topLevelDisplayText, displayTexts, glyph, Order(targetItems));
 
         public static ImmutableArray<InheritanceTargetItem> Order(ImmutableArray<InheritanceTargetItem> targetItems)
             => targetItems.OrderBy(t => t.DisplayName).ThenByDescending(t => t.LanguageGlyph).ThenBy(t => t.ProjectName ?? "").ToImmutableArray();