Skip to content

Commit c224232

Browse files
committed
Extend selection: add more cases for selecting identifier first
1 parent aee6745 commit c224232

File tree

6 files changed

+24
-1
lines changed

6 files changed

+24
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ and FSharpDotSelection(fsFile, offset, selectBetterToken, useCamelHumps) =
117117

118118
override this.IsPrevTokenBetter(prevToken, tokenNode) =
119119
let tokenType = tokenNode.GetTokenType()
120-
tokenType == FSharpTokenType.GREATER && not (this.IsSpaceToken(prevToken)) ||
120+
let isIdentifierLikeToken = FSharpTokenType.Identifiers.[tokenType]
121+
isIdentifierLikeToken && tokenType != FSharpTokenType.IDENTIFIER && not (this.IsSpaceToken(prevToken)) ||
121122

122123
base.IsPrevTokenBetter(prevToken, tokenNode)
123124

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ignore{caret}<int>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
|ignore|<int>
2+
3+
---------------------------------------------------------
4+
|ignore<int>|
5+
6+
---------------------------------------------------------
7+
|ignore<int>
8+
|
9+
---------------------------------------------------------
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
i{caret}+1
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
|i|+1
2+
3+
---------------------------------------------------------
4+
|i+1|
5+
6+
---------------------------------------------------------
7+
|i+1
8+
|
9+
---------------------------------------------------------

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,5 @@ type FSharpExtendSelectionTest() =
5858
[<Test>] member x.``Greater 01``() = x.DoNamedTest()
5959
[<Test>] member x.``Greater 02``() = x.DoNamedTest()
6060
[<Test>] member x.``Greater 03``() = x.DoNamedTest()
61+
[<Test>] member x.``Less 01``() = x.DoNamedTest()
62+
[<Test>] member x.``Plus 01``() = x.DoNamedTest()

0 commit comments

Comments
 (0)