Skip to content

[automated] Merge branch 'main' => 'release/dev17.14' #18415

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

Merged
merged 3 commits into from
Mar 26, 2025
Merged

[automated] Merge branch 'main' => 'release/dev17.14' #18415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2408d66
update devcontainer sdk (#18412)
Martin521 Mar 26, 2025
f4b677e
deal with hanging test (#18411)
majocha Mar 26, 2025
e37ef75
typo (#18413)
KevinRansom Mar 26, 2025
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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
{
"name": "F#",
"image": "mcr.microsoft.com/dotnet/sdk:9.0.200",
"image": "mcr.microsoft.com/dotnet/sdk:9.0.202",
"features": {
"ghcr.io/devcontainers/features/common-utils:2.5.2": {},
"ghcr.io/devcontainers/features/git:1.3.2": {},
Expand Down
3 changes: 2 additions & 1 deletion tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ let ``Cancel running jobs with the same key`` () =
let current = eventsWhen events (received Requested)
Assert.Equal(0, current |> countOf Canceled)

waitUntil events (countOf Canceled >> (=) 10)
// waitUntil events (countOf Canceled >> (=) 10)

waitUntil events (received Started)

Expand All @@ -442,6 +442,7 @@ let ``Cancel running jobs with the same key`` () =

Assert.Equal(0, events |> countOf Failed)

// All outdated jobs should have been canceled by now.
Assert.Equal(10, events |> countOf Canceled)

Assert.Equal(1, events |> countOf Finished)
Expand Down
6 changes: 3 additions & 3 deletions vsintegration/src/FSharp.Editor/Common/Extensions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ type ConnectionPointSubscription = System.IDisposable option

// Usage example:
// If a handler is None, to not handle that event
// let subscription = subscribeToTextViewEvents (textView, onChangeCaretHandler, onKillFocus, OnSetFocus)
// let subscription = subscribeToTextViewEvents (textView, onChangeCaretHandler, onKillFocus, onSetFocus)
// Unsubscribe using subscription.Dispose()
let subscribeToTextViewEvents (textView: IVsTextView, onChangeCaretHandler, onKillFocus, OnSetFocus) : ConnectionPointSubscription =
let handler = TextViewEventsHandler(onChangeCaretHandler, onKillFocus, OnSetFocus)
let subscribeToTextViewEvents (textView: IVsTextView, onChangeCaretHandler, onKillFocus, onSetFocus) : ConnectionPointSubscription =
let handler = TextViewEventsHandler(onChangeCaretHandler, onKillFocus, onSetFocus)

match textView with
| :? IConnectionPointContainer as cpContainer ->
Expand Down