Merge pull request #36314 from sharwell/private-protected

Update default naming styles to support 'private protected'

src/VisualStudio/Core/Test/Options/BasicEditorConfigGeneratorTests.vb

@@ -109,15 +109,15 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
 # Symbol specifications
 
 dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, friend, private, protected, protected_friend
+dotnet_naming_symbols.interface.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
 dotnet_naming_symbols.interface.required_modifiers = 
 
 dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.types.applicable_accessibilities = public, friend, private, protected, protected_friend
+dotnet_naming_symbols.types.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
 dotnet_naming_symbols.types.required_modifiers = 
 
 dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
-dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, friend, private, protected, protected_friend
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
 dotnet_naming_symbols.non_field_members.required_modifiers = 
 
 # Naming styles
@@ -236,15 +236,15 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
 # Symbol specifications
 
 dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, friend, private, protected, protected_friend
+dotnet_naming_symbols.interface.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
 dotnet_naming_symbols.interface.required_modifiers = 
 
 dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.types.applicable_accessibilities = public, friend, private, protected, protected_friend
+dotnet_naming_symbols.types.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
 dotnet_naming_symbols.types.required_modifiers = 
 
 dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
-dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, friend, private, protected, protected_friend
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
 dotnet_naming_symbols.non_field_members.required_modifiers = 
 
 # Naming styles

src/VisualStudio/Core/Test/Options/CSharpEditorConfigGeneratorTests.vb

@@ -190,15 +190,15 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
 # Symbol specifications
 
 dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
 dotnet_naming_symbols.interface.required_modifiers = 
 
 dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
 dotnet_naming_symbols.types.required_modifiers = 
 
 dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
-dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
 dotnet_naming_symbols.non_field_members.required_modifiers = 
 
 # Naming styles
@@ -399,15 +399,15 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
 # Symbol specifications
 
 dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
 dotnet_naming_symbols.interface.required_modifiers = 
 
 dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
 dotnet_naming_symbols.types.required_modifiers = 
 
 dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
-dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
 dotnet_naming_symbols.non_field_members.required_modifiers = 
 
 # Naming styles

src/Workspaces/Core/Portable/NamingStyles/Serialization/NamingStylePreferences.cs

@@ -117,6 +117,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList />
     </SymbolSpecification>
@@ -130,6 +131,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList />
     </SymbolSpecification>
@@ -143,6 +145,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList />
     </SymbolSpecification>
@@ -156,6 +159,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList />
     </SymbolSpecification>
@@ -169,6 +173,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList />
     </SymbolSpecification>
@@ -182,6 +187,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList />
     </SymbolSpecification>
@@ -213,6 +219,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList>
         <ModifierKind>IsAbstract</ModifierKind>
@@ -228,6 +235,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList>
         <ModifierKind>IsStatic</ModifierKind>
@@ -243,6 +251,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList />
     </SymbolSpecification>
@@ -266,6 +275,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList>
         <ModifierKind>IsStatic</ModifierKind>
@@ -278,6 +288,7 @@ public override int GetHashCode()
       <ApplicableAccessibilityList>
         <AccessibilityKind>Internal</AccessibilityKind>
         <AccessibilityKind>Private</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList />
     </SymbolSpecification>
@@ -288,6 +299,7 @@ public override int GetHashCode()
       <ApplicableAccessibilityList>
         <AccessibilityKind>Internal</AccessibilityKind>
         <AccessibilityKind>Private</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList>
         <ModifierKind>IsStatic</ModifierKind>
@@ -306,6 +318,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList />
     </SymbolSpecification>
@@ -321,6 +334,7 @@ public override int GetHashCode()
         <AccessibilityKind>Private</AccessibilityKind>
         <AccessibilityKind>Protected</AccessibilityKind>
         <AccessibilityKind>ProtectedOrInternal</AccessibilityKind>
+        <AccessibilityKind>ProtectedAndInternal</AccessibilityKind>
       </ApplicableAccessibilityList>
       <RequiredModifierList />
     </SymbolSpecification>