Skip to content

Commit 6ce22da

Browse files
T-GroT-Gro
committed
Fantomas applied
1 parent 924097b commit 6ce22da

6 files changed

Lines changed: 74 additions & 43 deletions

File tree

‎src/Compiler/Checking/CheckDeclarations.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5313,8 +5313,8 @@ let CheckOneSigFile (g, amap, thisCcu, checkForErrors, conditionalDefines, tcSin
53135313
use _ =
53145314
Activity.Start "CheckDeclarations.CheckOneSigFile"
53155315
[|
5316-
"fileName", fileName
5317-
"qualifiedNameOfFile", qualNameOfFile.Text
5316+
"fileName", sigFile.FileName
5317+
"qualifiedNameOfFile", sigFile.QualifiedName.Text
53185318
|]
53195319
let cenv =
53205320
cenv.Create

‎src/Compiler/Driver/CompilerOptions.fs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2315,11 +2315,12 @@ let PrintWholeAssemblyImplementation (tcConfig: TcConfig) outfile header expr =
23152315
let mutable tPrev: (DateTime * DateTime * float * int[]) option = None
23162316
let mutable nPrev: (string * IDisposable) option = None
23172317

2318-
let ReportTime (tcConfig: TcConfig) descr =
2318+
let ReportTime (tcConfig: TcConfig) descr =
23192319
match nPrev with
23202320
| None -> ()
2321-
| Some (prevDescr,prevActivity) ->
2321+
| Some (prevDescr, prevActivity) ->
23222322
use _ = prevActivity // Finish the previous diagnostics activity by .Dispose() at the end of this block
2323+
23232324
if tcConfig.pause then
23242325
dprintf "[done '%s', entering '%s'] press <enter> to continue... " prevDescr descr
23252326
Console.ReadLine() |> ignore
@@ -2385,7 +2386,7 @@ let ReportTime (tcConfig: TcConfig) descr =
23852386

23862387
tPrev <- Some(tStart, tNow, utNow, gcNow)
23872388

2388-
nPrev <- Some (descr, Activity.StartNoTags descr)
2389+
nPrev <- Some(descr, Activity.StartNoTags descr)
23892390

23902391
let ignoreFailureOnMono1_1_16 f =
23912392
try

‎src/Compiler/Driver/ParseAndCheckInputs.fs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,8 @@ let CheckOneInputAux
12011201

12021202
cancellable {
12031203
try
1204-
use _ = Activity.Start "ParseAndCheckInputs.CheckOneInput" [| "inputName", inp.FileName |]
1204+
use _ =
1205+
Activity.Start "ParseAndCheckInputs.CheckOneInput" [| "inputName", inp.FileName |]
12051206

12061207
CheckSimulateException tcConfig
12071208

‎src/Compiler/Facilities/Logger.fsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ module internal Activity =
1212

1313
val StartNoTags: name: string -> IDisposable
1414

15-
val Start: name: string -> tags: (string * #obj) seq -> IDisposable
15+
val Start: name: string -> tags: (string * #obj) seq -> IDisposable

‎src/Compiler/Service/FSharpCheckerResults.fs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2499,7 +2499,13 @@ module internal ParseAndCheckFile =
24992499
) =
25002500

25012501
cancellable {
2502-
use _ = Activity.Start "ParseAndCheckFile.CheckOneFile" [| "mainInputFileName", mainInputFileName; "Length", sourceText.Length.ToString() |]
2502+
use _ =
2503+
Activity.Start
2504+
"ParseAndCheckFile.CheckOneFile"
2505+
[|
2506+
"mainInputFileName", mainInputFileName
2507+
"Length", sourceText.Length.ToString()
2508+
|]
25032509

25042510
let parsedMainInput = parseResults.ParseTree
25052511

‎src/Compiler/Service/service.fs‎

Lines changed: 58 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,9 @@ type BackgroundCompiler
274274
/// creates an incremental builder used by the command line compiler.
275275
let CreateOneIncrementalBuilder (options: FSharpProjectOptions, userOpName) =
276276
node {
277-
use _ = Activity.Start "BackgroundCompiler.CreateOneIncrementalBuilder" [| "project", options.ProjectFileName |]
277+
use _ =
278+
Activity.Start "BackgroundCompiler.CreateOneIncrementalBuilder" [| "project", options.ProjectFileName |]
279+
278280
Trace.TraceInformation("FCS: {0}.{1} ({2})", userOpName, "CreateOneIncrementalBuilder", options.ProjectFileName)
279281
let projectReferences = getProjectReferences options userOpName
280282

@@ -403,8 +405,7 @@ type BackgroundCompiler
403405
| Some getBuilder ->
404406
node {
405407
match! getBuilder with
406-
| builderOpt, creationDiags when builderOpt.IsNone || not builderOpt.Value.IsReferencesInvalidated ->
407-
return builderOpt, creationDiags
408+
| builderOpt, creationDiags when builderOpt.IsNone || not builderOpt.Value.IsReferencesInvalidated -> return builderOpt, creationDiags
408409
| _ ->
409410
// The builder could be re-created,
410411
// clear the check file caches that are associated with it.
@@ -465,7 +466,8 @@ type BackgroundCompiler
465466

466467
member _.ParseFile(fileName: string, sourceText: ISourceText, options: FSharpParsingOptions, cache: bool, userOpName: string) =
467468
async {
468-
use _ = Activity.Start "BackgroundCompiler.ParseFile" [| "filename", fileName; "UserOpName", userOpName; "cache", cache.ToString() |]
469+
use _ =
470+
Activity.Start "BackgroundCompiler.ParseFile" [| "filename", fileName; "UserOpName", userOpName; "cache", cache.ToString() |]
469471

470472
if cache then
471473
let hash = sourceText.GetHashCode() |> int64
@@ -491,7 +493,9 @@ type BackgroundCompiler
491493
/// Fetch the parse information from the background compiler (which checks w.r.t. the FileSystem API)
492494
member _.GetBackgroundParseResultsForFileInProject(fileName, options, userOpName) =
493495
node {
494-
use _ = Activity.Start "BackgroundCompiler.GetBackgroundParseResultsForFileInProject" [| "filename", fileName; "UserOpName", userOpName |]
496+
use _ =
497+
Activity.Start "BackgroundCompiler.GetBackgroundParseResultsForFileInProject" [| "filename", fileName; "UserOpName", userOpName |]
498+
495499
let! builderOpt, creationDiags = getOrCreateBuilder (options, userOpName)
496500

497501
match builderOpt with
@@ -693,8 +697,8 @@ type BackgroundCompiler
693697
member bc.ParseAndCheckFileInProject(fileName: string, fileVersion, sourceText: ISourceText, options: FSharpProjectOptions, userOpName) =
694698
node {
695699
use _ =
696-
Activity.Start
697-
"BackgroundCompiler.ParseAndCheckFileInProject"
700+
Activity.Start
701+
"BackgroundCompiler.ParseAndCheckFileInProject"
698702
[|
699703
"project", options.ProjectFileName
700704
"fileName", fileName
@@ -713,8 +717,7 @@ type BackgroundCompiler
713717
let! cachedResults = bc.GetCachedCheckFileResult(builder, fileName, sourceText, options)
714718

715719
match cachedResults with
716-
| Some (parseResults, checkResults) ->
717-
return (parseResults, FSharpCheckFileAnswer.Succeeded checkResults)
720+
| Some (parseResults, checkResults) -> return (parseResults, FSharpCheckFileAnswer.Succeeded checkResults)
718721
| _ ->
719722
let! tcPrior = builder.GetCheckResultsBeforeFileInProject fileName
720723
let! tcInfo = tcPrior.GetOrComputeTcInfo()
@@ -740,8 +743,8 @@ type BackgroundCompiler
740743
member _.GetBackgroundCheckResultsForFileInProject(fileName, options, userOpName) =
741744
node {
742745
use _ =
743-
Activity.Start
744-
"BackgroundCompiler.ParseAndCheckFileInProject"
746+
Activity.Start
747+
"BackgroundCompiler.ParseAndCheckFileInProject"
745748
[|
746749
"project", options.ProjectFileName
747750
"fileName", fileName
@@ -832,14 +835,15 @@ type BackgroundCompiler
832835
) =
833836
node {
834837
use _ =
835-
Activity.Start
836-
"BackgroundCompiler.FindReferencesInFile"
838+
Activity.Start
839+
"BackgroundCompiler.FindReferencesInFile"
837840
[|
838841
"project", options.ProjectFileName
839842
"fileName", fileName
840843
"userOpName", userOpName
841844
"symbol", symbol.FullName
842845
|]
846+
843847
let! builderOpt, _ = getOrCreateBuilderWithInvalidationFlag (options, canInvalidateProject, userOpName)
844848

845849
match builderOpt with
@@ -859,13 +863,14 @@ type BackgroundCompiler
859863
member _.GetSemanticClassificationForFile(fileName: string, options: FSharpProjectOptions, userOpName: string) =
860864
node {
861865
use _ =
862-
Activity.Start
863-
"BackgroundCompiler.GetSemanticClassificationForFile"
866+
Activity.Start
867+
"BackgroundCompiler.GetSemanticClassificationForFile"
864868
[|
865869
"project", options.ProjectFileName
866870
"fileName", fileName
867-
"userOpName", userOpName
871+
"userOpName", userOpName
868872
|]
873+
869874
let! builderOpt, _ = getOrCreateBuilder (options, userOpName)
870875

871876
match builderOpt with
@@ -882,13 +887,14 @@ type BackgroundCompiler
882887
/// Try to get recent approximate type check results for a file.
883888
member _.TryGetRecentCheckResultsForFile(fileName: string, options: FSharpProjectOptions, sourceText: ISourceText option, _userOpName: string) =
884889
use _ =
885-
Activity.Start
886-
"BackgroundCompiler.GetSemanticClassificationForFile"
887-
[|
888-
"project", options.ProjectFileName
889-
"fileName", fileName
890-
"userOpName", _userOpName
891-
|]
890+
Activity.Start
891+
"BackgroundCompiler.GetSemanticClassificationForFile"
892+
[|
893+
"project", options.ProjectFileName
894+
"fileName", fileName
895+
"userOpName", _userOpName
896+
|]
897+
892898
match sourceText with
893899
| Some sourceText ->
894900
let hash = sourceText.GetHashCode() |> int64
@@ -961,7 +967,9 @@ type BackgroundCompiler
961967

962968
member _.GetAssemblyData(options, userOpName) =
963969
node {
964-
use _ = Activity.Start "BackgroundCompiler.GetAssemblyData" [|"project", options.ProjectFileName; "userOpName", userOpName |]
970+
use _ =
971+
Activity.Start "BackgroundCompiler.GetAssemblyData" [| "project", options.ProjectFileName; "userOpName", userOpName |]
972+
965973
let! builderOpt, _ = getOrCreateBuilder (options, userOpName)
966974

967975
match builderOpt with
@@ -982,7 +990,9 @@ type BackgroundCompiler
982990

983991
/// Parse and typecheck the whole project.
984992
member bc.ParseAndCheckProject(options, userOpName) =
985-
use _ = Activity.Start "BackgroundCompiler.ParseAndCheckProject" [| "project", options.ProjectFileName; "userOpName", userOpName |]
993+
use _ =
994+
Activity.Start "BackgroundCompiler.ParseAndCheckProject" [| "project", options.ProjectFileName; "userOpName", userOpName |]
995+
986996
bc.ParseAndCheckProjectImpl(options, userOpName)
987997

988998
member _.GetProjectOptionsFromScript
@@ -999,7 +1009,9 @@ type BackgroundCompiler
9991009
optionsStamp: int64 option,
10001010
_userOpName
10011011
) =
1002-
use _ = Activity.Start "BackgroundCompiler.GetProjectOptionsFromScript" [| "fileName", fileName; "userOpName", _userOpName |]
1012+
use _ =
1013+
Activity.Start "BackgroundCompiler.GetProjectOptionsFromScript" [| "fileName", fileName; "userOpName", _userOpName |]
1014+
10031015
cancellable {
10041016
use diagnostics = new DiagnosticsScope()
10051017

@@ -1084,7 +1096,9 @@ type BackgroundCompiler
10841096
|> Cancellable.toAsync
10851097

10861098
member bc.InvalidateConfiguration(options: FSharpProjectOptions, userOpName) =
1087-
use _ = Activity.Start "BackgroundCompiler.InvalidateConfiguration" [| "project", options.ProjectFileName; "userOpName", userOpName |]
1099+
use _ =
1100+
Activity.Start "BackgroundCompiler.InvalidateConfiguration" [| "project", options.ProjectFileName; "userOpName", userOpName |]
1101+
10881102
if incrementalBuildersCache.ContainsSimilarKey(AnyCallerThread, options) then
10891103
parseCacheLock.AcquireLock(fun ltok ->
10901104
for sourceFile in options.SourceFiles do
@@ -1095,12 +1109,15 @@ type BackgroundCompiler
10951109

10961110
member bc.ClearCache(options: seq<FSharpProjectOptions>, _userOpName) =
10971111
use _ = Activity.Start "BackgroundCompiler.ClearCache" [| "userOpName", _userOpName |]
1112+
10981113
lock gate (fun () ->
10991114
options
11001115
|> Seq.iter (fun options -> incrementalBuildersCache.RemoveAnySimilar(AnyCallerThread, options)))
11011116

11021117
member _.NotifyProjectCleaned(options: FSharpProjectOptions, userOpName) =
1103-
use _ = Activity.Start "BackgroundCompiler.NotifyProjectCleaned" [| "project", options.ProjectFileName; "userOpName", userOpName |]
1118+
use _ =
1119+
Activity.Start "BackgroundCompiler.NotifyProjectCleaned" [| "project", options.ProjectFileName; "userOpName", userOpName |]
1120+
11041121
async {
11051122
let! ct = Async.CancellationToken
11061123
// If there was a similar entry (as there normally will have been) then re-establish an empty builder . This
@@ -1120,7 +1137,8 @@ type BackgroundCompiler
11201137
member _.ProjectChecked = projectChecked.Publish
11211138

11221139
member _.ClearCaches() =
1123-
use _ = Activity.StartNoTags "BackgroundCompiler.ClearCaches"
1140+
use _ = Activity.StartNoTags "BackgroundCompiler.ClearCaches"
1141+
11241142
lock gate (fun () ->
11251143
parseCacheLock.AcquireLock(fun ltok ->
11261144
checkFileInProjectCache.Clear(ltok)
@@ -1131,7 +1149,8 @@ type BackgroundCompiler
11311149
scriptClosureCache.Clear AnyCallerThread)
11321150

11331151
member _.DownsizeCaches() =
1134-
use _ = Activity.StartNoTags "BackgroundCompiler.DownsizeCaches"
1152+
use _ = Activity.StartNoTags "BackgroundCompiler.DownsizeCaches"
1153+
11351154
lock gate (fun () ->
11361155
parseCacheLock.AcquireLock(fun ltok ->
11371156
checkFileInProjectCache.Resize(ltok, newKeepStrongly = 1)
@@ -1222,7 +1241,8 @@ type FSharpChecker
12221241
?parallelReferenceResolution
12231242
) =
12241243

1225-
use _ = Activity.StartNoTags "FSharpChecker.Create"
1244+
use _ = Activity.StartNoTags "FSharpChecker.Create"
1245+
12261246
let legacyReferenceResolver =
12271247
match legacyReferenceResolver with
12281248
| Some rr -> rr
@@ -1264,7 +1284,7 @@ type FSharpChecker
12641284

12651285
member _.MatchBraces(fileName, sourceText: ISourceText, options: FSharpParsingOptions, ?userOpName: string) =
12661286
let userOpName = defaultArg userOpName "Unknown"
1267-
use _ = Activity.Start "FSharpChecker.MatchBraces" [| "fileName", fileName; "userOpName", userOpName |]
1287+
use _ = Activity.Start "FSharpChecker.MatchBraces" [| "fileName", fileName; "userOpName", userOpName |]
12681288
let hash = sourceText.GetHashCode() |> int64
12691289

12701290
async {
@@ -1316,7 +1336,8 @@ type FSharpChecker
13161336

13171337
member _.Compile(argv: string[], ?userOpName: string) =
13181338
let _userOpName = defaultArg userOpName "Unknown"
1319-
use _ = Activity.Start "FSharpChecker.Compile" [| "userOpName", _userOpName |]
1339+
use _ = Activity.Start "FSharpChecker.Compile" [| "userOpName", _userOpName |]
1340+
13201341
async {
13211342
let ctok = CompilationThreadToken()
13221343
return CompileHelpers.compileFromArgs (ctok, argv, legacyReferenceResolver, None, None)
@@ -1326,15 +1347,17 @@ type FSharpChecker
13261347
/// For example, the type provider approvals file may have changed.
13271348
member ic.InvalidateAll() = ic.ClearCaches()
13281349

1329-
member ic.ClearCaches() =
1350+
member ic.ClearCaches() =
13301351
let utok = AnyCallerThread
13311352
braceMatchCache.Clear(utok)
13321353
backgroundCompiler.ClearCaches()
13331354
ClearAllILModuleReaderCache()
13341355

13351356
// This is for unit testing only
13361357
member ic.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients() =
1337-
use _ = Activity.StartNoTags "FsharpChecker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients"
1358+
use _ =
1359+
Activity.StartNoTags "FsharpChecker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients"
1360+
13381361
ic.ClearCaches()
13391362
GC.Collect()
13401363
GC.WaitForPendingFinalizers()

0 commit comments

Comments
 (0)