Initial draft of SynMemberDefn.ReadWriteMember.

src/Compiler/Checking/CheckDeclarations.fs

@@ -2530,6 +2530,7 @@ let TcMutRecDefns_Phase2 (cenv: cenv) envInitial bindsm scopem mutRecNSInfo (env
             | SynMemberDefn.LetBindings _
             | SynMemberDefn.AutoProperty _
             | SynMemberDefn.Member _
+            | SynMemberDefn.ReadWriteMember _
             | SynMemberDefn.Open _
                 -> Some(TyconBindingDefn(containerInfo, newslotsOK, declKind, memb, memb.Range))
 
@@ -4832,7 +4833,8 @@ module TcDeclarations =
                     cspec |> List.filter (fun memb -> 
                       match memb with 
                       | SynMemberDefn.Interface _
-                      | SynMemberDefn.Member _ 
+                      | SynMemberDefn.Member _
+                      | SynMemberDefn.ReadWriteMember _
                       | SynMemberDefn.LetBindings _
                       | SynMemberDefn.ImplicitCtor _
                       | SynMemberDefn.AutoProperty _ 

src/Compiler/Service/ServiceInterfaceStubGenerator.fs

@@ -817,6 +817,9 @@ module InterfaceStubGenerator =
                     else
                         Option.bind (List.tryPick walkSynMemberDefn) members
                 | SynMemberDefn.Member (binding, _range) -> walkBinding binding
+                | SynMemberDefn.ReadWriteMember (read = read; write = write) ->
+                    walkExpr read.Expression
+                    |> Option.orElseWith (fun () -> walkExpr write.Expression)
                 | SynMemberDefn.NestedType (typeDef, _access, _range) -> walkSynTypeDefn typeDef
                 | SynMemberDefn.ValField (_field, _range) -> None
                 | SynMemberDefn.LetBindings (bindings, _isStatic, _isRec, _range) -> List.tryPick walkBinding bindings

src/Compiler/Service/ServiceNavigation.fs

@@ -997,6 +997,21 @@ module NavigateTo =
                         walkSynMemberDefn m container
                 | None -> ()
             | SynMemberDefn.Member (binding, _) -> addBinding binding None container
+            | SynMemberDefn.ReadWriteMember (identifier = pat) ->
+                let kind = mapMemberKind SynMemberKind.PropertyGetSet
+
+                match pat with
+                | SynPat.LongIdent(longDotId = SynLongIdent ([ _; id ], _, _)) ->
+                    // instance members
+                    addIdent kind id false container
+                | SynPat.LongIdent(longDotId = SynLongIdent ([ id ], _, _)) ->
+                    // functions
+                    addIdent kind id false container
+                | SynPat.Named (SynIdent (id, _), _, _, _)
+                | SynPat.As (_, SynPat.Named (SynIdent (id, _), _, _, _), _) ->
+                    // values
+                    addIdent kind id false container
+                | _ -> ()
             | SynMemberDefn.NestedType (typeDef, _, _) -> walkSynTypeDefn typeDef container
             | SynMemberDefn.ValField (field, _) -> addField field false container
             | SynMemberDefn.LetBindings (bindings, _, _, _) ->

src/Compiler/Service/ServiceParseTreeWalk.fs

@@ -948,6 +948,9 @@ module SyntaxTraversal =
             | SynMemberDefn.Inherit (synType, _identOption, range) -> traverseInherit (synType, range)
             | SynMemberDefn.ValField (_synField, _range) -> None
             | SynMemberDefn.NestedType (synTypeDefn, _synAccessOption, _range) -> traverseSynTypeDefn path synTypeDefn
+            | SynMemberDefn.ReadWriteMember (read = read; write = write) ->
+                traverseSynExpr path read.Expression
+                |> Option.orElseWith (fun () -> traverseSynExpr path write.Expression)
 
         and traverseSynMatchClause origPath mc =
             let defaultTraverse mc =

src/Compiler/Service/ServiceXmlDocParser.fs

@@ -187,6 +187,13 @@ module XmlDocParsing =
                     let indent = indentOf line
                     XmlDocable(line, indent, [])
 
+                | SynMemberDefn.ReadWriteMember (xmlDoc = xmlDoc; identifier = synPat; range = range) ->
+                    if isEmptyXmlDoc xmlDoc then
+                        let line = range.StartLine
+                        let indent = indentOf line
+                        let paramNames = digNamesFrom synPat
+                        XmlDocable(line, indent, paramNames)
+
                 | SynMemberDefn.Open _
                 | SynMemberDefn.ImplicitCtor _
                 | SynMemberDefn.ImplicitInherit _

src/Compiler/SyntaxTree/SyntaxTree.fs

@@ -1367,6 +1367,18 @@ type SynMemberDefn =
 
     | Member of memberDefn: SynBinding * range: range
 
+    | ReadWriteMember of
+        accessibility: SynAccess option *
+        attributes: SynAttributes *
+        memberFlags: (SynMemberKind -> SynMemberFlags) *
+        xmlDoc: PreXmlDoc *
+        identifier: SynPat *
+        returnTypeOpt: SynReturnInfo option *
+        read: SynMemberDefnPropertyInfo *
+        write: SynMemberDefnPropertyInfo *
+        range: range *
+        trivia: SynMemberDefnReadWriteMemberTrivia
+
     | ImplicitCtor of
         accessibility: SynAccess option *
         attributes: SynAttributes *
@@ -1407,6 +1419,7 @@ type SynMemberDefn =
     member d.Range =
         match d with
         | SynMemberDefn.Member (range = m)
+        | SynMemberDefn.ReadWriteMember (range = m)
         | SynMemberDefn.Interface (range = m)
         | SynMemberDefn.Open (range = m)
         | SynMemberDefn.LetBindings (range = m)
@@ -1420,6 +1433,19 @@ type SynMemberDefn =
 
 type SynMemberDefns = SynMemberDefn list
 
+type SynMemberDefnPropertyInfo =
+    {
+        IsInline: bool
+        Attributes: SynAttributes
+        /// 'get' or 'set
+        IsWrite: bool
+        Pattern: SynPat
+        ReturnInfo: SynReturnInfo option
+        Expression: SynExpr
+        Range: range
+        Trivia: SynMemberDefnPropertyInfoTrivia
+    }
+
 [<NoEquality; NoComparison; RequireQualifiedAccess>]
 type SynModuleDecl =
 

src/Compiler/SyntaxTree/SyntaxTree.fsi

@@ -1554,6 +1554,19 @@ type SynMemberDefn =
     /// A 'member' definition within a type
     | Member of memberDefn: SynBinding * range: range
 
+    /// A 'member' definition with a get and set portion
+    | ReadWriteMember of
+        accessibility: SynAccess option *
+        attributes: SynAttributes *
+        memberFlags: (SynMemberKind -> SynMemberFlags) *
+        xmlDoc: PreXmlDoc *
+        identifier: SynPat *
+        returnTypeOpt: SynReturnInfo option *
+        read: SynMemberDefnPropertyInfo *
+        write: SynMemberDefnPropertyInfo *
+        range: range *
+        trivia: SynMemberDefnReadWriteMemberTrivia
+
     /// An implicit constructor definition
     | ImplicitCtor of
         accessibility: SynAccess option *
@@ -1605,6 +1618,19 @@ type SynMemberDefn =
 
 type SynMemberDefns = SynMemberDefn list
 
+type SynMemberDefnPropertyInfo =
+    {
+        IsInline: bool
+        Attributes: SynAttributes
+        /// 'get' or 'set
+        IsWrite: bool
+        Pattern: SynPat
+        ReturnInfo: SynReturnInfo option
+        Expression: SynExpr
+        Range: range
+        Trivia: SynMemberDefnPropertyInfoTrivia
+    }
+
 /// Represents a definition within a module
 [<NoEquality; NoComparison; RequireQualifiedAccess>]
 type SynModuleDecl =

src/Compiler/SyntaxTree/SyntaxTreeOps.fs

@@ -985,3 +985,91 @@ let mkDynamicArgExpr expr =
         SynExpr.Const(con, con.Range ident.idRange)
     | SynExpr.Paren (expr = e) -> e
     | e -> e
+
+let mkSynMemberGetOrSet
+    (grabXmlDocAtRangeStart: SynAttributes -> range -> PreXmlDoc)
+    (optInline: bool)
+    (propertyNameBindingPat: SynPat)
+    (mBindPattern: range)
+    (mWith: range)
+    (memberDefnPropertyInfo: SynMemberDefnPropertyInfo)
+    : SynAccess option -> (SynMemberKind -> SynMemberFlags) -> SynAttributeList list -> range -> SynMemberDefn list =
+    fun vis memFlagsBuilder attrs rangeStart ->
+        let optInline = optInline || memberDefnPropertyInfo.IsInline
+        let attrs = attrs @ memberDefnPropertyInfo.Attributes
+
+        let memberKind =
+            if memberDefnPropertyInfo.IsWrite then
+                SynMemberKind.PropertySet
+            else
+                SynMemberKind.PropertyGet
+
+        let xmlDoc = grabXmlDocAtRangeStart attrs rangeStart
+
+        let binding =
+            let mLhs = unionRanges mBindPattern memberDefnPropertyInfo.Pattern.Range
+
+            let headPat =
+                match propertyNameBindingPat with
+                | SynPat.LongIdent (longDotId, _, _, typarDecls, _, access, _) ->
+                    let getSet = if memberDefnPropertyInfo.IsWrite then "set" else "get"
+
+                    let m =
+                        unionRanges memberDefnPropertyInfo.Trivia.GetSetRange memberDefnPropertyInfo.Pattern.Range
+
+                    SynPat.LongIdent(
+                        longDotId,
+                        Some(PropertyKeyword.With mWith),
+                        Some(ident (getSet, memberDefnPropertyInfo.Trivia.GetSetRange)),
+                        typarDecls,
+                        SynArgPats.Pats([ memberDefnPropertyInfo.Pattern ]),
+                        access,
+                        m
+                    )
+                | pat -> pat
+
+            mkSynBinding
+                (xmlDoc, headPat)
+                (vis,
+                 optInline,
+                 false,
+                 mBindPattern,
+                 DebugPointAtBinding.NoneAtInvisible,
+                 memberDefnPropertyInfo.ReturnInfo,
+                 memberDefnPropertyInfo.Expression,
+                 mLhs,
+                 [],
+                 attrs,
+                 Some(memFlagsBuilder memberKind),
+                 SynBindingTrivia.Zero)
+
+        let memberRange =
+            unionRanges rangeStart memberDefnPropertyInfo.Expression.Range
+            |> unionRangeWithXmlDoc xmlDoc
+
+        [ SynMemberDefn.Member(binding, memberRange) ]
+
+let (|GetOrSetPattern|GetOrSetWithoutArgument|NoGetSetWord|) (pat: SynPat) : Choice<(string * SynPat), string, unit> =
+    let isGetOrSet v =
+        if v = "get" || v = "set" then Some v else None
+
+    let stripParensFromUnit p =
+        match p with
+        | SynPat.Paren(pat = SynPat.Const(constant = SynConst.Unit) as patUnit) -> patUnit
+        | _ -> p
+
+    let rec visit p =
+        match p with
+        | SynPat.LongIdent (longDotId = SynLongIdent ([ id ], _, _); argPats = SynArgPats.Pats [ singleArg ]) ->
+            isGetOrSet id.idText, Some(stripParensFromUnit singleArg)
+        | SynPat.Named (SynIdent (nm, _), _, _, _)
+        | SynPat.As (_, SynPat.Named (SynIdent (nm, _), _, _, _), _) -> isGetOrSet nm.idText, None
+        | SynPat.Typed (p, _, _) -> visit p
+        | SynPat.Attrib (p, _, _) -> visit p
+        | _ -> None, None
+
+    match visit pat with
+    | None, None -> NoGetSetWord
+    | Some v, None -> GetOrSetWithoutArgument v
+    | None, Some _ -> NoGetSetWord
+    | Some getOrSet, Some arg -> GetOrSetPattern(getOrSet, arg)

src/Compiler/SyntaxTree/SyntaxTreeOps.fsi

@@ -340,3 +340,14 @@ val (|SynPipeRight3|_|): SynExpr -> (SynExpr * SynExpr * SynExpr * SynExpr) opti
 val prependIdentInLongIdentWithTrivia: ident: SynIdent -> dotm: range -> lid: SynLongIdent -> SynLongIdent
 
 val mkDynamicArgExpr: expr: SynExpr -> SynExpr
+
+val mkSynMemberGetOrSet:
+    grabXmlDocAtRangeStart: (SynAttributes -> range -> PreXmlDoc) ->
+    optInline: bool ->
+    propertyNameBindingPat: SynPat ->
+    mBindPattern: range ->
+    mWith: range ->
+    memberDefnPropertyInfo: SynMemberDefnPropertyInfo ->
+        (SynAccess option -> (SynMemberKind -> SynMemberFlags) -> SynAttributeList list -> range -> SynMemberDefn list)
+
+val (|GetOrSetPattern|GetOrSetWithoutArgument|NoGetSetWord|): pat: SynPat -> Choice<(string * SynPat), string, unit>

src/Compiler/SyntaxTree/SyntaxTrivia.fs

@@ -230,3 +230,17 @@ type SynValSigTrivia =
             WithKeyword = None
             EqualsRange = None
         }
+
+[<NoEquality; NoComparison>]
+type SynMemberDefnReadWriteMemberTrivia =
+    {
+        WithKeyword: range
+        AndKeyword: range
+    }
+
+[<NoEquality; NoComparison>]
+type SynMemberDefnPropertyInfoTrivia =
+    {
+        GetSetRange: range
+        EqualsRange: range
+    }

src/Compiler/SyntaxTree/SyntaxTrivia.fsi

@@ -324,3 +324,23 @@ type SynValSigTrivia =
     }
 
     static member Zero: SynValSigTrivia
+
+/// Represents additional information for SynMemberDefn.ReadWriteMember
+[<NoEquality; NoComparison>]
+type SynMemberDefnReadWriteMemberTrivia =
+    {
+        /// The syntax range of the `with` keyword
+        WithKeyword: range
+        /// The syntax range of the `and` keyword
+        AndKeyword: range
+    }
+
+/// Represents additional information for SynMemberDefnPropertyInfo
+[<NoEquality; NoComparison>]
+type SynMemberDefnPropertyInfoTrivia =
+    {
+        /// The syntax range of the `get` or `set` keyword
+        GetSetRange: range
+        /// The syntax range of the `=` token after the read pattern
+        EqualsRange: range
+    }