Skip to content

Commit 9f008d8

Browse files
authored
TypeAnnotationsUtil: fix naming (#887)
1 parent 097dca3 commit 9f008d8

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

ReSharper.FSharp/src/FSharp/FSharp.Psi.Services/src/Util/TypeAnnotationsUtil.fs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,45 @@ open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Util.FSharpPatternUtil
44
open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
55
open JetBrains.ReSharper.Psi.Tree
66

7-
let rec private visitPattern (acc: ITreeNode list) (pattern: IFSharpPattern) =
8-
match pattern with
7+
let rec private collectPatterns (acc: ITreeNode list) (root: IFSharpPattern) =
8+
match root with
99
| null
1010
| :? IConstPat
1111
| :? IWildPat
1212
| :? ITypedPat -> acc
1313

14-
| :? IParenPat as parenPat -> visitPattern acc parenPat.Pattern
15-
| :? IAsPat as asPat -> visitPattern acc asPat.LeftPattern
14+
| :? IParenPat as parenPat -> collectPatterns acc parenPat.Pattern
15+
| :? IAsPat as asPat -> collectPatterns acc asPat.LeftPattern
1616

1717
| :? IOptionalValPat
1818
| :? IReferencePat as pat -> pat :: acc
1919

2020
| :? IRecordPat as recordPat ->
2121
recordPat.FieldPatternsEnumerable
22-
|> Seq.fold visitPattern acc
22+
|> Seq.fold collectPatterns acc
2323

24-
| :? IFieldPat as fieldPat -> visitPattern acc fieldPat.Pattern
25-
| :? IAttribPat as attribPat -> visitPattern acc attribPat.Pattern
24+
| :? IFieldPat as fieldPat -> collectPatterns acc fieldPat.Pattern
25+
| :? IAttribPat as attribPat -> collectPatterns acc attribPat.Pattern
2626

2727
| :? ITuplePat as tuplePat ->
2828
tuplePat.PatternsEnumerable
29-
|> Seq.fold visitPattern acc
29+
|> Seq.fold collectPatterns acc
3030

3131
| :? IParametersOwnerPat as parametersOwnerPat ->
3232
let acc = (parametersOwnerPat : ITreeNode) :: acc
3333
parametersOwnerPat.ParametersEnumerable
34-
|> Seq.fold visitPattern acc
34+
|> Seq.fold collectPatterns acc
3535

3636
| :? INamedUnionCaseFieldsPat as unionCaseFieldsPat ->
3737
unionCaseFieldsPat.FieldPatternsEnumerable
38-
|> Seq.fold visitPattern acc
38+
|> Seq.fold collectPatterns acc
3939

4040
| :? IAndsPat as andPat ->
4141
andPat.PatternsEnumerable
42-
|> Seq.fold visitPattern acc
42+
|> Seq.fold collectPatterns acc
4343

4444
| :? IOrPat as orPat ->
45-
visitPattern acc orPat.Pattern1
45+
collectPatterns acc orPat.Pattern1
4646

4747
| :? IListConsPat as pat ->
4848
let tailPat = getLastTailPattern pat
@@ -55,7 +55,7 @@ let rec private visitPattern (acc: ITreeNode list) (pattern: IFSharpPattern) =
5555

5656
let private collectPatternsRequiringAnnotations acc (parametersOwner: IParameterOwnerMemberDeclaration) =
5757
parametersOwner.ParameterPatterns
58-
|> Seq.fold visitPattern acc
58+
|> Seq.fold collectPatterns acc
5959

6060
let collectTypeHintAnchorsForBinding (binding: IBinding) =
6161
let acc: ITreeNode list = []
@@ -65,7 +65,7 @@ let collectTypeHintAnchorsForBinding (binding: IBinding) =
6565
let acc =
6666
if isNotNull binding.ReturnTypeInfo then acc
6767
elif binding.HasParameters then [binding :> ITreeNode]
68-
else visitPattern acc binding.HeadPattern
68+
else collectPatterns acc binding.HeadPattern
6969

7070
collectPatternsRequiringAnnotations acc binding
7171

@@ -75,7 +75,7 @@ let collectTypeHintAnchorsForLambda (lambda: ILambdaExpr) =
7575
if isNull lambda || isNull lambda.RArrow then acc else
7676

7777
lambda.PatternsEnumerable
78-
|> Seq.fold visitPattern acc
78+
|> Seq.fold collectPatterns acc
7979

8080
let collectTypeHintsAnchorsForMember (m: IMemberDeclaration) =
8181
let accessorDeclarations = m.AccessorDeclarations
@@ -93,8 +93,8 @@ let collectTypeHintAnchorsForConstructor (ctor: IConstructorDeclaration) =
9393

9494
let collectTypeHintAnchorsForEachExpr (forEachExpr: IForEachExpr) =
9595
if isNull forEachExpr.InExpression then []
96-
else visitPattern [] forEachExpr.Pattern
96+
else collectPatterns [] forEachExpr.Pattern
9797

9898
let collectTypeHintAnchorsForMatchClause (matchClause: IMatchClause) =
9999
if isNull matchClause.RArrow then []
100-
else visitPattern [] matchClause.Pattern
100+
else collectPatterns [] matchClause.Pattern

0 commit comments

Comments
 (0)