Skip to content

Commit 46011b9

Browse files
T-GroMartin521majochaKevinRansom
authored
[automated] Merge branch 'main' => 'release/dev17.14' (#18415)
* update devcontainer sdk (#18412) * deal with hanging test (#18411) * typo (#18413) --------- Co-authored-by: Martin <29605222+Martin521@users.noreply.github.com> Co-authored-by: Jakub Majocha <1760221+majocha@users.noreply.github.com> Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
2 parents 3b56f75 + e37ef75 commit 46011b9

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
22
{
33
"name": "F#",
4-
"image": "mcr.microsoft.com/dotnet/sdk:9.0.200",
4+
"image": "mcr.microsoft.com/dotnet/sdk:9.0.202",
55
"features": {
66
"ghcr.io/devcontainers/features/common-utils:2.5.2": {},
77
"ghcr.io/devcontainers/features/git:1.3.2": {},

tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ let ``Cancel running jobs with the same key`` () =
430430
let current = eventsWhen events (received Requested)
431431
Assert.Equal(0, current |> countOf Canceled)
432432

433-
waitUntil events (countOf Canceled >> (=) 10)
433+
// waitUntil events (countOf Canceled >> (=) 10)
434434

435435
waitUntil events (received Started)
436436

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

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

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

447448
Assert.Equal(1, events |> countOf Finished)

vsintegration/src/FSharp.Editor/Common/Extensions.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ type ConnectionPointSubscription = System.IDisposable option
9797

9898
// Usage example:
9999
// If a handler is None, to not handle that event
100-
// let subscription = subscribeToTextViewEvents (textView, onChangeCaretHandler, onKillFocus, OnSetFocus)
100+
// let subscription = subscribeToTextViewEvents (textView, onChangeCaretHandler, onKillFocus, onSetFocus)
101101
// Unsubscribe using subscription.Dispose()
102-
let subscribeToTextViewEvents (textView: IVsTextView, onChangeCaretHandler, onKillFocus, OnSetFocus) : ConnectionPointSubscription =
103-
let handler = TextViewEventsHandler(onChangeCaretHandler, onKillFocus, OnSetFocus)
102+
let subscribeToTextViewEvents (textView: IVsTextView, onChangeCaretHandler, onKillFocus, onSetFocus) : ConnectionPointSubscription =
103+
let handler = TextViewEventsHandler(onChangeCaretHandler, onKillFocus, onSetFocus)
104104

105105
match textView with
106106
| :? IConnectionPointContainer as cpContainer ->

0 commit comments

Comments
 (0)