Resolve conflicts

dotnet · Apr 20, 2021 · 46ec3ee · jcouv · Apr 20, 2021 · jcouv
1 parent 9a64656
commit 46ec3ee
Show file tree

Hide file tree

Showing 10 changed files with 330 additions and 364 deletions.
diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberContainerSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberContainerSymbol.cs
@@ -3542,11 +3542,8 @@ private void AddSynthesizedRecordMembersIfNecessary(MembersAndInitializersBuilde
             addToStringMethod(printMembers);
 
             memberSignatures.Free();
-<<<<<<< HEAD
             fieldsByName.Free();
-=======
             memberNames.Free();
->>>>>>> dotnet/main
 
             // We put synthesized record members first so that errors about conflicts show up on user-defined members rather than all
             // going to the record declaration
@@ -3815,7 +3812,10 @@ ImmutableArray<Symbol> addProperties(ImmutableArray<ParameterSymbol> recordParam
                         && field.TypeWithAnnotations.Equals(param.TypeWithAnnotations, TypeCompareKind.AllIgnoreOptions))
                     {
                         Binder.CheckFeatureAvailability(syntax, MessageID.IDS_FeaturePositionalFieldsInRecords, diagnostics);
-                        existingOrAddedMembers.Add(field);
+                        if (!isInherited || checkMemberNotHidden(field, param))
+                        {
+                            existingOrAddedMembers.Add(field);
+                        }
                     }
                     else if (existingMember is PropertySymbol { IsStatic: false, GetMethod: { } } prop
                         && prop.TypeWithAnnotations.Equals(param.TypeWithAnnotations, TypeCompareKind.AllIgnoreOptions))

diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs
@@ -10667,13 +10667,15 @@ protected virtual bool PrintMembers(System.Text.StringBuilder builder)
                 Row(21, TableIndex.TypeRef, EditAndContinueOperation.Default),
                 Row(4, TableIndex.TypeSpec, EditAndContinueOperation.Default),
                 Row(3, TableIndex.StandAloneSig, EditAndContinueOperation.Default),
-                Row(10, TableIndex.MethodDef, EditAndContinueOperation.Default)); // R.PrintMembers
+                Row(10, TableIndex.MethodDef, EditAndContinueOperation.Default), // R.PrintMembers
+                Row(24, TableIndex.CustomAttribute, EditAndContinueOperation.Default));
 
             CheckEncMap(reader1,
                 Handle(19, TableIndex.TypeRef),
                 Handle(20, TableIndex.TypeRef),
                 Handle(21, TableIndex.TypeRef),
                 Handle(10, TableIndex.MethodDef),
+                Handle(24, TableIndex.CustomAttribute),
                 Handle(3, TableIndex.StandAloneSig),
                 Handle(4, TableIndex.TypeSpec),
                 Handle(2, TableIndex.AssemblyRef));