ExtendSelection: accessors clause

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/ExtendSelection/FSharpExtendSelectionProvider.fs

@@ -99,6 +99,18 @@ type FSharpExtendSelectionProvider(settingsStore: ISettingsStore) =
             let parentExpr = node.Parent :?> IInterpolatedStringExpr
             if parentExpr.Literals.Count < 2 then null else
             FSharpInterpolatedStringExpressionSelection(fsFile, node.Parent :?> IInterpolatedStringExpr) :> _
+
+        | node ->
+
+        match node.Parent with
+        | :? IOverridableMemberDeclaration as parent ->
+            let withKeyword = parent.WithKeyword
+            if isNull withKeyword then null else
+
+            if node.GetTreeStartOffset().Offset >= withKeyword.GetTreeStartOffset().Offset then
+                FSharpTreeRangeSelection(fsFile, parent.WithKeyword, parent.LastChild) :> _ else
+
+            null
 
         | _ -> null
 

ReSharper.FSharp/src/FSharp/FSharp.Psi/src/FSharp.psi

@@ -1422,7 +1422,7 @@ memberSignature  options { stubBase="FSharpProperTypeMemberDeclarationBase"; cus
   accessorDecls?;
 
 private accessorDecls:
-  WITH
+  WITH<WITH, WithKeyword>
   accessorDeclaration<ACCESSOR_DECLARATION, AccessorDeclarations>
   (
     AND

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 01 - Implicit.fs

@@ -0,0 +1,2 @@
+type A() =
+    member val P = 1 with get{caret}, set

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 01 - Implicit.fs.gold

@@ -0,0 +1,20 @@
+type A() =
+    member val P = 1 with |get|, set
+
+---------------------------------------------------------
+type A() =
+    member val P = 1 |with get, set|
+
+---------------------------------------------------------
+type A() =
+    |member val P = 1 with get, set|
+
+---------------------------------------------------------
+|type A() =
+    member val P = 1 with get, set|
+
+---------------------------------------------------------
+|type A() =
+    member val P = 1 with get, set
+|
+---------------------------------------------------------

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 02 - Explicit.fs

@@ -0,0 +1,2 @@
+type A =
+    member x.P with get() = {caret}1 and set y = ()

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 02 - Explicit.fs.gold

@@ -0,0 +1,24 @@
+type A =
+    member x.P with get() = |1| and set y = ()
+
+---------------------------------------------------------
+type A =
+    member x.P with |get() = 1| and set y = ()
+
+---------------------------------------------------------
+type A =
+    member x.P |with get() = 1 and set y = ()|
+
+---------------------------------------------------------
+type A =
+    |member x.P with get() = 1 and set y = ()|
+
+---------------------------------------------------------
+|type A =
+    member x.P with get() = 1 and set y = ()|
+
+---------------------------------------------------------
+|type A =
+    member x.P with get() = 1 and set y = ()
+|
+---------------------------------------------------------

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 03 - Between.fs

@@ -0,0 +1,2 @@
+type A =
+    member x.P with get() = 1 and{caret} set y = ()

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 03 - Between.fs.gold

@@ -0,0 +1,20 @@
+type A =
+    member x.P with get() = 1 |and| set y = ()
+
+---------------------------------------------------------
+type A =
+    member x.P |with get() = 1 and set y = ()|
+
+---------------------------------------------------------
+type A =
+    |member x.P with get() = 1 and set y = ()|
+
+---------------------------------------------------------
+|type A =
+    member x.P with get() = 1 and set y = ()|
+
+---------------------------------------------------------
+|type A =
+    member x.P with get() = 1 and set y = ()
+|
+---------------------------------------------------------

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 04 - With.fs

@@ -0,0 +1,2 @@
+type A() =
+    member val A = 1 with{caret} get, set

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 04 - With.fs.gold

@@ -0,0 +1,20 @@
+type A() =
+    member val A = 1 |with| get, set
+
+---------------------------------------------------------
+type A() =
+    member val A = 1 |with get, set|
+
+---------------------------------------------------------
+type A() =
+    |member val A = 1 with get, set|
+
+---------------------------------------------------------
+|type A() =
+    member val A = 1 with get, set|
+
+---------------------------------------------------------
+|type A() =
+    member val A = 1 with get, set
+|
+---------------------------------------------------------

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 05 - No accessors.fs

@@ -0,0 +1,2 @@
+type A() =
+    member _.P = 1{caret}

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 05 - No accessors.fs.gold

@@ -0,0 +1,16 @@
+type A() =
+    member _.P = |1|
+
+---------------------------------------------------------
+type A() =
+    |member _.P = 1|
+
+---------------------------------------------------------
+|type A() =
+    member _.P = 1|
+
+---------------------------------------------------------
+|type A() =
+    member _.P = 1
+|
+---------------------------------------------------------

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 06 - Abstract.fs

@@ -0,0 +1,2 @@
+type A =
+    abstract P: int with get,{caret} set

ReSharper.FSharp/test/data/features/service/extendSelection/Accessors clause 06 - Abstract.fs.gold

@@ -0,0 +1,20 @@
+type A =
+    abstract P: int with get|,| set
+
+---------------------------------------------------------
+type A =
+    abstract P: int |with get, set|
+
+---------------------------------------------------------
+type A =
+    |abstract P: int with get, set|
+
+---------------------------------------------------------
+|type A =
+    abstract P: int with get, set|
+
+---------------------------------------------------------
+|type A =
+    abstract P: int with get, set
+|
+---------------------------------------------------------

ReSharper.FSharp/test/src/FSharp.Tests/Actions/FSharpExtendSelectionTest.fs

@@ -98,3 +98,10 @@ type FSharpExtendSelectionTest() =
     [<Test>] member x.``Strings - Interpolated - Triple quoted 03 - Complex insertion``() = x.DoNamedTest()
 
     [<Test>] member x.``Strings - Injections 01``() = x.DoNamedTest()
+
+    [<Test>] member x.``Accessors clause 01 - Implicit``() = x.DoNamedTest()
+    [<Test>] member x.``Accessors clause 02 - Explicit``() = x.DoNamedTest()
+    [<Test>] member x.``Accessors clause 03 - Between``() = x.DoNamedTest()
+    [<Test>] member x.``Accessors clause 04 - With``() = x.DoNamedTest()
+    [<Test>] member x.``Accessors clause 05 - No accessors``() = x.DoNamedTest()
+    [<Test>] member x.``Accessors clause 06 - Abstract``() = x.DoNamedTest()