Sync with the ultimate master

ReSharper.FSharp/src/FSharp.Fantomas.Host/PackagesLock.targets

@@ -5,7 +5,7 @@
     <PackageLock Include="Fantomas.FCS" Version="6.3.15" />
     <PackageLock Include="FSharp.Core" Version="9.0.100-beta.24466.6" />
     <PackageLock Include="JetBrains.Lifetimes" Version="2024.3.0" />
-    <PackageLock Include="JetBrains.NuGet.Versioning" Version="6.12.20241210.146" />
+    <PackageLock Include="JetBrains.NuGet.Versioning" Version="6.12.20250115.147" />
     <PackageLock Include="JetBrains.RdFramework" Version="2024.3.0" />
     <PackageLock Include="Microsoft.NETCore.Platforms" Version="1.1.1" />
     <PackageLock Include="Microsoft.NETCore.Targets" Version="1.1.3" />

ReSharper.FSharp/src/FSharp/FSharp.Common/src/Checker/FcsCheckerService.fs

@@ -9,6 +9,7 @@ open FSharp.Compiler.Text
 open JetBrains
 open JetBrains.Annotations
 open JetBrains.Application
+open JetBrains.Application.Parts
 open JetBrains.Application.Settings
 open JetBrains.Application.Threading
 open JetBrains.DataFlow
@@ -82,7 +83,7 @@ type FcsProjectInvalidationType =
     | Remove
 
 
-[<ShellComponent; AllowNullLiteral>]
+[<ShellComponent(Instantiation.DemandAnyThreadSafe); AllowNullLiteral>]
 type FcsCheckerService(lifetime: Lifetime, logger: ILogger, onSolutionCloseNotifier: OnSolutionCloseNotifier,
         settingsStore: ISettingsStore, locks: IShellLocks) =
 
