Skip to content

Replacing deprecated CommonDataKeys and LangDataKeys. Refactoring #26

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 1 commit into from
Nov 6, 2025
Merged

Replacing deprecated CommonDataKeys and LangDataKeys. Refactoring #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
167 changes: 84 additions & 83 deletions python-impl/src/main/java/com/jetbrains/pyqt/CompileQrcAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.jetbrains.pyqt;

import consulo.execution.RunContentExecutor;
import consulo.execution.process.ProcessTerminatedListener;
import consulo.fileChooser.FileChooserDescriptorFactory;
import consulo.language.editor.CommonDataKeys;
import consulo.language.editor.LangDataKeys;
import consulo.module.Module;
import consulo.process.ExecutionException;
import consulo.process.ProcessHandler;
import consulo.process.ProcessHandlerBuilder;
import consulo.process.cmd.GeneralCommandLine;
import consulo.project.Project;
import consulo.ui.annotation.RequiredUIAccess;
import consulo.ui.ex.action.AnAction;
import consulo.ui.ex.action.AnActionEvent;
import consulo.ui.ex.awt.DialogWrapper;
Expand All @@ -41,95 +39,98 @@
* @author yole
*/
public class CompileQrcAction extends AnAction {
@Override
public void actionPerformed(AnActionEvent e) {
Project project = e.getData(CommonDataKeys.PROJECT);
VirtualFile[] vFiles = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY);
assert vFiles != null;
Module module = e.getData(LangDataKeys.MODULE);
String path = QtFileType.findQtTool(module, "pyrcc4");
if (path == null) {
path = QtFileType.findQtTool(module, "pyside-rcc");
}
if (path == null) {
Messages.showErrorDialog(project, "Could not find pyrcc4 or pyside-rcc for selected Python interpreter", "Compile .qrc file");
return;
}
CompileQrcDialog dialog = new CompileQrcDialog(project, vFiles);
dialog.show();
if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
return;
}
@Override
@RequiredUIAccess
public void actionPerformed(AnActionEvent e) {
Project project = e.getData(Project.KEY);
VirtualFile[] vFiles = e.getRequiredData(VirtualFile.KEY_OF_ARRAY);
Module module = e.getData(Module.KEY);
String path = QtFileType.findQtTool(module, "pyrcc4");
if (path == null) {
path = QtFileType.findQtTool(module, "pyside-rcc");
}
if (path == null) {
Messages.showErrorDialog(project, "Could not find pyrcc4 or pyside-rcc for selected Python interpreter", "Compile .qrc file");
return;
}
CompileQrcDialog dialog = new CompileQrcDialog(project, vFiles);
dialog.show();
if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
return;
}

GeneralCommandLine cmdLine = new GeneralCommandLine();
cmdLine.setPassParentEnvironment(true);
cmdLine.setExePath(path);
cmdLine.addParameters("-o", dialog.getOutputPath());
for (VirtualFile vFile : vFiles) {
cmdLine.addParameter(vFile.getPath());
}
try {
ProcessHandler process = ProcessHandlerBuilder.create(cmdLine).build();
ProcessTerminatedListener.attach(process);
new RunContentExecutor(project, process)
.withTitle("Compile .qrc")
.run();
GeneralCommandLine cmdLine = new GeneralCommandLine();
cmdLine.setPassParentEnvironment(true);
cmdLine.setExePath(path);
cmdLine.addParameters("-o", dialog.getOutputPath());
for (VirtualFile vFile : vFiles) {
cmdLine.addParameter(vFile.getPath());
}
try {
ProcessHandler process = ProcessHandlerBuilder.create(cmdLine).build();
ProcessTerminatedListener.attach(process);
new RunContentExecutor(project, process)
.withTitle("Compile .qrc")
.run();
}
catch (ExecutionException ex) {
Messages.showErrorDialog(project, "Error running " + path + ": " + ex.getMessage(), "Compile .qrc file");
}
}
catch (ExecutionException ex) {
Messages.showErrorDialog(project, "Error running " + path + ": " + ex.getMessage(), "Compile .qrc file");
}
}

@Override
public void update(AnActionEvent e) {
Module module = e.getData(LangDataKeys.MODULE);
VirtualFile[] vFiles = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY);
e.getPresentation().setVisible(module != null && filesAreQrc(vFiles));
}

