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.

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

Update FSAC to use FCS and FSharp.Core from 9.0.100, as well as updated Analyzer SDK #1324

Merged
merged 28 commits into from
Nov 24, 2024

Conversation

TheAngryByrd
Copy link
Member

@TheAngryByrd TheAngryByrd commented Nov 16, 2024

Fixes #1323

@TheAngryByrd TheAngryByrd changed the title First Pass F# 9 support Update FSAC to use FCS and FSharp.Core from 9.0.100, as well as updated Analyzer SDK Nov 16, 2024
@@ -413,7 +413,12 @@ and AdaptiveCancellableTask<'a>(cancel: unit -> unit, real: Task<'a>) =
real
else
cachedTcs <- new TaskCompletionSource<'a>()
#if NET8_0
cachedTcs.TrySetFromTask real
#if NET9_0_OR_GREATER
cachedTcs.TrySetFromTask real |> ignore<bool>
Copy link
Member Author

Choose a reason for hiding this comment

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

I think we have to call this from within the current TrySetFromTask as it needs to be a completed task.

@TheAngryByrd TheAngryByrd force-pushed the dotnet9 branch 3 times, most recently from df9652f to becea2a Compare November 24, 2024 00:24
@TheAngryByrd TheAngryByrd marked this pull request as ready for review November 24, 2024 01:50
real.ContinueWith(fun (task: Task<_>) ->
real.ContinueWith (fun (task: Task<_>) ->
#if NET9_0_OR_GREATER
tcs.TrySetFromTask(task) |> ignore<bool>
Copy link
Contributor

Choose a reason for hiding this comment

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

oh fascinating - so the runtime is generally getting APIs that are better/correct/easier to use?

@@ -111,7 +111,8 @@ let private getRangesAndPlacement input pos =
members
|> List.tryPick (fun m ->
match m with
| SynMemberDefn.AutoProperty(accessibility = None; ident = ident; trivia = trivia) as a when
// TODO: Need to handle setting get or set accessibility separately
Copy link
Contributor

Choose a reason for hiding this comment

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

Making a comment here to make a link to this todo for an issue - we need to be able to handle the other AST cases when the getter or setter have different visibilities.

@@ -303,8 +303,8 @@ let formattingTests state =
| Result.Error e -> failwithf "Error while formatting %s: %A" sourceFile e
| Core.Result.Error errors -> failwithf "Errors while parsing script %s: %A" sourceFile errors
})

testList
// Skip until https://github.com/dotnet/sdk/issues/44838 is fixed
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be the first week of December FWIW

Copy link
Contributor

@baronfel baronfel left a comment

Choose a reason for hiding this comment

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

Brilliant - thank you for digging into the test failures and getting us to green!

@baronfel baronfel merged commit c9e2df1 into ionide:main Nov 24, 2024
14 checks passed
TheAngryByrd added a commit to TheAngryByrd/FsAutoComplete that referenced this pull request Dec 7, 2024
TheAngryByrd added a commit to TheAngryByrd/FsAutoComplete that referenced this pull request Dec 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update FSAC to use FCS and FSharp.Core from 9.0.100, as well as updated Analyzer SDK
2 participants