Skip to content

initial goto impl for signature file #1111

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

initial goto impl for signature file #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions src/FsAutoComplete.Core/Commands.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,11 +514,15 @@ module Commands =
=

let filterSymbols symbols =
symbols
|> Array.where (fun (su: FSharpSymbolUse) ->
su.IsFromDispatchSlotImplementation
|| (su.IsFromType
&& not (tyRes.GetParseResults.IsTypeAnnotationGivenAtPosition(su.Range.Start))))
if Utils.isSignatureFile (UMX.untag tyRes.FileName) then
let implFile = Utils.toFSharpFile (UMX.untag tyRes.FileName)
symbols |> Array.filter (fun (su: FSharpSymbolUse) -> su.FileName = implFile)
else
symbols
|> Array.where (fun (su: FSharpSymbolUse) ->
su.IsFromDispatchSlotImplementation
|| (su.IsFromType
&& not (tyRes.GetParseResults.IsTypeAnnotationGivenAtPosition(su.Range.Start))))

async {
match tyRes.TryGetSymbolUseAndUsages pos lineStr with
Expand Down
6 changes: 6 additions & 0 deletions src/FsAutoComplete.Core/Utils.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ let inline isAScript (fileName: ReadOnlySpan<char>) =
/// </summary>
let inline isSignatureFile (fileName: ReadOnlySpan<char>) = fileName.EndsWith ".fsi"

let toSignatureFile fileName =
IO.Path.ChangeExtension(fileName, ".fsi")

/// <summary>
/// Checks if the file ends with `.fs`
/// </summary>
Expand All @@ -132,6 +135,9 @@ let isFsharpFile (fileName: ReadOnlySpan<char>) = fileName.EndsWith ".fs"
let inline internal isFileWithFSharpI fileName = isAScript fileName || isSignatureFile fileName || isFsharpFile fileName


let toFSharpFile fileName =
IO.Path.ChangeExtension(fileName, ".fs")

/// <summary>
/// This is a combination of `isAScript`, `isSignatureFile`, and `isFsharpFile`
/// </summary>
Expand Down