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

Add possibility for flavor to patch command line before execution (https://github.com/JetBrains/intellij-community/pull/534)

Browse Source
This commit is contained in:
Dmitry Trofimov
2017-04-12 14:47:02 +02:00
parent e9400e0d1d
commit 5a0729c244
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/sdk/PySdkUtil.java
+10
View File
@@ -33,6 +33,8 @@ import com.intellij.psi.PsiFile;
import com.intellij.remote.RemoteSdkAdditionalData;
import com.intellij.util.SystemProperties;
import com.intellij.util.containers.HashMap;
import com.jetbrains.python.run.CommandLinePatcher;
import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -125,6 +127,14 @@ public class PySdkUtil {
try {
final GeneralCommandLine commandLine = cmd.withWorkDirectory(homePath).withEnvironment(env);
final PythonSdkFlavor flavor = PythonSdkFlavor.getFlavor(commandLine.getExePath());
final CommandLinePatcher cmdLinePatcher = flavor.commandLinePatcher();
if (cmdLinePatcher != null) {
cmdLinePatcher.patchCommandLine(cmd);
}
final CapturingProcessHandler processHandler = new CapturingProcessHandler(commandLine);
if (stdin != null) {
final OutputStream processInput = processHandler.getProcessInput();
python/src/com/jetbrains/python/sdk/PythonEnvUtil.java
+1
View File
@@ -66,6 +66,7 @@ public class PythonEnvUtil {
* @param value what to append
* @return modified path-like string
*/
@NotNull
public static String appendToPathEnvVar(@Nullable String source, @NotNull String value) {
if (StringUtil.isEmpty(source)) return value;
python/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java
+6
View File
@@ -29,6 +29,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.PatternUtil;
import com.jetbrains.python.psi.LanguageLevel;
import com.jetbrains.python.run.CommandLinePatcher;
import com.jetbrains.python.sdk.PySdkUtil;
import com.jetbrains.python.sdk.PythonEnvUtil;
import com.jetbrains.python.sdk.PythonSdkAdditionalData;
@@ -256,4 +257,9 @@ public abstract class PythonSdkFlavor {
public VirtualFile getSdkPath(VirtualFile path) {
return path;
}
@Nullable
public CommandLinePatcher commandLinePatcher() {
return null;
}
}