From fe8fb9c16756268a0bdf670e76c0b600d7d303ae Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Fri, 30 Oct 2015 15:58:55 +0300 Subject: [PATCH] fixed PY-17113 Right click menu is very slow to open up in PyCharm EAP PY-143.24 --- .../python/packaging/PyCondaPackageManagerImpl.java | 4 ++-- .../jetbrains/python/packaging/PyPackageManagerImpl.java | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java index d46dce3f0b5a..95f6ef828fee 100644 --- a/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java +++ b/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java @@ -130,9 +130,9 @@ public class PyCondaPackageManagerImpl extends PyPackageManagerImpl { getCondaOutput("remove", arguments); } - @Nullable + @NotNull @Override - public List getPackages(boolean cachedOnly) throws ExecutionException { + protected List getPackages() throws ExecutionException { final ProcessOutput output = getCondaOutput("list", Lists.newArrayList("-e")); return parseCondaToolOutput(output.getStdout()); } diff --git a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java index d7ef61698cf2..dc4506aa15fb 100644 --- a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java +++ b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java @@ -276,8 +276,7 @@ public class PyPackageManagerImpl extends PyPackageManager { } } try { - final String output = getHelperResult(PACKAGING_TOOL, Arrays.asList("list"), false, false, null); - final List packages = parsePackagingToolOutput(output); + final List packages = getPackages(); synchronized (myCacheLock) { myPackagesCache = packages; return new ArrayList(myPackagesCache); @@ -291,6 +290,12 @@ public class PyPackageManagerImpl extends PyPackageManager { } } + @NotNull + protected List getPackages() throws ExecutionException { + final String output = getHelperResult(PACKAGING_TOOL, Arrays.asList("list"), false, false, null); + return parsePackagingToolOutput(output); + } + @Nullable public Set getDependents(@NotNull PyPackage pkg) throws ExecutionException { final List packages = getPackages(false);