Skip to content

EP_NAME fix #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 3 commits into from
Apr 20, 2025
Merged

EP_NAME fix #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9059e7d
Reformatting sdk package.
unv-unv Apr 20, 2025
dd8e591
Refactoring of sdk package. Compilation fix.
unv-unv Apr 20, 2025
cfed9a7
Reformatting SkeletonErrorsDialog.
unv-unv Apr 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 25 additions & 30 deletions python-impl/src/main/java/com/jetbrains/python/impl/sdk/AbstractCreateVirtualEnvDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import consulo.application.progress.ProgressIndicator;
import consulo.application.progress.ProgressManager;
import consulo.application.progress.Task;
import consulo.application.util.function.Computable;
import consulo.content.bundle.Sdk;
import consulo.content.bundle.SdkUtil;
import consulo.ide.impl.idea.webcore.packaging.PackagesNotificationPanel;
Expand All @@ -42,14 +41,15 @@
import consulo.util.lang.StringUtil;
import consulo.virtualFileSystem.LocalFileSystem;
import consulo.virtualFileSystem.VirtualFile;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

import javax.swing.*;
import java.awt.*;
import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.function.Supplier;

public abstract class AbstractCreateVirtualEnvDialog extends IdeaDialog {
@Nullable
Expand All @@ -65,35 +65,30 @@ public interface VirtualEnvCallback {
}

@RequiredUIAccess
public static void setupVirtualEnvSdk(final String path, boolean associateWithProject, VirtualEnvCallback callback) {
final VirtualFile sdkHome = Application.get().runWriteAction(new Computable<VirtualFile>() {
@Nullable
@Override
public VirtualFile compute() {
return LocalFileSystem.getInstance().refreshAndFindFileByPath(path);
}
});
public static void setupVirtualEnvSdk(String path, boolean associateWithProject, VirtualEnvCallback callback) {
VirtualFile sdkHome =
Application.get().runWriteAction((Supplier<VirtualFile>)() -> LocalFileSystem.getInstance().refreshAndFindFileByPath(path));
if (sdkHome != null) {
final Sdk sdk =
Sdk sdk =
SdkUtil.createAndAddSDK(FileUtil.toSystemDependentName(sdkHome.getPath()), PythonSdkType.getInstance(), UIAccess.current());
callback.virtualEnvCreated(sdk, associateWithProject);
}
}

public AbstractCreateVirtualEnvDialog(Project project, final List<Sdk> allSdks) {
public AbstractCreateVirtualEnvDialog(Project project, List<Sdk> allSdks) {
super(project);
setupDialog(project, allSdks);
}

public AbstractCreateVirtualEnvDialog(Component owner, final List<Sdk> allSdks) {
public AbstractCreateVirtualEnvDialog(Component owner, List<Sdk> allSdks) {
super(owner);
setupDialog(null, allSdks);
}

void setupDialog(Project project, final List<Sdk> allSdks) {
void setupDialog(Project project, List<Sdk> allSdks) {
myProject = project;

final GridBagLayout layout = new GridBagLayout();
GridBagLayout layout = new GridBagLayout();
myMainPanel = new JPanel(layout);
myName = new JTextField();
myDestination = new TextFieldWithBrowseButton();
Expand Down Expand Up @@ -129,26 +124,26 @@ public void validate() {
protected void setInitialDestination() {
myInitialPath = "";

final VirtualFile file = VirtualEnvSdkFlavor.getDefaultLocation();
VirtualFile file = VirtualEnvSdkFlavor.getDefaultLocation();

if (file != null) {
myInitialPath = file.getPath();
}
else {
final String savedPath = PyPackageService.getInstance().getVirtualEnvBasePath();
String savedPath = PyPackageService.getInstance().getVirtualEnvBasePath();
if (!StringUtil.isEmptyOrSpaces(savedPath)) {
myInitialPath = savedPath;
}
else if (myProject != null) {
final VirtualFile baseDir = myProject.getBaseDir();
VirtualFile baseDir = myProject.getBaseDir();
if (baseDir != null) {
myInitialPath = baseDir.getPath();
}
}
}
}

/*protected void registerValidators(final FacetValidatorsManager validatorsManager) {
/*protected void registerValidators(FacetValidatorsManager validatorsManager) {
myDestination.getTextField().getDocument().addDocumentListener(new DocumentAdapter() {
@Override
protected void textChanged(DocumentEvent e) {
Expand Down Expand Up @@ -178,10 +173,10 @@ public void caretUpdate(CaretEvent event) {
}*/

protected void checkValid() {
final String projectName = myName.getText();
final File destFile = new File(getDestination());
String projectName = myName.getText();
File destFile = new File(getDestination());
if (destFile.exists()) {
final String[] content = destFile.list();
String[] content = destFile.list();
if (content != null && content.length != 0) {
setOKActionEnabled(false);
setErrorText(PyLocalize.sdkCreateVenvDialogErrorNotEmptyDirectory());
Expand All @@ -208,7 +203,7 @@ protected void checkValid() {
clearErrorText();
}

abstract protected void layoutPanel(final List<Sdk> allSdks);
abstract protected void layoutPanel(List<Sdk> allSdks);

@Override
protected JComponent createCenterPanel() {
Expand All @@ -232,22 +227,22 @@ public boolean associateWithProject() {
return !myMakeAvailableToAllProjectsCheckbox.isSelected();
}

public void createVirtualEnv(final VirtualEnvCallback callback) {
final ProgressManager progman = ProgressManager.getInstance();
final Sdk basicSdk = getSdk();
final Task.Modal createTask = new Task.Modal(myProject, PyLocalize.sdkCreateVenvDialogCreatingVenv(), false) {
public void createVirtualEnv(VirtualEnvCallback callback) {
ProgressManager progman = ProgressManager.getInstance();
Sdk basicSdk = getSdk();
Task.Modal createTask = new Task.Modal(myProject, PyLocalize.sdkCreateVenvDialogCreatingVenv(), false) {
String myPath;

@Override
public void run(@Nonnull final ProgressIndicator indicator) {
public void run(@Nonnull ProgressIndicator indicator) {
try {
indicator.setTextValue(PyLocalize.sdkCreateVenvDialogCreatingVenv());
myPath = createEnvironment(basicSdk);
}
catch (final ExecutionException e) {
catch (ExecutionException e) {
Application.get().invokeLater(
() -> {
final PackageManagementService.ErrorDescription description =
PackageManagementService.ErrorDescription description =
PyPackageManagementService.toErrorDescription(Collections.singletonList(e), basicSdk);
if (description != null) {
PackagesNotificationPanel.showError(
Expand Down
13 changes: 6 additions & 7 deletions python-impl/src/main/java/com/jetbrains/python/impl/sdk/InvalidSdkException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.jetbrains.python.impl.sdk;

public class InvalidSdkException extends Exception {
public InvalidSdkException(String s) {
super(s);
}
public InvalidSdkException(String s) {
super(s);
}

public InvalidSdkException(String message, Throwable cause) {
super(message, cause);
}
public InvalidSdkException(String message, Throwable cause) {
super(message, cause);
}
}
Loading
Loading