From f59b68df2eac4e9ad08e436696a4eabfb8f2ab7e Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 11 Oct 2022 13:47:35 +0200 Subject: [PATCH] [java-doc] JavaDocInfoGenerator: cosmetic GitOrigin-RevId: cb6ad25013be6a3f851aa508481f6285b7155975 --- .../javadoc/JavaDocInfoGenerator.java | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java index bbc2319f9dd6..e10d3ca574c7 100644 --- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java +++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java @@ -497,50 +497,50 @@ public class JavaDocInfoGenerator { private static String getPackageName(PsiElement element) { String packageName = null; - if (element instanceof PsiPackage) { - packageName = ((PsiPackage)element).getQualifiedName(); + if (element instanceof PsiPackage pkg) { + packageName = pkg.getQualifiedName(); } else { PsiFile file = element.getContainingFile(); - if (file instanceof PsiClassOwner) { - packageName = ((PsiClassOwner)file).getPackageName(); + if (file instanceof PsiClassOwner classOwner) { + packageName = classOwner.getPackageName(); } } return packageName; } public boolean generateDocInfoCore(StringBuilder buffer, boolean generatePrologue) { - if (myElement instanceof PsiClass) { - generateClassJavaDoc(buffer, (PsiClass)myElement, generatePrologue); + if (myElement instanceof PsiClass cls) { + generateClassJavaDoc(buffer, cls, generatePrologue); } - else if (myElement instanceof PsiMethod) { - generateMethodJavaDoc(buffer, (PsiMethod)myElement, generatePrologue); + else if (myElement instanceof PsiMethod method) { + generateMethodJavaDoc(buffer, method, generatePrologue); } - else if (myElement instanceof PsiPatternVariable) { - generatePatternVariableJavaDoc(buffer, generatePrologue, (PsiPatternVariable)myElement); + else if (myElement instanceof PsiPatternVariable var) { + generatePatternVariableJavaDoc(buffer, generatePrologue, var); } - else if (myElement instanceof PsiParameter) { - generateMethodParameterJavaDoc(buffer, (PsiParameter)myElement, generatePrologue); + else if (myElement instanceof PsiParameter parameter) { + generateMethodParameterJavaDoc(buffer, parameter, generatePrologue); } - else if (myElement instanceof PsiField) { - generateFieldJavaDoc(buffer, (PsiField)myElement, generatePrologue); + else if (myElement instanceof PsiField field) { + generateFieldJavaDoc(buffer, field, generatePrologue); } - else if (myElement instanceof PsiRecordComponent) { - generateRecordComponentJavaDoc(buffer, generatePrologue, (PsiRecordComponent)myElement); + else if (myElement instanceof PsiRecordComponent component) { + generateRecordComponentJavaDoc(buffer, generatePrologue, component); } - else if (myElement instanceof PsiVariable) { - generateVariableJavaDoc(buffer, (PsiVariable)myElement, generatePrologue); + else if (myElement instanceof PsiVariable var) { + generateVariableJavaDoc(buffer, var, generatePrologue); } - else if (myElement instanceof PsiDirectory) { - PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage((PsiDirectory)myElement); + else if (myElement instanceof PsiDirectory dir) { + PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage(dir); if (aPackage == null) return false; generatePackageJavaDoc(buffer, aPackage, generatePrologue); } - else if (myElement instanceof PsiPackage) { - generatePackageJavaDoc(buffer, (PsiPackage)myElement, generatePrologue); + else if (myElement instanceof PsiPackage pkg) { + generatePackageJavaDoc(buffer, pkg, generatePrologue); } - else if (myElement instanceof PsiJavaModule) { - generateModuleJavaDoc(buffer, (PsiJavaModule)myElement, generatePrologue); + else if (myElement instanceof PsiJavaModule module) { + generateModuleJavaDoc(buffer, module, generatePrologue); } else { return false; @@ -584,8 +584,8 @@ public class JavaDocInfoGenerator { private String getDocForPattern(@NotNull PsiPatternVariable variable) { PsiPattern pattern = variable.getPattern(); PsiElement parent = pattern.getParent(); - if (!(parent instanceof PsiDeconstructionList)) return null; - PsiPattern[] components = ((PsiDeconstructionList)parent).getDeconstructionComponents(); + if (!(parent instanceof PsiDeconstructionList deconstructionList)) return null; + PsiPattern[] components = deconstructionList.getDeconstructionComponents(); int index = ArrayUtil.indexOf(components, pattern); PsiDeconstructionPattern deconstructionPattern = (PsiDeconstructionPattern)parent.getParent(); PsiTypeElement typeElement = deconstructionPattern.getTypeElement(); @@ -602,7 +602,7 @@ public class JavaDocInfoGenerator { PsiRecordComponent recordComponent = recordComponents[recordComponentIndex]; PsiDocComment classComment = recordClass.getDocComment(); String recordComponentName = recordComponent.getName(); - if (classComment == null || recordComponentName == null) return null; + if (classComment == null) return null; PsiDocTag tag = getParamTagByName(classComment, recordComponentName); if (tag == null) return null; PsiElement[] elements = tag.getDataElements(); @@ -615,14 +615,14 @@ public class JavaDocInfoGenerator { public @NlsSafe String generateSignature(PsiElement element) { StringBuilder buf = new StringBuilder(); - if (element instanceof PsiClass) { - if (generateClassSignature(buf, (PsiClass)element, SignaturePlace.ToolTip)) return null; + if (element instanceof PsiClass cls) { + if (generateClassSignature(buf, cls, SignaturePlace.ToolTip)) return null; } - else if (element instanceof PsiField) { - generateFieldSignature(buf, (PsiField)element, SignaturePlace.ToolTip); + else if (element instanceof PsiField field) { + generateFieldSignature(buf, field, SignaturePlace.ToolTip); } - else if (element instanceof PsiMethod) { - generateMethodSignature(buf, (PsiMethod)element, SignaturePlace.ToolTip); + else if (element instanceof PsiMethod method) { + generateMethodSignature(buf, method, SignaturePlace.ToolTip); } return buf.toString(); } @@ -691,8 +691,8 @@ public class JavaDocInfoGenerator { if (element instanceof PsiClass) { PsiFile file = element.getContainingFile(); - if (file instanceof PsiJavaFile) { - String packageName = ((PsiJavaFile)file).getPackageName(); + if (file instanceof PsiJavaFile javaFile) { + String packageName = javaFile.getPackageName(); if (!packageName.isEmpty()) { PsiPackage aPackage = JavaPsiFacade.getInstance(file.getProject()).findPackage(packageName); StringBuilder packageFqnBuilder = new StringBuilder(); @@ -709,8 +709,8 @@ public class JavaDocInfoGenerator { } } } - else if (element instanceof PsiMember) { - PsiClass parentClass = ((PsiMember)element).getContainingClass(); + else if (element instanceof PsiMember member) { + PsiClass parentClass = member.getContainingClass(); if (parentClass != null && !PsiUtil.isArrayClass(parentClass)) { String qName = parentClass.getQualifiedName(); if (qName != null) { @@ -747,8 +747,8 @@ public class JavaDocInfoGenerator { if (aPackage == null) return false; items = aPackage.getDirectories(GlobalSearchScope.everythingScope(myProject)); } - else if (myElement instanceof PsiPackage) { - items = ((PsiPackage)myElement).getDirectories(GlobalSearchScope.everythingScope(myProject)); + else if (myElement instanceof PsiPackage pkg) { + items = pkg.getDirectories(GlobalSearchScope.everythingScope(myProject)); } else { if (myElement == null || myElement.getNavigationElement() == null) return false;