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

env tests fixed

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-09-28 19:07:27 +03:00
parent 5b2fe2ae3b
commit bc0a192e10
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/debugger/PyDebugRunner.java
+1 -1
View File
@@ -387,7 +387,7 @@ public class PyDebugRunner extends GenericProgramRunner {
final Sdk sdk = runConfiguration.getSdk();
if (sdk != null) {
List<String> roots = Lists.newArrayList();
for (VirtualFile contentRoot : sdk.getSdkModificator().getRoots(OrderRootType.CLASSES)) {
for (VirtualFile contentRoot : sdk.getRootProvider().getFiles(OrderRootType.CLASSES)) {
roots.add(contentRoot.getPath());
}
environment.put(LIBRARY_ROOTS, StringUtil.join(roots, File.pathSeparator));
python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
+11 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.projectRoots.ProjectJdkTable;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl;
import com.intellij.openapi.roots.OrderRootType;
@@ -161,7 +162,16 @@ public class PyPackageManagerImpl extends PyPackageManager {
protected void subscribeToLocalChanges() {
final Application app = ApplicationManager.getApplication();
final MessageBusConnection connection = app.getMessageBus().connect();
connection.subscribe(VirtualFileManager.VFS_CHANGES, new MySdkRootWatcher());
MySdkRootWatcher watcher = new MySdkRootWatcher();
connection.subscribe(VirtualFileManager.VFS_CHANGES, watcher);
connection.subscribe(ProjectJdkTable.JDK_TABLE_TOPIC, new ProjectJdkTable.Adapter() {
@Override
public void jdkRemoved(@NotNull Sdk jdk) {
if (jdk == getSdk()) {
connection.disconnect();
}
}
});
}
@NotNull