Skip to content

Sync with the ultimate master #1152

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
Eugene Auduchinok (auduchinok) merged 2 commits into from
Jun 4, 2026
Merged

Sync with the ultimate master #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c736b7
IJPL-241314 migrate module-set wrappers to hand-written plugins
develar Jun 2, 2026
f9d81b4
[console] IJPL-246107 Migrate ProcessOutputType comparison to isStdo…
zuevmaxim May 29, 2026
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 rider-fsharp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dependencies {
bundledModule("intellij.platform.langInjection")
bundledPlugin("org.jetbrains.plugins.textmate")
bundledPlugin("rider.intellij.plugin.appender")
bundledPlugin("com.intellij.moduleSet.structureView")
bundledPlugin("intellij.structureView.plugin")
bundledModule("intellij.resharper.assist")
instrumentationTools()
// TODO: Temporary I hope hope hope
Expand Down
13 changes: 6 additions & 7 deletions ...fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/FsiProcessHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.jetbrains.rider.plugins.fsharp.services.fsi
import com.intellij.execution.process.OSProcessHandler
import com.intellij.execution.process.ProcessEvent
import com.intellij.execution.process.ProcessListener
import com.intellij.execution.process.ProcessOutputTypes
import com.intellij.execution.process.ProcessOutputType
import com.intellij.execution.ui.ConsoleViewContentType
import com.intellij.openapi.rd.util.launchOnUi
import com.intellij.openapi.util.Key
Expand Down Expand Up @@ -36,12 +36,12 @@ internal class FsiProcessHandler(
lifetime.launchOnUi {
it.consumeEach { (text, outputType) ->
if (text != "> ") {
when (outputType) {
ProcessOutputTypes.STDOUT -> {
when {
ProcessOutputType.isStdout(outputType) -> {
fsiInputOutputProcessor.printOutputText(text, ConsoleViewContentType.NORMAL_OUTPUT)
}

ProcessOutputTypes.STDERR -> {
ProcessOutputType.isStderr(outputType) -> {
fsiInputOutputProcessor.printOutputText(text, ConsoleViewContentType.ERROR_OUTPUT)
}
}
Expand All @@ -56,9 +56,8 @@ internal class FsiProcessHandler(
}

override fun notifyTextAvailable(text: String, outputType: Key<*>) {
when (outputType) {
ProcessOutputTypes.STDOUT,
ProcessOutputTypes.STDERR -> {
when {
ProcessOutputType.isStdout(outputType) || ProcessOutputType.isStderr(outputType) -> {
ThreadingAssertions.assertBackgroundThread()
channel.trySendBlocking(text to outputType)
}
Expand Down
4 changes: 2 additions & 2 deletions ...rp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/FsiSandboxInfoUpdater.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class FsiSandboxInfoUpdater(
fun onOutputEnd() {
if (!ProcessOutputType.isSystem(fsiProcessOutputListener.lastOutputType)) {
verifiedCommandNumber += 1
if (fsiProcessOutputListener.lastOutputType == ProcessOutputTypes.STDOUT) {
if (ProcessOutputType.isStdout(fsiProcessOutputListener.lastOutputType)) {
correctCommandNumbers.add(verifiedCommandNumber)

updateSandboxInfo()
Expand All @@ -106,7 +106,7 @@ class FsiSandboxInfoUpdater(
var lastOutputType: Key<*> = ProcessOutputTypes.SYSTEM

override fun onTextAvailable(event: ProcessEvent, outputType: Key<*>) {
if (outputType == ProcessOutputTypes.STDOUT && !ProcessOutputType.isSystem(lastOutputType))
if (ProcessOutputType.isStdout(outputType) && !ProcessOutputType.isSystem(lastOutputType))
lastOutputType = ProcessOutputTypes.STDOUT
}

Expand Down
2 changes: 1 addition & 1 deletion rider-fsharp/src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<depends>com.intellij.modules.rider</depends>
<depends>rider.intellij.plugin.appender</depends>
<depends>com.intellij.rider.rdclient.spellchecker</depends>
<depends>com.intellij.moduleSet.structureView</depends>
<depends>intellij.structureView.plugin</depends>

<content>
<module name="intellij.rider.plugins.fsharp.injections" />
Expand Down
Loading