Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit5edc7cc

Browse files
committed
addressed CR feedback
1 parentf17c57d commit5edc7cc

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

‎src/fsharp/nameres.fs‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2459,7 +2459,7 @@ type ResolveCompletionTargets =
24592459
memberthis.ResolveAll=
24602460
match thiswith
24612461
| All_->true
2462-
|_->false
2462+
|SettablePropertiesAndFields->false
24632463

24642464
/// Resolve a (possibly incomplete) long identifier to a set of possible resolutions, qualified by type.
24652465
letResolveCompletionsInType(ncenv:NameResolver)nenv(completionTargets:ResolveCompletionTargets)m ad statics typ=
@@ -2535,7 +2535,7 @@ let ResolveCompletionsInType (ncenv: NameResolver) nenv (completionTargets: Reso
25352535
letminfoFilter(minfo:MethInfo)=
25362536
letisApplicableMeth=
25372537
match completionTargetswith
2538-
| ResolveCompletionTargets.AllisApplicableMeth->isApplicableMeth
2538+
| ResolveCompletionTargets.Allx->x
25392539
|_-> failwith"internal error: expected completionTargets = ResolveCompletionTargets.All"
25402540
// Only show the Finalize, MemberwiseClose etc. methods on System.Object for values whose static type really is
25412541
// System.Object. Few of these are typically used from F#.
@@ -2581,24 +2581,30 @@ let ResolveCompletionsInType (ncenv: NameResolver) nenv (completionTargets: Reso
25812581
|_-> pinfos
25822582

25832583
pinfos
2584-
|> List.map(fun pinfo-> DecodeFSharpEvent[pinfo] ad g ncenv m)
2585-
|> List.filter(fun pinfo->
2586-
match pinfowith
2587-
| Some(Item.Event(einfo))-> completionTargets.ResolveAll&& IsStandardEventInfo ncenv.InfoReader m ad einfo
2588-
|_-> pinfo.IsSome)
2589-
|> List.map(fun pinfo->pinfo.Value)
2584+
|> List.choose(fun pinfo->
2585+
letpinfoOpt= DecodeFSharpEvent[pinfo] ad g ncenv m
2586+
match pinfoOpt, completionTargetswith
2587+
| Some(Item.Event(einfo)), ResolveCompletionTargets.All_->if IsStandardEventInfo ncenv.InfoReader m ad einfothen pinfoOptelse None
2588+
|_-> pinfoOpt)
25902589

25912590
// REVIEW: add a name filter here in the common cases?
25922591
letminfos=
25932592
if completionTargets.ResolveAllthen
2593+
letminfos=
2594+
AllMethInfosOfTypeInScope ncenv.InfoReader nenv(None,ad) PreferOverrides m typ
2595+
|> List.filter minfoFilter
2596+
25942597
letaddersAndRemovers=
25952598
pinfoItems
25962599
|> List.map(function Item.Event(FSEvent(_,_,addValRef,removeValRef))->[addValRef.LogicalName;removeValRef.LogicalName]|_->[])
25972600
|> List.concat
25982601

2599-
AllMethInfosOfTypeInScope ncenv.InfoReader nenv(None,ad) PreferOverrides m typ
2600-
|> List.filter minfoFilter
2601-
|> List.filter(fun minfo->not(addersAndRemovers|>List.exists(fun ar-> ar= minfo.LogicalName)))
2602+
match addersAndRemoverswith
2603+
|[]-> minfos
2604+
| addersAndRemovers->
2605+
letisNotAdderOrRemover(minfo:MethInfo)=not(addersAndRemovers|> List.exists(fun ar-> ar= minfo.LogicalName))
2606+
List.filter isNotAdderOrRemover minfos
2607+
26022608
else[]
26032609
// Partition methods into overload sets
26042610
let recpartitionl(l:MethInfo list)acc=

‎src/fsharp/vs/service.fs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -507,9 +507,12 @@ type TypeCheckInfo
507507

508508
// Filter items to show only valid & return Some if there are any
509509
letReturnItemsOfType items g denv(m:range)filterCtors hasTextChangedSinceLastTypecheck f=
510-
letitems= items|> RemoveDuplicateItems g
511-
letitems= items|> RemoveExplicitlySuppressed g
512-
letitems= items|> FilterItemsForCtors filterCtors
510+
letitems=
511+
items
512+
|> RemoveDuplicateItems g
513+
|> RemoveExplicitlySuppressed g
514+
|> FilterItemsForCtors filterCtors
515+
513516
if nonNil itemsthen
514517
Trace.PrintLine("CompilerServicesVerbose",fun()-> sprintf"GetPreciseItemsFromNameResolution: Results in%d items!\n" items.Length)
515518
if hasTextChangedSinceLastTypecheck(textSnapshotInfo, Range.toVS m)then

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp