Skip to content

Localizing Path Macros. Refactoring #284

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
Mar 31, 2026
Merged

Localizing Path Macros. Refactoring #284

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
40 changes: 25 additions & 15 deletions plugin/src/main/java/com/intellij/java/impl/ide/macro/ClasspathEntryMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import consulo.annotation.component.ExtensionImpl;
import consulo.dataContext.DataContext;
import consulo.ide.localize.IdeLocalize;
import consulo.localize.LocalizeValue;
import consulo.module.content.ProjectRootManager;
import consulo.pathMacro.Macro;
import consulo.project.Project;
Expand All @@ -28,21 +29,30 @@
*/
@ExtensionImpl
public final class ClasspathEntryMacro extends Macro {
public String getName() {
return "ClasspathEntry";
}
@Override
public String getName() {
return "ClasspathEntry";
}

public String getDescription() {
return IdeLocalize.macroClasspathEntry().get();
}
@Override
public LocalizeValue getDescription() {
return IdeLocalize.macroClasspathEntry();
}

public String expand(DataContext dataContext) {
Project project = dataContext.getData(Project.KEY);
if (project == null) return null;
VirtualFile file = dataContext.getData(VirtualFile.KEY);
if (file == null) return null;
VirtualFile classRoot = ProjectRootManager.getInstance(project).getFileIndex().getClassRootForFile(file);
if (classRoot == null) return null;
return getPath(classRoot);
}
@Override
public String expand(DataContext dataContext) {
Project project = dataContext.getData(Project.KEY);
if (project == null) {
return null;
}
VirtualFile file = dataContext.getData(VirtualFile.KEY);
if (file == null) {
return null;
}
VirtualFile classRoot = ProjectRootManager.getInstance(project).getFileIndex().getClassRootForFile(file);
if (classRoot == null) {
return null;
}
return getPath(classRoot);
}
}
28 changes: 17 additions & 11 deletions plugin/src/main/java/com/intellij/java/impl/ide/macro/ClasspathMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,29 @@
import consulo.annotation.component.ExtensionImpl;
import consulo.dataContext.DataContext;
import consulo.ide.localize.IdeLocalize;
import consulo.localize.LocalizeValue;
import consulo.module.content.layer.OrderEnumerator;
import consulo.pathMacro.Macro;
import consulo.project.Project;

@ExtensionImpl
public final class ClasspathMacro extends Macro {
public String getName() {
return "Classpath";
}
@Override
public String getName() {
return "Classpath";
}

public String getDescription() {
return IdeLocalize.macroProjectClasspath().get();
}
@Override
public LocalizeValue getDescription() {
return IdeLocalize.macroProjectClasspath();
}

public String expand(DataContext dataContext) {
Project project = dataContext.getData(Project.KEY);
if (project == null) return null;
return OrderEnumerator.orderEntries(project).getPathsList().getPathsString();
}
@Override
public String expand(DataContext dataContext) {
Project project = dataContext.getData(Project.KEY);
if (project == null) {
return null;
}
return OrderEnumerator.orderEntries(project).getPathsList().getPathsString();
}
}
73 changes: 39 additions & 34 deletions plugin/src/main/java/com/intellij/java/impl/ide/macro/FileClassMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,45 +22,50 @@
import consulo.dataContext.DataContext;
import consulo.ide.localize.IdeLocalize;
import consulo.language.psi.PsiFile;
import consulo.localize.LocalizeValue;
import consulo.pathMacro.Macro;

