Skip to content

Fixing compilation after platform update #304

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
Sep 9, 2026
Merged

Fixing compilation after platform update #304

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
82 changes: 41 additions & 41 deletions .../intellij/java/impl/codeInsight/completion/ExcludeFromCompletionLookupActionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import consulo.language.editor.completion.lookup.LookupActionProvider;
import consulo.language.editor.completion.lookup.LookupElement;
import consulo.language.editor.completion.lookup.LookupElementAction;
import consulo.localize.LocalizeValue;
import consulo.project.Project;
import org.jspecify.annotations.Nullable;

Expand All @@ -33,53 +34,52 @@
*/
@ExtensionImpl(id = "javaExcludeFromCompletion", order = "after importStatic")
public class ExcludeFromCompletionLookupActionProvider implements LookupActionProvider {
@Override
public void fillActions(LookupElement element, Lookup lookup, Consumer<LookupElementAction> consumer) {
Object o = element.getObject();
if (o instanceof PsiClassObjectAccessExpression) {
o = PsiUtil.resolveClassInType(((PsiClassObjectAccessExpression) o).getOperand().getType());
}
@Override
public void fillActions(LookupElement element, Lookup lookup, Consumer<LookupElementAction> consumer) {
Object o = element.getObject();
if (o instanceof PsiClassObjectAccessExpression classObjectAccessExpr) {
o = PsiUtil.resolveClassInType(classObjectAccessExpr.getOperand().getType());
}

if (o instanceof PsiClass) {
PsiClass clazz = (PsiClass) o;
addExcludes(consumer, clazz, clazz.getQualifiedName());
} else if (o instanceof PsiMethod) {
PsiMethod method = (PsiMethod) o;
if (method.hasModifierProperty(PsiModifier.STATIC)) {
addExcludes(consumer, method, PsiUtil.getMemberQualifiedName(method));
}
} else if (o instanceof PsiField) {
PsiField field = (PsiField) o;
if (field.hasModifierProperty(PsiModifier.STATIC)) {
addExcludes(consumer, field, PsiUtil.getMemberQualifiedName(field));
}
if (o instanceof PsiClass clazz) {
addExcludes(consumer, clazz, clazz.getQualifiedName());
}
else if (o instanceof PsiMethod method) {
if (method.isStatic()) {
addExcludes(consumer, method, PsiUtil.getMemberQualifiedName(method));
}
}
else if (o instanceof PsiField field) {
if (field.isStatic()) {
addExcludes(consumer, field, PsiUtil.getMemberQualifiedName(field));
}
}
}
}

private static void addExcludes(Consumer<LookupElementAction> consumer, PsiMember element, @Nullable String qname) {
if (qname == null) {
return;
}
Project project = element.getProject();
for (String s : AddImportAction.getAllExcludableStrings(qname)) {
consumer.accept(new ExcludeFromCompletionAction(project, s));
private static void addExcludes(Consumer<LookupElementAction> consumer, PsiMember element, @Nullable String qName) {
if (qName == null) {
return;
}
Project project = element.getProject();
for (String s : AddImportAction.getAllExcludableStrings(qName)) {
consumer.accept(new ExcludeFromCompletionAction(project, s));
}
}
}

private static class ExcludeFromCompletionAction extends LookupElementAction {
private final Project myProject;
private final String myToExclude;
private static class ExcludeFromCompletionAction extends LookupElementAction {
private final Project myProject;
private final String myToExclude;

public ExcludeFromCompletionAction(Project project, String s) {
super(null, "Exclude '" + s + "' from completion");
myProject = project;
myToExclude = s;
}
public ExcludeFromCompletionAction(Project project, String s) {
super(null, LocalizeValue.localizeTODO("Exclude '" + s + "' from completion"));
myProject = project;
myToExclude = s;
}

@Override
public Result performLookupAction() {
AddImportAction.excludeFromImport(myProject, myToExclude);
return Result.HIDE_LOOKUP;
@Override
public Result performLookupAction() {
AddImportAction.excludeFromImport(myProject, myToExclude);
return Result.HIDE_LOOKUP;
}
}
}
}
35 changes: 18 additions & 17 deletions .../java/com/intellij/java/impl/codeInsight/completion/ImportStaticLookupActionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.intellij.java.impl.codeInsight.completion;

import consulo.annotation.component.ExtensionImpl;
import consulo.application.AllIcons;
import consulo.language.editor.completion.lookup.Lookup;
import consulo.language.editor.completion.lookup.LookupActionProvider;
import consulo.language.editor.completion.lookup.LookupElement;
import consulo.language.editor.completion.lookup.LookupElementAction;
import consulo.localize.LocalizeValue;
import consulo.platform.base.icon.PlatformIconGroup;
import consulo.ui.image.Image;

import java.util.function.Consumer;
Expand All @@ -15,21 +16,21 @@
*/
@ExtensionImpl(id = "importStatic")
public class ImportStaticLookupActionProvider implements LookupActionProvider {
@Override
public void fillActions(final LookupElement element, Lookup lookup, Consumer<LookupElementAction> consumer) {
final StaticallyImportable item = element.as(StaticallyImportable.CLASS_CONDITION_KEY);
if (item == null || !item.canBeImported()) {
return;
}
@Override
public void fillActions(final LookupElement element, Lookup lookup, Consumer<LookupElementAction> consumer) {
final StaticallyImportable item = element.as(StaticallyImportable.CLASS_CONDITION_KEY);
if (item == null || !item.canBeImported()) {
return;
}

Image checkIcon = AllIcons.Actions.Checked;
final Image icon = item.willBeImported() ? checkIcon : Image.empty(checkIcon.getWidth(), checkIcon.getHeight());
consumer.accept(new LookupElementAction(icon, "Import statically") {
@Override
public Result performLookupAction() {
item.setShouldBeImported(!item.willBeImported());
return new Result.ChooseItem(element);
}
});
}
Image checkIcon = PlatformIconGroup.actionsChecked();
final Image icon = item.willBeImported() ? checkIcon : Image.empty(checkIcon.getWidth(), checkIcon.getHeight());
consumer.accept(new LookupElementAction(icon, LocalizeValue.localizeTODO("Import statically")) {
@Override
public Result performLookupAction() {
item.setShouldBeImported(!item.willBeImported());
return new Result.ChooseItem(element);
}
});
}
}
Loading