@@ -334,16 +334,20 @@ type ExprTypingsResult =
334334type Names = string list
335335
336336type FSharpCodeCompletionOptions =
337- { SuggestPatternNames: bool
338- SuggestObsoleteSymbols: bool
339- SuggestGeneratedOverrides: bool
340- SuggestOverrideBodies: bool }
337+ {
338+ SuggestPatternNames: bool
339+ SuggestObsoleteSymbols: bool
340+ SuggestGeneratedOverrides: bool
341+ SuggestOverrideBodies: bool
342+ }
341343
342344 static member Default =
343- { SuggestPatternNames = true
344- SuggestObsoleteSymbols = false
345- SuggestGeneratedOverrides = true
346- SuggestOverrideBodies = true }
345+ {
346+ SuggestPatternNames = true
347+ SuggestObsoleteSymbols = false
348+ SuggestGeneratedOverrides = true
349+ SuggestOverrideBodies = true
350+ }
347351
348352/// A TypeCheckInfo represents everything we get back from the typecheck of a file.
349353/// It acts like an in-memory database about the file.
@@ -523,7 +527,9 @@ type internal TypeCheckInfo
523527 let targets =
524528 ResolveCompletionTargets.All( ConstraintSolver.IsApplicableMethApprox g amap m)
525529
526- let items = ResolveCompletionsInType ncenv nenv targets m ad true ( mkTyparTy tp) allowObsolete
530+ let items =
531+ ResolveCompletionsInType ncenv nenv targets m ad true ( mkTyparTy tp) allowObsolete
532+
527533 let items = List.map ItemWithNoInst items
528534 ReturnItemsOfType items g denv m filterCtors
529535
@@ -700,7 +706,16 @@ type internal TypeCheckInfo
700706 methods
701707 |> List.collect ( fun meth ->
702708 let retTy = meth.GetFSharpReturnType( amap, m, meth.FormalMethodInst)
703- ResolveCompletionsInType ncenv nenv ResolveCompletionTargets.SettablePropertiesAndFields m ad false retTy allowObsolete)
709+
710+ ResolveCompletionsInType
711+ ncenv
712+ nenv
713+ ResolveCompletionTargets.SettablePropertiesAndFields
714+ m
715+ ad
716+ false
717+ retTy
718+ allowObsolete)
704719
705720 let parameters = CollectParameters methods amap m
706721 let items = props @ parameters
@@ -1358,7 +1373,14 @@ type internal TypeCheckInfo
13581373
13591374 let getTyFromTypeNamePos ( endPos : pos ) =
13601375 let nameResItems =
1361- GetPreciseItemsFromNameResolution( endPos.Line, endPos.Column, None, ResolveTypeNamesToTypeRefs, ResolveOverloads.Yes, options.SuggestObsoleteSymbols)
1376+ GetPreciseItemsFromNameResolution(
1377+ endPos.Line,
1378+ endPos.Column,
1379+ None,
1380+ ResolveTypeNamesToTypeRefs,
1381+ ResolveOverloads.Yes,
1382+ options.SuggestObsoleteSymbols
1383+ )
13621384
13631385 match nameResItems with
13641386 | NameResResult.Members( ls, _, _) ->
@@ -1531,7 +1553,15 @@ type internal TypeCheckInfo
15311553 // This is based on position (i.e. colAtEndOfNamesAndResidue). This is not used if a residueOpt is given.
15321554 let nameResItems =
15331555 match residueOpt with
1534- | None -> GetPreciseItemsFromNameResolution( line, colAtEndOfNamesAndResidue, None, filterCtors, resolveOverloads, options.SuggestObsoleteSymbols)
1556+ | None ->
1557+ GetPreciseItemsFromNameResolution(
1558+ line,
1559+ colAtEndOfNamesAndResidue,
1560+ None,
1561+ filterCtors,
1562+ resolveOverloads,
1563+ options.SuggestObsoleteSymbols
1564+ )
15351565 | Some residue ->
15361566 // Deals with cases when we have spaces between dot and\or identifier, like A . $
15371567 // if this is our case - then we need to locate end position of the name skipping whitespaces
@@ -1545,7 +1575,15 @@ type internal TypeCheckInfo
15451575 match FindFirstNonWhitespacePosition lineStr ( p - 1 ) with
15461576 | Some colAtEndOfNames ->
15471577 let colAtEndOfNames = colAtEndOfNames + 1 // convert 0-based to 1-based
1548- GetPreciseItemsFromNameResolution( line, colAtEndOfNames, Some( residue), filterCtors, resolveOverloads, options.SuggestObsoleteSymbols)
1578+
1579+ GetPreciseItemsFromNameResolution(
1580+ line,
1581+ colAtEndOfNames,
1582+ Some( residue),
1583+ filterCtors,
1584+ resolveOverloads,
1585+ options.SuggestObsoleteSymbols
1586+ )
15491587 | None -> NameResResult.Empty
15501588 | _ -> NameResResult.Empty
15511589
@@ -1612,7 +1650,9 @@ type internal TypeCheckInfo
16121650 )
16131651
16141652 match leftOfDot with
1615- | Some( pos, _) -> GetPreciseCompletionListFromExprTypings( parseResults, pos, filterCtors, options.SuggestObsoleteSymbols), true
1653+ | Some( pos, _) ->
1654+ GetPreciseCompletionListFromExprTypings( parseResults, pos, filterCtors, options.SuggestObsoleteSymbols),
1655+ true
16161656 | None ->
16171657 // Can get here in a case like: if "f xxx yyy" is legal, and we do "f xxx y"
16181658 // We have no interest in expression typings, those are only useful for dot-completion. We want to fallback
@@ -1707,7 +1747,7 @@ type internal TypeCheckInfo
17071747 items |> List.map DefaultCompletionItem, denv, m
17081748
17091749 /// Find record fields in the best naming environment.
1710- let GetEnvironmentLookupResolutionsIncludingRecordFieldsAtPosition cursorPos plid envItems ( options : FSharpCodeCompletionOptions )=
1750+ let GetEnvironmentLookupResolutionsIncludingRecordFieldsAtPosition cursorPos plid envItems ( options : FSharpCodeCompletionOptions ) =
17111751 // An empty record expression may be completed into something like these:
17121752 // { XXX = ... }
17131753 // { xxx with XXX ... }
@@ -1895,7 +1935,8 @@ type internal TypeCheckInfo
18951935
18961936 // Completion at ' SomeMethod( ... ) ' or ' [<SomeAttribute( ... )>] ' with named arguments
18971937 | Some( CompletionContext.ParameterList( endPos, fields)) ->
1898- let results = GetNamedParametersAndSettableFields endPos options.SuggestObsoleteSymbols
1938+ let results =
1939+ GetNamedParametersAndSettableFields endPos options.SuggestObsoleteSymbols
18991940
19001941 let declaredItems = getDeclaredItemsNotInRangeOpWithAllSymbols ()
19011942
@@ -1986,14 +2027,7 @@ type internal TypeCheckInfo
19862027 spacesBeforeEnclosingDefinition)) when options.SuggestGeneratedOverrides ->
19872028 let indent = max 1 ( spacesBeforeOverrideKeyword - spacesBeforeEnclosingDefinition)
19882029
1989- GetOverridableMethods
1990- pos
1991- ctx
1992- enclosingTypeNameRange
1993- ( spacesBeforeOverrideKeyword + indent)
1994- hasThis
1995- isStatic
1996- options
2030+ GetOverridableMethods pos ctx enclosingTypeNameRange ( spacesBeforeOverrideKeyword + indent) hasThis isStatic options
19972031
19982032 // Other completions
19992033 | cc ->
@@ -2071,9 +2105,7 @@ type internal TypeCheckInfo
20712105 |> Option.map ( fun ( _ , q , _ , _ ) -> FSharpDisplayContext( fun _ -> q.DisplayEnv))
20722106
20732107 /// Get the auto-complete items at a location
2074- member _.GetDeclarations
2075- ( parseResultsOpt , line , lineStr , partialName , completionContextAtPos , getAllEntities , options )
2076- =
2108+ member _.GetDeclarations ( parseResultsOpt , line , lineStr , partialName , completionContextAtPos , getAllEntities , options ) =
20772109 let isSigFile = SourceFileImpl.IsSignatureFile mainInputFileName
20782110
20792111 DiagnosticsScope.Protect
@@ -2134,7 +2166,9 @@ type internal TypeCheckInfo
21342166 DeclarationListInfo.Error msg)
21352167
21362168 /// Get the symbols for auto-complete items at a location
2137- member _.GetDeclarationListSymbols ( parseResultsOpt , line , lineStr , partialName , getAllEntities , genBodyForOverriddenMeth : FSharpCodeCompletionOptions ) =
2169+ member _.GetDeclarationListSymbols
2170+ ( parseResultsOpt , line , lineStr , partialName , getAllEntities , genBodyForOverriddenMeth : FSharpCodeCompletionOptions )
2171+ =
21382172 let isSigFile = SourceFileImpl.IsSignatureFile mainInputFileName
21392173
21402174 DiagnosticsScope.Protect
@@ -3391,19 +3425,13 @@ type FSharpCheckFileResults
33913425 match details with
33923426 | None -> DeclarationListInfo.Empty
33933427 | Some( scope, _ builderOpt) ->
3394- scope.GetDeclarations(
3395- parsedFileResults,
3396- line,
3397- lineText,
3398- partialName,
3399- completionContextAtPos,
3400- getAllEntities,
3401- options
3402- )
3428+ scope.GetDeclarations( parsedFileResults, line, lineText, partialName, completionContextAtPos, getAllEntities, options)
34033429
34043430 member _.GetDeclarationListSymbols ( parsedFileResults , line , lineText , partialName , ? getAllEntities , ? options ) =
34053431 let getAllEntities = defaultArg getAllEntities ( fun () -> [])
3406- let genBodyForOverriddenMeth = defaultArg options FSharpCodeCompletionOptions.Default
3432+
3433+ let genBodyForOverriddenMeth =
3434+ defaultArg options FSharpCodeCompletionOptions.Default
34073435
34083436 match details with
34093437 | None -> []
0 commit comments