Allow access modifiers to auto properties getters and setters

docs/release-notes/.FSharp.Compiler.Service/8.0.300.md

@@ -18,6 +18,7 @@
 * Higher-order-function-based API for working with the untyped abstract syntax tree. ([PR #16462](https://github.com/dotnet/fsharp/pull/16462))
 * Allow returning bool instead of unit option for partial active patterns. ([Language suggestion #1041](https://github.com/fsharp/fslang-suggestions/issues/1041), [PR #16473](https://github.com/dotnet/fsharp/pull/16473))
 * Symbols: Add GenericArguments to FSharpEntity ([PR #16470](https://github.com/dotnet/fsharp/pull/16470))
+* Allow access modifies to auto properties getters and setters ([PR 16687](https://github.com/dotnet/fsharp/pull/16687), [Language suggestion #430](https://github.com/fsharp/fslang-suggestions/issues/430))
 
 ### Changed
 

docs/release-notes/.Language/preview.md

@@ -4,6 +4,7 @@
 * Bidirectional F#/C# interop for 'unmanaged' constraint. ([PR #12154](https://github.com/dotnet/fsharp/pull/12154))
 * Make `.Is*` discriminated union properties visible. ([Language suggestion #222](https://github.com/fsharp/fslang-suggestions/issues/222), [PR #16341](https://github.com/dotnet/fsharp/pull/16341))
 * Allow returning bool instead of unit option for partial active patterns. ([Language suggestion #1041](https://github.com/fsharp/fslang-suggestions/issues/1041), [PR #16473](https://github.com/dotnet/fsharp/pull/16473))
+* Allow access modifies to auto properties getters and setters ([PR 16687](https://github.com/dotnet/fsharp/pull/16687), [Language suggestion #430](https://github.com/fsharp/fslang-suggestions/issues/430))
 
 ### Fixed
 

src/Compiler/Checking/CheckDeclarations.fs

@@ -4342,7 +4342,7 @@ module TcDeclarations =
         let rec postAutoProps memb =
             match memb with 
             | SynMemberDefn.AutoProperty(ident = id) when String.IsNullOrEmpty(id.idText) -> []
-            | SynMemberDefn.AutoProperty(attributes=Attributes attribs; isStatic=isStatic; ident=id; typeOpt=tyOpt; propKind=propKind; memberFlags=memberFlags; memberFlagsForSet=memberFlagsForSet; xmlDoc=xmlDoc; accessibility=access; trivia = { GetSetKeywords = mGetSetOpt }) ->
+            | SynMemberDefn.AutoProperty(attributes=Attributes attribs; isStatic=isStatic; ident=id; typeOpt=tyOpt; propKind=propKind; memberFlags=memberFlags; memberFlagsForSet=memberFlagsForSet; xmlDoc=xmlDoc; trivia = { GetSetKeywords = mGetSetOpt }; getterAccessibility = getterAccesss; setterAccessibility = setterAccess) ->
                 let mMemberPortion = id.idRange
                 // Only the keep the non-field-targeted attributes
                 let attribs = attribs |> List.filter (fun a -> match a.Target with Some t when t.idText = "field" -> false | _ -> true)
@@ -4365,7 +4365,7 @@ module TcDeclarations =
                             let rhsExpr = SynExpr.Ident fldId
                             let retInfo = match tyOpt with None -> None | Some ty -> Some (None, SynReturnInfo((ty, SynInfo.unnamedRetVal), ty.Range))
                             let attribs = mkAttributeList attribs mMemberPortion
-                            let binding = mkSynBinding (xmlDoc, headPat) (access, false, false, mMemberPortion, DebugPointAtBinding.NoneAtInvisible, retInfo, rhsExpr, rhsExpr.Range, [], attribs, Some memberFlags, SynBindingTrivia.Zero)
+                            let binding = mkSynBinding (xmlDoc, headPat) (getterAccesss, false, false, mMemberPortion, DebugPointAtBinding.NoneAtInvisible, retInfo, rhsExpr, rhsExpr.Range, [], attribs, Some memberFlags, SynBindingTrivia.Zero)
                             SynMemberDefn.Member (binding, mMemberPortion) 
                         yield getter
                     | _ -> ()
@@ -4377,7 +4377,7 @@ module TcDeclarations =
                             let vId = ident("v", mMemberPortion)
                             let headPat = SynPat.LongIdent (SynLongIdent(headPatIds, [], List.replicate headPatIds.Length None), None, Some noInferredTypars, SynArgPats.Pats [mkSynPatVar None vId], None, mMemberPortion)
                             let rhsExpr = mkSynAssign (SynExpr.Ident fldId) (SynExpr.Ident vId)
-                            let binding = mkSynBinding (xmlDoc, headPat) (access, false, false, mMemberPortion, DebugPointAtBinding.NoneAtInvisible, None, rhsExpr, rhsExpr.Range, [], [], Some memberFlagsForSet, SynBindingTrivia.Zero)
+                            let binding = mkSynBinding (xmlDoc, headPat) (setterAccess, false, false, mMemberPortion, DebugPointAtBinding.NoneAtInvisible, None, rhsExpr, rhsExpr.Range, [], [], Some memberFlagsForSet, SynBindingTrivia.Zero)
                             SynMemberDefn.Member (binding, mMemberPortion)
                         yield setter 
                     | _ -> ()]

src/Compiler/FSComp.txt

@@ -1742,4 +1742,5 @@ featureReuseSameFieldsInStructUnions,"Share underlying fields in a [<Struct>] di
 3862,parsStaticMemberImcompleteSyntax,"Incomplete declaration of a static construct. Use 'static let','static do','static member' or 'static val' for declaration."
 3863,parsExpectingField,"Expecting record field"
 3864,tooManyMethodsInDotNetTypeWritingAssembly,"The type '%s' has too many methods. Found: '%d', maximum: '%d'"
-3865,parsOnlySimplePatternsAreAllowedInConstructors,"Only simple patterns are allowed in primary constructors"
+3865,parsOnlySimplePatternsAreAllowedInConstructors,"Only simple patterns are allowed in primary constructors"
+featureAllowAccessModifiersToAutoPropertiesGettersAndSetters,"Allow access modifiers to auto properties getters and setters"

src/Compiler/Facilities/LanguageFeatures.fs

@@ -85,6 +85,7 @@ type LanguageFeature =
     | WarningIndexedPropertiesGetSetSameType
     | WarningWhenTailCallAttrOnNonRec
     | BooleanReturningAndReturnTypeDirectedPartialActivePattern
+    | AllowAccessModifiersToAutoPropertiesGettersAndSetters
 
 /// LanguageVersion management
 type LanguageVersion(versionText) =
@@ -197,6 +198,7 @@ type LanguageVersion(versionText) =
                 LanguageFeature.WarningWhenTailCallAttrOnNonRec, previewVersion
                 LanguageFeature.UnionIsPropertiesVisible, previewVersion
                 LanguageFeature.BooleanReturningAndReturnTypeDirectedPartialActivePattern, previewVersion
+                LanguageFeature.AllowAccessModifiersToAutoPropertiesGettersAndSetters, previewVersion
             ]
 
     static let defaultLanguageVersion = LanguageVersion("default")
@@ -340,6 +342,8 @@ type LanguageVersion(versionText) =
         | LanguageFeature.WarningWhenTailCallAttrOnNonRec -> FSComp.SR.featureChkTailCallAttrOnNonRec ()
         | LanguageFeature.BooleanReturningAndReturnTypeDirectedPartialActivePattern ->
             FSComp.SR.featureBooleanReturningAndReturnTypeDirectedPartialActivePattern ()
+        | LanguageFeature.AllowAccessModifiersToAutoPropertiesGettersAndSetters ->
+            FSComp.SR.featureAllowAccessModifiersToAutoPropertiesGettersAndSetters ()
 
     /// Get a version string associated with the given feature.
     static member GetFeatureVersionString feature =

src/Compiler/Facilities/LanguageFeatures.fsi

@@ -76,6 +76,7 @@ type LanguageFeature =
     | WarningIndexedPropertiesGetSetSameType
     | WarningWhenTailCallAttrOnNonRec
     | BooleanReturningAndReturnTypeDirectedPartialActivePattern
+    | AllowAccessModifiersToAutoPropertiesGettersAndSetters
 
 /// LanguageVersion management
 type LanguageVersion =

src/Compiler/Service/ServiceNavigation.fs

@@ -332,9 +332,10 @@ module NavigationImpl =
                          [
                              createMember (rcid, NavigationItemKind.Field, FSharpGlyph.Field, range, enclosingEntityKind, false, access)
                          ]
-                     | SynMemberDefn.AutoProperty(ident = id; accessibility = access) ->
+                     | SynMemberDefn.AutoProperty(ident = id; getterAccessibility = getterAccessibility; setterAccessibility = setterAccessibility) ->
                          [
-                             createMember (id, NavigationItemKind.Field, FSharpGlyph.Field, id.idRange, enclosingEntityKind, false, access)
+                             createMember (id, NavigationItemKind.Field, FSharpGlyph.Field, id.idRange, enclosingEntityKind, false, getterAccessibility)
+                             createMember (id, NavigationItemKind.Field, FSharpGlyph.Field, id.idRange, enclosingEntityKind, false, setterAccessibility)
                          ]
                      | SynMemberDefn.AbstractSlot(slotSig = SynValSig(ident = SynIdent(id, _); synType = ty; accessibility = access)) ->
                          [

src/Compiler/SyntaxTree/ParseHelpers.fs

@@ -1100,7 +1100,7 @@ let mkSynUnionCase attributes (access: SynAccess option) id kind mDecl (xmlDoc,
     let mDecl = unionRangeWithXmlDoc xmlDoc mDecl
     SynUnionCase(attributes, id, kind, xmlDoc, None, mDecl, trivia)
 
-let mkAutoPropDefn mVal access ident typ mEquals (expr: SynExpr) accessors xmlDoc attribs flags rangeStart =
+let mkAutoPropDefn mVal access ident typ mEquals (expr: SynExpr) accessors xmlDoc attribs flags rangeStart langVersion =
     let mWith, (getSet, getSetOpt) = accessors
 
     let memberRange =
@@ -1117,6 +1117,24 @@ let mkAutoPropDefn mVal access ident typ mEquals (expr: SynExpr) accessors xmlDo
     let memberFlagsForSet = flags SynMemberKind.PropertySet
     let isStatic = not memberFlags.IsInstance
 
+    let getterAccess, setterAccess =
+        match access, getSetOpt with
+        | Some _, Some(GetSetKeywords.GetSet(_, None, _, None)) -> access, access
+        | Some _, Some(GetSetKeywords.GetSet(_, Some x, _, _))
+        | Some _, Some(GetSetKeywords.GetSet(_, _, _, Some x)) ->
+            raiseParseErrorAt x.Range (FSComp.SR.parsMultipleAccessibilitiesForGetSet ())
+        | None, Some(GetSetKeywords.GetSet(_, getterAccess, _, setterAccess)) ->
+            match getterAccess, setterAccess with
+            | Some x, _
+            | _, Some x ->
+                checkLanguageFeatureError langVersion LanguageFeature.AllowAccessModifiersToAutoPropertiesGettersAndSetters x.Range
+            | None, None -> ()
+
+            getterAccess, setterAccess
+        | _, Some(GetSetKeywords.Get _) -> access, None
+        | _, Some(GetSetKeywords.Set _) -> None, access
+        | _ -> None, None
+
     let trivia =
         {
             LeadingKeyword = leadingKeyword
@@ -1135,6 +1153,8 @@ let mkAutoPropDefn mVal access ident typ mEquals (expr: SynExpr) accessors xmlDo
         memberFlagsForSet,
         xmlDoc,
         access,
+        getterAccess,
+        setterAccess,
         expr,
         memberRange,
         trivia

src/Compiler/SyntaxTree/ParseHelpers.fsi

@@ -277,6 +277,7 @@ val mkAutoPropDefn:
         attribs: SynAttributes ->
         flags: (SynMemberKind -> SynMemberFlags) * SynLeadingKeyword ->
             rangeStart: range ->
+            langVersion: LanguageVersion ->
                 SynMemberDefn
 
 val mkValField:

src/Compiler/SyntaxTree/SyntaxTree.fs

@@ -221,6 +221,47 @@ type SynAccess =
         | Internal m
         | Private m -> m
 
+[<NoEquality; NoComparison>]
+type GetSetKeywords =
+    | Get of range
+    | Set of range
+    | GetSet of get: range * getterAccess: SynAccess option * set: range * setterAccess: SynAccess option
+
+    member x.Range =
+        match x with
+        | Get m
+        | Set m -> m
+        | GetSet(mG, _, mS, _) ->
+            if Range.rangeBeforePos mG mS.Start then
+                Range.unionRanges mG mS
+            else
+                Range.unionRanges mS mG
+
+[<NoEquality; NoComparison>]
+type SynMemberDefnAutoPropertyTrivia =
+    {
+        LeadingKeyword: SynLeadingKeyword
+        WithKeyword: range option
+        EqualsRange: range option
+        GetSetKeywords: GetSetKeywords option
+    }
+
+[<NoEquality; NoComparison>]
+type SynMemberDefnAbstractSlotTrivia =
+    {
+        GetSetKeywords: GetSetKeywords option
+    }
+
+    static member Zero = { GetSetKeywords = None }
+
+[<NoEquality; NoComparison>]
+type SynMemberSigMemberTrivia =
+    {
+        GetSetKeywords: GetSetKeywords option
+    }
+
+    static member Zero: SynMemberSigMemberTrivia = { GetSetKeywords = None }
+
 [<RequireQualifiedAccess>]
 type DebugPointAtTarget =
     | Yes
@@ -1463,6 +1504,8 @@ type SynMemberDefn =
         memberFlagsForSet: SynMemberFlags *
         xmlDoc: PreXmlDoc *
         accessibility: SynAccess option *
+        getterAccessibility: SynAccess option *
+        setterAccessibility: SynAccess option *
         synExpr: SynExpr *
         range: range *
         trivia: SynMemberDefnAutoPropertyTrivia

src/Compiler/SyntaxTree/SyntaxTree.fsi

@@ -242,6 +242,52 @@ type SynAccess =
 
     member Range: range
 
+/// Represents additional information for `get, set` syntax
+[<NoEquality; NoComparison; RequireQualifiedAccess>]
+type GetSetKeywords =
+    | Get of range
+    | Set of range
+    | GetSet of get: range * getterAccess: SynAccess option * set: range * setterAccess: SynAccess option
+
+    member Range: range
+
+/// Represents additional information for SynMemberDefn.AutoProperty
+[<NoEquality; NoComparison>]
+type SynMemberDefnAutoPropertyTrivia =
+    {
+        /// Used leading keyword of AutoProperty
+        LeadingKeyword: SynLeadingKeyword
+
+        /// The syntax range of the `with` keyword
+        WithKeyword: range option
+
+        /// The syntax range of the `=` token
+        EqualsRange: range option
+
+        /// The syntax range of 'get, set'
+        GetSetKeywords: GetSetKeywords option
+    }
+
+///  Represents additional information for SynMemberDefn.AbstractSlot
+[<NoEquality; NoComparison>]
+type SynMemberDefnAbstractSlotTrivia =
+    {
+        /// The syntax range of 'get, set'
+        GetSetKeywords: GetSetKeywords option
+    }
+
+    static member Zero: SynMemberDefnAbstractSlotTrivia
+
+/// Represents additional information for SynMemberSig.Member
+[<NoEquality; NoComparison>]
+type SynMemberSigMemberTrivia =
+    {
+        /// The syntax range of 'get, set'
+        GetSetKeywords: GetSetKeywords option
+    }
+
+    static member Zero: SynMemberSigMemberTrivia
+
 /// Represents whether a debug point should be present for the target
 /// of a decision tree, that is whether the construct corresponds to a debug
 /// point in the original source.
@@ -1656,6 +1702,8 @@ type SynMemberDefn =
         memberFlagsForSet: SynMemberFlags *
         xmlDoc: PreXmlDoc *
         accessibility: SynAccess option *
+        getterAccessibility: SynAccess option *
+        setterAccessibility: SynAccess option *
         synExpr: SynExpr *
         range: range *
         trivia: SynMemberDefnAutoPropertyTrivia

src/Compiler/SyntaxTree/SyntaxTrivia.fs

@@ -346,39 +346,6 @@ type SynMemberDefnImplicitCtorTrivia = { AsKeyword: range option }
 [<NoEquality; NoComparison>]
 type SynArgPatsNamePatPairsTrivia = { ParenRange: range }
 
-[<NoEquality; NoComparison>]
-type GetSetKeywords =
-    | Get of range
-    | Set of range
-    | GetSet of get: range * set: range
-
-    member x.Range =
-        match x with
-        | Get m
-        | Set m -> m
-        | GetSet(mG, mS) ->
-            if Range.rangeBeforePos mG mS.Start then
-                Range.unionRanges mG mS
-            else
-                Range.unionRanges mS mG
-
-[<NoEquality; NoComparison>]
-type SynMemberDefnAutoPropertyTrivia =
-    {
-        LeadingKeyword: SynLeadingKeyword
-        WithKeyword: range option
-        EqualsRange: range option
-        GetSetKeywords: GetSetKeywords option
-    }
-
-[<NoEquality; NoComparison>]
-type SynMemberDefnAbstractSlotTrivia =
-    {
-        GetSetKeywords: GetSetKeywords option
-    }
-
-    static member Zero = { GetSetKeywords = None }
-
 [<NoEquality; NoComparison>]
 type SynFieldTrivia =
     {
@@ -398,14 +365,6 @@ type SynTypeOrTrivia = { OrKeyword: range }
 [<NoEquality; NoComparison>]
 type SynBindingReturnInfoTrivia = { ColonRange: range option }
 
-[<NoEquality; NoComparison>]
-type SynMemberSigMemberTrivia =
-    {
-        GetSetKeywords: GetSetKeywords option
-    }
-
-    static member Zero: SynMemberSigMemberTrivia = { GetSetKeywords = None }
-
 [<NoEquality; NoComparison>]
 type SynTyparDeclTrivia =
     {

src/Compiler/SyntaxTree/SyntaxTrivia.fsi

@@ -444,42 +444,6 @@ type SynArgPatsNamePatPairsTrivia =
         ParenRange: range
     }
 
-/// Represents additional information for `get, set` syntax
-[<NoEquality; NoComparison; RequireQualifiedAccess>]
-type GetSetKeywords =
-    | Get of range
-    | Set of range
-    | GetSet of get: range * set: range
-
-    member Range: range
-
-/// Represents additional information for SynMemberDefn.AutoProperty
-[<NoEquality; NoComparison>]
-type SynMemberDefnAutoPropertyTrivia =
-    {
-        /// Used leading keyword of AutoProperty
-        LeadingKeyword: SynLeadingKeyword
-
-        /// The syntax range of the `with` keyword
-        WithKeyword: range option
-
-        /// The syntax range of the `=` token
-        EqualsRange: range option
-
-        /// The syntax range of 'get, set'
-        GetSetKeywords: GetSetKeywords option
-    }
-
-///  Represents additional information for SynMemberDefn.AbstractSlot
-[<NoEquality; NoComparison>]
-type SynMemberDefnAbstractSlotTrivia =
-    {
-        /// The syntax range of 'get, set'
-        GetSetKeywords: GetSetKeywords option
-    }
-
-    static member Zero: SynMemberDefnAbstractSlotTrivia
-
 /// Represents additional information for SynField
 [<NoEquality; NoComparison>]
 type SynFieldTrivia =
@@ -508,16 +472,6 @@ type SynBindingReturnInfoTrivia =
         ColonRange: range option
     }
 
-/// Represents additional information for SynMemberSig.Member
-[<NoEquality; NoComparison>]
-type SynMemberSigMemberTrivia =
-    {
-        /// The syntax range of 'get, set'
-        GetSetKeywords: GetSetKeywords option
-    }
-
-    static member Zero: SynMemberSigMemberTrivia
-
 /// Represents additional information for SynTyparDecl
 [<NoEquality; NoComparison>]
 type SynTyparDeclTrivia =