Skip to content

Null-safety of ElementDescriptionProviders #314

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
Oct 14, 2026
Merged

Null-safety of ElementDescriptionProviders #314

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
2 changes: 1 addition & 1 deletion ...m/intellij/java/impl/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ else if (element instanceof PsiJavaPackage javaPackage) {
return LocalizeValue.join(
LanguageLocalize.javaTermsPackage(),
LocalizeValue.space(),
LocalizeValue.of(javaPackage.getQualifiedName())
LocalizeValue.ofNullable(javaPackage.getQualifiedName())
);
}
return LocalizeValue.empty();
Expand Down
35 changes: 17 additions & 18 deletions ...va/com/intellij/java/impl/refactoring/util/JavaRefactoringElementDescriptionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import consulo.language.psi.ElementDescriptionProvider;
import consulo.language.psi.PsiElement;
import consulo.localize.LocalizeValue;
import consulo.util.lang.StringUtil;

@ExtensionImpl
public class JavaRefactoringElementDescriptionProvider implements ElementDescriptionProvider {
Expand All @@ -42,11 +43,8 @@ public LocalizeValue getElementDescription(PsiElement element, ElementDescriptio
if (rdLocation.includeParent()) {
options |= PsiFormatUtil.SHOW_CONTAINING_CLASS;
}
String fieldEmphasized = CommonRefactoringUtil.htmlEmphasize(PsiFormatUtil.formatVariable(
field,
options,
PsiSubstitutor.EMPTY
));
String fieldEmphasized =
CommonRefactoringUtil.htmlEmphasize(PsiFormatUtil.formatVariable(field, options, PsiSubstitutor.EMPTY));
return RefactoringLocalize.fieldDescription(fieldEmphasized);
}

Expand All @@ -55,41 +53,42 @@ public LocalizeValue getElementDescription(PsiElement element, ElementDescriptio
if (rdLocation.includeParent()) {
options |= PsiFormatUtil.SHOW_CONTAINING_CLASS;
}
String emphasizedMethod = CommonRefactoringUtil.htmlEmphasize(PsiFormatUtil.formatMethod(
method,
PsiSubstitutor.EMPTY,
options,
PsiFormatUtil.SHOW_TYPE
));
String emphasizedMethod = CommonRefactoringUtil.htmlEmphasize(
PsiFormatUtil.formatMethod(method, PsiSubstitutor.EMPTY, options, PsiFormatUtil.SHOW_TYPE)
);
return method.isConstructor()
? RefactoringLocalize.constructorDescription(emphasizedMethod)
: RefactoringLocalize.methodDescription(emphasizedMethod);
}

if (element instanceof PsiClassInitializer initializer) {
boolean isStatic = initializer.isStatic();
LocalizeValue elementDescription = getElementDescription(
initializer.getContainingClass(),
RefactoringDescriptionLocation.WITHOUT_PARENT
);
PsiClass containingClass = initializer.getContainingClass();
LocalizeValue elementDescription = containingClass != null
? getElementDescription(containingClass, RefactoringDescriptionLocation.WITHOUT_PARENT)
: LocalizeValue.empty();
return isStatic
? RefactoringLocalize.staticInitializerDescription(elementDescription)
: RefactoringLocalize.instanceInitializerDescription(elementDescription);
}

if (element instanceof PsiParameter parameter) {
String paramNameEmphasized = CommonRefactoringUtil.htmlEmphasize(parameter.getName());
String paramNameEmphasized = CommonRefactoringUtil.htmlEmphasize(StringUtil.notNullize(parameter.getName()));
return parameter.getDeclarationScope() instanceof PsiForeachStatement
? RefactoringLocalize.localVariableDescription(paramNameEmphasized)
: RefactoringLocalize.parameterDescription(paramNameEmphasized);
}

if (element instanceof PsiLocalVariable localVariable) {
return RefactoringLocalize.localVariableDescription(CommonRefactoringUtil.htmlEmphasize(localVariable.getName()));
return RefactoringLocalize.localVariableDescription(
CommonRefactoringUtil.htmlEmphasize(StringUtil.notNullize(localVariable.getName()))
);
}

if (element instanceof PsiJavaPackage javaPackage) {
return RefactoringLocalize.packageDescription(CommonRefactoringUtil.htmlEmphasize(javaPackage.getName()));
return RefactoringLocalize.packageDescription(
CommonRefactoringUtil.htmlEmphasize(StringUtil.notNullize(javaPackage.getName()))
);
}

if (element instanceof PsiClass psiClass) {
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/com/intellij/java/impl/usageView/JavaUsageViewDescriptionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public LocalizeValue getElementDescription(PsiElement element, ElementDescriptio
return LocalizeValue.ofNullable(javaPackage.getQualifiedName());
}
else if (element instanceof PsiClass psiClass) {
if (element instanceof PsiAnonymousClass) {
if (psiClass instanceof PsiAnonymousClass) {
return LanguageLocalize.javaTermsAnonymousClass();
}
else {
Expand Down
Loading