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

Propose solutions for SyntaxError and Python.h in installation output

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2014-10-02 17:17:01 +04:00
parent 9fd56e410f
commit 3970ef798d
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/packaging/ui/PyPackageManagementService.java
+31 -10
View File
@@ -19,12 +19,14 @@ import com.intellij.execution.ExecutionException;
import com.intellij.execution.RunCanceledByUserException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.CatchingConsumer;
import com.intellij.webcore.packaging.InstalledPackage;
import com.intellij.webcore.packaging.PackageManagementService;
import com.intellij.webcore.packaging.RepoPackage;
import com.jetbrains.python.packaging.*;
import com.jetbrains.python.psi.LanguageLevel;
import com.jetbrains.python.sdk.PySdkUtil;
import com.jetbrains.python.sdk.PythonSdkType;
import org.apache.xmlrpc.AsyncCallback;
@@ -323,23 +325,42 @@ public class PyPackageManagementService extends PackageManagementService {
final PyExecutionException ee = (PyExecutionException)e;
final String stdoutCause = findErrorCause(ee.getStdout());
final String stderrCause = findErrorCause(ee.getStderr());
final String message = stdoutCause != null ? stdoutCause : stderrCause != null ? stderrCause : ee.getMessage();
final String solution;
if ("pip".equals(ee.getCommand())) {
solution = "Try to run this command from the system terminal. Make sure that you use the correct version of 'pip' " +
"installed for your Python interpreter located at '" + sdk.getHomePath() + "'.";
}
else {
solution = null;
}
final String cause = stdoutCause != null ? stdoutCause : stderrCause;
final String message = cause != null ? cause : ee.getMessage();
final String command = ee.getCommand() + " " + StringUtil.join(ee.getArgs(), " ");
return new ErrorDescription(message, command, ee.getStdout(), solution);
return new ErrorDescription(message, command, ee.getStdout(), findErrorSolution(ee, cause, sdk));
}
else {
return ErrorDescription.fromMessage(e.getMessage());
}
}
@Nullable
private static String findErrorSolution(@NotNull PyExecutionException e, @Nullable String cause, @NotNull Sdk sdk) {
if (cause != null) {
if (StringUtil.containsIgnoreCase(cause, "SyntaxError")) {
final LanguageLevel languageLevel = PythonSdkType.getLanguageLevelForSdk(sdk);
return "Make sure that you use a version of Python supported by this package. Currently you are using Python " +
languageLevel + ".";
}
}
if (SystemInfo.isLinux && (containsInOutput(e, "pyconfig.h") || containsInOutput(e, "Python.h"))) {
return "Make sure that you have installed Python development packages for your operating system.";
}
if ("pip".equals(e.getCommand())) {
return "Try to run this command from the system terminal. Make sure that you use the correct version of 'pip' " +
"installed for your Python interpreter located at '" + sdk.getHomePath() + "'.";
}
return null;
}
private static boolean containsInOutput(@NotNull PyExecutionException e, @NotNull String text) {
return StringUtil.containsIgnoreCase(e.getStdout(), text) || StringUtil.containsIgnoreCase(e.getStderr(), text);
}
@Nullable
private static String findErrorCause(@NotNull String output) {
final Matcher m = PATTERN_ERROR_LINE.matcher(output);