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

Pass project to PyRemotePathEditor directly

Browse Source 
GitOrigin-RevId: 1ed8672330827fb5e86a73a3c13b6a0d450c1be6
This commit is contained in:
Alexander Koshevoy
2021-10-05 09:55:58 +00:00
committed by intellij-monorepo-bot
parent 41cbc844b0
commit 418100585c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
+7 -8
View File
@@ -3,9 +3,7 @@ package com.jetbrains.python.configuration;
import com.google.common.collect.Sets;
import com.intellij.icons.AllIcons;
import com.intellij.ide.DataManager;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.module.Module;
@@ -445,9 +443,9 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
}
}
private PythonPathEditor createPathEditor(final Sdk sdk) {
private PythonPathEditor createPathEditor(@NotNull final Sdk sdk) {
if (PythonSdkUtil.isRemote(sdk)) {
return new PyRemotePathEditor(sdk);
return new PyRemotePathEditor(myProject, sdk);
}
else {
return new PythonPathEditor(PyBundle.message("python.sdk.configuration.tab.title"), OrderRootType.CLASSES,
@@ -462,13 +460,15 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
private class PyRemotePathEditor extends PythonPathEditor {
private final RemoteSdkProperties myRemoteSdkData;
private final Sdk mySdk;
@NotNull private final Project myProject;
@NotNull private final Sdk mySdk;
private final List<PathMappingSettings.PathMapping> myNewMappings = new ArrayList<>();
PyRemotePathEditor(Sdk sdk) {
PyRemotePathEditor(@NotNull Project project, @NotNull Sdk sdk) {
super(PyBundle.message("python.sdk.configuration.tab.title"), OrderRootType.CLASSES,
FileChooserDescriptorFactory.createAllButJarContentsDescriptor());
myProject = project;
mySdk = sdk;
myRemoteSdkData = (RemoteSdkProperties)mySdk.getSdkAdditionalData();
}
@@ -503,10 +503,9 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
@Override
protected VirtualFile[] doAddItems() {
Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myPanel));
try {
String[] files = PythonRemoteInterpreterManager
.getInstance().chooseRemoteFiles(project, (PyRemoteSdkAdditionalDataBase)mySdk.getSdkAdditionalData(), false);
.getInstance().chooseRemoteFiles(myProject, (PyRemoteSdkAdditionalDataBase)mySdk.getSdkAdditionalData(), false);
final String sourcesLocalPath = PythonSdkUtil.getRemoteSourcesLocalPath(mySdk.getHomePath());