RIDER-128433 Rider .NET Intentions Previews: rework BaseTestNoShell.GetAttributes<T> impl and semantics, avoid metadata order dependencies, fix tests

controlflow · auduchinok · commit 9919f402b032 · 2025-12-27T11:07:39.000+01:00
GitOrigin-RevId: 82ab08f5f158ec6fb1a9f1416df4e3ca88a144d2
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/KeyValuePair 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/KeyValuePair 01.fs.gold
@@ -1,3 +1,3 @@
 ﻿open System.Collections.Generic
 
-let (KeyValue(s, i{caret})) = KeyValuePair("", 1)
+let (KeyValue({spotstart#1}s{spotend#1}, {spotstart#2}i{spotend#2}{caret})) = KeyValuePair("", 1)
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/KeyValuePair 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/KeyValuePair 02.fs.gold
@@ -1,3 +1,3 @@
 ﻿open System.Collections.Generic
 
-let (KeyValue(s, i{caret})) = KeyValuePair("", 1)
+let (KeyValue({spotstart#1}s{spotend#1}, {spotstart#2}i{spotend#2}{caret})) = KeyValuePair("", 1)
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Accessor 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Accessor 01.fs.gold
@@ -1,5 +1,5 @@
 ﻿type T() =
     let i = 0
 
-    member this.P with set ((i1, s{caret}): int * string) = 
+    member this.P with set (({spotstart#1}i1{spotend#1}, {spotstart#2}s{spotend#2}{caret}): int * string) = 
         ignore i
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Lambda 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Lambda 01.fs.gold
@@ -1,2 +1,2 @@
-﻿(1, 2) |> (fun (i, i1{caret}) -> ())
+﻿(1, 2) |> (fun ({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret}) -> ())
 
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Lambda 02 - Parens.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Lambda 02 - Parens.fs.gold
@@ -1,2 +1,2 @@
-﻿(1, 2) |> (fun (i, i1{caret}) -> ())
+﻿(1, 2) |> (fun ({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret}) -> ())
 
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Lambda 03 - Used names.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Lambda 03 - Used names.fs.gold
@@ -1,6 +1,6 @@
 ﻿let i = 0
 
-(1, "") |> (fun (i1, s{caret}) ->
+(1, "") |> (fun ({spotstart#1}i1{spotend#1}, {spotstart#2}s{spotend#2}{caret}) ->
     let _ = i
     ()
 )
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Decl 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Decl 01.fs.gold
@@ -1 +1 @@
-﻿let i, i1, i2{caret} = 1, 2, 3
+﻿let {spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}, {spotstart#3}i2{spotend#3}{caret} = 1, 2, 3
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Decl 02 - Used names.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Decl 02 - Used names.fs.gold
@@ -1,2 +1,2 @@
 ﻿let i1 = 1
-let i, i2, i3{caret} = 1, 2, 3
+let {spotstart#1}i{spotend#1}, {spotstart#2}i2{spotend#2}, {spotstart#3}i3{spotend#3}{caret} = 1, 2, 3
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Decl 03 - Abbreviation.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Decl 03 - Abbreviation.fs.gold
@@ -1,3 +1,3 @@
 ﻿type Abbr = int * string
 
-let i, s{caret}: Abbr = 1, ""
+let {spotstart#1}i{spotend#1}, {spotstart#2}s{spotend#2}{caret}: Abbr = 1, ""
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Expr 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Expr 01.fs.gold
@@ -1,3 +1,3 @@
 ﻿do
-    let i, i1, i2{caret} = 1, 2, 3
+    let {spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}, {spotstart#3}i2{spotend#3}{caret} = 1, 2, 3
     ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Expr 02 - Used names.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Expr 02 - Used names.fs.gold
@@ -1,4 +1,4 @@
 ﻿do
     let i, i1, i2 = 1, 2, 3
-    let i2, i3, i4{caret} = 1, 2, 3
+    let {spotstart#1}i2{spotend#1}, {spotstart#2}i3{spotend#2}, {spotstart#3}i4{spotend#3}{caret} = 1, 2, 3
     i, i1 |> ignore
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Expr 03 - Used.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Let - Expr 03 - Used.fs.gold
@@ -1,3 +1,3 @@
 ﻿do
-    let i1, i2, i3{caret} as i = 1, 2, 3
+    let {spotstart#1}i1{spotend#1}, {spotstart#2}i2{spotend#2}, {spotstart#3}i3{spotend#3}{caret} as i = 1, 2, 3
     i |> ignore
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Match 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Match 01.fs.gold
@@ -1,2 +1,2 @@
 ﻿match 1, "" with
-| i, s{caret} -> ()
+| {spotstart#1}i{spotend#1}, {spotstart#2}s{spotend#2}{caret} -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Match 02 - Used names.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Match 02 - Used names.fs.gold
@@ -1,6 +1,6 @@
 ﻿let i = 0
 
 match 1, "" with
-| i1, s{caret} when s <> "" ->
+| {spotstart#1}i1{spotend#1}, {spotstart#2}s{spotend#2}{caret} when s <> "" ->
     let _ = i
     ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Member - Add parens 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Member - Add parens 01.fs.gold
@@ -3,4 +3,4 @@
 
 type T1() =
     interface I<int * int> with
-        member this.M((i, i1{caret})) = failwith "todo"
+        member this.M(({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret})) = failwith "todo"
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Member - Add parens 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Member - Add parens 02.fs.gold
@@ -3,4 +3,4 @@
 
 type T1() =
     interface I<int * int> with
-        member this.M((i, i1{caret})) = failwith "todo"
+        member this.M(({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret})) = failwith "todo"
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Member - Add parens 03.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Member - Add parens 03.fs.gold
@@ -1,2 +1,2 @@
 ﻿type T2() =
-    member this.M(a, b{caret} as x) = fst x
+    member this.M({spotstart#1}a{spotend#1}, {spotstart#2}b{spotend#2}{caret} as x) = fst x
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Member - Add parens 04.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Member - Add parens 04.fs.gold
@@ -1,2 +1,2 @@
 ﻿type T2() =
-    member this.M(a, b{caret} as x) = fst x
+    member this.M({spotstart#1}a{spotend#1}, {spotstart#2}b{spotend#2}{caret} as x) = fst x
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Member 01 - Used names.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Member 01 - Used names.fs.gold
@@ -1,6 +1,6 @@
 ﻿type T() =
     let i = 0
 
-    member this.M((i1, b{caret}): int * bool) =
+    member this.M(({spotstart#1}i1{spotend#1}, {spotstart#2}b{spotend#2}{caret}): int * bool) =
         let _ = i
         ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 01.fs.gold
@@ -1,2 +1,2 @@
-﻿let f (a, b{caret} as s1) s2 =
+﻿let f ({spotstart#1}a{spotend#1}, {spotstart#2}b{spotend#2}{caret} as s1) s2 =
     fst s1, snd s2
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 02.fs.gold
@@ -1,2 +1,2 @@
-﻿let f (s, a{caret} as s1) s2 : string * string =
+﻿let f ({spotstart#1}s{spotend#1}, {spotstart#2}a{spotend#2}{caret} as s1) s2 : string * string =
     fst s1, snd s2
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 03.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 03.fs.gold
@@ -1,2 +1,2 @@
-﻿let f (s, s3{caret} as s1: string * string) s2 =
+﻿let f ({spotstart#1}s{spotend#1}, {spotstart#2}s3{spotend#2}{caret} as s1: string * string) s2 =
     fst s1, snd s2
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 04.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 04.fs.gold
@@ -1,4 +1,4 @@
 ﻿let i = 1
 
-let f ((i1, s{caret}): int * string) =
+let f (({spotstart#1}i1{spotend#1}, {spotstart#2}s{spotend#2}{caret}): int * string) =
     ignore i
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 05.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 05.fs.gold
@@ -1,4 +1,4 @@
 ﻿let i = 1
 
-let f ((i1, s{caret}): int * string) =
+let f (({spotstart#1}i1{spotend#1}, {spotstart#2}s{spotend#2}{caret}): int * string) =
     ignore i
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 06.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 06.fs.gold
@@ -1,2 +1,2 @@
-﻿let f (((i1, i2{caret}), i): (int * int) * int) =
+﻿let f ((({spotstart#1}i1{spotend#1}, {spotstart#2}i2{spotend#2}{caret}), i): (int * int) * int) =
     ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 07.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 07.fs.gold
@@ -1,6 +1,6 @@
 ﻿let s = ""
 
-let f ((i1, i2, s1{caret}): int * int * string) i =
+let f (({spotstart#1}i1{spotend#1}, {spotstart#2}i2{spotend#2}, {spotstart#3}s1{spotend#3}{caret}): int * int * string) i =
     let i1 = ()
     ignore i1, s
     ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 10.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter - Used names 10.fs.gold
@@ -1,3 +1,3 @@
 ﻿do
-    let f (i3, foo{caret} as s1) (i as i1 as i2) =
+    let f ({spotstart#1}i3{spotend#1}, {spotstart#2}foo{spotend#2}{caret} as s1) (i as i1 as i2) =
         fst s1 + i
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter owner 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Parameter owner 01.fs.gold
@@ -1 +1 @@
-﻿let (Some(i, i1{caret})) = Some (1, 2)
+﻿let (Some({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret})) = Some (1, 2)
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Used names 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Used names 01.fs.gold
@@ -1,2 +1,2 @@
 ﻿match 1, 2 with
-| i, i1{caret} as t | (_, _ as t) -> ()
+| {spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret} as t | (_, _ as t) -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Wild - Decl 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Wild - Decl 01.fs.gold
@@ -1 +1 @@
-﻿let i, i1, i2{caret} = 1, 2, 3
+﻿let {spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}, {spotstart#3}i2{spotend#3}{caret} = 1, 2, 3
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Wild - Expr 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Tuple - Wild - Expr 01.fs.gold
@@ -1,3 +1,3 @@
 ﻿do
-    let i, i1, i2{caret} = 1, 2, 3
+    let {spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}, {spotstart#3}i2{spotend#3}{caret} = 1, 2, 3
     ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 01.fs.gold
@@ -8,4 +8,4 @@ namespace Ns2
 open Ns1
 
 module Module =
-    let (A field{caret}) = Ns1.U.A 1
+    let (A {spotstart#1}field{spotend#1}{caret}) = Ns1.U.A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 02.fs.gold
@@ -6,4 +6,4 @@ module Module1 =
         | A of int
 
 module Module2 =
-    let (Module1.A i{caret}) = Module1.A 1
+    let (Module1.A {spotstart#1}i{spotend#1}{caret}) = Module1.A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 03.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 03.fs.gold
@@ -10,4 +10,4 @@ namespace Ns2
 open Ns1
 
 module Module2 =
-    let (Module.A i{caret}) = Ns1.Module.A 1
+    let (Module.A {spotstart#1}i{spotend#1}{caret}) = Ns1.Module.A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 04.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 04.fs.gold
@@ -9,4 +9,4 @@ module Module1 =
 open Module1.Nested
 
 module Module2 =
-    let (A i{caret}) = Module1.Nested.A 1
+    let (A {spotstart#1}i{spotend#1}{caret}) = Module1.Nested.A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 05.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 05.fs.gold
@@ -11,4 +11,4 @@ namespace Ns2
 open Ns1.Module.Nested
 
 module Module =
-    let (A i{caret}) = Ns1.Module.Nested.A 1
+    let (A {spotstart#1}i{spotend#1}{caret}) = Ns1.Module.Nested.A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 06.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 06.fs.gold
@@ -10,4 +10,4 @@ module Module =
     open Module1.Nested
 
     module Module2 =
-        let (A i{caret}) = Module1.Nested.A 1
+        let (A {spotstart#1}i{spotend#1}{caret}) = Module1.Nested.A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 07.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 07.fs.gold
@@ -10,4 +10,4 @@ module Nested1 =
     open Nested21.Nested3
 
     module Module22 =
-        let (A i{caret}) = Nested21.Nested3.A 1
+        let (A {spotstart#1}i{spotend#1}{caret}) = Nested21.Nested3.A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 08.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Import 08.fs.gold
@@ -10,4 +10,4 @@ module Nested1 =
     open Nested21.Nested3
 
     module Module22 =
-        let (A i{caret}) = Nested21.Nested3.A 1
+        let (A {spotstart#1}i{spotend#1}{caret}) = Nested21.Nested3.A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Let 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Let 01.fs.gold
@@ -1,4 +1,4 @@
 ﻿type U =
     | A of field: int
 
-let (A field{caret}) = A 1
+let (A {spotstart#1}field{spotend#1}{caret}) = A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Let 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Let 02.fs.gold
@@ -1,4 +1,4 @@
 ﻿type U =
     | A of field: int * string
 
-let (A(field, s{caret})) = A (1, "")
+let (A({spotstart#1}field{spotend#1}, {spotstart#2}s{spotend#2}{caret})) = A (1, "")
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Rqa 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Rqa 01.fs.gold
@@ -2,4 +2,4 @@
 type U =
     | A of field: int
 
-let (U.A field{caret}) = U.A 1
+let (U.A {spotstart#1}field{spotend#1}{caret}) = U.A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Rqa 02 - Import.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Rqa 02 - Import.fs.gold
@@ -12,4 +12,4 @@ namespace Ns2
 open Ns1.Nested1
 
 module Nested3 =
-    let (U.A field{caret}) = Ns1.Nested1.Nested2.U.A 1
+    let (U.A {spotstart#1}field{spotend#1}{caret}) = Ns1.Nested1.Nested2.U.A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Rqa 03 - Rqa module.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Rqa 03 - Rqa module.fs.gold
@@ -12,4 +12,4 @@ namespace Ns2
 open Ns1.Nested1
 
 module Nested3 =
-    let (Nested2.U.A field{caret}) = Ns1.Nested1.Nested2.U.A 1
+    let (Nested2.U.A {spotstart#1}field{spotend#1}{caret}) = Ns1.Nested1.Nested2.U.A 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Rqa 04 - Escaped.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Rqa 04 - Escaped.fs.gold
@@ -12,4 +12,4 @@ namespace Ns2
 open Ns1.Nested1
 
 module Nested3 =
-    let (Nested2.U.``A B`` field{caret}) = Ns1.Nested1.Nested2.U.``A B`` 1
+    let (Nested2.U.``A B`` {spotstart#1}field{spotend#1}{caret}) = Ns1.Nested1.Nested2.U.``A B`` 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Used 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Used 01.fs.gold
@@ -1,5 +1,5 @@
 ﻿type U =
     | A of int
 
-let A i{caret} as a = A 1
+let A {spotstart#1}i{spotend#1}{caret} as a = A 1
 let b = a
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Used 02 - Tuple.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Used 02 - Tuple.fs.gold
@@ -1,5 +1,5 @@
 ﻿type U =
     | A of int * int
 
-let A(i, i1{caret}) as a = A (1, 2)
+let A({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret}) as a = A (1, 2)
 let b = a
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Used 03.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single - Used 03.fs.gold
@@ -1,5 +1,5 @@
 ﻿type U =
     | A of int * int
 
-let _, (A(i, i1{caret}) as a) = (), A (1, 2)
+let _, (A({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret}) as a) = (), A (1, 2)
 let b = a
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single 01.fs.gold
@@ -4,4 +4,4 @@ type U =
     | A of someFieldName: bool * int * StringBuilder * anotherField: double
 
 match A (true, 2, null, 4.) with
-| A(someFieldName, i, stringBuilder, anotherField{caret}) -> failwith "todo"
+| A({spotstart#1}someFieldName{spotend#1}, {spotstart#2}i{spotend#2}, {spotstart#3}stringBuilder{spotend#3}, {spotstart#4}anotherField{spotend#4}{caret}) -> failwith "todo"
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single 02 - Escaped.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single 02 - Escaped.fs.gold
@@ -2,4 +2,4 @@
     | ``A B`` of field: int
 
 match ``A B`` 1 with
-| ``A B`` field{caret} -> ()
+| ``A B`` {spotstart#1}field{spotend#1}{caret} -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single 03 - Space.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single 03 - Space.fs.gold
@@ -2,4 +2,4 @@
     | A of int * int
 
 match A(1, 2) with
-| A (i, i1{caret}) -> ()
+| A ({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret}) -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single 04 - Arg.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case - Single 04 - Arg.fs.gold
@@ -6,4 +6,4 @@ type U =
     | A of int
 
 match A 1 with
-| Id(A i{caret}) -> ()
+| Id(A {spotstart#1}i{spotend#1}{caret}) -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields - Generic 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields - Generic 01.fs.gold
@@ -2,4 +2,4 @@
     | C of 'T * int
 
 match C(1, 2) with
-| C(i, i1{caret}) -> ()
+| C({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret}) -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields - Generic 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields - Generic 02.fs.gold
@@ -2,4 +2,4 @@
     | C of 'T1 * 'T2 option
 
 match C(1, Some "") with
-| C(i, stringOption{caret}) -> ()
+| C({spotstart#1}i{spotend#1}, {spotstart#2}stringOption{spotend#2}{caret}) -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields - Generic 03 - Array.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields - Generic 03 - Array.fs.gold
@@ -2,4 +2,4 @@
     | C of 'T[]
 
 match C([| 1 |]) with
-| C int32s{caret} -> ()
+| C {spotstart#1}int32s{spotend#1}{caret} -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields 01.fs.gold
@@ -5,4 +5,4 @@
     | D
 
 match D with
-| A(i, i1{caret}) -> ()
+| A({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret}) -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields 02.fs.gold
@@ -5,4 +5,4 @@
     | D
 
 match D with
-| B(i, f{caret}) -> ()
+| B({spotstart#1}i{spotend#1}, {spotstart#2}f{spotend#2}{caret}) -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields 03.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields 03.fs.gold
@@ -5,4 +5,4 @@
     | D
 
 match D with
-| C i{caret} -> ()
+| C {spotstart#1}i{spotend#1}{caret} -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields 04 - Parens.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields 04 - Parens.fs.gold
@@ -5,4 +5,4 @@
     | D
 
 match D with
-| A(i, i1{caret}) -> ()
+| A({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret}) -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields 05 - Parens.fs.gold b/ReSharper.FSharp/test/data/features/intentions/deconstruct/Union case fields 05 - Parens.fs.gold
@@ -5,4 +5,4 @@
     | D
 
 match D with
-| A(i, i1{caret}) -> ()
+| A({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret}) -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Comment 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Comment 01.fs.gold
@@ -1,5 +1,5 @@
 ﻿module Module
 
-let f x{caret} = // comment
+let f {spotstart#1}x{spotend#1}{caret} = // comment
     match x with
     | 1 -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Names - Generic 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Names - Generic 01.fs.gold
@@ -1,5 +1,5 @@
 ﻿module Module
 
-let f x{caret} =
+let f {spotstart#1}x{spotend#1}{caret} =
     match x with
     | _ -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Names - String 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Names - String 01.fs.gold
@@ -1,5 +1,5 @@
 ﻿module Module
 
-let f x{caret} =
+let f {spotstart#1}x{spotend#1}{caret} =
     match x with
     | "" -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Names - Used 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Names - Used 01.fs.gold
@@ -1,5 +1,5 @@
 ﻿module Module
 
-let f s x{caret} =
+let f s {spotstart#1}x{spotend#1}{caret} =
     match x with
     | "" -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Single line 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Single line 01.fs.gold
@@ -1,3 +1,3 @@
 ﻿module Module
 
-let f x{caret} = match x with | 1 -> ()
+let f {spotstart#1}x{spotend#1}{caret} = match x with | 1 -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Single line 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/matchLambdaToParameter/Single line 02.fs.gold
@@ -1,3 +1,3 @@
 ﻿module Module
 
-let f x{caret} = match x with | 1 -> () | 2 -> ()
+let f {spotstart#1}x{spotend#1}{caret} = match x with | 1 -> () | 2 -> ()
diff --git a/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Args 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Args 01.fs.gold
@@ -2,4 +2,4 @@
 
 let f a b = a + b
 
-fun o -> {caret}f a o
+fun {spotstart#1}o{spotend#1} -> {caret}f a o
diff --git a/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Args 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Args 02.fs.gold
@@ -2,6 +2,6 @@
 
 let f a b = a + b
 
-fun o ->
+fun {spotstart#1}o{spotend#1} ->
     {caret}f
         a o
diff --git a/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Args 03.fs.gold b/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Args 03.fs.gold
@@ -3,6 +3,6 @@
 let f a b = a + b
 
 do
-    fun o ->
+    fun {spotstart#1}o{spotend#1} ->
         {caret}f
             a o
diff --git a/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Args 04.fs.gold b/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Args 04.fs.gold
diff --git a/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Args 05.fs.gold b/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Args 05.fs.gold
diff --git a/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Op 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Op 01.fs.gold
diff --git a/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Op 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Op 02.fs.gold
diff --git a/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Op 03.fs.gold b/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Op 03.fs.gold
diff --git a/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Ref 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/partialToLambda/Ref 01.fs.gold
diff --git a/ReSharper.FSharp/test/data/features/intentions/toPositionalFieldPatterns/Union 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/toPositionalFieldPatterns/Union 01.fs.gold
diff --git a/ReSharper.FSharp/test/data/features/intentions/toPositionalFieldPatterns/Union 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/toPositionalFieldPatterns/Union 02.fs.gold
diff --git a/ReSharper.FSharp/test/data/features/intentions/toPositionalFieldPatterns/Union 04.fs.gold b/ReSharper.FSharp/test/data/features/intentions/toPositionalFieldPatterns/Union 04.fs.gold
diff --git a/ReSharper.FSharp/test/data/features/intentions/toPositionalFieldPatterns/Union 05.fs.gold b/ReSharper.FSharp/test/data/features/intentions/toPositionalFieldPatterns/Union 05.fs.gold
diff --git a/ReSharper.FSharp/test/data/features/intentions/toPositionalFieldPatterns/Union 06.fs.gold b/ReSharper.FSharp/test/data/features/intentions/toPositionalFieldPatterns/Union 06.fs.gold

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`open System.Collections.Generic`
`2`	`2`
`3`		`-let (KeyValue(s, i{caret})) = KeyValuePair("", 1)`
	`3`	`+let (KeyValue({spotstart#1}s{spotend#1}, {spotstart#2}i{spotend#2}{caret})) = KeyValuePair("", 1)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-(1, 2) \|> (fun (i, i1{caret}) -> ())`
	`1`	`+(1, 2) \|> (fun ({spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}{caret}) -> ())`
`2`	`2`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`let i = 0`
`2`	`2`
`3`		`-(1, "") \|> (fun (i1, s{caret}) ->`
	`3`	`+(1, "") \|> (fun ({spotstart#1}i1{spotend#1}, {spotstart#2}s{spotend#2}{caret}) ->`
`4`	`4`	`let _ = i`
`5`	`5`	`()`
`6`	`6`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-let i, i1, i2{caret} = 1, 2, 3`
	`1`	`+let {spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}, {spotstart#3}i2{spotend#3}{caret} = 1, 2, 3`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`let i1 = 1`
`2`		`-let i, i2, i3{caret} = 1, 2, 3`
	`2`	`+let {spotstart#1}i{spotend#1}, {spotstart#2}i2{spotend#2}, {spotstart#3}i3{spotend#3}{caret} = 1, 2, 3`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`type Abbr = int * string`
`2`	`2`
`3`		`-let i, s{caret}: Abbr = 1, ""`
	`3`	`+let {spotstart#1}i{spotend#1}, {spotstart#2}s{spotend#2}{caret}: Abbr = 1, ""`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 do
 -    let i, i1, i2{caret} = 1, 2, 3
 +    let {spotstart#1}i{spotend#1}, {spotstart#2}i1{spotend#2}, {spotstart#3}i2{spotend#3}{caret} = 1, 2, 3
     ()