@@ -93,7 +94,7 @@ type FcsCheckerService(lifetime: Lifetime, logger: ILogger, onSolutionCloseNotif
 
         let getSettingProperty name =
             let setting = SettingsUtil.getEntry<FSharpOptions> settingsStore name
-            settingsStoreLive.GetValueProperty(lifetime, setting, null)
+            settingsStoreLive.GetValueProperty2(lifetime, setting, null, ApartmentForNotifications.Primary(locks))
 
         let skipImpl = getSettingProperty "SkipImplementationAnalysis"
         let analyzerProjectReferencesInParallel = getSettingProperty "ParallelProjectReferencesAnalysis"

ReSharper.FSharp/src/FSharp/FSharp.Common/src/ProjectModel/FSharpFileService.fs

@@ -3,14 +3,15 @@ namespace JetBrains.ReSharper.Plugins.FSharp.ProjectModel
 open JetBrains.Application
 open JetBrains.Application.BuildScript
 open JetBrains.Application.BuildScript.Application.Zones
+open JetBrains.Application.Parts
 open JetBrains.ProjectModel
 open JetBrains.RdBackend.Common.Env
 open JetBrains.ReSharper.Plugins.FSharp
 open JetBrains.ReSharper.Plugins.FSharp.ProjectModel.Scripts
 open JetBrains.ReSharper.Psi
 open JetBrains.Rider.Backend.Env
 
-[<ShellComponent>]
+[<ShellComponent(Instantiation.DemandAnyThreadSafe)>]
 [<ZoneMarker(typeof<IReSharperHostNetFeatureZone>, typeof<IRiderBackendFeatureEnvironmentZone>, typeof<IRiderFeatureZone>)>]
 type FSharpFileService(settingsLocation: RiderAnyProductSettingsLocation, fileExtensions: IProjectFileExtensions) =
     let scratchesDir =

ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/FSharpErrorsStage.fs

@@ -2,6 +2,7 @@ namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Daemon.Stages
 
 open System
 open System.Collections.Generic
+open JetBrains.Application.Parts
 open JetBrains.ProjectModel
 open JetBrains.ReSharper.Daemon.VisualElements
 open JetBrains.ReSharper.Feature.Services.Daemon
@@ -23,7 +24,7 @@ module FSharpErrorsStage =
     let parseAndCheckResultsKey = Key<FSharpParseAndCheckResults option>("ParseAndCheckResultsKey")
 
 
-[<DaemonStage(StagesBefore = [| typeof<HighlightIdentifiersStage> |])>]
+[<DaemonStage(Instantiation.DemandAnyThreadUnsafe, StagesBefore = [| typeof<HighlightIdentifiersStage> |])>]
 type FSharpErrorsStage(elementProblemAnalyzerRegistrar) =
     inherit FSharpDaemonStageBase()
 

ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/FSharpVcsCodeVisionRangesProviderStage.fs

@@ -1,14 +1,15 @@
 namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Daemon.Stages
 
 open JetBrains.Application.BuildScript.Application.Zones
+open JetBrains.Application.Parts
 open JetBrains.RdBackend.Common.Features.CodeInsights.Stages.Vcs
 open JetBrains.ReSharper.Feature.Services.Daemon
 open JetBrains.ReSharper.Plugins.FSharp.Psi
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
 open JetBrains.ReSharper.Psi.Tree
 open JetBrains.RdBackend.Common.Env
 
-[<DaemonStage>]
+[<DaemonStage(Instantiation.DemandAnyThreadSafe)>]
 [<ZoneMarker(typeof<IReSharperHostNetFeatureZone>)>]
 type FSharpVcsCodeVisionRangesProviderStage() =
     inherit CodeInsightsVcsRangesStageBase<FSharpLanguage>()

ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/FormatSpecifiersStage.fs

@@ -1,5 +1,6 @@
 namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Daemon.Stages
 
+open JetBrains.Application.Parts
 open System.Collections.Generic
 open JetBrains.ReSharper.Daemon.Impl
 open JetBrains.ReSharper.Feature.Services.Daemon
@@ -26,7 +27,7 @@ type FormatSpecifiersStageProcess(fsFile: IFSharpFile, daemonProcess) =
 
         committer.Invoke(DaemonStageResult(highlightings))
 
-[<DaemonStage(StagesBefore = [| typeof<HighlightIdentifiersStage> |], StagesAfter = [| typeof<UnusedOpensStage> |])>]
+[<DaemonStage(Instantiation.DemandAnyThreadSafe, StagesBefore = [| typeof<HighlightIdentifiersStage> |], StagesAfter = [| typeof<UnusedOpensStage> |])>]
 type FormatSpecifiersStage() =
     inherit FSharpDaemonStageBase(true)
 

ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/InferredTypeCodeVisionProvider.fs

@@ -77,7 +77,7 @@ type InferredTypeCodeVisionProvider() =
         member x.OnExtraActionClick(_, _, _) = ()
 
 
-[<DaemonStage(StagesBefore = [| typeof<GlobalFileStructureCollectorStage> |])>]
+[<DaemonStage(Instantiation.DemandAnyThreadSafe, StagesBefore = [| typeof<GlobalFileStructureCollectorStage> |])>]
 type InferredTypeCodeVisionStage(provider: InferredTypeCodeVisionProvider) =
     inherit FSharpDaemonStageBase(true, false)
 

ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/PatternTypeHintsStage.fs

@@ -3,6 +3,7 @@ namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Daemon.Stages
 open System
 open System.Collections.Generic
 open FSharp.Compiler.Symbols
+open JetBrains.Application.Parts
 open JetBrains.Application.Settings
 open JetBrains.DocumentModel
 open JetBrains.ReSharper.Feature.Services.Daemon
@@ -233,7 +234,7 @@ type private PatternsHighlightingProcess(fsFile, settingsStore: IContextBoundSet
 
         committer.Invoke(DaemonStageResult remainingHighlightings)
 
-[<DaemonStage(StagesBefore = [| typeof<GlobalFileStructureCollectorStage> |])>]
+[<DaemonStage(Instantiation.DemandAnyThreadSafe, StagesBefore = [| typeof<GlobalFileStructureCollectorStage> |])>]
 type PatternTypeHintsStage() =
     inherit FSharpDaemonStageBase(true, false)
 

ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/PipeChainTypeHintStage.fs

@@ -3,6 +3,7 @@
 open System
 open System.Collections.Generic
 open FSharp.Compiler.Symbols
+open JetBrains.Application.Parts
 open JetBrains.Application.Settings
 open JetBrains.DocumentModel
 open JetBrains.ReSharper.Feature.Services.Daemon
@@ -165,7 +166,7 @@ type PipeChainHighlightingProcess(fsFile, settings: IContextBoundSettingsStore,
 
         committer.Invoke(DaemonStageResult remainingHighlightings)
 
-[<DaemonStage(StagesBefore = [| typeof<GlobalFileStructureCollectorStage> |])>]
+[<DaemonStage(Instantiation.DemandAnyThreadSafe, StagesBefore = [| typeof<GlobalFileStructureCollectorStage> |])>]
 type PipeChainTypeHintStage() =
     inherit FSharpDaemonStageBase(true, false)
 

ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/ScriptLoadPathsStage.fs

@@ -2,6 +2,7 @@ namespace rec JetBrains.ReSharper.Plugins.FSharp.Psi.Daemon.Stages
 
 open System.Collections.Generic
 open JetBrains.Application
+open JetBrains.Application.Parts
 open JetBrains.ReSharper.Feature.Services.Daemon
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Highlightings
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Stages
@@ -11,7 +12,7 @@ open JetBrains.ReSharper.Psi
 open JetBrains.ReSharper.Psi.Tree
 open JetBrains.Util
 
-[<DaemonStage(StagesBefore = [| typeof<GlobalFileStructureCollectorStage> |], StagesAfter = [| typeof<HighlightIdentifiersStage> |])>]
+[<DaemonStage(Instantiation.DemandAnyThreadSafe, StagesBefore = [| typeof<GlobalFileStructureCollectorStage> |], StagesAfter = [| typeof<HighlightIdentifiersStage> |])>]
 type ScriptLoadPathsStage() =
     inherit FSharpDaemonStageBase(true) // todo: should report for closed files
 

ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/SyntaxErrorsStage.fs

@@ -1,10 +1,12 @@
 namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Daemon.Stages
 
+open JetBrains.Application.Parts
 open JetBrains.ReSharper.Feature.Services.Daemon
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Stages
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
 
-[<DaemonStage(StagesBefore = [| typeof<GlobalFileStructureCollectorStage> |],
+[<DaemonStage(Instantiation.DemandAnyThreadSafe,
+              StagesBefore = [| typeof<GlobalFileStructureCollectorStage> |],
               StagesAfter = [| typeof<HighlightIdentifiersStage> |])>]
 type SyntaxErrorsStage() =
     inherit FSharpDaemonStageBase()

ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/UnusedOpensStage.fs

@@ -1,6 +1,7 @@
 namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Daemon.Stages
 
 open JetBrains.Application
+open JetBrains.Application.Parts
 open JetBrains.ReSharper.Daemon.UsageChecking
 open JetBrains.ReSharper.Feature.Services.Daemon
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon
@@ -9,7 +10,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Stages
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Services.Util
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
 
-[<DaemonStage(StagesBefore = [| typeof<HighlightIdentifiersStage> |], StagesAfter = [| typeof<CollectUsagesStage> |])>]
+[<DaemonStage(Instantiation.DemandAnyThreadSafe, StagesBefore = [| typeof<HighlightIdentifiersStage> |], StagesAfter = [| typeof<CollectUsagesStage> |])>]
 type UnusedOpensStage() =
     inherit FSharpDaemonStageBase()
 

ReSharper.FSharp/src/FSharp/FSharp.Psi.Services/src/Util/FSharpExtensionMemberUtil.fs

@@ -33,7 +33,7 @@ type FSharpRequest(psiModule, exprType: IType, name: string option) =
 
     interface IRequest with
         member this.Name = name
-        member this.BaseExpressionTypes = baseTypes
+        member this.EligibleExtensionArgumentTypes = baseTypes
         member this.ExpressionType = exprType
         member this.ForModule = psiModule
         member this.Kinds = memberKinds

ReSharper.FSharp/src/FSharp/FSharp.Psi.Services/src/Util/PsiUtil.fs

@@ -484,7 +484,7 @@ let shiftWhitespaceBefore shift (whitespace: Whitespace) =
 let shiftNode shift (expr: #ITreeNode) =
     if shift = 0 || isNull expr then () else
 
-    for child in List.ofSeq (expr.Tokens()) do
+    for child in List.ofSeq (expr.EnumerateAllTokensFromFirstIn()) do
         if not (child :? NewLine) then () else
 
         let nextSibling = child.NextSibling

ReSharper.FSharp/src/FSharp/PackagesLock.targets

@@ -5,16 +5,16 @@
     <PackageLock Include="Fantomas.Core" Version="6.3.15" />
     <PackageLock Include="FSharp.Core" Version="9.0.100-beta.24466.6" />
     <PackageLock Include="JetBrains.Annotations" Version="2024.3.0" />
-    <PackageLock Include="JetBrains.Build.Platform.DistributedCache" Version="1.1.20241202.225" />
+    <PackageLock Include="JetBrains.Build.Platform.DistributedCache" Version="1.1.20250116.227" />
     <PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2025.1.0" />
     <PackageLock Include="JetBrains.HabitatDetector" Version="1.4.3" />
     <PackageLock Include="JetBrains.Lifetimes" Version="2024.3.0" />
-    <PackageLock Include="JetBrains.NuGet.Packaging" Version="6.12.20241210.146" />
-    <PackageLock Include="JetBrains.NuGet.Versioning" Version="6.12.20241210.146" />
+    <PackageLock Include="JetBrains.NuGet.Packaging" Version="6.12.20250115.147" />
+    <PackageLock Include="JetBrains.NuGet.Versioning" Version="6.12.20250115.147" />
     <PackageLock Include="JetBrains.RdFramework" Version="2024.3.0" />
     <PackageLock Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="2.16.1" />
     <PackageLock Include="NVelocity" Version="1.0.3" />
     <PackageLock Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageLock Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
   </ItemGroup>
-</Project>
+</Project>

ReSharper.FSharp/test/src/FSharp.Common.Tests/SciptPsiModulesTest.fs

@@ -100,7 +100,7 @@ type MyTestSolutionToolset(lifetime: Lifetime, dotNetCoreInstallationsDetector:
 
 
 
-[<ShellComponent>]
+[<ShellComponent(Instantiation.DemandAnyThreadSafe)>]
 [<ZoneMarker(typeof<ICommonTestFSharpPluginZone>)>]
 type FSharpFileServiceStub() =
     interface IFSharpFileService with

ReSharper.FSharp/test/src/FSharp.Tests.Common/src/Stubs.fs

@@ -10,7 +10,7 @@ open JetBrains.ReSharper.Plugins.FSharp.ProjectModel.Host.ProjectItems.ItemsCont
 open JetBrains.ReSharper.Plugins.FSharp.ProjectModel.Scripts
 open JetBrains.ReSharper.Plugins.FSharp.Tests
 
-[<ShellComponent>]
+[<ShellComponent(Instantiation.DemandAnyThreadSafe)>]
 [<ZoneMarker(typeof<ITestFSharpPluginZone>)>]
 type FSharpFileServiceStub() =
 

ReSharper.FSharp/test/src/PackagesLock.targets

@@ -5,9 +5,9 @@
     <PackageLock Include="FSharp.Core" Version="9.0.100-beta.24466.6" />
     <PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2025.1.0" />
     <PackageLock Include="JetBrains.Lifetimes" Version="2024.3.0" />
-    <PackageLock Include="JetBrains.NuGet.Frameworks" Version="6.12.20241210.146" />
-    <PackageLock Include="JetBrains.NuGet.Packaging" Version="6.12.20241210.146" />
-    <PackageLock Include="JetBrains.NuGet.Versioning" Version="6.12.20241210.146" />
+    <PackageLock Include="JetBrains.NuGet.Frameworks" Version="6.12.20250115.147" />
+    <PackageLock Include="JetBrains.NuGet.Packaging" Version="6.12.20250115.147" />
+    <PackageLock Include="JetBrains.NuGet.Versioning" Version="6.12.20250115.147" />
     <PackageLock Include="JetBrains.RdFramework" Version="2024.3.0" />
     <PackageLock Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageLock Include="Microsoft.NETCore.Platforms" Version="1.1.1" />

rider-fsharp/build.gradle.kts

@@ -1,12 +1,12 @@
 import com.jetbrains.plugin.structure.base.utils.isFile
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jetbrains.intellij.platform.gradle.Constants
-import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
 import org.jetbrains.intellij.platform.gradle.tasks.RunIdeTask
 import org.jetbrains.kotlin.daemon.common.toHexString
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import kotlin.io.path.absolutePathString
+import kotlin.io.path.pathString
 
 plugins {
   // Version is configured in gradle.properties
@@ -57,7 +57,10 @@ dependencies {
     bundledPlugin("org.jetbrains.plugins.textmate")
     bundledPlugin("rider.intellij.plugin.appender")
     instrumentationTools()
-    testFramework(TestFrameworkType.Bundled)
+    // TODO: Temporary I hope hope hope
+    bundledLibrary(provider {
+      project.intellijPlatform.platformPath.resolve("lib/testFramework.jar").pathString
+    })
   }
 
   testImplementation("org.opentest4j:opentest4j:1.3.0")
@@ -291,7 +294,6 @@ tasks {
     }
 
     buildSearchableOptions {
-      jvmArgs("-Djava.security.manager=com.intellij.platform.core.nio.fs.CoreBootstrapSecurityManager")
       enabled = buildConfiguration == "Release"
     }
   }

rider-fsharp/gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2000m
 kotlin.stdlib.default.dependency=false
 rdVersion=2024.3-pre2
 rdKotlinVersion=2.1.0
-intellijPlatformGradlePluginVersion=2.1.0
+intellijPlatformGradlePluginVersion=2.2.1
 grammarKitVersion=2022.3.2.1
 gradleJvmWrapperVersion=0.14.0
 riderBaseVersion=2025.1

rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/fantomas/FantomasTest.kt

@@ -1,6 +1,6 @@
 package com.jetbrains.rider.plugins.fsharp.test.cases.fantomas
 
-import com.jetbrains.rdclient.testFramework.executeWithGold
+import com.jetbrains.rider.test.framework.executeWithGold
 import com.jetbrains.rider.test.scriptingApi.waitForDaemon
 import com.jetbrains.rider.plugins.fsharp.test.withEditorConfig
 import com.jetbrains.rider.test.annotations.Mute

rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FcsModuleReaderTest.kt

@@ -5,7 +5,7 @@ import com.intellij.openapi.editor.impl.EditorImpl
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
 import com.intellij.openapi.project.Project
 import com.intellij.platform.backend.workspace.WorkspaceModel
-import com.jetbrains.rdclient.testFramework.executeWithGold
+import com.jetbrains.rider.test.framework.executeWithGold
 import com.jetbrains.rdclient.util.idea.pumpMessages
 import com.jetbrains.rider.daemon.util.hasErrors
 import com.jetbrains.rider.editors.getProjectModelId

rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersFeaturesTest.kt

@@ -3,7 +3,7 @@ package com.jetbrains.rider.plugins.fsharp.test.cases.typeProviders
 import com.intellij.openapi.actionSystem.ActionPlaces
 import com.intellij.openapi.actionSystem.IdeActions
 import com.jetbrains.rd.platform.diagnostics.LogTraceScenario
-import com.jetbrains.rdclient.testFramework.executeWithGold
+import com.jetbrains.rider.test.framework.executeWithGold
 import com.jetbrains.rider.test.scriptingApi.waitForDaemon
 import com.jetbrains.rider.plugins.fsharp.logs.FSharpLogTraceScenarios
 import com.jetbrains.rider.test.annotations.TestEnvironment

rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersTest.kt

@@ -1,6 +1,6 @@
 package com.jetbrains.rider.plugins.fsharp.test.cases.typeProviders
 
-import com.jetbrains.rdclient.testFramework.executeWithGold
+import com.jetbrains.rider.test.framework.executeWithGold
 import com.jetbrains.rider.test.scriptingApi.waitForDaemon
 import com.jetbrains.rider.test.annotations.Mute
 import com.jetbrains.rider.test.annotations.Solution

rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typingAssist/FSharpPatchEngineTypingAssists.kt

@@ -42,13 +42,6 @@ abstract class FSharpTypingAssistPatchEngineTest(mode: PatchEngineEditorTestMode
   }
 }
 
-@Test
-@Subsystem(SubsystemConstants.TYPING_ASSIST)
-@Feature("Typing Assist")
-@TestEnvironment(sdkVersion = SdkVersion.LATEST_STABLE)
-class FSharpTypingAssistPatchEngineSpeculativeRebaseProhibitedTest :
-  FSharpTypingAssistPatchEngineTest(PatchEngineEditorTestMode.SpeculativeRebaseProhibited)
-
 @Test
 @Subsystem(SubsystemConstants.TYPING_ASSIST)
 @Feature("Typing Assist")