@ExtensionImpl
public final class FileClassMacro extends Macro {
public String getName() {
return "FileClass";
}

public String getDescription() {
return IdeLocalize.macroClassName().get();
}
@Override
public String getName() {
return "FileClass";
}

@RequiredReadAction
public String expand(DataContext dataContext) {
//Project project = (Project)dataContext.getData(DataConstants.PROJECT);
//if (project == null) {
// return null;
//}
//VirtualFile file = (VirtualFile)dataContext.getData(DataConstantsEx.VIRTUAL_FILE);
//if (file == null) {
// return null;
//}
//PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
//if (!(psiFile instanceof PsiJavaFile)) {
// return null;
//}
PsiFile javaFile = dataContext.getData(PsiFile.KEY);
if (!(javaFile instanceof PsiJavaFile)) return null;
PsiClass[] classes = ((PsiJavaFile) javaFile).getClasses();
if (classes.length == 1) {
return classes[0].getQualifiedName();
@Override
public LocalizeValue getDescription() {
return IdeLocalize.macroClassName();
}
String fileName = javaFile.getVirtualFile().getNameWithoutExtension();
for (PsiClass aClass : classes) {
String name = aClass.getName();
if (fileName.equals(name)) {
return aClass.getQualifiedName();
}

@Override
@RequiredReadAction
public String expand(DataContext dataContext) {
//Project project = (Project)dataContext.getData(DataConstants.PROJECT);
//if (project == null) {
// return null;
//}
//VirtualFile file = (VirtualFile)dataContext.getData(DataConstantsEx.VIRTUAL_FILE);
//if (file == null) {
// return null;
//}
//PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
//if (!(psiFile instanceof PsiJavaFile)) {
// return null;
//}
if (!(dataContext.getData(PsiFile.KEY) instanceof PsiJavaFile javaFile)) {
return null;
}
PsiClass[] classes = javaFile.getClasses();
if (classes.length == 1) {
return classes[0].getQualifiedName();
}
String fileName = javaFile.getVirtualFile().getNameWithoutExtension();
for (PsiClass aClass : classes) {
String name = aClass.getName();
if (fileName.equals(name)) {
return aClass.getQualifiedName();
}
}
return null;
}
return null;
}
}
28 changes: 17 additions & 11 deletions plugin/src/main/java/com/intellij/java/impl/ide/macro/FileFQPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,27 @@
import consulo.annotation.component.ExtensionImpl;
import consulo.dataContext.DataContext;
import consulo.ide.localize.IdeLocalize;
import consulo.localize.LocalizeValue;
import consulo.pathMacro.Macro;

@ExtensionImpl
public class FileFQPackage extends Macro {
public String expand(DataContext dataContext) {
PsiJavaPackage aPackage = FilePackageMacro.getFilePackage(dataContext);
if (aPackage == null) return null;
return aPackage.getQualifiedName();
}
@Override
public String expand(DataContext dataContext) {
PsiJavaPackage aPackage = FilePackageMacro.getFilePackage(dataContext);
if (aPackage == null) {
return null;
}
return aPackage.getQualifiedName();
}

public String getDescription() {
return IdeLocalize.macroFileFullyQualifiedPackage().get();
}
@Override
public LocalizeValue getDescription() {
return IdeLocalize.macroFileFullyQualifiedPackage();
}

public String getName() {
return "FileFQPackage";
}
@Override
public String getName() {
return "FileFQPackage";
}
}
50 changes: 30 additions & 20 deletions plugin/src/main/java/com/intellij/java/impl/ide/macro/FilePackageMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,42 @@
import consulo.ide.localize.IdeLocalize;
import consulo.language.psi.PsiDirectory;
import consulo.language.psi.PsiFile;
import consulo.localize.LocalizeValue;
import consulo.pathMacro.Macro;
import org.jspecify.annotations.Nullable;

@ExtensionImpl
public final class FilePackageMacro extends Macro {
public String getName() {
return "FilePackage";
}
@Override
public String getName() {
return "FilePackage";
}

public String getDescription() {
return IdeLocalize.macroFilePackage().get();
}
@Override
public LocalizeValue getDescription() {
return IdeLocalize.macroFilePackage();
}

@RequiredReadAction
public String expand(DataContext dataContext) {
PsiJavaPackage aPackage = getFilePackage(dataContext);
if (aPackage == null) return null;
return aPackage.getName();
}
@Override
@RequiredReadAction
public String expand(DataContext dataContext) {
PsiJavaPackage aPackage = getFilePackage(dataContext);
if (aPackage == null) {
return null;
}
return aPackage.getName();
}

@Nullable
static PsiJavaPackage getFilePackage(DataContext dataContext) {
PsiFile psiFile = dataContext.getData(PsiFile.KEY);
if (psiFile == null) return null;
PsiDirectory containingDirectory = psiFile.getContainingDirectory();
if (containingDirectory == null || !containingDirectory.isValid()) return null;
return JavaDirectoryService.getInstance().getPackage(containingDirectory);
}
@Nullable
static PsiJavaPackage getFilePackage(DataContext dataContext) {
PsiFile psiFile = dataContext.getData(PsiFile.KEY);
if (psiFile == null) {
return null;
}
PsiDirectory containingDirectory = psiFile.getContainingDirectory();
if (containingDirectory == null || !containingDirectory.isValid()) {
return null;
}
return JavaDirectoryService.getInstance().getPackage(containingDirectory);
}
}
38 changes: 21 additions & 17 deletions plugin/src/main/java/com/intellij/java/impl/ide/macro/JavaDocPathMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,35 @@
import consulo.annotation.component.ExtensionImpl;
import consulo.dataContext.DataContext;
import consulo.ide.localize.IdeLocalize;
import consulo.localize.LocalizeValue;
import consulo.pathMacro.Macro;
import consulo.project.Project;

import java.io.File;

@ExtensionImpl
public final class JavaDocPathMacro extends Macro {
public String getName() {
return "JavaDocPath";
}

public String getDescription() {
return IdeLocalize.macroJavadocOutputDirectory().get();
}
@Override
public String getName() {
return "JavaDocPath";
}

public String expand(DataContext dataContext) {
Project project = dataContext.getData(Project.KEY);
if (project == null) {
return null;
@Override
public LocalizeValue getDescription() {
return IdeLocalize.macroJavadocOutputDirectory();
}
JavadocGenerationManager manager = project.getComponent(JavadocGenerationManager.class);
if (manager == null) {
return null;

@Override
public String expand(DataContext dataContext) {
Project project = dataContext.getData(Project.KEY);
if (project == null) {
return null;
}
JavadocGenerationManager manager = project.getComponent(JavadocGenerationManager.class);
if (manager == null) {
return null;
}
JavadocConfiguration configuration = manager.getConfiguration();
return configuration.OUTPUT_DIRECTORY == null ? null : configuration.OUTPUT_DIRECTORY.replace('/', File.separatorChar);
}
JavadocConfiguration configuration = manager.getConfiguration();
return configuration.OUTPUT_DIRECTORY == null ? null : configuration.OUTPUT_DIRECTORY.replace('/', File.separatorChar);
}
}
Loading