From 8468aa3ba147e67f71591b1357f60128d6cfe09b Mon Sep 17 00:00:00 2001 From: Konstantin Krukhmalev Date: Tue, 19 May 2026 16:18:34 +0300 Subject: [PATCH 1/5] tests [rider] Add com.intellij.moduleSet.structureView to rider-fsharp plugin Gradle GitOrigin-RevId: 9d6c80971339abd4f4beea2eee4141f6a0903ac1 --- rider-fsharp/build.gradle.kts | 1 + rider-fsharp/src/main/resources/META-INF/plugin.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/rider-fsharp/build.gradle.kts b/rider-fsharp/build.gradle.kts index 9a1669ad37..743a2e6ac6 100644 --- a/rider-fsharp/build.gradle.kts +++ b/rider-fsharp/build.gradle.kts @@ -66,6 +66,7 @@ dependencies { bundledModule("intellij.platform.langInjection") bundledPlugin("org.jetbrains.plugins.textmate") bundledPlugin("rider.intellij.plugin.appender") + bundledPlugin("com.intellij.moduleSet.structureView") bundledModule("intellij.resharper.assist") instrumentationTools() // TODO: Temporary I hope hope hope diff --git a/rider-fsharp/src/main/resources/META-INF/plugin.xml b/rider-fsharp/src/main/resources/META-INF/plugin.xml index 7423670923..ac3f13ff42 100644 --- a/rider-fsharp/src/main/resources/META-INF/plugin.xml +++ b/rider-fsharp/src/main/resources/META-INF/plugin.xml @@ -15,6 +15,7 @@ com.intellij.modules.rider rider.intellij.plugin.appender com.intellij.rider.rdclient.spellchecker + com.intellij.moduleSet.structureView From a8578dac9fd239bd58fe946c262c985cbbcae1d2 Mon Sep 17 00:00:00 2001 From: "Maxim.Golubtsov" Date: Thu, 21 May 2026 14:55:32 +0300 Subject: [PATCH 2/5] update gold against fsharp XUnitProjectTemplateTest RIDER-81171 GitOrigin-RevId: d974204a8a04c49014683b2ff1586fcc09a7c2dd --- .../projectModel/gold/projectModel.gold | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rider-fsharp/src/test/testData/templates/net10/Net10/XUnitProjectTemplateTest/projectModel/gold/projectModel.gold b/rider-fsharp/src/test/testData/templates/net10/Net10/XUnitProjectTemplateTest/projectModel/gold/projectModel.gold index fdd3514ab0..16ba28ceff 100644 --- a/rider-fsharp/src/test/testData/templates/net10/Net10/XUnitProjectTemplateTest/projectModel/gold/projectModel.gold +++ b/rider-fsharp/src/test/testData/templates/net10/Net10/XUnitProjectTemplateTest/projectModel/gold/projectModel.gold @@ -11,7 +11,7 @@ Opened ... -Packages coverlet.collector/6.0.4 - FSharp.Core/10.0.100 + FSharp.Core/10.1.202 Microsoft.NET.Test.Sdk/17.14.1 xunit.runner.visualstudio/3.1.4 xunit/2.9.3 @@ -39,6 +39,7 @@ Project [Name:UnitTestProject, GUID:GUID] Child items: Folder [Name:net10.0, IsHidden:true] Child items: + ProjectFileImpl(Path : ILLink.Substitutions.xml)[Hidden EMBEDDEDRESOURCE Properties:LogicalName=ILLink.Substitutions.xml] ProjectFileImpl(Path : UnitTestProject.AssemblyInfo.fs)[Hidden COMPILE Properties:CompileOrder=CompileBefore] ProjectFileImpl(Path : xunit.abstractions.dll (.nuget/packages))[Hidden NONE ] ProjectFileImpl(Path : xunit.runner.visualstudio.testadapter.dll (.nuget/packages))[Hidden NONE ] From d13fc273118033f99f93b1c23f3ab53c05c7a99f Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 21 May 2026 17:25:33 +0200 Subject: [PATCH 3/5] IJPL-245430 convert tcServiceMessages to wrapper module Move TeamCity service messages out of shared project-library XMLs and into an intellij.libraries wrapper module so JPS, Bazel, product layouts, and packaging all consume the same module-backed dependency. Keep the wrapper transparent for Fleet and register it only in the essential module set next to the modules that require it. This avoids making core platform library sets and CodeServer inherit the TeamCity service messages dependency. IJPL-237791 IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 IJ-MR-193195 IJ-MR-196957 IJ-MR-199124 IJ-MR-197441 IJ-MR-204135 IJ-MR-204674 GitOrigin-RevId: 9239d7cb9853340405b1052355998fb83c26052b --- .../test/resources/intellij.rider.plugins.fsharp.test.cases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/rider-fsharp/src/test/resources/intellij.rider.plugins.fsharp.test.cases.xml b/rider-fsharp/src/test/resources/intellij.rider.plugins.fsharp.test.cases.xml index 0b577220e1..9588714cdd 100644 --- a/rider-fsharp/src/test/resources/intellij.rider.plugins.fsharp.test.cases.xml +++ b/rider-fsharp/src/test/resources/intellij.rider.plugins.fsharp.test.cases.xml @@ -12,6 +12,7 @@ + From 02af9b81d7742ce0b9d3832d3f21e7d016027ca3 Mon Sep 17 00:00:00 2001 From: Rival Abdrakhmanov Date: Mon, 18 May 2026 09:47:09 +0200 Subject: [PATCH 4/5] RIDER-138866 migrate from `DotNetProgramRunner` to `RiderProgramRunner` GitOrigin-RevId: 7ee21dd3c6892a33d6c68b37472088dfdeaa8940 --- .../services/fsi/runScript/FSharpScriptConfiguration.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/runScript/FSharpScriptConfiguration.kt b/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/runScript/FSharpScriptConfiguration.kt index 2abde43fbc..d3795ae407 100644 --- a/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/runScript/FSharpScriptConfiguration.kt +++ b/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/runScript/FSharpScriptConfiguration.kt @@ -8,10 +8,10 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.JDOMExternalizerUtil import com.intellij.openapi.vfs.VirtualFile import com.jetbrains.rdclient.util.idea.toVirtualFile -import com.jetbrains.rider.debugger.DotNetAsyncRunnableConfiguration import com.jetbrains.rider.debugger.IRiderDebuggable import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.FSharpScriptFileType import com.jetbrains.rider.plugins.fsharp.FSharpBundle +import com.jetbrains.rider.run.IRiderRunnable import com.jetbrains.rider.run.configurations.DotProfilingAwareRunConfiguration import com.jetbrains.rider.run.configurations.RiderAsyncRunConfiguration import org.jdom.Element @@ -25,7 +25,7 @@ class FSharpScriptConfiguration(name: String, project, factory, { FSharpScriptConfigurationEditor(it) }, - FSharpScriptExecutorFactory()), DotNetAsyncRunnableConfiguration, IRiderDebuggable, DotProfilingAwareRunConfiguration { + FSharpScriptExecutorFactory()), IRiderRunnable, IRiderDebuggable, DotProfilingAwareRunConfiguration { companion object { private const val SCRIPT_PATH = "SCRIPT_PATH" } From 36e311f952a32e8f359cecdd9eaeb57528d42fec Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Thu, 21 May 2026 16:01:12 +0200 Subject: [PATCH 5/5] NP-2141 Asserts: fix broken defines condition in the monorepo GitOrigin-RevId: 5ccc2eecf09e9007fa8b5412deffb0b90078de76 --- ReSharper.FSharp/Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReSharper.FSharp/Directory.Build.props b/ReSharper.FSharp/Directory.Build.props index 0169908595..451b6429b0 100644 --- a/ReSharper.FSharp/Directory.Build.props +++ b/ReSharper.FSharp/Directory.Build.props @@ -1,11 +1,11 @@ - + TRACE;DEBUG;JET_MODE_ASSERT - + TRACE