Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1097 incoming call hierarchy #1164

Merged
merged 13 commits into from
Oct 10, 2023
Merged

#1097 incoming call hierarchy #1164

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4a027cf
WIP Incoming Hierarchy
TheAngryByrd Sep 8, 2023
e2cd39c
Call Hierarchy Incoming calls
TheAngryByrd Sep 9, 2023
d39f9e9
outgoing call poc
TheAngryByrd Sep 14, 2023
7a04311
Using TryRangeOfNameOfNearestOuterBindingContainingPos for CallHierar…
TheAngryByrd Oct 3, 2023
43f3fce
Fixing incoming call hierarchy plus tests
TheAngryByrd Oct 4, 2023
0d51159
Fixing incoming call typechecks
TheAngryByrd Oct 4, 2023
20c5fcd
formatting
baronfel Oct 8, 2023
bd04f10
Fixing up Adaptive Cancellation
TheAngryByrd Oct 9, 2023
7d998c7
Adding Versioning to DiagnosticCollection
TheAngryByrd Oct 9, 2023
8f35d64
Fixing tests
TheAngryByrd Oct 9, 2023
30f546f
cleanup
TheAngryByrd Oct 9, 2023
6d2b1e4
cleanup
TheAngryByrd Oct 10, 2023
7c430d1
revert removing altcover
TheAngryByrd Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions src/FsAutoComplete.Core/Commands.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ module AsyncResult =
let recoverCancellation (ar: Async<Result<CoreResponse<'t>, exn>>) =
recoverCancellationGeneric ar (sprintf "Request cancelled (exn was %A)" >> CoreResponse.InfoRes)

let recoverCancellationIgnore (ar: Async<Result<unit, exn>>) = AsyncResult.foldResult id ignore ar
let recoverCancellationIgnore (ar: Async<Result<unit, exn>>) = ar |> AsyncResult.foldResult id (ignore<exn>)

[<RequireQualifiedAccess>]
type NotificationEvent =
| ParseError of errors: FSharpDiagnostic[] * file: string<LocalPath>
| ParseError of errors: FSharpDiagnostic[] * file: string<LocalPath> * version: int
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really wonder if we need some kind of 'file@version' abstraction here. Not now, but just immediately comes to mind.

| Workspace of ProjectSystem.ProjectResponse
| AnalyzerMessage of messages: FSharp.Analyzers.SDK.Message[] * file: string<LocalPath>
| UnusedOpens of file: string<LocalPath> * opens: Range[]
| AnalyzerMessage of messages: FSharp.Analyzers.SDK.Message[] * file: string<LocalPath> * version: int
| UnusedOpens of file: string<LocalPath> * opens: Range[] * version: int
// | Lint of file: string<LocalPath> * warningsWithCodes: Lint.EnrichedLintWarning list
| UnusedDeclarations of file: string<LocalPath> * decls: range[]
| SimplifyNames of file: string<LocalPath> * names: SimplifyNames.SimplifiableRange[]
| UnusedDeclarations of file: string<LocalPath> * decls: range[] * version: int
| SimplifyNames of file: string<LocalPath> * names: SimplifyNames.SimplifiableRange[] * version: int
| Canceled of errorMessage: string
| FileParsed of string<LocalPath>
| TestDetected of file: string<LocalPath> * tests: TestAdapter.TestAdapterEntry<range>[]
Expand Down Expand Up @@ -1251,7 +1251,7 @@ type Commands
//Diagnostics handler - Triggered by `CheckCore`
do
disposables.Add
<| fileChecked.Publish.Subscribe(fun (parseAndCheck, file, _) ->
<| fileChecked.Publish.Subscribe(fun (parseAndCheck, file, version) ->
async {
try
NotificationEvent.FileParsed file |> notify.Trigger
Expand All @@ -1265,7 +1265,7 @@ type Commands
|> Array.distinctBy (fun e ->
e.Severity, e.ErrorNumber, e.StartLine, e.StartColumn, e.EndLine, e.EndColumn, e.Message)

(errors, file) |> NotificationEvent.ParseError |> notify.Trigger
(errors, file, version) |> NotificationEvent.ParseError |> notify.Trigger
with _ ->
()
}
Expand All @@ -1274,7 +1274,7 @@ type Commands
//Analyzers handler - Triggered by `CheckCore`
do
disposables.Add
<| fileChecked.Publish.Subscribe(fun (parseAndCheck, file, _) ->
<| fileChecked.Publish.Subscribe(fun (parseAndCheck, file, version) ->
async {
if hasAnalyzers then
try
Expand All @@ -1298,7 +1298,7 @@ type Commands
parseAndCheck.GetAllEntities
)

(res, file) |> NotificationEvent.AnalyzerMessage |> notify.Trigger
(res, file, version) |> NotificationEvent.AnalyzerMessage |> notify.Trigger

Loggers.analyzers.info (
Log.setMessage "end analysis of {file}"
Expand Down Expand Up @@ -2435,6 +2435,7 @@ type Commands
let isScript = Utils.isAScript (UMX.untag file)

let! (opts, source) = state.TryGetFileCheckerOptionsWithSource file
let version = state.TryGetFileVersion file |> Option.defaultValue 0

let tyResOpt = checker.TryGetRecentCheckResultsForFile(file, opts, source)

Expand All @@ -2444,13 +2445,14 @@ type Commands
let! unused = UnusedDeclarations.getUnusedDeclarations (tyRes.GetCheckResults, isScript)
let unused = unused |> Seq.toArray

notify.Trigger(NotificationEvent.UnusedDeclarations(file, unused))
notify.Trigger(NotificationEvent.UnusedDeclarations(file, unused, version))
}
|> Async.Ignore<Result<unit, _>>

member x.CheckSimplifiedNames file : Async<unit> =
asyncResult {
let! (opts, source) = state.TryGetFileCheckerOptionsWithLines file
let version = state.TryGetFileVersion file |> Option.defaultValue 0

let tyResOpt = checker.TryGetRecentCheckResultsForFile(file, opts, source)

Expand All @@ -2461,7 +2463,7 @@ type Commands

let! simplified = SimplifyNames.getSimplifiableNames (tyRes.GetCheckResults, getSourceLine)
let simplified = Array.ofSeq simplified
notify.Trigger(NotificationEvent.SimplifyNames(file, simplified))
notify.Trigger(NotificationEvent.SimplifyNames(file, simplified, version))
}
|> Async.Ignore<Result<unit, _>>
|> x.AsCancellable file
Expand All @@ -2470,14 +2472,15 @@ type Commands
member x.CheckUnusedOpens file : Async<unit> =
asyncResult {
let! (opts, source) = state.TryGetFileCheckerOptionsWithLines file
let version = state.TryGetFileVersion file |> Option.defaultValue 0

match checker.TryGetRecentCheckResultsForFile(file, opts, source) with
| None -> return ()
| Some tyRes ->
let! unused =
UnusedOpens.getUnusedOpens (tyRes.GetCheckResults, (fun i -> (source: ISourceText).GetLineString(i - 1)))

notify.Trigger(NotificationEvent.UnusedOpens(file, (unused |> List.toArray)))
notify.Trigger(NotificationEvent.UnusedOpens(file, (unused |> List.toArray), version))

}
|> Async.Ignore<Result<unit, _>>
Expand Down
Loading
Loading