Skip to content

[WIP] cleanup/renaming #11937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 1 commit into from
Aug 9, 2021
Merged

[WIP] cleanup/renaming #11937

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions src/fsharp/service/FSharpParseFileResults.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ type FSharpParseFileResults(diagnostics: FSharpDiagnostic[], input: ParsedInput,
| None -> None
| Some clause ->
match clause with
| SynMatchClause.SynMatchClause (_, whenExpr, resultExpr, _, _) ->
match whenExpr with
| SynMatchClause.SynMatchClause (_, whenExprOpt, resultExpr, _, _) ->
match whenExprOpt with
| None ->
getIdentRangeForFuncExprInApp traverseSynExpr resultExpr pos
| Some whenExpr ->
Expand Down Expand Up @@ -454,15 +454,18 @@ type FSharpParseFileResults(diagnostics: FSharpDiagnostic[], input: ParsedInput,
yield! walkExpr (isFunction || (match spInfo with DebugPointAtBinding.Yes _ -> false | _-> true)) synExpr ]

and walkExprs es = List.collect (walkExpr false) es

and walkBinds es = List.collect walkBind es

and walkMatchClauses cl =
[ for SynMatchClause(_, whenExpr, e, _, _) in cl do
match whenExpr with
| Some e -> yield! walkExpr false e
[ for SynMatchClause(_, whenExprOpt, tgtExpr, _, _) in cl do
match whenExprOpt with
| Some whenExpr -> yield! walkExpr false whenExpr
| _ -> ()
yield! walkExpr true e ]
yield! walkExpr true tgtExpr ]

and walkExprOpt (spAlways: bool) eOpt = [ match eOpt with Some e -> yield! walkExpr spAlways e | _ -> () ]
and walkExprOpt (spAlways: bool) eOpt =
[ match eOpt with Some e -> yield! walkExpr spAlways e | _ -> () ]

and IsBreakableExpression e =
match e with
Expand All @@ -475,13 +478,13 @@ type FSharpParseFileResults(diagnostics: FSharpDiagnostic[], input: ParsedInput,

// Determine the breakpoint locations for an expression. spAlways indicates we always
// emit a breakpoint location for the expression unless it is a syntactic control flow construct
and walkExpr (spAlways: bool) e =
let m = e.Range
and walkExpr (spAlways: bool) expr =
let m = expr.Range
if not (isMatchRange m) then [] else
[ if spAlways && IsBreakableExpression e then
[ if spAlways && IsBreakableExpression expr then
yield! checkRange m

match e with
match expr with
| SynExpr.ArbitraryAfterError _
| SynExpr.LongIdent _
| SynExpr.LibraryOnlyILAssembly _
Expand Down Expand Up @@ -588,24 +591,24 @@ type FSharpParseFileResults(diagnostics: FSharpDiagnostic[], input: ParsedInput,
yield! walkExprOpt false whenExpr
yield! walkExpr true e

| SynExpr.Lambda (_, _, _, e, _, _) ->
yield! walkExpr true e
| SynExpr.Lambda (_, _, _, bodyExpr, _, _) ->
yield! walkExpr true bodyExpr

| SynExpr.Match (spBind, e, cl, _) ->
| SynExpr.Match (spBind, inpExpr, cl, _) ->
yield! walkBindSeqPt spBind
yield! walkExpr false e
for SynMatchClause(_, whenExpr, e, _, _) in cl do
yield! walkExpr false inpExpr
for SynMatchClause(_, whenExpr, tgtExpr, _, _) in cl do
yield! walkExprOpt false whenExpr
yield! walkExpr true e
yield! walkExpr true tgtExpr

| SynExpr.LetOrUse (_, _, bs, e, _) ->
yield! walkBinds bs
yield! walkExpr true e
| SynExpr.LetOrUse (_, _, binds, bodyExpr, _) ->
yield! walkBinds binds
yield! walkExpr true bodyExpr

| SynExpr.TryWith (e, _, cl, _, _, spTry, spWith) ->
| SynExpr.TryWith (tryExpr, _, cl, _, _, spTry, spWith) ->
yield! walkTrySeqPt spTry
yield! walkWithSeqPt spWith
yield! walkExpr true e
yield! walkExpr true tryExpr
yield! walkMatchClauses cl

| SynExpr.TryFinally (e1, e2, _, spTry, spFinally) ->
Expand Down