MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[terminal] IJPL-159752 send Ctrl+C to terminate a running command as a workaround for ConPTY issue

Browse Source 
GitOrigin-RevId: d06fab0c71bde3de7fea1656f05351555425b9e0
This commit is contained in:
Sergey Simonchik
2025-06-17 00:16:06 +02:00
committed by intellij-monorepo-bot
parent 92e121eb92
commit 3e3e463b89
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalTtyConnector.java
View File

@@ -1,15 +1,19 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.plugins.terminal;
import com.google.common.base.Ascii;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.terminal.pty.PtyProcessTtyConnector;
import com.intellij.util.concurrency.AppExecutorUtil;
import com.jediterm.core.util.TermSize;
import com.pty4j.PtyProcess;
import com.pty4j.unix.UnixPtyProcess;
import com.pty4j.windows.conpty.WinConPtyProcess;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
import java.util.concurrent.TimeUnit;
@@ -35,10 +39,35 @@ public class LocalTerminalTtyConnector extends PtyProcessTtyConnector {
}, 1000, TimeUnit.MILLISECONDS);
}
else {
if (myProcess instanceof WinConPtyProcess winConPtyProcess && !winConPtyProcess.isBundledConPtyLibrary()) {
sendInterruptToWinConPtyProcess();
}
myProcess.destroy();
}
}
/**
* Workaround for the ConPTY issue <a href="https://github.com/microsoft/terminal/issues/15373">#15373</a>
* which was fixed in Windows Terminal 1.22.
* Even though this version is bundled with IDE, ConPTY can be loaded from the OS.
* @see <a href="https://github.com/microsoft/terminal/discussions/19030">workaround discussion</a>
*/
private void sendInterruptToWinConPtyProcess() {
OutputStream outputStream = myProcess.getOutputStream();
if (outputStream != null && myProcess.isAlive()) {
try {
// ConPTY will process `0x03` and raise `CTRL_C_EVENT`.
// This will hopefully terminate the whole process hierarchy of running user command,
// which is a must for commands like `npm run dev`.
outputStream.write(Ascii.ETX);
outputStream.flush();
}
catch (IOException e) {
LOG.info("Failed to send Ctrl+C to " + myProcess.getClass().getSimpleName() + ", alive:" + myProcess.isAlive(), e);
}
}
}
@Override
public void resize(@NotNull TermSize termSize) {
if (LOG.isDebugEnabled()) {