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

python-psi-impl extracted

Browse Source 
GitOrigin-RevId: e3d808c147ac793701c7b628dbf825a99bb71f2a
This commit is contained in:
Dmitry Trofimov
2019-09-11 19:15:01 +00:00
committed by intellij-monorepo-bot
parent 55fbfb54c2
commit a0bc048dcc
728 changed files with 3029 additions and 2587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/pluginCore/com/jetbrains/python/packaging/PyManagePackagesAction.java
+3 -3
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.LangDataKeys;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.projectRoots.Sdk;
import com.jetbrains.python.sdk.PythonSdkType;
import com.jetbrains.python.sdk.PythonSdkUtil;
import org.jetbrains.annotations.NotNull;
/**
@@ -30,7 +30,7 @@ public class PyManagePackagesAction extends AnAction {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
Module module = e.getData(LangDataKeys.MODULE);
final Sdk sdk = PythonSdkType.findPythonSdk(module);
final Sdk sdk = PythonSdkUtil.findPythonSdk(module);
if (module != null && sdk != null) {
new PyManagePackagesDialog(module.getProject(), sdk).show();
}
@@ -39,6 +39,6 @@ public class PyManagePackagesAction extends AnAction {
@Override
public void update(@NotNull AnActionEvent e) {
Module module = e.getData(LangDataKeys.MODULE);
e.getPresentation().setEnabled(module != null && PythonSdkType.findPythonSdk(module) != null);
e.getPresentation().setEnabled(module != null && PythonSdkUtil.findPythonSdk(module) != null);
}
}
python/pluginCore/com/jetbrains/python/packaging/PyManagePackagesDialog.java
+2 -2
View File
@@ -11,7 +11,7 @@ import com.intellij.webcore.packaging.PackagesNotificationPanel;
import com.jetbrains.python.packaging.ui.PyInstalledPackagesPanel;
import com.jetbrains.python.sdk.PreferredSdkComparator;
import com.jetbrains.python.sdk.PySdkListCellRenderer;
import com.jetbrains.python.sdk.PythonSdkType;
import com.jetbrains.python.sdk.PythonSdkUtil;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -31,7 +31,7 @@ public class PyManagePackagesDialog extends DialogWrapper {
super(project, true);
setTitle("Manage Python Packages");
List<Sdk> sdks = PythonSdkType.getAllSdks();
List<Sdk> sdks = PythonSdkUtil.getAllSdks();
Collections.sort(sdks, new PreferredSdkComparator());
final JComboBox sdkComboBox = new JComboBox(new CollectionComboBoxModel(sdks, sdk));
sdkComboBox.setRenderer(new PySdkListCellRenderer(null));
python/pluginCore/com/jetbrains/python/run/PyPluginCommonOptionsForm.java
+4 -7
View File
@@ -22,10 +22,7 @@ import com.intellij.ui.RawCommandLineEditor;
import com.intellij.ui.components.JBCheckBox;
import com.intellij.ui.components.JBLabel;
import com.intellij.util.PathMappingSettings;
import com.jetbrains.python.sdk.PreferredSdkComparator;
import com.jetbrains.python.sdk.PySdkListCellRenderer;
import com.jetbrains.python.sdk.PySdkUtil;
import com.jetbrains.python.sdk.PythonSdkType;
import com.jetbrains.python.sdk.*;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -115,7 +112,7 @@ public class PyPluginCommonOptionsForm implements AbstractPyCommonOptionsForm {
@Override
public void actionPerformed(ActionEvent e) {
for (Consumer<Boolean> f : myRemoteInterpreterModeListeners) {
f.accept(PySdkUtil.isRemote(getSelectedSdk()));
f.accept(PythonSdkUtil.isRemote(getSelectedSdk()));
}
}
});
@@ -124,7 +121,7 @@ public class PyPluginCommonOptionsForm implements AbstractPyCommonOptionsForm {
private void updateControls() {
myModuleComboBox.setEnabled(myUseModuleSdkRadioButton.isSelected());
myInterpreterComboBox.setEnabled(myUseSpecifiedSdkRadioButton.isSelected());
myPathMappingsComponent.setVisible(PySdkUtil.isRemote(getSelectedSdk()));
myPathMappingsComponent.setVisible(PythonSdkUtil.isRemote(getSelectedSdk()));
}
@Override
@@ -182,7 +179,7 @@ public class PyPluginCommonOptionsForm implements AbstractPyCommonOptionsForm {
public void setSdkHome(String sdkHome) {
List<Sdk> sdkList = new ArrayList<>();
sdkList.add(null);
final List<Sdk> allSdks = PythonSdkType.getAllSdks();
final List<Sdk> allSdks = PythonSdkUtil.getAllSdks();
Collections.sort(allSdks, new PreferredSdkComparator());
Sdk selection = null;
for (Sdk sdk : allSdks) {