MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

[terminal] IJPL-199151 run Windows shells locally even if the project is open in WSL

Browse Source 
GitOrigin-RevId: ab8529ef3d4961fa09df41931ce174b971f2ce5c
This commit is contained in:
Sergey Simonchik
2025-08-03 17:42:22 +00:00
committed by intellij-monorepo-bot
parent 858659c93b
commit a5fc863d4a
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/terminal/src/org/jetbrains/plugins/terminal/runner/LocalOptionsConfigurer.java
+2 -3
View File
@@ -20,7 +20,6 @@ import com.intellij.terminal.ui.TerminalWidget;
import com.intellij.util.EnvironmentRestorer;
import com.intellij.util.SystemProperties;
import com.intellij.util.containers.CollectionFactory;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -46,11 +45,11 @@ public final class LocalOptionsConfigurer {
private static final Logger LOG = Logger.getInstance(LocalOptionsConfigurer.class);
public static @NotNull ShellStartupOptions configureStartupOptions(@NotNull ShellStartupOptions baseOptions, @NotNull Project project) {
List<String> initialCommand = getInitialCommand(baseOptions, project);
String workingDir = getWorkingDirectory(baseOptions.getWorkingDirectory(), project);
var eelDescriptor = findEelDescriptor(workingDir, ContainerUtil.notNullize(baseOptions.getShellCommand()));
var eelDescriptor = findEelDescriptor(workingDir, initialCommand);
Map<String, String> envs = getTerminalEnvironment(baseOptions.getEnvVariables(), workingDir, project, eelDescriptor);
List<String> initialCommand = getInitialCommand(baseOptions, project);
TerminalWidget widget = baseOptions.getWidget();
if (widget != null) {
widget.setShellCommand(initialCommand);
plugins/terminal/src/org/jetbrains/plugins/terminal/terminalStartup.kt
+21 -2
View File
@@ -7,6 +7,7 @@ import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.progress.runBlockingMaybeCancellable
import com.intellij.openapi.util.SystemInfo
import com.intellij.openapi.util.io.OSAgnosticPathUtil
import com.intellij.openapi.util.registry.Registry
import com.intellij.platform.eel.*
import com.intellij.platform.eel.path.EelPath
@@ -14,10 +15,12 @@ import com.intellij.platform.eel.provider.LocalEelDescriptor
import com.intellij.platform.eel.provider.asEelPath
import com.intellij.platform.eel.provider.getEelDescriptor
import com.intellij.util.PathUtil
import com.intellij.util.system.OS
import com.jediterm.core.util.TermSize
import com.jediterm.terminal.TtyConnector
import com.pty4j.PtyProcess
import org.jetbrains.plugins.terminal.runner.LocalTerminalStartCommandBuilder
import org.jetbrains.plugins.terminal.util.ShellNameUtil
import java.nio.file.InvalidPathException
import java.nio.file.Path
import java.time.Duration
@@ -105,8 +108,24 @@ internal fun findEelDescriptor(workingDir: String?, shellCommand: List<String>):
}
}
private fun buildStartupEelContext(workingDirectory: Path, command: List<String>): TerminalStartupEelContext {
val wslDistribNameFromCommandline = getWslDistributionNameFromCommand(command)
private fun buildStartupEelContext(workingDirectory: Path, shellCommand: List<String>): TerminalStartupEelContext {
val executable = shellCommand.firstOrNull()
if (OS.CURRENT == OS.Windows && executable != null &&
(ShellNameUtil.isPowerShell(executable) || OSAgnosticPathUtil.isAbsoluteDosPath(executable))) {
// Enforce running a Windows shell locally even if the project is opened in WSL.
//
// Although WSL can run Windows processes, it's best to avoid it:
// 1. Command-block shell integration won't work because the order of operations is not maintained.
// It works when using the local environment with bundled ConPTY (IJPL-190952).
// 2. WSL fails to run a Windows process if the executable is specified without the '.exe' extension, e.g. 'powershell'.
// 3. WSL fails to run a Windows process specified with an absolute Windows path,
// e.g. 'C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe'.
// 4. Using two interoperability layers to run a local Windows process is generally unnecessary.
return TerminalStartupEelContext(LocalEelDescriptor) {
EelPath.parse(workingDirectory.toString(), LocalEelDescriptor)
}
}
val wslDistribNameFromCommandline = getWslDistributionNameFromCommand(shellCommand)
if (wslDistribNameFromCommandline != null) {
val wslDistribNameFromWorkingDirectory = WslPath.parseWindowsUncPath(workingDirectory.toString())?.distributionId
if (wslDistribNameFromCommandline != wslDistribNameFromWorkingDirectory) {