Skip to content

Commit 5a538ef

Browse files
committed
Core(Framework,Rules): SuggestedFix refactoring
Removed FromText property of SuggestedFix as it duplicates FromRange functionality and is not actually used anywhere.
1 parent 81ccc0c commit 5a538ef

25 files changed

+40
-96
lines changed

src/FSharpLint.Core/Framework/Suggestion.fs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ open FSharp.Compiler.Text
66
/// Information for consuming applications to provide an automated fix for a lint suggestion.
77
[<NoEquality; NoComparison>]
88
type SuggestedFix = {
9-
/// Text to be replaced.
10-
FromText:string
11-
129
/// Location of the text to be replaced.
1310
FromRange:Range
1411

src/FSharpLint.Core/Rules/Conventions/AvoidSinglePipeOperator.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ let runner (args: AstNodeRuleParams) =
4949
match (maybeFuncText, maybeArgText) with
5050
| Some(funcText), Some(argText) ->
5151
let replacementText = sprintf "%s %s" funcText argText
52-
Some { FromText=args.FileContent; FromRange=range; ToText=replacementText }
52+
Some { FromRange=range; ToText=replacementText }
5353
| _ -> None)
5454
errors ident.idRange (Some suggestedFix)
5555
else

src/FSharpLint.Core/Rules/Conventions/Binding/FavourAsKeyword.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ let private checkForNamedPatternEqualsConstant (args:AstNodeRuleParams) pattern
2929

3030
ExpressionUtilities.tryFindTextOfRange constRange args.FileContent
3131
|> Option.bind (fun constText ->
32-
Some (lazy (Some { FromText = text; FromRange = fromRange; ToText = $"{constText} as {ident.idText}"}))
32+
Some (lazy (Some { FromRange = fromRange; ToText = $"{constText} as {ident.idText}"}))
3333
)
3434
)
3535

src/FSharpLint.Core/Rules/Conventions/Binding/FavourIgnoreOverLetWild.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ let private checkForBindingToAWildcard pattern range fileContent (expr: SynExpr)
2020
{ Range = range
2121
Message = Resources.GetString("RulesFavourIgnoreOverLetWildError")
2222
SuggestedFix = Some (lazy (Some({ FromRange = letBindingRange
23-
FromText = fileContent
2423
ToText = sprintf "(%s) |> ignore" exprText })))
2524
TypeChecks = List.Empty }
2625
else

src/FSharpLint.Core/Rules/Conventions/Binding/FavourTypedIgnore.fs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ let private runner (args: AstNodeRuleParams) =
1515
(ExpressionUtilities.tryFindTextOfRange range text
1616
|> Option.map
1717
(fun fromText ->
18-
{ FromText = fromText
19-
FromRange = range
18+
{ FromRange = range
2019
ToText = identifier }))
2120

2221
{

src/FSharpLint.Core/Rules/Conventions/Binding/TupleOfWildcards.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ let private checkTupleOfWildcards fileContents pattern identifier identifierRang
2828
let refactorTo = constructorString 1
2929
let error = String.Format(errorFormat, refactorFrom, refactorTo)
3030
let suggestedFix = lazy(
31-
Some { SuggestedFix.FromRange = identifierRange; FromText = fileContents; ToText = refactorTo })
31+
Some { SuggestedFix.FromRange = identifierRange; ToText = refactorTo })
3232
Array.singleton
3333
{
3434
Range = range

src/FSharpLint.Core/Rules/Conventions/Binding/UselessBinding.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ let private runner (args:AstNodeRuleParams) =
5151
let maybeSuggestedFix =
5252
match args.GetParents(args.NodeIndex) with
5353
| AstNode.ModuleDeclaration(SynModuleDecl.Let(_, _, range)) :: _ ->
54-
Some({ FromRange = range; FromText = "let"; ToText = String.Empty })
54+
Some({ FromRange = range; ToText = String.Empty })
5555
| AstNode.Expression(SynExpr.LetOrUse(_, false, _, _, range, _)) :: _ ->
56-
Some({ FromRange = range; FromText = "use"; ToText = String.Empty })
56+
Some({ FromRange = range; ToText = String.Empty })
5757
| _ -> None
5858
match args.AstNode with
5959
| AstNode.Binding(SynBinding(_, _, _, isMutable, _, _, _, pattern, _, expr, range, _, _))

src/FSharpLint.Core/Rules/Conventions/Binding/WildcardNamedWithAsPattern.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let private checkForWildcardNamedWithAsPattern fileContents pattern =
1313
when wildcardRange <> range ->
1414
let suggestedFix =
1515
lazy(
16-
Some { FromRange = range; FromText = fileContents; ToText = identifier.idText })
16+
Some { FromRange = range; ToText = identifier.idText })
1717
Array.singleton
1818
{ Range = range
1919
Message = Resources.GetString("RulesWildcardNamedWithAsPattern")

src/FSharpLint.Core/Rules/Conventions/FavourConsistentThis.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let runner (config: Config) args =
2424
if identifiers.Length = 2 then
2525
match identifiers with
2626
| head::_ when isNotConsistent head.idText symbol ->
27-
let suggestedFix = lazy(Some({ FromRange = head.idRange; FromText = head.idText; ToText = symbol }))
27+
let suggestedFix = lazy(Some({ FromRange = head.idRange; ToText = symbol }))
2828
let error =
2929
Array.singleton
3030
{ Range = range

src/FSharpLint.Core/Rules/Conventions/FavourReRaise.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let private runner (args: AstNodeRuleParams) =
1818
let rec checkExpr (expr) maybeIdent =
1919
match expr with
2020
| SynExpr.App (_, _, SynExpr.Ident raiseId, expression, range) when raiseId.idText = "raise" ->
21-
let suggestedFix = lazy(Some({ FromRange = range; FromText = raiseId.idText; ToText = "reraise()" }))
21+
let suggestedFix = lazy(Some({ FromRange = range; ToText = "reraise()" }))
2222
match expression with
2323
| SynExpr.Ident ident ->
2424
match maybeIdent with

0 commit comments

Comments
 (0)