Skip to content

Commit bdb546b

Browse files
safesparrowsafesparrow
committed
Fantomas formatting
1 parent c86c851 commit bdb546b

File tree

6 files changed

+74
-68
lines changed

6 files changed

+74
-68
lines changed

‎src/Compiler/Driver/ParseAndCheckInputs.fs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -857,10 +857,7 @@ let ProcessMetaCommandsFromInput
857857
| ParsedHashDirective ("nowarn", ParsedHashDirectiveArguments numbers, m) ->
858858
List.fold (fun state d -> nowarnF state (m, d)) state numbers
859859

860-
| ParsedHashDirective (("reference"
861-
| "r"),
862-
ParsedHashDirectiveArguments args,
863-
m) ->
860+
| ParsedHashDirective (("reference" | "r"), ParsedHashDirectiveArguments args, m) ->
864861
matchedm <- m
865862
ProcessDependencyManagerDirective Directive.Resolution args m state
866863

@@ -1139,8 +1136,8 @@ let CheckOneInput
11391136

11401137
cancellable {
11411138
try
1142-
use _ = Activity.instance.Start "CheckOneInput" [|"inputName", inp.FileName|]
1143-
1139+
use _ = Activity.instance.Start "CheckOneInput" [| "inputName", inp.FileName |]
1140+
11441141
CheckSimulateException tcConfig
11451142

11461143
let m = inp.Range

‎src/Compiler/Driver/fsc.fs‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ let TypeCheck
166166
inputs,
167167
exiter: Exiter
168168
) =
169-
use _ = Activity.instance.Start "typecheck_inputs" [|"assemblyName", assemblyName|]
169+
use _ =
170+
Activity.instance.Start "typecheck_inputs" [| "assemblyName", assemblyName |]
170171

171172
try
172173
if isNil inputs then
@@ -476,7 +477,7 @@ let main1
476477
diagnosticsLoggerProvider: DiagnosticsLoggerProvider,
477478
disposables: DisposablesTracker
478479
) =
479-
480+
480481
use mainActivity = new Activity("main")
481482

482483
// See Bug 735819
@@ -598,7 +599,9 @@ let main1
598599

599600
// Import basic assemblies
600601
let tcGlobals, frameworkTcImports =
601-
use frameworkImportsActivity = Activity.instance.StartNoTags("import_framework_references")
602+
use frameworkImportsActivity =
603+
Activity.instance.StartNoTags("import_framework_references")
604+
602605
TcImports.BuildFrameworkTcImports(foundationalTcConfigP, sysRes, otherRes)
603606
|> NodeCode.RunImmediateWithoutCancellation
604607

@@ -651,7 +654,9 @@ let main1
651654
ReportTime tcConfig "Import non-system references"
652655

653656
let tcImports =
654-
use nonFrameworkImportsActivity = Activity.instance.StartNoTags("import_non_framework_references")
657+
use nonFrameworkImportsActivity =
658+
Activity.instance.StartNoTags("import_non_framework_references")
659+
655660
TcImports.BuildNonFrameworkTcImports(tcConfigP, frameworkTcImports, otherRes, knownUnresolved, dependencyProvider)
656661
|> NodeCode.RunImmediateWithoutCancellation
657662

@@ -730,9 +735,9 @@ let main1OfAst
730735
disposables: DisposablesTracker,
731736
inputs: ParsedInput list
732737
) =
733-
738+
734739
use main1AstActivity = Activity.instance.StartNoTags("main1_of_ast")
735-
740+
736741
let tryGetMetadataSnapshot = (fun _ -> None)
737742

