NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitd6fade9

committed

use EnclosingEntity if available

1 parent26526dd commitd6fade9Copy full SHA for d6fade9

File tree

2 files changed

+16

-11

lines changed

src/fsharp/vs
- ServiceAnalysis.fs
vsintegration/src/FSharp.Editor/Diagnostics
- UnusedOpensDiagnosticAnalyzer.fs

2 files changed

+16

-11

lines changed

`‎src/fsharp/vs/ServiceAnalysis.fs‎`

Lines changed: 12 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ module UnusedOpens =`
`33`	`33`	`// (note: fv.IsExtensionMember has proper value for symbols returning by GetAllUsesOfAllSymbolsInFile though)`
`34`	`34`	`if Symbol.hasAttribute<ExtensionAttribute> fv.Attributesthen`
`35`	`35`	`yieldupcast fv`
`36`		`-`
`37`		`-for fvin this.Entity.MembersFunctionsAndValuesdo`
`38`		`-yieldupcast fv`
`39`	`36`
`40`	`37`	`for apCasein this.Entity.ActivePatternCasesdo`
`41`	`38`	`yieldupcast apCase`
	`39`	`+`
	`40`	`+for fvin this.Entity.MembersFunctionsAndValuesdo`
	`41`	`+yieldupcast fv`
`42`	`42`	`}\|> Seq.cache`
`43`	`43`
`44`	`44`	`typeModuleGroup=`
`@@ -127,16 +127,17 @@ module UnusedOpens =`
`127`	`127`	`\|> List.exists(fun modul->`
`128`	`128`	`symbolUsesInScope`
`129`	`129`	`\|> Array.exists(fun symbolUse->`
`130`		`-//match symbolUse.Symbol with`
`131`		`-//\| :? FSharpMemberOrFunctionOrValue as f ->`
`132`		`-// match f.EnclosingEntity with`
`133`		`-// \| Some enclosingEntity -> Some (enclosingEntity.IsEffectivelySameAs modul.Entity)`
`134`		`-// \| _ -> None`
`135`		`-//\| _ -> None`
`136`		`-//\|> Option.defaultWith (fun () ->`
	`130`	`+match symbolUse.Symbolwith`
	`131`	`+\|:? FSharpMemberOrFunctionOrValueas f->`
	`132`	`+match f.EnclosingEntitywith`
	`133`	`+\| Some entwhen ent.IsNamespace\|\| ent.IsFSharpModule->`
	`134`	`+ Some(ent.IsEffectivelySameAs modul.Entity)`
	`135`	`+\|_-> None`
	`136`	`+\|_-> None`
	`137`	`+\|> Option.defaultWith(fun()->`
`137`	`138`	`modul.ChildSymbols`
`138`	`139`	`\|> Seq.exists(fun x-> x.IsEffectivelySameAs symbolUse.Symbol)`
`139`		`-)))`
	`140`	`+))))`
`140`	`141`	`\|> List.collect(fun mg->`
`141`	`142`	`mg.Modules\|> List.map(fun x->{ Module= x.Entity; AppliedScope= openStatement.AppliedScope}))`
`142`	`143`

`‎vsintegration/src/FSharp.Editor/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,13 @@ type internal UnusedOpensDiagnosticAnalyzer() =`
`43`	`43`	`do! Option.guard Settings.CodeFixes.UnusedOpens`
`44`	`44`	`let!sourceText= document.GetTextAsync()`
`45`	`45`	`let!_,_,checkResults= checker.ParseAndCheckDocument(document, options, sourceText= sourceText, allowStaleResults=true, userOpName= userOpName)`
	`46`	`+#if DEBUG`
`46`	`47`	`letsw= Stopwatch.StartNew()`
	`48`	`+#endif`
`47`	`49`	`let!unusedOpens= UnusedOpens.getUnusedOpens(checkResults,fun lineNumber-> sourceText.Lines.[Line.toZ lineNumber].ToString())\|> liftAsync`
	`50`	`+#if DEBUG`
`48`	`51`	`Logging.Logging.logInfof"*** Got%d unused opens in%O" unusedOpens.Length sw.Elapsed`
	`52`	`+#endif`
`49`	`53`	`return unusedOpens`
`50`	`54`	`}`
`51`	`55`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd6fade9

File tree

2 files changed

2 files changed

`‎src/fsharp/vs/ServiceAnalysis.fs‎`

`‎vsintegration/src/FSharp.Editor/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs‎`

0 commit comments