private static boolean filesAreQrc(VirtualFile[] vFiles) {
if (vFiles == null || vFiles.length == 0) {
return false;
@Override
public void update(AnActionEvent e) {
Module module = e.getData(Module.KEY);
VirtualFile[] vFiles = e.getData(VirtualFile.KEY_OF_ARRAY);
e.getPresentation().setVisible(module != null && filesAreQrc(vFiles));
}
for (VirtualFile vFile : vFiles) {
if (!FileUtil.extensionEquals(vFile.getName(), "qrc")) {
return false;
}

private static boolean filesAreQrc(VirtualFile[] vFiles) {
if (vFiles == null || vFiles.length == 0) {
return false;
}
for (VirtualFile vFile : vFiles) {
if (!FileUtil.extensionEquals(vFile.getName(), "qrc")) {
return false;
}
}
return true;
}
return true;
}

public static class CompileQrcDialog extends DialogWrapper {
private JPanel myPanel;
private TextFieldWithBrowseButton myOutputFileField;
public static class CompileQrcDialog extends DialogWrapper {
private JPanel myPanel;
private TextFieldWithBrowseButton myOutputFileField;

protected CompileQrcDialog(Project project, VirtualFile[] vFiles) {
super(project);
if (vFiles.length == 1) {
setTitle("Compile " + vFiles[0].getName());
}
else {
setTitle("Compile " + vFiles.length + " .qrc files");
}
myOutputFileField.addBrowseFolderListener("Select output path:",
null,
project,
FileChooserDescriptorFactory.createSingleLocalFileDescriptor());
init();
}
protected CompileQrcDialog(Project project, VirtualFile[] vFiles) {
super(project);
if (vFiles.length == 1) {
setTitle("Compile " + vFiles[0].getName());
}
else {
setTitle("Compile " + vFiles.length + " .qrc files");
}
myOutputFileField.addBrowseFolderListener(
"Select output path:",
null,
project,
FileChooserDescriptorFactory.createSingleLocalFileDescriptor()
);
init();
}

@Override
protected JComponent createCenterPanel() {
return myPanel;
}
@Override
protected JComponent createCenterPanel() {
return myPanel;
}

public String getOutputPath() {
return myOutputFileField.getText();
}
public String getOutputPath() {
return myOutputFileField.getText();
}

@Override
public JComponent getPreferredFocusedComponent() {
return myOutputFileField;
@Override
@RequiredUIAccess
public JComponent getPreferredFocusedComponent() {
return myOutputFileField;
}
}
}
}
127 changes: 55 additions & 72 deletions python-impl/src/main/java/com/jetbrains/python/impl/actions/CleanPycAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,99 +13,82 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.jetbrains.python.impl.actions;

import com.jetbrains.python.PyNames;
import consulo.application.Application;
import consulo.application.progress.ProgressManager;
import consulo.application.util.AsyncFileService;
import consulo.application.util.function.Processor;
import consulo.language.editor.LangDataKeys;
import consulo.language.psi.PsiDirectory;
import consulo.language.psi.PsiElement;
import consulo.project.Project;
import consulo.project.ui.wm.StatusBar;
import consulo.project.ui.wm.WindowManager;
import consulo.ui.annotation.RequiredUIAccess;
import consulo.ui.ex.action.AnAction;
import consulo.ui.ex.action.AnActionEvent;
import consulo.util.io.FileUtil;

import jakarta.annotation.Nullable;

import java.io.File;
import java.util.ArrayList;
import java.util.List;

/**
* @author yole
*/
public class CleanPycAction extends AnAction
{
private static void collectPycFiles(File directory, final List<File> pycFiles)
{
FileUtil.processFilesRecursively(directory, new Processor<File>()
{
@Override
public boolean process(File file)
{
if(file.getParentFile().getName().equals(PyNames.PYCACHE) ||
FileUtil.extensionEquals(file.getName(), "pyc") ||
FileUtil.extensionEquals(file.getName(), "pyo"))
{
pycFiles.add(file);
}
return true;
}
});
}
public class CleanPycAction extends AnAction {
private static void collectPycFiles(File directory, List<File> pycFiles) {
FileUtil.processFilesRecursively(
directory,
file -> {
if (file.getParentFile().getName().equals(PyNames.PYCACHE)
|| FileUtil.extensionEquals(file.getName(), "pyc")
|| FileUtil.extensionEquals(file.getName(), "pyo")) {
pycFiles.add(file);
}
return true;
}
);
}

private static boolean isAllDirectories(@Nullable PsiElement[] elements)
{
if(elements == null || elements.length == 0)
{
return false;
}
for(PsiElement element : elements)
{
if(!(element instanceof PsiDirectory))
{
return false;
}
}
return true;
}
private static boolean isAllDirectories(@Nullable PsiElement[] elements) {
if (elements == null || elements.length == 0) {
return false;
}
for (PsiElement element : elements) {
if (!(element instanceof PsiDirectory)) {
return false;
}
}
return true;
}

@Override
public void actionPerformed(AnActionEvent e)
{
final PsiElement[] elements = e.getData(LangDataKeys.PSI_ELEMENT_ARRAY);
if(elements == null)
{
return;
}
List<File> pycFiles = new ArrayList<File>();
ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable()
{
@Override
public void run()
{
for(PsiElement element : elements)
{
PsiDirectory dir = (PsiDirectory) element;
collectPycFiles(new File(dir.getVirtualFile().getPath()), pycFiles);
}
Application.get().getInstance(AsyncFileService.class).asyncDelete(pycFiles);
}
}, "Cleaning up .py files...", false, e.getData(Project.KEY));
}
@Override
@RequiredUIAccess
public void actionPerformed(AnActionEvent e) {
PsiElement[] elements = e.getData(PsiElement.KEY_OF_ARRAY);
if (elements == null) {
return;
}
List<File> pycFiles = new ArrayList<>();
ProgressManager.getInstance().runProcessWithProgressSynchronously(
() -> {
for (PsiElement element : elements) {
PsiDirectory dir = (PsiDirectory) element;
collectPycFiles(new File(dir.getVirtualFile().getPath()), pycFiles);
}
Application.get().getInstance(AsyncFileService.class).asyncDelete(pycFiles);
},
"Cleaning up .py files...",
false,
e.getData(Project.KEY)
);
}

@Override
public void update(AnActionEvent e)
{
if(e.getPresentation().isVisible())
{
final PsiElement[] elements = e.getData(LangDataKeys.PSI_ELEMENT_ARRAY);
e.getPresentation().setEnabled(isAllDirectories(elements));
}
}
@Override
public void update(AnActionEvent e) {
if (e.getPresentation().isVisible()) {
PsiElement[] elements = e.getData(PsiElement.KEY_OF_ARRAY);
e.getPresentation().setEnabled(isAllDirectories(elements));
}
}
}
Loading
Loading