738743
let directoryBuildingFrom = Directory.GetCurrentDirectory()
@@ -1396,6 +1401,7 @@ let CompileFromCommandLineArguments
13961401
with _ ->
13971402
()
13981403
}
1404+
13991405
main1 (
14001406
ctok,
14011407
argv,

‎src/Compiler/Facilities/BuildGraph.fsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ type NodeCodeBuilder =
4848
/// A limited form 'use' for establishing the compilation globals. (Note
4949
/// that a proper generic 'use' could be implemented but has not currently been necessary)
5050
member Using: CompilationGlobalsScope * (CompilationGlobalsScope -> NodeCode<'T>) -> NodeCode<'T>
51-
51+
5252
member Using: ActivityFacade * (ActivityFacade -> NodeCode<'T>) -> NodeCode<'T>
5353

5454
/// Specifies code that can be run as part of the build graph.

‎src/Compiler/Facilities/Logger.fsi‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ module Activity =
99

1010
type ActivityFacade =
1111
interface IDisposable
12-
new : Activity option -> ActivityFacade
13-
member AddTag : string -> #obj -> unit
14-
member Perform : (Activity -> unit) -> unit
15-
member Dispose : unit -> unit
12+
new: Activity option -> ActivityFacade
13+
member AddTag: string -> #obj -> unit
14+
member Perform: (Activity -> unit) -> unit
15+
member Dispose: unit -> unit
1616

1717
type ActivitySourceFacade =
1818
interface IDisposable
19-
new : ActivitySource -> ActivitySourceFacade
20-
member Start : string -> (string * #obj) seq -> ActivityFacade
21-
member StartNoTags : string -> ActivityFacade
22-
member Name : string
23-
member Dispose : unit -> unit
19+
new: ActivitySource -> ActivitySourceFacade
20+
member Start: string -> (string * #obj) seq -> ActivityFacade
21+
member StartNoTags: string -> ActivityFacade
22+
member Name: string
23+
member Dispose: unit -> unit
2424

2525
val instance: ActivitySourceFacade
2626

‎src/Compiler/Service/FSharpCheckerResults.fs‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,7 @@ type FSharpSymbolUse(denv: DisplayEnv, symbol: FSharpSymbol, inst: TyparInstanti
247247
// 'seq' in 'seq { ... }' gets colored as keywords
248248
| Item.Value vref, ItemOccurence.Use when valRefEq denv.g denv.g.seq_vref vref -> true
249249
// custom builders, custom operations get colored as keywords
250-
| (Item.CustomBuilder _
251-
| Item.CustomOperation _),
252-
ItemOccurence.Use -> true
250+
| (Item.CustomBuilder _ | Item.CustomOperation _), ItemOccurence.Use -> true
253251
| _ -> false
254252

255253
member _.IsFromOpenStatement = itemOcc = ItemOccurence.Open
@@ -2310,14 +2308,8 @@ module internal ParseAndCheckFile =
23102308

23112309
matchBraces stackAfterMatch
23122310

2313-
| LPAREN
2314-
| LBRACE _
2315-
| LBRACK
2316-
| LBRACE_BAR
2317-
| LBRACK_BAR
2318-
| LQUOTE _
2319-
| LBRACK_LESS as tok,
2320-
_ -> matchBraces ((tok, lexbuf.LexemeRange) :: stack)
2311+
| LPAREN | LBRACE _ | LBRACK | LBRACE_BAR | LBRACK_BAR | LQUOTE _ | LBRACK_LESS as tok, _ ->
2312+
matchBraces ((tok, lexbuf.LexemeRange) :: stack)
23212313

23222314
// INTERP_STRING_BEGIN_PART corresponds to $"... {" at the start of an interpolated string
23232315
//
@@ -2326,19 +2318,15 @@ module internal ParseAndCheckFile =
23262318
// interpolation expression)
23272319
//
23282320
// Either way we start a new potential match at the last character
2329-
| INTERP_STRING_BEGIN_PART _
2330-
| INTERP_STRING_PART _ as tok,
2331-
_ ->
2321+
| INTERP_STRING_BEGIN_PART _ | INTERP_STRING_PART _ as tok, _ ->
23322322
let m = lexbuf.LexemeRange
23332323

23342324
let m2 =
23352325
mkFileIndexRange m.FileIndex (mkPos m.End.Line (max (m.End.Column - 1) 0)) m.End
23362326

23372327
matchBraces ((tok, m2) :: stack)
23382328

2339-
| (EOF _
2340-
| LEX_FAILURE _),
2341-
_ -> ()
2329+
| (EOF _ | LEX_FAILURE _), _ -> ()
23422330
| _ -> matchBraces stack
23432331

23442332
matchBraces [])
@@ -2347,8 +2335,8 @@ module internal ParseAndCheckFile =
23472335

23482336
let parseFile (sourceText: ISourceText, fileName, options: FSharpParsingOptions, userOpName: string, suggestNamesForErrors: bool) =
23492337
Trace.TraceInformation("FCS: {0}.{1} ({2})", userOpName, "parseFile", fileName)
2350-
use act = Activity.instance.Start "parseFile" [|"fileName", fileName|]
2351-
2338+
use act = Activity.instance.Start "parseFile" [| "fileName", fileName |]
2339+
23522340
let errHandler =
23532341
ErrorHandler(true, fileName, options.DiagnosticOptions, sourceText, suggestNamesForErrors)
23542342

‎src/Compiler/Service/service.fs‎

Lines changed: 42 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ type BackgroundCompiler
390390
/// creates an incremental builder used by the command line compiler.
391391
let CreateOneIncrementalBuilder (options: FSharpProjectOptions, userOpName) =
392392
node {
393-
use _ = Activity.instance.Start "CreateOneIncrementalBuilder" [|"project", options.ProjectFileName|]
393+
use _ = Activity.instance.Start "CreateOneIncrementalBuilder" [| "project", options.ProjectFileName |]
394394
Trace.TraceInformation("FCS: {0}.{1} ({2})", userOpName, "CreateOneIncrementalBuilder", options.ProjectFileName)
395395
let projectReferences = getProjectReferences options userOpName
396396

@@ -582,7 +582,9 @@ type BackgroundCompiler
582582

583583
member _.ParseFile(fileName: string, sourceText: ISourceText, options: FSharpParsingOptions, cache: bool, userOpName: string) =
584584
async {
585-
use _ = Activity.instance.Start "CompileToDynamicAssembly1" [|"filename", fileName; "UserOpName", userOpName|]
585+
use _ =
586+
Activity.instance.Start "CompileToDynamicAssembly1" [| "filename", fileName; "UserOpName", userOpName |]
587+
586588
if cache then
587589
let hash = sourceText.GetHashCode() |> int64
588590

@@ -737,12 +739,14 @@ type BackgroundCompiler
737739
) =
738740
node {
739741
use _ =
740-
Activity.instance.Start "CheckFileInProjectAllowingStaleCachedResults"
742+
Activity.instance.Start
743+
"CheckFileInProjectAllowingStaleCachedResults"
741744
[|
742745
"Project", options.ProjectFileName
743746
"filename", fileName
744-
"UserOpName", userOpName
747+
"UserOpName", userOpName
745748
|]
749+
746750
let! cachedResults =
747751
node {
748752
let! builderOpt, creationDiags = getAnyBuilder (options, userOpName)
@@ -776,7 +780,15 @@ type BackgroundCompiler
776780
/// Type-check the result obtained by parsing. Force the evaluation of the antecedent type checking context if needed.
777781
member bc.CheckFileInProject(parseResults: FSharpParseFileResults, fileName, fileVersion, sourceText: ISourceText, options, userOpName) =
778782
node {
779-
use _ = Activity.instance.Start "CheckFileInProject" [|"project", options.ProjectFileName; "fileName", fileName; "userOpName", userOpName|]
783+
use _ =
784+
Activity.instance.Start
785+
"CheckFileInProject"
786+
[|
787+
"project", options.ProjectFileName
788+
"fileName", fileName
789+
"userOpName", userOpName
790+
|]
791+
780792
let! builderOpt, creationDiags = getOrCreateBuilder (options, userOpName)
781793

782794
match builderOpt with
@@ -796,7 +808,9 @@ type BackgroundCompiler
796808
/// Parses and checks the source file and returns untyped AST and check results.
797809
member bc.ParseAndCheckFileInProject(fileName: string, fileVersion, sourceText: ISourceText, options: FSharpProjectOptions, userOpName) =
798810
node {
799-
use _ = Activity.instance.Start "Service_ParseAndCheckFileInProject" [|"project", options.ProjectFileName; "fileName", fileName|]
811+
use _ =
812+
Activity.instance.Start "Service_ParseAndCheckFileInProject" [| "project", options.ProjectFileName; "fileName", fileName |]
813+
800814
let strGuid = "_ProjectId=" + (options.ProjectId |> Option.defaultValue "null")
801815
Logger.LogBlockMessageStart (fileName + strGuid) LogCompilerFunctionId.Service_ParseAndCheckFileInProject
802816

@@ -1391,7 +1405,7 @@ type FSharpChecker
13911405
let _userOpName = defaultArg userOpName "Unknown"
13921406

13931407
async {
1394-
use _ = Activity.instance.Start "CompileToDynamicAssembly1" [|"UserOpName", _userOpName|]
1408+
use _ = Activity.instance.Start "CompileToDynamicAssembly1" [| "UserOpName", _userOpName |]
13951409
let ctok = CompilationThreadToken()
13961410
CompileHelpers.setOutputStreams execute
13971411

@@ -1434,7 +1448,9 @@ type FSharpChecker
14341448
let _userOpName = defaultArg userOpName "Unknown"
14351449

14361450
async {
1437-
use _ = Activity.instance.Start "CompileToDynamicAssembly2" [|"Assembly", assemblyName; "UserOpName", _userOpName|]
1451+
use _ =
1452+
Activity.instance.Start "CompileToDynamicAssembly2" [| "Assembly", assemblyName; "UserOpName", _userOpName |]
1453+
14381454
let ctok = CompilationThreadToken()
14391455
CompileHelpers.setOutputStreams execute
14401456

@@ -1528,6 +1544,7 @@ type FSharpChecker
15281544
?userOpName: string
15291545
) =
15301546
let userOpName = defaultArg userOpName "Unknown"
1547+
15311548
backgroundCompiler.CheckFileInProjectAllowingStaleCachedResults(
15321549
parseResults,
15331550
fileName,
@@ -1551,6 +1568,7 @@ type FSharpChecker
15511568
) =
15521569
async {
15531570
let userOpName = defaultArg userOpName "Unknown"
1571+
15541572
return!
15551573
backgroundCompiler.CheckFileInProject(parseResults, fileName, fileVersion, sourceText, options, userOpName)
15561574
|> Async.AwaitNodeCode
@@ -1565,30 +1583,31 @@ type FSharpChecker
15651583
sourceText: ISourceText,
15661584
options: FSharpProjectOptions,
15671585
?userOpName: string
1568-
) =
1586+
) =
15691587
async {
15701588
let userOpName = defaultArg userOpName "Unknown"
1589+
15711590
use _ =
1572-
Activity.instance.Start "ParseAndCheckFileInProject"
1591+
Activity.instance.Start
1592+
"ParseAndCheckFileInProject"
15731593
[|
15741594
"Project", options.ProjectFileName
15751595
"filename", fileName
1576-
"UserOpName", userOpName
1596+
"UserOpName", userOpName
15771597
|]
1578-
return!
1598+
1599+
return!
15791600
backgroundCompiler.ParseAndCheckFileInProject(fileName, fileVersion, sourceText, options, userOpName)
15801601
|> Async.AwaitNodeCode
15811602
}
15821603

15831604
member _.ParseAndCheckProject(options, ?userOpName: string) =
15841605
async {
15851606
let userOpName = defaultArg userOpName "Unknown"
1607+
15861608
use _ =
1587-
Activity.instance.Start "ParseAndCheckProject"
1588-
[|
1589-
"Project", options.ProjectFileName
1590-
"UserOpName", userOpName
1591-
|]
1609+
Activity.instance.Start "ParseAndCheckProject" [| "Project", options.ProjectFileName; "UserOpName", userOpName |]
1610+
15921611
return!
15931612
backgroundCompiler.ParseAndCheckProject(options, userOpName)
15941613
|> Async.AwaitNodeCode
@@ -1605,12 +1624,10 @@ type FSharpChecker
16051624
async {
16061625
let canInvalidateProject = defaultArg canInvalidateProject true
16071626
let userOpName = defaultArg userOpName "Unknown"
1627+
16081628
use _ =
1609-
Activity.instance.Start "FindBackgroundReferencesInFile"
1610-
[|
1611-
"Project", options.ProjectFileName
1612-
"UserOpName", userOpName
1613-
|]
1629+
Activity.instance.Start "FindBackgroundReferencesInFile" [| "Project", options.ProjectFileName; "UserOpName", userOpName |]
1630+
16141631
return!
16151632
backgroundCompiler.FindReferencesInFile(fileName, options, symbol, canInvalidateProject, userOpName)
16161633
|> Async.AwaitNodeCode
@@ -1619,12 +1636,10 @@ type FSharpChecker
16191636
member _.GetBackgroundSemanticClassificationForFile(fileName: string, options: FSharpProjectOptions, ?userOpName) =
16201637
async {
16211638
let userOpName = defaultArg userOpName "Unknown"
1639+
16221640
use _ =
1623-
Activity.instance.Start "FindBackgroundReferencesInFile"
1624-
[|
1625-
"Project", options.ProjectFileName
1626-
"UserOpName", userOpName
1627-
|]
1641+
Activity.instance.Start "FindBackgroundReferencesInFile" [| "Project", options.ProjectFileName; "UserOpName", userOpName |]
1642+
16281643
return!
16291644
backgroundCompiler.GetSemanticClassificationForFile(fileName, options, userOpName)
16301645
|> Async.AwaitNodeCode

0 commit comments

Comments
 (0)