diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpDocumentationProvider.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpDocumentationProvider.java index 4c7f70c0cc52..84d69abdbff3 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpDocumentationProvider.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpDocumentationProvider.java @@ -15,8 +15,7 @@ public final class RegExpDocumentationProvider extends AbstractDocumentationProv @Nullable @Nls public String generateDoc(PsiElement element, @Nullable PsiElement originalElement) { - if (element instanceof RegExpProperty) { - final RegExpProperty prop = (RegExpProperty)element; + if (element instanceof RegExpProperty prop) { final ASTNode node = prop.getCategoryNode(); if (node != null) { final String description = RegExpLanguageHosts.getInstance().getPropertyDescription(node.getPsi(), node.getText()); @@ -35,8 +34,7 @@ public final class RegExpDocumentationProvider extends AbstractDocumentationProv @Override @Nullable public @Nls String getQuickNavigateInfo(PsiElement element, PsiElement originalElement) { - if (element instanceof RegExpGroup) { - final RegExpGroup group = (RegExpGroup)element; + if (element instanceof RegExpGroup group) { return StringUtil.escapeXmlEntities(group.getUnescapedText()); } else { return null; diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/DuplicateCharacterInClassInspection.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/DuplicateCharacterInClassInspection.java index 8f719bfa843a..0f7548e6abc0 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/DuplicateCharacterInClassInspection.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/DuplicateCharacterInClassInspection.java @@ -41,8 +41,7 @@ public class DuplicateCharacterInClassInspection extends LocalInspectionTool { } private void checkForDuplicates(RegExpClassElement element, Set seen) { - if (element instanceof RegExpChar) { - final RegExpChar regExpChar = (RegExpChar)element; + if (element instanceof RegExpChar regExpChar) { final int value = regExpChar.getValue(); if (value != -1 && !seen.add(value)) { myHolder.registerProblem(regExpChar, @@ -50,8 +49,7 @@ public class DuplicateCharacterInClassInspection extends LocalInspectionTool { new DuplicateCharacterInClassFix(regExpChar)); } } - else if (element instanceof RegExpSimpleClass) { - final RegExpSimpleClass regExpSimpleClass = (RegExpSimpleClass)element; + else if (element instanceof RegExpSimpleClass regExpSimpleClass) { final RegExpSimpleClass.Kind kind = regExpSimpleClass.getKind(); if (!seen.add(kind)) { final String text = regExpSimpleClass.getText(); diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/ReDoSInspection.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/ReDoSInspection.java index 57163f4822ba..3e5436c97d43 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/ReDoSInspection.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/ReDoSInspection.java @@ -65,14 +65,12 @@ public class ReDoSInspection extends LocalInspectionTool { private static boolean isAtomic(RegExpAtom element) { while (element != null) { - if (element instanceof RegExpClosure) { - final RegExpClosure closure = (RegExpClosure)element; + if (element instanceof RegExpClosure closure) { if (closure.getQuantifier().isPossessive()) { return true; } } - else if (element instanceof RegExpGroup) { - final RegExpGroup group = (RegExpGroup)element; + else if (element instanceof RegExpGroup group) { if (group.getType() == RegExpGroup.Type.ATOMIC) { return true; } diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/RedundantNestedCharacterClassInspection.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/RedundantNestedCharacterClassInspection.java index 0ced7df09407..ce0856203909 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/RedundantNestedCharacterClassInspection.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/RedundantNestedCharacterClassInspection.java @@ -43,8 +43,7 @@ public class RedundantNestedCharacterClassInspection extends LocalInspectionTool // JDK 9: [^a&&b] is the intersection of [a] and [b] (which is nothing), inverted, which equals everything. // see https://bugs.openjdk.org/browse/JDK-8189343 // and http://mail.openjdk.org/pipermail/core-libs-dev/2011-June/006957.html - if (parent instanceof RegExpClass) { - final RegExpClass parentClass = (RegExpClass)parent; + if (parent instanceof RegExpClass parentClass) { if (!parentClass.isNegated() && !regExpClass.isNegated()) { myHolder.registerProblem(regExpClass.getFirstChild(), RegExpBundle.message("inspection.warning.redundant.nested.character.class"), new RedundantNestedCharacterClassFix()); @@ -52,8 +51,7 @@ public class RedundantNestedCharacterClassInspection extends LocalInspectionTool } else if (parent instanceof RegExpIntersection) { final PsiElement grandParent = parent.getParent(); - if (grandParent instanceof RegExpClass) { - final RegExpClass grandparentClass = (RegExpClass)grandParent; + if (grandParent instanceof RegExpClass grandparentClass) { if (!grandparentClass.isNegated() && !regExpClass.isNegated()) { myHolder.registerProblem(regExpClass.getFirstChild(), RegExpBundle.message("inspection.warning.redundant.nested.character.class"), new RedundantNestedCharacterClassFix()); @@ -72,8 +70,7 @@ public class RedundantNestedCharacterClassInspection extends LocalInspectionTool @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent(); - if (element instanceof RegExpClass) { - final RegExpClass regExpClass = (RegExpClass)element; + if (element instanceof RegExpClass regExpClass) { final RegExpClassElement[] elements = regExpClass.getElements(); final PsiElement parent = regExpClass.getParent(); for (RegExpClassElement classElement : elements) { diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/RegExpSimplifiableInspection.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/RegExpSimplifiableInspection.java index 5896c8007f1b..538eeb3344cd 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/RegExpSimplifiableInspection.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/RegExpSimplifiableInspection.java @@ -35,8 +35,7 @@ public class RegExpSimplifiableInspection extends LocalInspectionTool { super.visitRegExpClass(regExpClass); final RegExpClassElement[] elements = regExpClass.getElements(); for (RegExpClassElement element : elements) { - if (element instanceof RegExpCharRange) { - final RegExpCharRange range = (RegExpCharRange)element; + if (element instanceof RegExpCharRange range) { final int from = range.getFrom().getValue(); final RegExpChar to = range.getTo(); if (from != -1 && to != null && from == to.getValue()) { @@ -48,8 +47,7 @@ public class RegExpSimplifiableInspection extends LocalInspectionTool { if (regExpClass.isNegated()) { if (elements.length == 1) { final RegExpClassElement element = elements[0]; - if (element instanceof RegExpSimpleClass) { - final RegExpSimpleClass simpleClass = (RegExpSimpleClass)element; + if (element instanceof RegExpSimpleClass simpleClass) { final String text = getInverseSimpleClassText(simpleClass); if (text != null) { // [^\d] -> \D diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/RepeatedSpaceInspection.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/RepeatedSpaceInspection.java index d09e91fc1b8d..8a5aa3e84778 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/RepeatedSpaceInspection.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/RepeatedSpaceInspection.java @@ -79,10 +79,9 @@ public class RepeatedSpaceInspection extends LocalInspectionTool { } private static boolean isSpace(PsiElement element) { - if (!(element instanceof RegExpChar)) { + if (!(element instanceof RegExpChar aChar)) { return false; } - final RegExpChar aChar = (RegExpChar)element; return aChar.getType() == RegExpChar.Type.CHAR && aChar.getValue() == ' '; } } diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/SingleCharAlternationInspection.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/SingleCharAlternationInspection.java index e30d34082e9d..b31af5a99f96 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/SingleCharAlternationInspection.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/SingleCharAlternationInspection.java @@ -76,10 +76,9 @@ public class SingleCharAlternationInspection extends LocalInspectionTool { @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof RegExpPattern)) { + if (!(element instanceof RegExpPattern pattern)) { return; } - final RegExpPattern pattern = (RegExpPattern)element; final PsiElement parent = pattern.getParent(); final PsiElement victim = (parent instanceof RegExpGroup && ((RegExpGroup)parent).getType() == RegExpGroup.Type.NON_CAPTURING) ? parent : pattern; @@ -96,10 +95,9 @@ public class SingleCharAlternationInspection extends LocalInspectionTool { final StringBuilder text = new StringBuilder("["); for (RegExpBranch branch : pattern.getBranches()) { for (PsiElement child : branch.getChildren()) { - if (!(child instanceof RegExpChar)) { + if (!(child instanceof RegExpChar ch)) { return null; } - final RegExpChar ch = (RegExpChar)child; final IElementType type = ch.getNode().getFirstChildNode().getElementType(); if (type == RegExpTT.REDUNDANT_ESCAPE) { final int value = ch.getValue(); diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/UnexpectedAnchorInspection.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/UnexpectedAnchorInspection.java index ec55e37e5d48..ee2e628c2a38 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/UnexpectedAnchorInspection.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/UnexpectedAnchorInspection.java @@ -84,16 +84,13 @@ public class UnexpectedAnchorInspection extends LocalInspectionTool { default -> true; }; } - else if (sibling instanceof RegExpClosure) { - final RegExpClosure closure = (RegExpClosure)sibling; + else if (sibling instanceof RegExpClosure closure) { return isUnexpectedSibling(element, next, closure.getAtom()); } - else if (sibling instanceof RegExpGroup) { - final RegExpGroup group = (RegExpGroup)sibling; + else if (sibling instanceof RegExpGroup group) { return isUnexpectedSibling(element, next, group.getPattern()); } - else if (sibling instanceof RegExpPattern) { - final RegExpPattern pattern = (RegExpPattern)sibling; + else if (sibling instanceof RegExpPattern pattern) { for (RegExpBranch branch : pattern.getBranches()) { if (isUnexpectedSibling(element, next, branch)) { return true; diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/UnnecessaryNonCapturingGroupInspection.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/UnnecessaryNonCapturingGroupInspection.java index 4f6ff36a578f..8cee00f4dad5 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/UnnecessaryNonCapturingGroupInspection.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/UnnecessaryNonCapturingGroupInspection.java @@ -87,10 +87,9 @@ public class UnnecessaryNonCapturingGroupInspection extends LocalInspectionTool @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent(); - if (!(element instanceof RegExpGroup)) { + if (!(element instanceof RegExpGroup group)) { return; } - final RegExpGroup group = (RegExpGroup)element; RegExpReplacementUtil.replaceInContext(group, group.getPattern().getUnescapedText()); } } diff --git a/RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpForm.java b/RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpForm.java index 3e82deea648b..82722e67b41a 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpForm.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpForm.java @@ -366,8 +366,7 @@ public final class CheckRegExpForm { PsiElement element = regExpFile.findElementAt(offset); RegExpGroup group = null; while (element != null) { - if (element instanceof RegExpGroup) { - final RegExpGroup g = (RegExpGroup)element; + if (element instanceof RegExpGroup g) { if (g.isCapturing()) { group = g; break; diff --git a/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java b/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java index f0c62c5e8d80..a66b48a2955f 100644 --- a/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java +++ b/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java @@ -88,11 +88,10 @@ final class ImageFileEditorImpl extends UserDataHolderBase implements ImageFileE @Override public void setState(@NotNull FileEditorState state) { - if (state instanceof ImageFileEditorState) { + if (state instanceof ImageFileEditorState editorState) { Options options = OptionsManager.getInstance().getOptions(); ZoomOptions zoomOptions = options.getEditorOptions().getZoomOptions(); - ImageFileEditorState editorState = (ImageFileEditorState)state; ImageZoomModel zoomModel = imageEditor.getZoomModel(); imageEditor.setTransparencyChessboardVisible(editorState.isBackgroundVisible()); imageEditor.setGridVisible(editorState.isGridVisible()); diff --git a/images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java b/images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java index a151864cbf9b..4a15e12833cd 100644 --- a/images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java +++ b/images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java @@ -71,12 +71,10 @@ final class ExternalEditorOptionsImpl implements ExternalEditorOptions, JDOMExte if (this == o) { return true; } - if (!(o instanceof ExternalEditorOptions)) { + if (!(o instanceof ExternalEditorOptions otherOptions)) { return false; } - ExternalEditorOptions otherOptions = (ExternalEditorOptions)o; - return executablePath != null ? executablePath.equals(otherOptions.getExecutablePath()) : otherOptions.getExecutablePath() == null; diff --git a/images/src/org/intellij/images/options/impl/OptionsImpl.java b/images/src/org/intellij/images/options/impl/OptionsImpl.java index f1b508d02ea5..ee2f3e5ba4cc 100644 --- a/images/src/org/intellij/images/options/impl/OptionsImpl.java +++ b/images/src/org/intellij/images/options/impl/OptionsImpl.java @@ -89,10 +89,9 @@ final class OptionsImpl implements Options, JDOMExternalizable { if (obj == this) { return true; } - if (!(obj instanceof Options)) { + if (!(obj instanceof Options otherOptions)) { return false; } - Options otherOptions = (Options)obj; EditorOptions editorOptions = otherOptions.getEditorOptions(); ExternalEditorOptions externalEditorOptions = otherOptions.getExternalEditorOptions(); return editorOptions.equals(getEditorOptions()) && externalEditorOptions.equals(getExternalEditorOptions()); diff --git a/images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java b/images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java index f2fd0d6fa83b..84d0b11669b2 100644 --- a/images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java +++ b/images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java @@ -76,12 +76,10 @@ final class ZoomOptionsImpl implements ZoomOptions { if (this == obj) { return true; } - if (!(obj instanceof ZoomOptions)) { + if (!(obj instanceof ZoomOptions otherOptions)) { return false; } - ZoomOptions otherOptions = (ZoomOptions)obj; - Dimension prefferedSize = otherOptions.getPrefferedSize(); return prefferedSize != null && prefferedHeight == prefferedSize.height && prefferedWidth == prefferedSize.width; diff --git a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java index 91d71cbd1b2b..e662ad0fdd65 100644 --- a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java +++ b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java @@ -339,9 +339,8 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable { public Component getListCellRendererComponent( JList list, Object value, int index, boolean isSelected, boolean cellHasFocus ) { - if (value instanceof VirtualFile) { - VirtualFile file = (VirtualFile) value; - setFileName(file.getName()); + if (value instanceof VirtualFile file) { + setFileName(file.getName()); String toolTipText = IfsUtil.getReferencePath(thumbnailView.getProject(), file); if (!isFileSizeVisible()) { String description = getImageComponent().getDescription(); diff --git a/images/src/org/intellij/images/util/imageio/CommonsImagingImageReaderSpi.java b/images/src/org/intellij/images/util/imageio/CommonsImagingImageReaderSpi.java index 374b66bddb9f..fb389875fd75 100644 --- a/images/src/org/intellij/images/util/imageio/CommonsImagingImageReaderSpi.java +++ b/images/src/org/intellij/images/util/imageio/CommonsImagingImageReaderSpi.java @@ -59,10 +59,9 @@ public class CommonsImagingImageReaderSpi extends ImageReaderSpi { @Override public boolean canDecodeInput(Object input) throws IOException { - if (!(input instanceof ImageInputStream)) { + if (!(input instanceof ImageInputStream stream)) { return false; } - final ImageInputStream stream = (ImageInputStream)input; try { final ImageFormat imageFormat = Imaging.guessFormat(new MyByteSource(stream)); if (myFormats.contains(imageFormat)) { diff --git a/json/src/com/intellij/json/JsonWebReferenceContributor.java b/json/src/com/intellij/json/JsonWebReferenceContributor.java index 3776bd31d122..2349a5591328 100644 --- a/json/src/com/intellij/json/JsonWebReferenceContributor.java +++ b/json/src/com/intellij/json/JsonWebReferenceContributor.java @@ -26,8 +26,7 @@ final class JsonWebReferenceContributor extends PsiReferenceContributor { @Override public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) { - if (!(element instanceof JsonStringLiteral)) return PsiReference.EMPTY_ARRAY; - JsonStringLiteral stringLiteral = (JsonStringLiteral)element; + if (!(element instanceof JsonStringLiteral stringLiteral)) return PsiReference.EMPTY_ARRAY; PsiElement parent = stringLiteral.getParent(); if (!(parent instanceof JsonProperty)) return PsiReference.EMPTY_ARRAY; diff --git a/json/src/com/intellij/json/actions/ShowAsJsonAction.java b/json/src/com/intellij/json/actions/ShowAsJsonAction.java index e8238d97dfc1..667de9991bf5 100644 --- a/json/src/com/intellij/json/actions/ShowAsJsonAction.java +++ b/json/src/com/intellij/json/actions/ShowAsJsonAction.java @@ -164,8 +164,7 @@ class ShowAsJsonAction extends DumbAwareAction { private static boolean selectOpened(Editor editor, JsonLineExtractor jsonLineExtractor, FileEditorManager fileEditorManager) { for (FileEditor fileEditor : fileEditorManager.getAllEditors()) { - if (fileEditor instanceof TextEditor) { - TextEditor textEditor = (TextEditor)fileEditor; + if (fileEditor instanceof TextEditor textEditor) { VirtualFile file = FileDocumentManager.getInstance().getFile(textEditor.getEditor().getDocument()); if (file instanceof LightVirtualFile) { Integer line = LINE_KEY.get(file); diff --git a/json/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java b/json/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java index 6caa3fc5baea..9626bf4fa367 100644 --- a/json/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java +++ b/json/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java @@ -34,8 +34,7 @@ public class JsonLiteralAnnotator implements Annotator { if (element instanceof JsonReferenceExpression) { highlightPropertyKey(element, holder); } - else if (element instanceof JsonStringLiteral) { - final JsonStringLiteral stringLiteral = (JsonStringLiteral)element; + else if (element instanceof JsonStringLiteral stringLiteral) { final int elementOffset = element.getTextOffset(); highlightPropertyKey(element, holder); final String text = JsonPsiUtil.getElementTextWithoutHostEscaping(element); diff --git a/json/src/com/intellij/json/codeinsight/JsonStandardComplianceInspection.java b/json/src/com/intellij/json/codeinsight/JsonStandardComplianceInspection.java index f85a42b33545..82d7c94a9129 100644 --- a/json/src/com/intellij/json/codeinsight/JsonStandardComplianceInspection.java +++ b/json/src/com/intellij/json/codeinsight/JsonStandardComplianceInspection.java @@ -222,8 +222,7 @@ public class JsonStandardComplianceInspection extends LocalInspectionTool { @Override public void visitValue(@NotNull JsonValue value) { - if (value.getContainingFile() instanceof JsonFile) { - final JsonFile jsonFile = (JsonFile)value.getContainingFile(); + if (value.getContainingFile() instanceof JsonFile jsonFile) { if (myWarnAboutMultipleTopLevelValues && value.getParent() == jsonFile && value != jsonFile.getTopLevelValue() && diff --git a/json/src/com/intellij/json/editor/smartEnter/JsonSmartEnterProcessor.java b/json/src/com/intellij/json/editor/smartEnter/JsonSmartEnterProcessor.java index 04beebc52d7e..d5cc85de7778 100644 --- a/json/src/com/intellij/json/editor/smartEnter/JsonSmartEnterProcessor.java +++ b/json/src/com/intellij/json/editor/smartEnter/JsonSmartEnterProcessor.java @@ -70,8 +70,7 @@ public class JsonSmartEnterProcessor extends SmartEnterProcessorWithFixers { @Override public void apply(@NotNull Editor editor, @NotNull JsonSmartEnterProcessor processor, @NotNull PsiElement element) throws IncorrectOperationException { - if (element instanceof JsonValue && element.getParent() instanceof JsonArray) { - final JsonValue arrayElement = (JsonValue)element; + if (element instanceof JsonValue arrayElement && element.getParent() instanceof JsonArray) { if (terminatedOnCurrentLine(editor, arrayElement) && !isFollowedByTerminal(element, COMMA)) { editor.getDocument().insertString(arrayElement.getTextRange().getEndOffset(), ","); processor.myShouldAddNewline = true; diff --git a/json/src/com/intellij/json/psi/impl/JsonPropertyNameReference.java b/json/src/com/intellij/json/psi/impl/JsonPropertyNameReference.java index 5b51dcb9f9c5..44210aab1cdc 100644 --- a/json/src/com/intellij/json/psi/impl/JsonPropertyNameReference.java +++ b/json/src/com/intellij/json/psi/impl/JsonPropertyNameReference.java @@ -58,11 +58,10 @@ public class JsonPropertyNameReference implements PsiReference { @Override public boolean isReferenceTo(@NotNull PsiElement element) { - if (!(element instanceof JsonProperty)) { + if (!(element instanceof JsonProperty otherProperty)) { return false; } // May reference to the property with the same name for compatibility with JavaScript JSON support - final JsonProperty otherProperty = (JsonProperty)element; final PsiElement selfResolve = resolve(); return otherProperty.getName().equals(getCanonicalText()) && selfResolve != otherProperty; } diff --git a/json/src/com/intellij/json/structureView/JsonStructureViewElement.java b/json/src/com/intellij/json/structureView/JsonStructureViewElement.java index 76fae0f54afc..25ece3d5b031 100644 --- a/json/src/com/intellij/json/structureView/JsonStructureViewElement.java +++ b/json/src/com/intellij/json/structureView/JsonStructureViewElement.java @@ -61,12 +61,10 @@ public class JsonStructureViewElement implements StructureViewTreeElement { else if (PsiTreeUtil.instanceOf(myElement, JsonObject.class, JsonArray.class)) { value = myElement; } - if (value instanceof JsonObject) { - final JsonObject object = ((JsonObject)value); + if (value instanceof JsonObject object) { return ContainerUtil.map2Array(object.getPropertyList(), TreeElement.class, property -> new JsonStructureViewElement(property)); } - else if (value instanceof JsonArray) { - final JsonArray array = (JsonArray)value; + else if (value instanceof JsonArray array) { final List childObjects = ContainerUtil.mapNotNull(array.getValueList(), value1 -> { if (value1 instanceof JsonObject && !((JsonObject)value1).getPropertyList().isEmpty()) { return new JsonStructureViewElement(value1); diff --git a/json/src/com/intellij/jsonpath/JsonPathCompletionContributor.java b/json/src/com/intellij/jsonpath/JsonPathCompletionContributor.java index 3d54ea0e745a..3391e07e82cc 100644 --- a/json/src/com/intellij/jsonpath/JsonPathCompletionContributor.java +++ b/json/src/com/intellij/jsonpath/JsonPathCompletionContributor.java @@ -179,8 +179,7 @@ public final class JsonPathCompletionContributor extends CompletionContributor { if (files == null) return; for (Pair rangePair : files) { - if (rangePair.getFirst() instanceof JsonPathFile) { - JsonPathFile jsonPathFile = (JsonPathFile)rangePair.getFirst(); + if (rangePair.getFirst() instanceof JsonPathFile jsonPathFile) { visitJsonPathLiterals(jsonPathFile); } } diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonOriginalPsiWalker.java b/json/src/com/jetbrains/jsonSchema/impl/JsonOriginalPsiWalker.java index 47f8afbd63f6..f6137c0b69c9 100644 --- a/json/src/com/jetbrains/jsonSchema/impl/JsonOriginalPsiWalker.java +++ b/json/src/com/jetbrains/jsonSchema/impl/JsonOriginalPsiWalker.java @@ -80,8 +80,7 @@ public class JsonOriginalPsiWalker implements JsonLikePsiWalker { while (! (current instanceof PsiFile)) { final PsiElement position = current; current = current.getParent(); - if (current instanceof JsonArray) { - JsonArray array = (JsonArray)current; + if (current instanceof JsonArray array) { final List list = array.getValueList(); int idx = -1; for (int i = 0; i < list.size(); i++) { diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.java index 3d82c72eae51..005cd725c57b 100644 --- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.java +++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.java @@ -193,8 +193,7 @@ public final class JsonSchemaCompletionContributor extends CompletionContributor List anEnum = propertyNamesSchema.getEnum(); if (anEnum == null) return; for (Object o : anEnum) { - if (!(o instanceof String)) continue; - String key = ((String)o); + if (!(o instanceof String key)) continue; key = !shouldWrapInQuotes(key, false) ? key : StringUtil.wrapWithDoubleQuote(key); myVariants.add(LookupElementBuilder.create(StringUtil.unquoteString(key))); } diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintAnalyzer.java b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintAnalyzer.java index 4704e899158e..93f7020ef00f 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintAnalyzer.java +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintAnalyzer.java @@ -268,8 +268,7 @@ public class TaintAnalyzer { PsiType type = target == null ? null : PsiUtil.getTypeByPsiElement(target); if (type == null) return null; if (target instanceof PsiClass) return null; - if (target instanceof PsiModifierListOwner) { - PsiModifierListOwner owner = (PsiModifierListOwner)target; + if (target instanceof PsiModifierListOwner owner) { TaintValue taintValue = TaintValueFactory.INSTANCE.fromModifierListOwner(owner); if (taintValue == TaintValue.UNKNOWN) taintValue = TaintValueFactory.of(owner); if (taintValue != TaintValue.UNKNOWN) return taintValue; diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintValueFactory.java b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintValueFactory.java index ba15f06965d4..78517d7966c4 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintValueFactory.java +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/TaintValueFactory.java @@ -46,8 +46,7 @@ class TaintValueFactory implements RestrictionInfoFactory { if (info != TaintValue.UNKNOWN) return info; info = fromExternalAnnotations(owner); if (info != TaintValue.UNKNOWN) return info; - if (owner instanceof PsiParameter) { - PsiParameter parameter = (PsiParameter)owner; + if (owner instanceof PsiParameter parameter) { info = of(parameter); if (info != TaintValue.UNKNOWN) return info; if (parameter.isVarArgs() && type instanceof PsiEllipsisType) { diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/test/junit/references/JUnitReferenceContributor.java b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/test/junit/references/JUnitReferenceContributor.java index f80537c0e270..521720999d5b 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/test/junit/references/JUnitReferenceContributor.java +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/test/junit/references/JUnitReferenceContributor.java @@ -116,16 +116,14 @@ final class JUnitReferenceContributor extends PsiReferenceContributor { element instanceof UBlockExpression) { return false; } - if (element instanceof UNamedExpression) { - UNamedExpression uPair = (UNamedExpression)element; + if (element instanceof UNamedExpression uPair) { String name = ObjectUtils.notNull(uPair.getName(), PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME); if (!myParameterName.equals(name)) { return false; } parameterFound = true; } - if (element instanceof UAnnotation) { - UAnnotation annotation = (UAnnotation)element; + if (element instanceof UAnnotation annotation) { return parameterFound && myAnnotation.equals(annotation.getQualifiedName()); } element = element.getUastParent(); diff --git a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/PositionHelper.java b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/PositionHelper.java index 028978e02bac..ce980fe11f4c 100644 --- a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/PositionHelper.java +++ b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/PositionHelper.java @@ -122,9 +122,8 @@ class PositionHelper implements PropertyChangeListener { Container p = table.getParent(); if (p instanceof JViewport) { Container gp = p.getParent(); - if (gp instanceof JScrollPane) { - JScrollPane scrollPane = (JScrollPane) gp; - JViewport viewport = scrollPane.getViewport(); + if (gp instanceof JScrollPane scrollPane) { + JViewport viewport = scrollPane.getViewport(); if ((viewport != null) && (viewport.getView() == table)) { setUp(scrollPane); previousTableViewport = p; @@ -195,9 +194,8 @@ class PositionHelper implements PropertyChangeListener { currentViewport.remove(filterHeader); Container parent = currentViewport.getParent(); - if (parent instanceof JScrollPane) { - JScrollPane scrollPane = (JScrollPane) parent; - if (scrollPane.getColumnHeader() == currentViewport) { + if (parent instanceof JScrollPane scrollPane) { + if (scrollPane.getColumnHeader() == currentViewport) { Component tableHeader = getTableHeader(); JViewport newView = (tableHeader == null) ? null : createCleanViewport(tableHeader); scrollPane.setColumnHeader(newView); diff --git a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/ChoicesListModel.java b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/ChoicesListModel.java index 26b8bf947f36..1a4bcbc60a70 100644 --- a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/ChoicesListModel.java +++ b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/ChoicesListModel.java @@ -274,10 +274,9 @@ public class ChoicesListModel extends AbstractListModel Object o1 = w1.o; Object o2 = w2.o; if (o1 instanceof CustomChoice) { - if (o2 instanceof CustomChoice) { + if (o2 instanceof CustomChoice c2) { CustomChoice c1 = (CustomChoice) o1; - CustomChoice c2 = (CustomChoice) o2; - int ret = c1.getPrecedence() - c2.getPrecedence(); + int ret = c1.getPrecedence() - c2.getPrecedence(); if (ret == 0) { // in this case, the comparator is string comparator ret = strComparator.compare(w1.str, w2.str); diff --git a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/FilterEditor.java b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/FilterEditor.java index e658f0749c39..f24fcbd37331 100644 --- a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/FilterEditor.java +++ b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/FilterEditor.java @@ -688,8 +688,7 @@ public class FilterEditor extends JComponent implements IFilterEditor /*, Dispos @Override public void actionPerformed(ActionEvent e) { popup.hide(); - if (e.getSource() instanceof JTextField) { - JTextField textField = (JTextField)e.getSource(); + if (e.getSource() instanceof JTextField textField) { textField.setCaretPosition(textField.getCaretPosition()); } } @@ -709,8 +708,7 @@ public class FilterEditor extends JComponent implements IFilterEditor /*, Dispos @Override public void actionPerformed(ActionEvent e) { if (!popup.isPopupFocused() || !popup.selectLast(false)) { - if (e.getSource() instanceof JTextField) { - JTextField textField = (JTextField)e.getSource(); + if (e.getSource() instanceof JTextField textField) { textField.setCaretPosition(textField.getText() .length()); } @@ -737,8 +735,7 @@ public class FilterEditor extends JComponent implements IFilterEditor /*, Dispos // list; if the item is already on the very last element, or // the focus is on the text field, move the caret to the end if (!popup.isPopupFocused() || !popup.selectLast(true)) { - if (e.getSource() instanceof JTextField) { - JTextField textField = (JTextField)e.getSource(); + if (e.getSource() instanceof JTextField textField) { textField.setCaretPosition(textField.getText() .length()); } @@ -766,8 +763,7 @@ public class FilterEditor extends JComponent implements IFilterEditor /*, Dispos // list; if the item is already on the very first element, or // the focus is on the text field, move the caret home if (!popup.isPopupFocused() || !popup.selectFirst(true)) { - if (e.getSource() instanceof JTextField) { - JTextField textField = (JTextField)e.getSource(); + if (e.getSource() instanceof JTextField textField) { textField.setCaretPosition(0); } } @@ -797,8 +793,7 @@ public class FilterEditor extends JComponent implements IFilterEditor /*, Dispos @Override public void actionPerformed(ActionEvent e) { if (!popup.isPopupFocused() || !popup.selectFirst(false)) { - if (e.getSource() instanceof JTextField) { - JTextField textField = (JTextField)e.getSource(); + if (e.getSource() instanceof JTextField textField) { textField.setCaretPosition(0); } } diff --git a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/HistoryListModel.java b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/HistoryListModel.java index 5832a36993d0..6c03d51c748b 100644 --- a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/HistoryListModel.java +++ b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/r/inlays/table/filters/gui/editor/HistoryListModel.java @@ -163,9 +163,8 @@ class HistoryListModel extends AbstractListModel { /** @see PopupComponent#selectBestMatch(Object) */ public ChoiceMatch getClosestMatch(Object hint) { ChoiceMatch ret = new ChoiceMatch(); - if ((stringComparator != null) && (hint instanceof String)) { - String strStart = (String) hint; - int strLen = strStart.length(); + if ((stringComparator != null) && (hint instanceof String strStart)) { + int strLen = strStart.length(); int historyLen = shownHistory.size(); while (historyLen-- > 0) { Object content = shownHistory.get(historyLen); diff --git a/platform/analysis-api/src/com/intellij/codeInsight/CharTailType.java b/platform/analysis-api/src/com/intellij/codeInsight/CharTailType.java index 2f0c3554a824..e165cfb5f715 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/CharTailType.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/CharTailType.java @@ -45,9 +45,7 @@ public class CharTailType extends TailType { public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof CharTailType)) return false; - - final CharTailType that = (CharTailType)o; + if (!(o instanceof CharTailType that)) return false; if (myChar != that.myChar) return false; diff --git a/platform/analysis-api/src/com/intellij/codeInsight/lookup/LookupElementPresentation.java b/platform/analysis-api/src/com/intellij/codeInsight/lookup/LookupElementPresentation.java index 61f3ca67ab71..c936cf7c8fa4 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/lookup/LookupElementPresentation.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/lookup/LookupElementPresentation.java @@ -277,8 +277,7 @@ public class LookupElementPresentation { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof TextFragment)) return false; - TextFragment fragment = (TextFragment)o; + if (!(o instanceof TextFragment fragment)) return false; return myGrayed == fragment.myGrayed && myItalic == fragment.myItalic && Objects.equals(text, fragment.text) && diff --git a/platform/analysis-api/src/com/intellij/openapi/fileEditor/ex/FileEditorWithProvider.java b/platform/analysis-api/src/com/intellij/openapi/fileEditor/ex/FileEditorWithProvider.java index e2b89fe2c0ea..446e757d7900 100644 --- a/platform/analysis-api/src/com/intellij/openapi/fileEditor/ex/FileEditorWithProvider.java +++ b/platform/analysis-api/src/com/intellij/openapi/fileEditor/ex/FileEditorWithProvider.java @@ -29,9 +29,7 @@ public final class FileEditorWithProvider { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof FileEditorWithProvider)) return false; - - FileEditorWithProvider provider = (FileEditorWithProvider)o; + if (!(o instanceof FileEditorWithProvider provider)) return false; if (!myFileEditor.equals(provider.myFileEditor)) return false; if (!myProvider.equals(provider.myProvider)) return false; diff --git a/platform/analysis-api/src/com/intellij/packageDependencies/DependencyRule.java b/platform/analysis-api/src/com/intellij/packageDependencies/DependencyRule.java index 7dc2aa2f74cd..bb24f3f8d108 100644 --- a/platform/analysis-api/src/com/intellij/packageDependencies/DependencyRule.java +++ b/platform/analysis-api/src/com/intellij/packageDependencies/DependencyRule.java @@ -68,8 +68,7 @@ public class DependencyRule { } public boolean equals(Object o) { - if (!(o instanceof DependencyRule)) return false; - DependencyRule other = (DependencyRule)o; + if (!(o instanceof DependencyRule other)) return false; return getDisplayText().equals(other.getDisplayText()) && Comparing.strEqual(getPackageSetPresentation(myFromScope), getPackageSetPresentation(other.myFromScope)) && Comparing.strEqual(getPackageSetPresentation(myToScope), getPackageSetPresentation(other.myToScope)); diff --git a/platform/analysis-api/src/com/intellij/psi/search/GlobalSearchScopesCore.java b/platform/analysis-api/src/com/intellij/psi/search/GlobalSearchScopesCore.java index bcc6a5d2e0f0..859fbab29a3c 100644 --- a/platform/analysis-api/src/com/intellij/psi/search/GlobalSearchScopesCore.java +++ b/platform/analysis-api/src/com/intellij/psi/search/GlobalSearchScopesCore.java @@ -277,8 +277,7 @@ public final class GlobalSearchScopesCore { @Override public GlobalSearchScope uniteWith(@NotNull GlobalSearchScope scope) { if (equals(scope)) return this; - if (scope instanceof DirectoryScope) { - DirectoryScope other = (DirectoryScope)scope; + if (scope instanceof DirectoryScope other) { if (containsScope(other)) return this; if (other.containsScope(this)) return other; return new DirectoriesScope(Objects.requireNonNull(getProject()), diff --git a/platform/analysis-api/src/com/intellij/psi/util/PsiUtilBase.java b/platform/analysis-api/src/com/intellij/psi/util/PsiUtilBase.java index 189b593f9107..a5042e0a324b 100644 --- a/platform/analysis-api/src/com/intellij/psi/util/PsiUtilBase.java +++ b/platform/analysis-api/src/com/intellij/psi/util/PsiUtilBase.java @@ -208,8 +208,7 @@ public class PsiUtilBase extends PsiUtilCore implements PsiEditorUtil { @Nullable public static VirtualFile asVirtualFile(@Nullable PsiElement element) { - if (element instanceof PsiFileSystemItem) { - PsiFileSystemItem psiFileSystemItem = (PsiFileSystemItem)element; + if (element instanceof PsiFileSystemItem psiFileSystemItem) { return psiFileSystemItem.isValid() ? psiFileSystemItem.getVirtualFile() : null; } return null; diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/TargetElementUtilBase.java b/platform/analysis-impl/src/com/intellij/codeInsight/TargetElementUtilBase.java index 1570f36fa9fc..ff52bbd73153 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/TargetElementUtilBase.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/TargetElementUtilBase.java @@ -125,8 +125,7 @@ public final class TargetElementUtilBase { final List targets = new ArrayList<>(); final Consumer consumer = target -> { - if (target instanceof PsiDeclaredTarget) { - final PsiDeclaredTarget declaredTarget = (PsiDeclaredTarget)target; + if (target instanceof PsiDeclaredTarget declaredTarget) { final PsiElement navigationElement = declaredTarget.getNavigationElement(); final TextRange range = declaredTarget.getNameIdentifierRange(); if (range != null && !range.shiftRight(navigationElement.getTextRange().getStartOffset()) diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java index 53c3650846d1..84b5abe24d02 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java @@ -187,13 +187,11 @@ public class CompletionData { protected void addLookupItem(Set set, TailType tailType, @NotNull Object completion, final CompletionVariant variant) { LookupElement ret = objectToLookupItem(completion); - if (!(ret instanceof LookupItem)) { + if (!(ret instanceof LookupItem item)) { set.add(ret); return; } - LookupItem item = (LookupItem)ret; - InsertHandler insertHandler = variant.getInsertHandler(); if(insertHandler != null && item.getInsertHandler() == null) { item.setInsertHandler(insertHandler); @@ -228,8 +226,7 @@ public class CompletionData { LOG.error("Position=" + position + "\n;Reference=" + reference + "\n;variants=" + Arrays.toString(completions)); continue; } - if (completion instanceof PsiElement) { - final PsiElement psiElement = (PsiElement)completion; + if (completion instanceof PsiElement psiElement) { if (filter.isClassAcceptable(psiElement.getClass()) && filter.isAcceptable(psiElement, position)) { addLookupItem(set, tailType, completion, variant); } diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java index 1b1bccdc9060..cb024c937acf 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java @@ -117,8 +117,7 @@ public class CompletionVariant { void addReferenceCompletions(PsiReference reference, PsiElement position, Set set, final PsiFile file, final CompletionData completionData){ for (final CompletionVariantItem ce : myCompletionsList) { - if(ce.completion() instanceof ElementFilter){ - final ElementFilter filter = (ElementFilter)ce.completion(); + if(ce.completion() instanceof ElementFilter filter){ completionData.completeReference(reference, position, set, ce.tailtype(), filter, this); } } diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerEx.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerEx.java index 31bc3247e65b..ef9bf331a02a 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerEx.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerEx.java @@ -47,8 +47,7 @@ public abstract class DaemonCodeAnalyzerEx extends DaemonCodeAnalyzer { return model.processRangeHighlightersOverlappingWith(startOffset, endOffset, marker -> { ProgressManager.checkCanceled(); Object tt = marker.getErrorStripeTooltip(); - if (!(tt instanceof HighlightInfo)) return true; - HighlightInfo info = (HighlightInfo)tt; + if (!(tt instanceof HighlightInfo info)) return true; return minSeverity != null && severityRegistrar.compare(info.getSeverity(), minSeverity) < 0 || info.getHighlighter() == null || processor.process(info); diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java index 016daa726915..e73b07450369 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java @@ -453,8 +453,7 @@ public class HighlightInfo implements Segment { @Override public boolean equals(Object obj) { if (obj == this) return true; - if (!(obj instanceof HighlightInfo)) return false; - HighlightInfo info = (HighlightInfo)obj; + if (!(obj instanceof HighlightInfo info)) return false; return info.getSeverity() == getSeverity() && info.startOffset == startOffset && diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java index d374397ad19c..051b8a1980af 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java @@ -152,9 +152,7 @@ public interface HighlightInfoType { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof HighlightInfoTypeImpl)) return false; - - HighlightInfoTypeImpl that = (HighlightInfoTypeImpl)o; + if (!(o instanceof HighlightInfoTypeImpl that)) return false; if (!Comparing.equal(myAttributesKey, that.myAttributesKey)) return false; if (!mySeverity.equals(that.mySeverity)) return false; diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java index 1cdf2897fc75..cb8759b66c6c 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java @@ -347,8 +347,7 @@ public final class UpdateHighlightersUtil { private static boolean shouldRemoveInfoEvenInEssentialMode(@NotNull RangeHighlighter highlighter) { Object tooltip = highlighter.getErrorStripeTooltip(); - if (!(tooltip instanceof HighlightInfo)) return true; - HighlightInfo info = (HighlightInfo)tooltip; + if (!(tooltip instanceof HighlightInfo info)) return true; int group = info.getGroup(); if (group != Pass.LOCAL_INSPECTIONS && group != Pass.EXTERNAL_TOOLS diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/lookup/ClassifierFactory.java b/platform/analysis-impl/src/com/intellij/codeInsight/lookup/ClassifierFactory.java index 7292061ea356..308938a3b076 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/lookup/ClassifierFactory.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/lookup/ClassifierFactory.java @@ -33,9 +33,7 @@ public abstract class ClassifierFactory { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ClassifierFactory)) return false; - - ClassifierFactory that = (ClassifierFactory)o; + if (!(o instanceof ClassifierFactory that)) return false; if (!myId.equals(that.myId)) return false; diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/lookup/DefaultLookupItemRenderer.java b/platform/analysis-impl/src/com/intellij/codeInsight/lookup/DefaultLookupItemRenderer.java index 0f113425d7da..73c3464850c6 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/lookup/DefaultLookupItemRenderer.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/lookup/DefaultLookupItemRenderer.java @@ -81,8 +81,7 @@ public class DefaultLookupItemRenderer extends LookupElementRenderer extends MutableLookupElement implements Comparable variables = new ArrayList<>(templateImpl.getVariables()); variables.sort(myVariableComparator); for (int i = variables.size() - 1; i >= 0; i--) { diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateImpl.java b/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateImpl.java index 35906c765a98..6d3f8bc67dae 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/TemplateImpl.java @@ -27,9 +27,8 @@ public class TemplateImpl extends TemplateBase implements SchemeElement { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof TemplateImpl)) return false; + if (!(o instanceof TemplateImpl template)) return false; - final TemplateImpl template = (TemplateImpl) o; if (myId != null && myId.equals(template.myId)) return true; if (isToReformat != template.isToReformat) return false; diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/Variable.java b/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/Variable.java index b3e1033300d1..26c987ceccb0 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/Variable.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/template/impl/Variable.java @@ -135,9 +135,7 @@ public class Variable implements Cloneable { public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof Variable)) return false; - - final Variable variable = (Variable) o; + if (!(o instanceof Variable variable)) return false; if (myAlwaysStopAt != variable.myAlwaysStopAt) return false; if (mySkipOnStart != variable.mySkipOnStart) return false; diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/DefaultInspectionToolResultExporter.java b/platform/analysis-impl/src/com/intellij/codeInspection/DefaultInspectionToolResultExporter.java index a95c30a339fc..7c0246d79b55 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/DefaultInspectionToolResultExporter.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/DefaultInspectionToolResultExporter.java @@ -547,8 +547,7 @@ public class DefaultInspectionToolResultExporter implements InspectionToolResult if (desc instanceof ProblemDescriptor) { lineNumber = ((ProblemDescriptor)desc).getLineNumber(); } - if (desc instanceof ProblemDescriptorBase) { - final ProblemDescriptorBase descriptorBase = (ProblemDescriptorBase)desc; + if (desc instanceof ProblemDescriptorBase descriptorBase) { file = descriptorBase.getContainingFile(); final TextRange textRange = descriptorBase.getTextRange(); position = textRange != null ? textRange.getStartOffset() : 0; diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/InspectionEngine.java b/platform/analysis-impl/src/com/intellij/codeInspection/InspectionEngine.java index 95de42283ea6..3786d50e8b94 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/InspectionEngine.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/InspectionEngine.java @@ -326,8 +326,7 @@ public final class InspectionEngine { } else if (toolWrapper instanceof GlobalInspectionToolWrapper) { GlobalInspectionTool globalTool = ((GlobalInspectionToolWrapper)toolWrapper).getTool(); - if (globalTool instanceof GlobalSimpleInspectionTool) { - GlobalSimpleInspectionTool simpleTool = (GlobalSimpleInspectionTool)globalTool; + if (globalTool instanceof GlobalSimpleInspectionTool simpleTool) { ProblemsHolder problemsHolder = new ProblemsHolder(inspectionManager, file, false); ProblemDescriptionsProcessor collectProcessor = new ProblemDescriptionsProcessor() { @Override diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/InspectionToolResultExporter.java b/platform/analysis-impl/src/com/intellij/codeInspection/InspectionToolResultExporter.java index a53106ff220f..8ee60f991e75 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/InspectionToolResultExporter.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/InspectionToolResultExporter.java @@ -52,8 +52,7 @@ public interface InspectionToolResultExporter extends ProblemDescriptionsProcess @NotNull InspectionToolResultExporter presentation) { HighlightSeverity severity = null; final InspectionProfile profile = InspectionProjectProfileManager.getInstance(presentation.getProject()).getCurrentProfile(); - if (entity instanceof RefElement) { - final RefElement refElement = (RefElement)entity; + if (entity instanceof RefElement refElement) { severity = presentation.getSeverity(refElement); } if (severity == null) { diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java b/platform/analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java index 5de9d785a264..e018feea8594 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java @@ -121,8 +121,7 @@ public abstract class RedundantSuppressInspectionBase extends GlobalSimpleInspec String toolId = suppressedTools.get(toolWrapper); toolWrapper.initialize(globalContext); final Collection descriptors; - if (toolWrapper instanceof LocalInspectionToolWrapper) { - LocalInspectionToolWrapper local = (LocalInspectionToolWrapper)toolWrapper; + if (toolWrapper instanceof LocalInspectionToolWrapper local) { if (local.isUnfair()) { continue; // can't work with passes other than LocalInspectionPass } @@ -135,8 +134,7 @@ public abstract class RedundantSuppressInspectionBase extends GlobalSimpleInspec (wrapper, descriptor) -> found.add(descriptor)); descriptors = new ArrayList<>(found); } - else if (toolWrapper instanceof GlobalInspectionToolWrapper) { - final GlobalInspectionToolWrapper global = (GlobalInspectionToolWrapper)toolWrapper; + else if (toolWrapper instanceof GlobalInspectionToolWrapper global) { GlobalInspectionTool globalTool = global.getTool(); //when graph is needed, results probably depend on outer files so absence of results on one file (in current context) doesn't guarantee anything if (globalTool.isGraphNeeded()) continue; diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/ControlFlow.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/ControlFlow.java index 6303b5357e1d..ecac833b2546 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/ControlFlow.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/ControlFlow.java @@ -190,8 +190,7 @@ public final class ControlFlow { int startOffset = getStartOffset(element).getInstructionOffset(); List synthetics = new ArrayList<>(); for (DfaValue value : myFactory.getValues()) { - if (value instanceof DfaVariableValue) { - DfaVariableValue var = (DfaVariableValue)value; + if (value instanceof DfaVariableValue var) { VariableDescriptor descriptor = var.getDescriptor(); if (descriptor instanceof Synthetic && ((Synthetic)descriptor).myLocation >= startOffset) { synthetics.add(var); diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DfaMemoryStateImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DfaMemoryStateImpl.java index 95d5f2e07661..0377d0418aa1 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DfaMemoryStateImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DfaMemoryStateImpl.java @@ -94,8 +94,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { public boolean equals(Object obj) { if (obj == this) return true; - if (!(obj instanceof DfaMemoryStateImpl)) return false; - DfaMemoryStateImpl that = (DfaMemoryStateImpl)obj; + if (!(obj instanceof DfaMemoryStateImpl that)) return false; if (myCachedHash != null && that.myCachedHash != null && !myCachedHash.equals(that.myCachedHash)) return false; return myEphemeral == that.myEphemeral && myStack.equals(that.myStack) && getNonTrivialEqClasses().equals(that.getNonTrivialEqClasses()) && @@ -424,8 +423,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { } } // ordering like a < b may affect types of the variables: in this case merge both types and ordering - if (diff instanceof UpdateVariableMergePatch) { - UpdateVariableMergePatch updateVar = (UpdateVariableMergePatch)diff; + if (diff instanceof UpdateVariableMergePatch updateVar) { DfaVariableValue var = updateVar.myValue; DfaVariableValue otherVar; DistinctPairSet.DistinctPair pair = ((DropOrderingMergePatch)mySingleDiff).myPair; @@ -502,8 +500,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { @Override public boolean isSuperStateOf(@NotNull DfaMemoryState other) { - if (!(other instanceof DfaMemoryStateImpl)) return false; - DfaMemoryStateImpl that = (DfaMemoryStateImpl)other; + if (!(other instanceof DfaMemoryStateImpl that)) return false; if (myEphemeral && !that.myEphemeral) return false; if (myStack.size() != that.myStack.size()) return false; for (int i = 0; i < myStack.size(); i++) { @@ -777,8 +774,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { if (value instanceof DfaBinOpValue) { return propagateRangeBack(ObjectUtils.tryCast(dfType, DfIntegralType.class), (DfaBinOpValue)value); } - if (value instanceof DfaVariableValue) { - DfaVariableValue var = (DfaVariableValue)value; + if (value instanceof DfaVariableValue var) { DfType type = getDfType(var); DfType result = type.meet(dfType); if (result.equals(type)) return true; @@ -834,8 +830,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { @Override public boolean applyContractCondition(@NotNull DfaCondition condition) { - if (condition instanceof DfaRelation) { - DfaRelation relation = (DfaRelation)condition; + if (condition instanceof DfaRelation relation) { if (relation.isEquality()) { checkEphemeral(relation.getLeftOperand(), relation.getRightOperand()); checkEphemeral(relation.getRightOperand(), relation.getLeftOperand()); @@ -846,9 +841,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { @Override public boolean areEqual(@NotNull DfaValue value1, @NotNull DfaValue value2) { - if (value1 instanceof DfaBinOpValue && value2 instanceof DfaBinOpValue) { - DfaBinOpValue binOp1 = (DfaBinOpValue)value1; - DfaBinOpValue binOp2 = (DfaBinOpValue)value2; + if (value1 instanceof DfaBinOpValue binOp1 && value2 instanceof DfaBinOpValue binOp2) { return binOp1.getOperation() == binOp2.getOperation() && areEqual(binOp1.getLeft(), binOp2.getLeft()) && areEqual(binOp1.getRight(), binOp2.getRight()); @@ -920,13 +913,12 @@ public class DfaMemoryStateImpl implements DfaMemoryState { private boolean applyBinOpRelations(DfaValue left, RelationType type, DfaValue right) { if (type != RelationType.LT && type != RelationType.GT && type != RelationType.NE && type != RelationType.EQ) return true; - if (!(left instanceof DfaBinOpValue)) { + if (!(left instanceof DfaBinOpValue binOp)) { if (right instanceof DfaBinOpValue) { return applyBinOpRelations(right, type.getFlipped(), left); } return true; } - DfaBinOpValue binOp = (DfaBinOpValue)left; LongRangeBinOp op = binOp.getOperation(); if (op != LongRangeBinOp.PLUS && op != LongRangeBinOp.MINUS) return true; DfaVariableValue leftLeft = binOp.getLeft(); @@ -1193,8 +1185,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { * @return true if value might be unstable, false otherwise */ private boolean isUnstableValue(DfaValue value) { - if (!(value instanceof DfaVariableValue)) return false; - DfaVariableValue var = (DfaVariableValue)value; + if (!(value instanceof DfaVariableValue var)) return false; return !var.alwaysEqualsToItself(getDfType(var)); } @@ -1296,8 +1287,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { if (value instanceof DfaVariableValue) { return canonicalize((DfaVariableValue)value); } - if (value instanceof DfaWrappedValue) { - DfaWrappedValue boxedValue = (DfaWrappedValue)value; + if (value instanceof DfaWrappedValue boxedValue) { DfaValue canonicalized = canonicalize(boxedValue.getWrappedValue()); if (canonicalized == boxedValue.getWrappedValue()) return boxedValue; return myFactory.getWrapperFactory().createWrapper(boxedValue.getDfType(), boxedValue.getSpecialField(), canonicalized); @@ -1684,8 +1674,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { QualifierStatus status = myMap.get(qualifier.getID()); if (status == null) { status = calculate(qualifier); - if (status != QualifierStatus.SHOULD_FLUSH_ALWAYS && qualifier instanceof DfaVariableValue) { - DfaVariableValue qualifierVar = (DfaVariableValue)qualifier; + if (status != QualifierStatus.SHOULD_FLUSH_ALWAYS && qualifier instanceof DfaVariableValue qualifierVar) { if (myClosure ? qualifierVar.canBeCapturedInClosure() : qualifierVar.isFlushableByCalls()) { DfaVariableValue qualifierQualifier = qualifierVar.getQualifier(); if (shouldFlush(qualifierQualifier, qualifierVar.containsCalls())) { diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DistinctPairSet.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DistinctPairSet.java index af29b8cb73c0..36ff999fd8f4 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DistinctPairSet.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DistinctPairSet.java @@ -57,8 +57,7 @@ public final class DistinctPairSet extends AbstractSet myTo) return this; - if (other instanceof ModRange) { - ModRange modRange = (ModRange)other; + if (other instanceof ModRange modRange) { long newBits = ~modRange.myBits; if (modRange.myMod < 64) { newBits &= (1L << modRange.myMod) - 1; @@ -1580,8 +1578,7 @@ public abstract class LongRangeSet { @Override public @NotNull LongRangeSet subtract(@NotNull LongRangeSet other) { - if (other instanceof Point) { - Point p = (Point)other; + if (other instanceof Point p) { if (p.myValue == myFrom) { return modRange(myFrom + 1, myTo, myMod, myBits); } @@ -1589,8 +1586,7 @@ public abstract class LongRangeSet { return modRange(myFrom, myTo - 1, myMod, myBits); } } - if (other instanceof Range && !(other instanceof ModRange)) { - Range r = (Range)other; + if (other instanceof Range r && !(other instanceof ModRange)) { if (r.myFrom <= myFrom && r.myTo >= myFrom && r.myTo < myTo) { return modRange(r.myTo + 1, myTo, myMod, myBits); } @@ -1638,8 +1634,7 @@ public abstract class LongRangeSet { if (intersection instanceof Range || intersection instanceof Point) { long bits = myBits; int mod = myMod; - if (other instanceof ModRange) { - ModRange modRange = (ModRange)other; + if (other instanceof ModRange modRange) { int lcm = lcm(modRange.myMod); if (lcm <= Long.SIZE) { bits = widenBits(lcm) & modRange.widenBits(lcm); @@ -1660,8 +1655,7 @@ public abstract class LongRangeSet { if (other instanceof Point) { return contains(((Point)other).myValue); } - if (other instanceof ModRange) { - ModRange modRange = (ModRange)other; + if (other instanceof ModRange modRange) { int lcm = lcm(modRange.myMod); if (lcm <= Long.SIZE && (modRange.widenBits(lcm) & widenBits(lcm)) == 0) return false; } @@ -1678,8 +1672,7 @@ public abstract class LongRangeSet { @NotNull @Override public LongRangeSet join(@NotNull LongRangeSet other) { - if (other instanceof ModRange) { - ModRange modRange = (ModRange)other; + if (other instanceof ModRange modRange) { int lcm = lcm(modRange.myMod); if (lcm <= Long.SIZE) { long bits = widenBits(lcm) | modRange.widenBits(lcm); @@ -1714,8 +1707,7 @@ public abstract class LongRangeSet { @Override public boolean contains(@NotNull LongRangeSet other) { - if (other instanceof ModRange) { - ModRange modRange = (ModRange)other; + if (other instanceof ModRange modRange) { if (modRange.myFrom < myFrom || modRange.myTo > myTo) return false; int lcm = lcm(modRange.myMod); if (lcm <= Long.SIZE) { diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaBinOpValue.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaBinOpValue.java index 25946ae662b2..9c484663c81f 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaBinOpValue.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaBinOpValue.java @@ -190,8 +190,7 @@ public final class DfaBinOpValue extends DfaValue { return doCreate((DfaVariableValue)left, right, resultType, LongRangeBinOp.PLUS); } } - if (left instanceof DfaBinOpValue) { - DfaBinOpValue sumValue = (DfaBinOpValue)left; + if (left instanceof DfaBinOpValue sumValue) { if (sumValue.getOperation() != LongRangeBinOp.PLUS && sumValue.getOperation() != LongRangeBinOp.MINUS) return null; if (rightConst != null) { if (sumValue.getRight() instanceof DfaTypeValue) { diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java index 680f85254ed9..a537a53d86b7 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java @@ -55,8 +55,7 @@ public abstract class HTMLComposerImpl extends HTMLComposer { public void compose(@NotNull StringBuilder buf, RefEntity refElement, CommonProblemDescriptor descriptor) {} protected void genPageHeader(@NotNull StringBuilder buf, RefEntity refEntity) { - if (refEntity instanceof RefElement) { - RefElement refElement = (RefElement)refEntity; + if (refEntity instanceof RefElement refElement) { appendHeading(buf, AnalysisBundle.message("inspection.export.results.capitalized.location")); buf.append("
"); diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java index 097ec1397b6d..97e85219807c 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java @@ -505,8 +505,7 @@ public final class ToolsImpl implements Tools { @Override public boolean equals(Object o) { - if (!(o instanceof ToolsImpl)) return false; - ToolsImpl tools = (ToolsImpl)o; + if (!(o instanceof ToolsImpl tools)) return false; if (myEnabled != tools.myEnabled) return false; if (getTools().size() != tools.getTools().size()) return false; for (int i = 0; i < getTools().size(); i++) { diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java index 7d03fc60d37c..3ab0a0b37b81 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java @@ -277,8 +277,7 @@ public class RefManagerImpl extends RefManager { fileElement.addContent(virtualFile.getUrl()); problem.addContent(fileElement); } - else if (refEntity instanceof RefElement) { - final RefElement refElement = (RefElement)refEntity; + else if (refEntity instanceof RefElement refElement) { final SmartPsiElementPointer pointer = refElement.getPointer(); PsiFile psiFile = pointer.getContainingFile(); if (psiFile == null) return null; @@ -306,8 +305,7 @@ public class RefManagerImpl extends RefManager { appendModule(problem, refElement.getModule()); } - else if (refEntity instanceof RefModule) { - final RefModule refModule = (RefModule)refEntity; + else if (refEntity instanceof RefModule refModule) { final VirtualFile moduleFile = refModule.getModule().getModuleFile(); final Element fileElement = new Element("file"); fileElement.addContent(moduleFile != null ? moduleFile.getUrl() : refEntity.getName()); diff --git a/platform/analysis-impl/src/com/intellij/lang/PerFileMappingsBase.java b/platform/analysis-impl/src/com/intellij/lang/PerFileMappingsBase.java index 02657efb00e7..73a98e2da910 100644 --- a/platform/analysis-impl/src/com/intellij/lang/PerFileMappingsBase.java +++ b/platform/analysis-impl/src/com/intellij/lang/PerFileMappingsBase.java @@ -112,8 +112,7 @@ public abstract class PerFileMappingsBase implements PersistentStateComponent @Nullable private T getMappingInner(@Nullable VirtualFile file, @Nullable FilePropertyKey pusherKey, boolean forHierarchy) { - if (file instanceof VirtualFileWindow) { - VirtualFileWindow window = (VirtualFileWindow)file; + if (file instanceof VirtualFileWindow window) { file = window.getDelegate(); } VirtualFile originalFile = file instanceof LightVirtualFile ? ((LightVirtualFile)file).getOriginalFile() : null; diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileInfoManager.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileInfoManager.java index a56beea7db9a..343687080d21 100644 --- a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileInfoManager.java +++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileInfoManager.java @@ -22,11 +22,10 @@ public final class FileInfoManager { } public static Object getFileLookupItem(PsiElement psiElement) { - if (!(psiElement instanceof PsiFile) || !(psiElement.isPhysical())) { + if (!(psiElement instanceof PsiFile file) || !(psiElement.isPhysical())) { return psiElement; } - final PsiFile file = (PsiFile)psiElement; return _getLookupItem(file, file.getName(), file.getIcon(0)); } @@ -37,12 +36,10 @@ public final class FileInfoManager { @Nullable private static String _getInfo(PsiElement psiElement) { - if (!(psiElement instanceof PsiFile) || !(psiElement.isPhysical())) { + if (!(psiElement instanceof PsiFile psiFile) || !(psiElement.isPhysical())) { return null; } - final PsiFile psiFile = (PsiFile)psiElement; - FileLookupInfoProvider provider = ContainerUtil.find(FileLookupInfoProvider.EP_NAME.getExtensionList(), p -> ArrayUtil.find(p.getFileTypes(), psiFile.getFileType()) != -1); diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java index 0dad51cfa100..0db80b32e3e1 100644 --- a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java +++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java @@ -67,8 +67,7 @@ public class FileReference implements PsiFileReference, FileReferenceOwner, PsiP @Nullable public static FileReference findFileReference(@NotNull final PsiReference original) { - if (original instanceof PsiMultiReference) { - final PsiMultiReference multiReference = (PsiMultiReference)original; + if (original instanceof PsiMultiReference multiReference) { for (PsiReference reference : multiReference.getReferences()) { if (reference instanceof FileReference) { return (FileReference)reference; @@ -200,9 +199,8 @@ public class FileReference implements PsiFileReference, FileReferenceOwner, PsiP // match filesystem roots result.add(new PsiElementResolveResult(getOriginalFile(context))); } - else if (context instanceof PsiDirectory && caseSensitivityApplies((PsiDirectory)context, caseSensitive)) { + else if (context instanceof PsiDirectory directory && caseSensitivityApplies((PsiDirectory)context, caseSensitive)) { // optimization: do not load all children into VFS - PsiDirectory directory = (PsiDirectory)context; PsiFileSystemItem child = directory.findFile(decoded); if (child == null) child = directory.findSubdirectory(decoded); if (child != null) { @@ -413,14 +411,13 @@ public class FileReference implements PsiFileReference, FileReferenceOwner, PsiP } public PsiElement bindToElement(@NotNull final PsiElement element, final boolean absolute) throws IncorrectOperationException { - if (!(element instanceof PsiFileSystemItem)) { + if (!(element instanceof PsiFileSystemItem fileSystemItem)) { throw new IncorrectOperationException("Cannot bind to element, should be instanceof PsiFileSystemItem: " + element); } // handle empty reference that resolves to current file if (getCanonicalText().isEmpty() && element == getElement().getContainingFile()) return getElement(); - final PsiFileSystemItem fileSystemItem = (PsiFileSystemItem)element; VirtualFile dstVFile = fileSystemItem.getVirtualFile(); if (dstVFile == null) throw new IncorrectOperationException("Cannot bind to non-physical element:" + element); diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceCompletionImpl.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceCompletionImpl.java index 7c2acbedf28e..a595af826087 100644 --- a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceCompletionImpl.java +++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceCompletionImpl.java @@ -104,8 +104,7 @@ public final class FileReferenceCompletionImpl extends FileReferenceCompletion { List encodedVariants = new ArrayList<>(variants.length + additionalItems.size()); for (int i = 0; i < candidates.length; i++) { final PsiElement element = candidates[i]; - if (element instanceof PsiNamedElement) { - final PsiNamedElement psiElement = (PsiNamedElement)element; + if (element instanceof PsiNamedElement psiElement) { String name = psiElement.getName(); final String encoded = reference.encode(name, psiElement); if (encoded == null) continue; diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/DocumentWindowImpl.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/DocumentWindowImpl.java index e4481b540fe4..46dddf36b88c 100644 --- a/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/DocumentWindowImpl.java +++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/DocumentWindowImpl.java @@ -892,8 +892,7 @@ class DocumentWindowImpl extends UserDataHolderBase implements Disposable, Docum @Override public boolean equals(Object o) { - if (!(o instanceof DocumentWindowImpl)) return false; - DocumentWindowImpl window = (DocumentWindowImpl)o; + if (!(o instanceof DocumentWindowImpl window)) return false; return myDelegate.equals(window.getDelegate()) && areRangesEqual(window); } diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtilBase.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtilBase.java index bac2957ac0d6..42784e192d77 100644 --- a/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtilBase.java +++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtilBase.java @@ -123,8 +123,7 @@ public class InjectedLanguageUtilBase { } public static Place getShreds(@NotNull FileViewProvider viewProvider) { - if (!(viewProvider instanceof InjectedFileViewProvider)) return null; - InjectedFileViewProvider myFileViewProvider = (InjectedFileViewProvider)viewProvider; + if (!(viewProvider instanceof InjectedFileViewProvider myFileViewProvider)) return null; return getShreds(myFileViewProvider.getDocument()); } @@ -268,8 +267,7 @@ public class InjectedLanguageUtilBase { } } } - if (result.references != null && visitor instanceof InjectedReferenceVisitor) { - InjectedReferenceVisitor refVisitor = (InjectedReferenceVisitor)visitor; + if (result.references != null && visitor instanceof InjectedReferenceVisitor refVisitor) { for (Pair pair : result.references) { Place place = pair.getSecond(); if (place.isValid()) { diff --git a/platform/analysis-impl/src/com/intellij/refactoring/util/DefaultNonCodeSearchElementDescriptionProvider.java b/platform/analysis-impl/src/com/intellij/refactoring/util/DefaultNonCodeSearchElementDescriptionProvider.java index 9d095b94e89f..e92bf95f2895 100644 --- a/platform/analysis-impl/src/com/intellij/refactoring/util/DefaultNonCodeSearchElementDescriptionProvider.java +++ b/platform/analysis-impl/src/com/intellij/refactoring/util/DefaultNonCodeSearchElementDescriptionProvider.java @@ -13,8 +13,7 @@ class DefaultNonCodeSearchElementDescriptionProvider implements ElementDescripti @Override public String getElementDescription(@NotNull final PsiElement element, @NotNull final ElementDescriptionLocation location) { - if (!(location instanceof NonCodeSearchDescriptionLocation)) return null; - final NonCodeSearchDescriptionLocation ncdLocation = (NonCodeSearchDescriptionLocation)location; + if (!(location instanceof NonCodeSearchDescriptionLocation ncdLocation)) return null; if (element instanceof PsiDirectory) { if (ncdLocation.isNonJava()) { @@ -25,8 +24,7 @@ class DefaultNonCodeSearchElementDescriptionProvider implements ElementDescripti return ((PsiDirectory) element).getName(); } - if (element instanceof PsiMetaOwner) { - final PsiMetaOwner psiMetaOwner = (PsiMetaOwner)element; + if (element instanceof PsiMetaOwner psiMetaOwner) { final PsiMetaData metaData = psiMetaOwner.getMetaData(); if (metaData != null) { return metaData.getName(); diff --git a/platform/boot/src/com/intellij/util/lang/ZipResourceFile.java b/platform/boot/src/com/intellij/util/lang/ZipResourceFile.java index 1ed826b9ca97..6e02263c1bfe 100644 --- a/platform/boot/src/com/intellij/util/lang/ZipResourceFile.java +++ b/platform/boot/src/com/intellij/util/lang/ZipResourceFile.java @@ -61,8 +61,7 @@ final class ZipResourceFile implements ResourceFile { @Override public @NotNull ClasspathCache.IndexRegistrar buildClassPathCacheData() { // name hash is not added - doesn't make sense as fast lookup by name is supported by ImmutableZipFile - if (zipFile instanceof ImmutableZipFile) { - ImmutableZipFile file = (ImmutableZipFile)zipFile; + if (zipFile instanceof ImmutableZipFile file) { return new ClasspathCache.IndexRegistrar() { @Override public int classPackageCount() { diff --git a/platform/bootstrap/src/com/intellij/idea/BootstrapClassLoaderUtil.java b/platform/bootstrap/src/com/intellij/idea/BootstrapClassLoaderUtil.java index 7c6a9a72bd52..bd9511677192 100644 --- a/platform/bootstrap/src/com/intellij/idea/BootstrapClassLoaderUtil.java +++ b/platform/bootstrap/src/com/intellij/idea/BootstrapClassLoaderUtil.java @@ -56,10 +56,9 @@ public final class BootstrapClassLoaderUtil { public static void initClassLoader(boolean addCwmLibs) throws Throwable { Path distDir = Path.of(PathManager.getHomePath()); ClassLoader classLoader = BootstrapClassLoaderUtil.class.getClassLoader(); - if (!(classLoader instanceof PathClassLoader)) { + if (!(classLoader instanceof PathClassLoader pathClassLoader)) { throw new RuntimeException("You must run JVM with -Djava.system.class.loader=com.intellij.util.lang.PathClassLoader"); } - PathClassLoader pathClassLoader = (PathClassLoader)classLoader; if (AppMode.isDevServer()) { List paths = loadClassPathFromDevBuild(distDir); diff --git a/platform/code-style-api/src/com/intellij/lang/LanguageFormatting.java b/platform/code-style-api/src/com/intellij/lang/LanguageFormatting.java index e5f3d6f670f6..e6ba847a01e3 100644 --- a/platform/code-style-api/src/com/intellij/lang/LanguageFormatting.java +++ b/platform/code-style-api/src/com/intellij/lang/LanguageFormatting.java @@ -49,8 +49,7 @@ public final class LanguageFormatting extends LanguageExtension myEntries = new ArrayList<>(); public boolean equals(Object obj) { - if (!(obj instanceof PackageEntryTable)) { + if (!(obj instanceof PackageEntryTable other)) { return false; } - PackageEntryTable other = (PackageEntryTable)obj; if (other.myEntries.size() != myEntries.size()) { return false; } diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/PredefinedCodeStyle.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/PredefinedCodeStyle.java index 1a16ecfd54db..1a85d0614777 100644 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/PredefinedCodeStyle.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/PredefinedCodeStyle.java @@ -77,8 +77,7 @@ public abstract class PredefinedCodeStyle { @Override public boolean equals(Object obj) { - if (!(obj instanceof PredefinedCodeStyle)) return false; - PredefinedCodeStyle otherStyle = (PredefinedCodeStyle)obj; + if (!(obj instanceof PredefinedCodeStyle otherStyle)) return false; return myName.equals(otherStyle.getName()) && myLanguage.equals(otherStyle.getLanguage()); } diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/DefaultArrangementSettingsSerializer.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/DefaultArrangementSettingsSerializer.java index d420361cca33..e90d48cfa302 100644 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/DefaultArrangementSettingsSerializer.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/DefaultArrangementSettingsSerializer.java @@ -57,11 +57,10 @@ public class DefaultArrangementSettingsSerializer implements ArrangementSettings @Override public void serialize(@NotNull ArrangementSettings s, @NotNull Element holder) { - if (!(s instanceof StdArrangementSettings)) { + if (!(s instanceof StdArrangementSettings settings)) { return; } - StdArrangementSettings settings = (StdArrangementSettings)s; if (settings instanceof ArrangementExtendableSettings && myDefaultSettings instanceof ArrangementExtendableSettings) { final Set tokensDefinition = ((ArrangementExtendableSettings)settings).getRuleAliases(); final boolean isDefault = tokensDefinition.equals(((ArrangementExtendableSettings)myDefaultSettings).getRuleAliases()); diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/match/ByTextArrangementEntryMatcher.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/match/ByTextArrangementEntryMatcher.java index 068a86c15939..8d2b05f1c540 100644 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/match/ByTextArrangementEntryMatcher.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/match/ByTextArrangementEntryMatcher.java @@ -47,11 +47,10 @@ public class ByTextArrangementEntryMatcher implements ArrangementEntryMatcher { if (this == o) { return true; } - if (!(o instanceof ByTextArrangementEntryMatcher)) { + if (!(o instanceof ByTextArrangementEntryMatcher matcher)) { return false; } - ByTextArrangementEntryMatcher matcher = (ByTextArrangementEntryMatcher)o; if (!myText.equals(matcher.myText)) { return false; } diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokenType.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokenType.java index 4f1fe0765643..f6543a9fee0b 100644 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokenType.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokenType.java @@ -47,10 +47,9 @@ public class StdArrangementTokenType { @Override public boolean equals(Object o) { if (this == o) {return true;} - if (!(o instanceof StdArrangementTokenType)) { + if (!(o instanceof StdArrangementTokenType oType)) { return false; } - StdArrangementTokenType oType = (StdArrangementTokenType) o; return oType.myId.equals(myId) && myUiRole == oType.myUiRole; } diff --git a/platform/code-style-impl/src/com/intellij/formatting/AlignmentCyclesDetector.java b/platform/code-style-impl/src/com/intellij/formatting/AlignmentCyclesDetector.java index 27d8b3baebfe..9bb8b2c5509c 100644 --- a/platform/code-style-impl/src/com/intellij/formatting/AlignmentCyclesDetector.java +++ b/platform/code-style-impl/src/com/intellij/formatting/AlignmentCyclesDetector.java @@ -37,8 +37,7 @@ public class AlignmentCyclesDetector { @Override public boolean equals(Object obj) { - if (obj instanceof OffsetPair) { - OffsetPair other = (OffsetPair)obj; + if (obj instanceof OffsetPair other) { return other.first == first && other.second == second; } return false; diff --git a/platform/code-style-impl/src/com/intellij/formatting/InitialInfoBuilder.java b/platform/code-style-impl/src/com/intellij/formatting/InitialInfoBuilder.java index ec745ddec134..8c2cb30ee34e 100644 --- a/platform/code-style-impl/src/com/intellij/formatting/InitialInfoBuilder.java +++ b/platform/code-style-impl/src/com/intellij/formatting/InitialInfoBuilder.java @@ -233,8 +233,7 @@ public final class InitialInfoBuilder { } private void registerExpandableIndents(@NotNull Block block, @NotNull AbstractBlockWrapper wrapper) { - if (block.getIndent() instanceof ExpandableIndent) { - ExpandableIndent indent = (ExpandableIndent)block.getIndent(); + if (block.getIndent() instanceof ExpandableIndent indent) { myBlocksToForceChildrenIndent.putValue(indent, wrapper); } } diff --git a/platform/code-style-impl/src/com/intellij/formatting/RangesAssert.java b/platform/code-style-impl/src/com/intellij/formatting/RangesAssert.java index fffb3d2dccb3..3d51f9a9cde3 100644 --- a/platform/code-style-impl/src/com/intellij/formatting/RangesAssert.java +++ b/platform/code-style-impl/src/com/intellij/formatting/RangesAssert.java @@ -45,8 +45,7 @@ class RangesAssert { buffer.append("'\n"); buffer.append("model (").append(model.getClass()).append("): ").append(model); - if (model instanceof FormattingDocumentModelImpl) { - final FormattingDocumentModelImpl modelImpl = (FormattingDocumentModelImpl)model; + if (model instanceof FormattingDocumentModelImpl modelImpl) { buffer.append("Psi Tree:\n"); final PsiFile file = modelImpl.getFile(); final List roots = file.getViewProvider().getAllFiles(); diff --git a/platform/code-style-impl/src/com/intellij/formatting/SpacingImpl.java b/platform/code-style-impl/src/com/intellij/formatting/SpacingImpl.java index 2ccc753c3e4f..44e6ecd9a9b5 100644 --- a/platform/code-style-impl/src/com/intellij/formatting/SpacingImpl.java +++ b/platform/code-style-impl/src/com/intellij/formatting/SpacingImpl.java @@ -117,8 +117,7 @@ public class SpacingImpl extends Spacing { */ @Override public boolean equals(Object o) { - if (!(o instanceof SpacingImpl)) return false; - final SpacingImpl spacing = (SpacingImpl)o; + if (!(o instanceof SpacingImpl spacing)) return false; return myFlags == spacing.myFlags && myMinSpaces == spacing.myMinSpaces && myMaxSpaces == spacing.myMaxSpaces && diff --git a/platform/code-style-impl/src/com/intellij/formatting/engine/AdjustWhiteSpacesState.java b/platform/code-style-impl/src/com/intellij/formatting/engine/AdjustWhiteSpacesState.java index fb97c8de266f..fbcdbc204511 100644 --- a/platform/code-style-impl/src/com/intellij/formatting/engine/AdjustWhiteSpacesState.java +++ b/platform/code-style-impl/src/com/intellij/formatting/engine/AdjustWhiteSpacesState.java @@ -129,11 +129,10 @@ public class AdjustWhiteSpacesState extends State { private static List getDependentRegionRangesAfterCurrentWhiteSpace(final SpacingImpl spaceProperty, final WhiteSpace whiteSpace) { - if (!(spaceProperty instanceof DependantSpacingImpl)) return ContainerUtil.emptyList(); + if (!(spaceProperty instanceof DependantSpacingImpl spacing)) return ContainerUtil.emptyList(); if (whiteSpace.isReadOnly() || whiteSpace.isLineFeedsAreReadOnly()) return ContainerUtil.emptyList(); - DependantSpacingImpl spacing = (DependantSpacingImpl)spaceProperty; return ContainerUtil.filter(spacing.getDependentRegionRanges(), dependencyRange -> whiteSpace.getStartOffset() < dependencyRange.getEndOffset()); } diff --git a/platform/code-style-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockWrapper.java b/platform/code-style-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockWrapper.java index 5c472d3320d5..5d5566c47c98 100644 --- a/platform/code-style-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockWrapper.java +++ b/platform/code-style-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockWrapper.java @@ -149,8 +149,7 @@ public class InjectedLanguageBlockWrapper implements BlockEx { } if (child2 instanceof InjectedLanguageBlockWrapper) child2ToUse = ((InjectedLanguageBlockWrapper)child2).myOriginal; Spacing spacing = myOriginal.getSpacing(child1ToUse, child2ToUse); - if (spacing instanceof DependantSpacingImpl && shift != 0) { - DependantSpacingImpl hostSpacing = (DependantSpacingImpl)spacing; + if (spacing instanceof DependantSpacingImpl hostSpacing && shift != 0) { final int finalShift = shift; List shiftedRanges = ContainerUtil.map(hostSpacing.getDependentRegionRanges(), range -> range.shiftRight(finalShift)); return new DependantSpacingImpl( diff --git a/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java b/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java index 77849343f937..86fe9b0a855f 100644 --- a/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java +++ b/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java @@ -101,8 +101,7 @@ public class CodeFormatterFacade { } TextRange range = preprocess(element, TextRange.create(startOffset, endOffset)); - if (document instanceof DocumentWindow) { - DocumentWindow documentWindow = (DocumentWindow)document; + if (document instanceof DocumentWindow documentWindow) { range = documentWindow.injectedToHost(range); } @@ -145,9 +144,8 @@ public class CodeFormatterFacade { final Project project = file.getProject(); Document document = file.getViewProvider().getDocument(); final List textRanges = ranges.getRanges(); - if (document instanceof DocumentWindow && shouldDelegateToTopLevel(file)) { + if (document instanceof DocumentWindow documentWindow && shouldDelegateToTopLevel(file)) { file = InjectedLanguageManager.getInstance(file.getProject()).getTopLevelFile(file); - final DocumentWindow documentWindow = (DocumentWindow)document; for (FormatTextRange range : textRanges) { range.setTextRange(documentWindow.injectedToHost(range.getTextRange())); } diff --git a/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java b/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java index d82daf87d91c..1f085bf38783 100644 --- a/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java +++ b/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java @@ -370,8 +370,7 @@ public class CodeStyleManagerImpl extends CodeStyleManager implements Formatting private static boolean isCommentToken(final ASTNode element) { final Language language = element.getElementType().getLanguage(); final Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(language); - if (commenter instanceof CodeDocumentationAwareCommenter) { - final CodeDocumentationAwareCommenter documentationAwareCommenter = (CodeDocumentationAwareCommenter)commenter; + if (commenter instanceof CodeDocumentationAwareCommenter documentationAwareCommenter) { return element.getElementType() == documentationAwareCommenter.getBlockCommentTokenType() || element.getElementType() == documentationAwareCommenter.getLineCommentTokenType(); } diff --git a/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java b/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java index 10dc24e30264..3624416822cb 100644 --- a/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java +++ b/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java @@ -43,8 +43,7 @@ abstract class CodeStyleManagerRunnable { PsiDocumentManager documentManager = PsiDocumentManager.getInstance(myCodeStyleManager.getProject()); Document document = documentManager.getDocument(file); - if (document instanceof DocumentWindow) { - final DocumentWindow documentWindow = (DocumentWindow)document; + if (document instanceof DocumentWindow documentWindow) { final PsiFile topLevelFile = InjectedLanguageManager.getInstance(file.getProject()).getTopLevelFile(file); if (!file.equals(topLevelFile)) { if (range != null) { diff --git a/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/IndentImpl.java b/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/IndentImpl.java index 18753fcfc96e..ddfeddde7dfb 100644 --- a/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/IndentImpl.java +++ b/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/IndentImpl.java @@ -42,9 +42,7 @@ public class IndentImpl implements Indent{ } public boolean equals(Object o) { - if (!(o instanceof IndentImpl)) return false; - - IndentImpl indent = (IndentImpl)o; + if (!(o instanceof IndentImpl indent)) return false; if (myIndentLevel != indent.myIndentLevel) return false; if (mySpaceCount != indent.mySpaceCount) return false; diff --git a/platform/core-ui/src/ui/LayeredIcon.java b/platform/core-ui/src/ui/LayeredIcon.java index 3cf28149ab3d..520ab6eaa3ad 100644 --- a/platform/core-ui/src/ui/LayeredIcon.java +++ b/platform/core-ui/src/ui/LayeredIcon.java @@ -117,9 +117,7 @@ public class LayeredIcon extends JBCachingScalableIcon implements D @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof LayeredIcon)) return false; - - final LayeredIcon icon = (LayeredIcon)o; + if (!(o instanceof LayeredIcon icon)) return false; if (myHeight != icon.myHeight) return false; if (myWidth != icon.myWidth) return false; diff --git a/platform/core-ui/src/ui/OffsetIcon.java b/platform/core-ui/src/ui/OffsetIcon.java index 4174d7941d28..ebbd56b654f2 100644 --- a/platform/core-ui/src/ui/OffsetIcon.java +++ b/platform/core-ui/src/ui/OffsetIcon.java @@ -71,8 +71,7 @@ public final class OffsetIcon extends JBCachingScalableIcon { public boolean equals(Object obj) { if (obj == this) return true; - if (obj instanceof OffsetIcon) { - OffsetIcon icon = (OffsetIcon)obj; + if (obj instanceof OffsetIcon icon) { return icon.myOffset == myOffset && Objects.equals(icon.myIcon, myIcon); } return false; diff --git a/platform/core-ui/src/ui/TableCell.java b/platform/core-ui/src/ui/TableCell.java index 0024b278a281..f057c70cc6d1 100644 --- a/platform/core-ui/src/ui/TableCell.java +++ b/platform/core-ui/src/ui/TableCell.java @@ -12,9 +12,7 @@ public final class TableCell { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof TableCell)) return false; - - final TableCell myKey = (TableCell)o; + if (!(o instanceof TableCell myKey)) return false; if (column != myKey.column) return false; if (row != myKey.row) return false; diff --git a/platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java b/platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java index 0e4c0c4c45b9..99a35f437ce4 100644 --- a/platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java +++ b/platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java @@ -130,8 +130,7 @@ public class DiffManagerImpl extends DiffManagerEx { return; } - if (request instanceof ThreesideMergeRequest) { - ThreesideMergeRequest mergeRequest = (ThreesideMergeRequest)request; + if (request instanceof ThreesideMergeRequest mergeRequest) { DiffContent outputContent = mergeRequest.getOutputContent(); FileType fileType = outputContent.getContentType(); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java index 3b414d2e9c2a..53e26029d167 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java @@ -168,8 +168,7 @@ public final class ExternalDiffToolUtil { File tempFile = createTempFile(file, fileName); return new NonLocalOutputFile(file, tempFile); } - else if (content instanceof DocumentContent) { - DocumentContent documentContent = (DocumentContent)content; + else if (content instanceof DocumentContent documentContent) { File tempFile = createTempFile(project, documentContent, fileName); Charset charset = getContentCharset(project, documentContent); return new DocumentOutputFile(documentContent.getDocument(), charset, tempFile); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/TransferableFileEditorStateSupport.java b/platform/diff-impl/src/com/intellij/diff/tools/util/TransferableFileEditorStateSupport.java index 4ac0bfdc0161..d2187e3049d1 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/TransferableFileEditorStateSupport.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/TransferableFileEditorStateSupport.java @@ -155,9 +155,8 @@ public class TransferableFileEditorStateSupport { @Override public void propertyChange(PropertyChangeEvent evt) { if (myDuringUpdate || !isEnabled()) return; - if (!(evt.getSource() instanceof FileEditor)) return; + if (!(evt.getSource() instanceof FileEditor editor)) return; - FileEditor editor = (FileEditor)evt.getSource(); if (!editor.getComponent().isShowing()) return; Dimension size = editor.getComponent().getSize(); if (size.width <= 0 || size.height <= 0) return; diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableCellRenderer.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableCellRenderer.java index a4cfab2b5d8f..3c70d8110054 100644 --- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableCellRenderer.java +++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableCellRenderer.java @@ -60,8 +60,7 @@ public class DirDiffTableCellRenderer extends DefaultTableCellRenderer { }; } final Component c = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - if (c instanceof JLabel) { - final JLabel label = (JLabel)c; + if (c instanceof JLabel label) { Border border = label.getBorder(); if ((hasFocus || isSelected) && border != null) { label.setBorder(new EmptyBorder(border.getBorderInsets(label))); diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/settings/DiffColorDescriptionPanel.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/settings/DiffColorDescriptionPanel.java index ee94dcf269cf..fd92a5219765 100644 --- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/settings/DiffColorDescriptionPanel.java +++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/settings/DiffColorDescriptionPanel.java @@ -83,8 +83,7 @@ class DiffColorDescriptionPanel extends JPanel implements OptionsPanelImpl.Color @Override public void reset(@NotNull EditorSchemeAttributeDescriptor attrDescription) { - if (!(attrDescription instanceof ColorAndFontDescription)) return; - ColorAndFontDescription description = (ColorAndFontDescription)attrDescription; + if (!(attrDescription instanceof ColorAndFontDescription description)) return; Color backgroundColor = getBackgroundColor(description); Color ignoredColor = getIgnoredColor(description); @@ -104,8 +103,7 @@ class DiffColorDescriptionPanel extends JPanel implements OptionsPanelImpl.Color @Override public void apply(@NotNull EditorSchemeAttributeDescriptor attrDescription, EditorColorsScheme scheme) { - if (!(attrDescription instanceof ColorAndFontDescription)) return; - ColorAndFontDescription description = (ColorAndFontDescription)attrDescription; + if (!(attrDescription instanceof ColorAndFontDescription description)) return; description.setBackgroundChecked(true); description.setForegroundChecked(true); diff --git a/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopupPanel.java b/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopupPanel.java index dab03031b26e..3ae9d895ee89 100644 --- a/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopupPanel.java +++ b/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopupPanel.java @@ -177,8 +177,7 @@ public class LineStatusMarkerPopupPanel extends JPanel { @Override public void hintShown(@NotNull Editor newEditor, @NotNull LightweightHint newHint, int flags, @NotNull HintHint hintInfo) { // Ex: if popup re-shown by ToggleByWordDiffAction - if (newHint.getComponent() instanceof LineStatusMarkerPopupPanel) { - LineStatusMarkerPopupPanel newPopupPanel = (LineStatusMarkerPopupPanel)newHint.getComponent(); + if (newHint.getComponent() instanceof LineStatusMarkerPopupPanel newPopupPanel) { if (newPopupPanel.getEditor().equals(newEditor)) { hint.hide(); } diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/util/PsiFragment.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/util/PsiFragment.java index edaf718609ff..b5e023cfd33b 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/util/PsiFragment.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/util/PsiFragment.java @@ -205,9 +205,7 @@ public abstract class PsiFragment { public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof PsiFragment)) return false; - - PsiFragment other = (PsiFragment)o; + if (!(o instanceof PsiFragment other)) return false; return other.getStartOffset() == getStartOffset() && other.getEndOffset() == getEndOffset() && diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java index 1c82fdd9b4f4..ba63c3cc3ac7 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java @@ -520,8 +520,7 @@ public final class PushLog extends JPanel implements Disposable, DataProvider { @Nullable private DefaultMutableTreeNode getFirstNodeToEdit() { // start edit last selected component if editable - if (myTree.getLastSelectedPathComponent() instanceof RepositoryNode) { - RepositoryNode selectedNode = ((RepositoryNode)myTree.getLastSelectedPathComponent()); + if (myTree.getLastSelectedPathComponent() instanceof RepositoryNode selectedNode) { if (selectedNode.isEditableNow()) return selectedNode; } List repositoryNodes = getChildNodesByType((DefaultMutableTreeNode)myTree.getModel().getRoot(), @@ -633,9 +632,8 @@ public final class PushLog extends JPanel implements Disposable, DataProvider { // null border works as expected always. ColoredTreeCellRenderer renderer = getTextRenderer(); renderer.setIpad(JBInsets.emptyInsets()); - if (value instanceof RepositoryNode) { + if (value instanceof RepositoryNode valueNode) { //todo simplify, remove instance of - RepositoryNode valueNode = (RepositoryNode)value; boolean isCheckboxVisible = valueNode.isCheckboxVisible(); myCheckbox.setVisible(isCheckboxVisible); if (!isCheckboxVisible) { @@ -679,8 +677,7 @@ public final class PushLog extends JPanel implements Disposable, DataProvider { @Override public boolean isCellEditable(EventObject anEvent) { - if (anEvent instanceof MouseEvent) { - MouseEvent me = ((MouseEvent)anEvent); + if (anEvent instanceof MouseEvent me) { final TreePath path = myTree.getClosestPathForLocation(me.getX(), me.getY()); final int row = myTree.getRowForLocation(me.getX(), me.getY()); myTree.getCellRenderer().getTreeCellRendererComponent(myTree, path.getLastPathComponent(), false, false, true, row, true); diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLogTreeUtil.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLogTreeUtil.java index f964a18db9bf..f1c726d412bc 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLogTreeUtil.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLogTreeUtil.java @@ -32,8 +32,7 @@ public final class PushLogTreeUtil { final TreeNode treeNode = (TreeNode)path.getLastPathComponent(); final int row = tree.getRowForLocation(e.getX(), e.getY()); tree.getCellRenderer().getTreeCellRendererComponent(tree, treeNode, false, false, true, row, true); - if (treeNode instanceof RepositoryNode) { - RepositoryNode repositoryNode = (RepositoryNode)treeNode; + if (treeNode instanceof RepositoryNode repositoryNode) { int checkBoxWidth = repositoryNode.isCheckboxVisible() ? renderer.getCheckbox().getWidth() : 0; tag = renderer.getTextRenderer().getFragmentTagAt(dx - checkBoxWidth); } diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsBranchEditorListener.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsBranchEditorListener.java index 0e7907c4eacf..71ffdefa0690 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsBranchEditorListener.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsBranchEditorListener.java @@ -32,9 +32,8 @@ public class VcsBranchEditorListener extends LinkMouseListenerBase { myUnderlined = null; shouldRepaint = true; } - if (tag instanceof VcsLinkedTextComponent) { + if (tag instanceof VcsLinkedTextComponent linkedText) { component.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - VcsLinkedTextComponent linkedText = (VcsLinkedTextComponent)tag; linkedText.setUnderlined(true); myUnderlined = linkedText; shouldRepaint = true; @@ -55,8 +54,7 @@ public class VcsBranchEditorListener extends LinkMouseListenerBase { @Override protected void handleTagClick(@Nullable final Object tag, @NotNull MouseEvent event) { - if (tag instanceof VcsLinkedTextComponent) { - VcsLinkedTextComponent textWithLink = (VcsLinkedTextComponent)tag; + if (tag instanceof VcsLinkedTextComponent textWithLink) { final TreePath path = myRenderer.getTextRenderer().getTree().getPathForLocation(event.getX(), event.getY()); if (path == null) return; //path could not be null if tag not null; see com.intellij.dvcs.push.ui.PushLogTreeUtil.getTagAtForRenderer Object node = path.getLastPathComponent(); diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java index 995673c63c3e..b54df0ce8650 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java @@ -292,8 +292,7 @@ public class VcsPushDialog extends DialogWrapper implements VcsPushUi, DataProvi @Override public void onThrowable(@NotNull Throwable error) { - if (error instanceof PushController.HandlerException) { - PushController.HandlerException handlerException = (PushController.HandlerException)error; + if (error instanceof PushController.HandlerException handlerException) { Throwable cause = handlerException.getCause(); String failedHandler = handlerException.getFailedHandlerName(); diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java index 922099ac2389..5a6bd3a5a74b 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java @@ -262,8 +262,7 @@ public final class BranchActionGroupPopup extends FlatSpeedSearchPopup { List speedSearchActions = new ArrayList<>(); if (!isFirstLevel) speedSearchActions.add(new Separator(parentActionGroup.getTemplatePresentation().getText())); for (AnAction child : parentActionGroup.getChildren(null)) { - if (child instanceof ActionGroup) { - ActionGroup childGroup = (ActionGroup)child; + if (child instanceof ActionGroup childGroup) { if (childGroup instanceof HideableActionGroup) { childGroup = ((HideableActionGroup)childGroup).getDelegate(); } diff --git a/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java index b229506f1e52..4ba2cbab9a23 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java @@ -291,18 +291,16 @@ public abstract class AbstractTreeNode extends PresentableNodeDescriptor pointer) { // see #getValue && default implementation of TreeAnchorizer - SmartPsiElementPointer pointer = (SmartPsiElementPointer)value; return pointer.getVirtualFile(); } return null; @@ -321,8 +319,7 @@ public abstract class AbstractTreeNode extends PresentableNodeDescriptor { } public boolean equals(Object o) { - if (!(o instanceof LogicalPosition)) return false; - final LogicalPosition logicalPosition = (LogicalPosition) o; + if (!(o instanceof LogicalPosition logicalPosition)) return false; return column == logicalPosition.column && line == logicalPosition.line; } diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/VisualPosition.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/VisualPosition.java index aae192374d89..895d6efce541 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/VisualPosition.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/VisualPosition.java @@ -92,9 +92,7 @@ public class VisualPosition { @Override public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof VisualPosition)) return false; - - final VisualPosition that = (VisualPosition)o; + if (!(o instanceof VisualPosition that)) return false; if (column != that.column) return false; if (line != that.line) return false; diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java index e006b4414c0d..b55d89f93423 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java @@ -955,8 +955,7 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement } public boolean settingsEqual(Object other, @Nullable Predicate colorKeyFilter) { - if (!(other instanceof AbstractColorsScheme)) return false; - AbstractColorsScheme otherScheme = (AbstractColorsScheme)other; + if (!(other instanceof AbstractColorsScheme otherScheme)) return false; // parent is used only for default schemes (e.g. Darcula bundled in all ide (opposite to IDE-specific, like Cobalt)) if (getBaseDefaultScheme(this) != getBaseDefaultScheme(otherScheme)) { diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/FontPreferencesImpl.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/FontPreferencesImpl.java index 548c5ea08118..d205c08baeaa 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/FontPreferencesImpl.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/FontPreferencesImpl.java @@ -199,8 +199,7 @@ public class FontPreferencesImpl extends ModifiableFontPreferences { @Override public void copyTo(@NotNull final FontPreferences preferences) { - if (preferences instanceof ModifiableFontPreferences) { - ModifiableFontPreferences modifiablePreferences = (ModifiableFontPreferences)preferences; + if (preferences instanceof ModifiableFontPreferences modifiablePreferences) { modifiablePreferences.setEffectiveFontFamilies(myEffectiveFontFamilies); modifiablePreferences.setRealFontFamilies(myRealFontFamilies); modifiablePreferences.setTemplateFontSize(myTemplateFontSize); diff --git a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternOccurrenceImpl.java b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternOccurrenceImpl.java index 9b4b302c5457..8b613ceed1c7 100644 --- a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternOccurrenceImpl.java +++ b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternOccurrenceImpl.java @@ -56,10 +56,9 @@ class IndexPatternOccurrenceImpl implements IndexPatternOccurrence { } public boolean equals(Object obj){ - if(!(obj instanceof IndexPatternOccurrenceImpl)){ + if(!(obj instanceof IndexPatternOccurrenceImpl todoItem)){ return false; } - IndexPatternOccurrenceImpl todoItem=(IndexPatternOccurrenceImpl)obj; return myFile.equals(todoItem.myFile) && myStartOffset == todoItem.myStartOffset && myEndOffset == todoItem.myEndOffset && diff --git a/platform/execution-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java b/platform/execution-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java index 66267dae5072..08c1233c2d61 100644 --- a/platform/execution-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java +++ b/platform/execution-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java @@ -210,7 +210,7 @@ public final class ExecutionTargetManagerImpl extends ExecutionTargetManager imp boolean checkFallbackToDefault = isCompound && !target.equals(defaultTarget); return doWithEachNonCompoundWithSpecifiedTarget(configuration, (subConfiguration, executionTarget) -> { - if (!(subConfiguration instanceof TargetAwareRunProfile)) { + if (!(subConfiguration instanceof TargetAwareRunProfile targetAwareProfile)) { return true; } @@ -219,7 +219,6 @@ public final class ExecutionTargetManagerImpl extends ExecutionTargetManager imp return false; } - TargetAwareRunProfile targetAwareProfile = (TargetAwareRunProfile)subConfiguration; return target.canRun(subConfiguration) && targetAwareProfile.canRunOn(target) || (checkFallbackToDefault && defaultTarget.canRun(subConfiguration) && targetAwareProfile.canRunOn(defaultTarget)); }); diff --git a/platform/execution-impl/src/com/intellij/execution/ExecutorRegistryImpl.java b/platform/execution-impl/src/com/intellij/execution/ExecutorRegistryImpl.java index 9d8e375dcbab..38efb9ba629f 100644 --- a/platform/execution-impl/src/com/intellij/execution/ExecutorRegistryImpl.java +++ b/platform/execution-impl/src/com/intellij/execution/ExecutorRegistryImpl.java @@ -110,8 +110,7 @@ public final class ExecutorRegistryImpl extends ExecutorRegistry { AnAction toolbarAction; AnAction runContextAction; AnAction runNonExistingContextAction; - if (executor instanceof ExecutorGroup) { - ExecutorGroup executorGroup = (ExecutorGroup)executor; + if (executor instanceof ExecutorGroup executorGroup) { ActionGroup toolbarActionGroup = new SplitButtonAction(new ExecutorGroupActionGroup(executorGroup, ExecutorAction::new)); Presentation presentation = toolbarActionGroup.getTemplatePresentation(); presentation.setIcon(executor.getIcon()); @@ -152,9 +151,8 @@ public final class ExecutorRegistryImpl extends ExecutorRegistry { private synchronized void initRunToolbarExecutorActions(@NotNull Executor executor, @NotNull ActionManager actionManager) { if (ToolbarSettings.getInstance().isAvailable()) { RunToolbarProcess.getProcessesByExecutorId(executor.getId()).forEach(process -> { - if (executor instanceof ExecutorGroup) { + if (executor instanceof ExecutorGroup executorGroup) { - ExecutorGroup executorGroup = (ExecutorGroup)executor; if (process.getShowInBar()) { ActionGroup wrappedAction = new RunToolbarExecutorGroupAction( new RunToolbarExecutorGroup(executorGroup, (ex) -> new RunToolbarGroupProcessAction(process, ex), process)); @@ -551,8 +549,7 @@ public final class ExecutorRegistryImpl extends ExecutorRegistry { protected Icon getInformativeIcon(@NotNull Project project, @NotNull RunnerAndConfigurationSettings selectedConfiguration, @NotNull AnActionEvent e) { RunConfiguration configuration = selectedConfiguration.getConfiguration(); - if (configuration instanceof RunnerIconProvider) { - RunnerIconProvider provider = (RunnerIconProvider)configuration; + if (configuration instanceof RunnerIconProvider provider) { Icon icon = provider.getExecutorIcon(configuration, myExecutor); if (icon != null) { return icon; diff --git a/platform/execution-impl/src/com/intellij/execution/RunOnTargetComboBox.java b/platform/execution-impl/src/com/intellij/execution/RunOnTargetComboBox.java index d9501b6b5535..0f93f25ea4ff 100644 --- a/platform/execution-impl/src/com/intellij/execution/RunOnTargetComboBox.java +++ b/platform/execution-impl/src/com/intellij/execution/RunOnTargetComboBox.java @@ -110,8 +110,7 @@ public class RunOnTargetComboBox extends ComboBox { private void validateSelectedTarget() { Object selected = getSelectedItem(); boolean hasErrors = false; - if (selected instanceof SavedTarget) { - SavedTarget target = (SavedTarget)selected; + if (selected instanceof SavedTarget target) { target.revalidateConfiguration(); hasErrors = target.hasErrors(); } diff --git a/platform/execution-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java b/platform/execution-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java index 04d124cf0525..fd57bd3fb57d 100644 --- a/platform/execution-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java +++ b/platform/execution-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java @@ -759,8 +759,7 @@ public final class ChooseRunConfigurationPopup implements ExecutorProvider { if (super.shouldBeShowing(value)) { return true; } - if (value instanceof FolderWrapper && mySpeedSearch.isHoldingFilter()) { - FolderWrapper folderWrapper = (FolderWrapper)value; + if (value instanceof FolderWrapper folderWrapper && mySpeedSearch.isHoldingFilter()) { for (RunnerAndConfigurationSettings configuration : folderWrapper.myConfigurations) { if (mySpeedSearch.shouldBeShowing(configuration.getName() + configuration.getConfiguration().getPresentableType()) ) { return true; diff --git a/platform/execution-impl/src/com/intellij/execution/actions/ShowRunningListAction.java b/platform/execution-impl/src/com/intellij/execution/actions/ShowRunningListAction.java index 4c0d47705e9c..ae634c320240 100644 --- a/platform/execution-impl/src/com/intellij/execution/actions/ShowRunningListAction.java +++ b/platform/execution-impl/src/com/intellij/execution/actions/ShowRunningListAction.java @@ -92,8 +92,7 @@ final class ShowRunningListAction extends AnAction { builder.setClickHandler(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - if (e.getSource() instanceof MouseEvent) { - MouseEvent mouseEvent = (MouseEvent)e.getSource(); + if (e.getSource() instanceof MouseEvent mouseEvent) { Component component = mouseEvent.getComponent(); component = SwingUtilities.getDeepestComponentAt(component, mouseEvent.getX(), mouseEvent.getY()); Object value = ((JComponent)component).getClientProperty(KEY); diff --git a/platform/execution-impl/src/com/intellij/execution/actions/StopProcessAction.java b/platform/execution-impl/src/com/intellij/execution/actions/StopProcessAction.java index 61fb3f5ba9f2..4ef3acebc6fe 100644 --- a/platform/execution-impl/src/com/intellij/execution/actions/StopProcessAction.java +++ b/platform/execution-impl/src/com/intellij/execution/actions/StopProcessAction.java @@ -67,8 +67,7 @@ public class StopProcessAction extends DumbAwareAction { String description = templatePresentation.getDescription(); if (processHandler != null && !processHandler.isProcessTerminated()) { enable = true; - if (processHandler.isProcessTerminating() && processHandler instanceof KillableProcess) { - KillableProcess killableProcess = (KillableProcess) processHandler; + if (processHandler.isProcessTerminating() && processHandler instanceof KillableProcess killableProcess) { if (killableProcess.canKillProcess()) { // 'force quite' action presentation icon = AllIcons.Debugger.KillProcess; diff --git a/platform/execution-impl/src/com/intellij/execution/compound/CompoundRunConfigurationSettingsEditor.java b/platform/execution-impl/src/com/intellij/execution/compound/CompoundRunConfigurationSettingsEditor.java index d2ad120ab1ec..7bcccc5a68c3 100644 --- a/platform/execution-impl/src/com/intellij/execution/compound/CompoundRunConfigurationSettingsEditor.java +++ b/platform/execution-impl/src/com/intellij/execution/compound/CompoundRunConfigurationSettingsEditor.java @@ -52,9 +52,7 @@ public final class CompoundRunConfigurationSettingsEditor extends SettingsEditor if (candidate.getType() == root.getType() && candidate.getName().equals(root.getName())) return false; List> tasks = RunManagerImplKt.doGetBeforeRunTasks(candidate); for (BeforeRunTask task : tasks) { - if (task instanceof RunConfigurationBeforeRunProvider.RunConfigurableBeforeRunTask) { - RunConfigurationBeforeRunProvider.RunConfigurableBeforeRunTask runTask - = (RunConfigurationBeforeRunProvider.RunConfigurableBeforeRunTask)task; + if (task instanceof RunConfigurationBeforeRunProvider.RunConfigurableBeforeRunTask runTask) { RunnerAndConfigurationSettings settings = runTask.getSettings(); if (settings != null) { if (!canBeAdded(settings.getConfiguration(), root)) return false; diff --git a/platform/execution-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java b/platform/execution-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java index 889840d85444..5e2246e87994 100644 --- a/platform/execution-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java +++ b/platform/execution-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java @@ -208,21 +208,18 @@ public abstract class BaseExecuteBeforeRunDialog> ext for (Enumeration nodes = myRoot.depthFirstEnumeration(); nodes.hasMoreElements(); ) { final DefaultMutableTreeNode node = (DefaultMutableTreeNode)nodes.nextElement(); Object object = node.getUserObject(); - if (!(object instanceof Descriptor)) { + if (!(object instanceof Descriptor descriptor)) { continue; } - final Descriptor descriptor = (Descriptor)object; final boolean isChecked = descriptor.isChecked(); - if (descriptor instanceof ConfigurationTypeDescriptor) { - ConfigurationTypeDescriptor typeDesc = (ConfigurationTypeDescriptor)descriptor; + if (descriptor instanceof ConfigurationTypeDescriptor typeDesc) { for (ConfigurationFactory factory : typeDesc.getConfigurationType().getConfigurationFactories()) { RunnerAndConfigurationSettings settings = runManager.getConfigurationTemplate(factory); update(settings.getConfiguration(), isChecked, runManager); } } - else if (descriptor instanceof ConfigurationDescriptor) { - ConfigurationDescriptor configDesc = (ConfigurationDescriptor)descriptor; + else if (descriptor instanceof ConfigurationDescriptor configDesc) { update(configDesc.getConfiguration(), isChecked, runManager); } } @@ -401,15 +398,13 @@ public abstract class BaseExecuteBeforeRunDialog> ext myLabel.setText(configurationTypeDescriptor.getConfigurationType().getDisplayName()); myLabel.setIcon(configurationTypeDescriptor.getIcon()); } - else if (descriptor instanceof GroupConfigurationDescriptor) { - GroupConfigurationDescriptor groupConfigurationDescriptor = (GroupConfigurationDescriptor)descriptor; + else if (descriptor instanceof GroupConfigurationDescriptor groupConfigurationDescriptor) { myLabel.setIcon(groupConfigurationDescriptor.getIcon()); myLabel.setText(groupConfigurationDescriptor.getConfigurationType().getDisplayName()); myLabel.setFont(tree.getFont()); myCheckbox.setState(getStateFromChildren(node)); } - else if (descriptor instanceof ConfigurationDescriptor) { - ConfigurationDescriptor configurationTypeDescriptor = (ConfigurationDescriptor)descriptor; + else if (descriptor instanceof ConfigurationDescriptor configurationTypeDescriptor) { myLabel.setFont(tree.getFont()); myLabel.setText(configurationTypeDescriptor.getName()); myLabel.setIcon(null); diff --git a/platform/execution-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java b/platform/execution-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java index 6de04f20ae68..9b3061820bdb 100644 --- a/platform/execution-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java +++ b/platform/execution-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java @@ -336,8 +336,7 @@ public final class BeforeRunStepsPanel extends JPanel { @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - if (value instanceof BeforeRunTask) { - BeforeRunTask task = (BeforeRunTask)value; + if (value instanceof BeforeRunTask task) { //noinspection rawtypes BeforeRunTaskProvider provider = getProvider(myRunConfiguration.getProject(), task.getProviderId()); if (provider == null) { diff --git a/platform/execution-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java b/platform/execution-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java index a826b102ba79..e1b426ffcdc3 100644 --- a/platform/execution-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java +++ b/platform/execution-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java @@ -55,8 +55,7 @@ public class ConfigurationSettingsEditor extends CompositeSettingsEditor(); Disposer.register(this, myCompound); - if (myConfigurationEditor instanceof SettingsEditorGroup) { - SettingsEditorGroup group = (SettingsEditorGroup)myConfigurationEditor; + if (myConfigurationEditor instanceof SettingsEditorGroup group) { List>> editors = group.getEditors(); for (Pair<@TabTitle String, SettingsEditor> pair : editors) { myCompound.addEditor(pair.getFirst(), new ConfigToSettingsWrapper(pair.getSecond())); diff --git a/platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationTypeUsagesCollector.java b/platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationTypeUsagesCollector.java index c9110c60c66b..62ed0a8f5538 100644 --- a/platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationTypeUsagesCollector.java +++ b/platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationTypeUsagesCollector.java @@ -134,8 +134,7 @@ public final class RunConfigurationTypeUsagesCollector extends ProjectUsagesColl PluginInfo info = PluginInfoDetectorKt.getPluginInfo(runConfiguration.getClass()); if (!info.isSafeToReport()) return; Object state = ((RunConfigurationBase)runConfiguration).getState(); - if (state instanceof RunConfigurationOptions) { - RunConfigurationOptions runConfigurationOptions = (RunConfigurationOptions)state; + if (state instanceof RunConfigurationOptions runConfigurationOptions) { List> properties = runConfigurationOptions.__getProperties(); for (StoredProperty property : properties) { String name = property.getName(); diff --git a/platform/execution-impl/src/com/intellij/execution/runners/RunTab.java b/platform/execution-impl/src/com/intellij/execution/runners/RunTab.java index 7dd1bb91b47b..18049478ffff 100644 --- a/platform/execution-impl/src/com/intellij/execution/runners/RunTab.java +++ b/platform/execution-impl/src/com/intellij/execution/runners/RunTab.java @@ -137,8 +137,7 @@ public abstract class RunTab implements DataProvider, Disposable { protected final void initLogConsoles(@NotNull RunProfile runConfiguration, @NotNull RunContentDescriptor contentDescriptor, @Nullable ExecutionConsole console) { ProcessHandler processHandler = contentDescriptor.getProcessHandler(); - if (runConfiguration instanceof RunConfigurationBase) { - RunConfigurationBase configuration = (RunConfigurationBase)runConfiguration; + if (runConfiguration instanceof RunConfigurationBase configuration) { if (myManager == null) { myManager = new LogFilesManager(myProject, getLogConsoleManager(), contentDescriptor); } diff --git a/platform/execution-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java b/platform/execution-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java index dd9a516024b1..9a08624d3a10 100644 --- a/platform/execution-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java +++ b/platform/execution-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java @@ -272,8 +272,7 @@ final class ProjectStartupConfigurable implements SearchableConfigurable, Config }, false); final Set existing = new HashSet<>(myModel.getAllConfigurations()); for (ChooseRunConfigurationPopup.ItemWrapper setting : allSettings) { - if (setting.getValue() instanceof RunnerAndConfigurationSettings) { - final RunnerAndConfigurationSettings settings = (RunnerAndConfigurationSettings)setting.getValue(); + if (setting.getValue() instanceof RunnerAndConfigurationSettings settings) { if (!settings.isTemporary() && ProjectStartupRunner.canBeRun(settings) && !existing.contains(settings)) { wrappers.add(setting); } @@ -286,8 +285,7 @@ final class ProjectStartupConfigurable implements SearchableConfigurable, Config label.setText(value.getText()); })) .setItemChosenCallback((at) -> { - if (at.getValue() instanceof RunnerAndConfigurationSettings) { - final RunnerAndConfigurationSettings added = (RunnerAndConfigurationSettings)at.getValue(); + if (at.getValue() instanceof RunnerAndConfigurationSettings added) { addConfiguration(added); } else { diff --git a/platform/execution/src/com/intellij/execution/configurations/RunConfigurationBase.java b/platform/execution/src/com/intellij/execution/configurations/RunConfigurationBase.java index 21d95284ef1f..99c358f49b3f 100644 --- a/platform/execution/src/com/intellij/execution/configurations/RunConfigurationBase.java +++ b/platform/execution/src/com/intellij/execution/configurations/RunConfigurationBase.java @@ -276,8 +276,7 @@ public abstract class RunConfigurationBase extends UserDataHolderBase impleme //noinspection unchecked return (Class)result; } - else if (this instanceof PersistentStateComponent) { - PersistentStateComponent instance = (PersistentStateComponent)this; + else if (this instanceof PersistentStateComponent instance) { return ComponentSerializationUtil.getStateClass(instance.getClass()); } else { diff --git a/platform/execution/src/com/intellij/execution/rmi/RemoteProcessSupport.java b/platform/execution/src/com/intellij/execution/rmi/RemoteProcessSupport.java index 3541d975724f..d52d3fcb099d 100644 --- a/platform/execution/src/com/intellij/execution/rmi/RemoteProcessSupport.java +++ b/platform/execution/src/com/intellij/execution/rmi/RemoteProcessSupport.java @@ -187,8 +187,7 @@ public abstract class RemoteProcessSupport { } } RunningInfo info = ref.get(); - if (info instanceof FailedInfo) { - FailedInfo o = (FailedInfo)info; + if (info instanceof FailedInfo o) { String message = o.cause != null && StringUtil.isEmptyOrSpaces(o.stderr) ? o.cause.getMessage() : o.stderr; throw new ExecutionException(message, o.cause); } @@ -443,8 +442,7 @@ public abstract class RemoteProcessSupport { info = null; } } - if (info instanceof PendingInfo) { - PendingInfo pendingInfo = (PendingInfo)info; + if (info instanceof PendingInfo pendingInfo) { if (error != null || pendingInfo.stderr.length() > 0 || pendingInfo.ref.isNull()) { pendingInfo.ref.set(new FailedInfo(error, pendingInfo.stderr.toString())); } diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ContentRootData.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ContentRootData.java index c6323db63a4d..063beaddf323 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ContentRootData.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ContentRootData.java @@ -121,8 +121,7 @@ public final class ContentRootData extends AbstractExternalEntityData { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof SourceRoot)) return false; - SourceRoot root = (SourceRoot)o; + if (!(o instanceof SourceRoot root)) return false; if (packagePrefix != null ? !packagePrefix.equals(root.packagePrefix) : root.packagePrefix != null) return false; if (!path.equals(root.path)) return false; return true; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java index e8bf8fe74402..c9c44e24de6c 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java @@ -348,11 +348,9 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf @Override public boolean equals(Object o) { - if (!(o instanceof ModuleData)) return false; + if (!(o instanceof ModuleData that)) return false; if (!super.equals(o)) return false; - ModuleData that = (ModuleData)o; - if (!id.equals(that.id)) return false; if (!externalConfigPath.equals(that.externalConfigPath)) return false; if (group != null ? !group.equals(that.group) : that.group != null) return false; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/util/ExternalSystemApiUtil.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/util/ExternalSystemApiUtil.java index ef153c287fb2..212e15f4e1fd 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/util/ExternalSystemApiUtil.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/util/ExternalSystemApiUtil.java @@ -760,8 +760,7 @@ public final class ExternalSystemApiUtil { public static @NotNull FileChooserDescriptor getExternalProjectConfigDescriptor(@NotNull ProjectSystemId systemId) { ExternalSystemManager manager = getManager(systemId); - if (manager instanceof ExternalSystemUiAware) { - ExternalSystemUiAware uiAware = ((ExternalSystemUiAware)manager); + if (manager instanceof ExternalSystemUiAware uiAware) { FileChooserDescriptor descriptor = uiAware.getExternalProjectConfigDescriptor(); if (descriptor != null) { return descriptor; diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ExternalSystemRunConfigurationMenu.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ExternalSystemRunConfigurationMenu.java index bd95bd163a51..5f2987056f0a 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ExternalSystemRunConfigurationMenu.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ExternalSystemRunConfigurationMenu.java @@ -35,11 +35,10 @@ public final class ExternalSystemRunConfigurationMenu extends DefaultActionGroup Project project = e.getProject(); List selectedNodes = e.getData(ExternalSystemDataKeys.SELECTED_NODES); - if (selectedNodes == null || selectedNodes.size() != 1 || !(selectedNodes.get(0) instanceof RunConfigurationNode)) { + if (selectedNodes == null || selectedNodes.size() != 1 || !(selectedNodes.get(0) instanceof RunConfigurationNode runConfigurationNode)) { return; } - RunConfigurationNode runConfigurationNode = (RunConfigurationNode)selectedNodes.get(0); final RunnerAndConfigurationSettings settings = runConfigurationNode.getSettings(); if (settings == null || project == null) return; diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTask.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTask.java index 7037c3c95c07..7807a2b4dfca 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTask.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTask.java @@ -58,11 +58,9 @@ public class ExternalSystemBeforeRunTask extends BeforeRunTask result = new SmartList<>(); for (ExternalSystemTask task : myTasksDetails.values()) { - if (task instanceof AbstractExternalSystemTask) { - AbstractExternalSystemTask externalSystemTask = (AbstractExternalSystemTask)task; + if (task instanceof AbstractExternalSystemTask externalSystemTask) { if (externalSystemTask.getExternalSystemId().getId().equals(projectSystemId.getId()) && ArrayUtil.contains(externalSystemTask.getState(), taskStates)) { result.add(task); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/notification/ExternalSystemNotificationManager.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/notification/ExternalSystemNotificationManager.java index e3c1f09eccec..ec9d396fb3ad 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/notification/ExternalSystemNotificationManager.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/notification/ExternalSystemNotificationManager.java @@ -113,8 +113,7 @@ public final class ExternalSystemNotificationManager implements Disposable { Integer column = null; Throwable unwrapped = RemoteUtil.unwrap(error); - if (unwrapped instanceof LocationAwareExternalSystemException) { - LocationAwareExternalSystemException locationAwareExternalSystemException = (LocationAwareExternalSystemException)unwrapped; + if (unwrapped instanceof LocationAwareExternalSystemException locationAwareExternalSystemException) { filePath = locationAwareExternalSystemException.getFilePath(); line = locationAwareExternalSystemException.getLine(); column = locationAwareExternalSystemException.getColumn(); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/AbstractIdeModifiableModelsProvider.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/AbstractIdeModifiableModelsProvider.java index 7dd226b31d91..622dc55055bd 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/AbstractIdeModifiableModelsProvider.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/AbstractIdeModifiableModelsProvider.java @@ -496,8 +496,7 @@ public abstract class AbstractIdeModifiableModelsProvider extends IdeModelsProvi } } - if (!(orderEntry instanceof LibraryOrderEntry)) continue; - LibraryOrderEntry libraryOrderEntry = (LibraryOrderEntry)orderEntry; + if (!(orderEntry instanceof LibraryOrderEntry libraryOrderEntry)) continue; if (!libraryOrderEntry.isModuleLevel() && libraryOrderEntry.getLibraryName() != null) { String workspaceModule = toSubstitute.get(libraryOrderEntry.getLibraryName()); if (workspaceModule != null) { diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/IdeModelsProviderImpl.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/IdeModelsProviderImpl.java index 61c41859d897..4b6b72434596 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/IdeModelsProviderImpl.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/IdeModelsProviderImpl.java @@ -235,8 +235,7 @@ public class IdeModelsProviderImpl implements IdeModelsProvider { Map result = new HashMap<>(); for (OrderEntry entry : getOrderEntries(ownerIdeModule)) { - if (entry instanceof LibraryOrderEntry) { - LibraryOrderEntry libraryOrderEntry = (LibraryOrderEntry)entry; + if (entry instanceof LibraryOrderEntry libraryOrderEntry) { if (!libraryOrderEntry.isModuleLevel()) continue; final Set entryPaths = ContainerUtil.map2Set(((LibraryOrderEntry)entry).getRootUrls(OrderRootType.CLASSES), s -> PathUtil.getLocalPath(VfsUtilCore.urlToPath(s))); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/autoimport/FileChangeListenerBase.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/autoimport/FileChangeListenerBase.java index 78e2653146d1..198714c32203 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/autoimport/FileChangeListenerBase.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/autoimport/FileChangeListenerBase.java @@ -49,8 +49,7 @@ public abstract class FileChangeListenerBase implements BulkFileListener { deleteRecursively(each.getFile(), each); } } - else if (each instanceof VFileMoveEvent) { - VFileMoveEvent moveEvent = (VFileMoveEvent)each; + else if (each instanceof VFileMoveEvent moveEvent) { String newPath = moveEvent.getNewParent().getPath() + "/" + moveEvent.getFile().getName(); if (!isRelevant(newPath)) { deleteRecursively(moveEvent.getFile(), each); @@ -81,15 +80,13 @@ public abstract class FileChangeListenerBase implements BulkFileListener { for (VFileEvent each : events) { if (!isRelevant(each.getPath())) continue; - if (each instanceof VFileCreateEvent) { - VFileCreateEvent createEvent = (VFileCreateEvent)each; + if (each instanceof VFileCreateEvent createEvent) { VirtualFile newChild = createEvent.getParent().findChild(createEvent.getChildName()); if (newChild != null) { updateFile(newChild, each); } } - else if (each instanceof VFileCopyEvent) { - VFileCopyEvent copyEvent = (VFileCopyEvent)each; + else if (each instanceof VFileCopyEvent copyEvent) { VirtualFile newChild = copyEvent.getNewParent().findChild(copyEvent.getNewChildName()); if (newChild != null) { updateFile(newChild, each); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsManagerImpl.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsManagerImpl.java index 49d7c189165c..bcf9bdba6ace 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsManagerImpl.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsManagerImpl.java @@ -158,8 +158,7 @@ public class ExternalProjectsManagerImpl implements ExternalProjectsManager, Per assert getExternalProjectsView(externalProjectsView.getSystemId()) == null; myProjectsViews.add(externalProjectsView); - if (externalProjectsView instanceof ExternalProjectsViewImpl) { - ExternalProjectsViewImpl view = (ExternalProjectsViewImpl)externalProjectsView; + if (externalProjectsView instanceof ExternalProjectsViewImpl view) { view.loadState(myState.getExternalSystemsState().get(externalProjectsView.getSystemId().getId()).getProjectsViewState()); view.init(); } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemKeymapExtension.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemKeymapExtension.java index 07420270d03c..ea4bcd327b0a 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemKeymapExtension.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemKeymapExtension.java @@ -86,10 +86,9 @@ public final class ExternalSystemKeymapExtension implements KeymapExtension { for (String eachId : actionManager.getActionIdList(getActionPrefix(project, null))) { AnAction eachAction = actionManager.getAction(eachId); - if (!(eachAction instanceof MyExternalSystemAction)) continue; + if (!(eachAction instanceof MyExternalSystemAction taskAction)) continue; if (condition != null && !condition.value(actionManager.getActionOrStub(eachId))) continue; - MyExternalSystemAction taskAction = (MyExternalSystemAction)eachAction; projectToActionsMapping.putValue(taskAction.getSystemId(), eachId); } } @@ -172,8 +171,7 @@ public final class ExternalSystemKeymapExtension implements KeymapExtension { private static boolean isGroupFiltered(Condition condition, KeymapGroup keymapGroup) { final EmptyAction emptyAction = new EmptyAction(); - if (condition != null && !condition.value(emptyAction) && keymapGroup instanceof Group) { - final Group group = (Group)keymapGroup; + if (condition != null && !condition.value(emptyAction) && keymapGroup instanceof Group group) { return group.getSize() > 1 || condition.value(new EmptyAction(group.getName(), null, null)); } return true; @@ -338,9 +336,7 @@ public final class ExternalSystemKeymapExtension implements KeymapExtension { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ExternalSystemTaskAction)) return false; - - ExternalSystemTaskAction action = (ExternalSystemTaskAction)o; + if (!(o instanceof ExternalSystemTaskAction action)) return false; if (myId != null ? !myId.equals(action.myId) : action.myId != null) return false; if (myGroup != null ? !myGroup.equals(action.myGroup) : action.myGroup != null) return false; diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDataService.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDataService.java index c6e7d3bf8c24..26c02d6e8435 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDataService.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDataService.java @@ -182,8 +182,7 @@ public final class LibraryDataService extends AbstractProjectDataService orderEntryDataMap = new LinkedHashMap<>(); final List duplicatesToRemove = new ArrayList<>(); for (OrderEntry entry : modelsProvider.getOrderEntries(module)) { - if (entry instanceof ModuleOrderEntry) { - ModuleOrderEntry e = (ModuleOrderEntry)entry; + if (entry instanceof ModuleOrderEntry e) { Pair key = Pair.create(e.getModuleName(), e.getScope()); if (toRemove.containsKey(key)) { duplicatesToRemove.add(e); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java index 08b7bb172fe5..6da6a4cdfcdf 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java @@ -230,8 +230,7 @@ public final class ConfigureTasksActivationDialog extends DialogWrapper { private List findTasksUnder(SimpleNode @NotNull [] nodes) { List tasks = new SmartList<>(); for (SimpleNode node : nodes) { - if (node instanceof TaskNode) { - final TaskNode taskNode = (TaskNode)node; + if (node instanceof TaskNode taskNode) { final String taskName = taskNode.getName(); final PhaseNode phaseNode = (PhaseNode)taskNode.getParent(); tasks.add(new TaskActivationEntry(myProjectSystemId, phaseNode.myPhase, phaseNode.myProjectPath, taskName)); @@ -246,8 +245,7 @@ public final class ConfigureTasksActivationDialog extends DialogWrapper { private List findSelectedProjects() { List tasks = new ArrayList<>(); for (DefaultMutableTreeNode node : myTree.getSelectedNodes(DefaultMutableTreeNode.class, null)) { - if (node.getUserObject() instanceof ProjectNode) { - final ProjectNode projectNode = (ProjectNode)node.getUserObject(); + if (node.getUserObject() instanceof ProjectNode projectNode) { tasks.add(projectNode.myProjectPath); } } @@ -296,8 +294,7 @@ public final class ConfigureTasksActivationDialog extends DialogWrapper { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ProjectItem)) return false; - ProjectItem item = (ProjectItem)o; + if (!(o instanceof ProjectItem item)) return false; if (!myProjectSettings.equals(item.myProjectSettings)) return false; return true; } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksTree.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksTree.java index dc5ca800d6da..77c2cb3d99f8 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksTree.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksTree.java @@ -169,8 +169,7 @@ public class ExternalSystemTasksTree extends Tree implements Supplier child = root.getChildAt(i); ExternalSystemNodeDescriptor descriptor = child.getDescriptor(); Object element = descriptor.getElement(); - if (element instanceof ExternalProjectPojo) { - ExternalProjectPojo pojo = (ExternalProjectPojo)element; + if (element instanceof ExternalProjectPojo pojo) { if (pojo.getPath().equals(project.getPath())) { if (!pojo.getName().equals(project.getName())) { pojo.setName(project.getName()); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java index b1499feefdbe..88e80af167f0 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java @@ -153,9 +153,7 @@ public final class ExternalProjectDataSelectorDialog extends DialogWrapper { private void reloadTree() { final DefaultTreeModel treeModel = (DefaultTreeModel)myTree.getModel(); final Object root = treeModel.getRoot(); - if (!(root instanceof CheckedTreeNode)) return; - - final CheckedTreeNode rootNode = (CheckedTreeNode)root; + if (!(root instanceof CheckedTreeNode rootNode)) return; final Couple rootAndPreselectedNode = createRoot(); final CheckedTreeNode rootCopy = rootAndPreselectedNode.first; @@ -225,10 +223,9 @@ public final class ExternalProjectDataSelectorDialog extends DialogWrapper { @Override public void customizeRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { - if (!(value instanceof DataNodeCheckedTreeNode)) { + if (!(value instanceof DataNodeCheckedTreeNode node)) { return; } - final DataNodeCheckedTreeNode node = (DataNodeCheckedTreeNode)value; String tooltip = null; boolean hasErrors = false; @@ -357,8 +354,7 @@ public final class ExternalProjectDataSelectorDialog extends DialogWrapper { for (Map.Entry> groupingEntry : ideGroupingMap.entrySet()) { DataNode node = groupingEntry.getValue(); - if (!(node.getData() instanceof ModuleData)) continue; - ModuleData moduleData = (ModuleData)node.getData(); + if (!(node.getData() instanceof ModuleData moduleData)) continue; String ideParentGrouping = moduleData.getIdeParentGrouping(); DataNode structuralParent = ideParentGrouping != null ? ideGroupingMap.get(ideParentGrouping) : null; DataNodeCheckedTreeNode treeParentNode = structuralParent != null ? treeNodeMap.get(structuralParent) : null; diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectPathField.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectPathField.java index 145036704945..b7b7455f2444 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectPathField.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectPathField.java @@ -96,8 +96,7 @@ public class ExternalProjectPathField extends ComponentWithBrowseButton depNode = new MyDependenciesNode(externalProjectsView); for (DataNode dataNode : depsGraph) { - if (!(dataNode.getData() instanceof ProjectDependencies)) continue; + if (!(dataNode.getData() instanceof ProjectDependencies projectDependencies)) continue; - ProjectDependencies projectDependencies = (ProjectDependencies)dataNode.getData(); for (ComponentDependencies componentDependencies : projectDependencies.getComponentsDependencies()) { depNode.add(new DependencyScopeExternalSystemNode(externalProjectsView, componentDependencies.getCompileDependenciesGraph())); depNode.add(new DependencyScopeExternalSystemNode(externalProjectsView, componentDependencies.getRuntimeDependenciesGraph())); @@ -455,8 +454,7 @@ final class ExternalSystemViewDefaultContributor extends ExternalSystemViewContr @NotNull private static String getDependencySimpleName(@NotNull ExternalSystemNode node) { Object thatData = node.getData(); - if (thatData instanceof LibraryDependencyData) { - LibraryDependencyData dependencyData = (LibraryDependencyData)thatData; + if (thatData instanceof LibraryDependencyData dependencyData) { String externalName = dependencyData.getExternalName(); if (StringUtil.isEmpty(externalName)) { Set paths = dependencyData.getTarget().getPaths(LibraryPathType.BINARY); @@ -549,8 +547,7 @@ final class ExternalSystemViewDefaultContributor extends ExternalSystemViewContr @NotNull private static String getNodeDisplayName(@NotNull DataNode node) { Object data = node.getData(); - if (data instanceof LibraryDependencyData) { - LibraryDependencyData libraryDependencyData = (LibraryDependencyData)data; + if (data instanceof LibraryDependencyData libraryDependencyData) { String externalName = libraryDependencyData.getExternalName(); if (StringUtil.isEmpty(externalName)) { Set paths = libraryDependencyData.getTarget().getPaths(LibraryPathType.BINARY); diff --git a/platform/ide-core-impl/src/com/intellij/ide/impl/DataManagerImpl.java b/platform/ide-core-impl/src/com/intellij/ide/impl/DataManagerImpl.java index c8aa52890682..242f0e1f4105 100644 --- a/platform/ide-core-impl/src/com/intellij/ide/impl/DataManagerImpl.java +++ b/platform/ide-core-impl/src/com/intellij/ide/impl/DataManagerImpl.java @@ -278,8 +278,7 @@ public class DataManagerImpl extends DataManager { // Point inside JTabbedPane has special meaning. If point is inside tab bounds then // we construct DataContext by the component which corresponds to the (x, y) tab. - if (component instanceof JTabbedPane) { - JTabbedPane tabbedPane = (JTabbedPane)component; + if (component instanceof JTabbedPane tabbedPane) { int index = tabbedPane.getUI().tabForCoordinate(tabbedPane, x, y); return getDataContext(index != -1 ? tabbedPane.getComponentAt(index) : tabbedPane); } @@ -365,8 +364,7 @@ public class DataManagerImpl extends DataManager { } public static @Nullable Editor validateEditor(Editor editor, Component contextComponent) { - if (contextComponent instanceof JComponent) { - final JComponent jComponent = (JComponent)contextComponent; + if (contextComponent instanceof JComponent jComponent) { if (jComponent.getClientProperty(UIUtil.HIDE_EDITOR_FROM_DATA_CONTEXT_PROPERTY) != null) return null; } diff --git a/platform/ide-core/src/com/intellij/openapi/ui/ValidationInfo.java b/platform/ide-core/src/com/intellij/openapi/ui/ValidationInfo.java index d86365e81f86..084a606805b8 100644 --- a/platform/ide-core/src/com/intellij/openapi/ui/ValidationInfo.java +++ b/platform/ide-core/src/com/intellij/openapi/ui/ValidationInfo.java @@ -72,9 +72,8 @@ public final class ValidationInfo { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ValidationInfo)) return false; + if (!(o instanceof ValidationInfo that)) return false; - ValidationInfo that = (ValidationInfo)o; return StringUtil.equals(this.message, that.message) && this.component == that.component && this.okEnabled == that.okEnabled && diff --git a/platform/ide-core/src/com/intellij/ui/ComponentTreeWatcher.java b/platform/ide-core/src/com/intellij/ui/ComponentTreeWatcher.java index be04ab06e057..6433b0027990 100644 --- a/platform/ide-core/src/com/intellij/ui/ComponentTreeWatcher.java +++ b/platform/ide-core/src/com/intellij/ui/ComponentTreeWatcher.java @@ -49,8 +49,7 @@ public abstract class ComponentTreeWatcher { return; } - if (parentComponent instanceof Container && processChildren((Container)parentComponent)) { - Container container = (Container)parentComponent; + if (parentComponent instanceof Container container && processChildren((Container)parentComponent)) { for (int i = 0; i < container.getComponentCount(); i++) { register(container.getComponent(i)); } @@ -68,8 +67,7 @@ public abstract class ComponentTreeWatcher { private void unregister(Component component) { - if (component instanceof Container && processChildren((Container)component)) { - Container container = (Container)component; + if (component instanceof Container container && processChildren((Container)component)) { for (int i = 0; i < container.getComponentCount(); i++) { unregister(container.getComponent(i)); } diff --git a/platform/ide-core/src/com/intellij/ui/UserActivityWatcher.java b/platform/ide-core/src/com/intellij/ui/UserActivityWatcher.java index d1da4667c280..6ebb3f2b1a27 100644 --- a/platform/ide-core/src/com/intellij/ui/UserActivityWatcher.java +++ b/platform/ide-core/src/com/intellij/ui/UserActivityWatcher.java @@ -199,8 +199,7 @@ public class UserActivityWatcher extends ComponentTreeWatcher { } } - if (parentComponent instanceof JTable) { - JTable table = (JTable)parentComponent; + if (parentComponent instanceof JTable table) { table.addPropertyChangeListener("model", myTableListener); TableModel model = table.getModel(); if (model != null) { diff --git a/platform/ide-core/src/com/intellij/util/io/HttpRequests.java b/platform/ide-core/src/com/intellij/util/io/HttpRequests.java index 4cc51bea6e15..b705d19c2555 100644 --- a/platform/ide-core/src/com/intellij/util/io/HttpRequests.java +++ b/platform/ide-core/src/com/intellij/util/io/HttpRequests.java @@ -215,8 +215,7 @@ public final class HttpRequests { if (includeHeaders) { builder.append("\n, headers: ").append(connection.getHeaderFields()); } - if (connection instanceof HttpURLConnection) { - HttpURLConnection httpConnection = (HttpURLConnection)connection; + if (connection instanceof HttpURLConnection httpConnection) { builder.append("\n, response: ").append(httpConnection.getResponseCode()).append(' ').append(httpConnection.getResponseMessage()); } } @@ -598,7 +597,7 @@ public final class HttpRequests { checkRequestHeadersForNulBytes(connection); - if (!(connection instanceof HttpURLConnection)) { + if (!(connection instanceof HttpURLConnection httpURLConnection)) { return connection; } @@ -606,7 +605,6 @@ public final class HttpRequests { return connection; } - HttpURLConnection httpURLConnection = (HttpURLConnection)connection; String method = httpURLConnection.getRequestMethod(); LOG.assertTrue(method.equals("GET") || method.equals("HEAD") || method.equals("DELETE"), diff --git a/platform/indexing-api/src/com/intellij/lang/findUsages/DescriptiveNameUtil.java b/platform/indexing-api/src/com/intellij/lang/findUsages/DescriptiveNameUtil.java index 8f8a5b1d7b54..0f6108669cbf 100644 --- a/platform/indexing-api/src/com/intellij/lang/findUsages/DescriptiveNameUtil.java +++ b/platform/indexing-api/src/com/intellij/lang/findUsages/DescriptiveNameUtil.java @@ -22,8 +22,7 @@ public final class DescriptiveNameUtil { public static @NlsSafe String getDescriptiveName(@NotNull PsiElement psiElement) { PsiUtilCore.ensureValid(psiElement); - if (psiElement instanceof PsiMetaOwner) { - PsiMetaOwner psiMetaOwner = (PsiMetaOwner)psiElement; + if (psiElement instanceof PsiMetaOwner psiMetaOwner) { PsiMetaData metaData = psiMetaOwner.getMetaData(); if (metaData != null) return getMetaDataName(metaData); } diff --git a/platform/indexing-api/src/com/intellij/psi/search/PsiSearchRequest.java b/platform/indexing-api/src/com/intellij/psi/search/PsiSearchRequest.java index ff3674af3259..7023ff258319 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/PsiSearchRequest.java +++ b/platform/indexing-api/src/com/intellij/psi/search/PsiSearchRequest.java @@ -57,9 +57,7 @@ public class PsiSearchRequest { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PsiSearchRequest)) return false; - - PsiSearchRequest that = (PsiSearchRequest)o; + if (!(o instanceof PsiSearchRequest that)) return false; if (caseSensitive != that.caseSensitive) return false; if (searchContext != that.searchContext) return false; diff --git a/platform/indexing-api/src/com/intellij/psi/search/TodoAttributes.java b/platform/indexing-api/src/com/intellij/psi/search/TodoAttributes.java index 227f632480f0..a3d11e64ed26 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/TodoAttributes.java +++ b/platform/indexing-api/src/com/intellij/psi/search/TodoAttributes.java @@ -92,9 +92,7 @@ public final class TodoAttributes implements Cloneable { public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof TodoAttributes)) return false; - - final TodoAttributes attributes = (TodoAttributes)o; + if (!(o instanceof TodoAttributes attributes)) return false; return myIcon == attributes.myIcon && !(myTextAttributes != null ? !myTextAttributes.equals(attributes.myTextAttributes) : attributes.myTextAttributes != null) && diff --git a/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java b/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java index 6aae9eb596a3..c37afe52ac86 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java +++ b/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java @@ -90,12 +90,10 @@ public final class TodoPattern implements Cloneable { } public boolean equals(Object obj) { - if (!(obj instanceof TodoPattern)) { + if (!(obj instanceof TodoPattern pattern)) { return false; } - TodoPattern pattern = (TodoPattern)obj; - if (!indexPattern.equals(pattern.indexPattern)) { return false; } diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java index dde6cce66de1..c96f66c7d71c 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java +++ b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java @@ -29,9 +29,7 @@ public final class ReferenceDescriptor { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ReferenceDescriptor)) return false; - - ReferenceDescriptor that = (ReferenceDescriptor)o; + if (!(o instanceof ReferenceDescriptor that)) return false; if (offset != that.offset) return false; return file.equals(that.file); diff --git a/platform/indexing-api/src/com/intellij/util/xml/XmlFileHeader.java b/platform/indexing-api/src/com/intellij/util/xml/XmlFileHeader.java index cf8b495ec4f2..3286b087e3af 100644 --- a/platform/indexing-api/src/com/intellij/util/xml/XmlFileHeader.java +++ b/platform/indexing-api/src/com/intellij/util/xml/XmlFileHeader.java @@ -55,9 +55,7 @@ public class XmlFileHeader { public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof XmlFileHeader)) return false; - - final XmlFileHeader header = (XmlFileHeader)o; + if (!(o instanceof XmlFileHeader header)) return false; if (myPublicId != null ? !myPublicId.equals(header.myPublicId) : header.myPublicId != null) return false; if (myRootTagLocalName != null ? !myRootTagLocalName.equals(header.myRootTagLocalName) : header.myRootTagLocalName != null) diff --git a/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java b/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java index 004010022c77..2f2a96a396dd 100644 --- a/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java +++ b/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java @@ -149,10 +149,9 @@ public final class TodoFilter implements Cloneable { } public boolean equals(Object obj) { - if (!(obj instanceof TodoFilter)) { + if (!(obj instanceof TodoFilter filter)) { return false; } - TodoFilter filter = (TodoFilter)obj; if (!myName.equals(filter.myName)) { return false; diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/TodoItemImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/TodoItemImpl.java index e68cef6d5c3f..8b39385154dc 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/search/TodoItemImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/TodoItemImpl.java @@ -55,10 +55,9 @@ public class TodoItemImpl implements TodoItem { } public boolean equals(Object obj){ - if(!(obj instanceof TodoItemImpl)){ + if(!(obj instanceof TodoItemImpl todoItem)){ return false; } - TodoItemImpl todoItem=(TodoItemImpl)obj; return myFile.equals(todoItem.myFile) && myStartOffset == todoItem.myStartOffset && myEndOffset == todoItem.myEndOffset && diff --git a/platform/indexing-impl/src/com/intellij/psi/stubs/SerializedStubTree.java b/platform/indexing-impl/src/com/intellij/psi/stubs/SerializedStubTree.java index 913e82b7a593..5681573fc6ba 100644 --- a/platform/indexing-impl/src/com/intellij/psi/stubs/SerializedStubTree.java +++ b/platform/indexing-impl/src/com/intellij/psi/stubs/SerializedStubTree.java @@ -154,10 +154,9 @@ public final class SerializedStubTree { if (this == that) { return true; } - if (!(that instanceof SerializedStubTree)) { + if (!(that instanceof SerializedStubTree thatTree)) { return false; } - final SerializedStubTree thatTree = (SerializedStubTree)that; final int length = myTreeByteLength; if (length != thatTree.myTreeByteLength) { diff --git a/platform/indexing-impl/src/com/intellij/psi/stubs/StubIdList.java b/platform/indexing-impl/src/com/intellij/psi/stubs/StubIdList.java index ecd7bd0194a2..367e55f1afd8 100644 --- a/platform/indexing-impl/src/com/intellij/psi/stubs/StubIdList.java +++ b/platform/indexing-impl/src/com/intellij/psi/stubs/StubIdList.java @@ -47,8 +47,7 @@ public final class StubIdList { @Override public boolean equals(Object obj) { if (obj == this) return true; - if (!(obj instanceof StubIdList)) return false; - StubIdList other = (StubIdList)obj; + if (!(obj instanceof StubIdList other)) return false; if (myArray == null) { return other.myArray == null && other.myData == myData; } diff --git a/platform/indexing-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java b/platform/indexing-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java index 183434fa933a..a8d43b9f8403 100644 --- a/platform/indexing-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java +++ b/platform/indexing-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java @@ -358,9 +358,7 @@ public final class StubUpdatingIndex extends SingleEntryFileBasedIndexExtension< return new StubUpdatingForwardIndexAccessor(extension); } }, mySerializationManager); - if (index.getStorage() instanceof TransientChangesIndexStorage) { - final TransientChangesIndexStorage - memStorage = (TransientChangesIndexStorage)index.getStorage(); + if (index.getStorage() instanceof TransientChangesIndexStorage memStorage) { memStorage.addBufferingStateListener(new TransientChangesIndexStorage.BufferingStateListener() { @Override public void bufferingStateChanged(final boolean newState) { diff --git a/platform/indexing-impl/src/com/intellij/util/indexing/storage/MapReduceIndexBase.java b/platform/indexing-impl/src/com/intellij/util/indexing/storage/MapReduceIndexBase.java index 5a27033d3c37..973ddd6a8d9d 100644 --- a/platform/indexing-impl/src/com/intellij/util/indexing/storage/MapReduceIndexBase.java +++ b/platform/indexing-impl/src/com/intellij/util/indexing/storage/MapReduceIndexBase.java @@ -86,9 +86,8 @@ public abstract class MapReduceIndexBase extends MapReduc }); return result.get(); } - if (getForwardIndexAccessor() instanceof AbstractMapForwardIndexAccessor) { + if (getForwardIndexAccessor() instanceof AbstractMapForwardIndexAccessor forwardIndexAccessor) { ByteArraySequence serializedInputData = getForwardIndex().get(fileId); - AbstractMapForwardIndexAccessor forwardIndexAccessor = (AbstractMapForwardIndexAccessor)getForwardIndexAccessor(); return forwardIndexAccessor.convertToInputDataMap(fileId, serializedInputData); } getLogger().error("Can't fetch indexed data for index " + myIndexId.getName()); diff --git a/platform/inspect/src/com/intellij/inspectopedia/extractor/InspectopediaExtractor.java b/platform/inspect/src/com/intellij/inspectopedia/extractor/InspectopediaExtractor.java index 4d151cd8f838..31ed31325f6a 100644 --- a/platform/inspect/src/com/intellij/inspectopedia/extractor/InspectopediaExtractor.java +++ b/platform/inspect/src/com/intellij/inspectopedia/extractor/InspectopediaExtractor.java @@ -230,8 +230,7 @@ public class InspectopediaExtractor implements ApplicationStarter { result.children.add(new OptionsPanelInfo("ListItem", element.getClass().getName())); } } - else if (ofWhat instanceof JTable) { - final JTable table = (JTable)ofWhat; + else if (ofWhat instanceof JTable table) { result.children = new ArrayList<>(); for (int i = 0; i < table.getModel().getRowCount(); i++) { final StringBuilder sb = new StringBuilder(); diff --git a/platform/inspect/src/com/intellij/inspectopedia/extractor/data/Inspection.java b/platform/inspect/src/com/intellij/inspectopedia/extractor/data/Inspection.java index 1ef63484221f..24e2077744c1 100644 --- a/platform/inspect/src/com/intellij/inspectopedia/extractor/data/Inspection.java +++ b/platform/inspect/src/com/intellij/inspectopedia/extractor/data/Inspection.java @@ -120,8 +120,7 @@ public class Inspection implements Comparable { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof Inspection)) return false; - Inspection that = (Inspection)o; + if (!(o instanceof Inspection that)) return false; return appliesToDialects == that.appliesToDialects && isCleanup == that.isCleanup && isEnabledDefault == that.isEnabledDefault && diff --git a/platform/inspect/src/com/intellij/inspectopedia/extractor/utils/HtmlUtils.java b/platform/inspect/src/com/intellij/inspectopedia/extractor/utils/HtmlUtils.java index b6dc830f839f..b010a4d39d8b 100644 --- a/platform/inspect/src/com/intellij/inspectopedia/extractor/utils/HtmlUtils.java +++ b/platform/inspect/src/com/intellij/inspectopedia/extractor/utils/HtmlUtils.java @@ -129,11 +129,10 @@ public final class HtmlUtils { } private static boolean isBlockElement(@NotNull Node node) { - if (!(node instanceof Element)) + if (!(node instanceof Element element)) return false; - final Element element = (Element) node; - return element.tagName().equals("list") || + return element.tagName().equals("list") || (element.tagName().equals("code") && element.attr("style").equals("block")) || isBr(node); } diff --git a/platform/lang-api/src/com/intellij/codeInspection/ui/RegExInputVerifier.java b/platform/lang-api/src/com/intellij/codeInspection/ui/RegExInputVerifier.java index 79c5ebed3f7a..10c5b391cc5b 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/ui/RegExInputVerifier.java +++ b/platform/lang-api/src/com/intellij/codeInspection/ui/RegExInputVerifier.java @@ -27,8 +27,7 @@ public class RegExInputVerifier extends InputVerifier { @Override public boolean shouldYieldFocus(JComponent input) { - if (input instanceof JFormattedTextField) { - final JFormattedTextField ftf = (JFormattedTextField) input; + if (input instanceof JFormattedTextField ftf) { final JFormattedTextField.AbstractFormatter formatter = ftf.getFormatter(); if (formatter != null) { try { diff --git a/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java b/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java index 2ef2a41fd379..d2f21b5c4b15 100644 --- a/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java +++ b/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java @@ -159,8 +159,7 @@ public abstract class ProjectViewNode extends AbstractTreeNode im if (value instanceof VirtualFile) { return Collections.singleton((VirtualFile)value); } - if (value instanceof PsiFileSystemItem) { - PsiFileSystemItem item = (PsiFileSystemItem)value; + if (value instanceof PsiFileSystemItem item) { return getDefaultRootsFor(item.getVirtualFile()); } return Collections.emptySet(); diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/DisplayPrioritySortable.java b/platform/lang-api/src/com/intellij/psi/codeStyle/DisplayPrioritySortable.java index 46e0146f2764..e9895dc47631 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/DisplayPrioritySortable.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/DisplayPrioritySortable.java @@ -49,9 +49,8 @@ public interface DisplayPrioritySortable { */ static int compare(@NotNull T o1, @NotNull T o2, @NotNull Function nameExtractor) { if (o1 instanceof DisplayPrioritySortable) { - if (o2 instanceof DisplayPrioritySortable) { + if (o2 instanceof DisplayPrioritySortable d2) { DisplayPrioritySortable d1 = (DisplayPrioritySortable)o1; - DisplayPrioritySortable d2 = (DisplayPrioritySortable)o2; int result = (d1.getPriority()).compareTo(d2.getPriority()); if (result != 0) return result; result = -Integer.compare(d1.getWeight(), d2.getWeight()); diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/extractor/values/ClassSerializer.java b/platform/lang-api/src/com/intellij/psi/codeStyle/extractor/values/ClassSerializer.java index 61945198e82d..1b5a1d3416e0 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/extractor/values/ClassSerializer.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/extractor/values/ClassSerializer.java @@ -86,8 +86,7 @@ public class ClassSerializer { @Override public boolean equals(Object o) { - if (o instanceof ClassSerializer) { - ClassSerializer other = (ClassSerializer) o; + if (o instanceof ClassSerializer other) { return other.myInstance.equals(myInstance); } else { return false; diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/extractor/values/Value.java b/platform/lang-api/src/com/intellij/psi/codeStyle/extractor/values/Value.java index 22ae45ba703d..95cd4c0cf5e5 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/extractor/values/Value.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/extractor/values/Value.java @@ -229,8 +229,7 @@ public class Value { @Override public boolean equals(Object o) { - if (o instanceof Value) { - Value other = (Value) o; + if (o instanceof Value other) { return other.name.equals(name) && other.serializer.equals(serializer); } else { return false; diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java b/platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java index f69ffeff80e0..33545286c6ca 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java @@ -24,8 +24,7 @@ public class CodeStyleSettingPresentation { @Override public boolean equals(Object o) { - if (o instanceof SettingsGroup) { - SettingsGroup other = (SettingsGroup) o; + if (o instanceof SettingsGroup other) { return name != null && name.equals(other.name); } else { return false; diff --git a/platform/lang-core/src/com/intellij/openapi/module/ModuleType.java b/platform/lang-core/src/com/intellij/openapi/module/ModuleType.java index 29403402cabd..b39a7d68f33d 100644 --- a/platform/lang-core/src/com/intellij/openapi/module/ModuleType.java +++ b/platform/lang-core/src/com/intellij/openapi/module/ModuleType.java @@ -74,9 +74,7 @@ public abstract class ModuleType { public final boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ModuleType)) return false; - - final ModuleType moduleType = (ModuleType)o; + if (!(o instanceof ModuleType moduleType)) return false; return myId.equals(moduleType.myId); } diff --git a/platform/lang-core/src/com/intellij/openapi/projectRoots/SdkType.java b/platform/lang-core/src/com/intellij/openapi/projectRoots/SdkType.java index dc79fe9c889b..4f6587e21be5 100644 --- a/platform/lang-core/src/com/intellij/openapi/projectRoots/SdkType.java +++ b/platform/lang-core/src/com/intellij/openapi/projectRoots/SdkType.java @@ -181,9 +181,7 @@ public abstract class SdkType implements SdkTypeId { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof SdkType)) return false; - - SdkType sdkType = (SdkType)o; + if (!(o instanceof SdkType sdkType)) return false; if (!myName.equals(sdkType.myName)) return false; diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java index 132291c8158f..483ef713afde 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java @@ -240,8 +240,7 @@ public class CodeStyleMainPanel extends JPanel implements TabbedLanguageCodeStyl public void showTabOnCurrentPanel(String tab) { NewCodeStyleSettingsPanel selectedPanel = ensureCurrentPanel(); CodeStyleAbstractPanel settingsPanel = selectedPanel.getSelectedPanel(); - if (settingsPanel instanceof TabbedLanguageCodeStylePanel) { - TabbedLanguageCodeStylePanel tabbedPanel = (TabbedLanguageCodeStylePanel)settingsPanel; + if (settingsPanel instanceof TabbedLanguageCodeStylePanel tabbedPanel) { tabbedPanel.changeTab(tab); } } @@ -253,8 +252,7 @@ public class CodeStyleMainPanel extends JPanel implements TabbedLanguageCodeStyl panel.reset(myModel.getCloneSettings(scheme)); panel.setModel(myModel); CodeStyleAbstractPanel settingsPanel = panel.getSelectedPanel(); - if (settingsPanel instanceof TabbedLanguageCodeStylePanel) { - TabbedLanguageCodeStylePanel tabbedPanel = (TabbedLanguageCodeStylePanel)settingsPanel; + if (settingsPanel instanceof TabbedLanguageCodeStylePanel tabbedPanel) { tabbedPanel.setListener(this); String currentTab = myProperties.getValue(getSelectedTabPropertyName(tabbedPanel)); if (currentTab != null) { diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java index 94aa09dfba1d..90f8d0d8c61e 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java @@ -565,8 +565,7 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo public final ColumnInfo TITLE = new ColumnInfo("TITLE") { @Override public Object valueOf(Object o) { - if (o instanceof MyTreeNode) { - MyTreeNode node = (MyTreeNode)o; + if (o instanceof MyTreeNode node) { return node.getText(); } return o.toString(); @@ -584,8 +583,7 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo @Override public Object valueOf(Object o) { - if (o instanceof MyTreeNode) { - MyTreeNode node = (MyTreeNode)o; + if (o instanceof MyTreeNode node) { return node.getValue(); } @@ -844,16 +842,14 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo getPathForRow(row).getLastPathComponent(); myCurrentEditor = null; myCurrentNode = null; - if (defaultNode instanceof MyTreeNode) { - MyTreeNode node = (MyTreeNode)defaultNode; + if (defaultNode instanceof MyTreeNode node) { myCurrentNode = node; if (node.getKey() instanceof BooleanOption) { myCurrentEditor = myBooleanEditor; myBooleanEditor.setSelected(node.getValue() == Boolean.TRUE); myBooleanEditor.setEnabled(node.isEnabled()); } - else if (node.getKey() instanceof IntOption) { - IntOption intOption = (IntOption)node.getKey(); + else if (node.getKey() instanceof IntOption intOption) { myCurrentEditor = myIntOptionsEditor; myIntOptionsEditor.setCanBeEmpty(true); myIntOptionsEditor.setMinValue(intOption.getMinValue()); @@ -969,8 +965,7 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo boolean hasFocus) { SimpleTextAttributes attributes = SimpleTextAttributes.REGULAR_ATTRIBUTES; String text; - if (value instanceof MyTreeNode) { - MyTreeNode node = (MyTreeNode)value; + if (value instanceof MyTreeNode node) { if (node.getKey().groupName == null) { attributes = SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES; } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java index 59ad46c50298..5e9017a48c2e 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java @@ -260,8 +260,7 @@ public abstract class OptionTreeWithPreviewPanel extends CustomizableLanguageCod return; } Object o = treePath.getLastPathComponent(); - if (o instanceof MyToggleTreeNode) { - MyToggleTreeNode node = (MyToggleTreeNode)o; + if (o instanceof MyToggleTreeNode node) { if (!node.isEnabled()) return; node.setSelected(!node.isSelected()); int row = myOptionsTree.getRowForPath(treePath); @@ -431,8 +430,7 @@ public abstract class OptionTreeWithPreviewPanel extends CustomizableLanguageCod boolean leaf, int row, boolean hasFocus) { Color background = RenderingUtil.getBackground(tree, isSelected); Color foreground = RenderingUtil.getForeground(tree, isSelected); - if (value instanceof MyToggleTreeNode) { - MyToggleTreeNode treeNode = (MyToggleTreeNode)value; + if (value instanceof MyToggleTreeNode treeNode) { JToggleButton button = myCheckBox; button.setSelected(treeNode.isSelected); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java index b10a180dd7e1..db20041bf2a9 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java @@ -74,14 +74,12 @@ public class WrappingAndBracesPanel extends OptionTableWithPreviewPanel { for (CodeStyleSettingPresentation setting : entry.getValue()) { String fieldName = setting.getFieldName(); String uiName = setting.getUiName(); - if (setting instanceof CodeStyleBoundedIntegerSettingPresentation) { - CodeStyleBoundedIntegerSettingPresentation intSetting = (CodeStyleBoundedIntegerSettingPresentation)setting; + if (setting instanceof CodeStyleBoundedIntegerSettingPresentation intSetting) { int defaultValue = intSetting.getDefaultValue(); addOption(fieldName, uiName, group.name, intSetting.getLowerBound(), intSetting.getUpperBound(), defaultValue, getDefaultIntValueRenderer(fieldName)); } - else if (setting instanceof CodeStyleSelectSettingPresentation) { - CodeStyleSelectSettingPresentation selectSetting = (CodeStyleSelectSettingPresentation)setting; + else if (setting instanceof CodeStyleSelectSettingPresentation selectSetting) { addOption(fieldName, uiName, group.name, selectSetting.getOptions(), selectSetting.getValues()); } else if (setting instanceof CodeStyleSoftMarginsPresentation) { @@ -227,8 +225,7 @@ public class WrappingAndBracesPanel extends OptionTableWithPreviewPanel { } } else if ("BUILDER_METHODS".equals(optionName)) { - if (value instanceof String) { - String strValue = (String)value; + if (value instanceof String strValue) { String tooltipText = ApplicationBundle.message("settings.code.style.builder.methods.tooltip"); if (StringUtil.isEmptyOrSpaces(strValue)) { ColoredLabel hintLabel = new ColoredLabel(ApplicationBundle.message("settings.code.style.builder.method.names"), JBColor.gray); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingRulesControl.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingRulesControl.java index 8b60872bc9cc..874c099064c6 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingRulesControl.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingRulesControl.java @@ -116,8 +116,7 @@ public class ArrangementGroupingRulesControl extends JBTable { private static class MyRenderer implements TableCellRenderer { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - if (value instanceof ArrangementGroupingComponent) { - ArrangementGroupingComponent component = (ArrangementGroupingComponent)value; + if (value instanceof ArrangementGroupingComponent component) { component.setRowIndex(row + 1); component.setHighlight(TableHoverListener.getHoveredRow(table) == row || table.isRowSelected(row)); component.revalidate(); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java index 5186ad6c295b..b944956dd072 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java @@ -457,10 +457,9 @@ public class ArrangementMatchingRulesControl extends JBTable { ArrangementListRowDecorator component = myComponents.get(row); if (component == null) { - if (!(value instanceof StdArrangementMatchRule)) { + if (!(value instanceof StdArrangementMatchRule rule)) { return new JLabel(ApplicationBundle.message("arrangement.text.empty.rule")); } - StdArrangementMatchRule rule = (StdArrangementMatchRule)value; final boolean allowModifications = allowModifications(rule); ArrangementUiComponent ruleComponent = myFactory.getComponent(rule.getMatcher().getCondition(), rule, allowModifications); component = new ArrangementListRowDecorator(ruleComponent, ArrangementMatchingRulesControl.this); diff --git a/platform/lang-impl/src/com/intellij/build/BuildTreeConsoleView.java b/platform/lang-impl/src/com/intellij/build/BuildTreeConsoleView.java index 771936c82e61..f48d705b2161 100644 --- a/platform/lang-impl/src/com/intellij/build/BuildTreeConsoleView.java +++ b/platform/lang-impl/src/com/intellij/build/BuildTreeConsoleView.java @@ -601,8 +601,7 @@ public final class BuildTreeConsoleView implements ConsoleView, DataProvider, Bu String failureNodeName = getMessageTitle(message); Navigatable failureNavigatable = failure.getNavigatable(); FilePosition filePosition = null; - if (failureNavigatable instanceof OpenFileDescriptor) { - OpenFileDescriptor fileDescriptor = (OpenFileDescriptor)failureNavigatable; + if (failureNavigatable instanceof OpenFileDescriptor fileDescriptor) { File file = VfsUtilCore.virtualToIoFile(fileDescriptor.getFile()); filePosition = new FilePosition(file, fileDescriptor.getLine(), fileDescriptor.getColumn()); parentNode = createMessageParentNodes(eventTime, filePosition, failureNavigatable, parentNode); @@ -1179,10 +1178,9 @@ public final class BuildTreeConsoleView implements ConsoleView, DataProvider, Bu @Override protected Navigatable createDescriptorForNode(@NotNull DefaultMutableTreeNode node) { Object userObject = node.getUserObject(); - if (!(userObject instanceof ExecutionNode)) { + if (!(userObject instanceof ExecutionNode executionNode)) { return null; } - final ExecutionNode executionNode = (ExecutionNode)userObject; if (node.getChildCount() != 0 || !executionNode.hasWarnings() && !executionNode.isFailed()) { return null; } @@ -1363,8 +1361,7 @@ public final class BuildTreeConsoleView implements ConsoleView, DataProvider, Bu private boolean maybeExpand(TreePath path) { if (myTree == null || path == null) return false; Object last = path.getLastPathComponent(); - if (last instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode mutableTreeNode = (DefaultMutableTreeNode)last; + if (last instanceof DefaultMutableTreeNode mutableTreeNode) { boolean expanded = false; Enumeration children = mutableTreeNode.children(); if (children.hasMoreElements()) { diff --git a/platform/lang-impl/src/com/intellij/build/DefaultBuildDescriptor.java b/platform/lang-impl/src/com/intellij/build/DefaultBuildDescriptor.java index 6616f0f8dca6..d11a22445be3 100644 --- a/platform/lang-impl/src/com/intellij/build/DefaultBuildDescriptor.java +++ b/platform/lang-impl/src/com/intellij/build/DefaultBuildDescriptor.java @@ -84,8 +84,7 @@ public class DefaultBuildDescriptor implements BuildDescriptor { public DefaultBuildDescriptor(@NotNull BuildDescriptor descriptor) { this(descriptor.getId(), descriptor.getGroupId(), descriptor.getTitle(), descriptor.getWorkingDir(), descriptor.getStartTime()); - if (descriptor instanceof DefaultBuildDescriptor) { - DefaultBuildDescriptor defaultBuildDescriptor = (DefaultBuildDescriptor)descriptor; + if (descriptor instanceof DefaultBuildDescriptor defaultBuildDescriptor) { myActivateToolWindowWhenAdded = defaultBuildDescriptor.myActivateToolWindowWhenAdded; myActivateToolWindowWhenFailed = defaultBuildDescriptor.myActivateToolWindowWhenFailed; myAutoFocusContent = defaultBuildDescriptor.myAutoFocusContent; diff --git a/platform/lang-impl/src/com/intellij/build/MultipleBuildsView.java b/platform/lang-impl/src/com/intellij/build/MultipleBuildsView.java index 4fa2503172cc..07efb77421be 100644 --- a/platform/lang-impl/src/com/intellij/build/MultipleBuildsView.java +++ b/platform/lang-impl/src/com/intellij/build/MultipleBuildsView.java @@ -130,8 +130,7 @@ public class MultipleBuildsView implements BuildProgressListener, Disposable { public void onEvent(@NotNull Object buildId, @NotNull BuildEvent event) { List runOnEdt = new SmartList<>(); AbstractViewManager.BuildInfo buildInfo; - if (event instanceof StartBuildEvent) { - StartBuildEvent startBuildEvent = (StartBuildEvent)event; + if (event instanceof StartBuildEvent startBuildEvent) { if (isInitializeStarted.get()) { clearOldBuilds(runOnEdt, startBuildEvent); } diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java index 41823eb68587..f6a38d0f6650 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java @@ -59,10 +59,9 @@ final class PageSizes { public static String getName(Object item) { init(); - if(!(item instanceof PageSize)) { + if(!(item instanceof PageSize pageSize)) { return null; } - PageSize pageSize = (PageSize)item; return pageSize.name; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/onSave/FormatOnSaveActionInfoBase.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/onSave/FormatOnSaveActionInfoBase.java index 727d4625c014..df6cfd8e1449 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/onSave/FormatOnSaveActionInfoBase.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/onSave/FormatOnSaveActionInfoBase.java @@ -206,9 +206,8 @@ public abstract class FormatOnSaveActionInfoBase events) { boolean isDaemonShouldBeStopped = false; for (VFileEvent event : events) { - if (event instanceof VFilePropertyChangeEvent) { - VFilePropertyChangeEvent e = (VFilePropertyChangeEvent)event; + if (event instanceof VFilePropertyChangeEvent e) { String propertyName = e.getPropertyName(); if (VirtualFile.PROP_NAME.equals(propertyName)) { fileRenamed(e); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipRendererProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipRendererProvider.java index 5dd731a17137..57e02e40e0a4 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipRendererProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipRendererProvider.java @@ -38,8 +38,7 @@ public class DaemonTooltipRendererProvider implements ErrorStripTooltipRendererP for (RangeHighlighter marker : highlighters) { Object tooltipObject = marker.getErrorStripeTooltip(); if (tooltipObject == null) continue; - if (tooltipObject instanceof HighlightInfo) { - HighlightInfo info = (HighlightInfo)tooltipObject; + if (tooltipObject instanceof HighlightInfo info) { if (info.getToolTip() != null && tooltips.add(info.getToolTip())) { infos.add(info); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ErrorStripeUpdateManager.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ErrorStripeUpdateManager.java index dc9231f21cb7..991bd85712e5 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ErrorStripeUpdateManager.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ErrorStripeUpdateManager.java @@ -64,8 +64,7 @@ public final class ErrorStripeUpdateManager implements Disposable { return; } ErrorStripeRenderer renderer = editorMarkupModel.getErrorStripeRenderer(); - if (renderer instanceof TrafficLightRenderer) { - TrafficLightRenderer tlr = (TrafficLightRenderer) renderer; + if (renderer instanceof TrafficLightRenderer tlr) { EditorMarkupModelImpl markupModelImpl = (EditorMarkupModelImpl) editorMarkupModel; tlr.refresh(markupModelImpl); markupModelImpl.repaintTrafficLightIcon(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InspectionRunner.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InspectionRunner.java index c7707d6d4c19..f97def2736c7 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InspectionRunner.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InspectionRunner.java @@ -228,10 +228,9 @@ class InspectionRunner { InspectionToolWrapper toolWrapper = inspectionProfile.getInspectionTool(RedundantSuppressInspectionBase.SHORT_NAME, myPsiFile); Language fileLanguage = myPsiFile.getLanguage(); InspectionSuppressor suppressor = LanguageInspectionSuppressors.INSTANCE.forLanguage(fileLanguage); - if (!(suppressor instanceof RedundantSuppressionDetector)) { + if (!(suppressor instanceof RedundantSuppressionDetector redundantSuppressionDetector)) { return; } - RedundantSuppressionDetector redundantSuppressionDetector = (RedundantSuppressionDetector)suppressor; Set activeTools = new HashSet<>(); for (LocalInspectionToolWrapper tool : toolWrappers) { if (tool.runForWholeFile()) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java index 0acd8b29cae8..ffd865642100 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java @@ -132,8 +132,7 @@ public final class LineMarkersPass extends TextEditorHighlightingPass { for (int i = markers.size() - 1; i >= 0; i--) { LineMarkerInfo marker = markers.get(i); - if (marker instanceof MergeableLineMarkerInfo) { - MergeableLineMarkerInfo mergeable = (MergeableLineMarkerInfo)marker; + if (marker instanceof MergeableLineMarkerInfo mergeable) { markers.remove(i); int line = document.getLineNumber(marker.startOffset); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java index f7315950614d..a3241f57e58a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java @@ -119,14 +119,12 @@ final class PassExecutorService implements Disposable { AtomicInteger threadsToStartCountdown = new AtomicInteger(0); for (HighlightingPass pass : passes) { - if (pass instanceof EditorBoundHighlightingPass) { - EditorBoundHighlightingPass editorPass = (EditorBoundHighlightingPass)pass; + if (pass instanceof EditorBoundHighlightingPass editorPass) { // have to make ids unique for this document assignUniqueId(editorPass, id2Pass); editorBoundPasses.add(editorPass); } - else if (pass instanceof TextEditorHighlightingPass) { - TextEditorHighlightingPass tePass = (TextEditorHighlightingPass)pass; + else if (pass instanceof TextEditorHighlightingPass tePass) { assignUniqueId(tePass, id2Pass); documentBoundPasses.add(tePass); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java index c7be201e61e8..cd972b95cf79 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java @@ -1414,9 +1414,8 @@ public class DocumentationManager extends DockablePopupManager generateComment(pair.first, editor, docProvider, commenter, project); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java index b24917c4d6df..ae1029e69d6f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java @@ -392,8 +392,7 @@ public class JoinLinesHandler extends EditorActionHandler.ForEachCaret { private static boolean tryConvertEndOfLineComment(PsiElement commentElement) { Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(commentElement.getLanguage()); - if (commenter instanceof CodeDocumentationAwareCommenter) { - CodeDocumentationAwareCommenter docCommenter = (CodeDocumentationAwareCommenter) commenter; + if (commenter instanceof CodeDocumentationAwareCommenter docCommenter) { String lineCommentPrefix = commenter.getLineCommentPrefix(); String blockCommentPrefix = commenter.getBlockCommentPrefix(); String blockCommentSuffix = commenter.getBlockCommentSuffix(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java index a878c66aadc6..821d5261e41a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java @@ -216,8 +216,7 @@ public class SelectWordHandler extends EditorActionHandler.ForEachCaret { private static boolean isLanguageExtension(@NotNull final PsiFile file, @NotNull final PsiElement elementAt) { final Language elementLanguage = elementAt.getLanguage(); - if (file.getLanguage() instanceof CompositeLanguage) { - CompositeLanguage compositeLanguage = (CompositeLanguage) file.getLanguage(); + if (file.getLanguage() instanceof CompositeLanguage compositeLanguage) { final Language[] extensions = compositeLanguage.getLanguageExtensionsForFile(file); return ArrayUtil.contains(elementLanguage, extensions); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/PsiNamesElementSignatureProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/PsiNamesElementSignatureProvider.java index 512fe3131036..769eaa5849c6 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/PsiNamesElementSignatureProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/PsiNamesElementSignatureProvider.java @@ -170,8 +170,7 @@ public class PsiNamesElementSignatureProvider extends AbstractElementSignaturePr */ @Nullable private static StringBuilder getSignature(@NotNull PsiElement element, @Nullable StringBuilder buffer) { - if (element instanceof PsiNamedElement) { - PsiNamedElement named = (PsiNamedElement)element; + if (element instanceof PsiNamedElement named) { final String name = named.getName(); if (StringUtil.isEmpty(name)) { return null; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java index 16d46e6dcee2..941a9dd5bb3b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java @@ -72,8 +72,7 @@ public final class CommentByBlockCommentHandler extends MultiCaretCodeInsightAct final String prefix; final String suffix; - if (commenter instanceof SelfManagingCommenter) { - final SelfManagingCommenter selfManagingCommenter = (SelfManagingCommenter)commenter; + if (commenter instanceof SelfManagingCommenter selfManagingCommenter) { mySelfManagedCommenterData = selfManagingCommenter.createBlockCommentingState( caret.getSelectionStart(), caret.getSelectionEnd(), @@ -269,8 +268,7 @@ public final class CommentByBlockCommentHandler extends MultiCaretCodeInsightAct return commentedRange.shiftRight(myCaret.getSelectionStart()); } - if (commenter instanceof SelfManagingCommenter) { - SelfManagingCommenter selfManagingCommenter = (SelfManagingCommenter)commenter; + if (commenter instanceof SelfManagingCommenter selfManagingCommenter) { prefix = selfManagingCommenter.getBlockCommentPrefix( myCaret.getSelectionStart(), @@ -457,8 +455,7 @@ public final class CommentByBlockCommentHandler extends MultiCaretCodeInsightAct } private boolean breaksExistingComment(int offset, boolean includingAfterLineComment) { - if (!(myCommenter instanceof CodeDocumentationAwareCommenter) || offset == 0) return false; - CodeDocumentationAwareCommenter commenter = (CodeDocumentationAwareCommenter)myCommenter; + if (!(myCommenter instanceof CodeDocumentationAwareCommenter commenter) || offset == 0) return false; HighlighterIterator it = myEditor.getHighlighter().createIterator(offset - 1); IElementType tokenType = it.getTokenType(); return (tokenType != null && (it.getEnd() > offset && (tokenType == commenter.getLineCommentTokenType() || @@ -520,8 +517,7 @@ public final class CommentByBlockCommentHandler extends MultiCaretCodeInsightAct String commentPrefix, String commentSuffix, Commenter commenter) { - if (commenter instanceof SelfManagingCommenter) { - final SelfManagingCommenter selfManagingCommenter = (SelfManagingCommenter)commenter; + if (commenter instanceof SelfManagingCommenter selfManagingCommenter) { return selfManagingCommenter.insertBlockComment( startOffset, endOffset, @@ -754,8 +750,7 @@ public final class CommentByBlockCommentHandler extends MultiCaretCodeInsightAct } public void uncommentRange(TextRange range, String commentPrefix, String commentSuffix, Commenter commenter) { - if (commenter instanceof SelfManagingCommenter) { - final SelfManagingCommenter selfManagingCommenter = (SelfManagingCommenter)commenter; + if (commenter instanceof SelfManagingCommenter selfManagingCommenter) { selfManagingCommenter.uncommentBlockComment( range.getStartOffset(), range.getEndOffset(), @@ -771,12 +766,11 @@ public final class CommentByBlockCommentHandler extends MultiCaretCodeInsightAct List> ranges = new ArrayList<>(); - if (commenter instanceof CustomUncommenter) { + if (commenter instanceof CustomUncommenter customUncommenter) { /* In case of custom uncommenter, we need to ask it for list of [commentOpen-start,commentOpen-end], [commentClose-start,commentClose-end] and shift if according to current offset */ - CustomUncommenter customUncommenter = (CustomUncommenter)commenter; for (Couple coupleFromCommenter : customUncommenter.getCommentRangesToDelete(text)) { TextRange openComment = coupleFromCommenter.first.shiftRight(startOffset); TextRange closeComment = coupleFromCommenter.second.shiftRight(startOffset); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java index f527c9093b46..e9305130d96b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java @@ -188,8 +188,7 @@ public final class CommentByLineCommentHandler extends MultiCaretCodeInsightActi break; } - if (commenter instanceof SelfManagingCommenter && block.commenterStateMap.get(commenter) == null) { - final SelfManagingCommenter selfManagingCommenter = (SelfManagingCommenter)commenter; + if (commenter instanceof SelfManagingCommenter selfManagingCommenter && block.commenterStateMap.get(commenter) == null) { CommenterDataHolder state = selfManagingCommenter.createLineCommentingState(startLine, endLine, document, psiFile); if (state == null) state = SelfManagingCommenter.EMPTY_STATE; block.commenterStateMap.put(selfManagingCommenter, state); @@ -353,8 +352,7 @@ public final class CommentByLineCommentHandler extends MultiCaretCodeInsightActi CharSequence chars = document.getCharsSequence(); lineStart = CharArrayUtil.shiftForward(chars, lineStart, " \t"); - if (commenter instanceof SelfManagingCommenter) { - final SelfManagingCommenter selfManagingCommenter = (SelfManagingCommenter)commenter; + if (commenter instanceof SelfManagingCommenter selfManagingCommenter) { commented = selfManagingCommenter.isLineCommented(line, lineStart, document, block.commenterStateMap.get(selfManagingCommenter)); } else { @@ -526,8 +524,7 @@ public final class CommentByLineCommentHandler extends MultiCaretCodeInsightActi return; } - if (commenter instanceof SelfManagingCommenter) { - SelfManagingCommenter selfManagingCommenter = (SelfManagingCommenter)commenter; + if (commenter instanceof SelfManagingCommenter selfManagingCommenter) { selfManagingCommenter.uncommentLine(line, startOffset, document, block.commenterStateMap.get(selfManagingCommenter)); return; } @@ -559,8 +556,7 @@ public final class CommentByLineCommentHandler extends MultiCaretCodeInsightActi if (removeLineSpace) prefix += ' '; CharSequence chars = document.getCharsSequence(); - if (commenter instanceof CommenterWithLineSuffix) { - CommenterWithLineSuffix commenterWithLineSuffix = (CommenterWithLineSuffix)commenter; + if (commenter instanceof CommenterWithLineSuffix commenterWithLineSuffix) { String suffix = commenterWithLineSuffix.getLineCommentSuffix(); @@ -633,8 +629,7 @@ public final class CommentByLineCommentHandler extends MultiCaretCodeInsightActi Document document = block.editor.getDocument(); if (commenter == null) commenter = findCommenter(block.editor, block.psiFile, line); if (commenter == null) return; - if (commenter instanceof SelfManagingCommenter) { - final SelfManagingCommenter selfManagingCommenter = (SelfManagingCommenter)commenter; + if (commenter instanceof SelfManagingCommenter selfManagingCommenter) { selfManagingCommenter.commentLine(line, offset, document, block.commenterStateMap.get(selfManagingCommenter)); return; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesHandler.java index 061fdf7c06cd..960759420da9 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesHandler.java @@ -243,8 +243,7 @@ public class HighlightUsagesHandler extends HighlightHandlerBase { public static Pair getNameIdentifierRangeInCurrentRoot(@NotNull PsiFile file, @NotNull PsiElement element) { if (element instanceof PomTargetPsiElement) { final PomTarget target = ((PomTargetPsiElement)element).getTarget(); - if (target instanceof PsiDeclaredTarget) { - final PsiDeclaredTarget declaredTarget = (PsiDeclaredTarget)target; + if (target instanceof PsiDeclaredTarget declaredTarget) { final TextRange range = declaredTarget.getNameIdentifierRange(); if (range != null) { if (range.getStartOffset() < 0 || range.getLength() <= 0) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLinkHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLinkHandler.java index fd1873dcb87f..28242aec24b2 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLinkHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLinkHandler.java @@ -20,8 +20,7 @@ public final class ElementLinkHandler extends TooltipLinkHandler { Project project = editor.getProject(); if (project != null) { PsiElement element = qualifiedNameToElement(name, project); - if (element instanceof Navigatable) { - Navigatable navigatable = (Navigatable)element; + if (element instanceof Navigatable navigatable) { if (navigatable.canNavigate()) { navigatable.navigate(true); return true; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoControllerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoControllerBase.java index b1ca20034da3..74125e63eb22 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoControllerBase.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoControllerBase.java @@ -245,8 +245,7 @@ public abstract class ParameterInfoControllerBase extends UserDataHolderBase imp protected abstract void moveToParameterAtOffset(int offset); protected int getPrevOrNextParameterOffset(boolean isNext) { - if (!(myParameterInfoControllerData.getHandler() instanceof ParameterInfoHandlerWithTabActionSupport)) return -1; - ParameterInfoHandlerWithTabActionSupport handler = (ParameterInfoHandlerWithTabActionSupport)myParameterInfoControllerData.getHandler(); + if (!(myParameterInfoControllerData.getHandler() instanceof ParameterInfoHandlerWithTabActionSupport handler)) return -1; IElementType delimiter = handler.getActualParameterDelimiterType(); boolean noDelimiter = delimiter == TokenType.WHITE_SPACE; @@ -318,8 +317,7 @@ public abstract class ParameterInfoControllerBase extends UserDataHolderBase imp ParameterInfoHandler[] handlers = ShowParameterInfoHandler.getHandlers(file.getProject(), PsiUtilCore.getLanguageAtOffset(file, offset), file.getViewProvider().getBaseLanguage()); for (ParameterInfoHandler handler : handlers) { - if (handler instanceof ParameterInfoHandlerWithTabActionSupport) { - final ParameterInfoHandlerWithTabActionSupport parameterInfoHandler2 = (ParameterInfoHandlerWithTabActionSupport)handler; + if (handler instanceof ParameterInfoHandlerWithTabActionSupport parameterInfoHandler2) { // please don't remove typecast in the following line; it's required to compile the code under old JDK 6 versions final E e = ParameterInfoUtils.findArgumentList(file, offset, lbraceOffset, parameterInfoHandler2); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/PsiImplementationViewSession.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/PsiImplementationViewSession.java index c7d76da66893..efff760b1b82 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/PsiImplementationViewSession.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/PsiImplementationViewSession.java @@ -243,8 +243,7 @@ public class PsiImplementationViewSession implements ImplementationViewSession { text = SymbolPresentationUtil.getSymbolPresentableText(element); } - if (impls.length == 0 && ref instanceof PsiPolyVariantReference) { - final PsiPolyVariantReference polyReference = (PsiPolyVariantReference)ref; + if (impls.length == 0 && ref instanceof PsiPolyVariantReference polyReference) { PsiElement refElement = polyReference.getElement(); TextRange rangeInElement = polyReference.getRangeInElement(); String refElementText = refElement.getText(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hints/MethodInfoExcludeListFilter.java b/platform/lang-impl/src/com/intellij/codeInsight/hints/MethodInfoExcludeListFilter.java index 231035df1edd..a2d8379bda1c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hints/MethodInfoExcludeListFilter.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/MethodInfoExcludeListFilter.java @@ -35,8 +35,7 @@ public class MethodInfoExcludeListFilter implements HintInfoFilter { @Override public boolean showHint(@NotNull HintInfo info) { - if (info instanceof HintInfo.MethodInfo) { - HintInfo.MethodInfo methodInfo = (HintInfo.MethodInfo)info; + if (info instanceof HintInfo.MethodInfo methodInfo) { return !ContainerUtil.exists(myMatchers, (e) -> e.isMatching(methodInfo.getFullyQualifiedName(), methodInfo.getParamNames())); } return false; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java index ec818b9a72a3..f01d457d1e37 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java @@ -165,8 +165,7 @@ public class IntentionActionWithTextCaching implements Comparable matchers = FileTypeManager.getInstance().getAssociations(fileType); for (final FileNameMatcher matcher : matchers) { - if (matcher instanceof ExactFileNameMatcher) { - final ExactFileNameMatcher exactFileNameMatcher = (ExactFileNameMatcher)matcher; + if (matcher instanceof ExactFileNameMatcher exactFileNameMatcher) { final String fileName = StringUtil.trimStart(exactFileNameMatcher.getFileName(), "."); String resourcePath = getResourceLocation(prefix + "." + fileName + suffix); URL resource = myLoader.getResource(resourcePath); if (resource != null) urls.add(new ResourceTextDescriptor(myLoader, resourcePath)); } - else if (matcher instanceof ExtensionFileNameMatcher) { - final ExtensionFileNameMatcher extensionFileNameMatcher = (ExtensionFileNameMatcher)matcher; + else if (matcher instanceof ExtensionFileNameMatcher extensionFileNameMatcher) { final String extension = extensionFileNameMatcher.getExtension(); for (int i = 0; ; i++) { String resourcePath = getResourceLocation(prefix + "." + extension + (i == 0 ? "" : Integer.toString(i)) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsPanel.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsPanel.java index 740c8da4c447..8b94c4e95027 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsPanel.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsPanel.java @@ -35,8 +35,7 @@ public final class IntentionSettingsPanel implements MasterDetails { myIntentionSettingsTree = new IntentionSettingsTree() { @Override protected void selectionChanged(Object selected) { - if (selected instanceof IntentionActionMetaData) { - final IntentionActionMetaData actionMetaData = (IntentionActionMetaData)selected; + if (selected instanceof IntentionActionMetaData actionMetaData) { final Runnable runnable = () -> { intentionSelected(actionMetaData); if (myDetailsComponent != null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsTree.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsTree.java index 6bfb27618e86..b2396321d89b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsTree.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsTree.java @@ -166,8 +166,7 @@ public abstract class IntentionSettingsTree { private boolean resetCheckMark(final CheckedTreeNode root) { Object userObject = root.getUserObject(); - if (userObject instanceof IntentionActionMetaData) { - IntentionActionMetaData metaData = (IntentionActionMetaData)userObject; + if (userObject instanceof IntentionActionMetaData metaData) { Boolean b = myIntentionToCheckStatus.get(metaData); boolean enabled = b == Boolean.TRUE; root.setChecked(enabled); @@ -246,8 +245,7 @@ public abstract class IntentionSettingsTree { private void refreshCheckStatus(final CheckedTreeNode root) { Object userObject = root.getUserObject(); - if (userObject instanceof IntentionActionMetaData) { - IntentionActionMetaData actionMetaData = (IntentionActionMetaData)userObject; + if (userObject instanceof IntentionActionMetaData actionMetaData) { myIntentionToCheckStatus.put(actionMetaData, root.isChecked()); } else { @@ -263,8 +261,7 @@ public abstract class IntentionSettingsTree { private static void apply(CheckedTreeNode root) { Object userObject = root.getUserObject(); - if (userObject instanceof IntentionActionMetaData) { - IntentionActionMetaData actionMetaData = (IntentionActionMetaData)userObject; + if (userObject instanceof IntentionActionMetaData actionMetaData) { IntentionManagerSettings.getInstance().setEnabled(actionMetaData, root.isChecked()); } else { @@ -283,8 +280,7 @@ public abstract class IntentionSettingsTree { private static boolean isModified(CheckedTreeNode root) { Object userObject = root.getUserObject(); - if (userObject instanceof IntentionActionMetaData) { - IntentionActionMetaData actionMetaData = (IntentionActionMetaData)userObject; + if (userObject instanceof IntentionActionMetaData actionMetaData) { boolean enabled = IntentionManagerSettings.getInstance().isEnabled(actionMetaData); return enabled != root.isChecked(); } @@ -383,11 +379,10 @@ public abstract class IntentionSettingsTree { @Override public void customizeRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { - if (!(value instanceof CheckedTreeNode)) { + if (!(value instanceof CheckedTreeNode node)) { return; } - CheckedTreeNode node = (CheckedTreeNode)value; SimpleTextAttributes attributes = node.getUserObject() instanceof IntentionActionMetaData ? SimpleTextAttributes.REGULAR_ATTRIBUTES : SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java index 8d152d2fbb58..1fe23d4e17cb 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java @@ -447,15 +447,13 @@ public final class LookupCellRenderer implements ListCellRenderer @NotNull private static Icon removeVisibility(@Nullable Editor editor, @NotNull Icon icon, @NotNull Icon standard) { - if (icon instanceof IconDecorator) { - IconDecorator decoratorIcon = (IconDecorator)icon; + if (icon instanceof IconDecorator decoratorIcon) { Icon delegateIcon = decoratorIcon.getDelegate(); if (delegateIcon != null) { return decoratorIcon.withDelegate(removeVisibility(editor, delegateIcon, standard)); } } - else if (icon instanceof RowIcon) { - RowIcon rowIcon = (RowIcon)icon; + else if (icon instanceof RowIcon rowIcon) { if (rowIcon.getIconCount() >= 1) { Icon firstIcon = rowIcon.getIcon(0); if (firstIcon != null) { @@ -477,8 +475,7 @@ public final class LookupCellRenderer implements ListCellRenderer } if (icon == null) { return standard; - } else if (icon instanceof IconDecorator ) { - IconDecorator decoratorIcon = (IconDecorator)icon; + } else if (icon instanceof IconDecorator decoratorIcon) { return decoratorIcon.withDelegate(augmentIcon(editor, decoratorIcon.getDelegate(), standard)); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java index 95944e3a2396..5a46037704f5 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java @@ -106,8 +106,7 @@ public class GotoImplementationHandler extends GotoTargetHandler { List renderers = ((EditorGutterComponentEx)editor.getGutter()).getGutterRenderers(line); List elementCandidates = new ArrayList<>(); for (GutterMark renderer : renderers) { - if (renderer instanceof LineMarkerInfo.LineMarkerGutterIconRenderer) { - LineMarkerInfo.LineMarkerGutterIconRenderer lineMarkerRenderer = (LineMarkerInfo.LineMarkerGutterIconRenderer)renderer; + if (renderer instanceof LineMarkerInfo.LineMarkerGutterIconRenderer lineMarkerRenderer) { AnAction clickAction = ((LineMarkerInfo.LineMarkerGutterIconRenderer)renderer).getClickAction(); if (clickAction instanceof NavigateAction && actionId.equals(((NavigateAction)clickAction).getOriginalActionId())) { elementCandidates.add(lineMarkerRenderer.getLineMarkerInfo().getElement()); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java index 201fd75397c1..5626eed74828 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java @@ -47,8 +47,7 @@ public final class MethodUpDownUtil { private static void addNavigationElements(Collection array, PsiFile element) { StructureViewBuilder structureViewBuilder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(element); - if (structureViewBuilder instanceof TreeBasedStructureViewBuilder) { - TreeBasedStructureViewBuilder builder = (TreeBasedStructureViewBuilder) structureViewBuilder; + if (structureViewBuilder instanceof TreeBasedStructureViewBuilder builder) { StructureViewModel model = builder.createStructureViewModel(null); try { addStructureViewElements(model.getRoot(), array, element); @@ -62,8 +61,7 @@ public final class MethodUpDownUtil { private static void addStructureViewElements(final TreeElement parent, final Collection array, @NotNull PsiFile file) { for(TreeElement treeElement: parent.getChildren()) { Object value = ((StructureViewTreeElement)treeElement).getValue(); - if (value instanceof PsiElement) { - PsiElement element = (PsiElement)value; + if (value instanceof PsiElement element) { if (array.contains(element) || !file.equals(element.getContainingFile())) continue; array.add(element); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java index 9fef8624d1b4..c767e48ab238 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java @@ -349,10 +349,9 @@ public final class NavigationUtil { @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { final Component psiComponent = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - if (!hasMnemonic.get() || !(psiComponent instanceof JPanel)) { + if (!hasMnemonic.get() || !(psiComponent instanceof JPanel component)) { return psiComponent; } - JPanel component = (JPanel)psiComponent; final JPanel panelWithMnemonic = new JPanel(new BorderLayout()); final int mnemonic = getMnemonic(value, itemsMap); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java index d7d6e203afe2..30dad2e73d2d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java @@ -254,8 +254,7 @@ public class GotoDeclarationAction extends BaseCodeInsightAction implements Dumb } // if no references found in injected fragment, try outer document - if (editor instanceof EditorWindow) { - EditorWindow window = (EditorWindow)editor; + if (editor instanceof EditorWindow window) { return findTargetElementsNoVS(project, window.getDelegate(), window.getDocument().injectedToHost(offset), lookupAccepted); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateTree.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateTree.java index 60c9a304d507..c3288edbb068 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateTree.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateTree.java @@ -55,8 +55,7 @@ class LiveTemplateTree extends CheckboxTree implements DataProvider, CopyProvide if (object instanceof TemplateGroup) { return ((TemplateGroup)object).getName(); } - if (object instanceof TemplateImpl) { - TemplateImpl template = (TemplateImpl)object; + if (object instanceof TemplateImpl template) { return StringUtil.notNullize(template.getGroupName()) + " " + StringUtil.notNullize(template.getKey()) + " " + StringUtil.notNullize(template.getDescription()) + " " + diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java index df48e1b6f41a..3c8c1b3e2d06 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java @@ -437,8 +437,7 @@ public class TemplateListPanel extends JPanel implements Disposable { if (o instanceof TemplateGroup) { myTemplateGroups.remove(o); removeNodeFromParent(node); - } else if (o instanceof TemplateImpl) { - TemplateImpl template = (TemplateImpl)o; + } else if (o instanceof TemplateImpl template) { TemplateGroup templateGroup = getTemplateGroup(template.getGroupName()); if (templateGroup != null) { templateGroup.removeElement(template); @@ -468,8 +467,7 @@ public class TemplateListPanel extends JPanel implements Disposable { if (!(value instanceof DefaultMutableTreeNode)) return; value = ((DefaultMutableTreeNode)value).getUserObject(); - if (value instanceof TemplateImpl) { - TemplateImpl template = (TemplateImpl)value; + if (value instanceof TemplateImpl template) { TemplateImpl defaultTemplate = TemplateSettings.getInstance().getDefaultTemplate(template); LiveTemplateContextsSnapshot allContexts = LiveTemplateContextService.getInstance().getSnapshot(); Color fgColor = defaultTemplate == null || templatesDiffer(allContexts, template, defaultTemplate) ? JBColor.BLUE : null; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplateLookupActionProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplateLookupActionProvider.java index 7e2864fb2d5f..cee44610975a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplateLookupActionProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplateLookupActionProvider.java @@ -21,8 +21,7 @@ import org.jetbrains.annotations.NotNull; public class PostfixTemplateLookupActionProvider implements LookupActionProvider { @Override public void fillActions(@NotNull LookupElement element, final @NotNull Lookup lookup, @NotNull Consumer consumer) { - if (element instanceof PostfixTemplateLookupElement) { - final PostfixTemplateLookupElement templateLookupElement = (PostfixTemplateLookupElement)element; + if (element instanceof PostfixTemplateLookupElement templateLookupElement) { final PostfixTemplate template = templateLookupElement.getPostfixTemplate(); consumer.consume(new LookupElementAction(PlatformIcons.EDIT, CodeInsightBundle.message("action.text.edit.postfix.templates.settings")) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateStorage.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateStorage.java index 86bee42be81f..2392eefc3a90 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateStorage.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateStorage.java @@ -111,8 +111,7 @@ public final class PostfixTemplateStorage extends SimpleModificationTracker impl for (PostfixTemplate template : entry.getValue()) { PostfixTemplateProvider provider = template.getProvider(); if (provider != null) { - if (template instanceof PostfixChangedBuiltinTemplate) { - PostfixChangedBuiltinTemplate changedBuiltinTemplate = (PostfixChangedBuiltinTemplate)template; + if (template instanceof PostfixChangedBuiltinTemplate changedBuiltinTemplate) { String builtin = changedBuiltinTemplate.getBuiltinTemplate().getId(); element.addContent(writeTemplate(changedBuiltinTemplate.getDelegate(), provider, builtin)); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesCheckboxTree.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesCheckboxTree.java index 2c7fb27ce2cd..6854a41177bc 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesCheckboxTree.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesCheckboxTree.java @@ -104,8 +104,7 @@ public class PostfixTemplatesCheckboxTree extends CheckboxTree implements Dispos return new CheckboxTreeCellRenderer() { @Override public void customizeRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { - if (!(value instanceof CheckedTreeNode)) return; - CheckedTreeNode node = (CheckedTreeNode)value; + if (!(value instanceof CheckedTreeNode node)) return; Color background = UIUtil.getTreeBackground(selected, true); PostfixTemplateCheckedTreeNode templateNode = ObjectUtils.tryCast(node, PostfixTemplateCheckedTreeNode.class); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplate.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplate.java index 451d1b7d1ab0..6e104238d54b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplate.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplate.java @@ -191,8 +191,7 @@ public abstract class PostfixTemplate { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PostfixTemplate)) return false; - PostfixTemplate template = (PostfixTemplate)o; + if (!(o instanceof PostfixTemplate template)) return false; return Objects.equals(myId, template.myId) && Objects.equals(myPresentableName, template.myPresentableName) && Objects.equals(myKey, template.myKey) && diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/EditablePostfixTemplate.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/EditablePostfixTemplate.java index 5db14edf4830..fe203bb43069 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/EditablePostfixTemplate.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/EditablePostfixTemplate.java @@ -100,9 +100,8 @@ public abstract class EditablePostfixTemplate extends PostfixTemplate { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof EditablePostfixTemplate)) return false; + if (!(o instanceof EditablePostfixTemplate template)) return false; if (!super.equals(o)) return false; - EditablePostfixTemplate template = (EditablePostfixTemplate)o; return Objects.equals(myLiveTemplate, template.myLiveTemplate); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixChangedBuiltinTemplate.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixChangedBuiltinTemplate.java index e57420d5e8f8..d12869ea05c7 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixChangedBuiltinTemplate.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixChangedBuiltinTemplate.java @@ -32,9 +32,8 @@ public class PostfixChangedBuiltinTemplate extends PostfixTemplateWrapper { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PostfixChangedBuiltinTemplate)) return false; + if (!(o instanceof PostfixChangedBuiltinTemplate template)) return false; if (!super.equals(o)) return false; - PostfixChangedBuiltinTemplate template = (PostfixChangedBuiltinTemplate)o; return Objects.equals(myBuiltinTemplate, template.myBuiltinTemplate); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixTemplateWrapper.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixTemplateWrapper.java index a575d008df7b..656f7ac557a6 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixTemplateWrapper.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixTemplateWrapper.java @@ -71,9 +71,8 @@ public class PostfixTemplateWrapper extends PostfixTemplate { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PostfixTemplateWrapper)) return false; + if (!(o instanceof PostfixTemplateWrapper wrapper)) return false; if (!super.equals(o)) return false; - PostfixTemplateWrapper wrapper = (PostfixTemplateWrapper)o; return Objects.equals(myDelegate, wrapper.myDelegate); } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/EmptyDirectoryInspection.java b/platform/lang-impl/src/com/intellij/codeInspection/EmptyDirectoryInspection.java index 86a84087d6ba..4bcd2b695484 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/EmptyDirectoryInspection.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/EmptyDirectoryInspection.java @@ -51,10 +51,9 @@ public class EmptyDirectoryInspection extends GlobalInspectionTool { final Project project = context.getProject(); final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex(); final SearchScope searchScope = ReadAction.compute(() -> scope.toSearchScope()); - if (!(searchScope instanceof GlobalSearchScope)) { + if (!(searchScope instanceof GlobalSearchScope globalSearchScope)) { return; } - final GlobalSearchScope globalSearchScope = (GlobalSearchScope)searchScope; index.iterateContent(file -> { if (onlyReportDirectoriesUnderSourceRoots && !index.isInSourceContent(file)) { return true; diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java index e093ee035448..cca3f1c2a18e 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java @@ -52,8 +52,7 @@ public class Descriptor { @Override public boolean equals(Object obj) { - if (!(obj instanceof Descriptor)) return false; - final Descriptor descriptor = (Descriptor)obj; + if (!(obj instanceof Descriptor descriptor)) return false; return myShortName.equals(descriptor.myShortName) && myLevel.equals(descriptor.getLevel()) && myEnabled == descriptor.isEnabled() && diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java index f9716223c244..4b547d7310a9 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java @@ -727,8 +727,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { refManager.iterate(new RefVisitor() { @Override public void visitElement(@NotNull RefEntity elem) { - if (elem instanceof RefElement) { - RefElement refElement = (RefElement)elem; + if (elem instanceof RefElement refElement) { entitiesWithParents.put(refElement, refElement.getInReferences()); if (refElement.getInReferences().isEmpty() || refElement.getInReferences().contains(refElement)) { roots.add(refElement); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProvider.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProvider.java index 589131574885..0e81f4164718 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProvider.java @@ -114,8 +114,7 @@ public abstract class InspectionRVContentProvider { .traverse(TreeTraversal.PRE_ORDER_DFS) .processEach(node -> { if (!((InspectionTreeNode) node).isValid()) return true; - if (node instanceof ProblemDescriptionNode) { - ProblemDescriptionNode problemDescriptionNode = (ProblemDescriptionNode)node; + if (node instanceof ProblemDescriptionNode problemDescriptionNode) { if (!problemDescriptionNode.isQuickFixAppliedFromView()) { final CommonProblemDescriptor descriptor = problemDescriptionNode.getDescriptor(); final QuickFix[] fixes = descriptor != null ? descriptor.getFixes() : null; diff --git a/platform/lang-impl/src/com/intellij/codeInspection/naming/NamingConventionWithFallbackBean.java b/platform/lang-impl/src/com/intellij/codeInspection/naming/NamingConventionWithFallbackBean.java index a2b6c3324942..bcc79ae94e08 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/naming/NamingConventionWithFallbackBean.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/naming/NamingConventionWithFallbackBean.java @@ -26,11 +26,9 @@ public class NamingConventionWithFallbackBean extends NamingConventionBean { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof NamingConventionWithFallbackBean)) return false; + if (!(o instanceof NamingConventionWithFallbackBean bean)) return false; if (!super.equals(o)) return false; - NamingConventionWithFallbackBean bean = (NamingConventionWithFallbackBean)o; - if (inheritDefaultSettings != bean.inheritDefaultSettings) return false; return true; diff --git a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java index 1c77f1af5ae7..c35e785ac40c 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java @@ -136,8 +136,7 @@ public final class OfflineDescriptorResolveResult { QuickFix @NotNull [] fixes, @NotNull Project project) { InspectionManager inspectionManager = InspectionManager.getInstance(project); - if (element instanceof RefElement) { - RefElement refElement = (RefElement)element; + if (element instanceof RefElement refElement) { if(refElement.getPsiElement() instanceof PsiFile) { PsiElement targetElement = findTargetElementFromOfflineDescriptor((PsiFile)refElement.getPsiElement(), offlineDescriptor, project); if(targetElement != null) { diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java index e0b2afc5c00e..1abbcfcb11f3 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java @@ -390,8 +390,7 @@ public class InspectionResultsView extends JPanel implements Disposable, DataPro TreePath pathSelected = myTree.getSelectionModel().getLeadSelectionPath(); if (pathSelected != null) { final InspectionTreeNode node = (InspectionTreeNode)pathSelected.getLastPathComponent(); - if (node instanceof ProblemDescriptionNode) { - final ProblemDescriptionNode problemNode = (ProblemDescriptionNode)node; + if (node instanceof ProblemDescriptionNode problemNode) { showInRightPanel(problemNode.getElement()); } else if (node instanceof InspectionPackageNode || @@ -738,8 +737,7 @@ public class InspectionResultsView extends JPanel implements Disposable, DataPro return null; } - if (selectedNode instanceof RefElementNode) { - final RefElementNode refElementNode = (RefElementNode)selectedNode; + if (selectedNode instanceof RefElementNode refElementNode) { RefEntity refElement = refElementNode.getElement(); if (refElement == null || !refElement.isValid()) return null; final RefEntity item = refElement.getRefManager().getRefinedElement(refElement); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewComparator.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewComparator.java index 7a0821fe533f..4c69bf79c3f7 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewComparator.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewComparator.java @@ -29,9 +29,7 @@ public class InspectionResultsViewComparator implements Comparator children = node.getChildren(); return !children.isEmpty() && ContainerUtil.and(children, this::shouldDelete); } - if (node instanceof ProblemDescriptionNode) { - ProblemDescriptionNode problemDescriptionNode = (ProblemDescriptionNode)node; + if (node instanceof ProblemDescriptionNode problemDescriptionNode) { CommonProblemDescriptor descriptor = problemDescriptionNode.getDescriptor(); InspectionToolPresentation presentation = problemDescriptionNode.getPresentation(); return descriptor == null || presentation.isExcluded(descriptor) || presentation.isProblemResolved(descriptor); @@ -665,8 +662,7 @@ public class InspectionTree extends Tree { if (node.isExcluded()) { return false; } - if (node instanceof RefElementNode) { - final RefElementNode refNode = (RefElementNode)node; + if (node instanceof RefElementNode refNode) { if (hasDescriptorUnder(refNode)) return false; final RefEntity element = refNode.getElement(); return element != null && element.isValid(); @@ -679,8 +675,7 @@ public class InspectionTree extends Tree { if (node.isExcluded()) { return null; } - if (node instanceof RefElementNode) { - final RefElementNode refNode = (RefElementNode)node; + if (node instanceof RefElementNode refNode) { if (hasDescriptorUnder(refNode)) return null; final RefEntity element = refNode.getElement(); if (element == null || !element.isValid()) return null; @@ -688,8 +683,7 @@ public class InspectionTree extends Tree { return getOpenFileDescriptor((RefElement)element); } } - else if (node instanceof ProblemDescriptionNode) { - ProblemDescriptionNode problemNode = (ProblemDescriptionNode)node; + else if (node instanceof ProblemDescriptionNode problemNode) { boolean isValid = problemNode.isValid() && (!problemNode.isQuickFixAppliedFromView() || problemNode.calculateIsValid()); return isValid diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/SuppressableInspectionTreeNode.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/SuppressableInspectionTreeNode.java index 0f41a4af3a2e..6277560ce2c3 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/SuppressableInspectionTreeNode.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/SuppressableInspectionTreeNode.java @@ -189,9 +189,7 @@ public abstract class SuppressableInspectionTreeNode extends InspectionTreeNode @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof NodeState)) return false; - - NodeState state = (NodeState)o; + if (!(o instanceof NodeState state)) return false; if (isValid != state.isValid) return false; if (isSuppressed != state.isSuppressed) return false; diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardServiceViewContributor.java b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardServiceViewContributor.java index e2ae0d5f1360..7bbf0c17eb05 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardServiceViewContributor.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardServiceViewContributor.java @@ -197,9 +197,8 @@ public final class RunDashboardServiceViewContributor if (!(object instanceof DataProvider)) return null; Object data = ((DataProvider)object).getData(PlatformCoreDataKeys.SELECTED_ITEMS.getName()); - if (!(data instanceof Object[])) return null; + if (!(data instanceof Object[] items)) return null; - Object[] items = (Object[])data; if (items.length != 1) return null; RunDashboardRunConfigurationNode node = ObjectUtils.tryCast(items[0], RunDashboardRunConfigurationNode.class); diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/StatusDashboardGroupingRule.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/StatusDashboardGroupingRule.java index ddc6521b36a4..f7fdbc268d62 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/StatusDashboardGroupingRule.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/StatusDashboardGroupingRule.java @@ -45,8 +45,7 @@ public class StatusDashboardGroupingRule implements RunDashboardGroupingRule { if (project != null && !PropertiesComponent.getInstance(project).getBoolean(getName(), true)) { return null; } - if (node instanceof RunDashboardRunConfigurationNode) { - RunDashboardRunConfigurationNode runConfigurationNode = (RunDashboardRunConfigurationNode)node; + if (node instanceof RunDashboardRunConfigurationNode runConfigurationNode) { RunDashboardRunConfigurationStatus status = runConfigurationNode.getStatus(); return new RunDashboardGroupImpl<>(status, status.getName(), status.getIcon()); } diff --git a/platform/lang-impl/src/com/intellij/execution/services/ServiceModel.java b/platform/lang-impl/src/com/intellij/execution/services/ServiceModel.java index 0ca9b3c0bcd6..da05cf27caf6 100644 --- a/platform/lang-impl/src/com/intellij/execution/services/ServiceModel.java +++ b/platform/lang-impl/src/com/intellij/execution/services/ServiceModel.java @@ -348,8 +348,7 @@ final class ServiceModel implements Disposable, InvokerSupplier { private void serviceStructureChanged(ServiceEvent e) { ServiceViewItem item = findItem(e.target, e.contributorClass); - if (item instanceof ServiceNode) { - ServiceNode node = (ServiceNode)item; + if (item instanceof ServiceNode node) { updateServiceViewDescriptor(node, e.target); node.reloadChildren(); } diff --git a/platform/lang-impl/src/com/intellij/execution/services/ServiceViewDragHelper.java b/platform/lang-impl/src/com/intellij/execution/services/ServiceViewDragHelper.java index 50f528063ea7..ed388afcdbfe 100644 --- a/platform/lang-impl/src/com/intellij/execution/services/ServiceViewDragHelper.java +++ b/platform/lang-impl/src/com/intellij/execution/services/ServiceViewDragHelper.java @@ -303,12 +303,11 @@ final class ServiceViewDragHelper { private EventContext getEventContext(Point point) { TreePath path = myTree.getPathForLocation(point.x, point.y); - if (path == null || !(path.getLastPathComponent() instanceof ServiceViewItem)) return null; + if (path == null || !(path.getLastPathComponent() instanceof ServiceViewItem item)) return null; Rectangle cellBounds = myTree.getPathBounds(path); if (cellBounds == null) return null; - ServiceViewItem item = (ServiceViewItem)path.getLastPathComponent(); ServiceViewDescriptor viewDescriptor = item.getViewDescriptor(); if (!(viewDescriptor instanceof ServiceViewDnDDescriptor)) return null; diff --git a/platform/lang-impl/src/com/intellij/execution/services/ServiceViewModel.java b/platform/lang-impl/src/com/intellij/execution/services/ServiceViewModel.java index dccc9df2e943..5a0103ad79dc 100644 --- a/platform/lang-impl/src/com/intellij/execution/services/ServiceViewModel.java +++ b/platform/lang-impl/src/com/intellij/execution/services/ServiceViewModel.java @@ -210,8 +210,7 @@ abstract class ServiceViewModel implements Disposable, InvokerSupplier, ServiceM } private static boolean isSingleService(ServiceViewItem item) { - if (item instanceof ServiceNode) { - ServiceNode node = (ServiceNode)item; + if (item instanceof ServiceNode node) { if (!node.isChildrenInitialized() || !node.isLoaded()) { return false; } diff --git a/platform/lang-impl/src/com/intellij/execution/services/ServiceViewNavBarPanel.java b/platform/lang-impl/src/com/intellij/execution/services/ServiceViewNavBarPanel.java index 95865abf38b8..039d1c556fe2 100644 --- a/platform/lang-impl/src/com/intellij/execution/services/ServiceViewNavBarPanel.java +++ b/platform/lang-impl/src/com/intellij/execution/services/ServiceViewNavBarPanel.java @@ -101,8 +101,7 @@ final class ServiceViewNavBarPanel extends NavBarPanel { @Override public void updateModel(Object object) { List path = new ArrayList<>(); - if (object instanceof ServiceViewItem) { - ServiceViewItem item = (ServiceViewItem)object; + if (object instanceof ServiceViewItem item) { List roots = myViewModel.getVisibleRoots(); do { @@ -127,8 +126,7 @@ final class ServiceViewNavBarPanel extends NavBarPanel { return new ArrayList<>(myViewModel.getVisibleRoots()); } if (object instanceof ServiceViewItem) { - if (object instanceof ServiceNode) { - ServiceNode service = (ServiceNode)object; + if (object instanceof ServiceNode service) { if (service.getProvidingContributor() != null && !service.isChildrenInitialized()) { myViewModel.getInvoker().invoke(() -> { service.getChildren(); // initialize children on background thread diff --git a/platform/lang-impl/src/com/intellij/execution/services/ServiceViewTreeModel.java b/platform/lang-impl/src/com/intellij/execution/services/ServiceViewTreeModel.java index 5ba2c480df3b..7694aba6c465 100644 --- a/platform/lang-impl/src/com/intellij/execution/services/ServiceViewTreeModel.java +++ b/platform/lang-impl/src/com/intellij/execution/services/ServiceViewTreeModel.java @@ -40,8 +40,7 @@ class ServiceViewTreeModel extends BaseTreeModel implements InvokerSuppl public boolean isLeaf(Object object) { if (object == myRoot) return false; - if (object instanceof ServiceModel.ServiceNode) { - ServiceModel.ServiceNode node = (ServiceModel.ServiceNode)object; + if (object instanceof ServiceModel.ServiceNode node) { if (!node.isChildrenInitialized() && !node.isLoaded()) { return false; } diff --git a/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointerModuleListener.java b/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointerModuleListener.java index 9100dc92fea1..703bb97e8f03 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointerModuleListener.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointerModuleListener.java @@ -30,8 +30,7 @@ final class FacetPointerModuleListener implements ModuleListener { @NotNull List modules, @NotNull Function oldNameProvider) { FacetPointersManager manager = FacetPointersManager.getInstance(myProject); - if (manager instanceof FacetPointersManagerImpl) { - FacetPointersManagerImpl managerImpl = (FacetPointersManagerImpl)manager; + if (manager instanceof FacetPointersManagerImpl managerImpl) { managerImpl.refreshPointers(); } } diff --git a/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointersFacetManagerListener.java b/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointersFacetManagerListener.java index 9072e4eb3b42..8acfb1157b06 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointersFacetManagerListener.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointersFacetManagerListener.java @@ -16,8 +16,7 @@ public class FacetPointersFacetManagerListener implements FacetManagerListener { @Override public void facetAdded(@NotNull Facet facet) { FacetPointersManager manager = FacetPointersManager.getInstance(myProject); - if (manager instanceof FacetPointersManagerImpl) { - FacetPointersManagerImpl managerImpl = (FacetPointersManagerImpl)manager; + if (manager instanceof FacetPointersManagerImpl managerImpl) { managerImpl.refreshPointers(); } } @@ -25,8 +24,7 @@ public class FacetPointersFacetManagerListener implements FacetManagerListener { @Override public void beforeFacetRenamed(@NotNull Facet facet) { FacetPointersManager manager = FacetPointersManager.getInstance(myProject); - if (manager instanceof FacetPointersManagerImpl) { - FacetPointersManagerImpl managerImpl = (FacetPointersManagerImpl)manager; + if (manager instanceof FacetPointersManagerImpl managerImpl) { final FacetPointerImpl pointer = managerImpl.get(FacetPointersManager.constructId(facet)); if (pointer != null) { pointer.refresh(); @@ -37,8 +35,7 @@ public class FacetPointersFacetManagerListener implements FacetManagerListener { @Override public void facetRenamed(@NotNull final Facet facet, @NotNull final String oldName) { FacetPointersManager manager = FacetPointersManager.getInstance(myProject); - if (manager instanceof FacetPointersManagerImpl) { - FacetPointersManagerImpl managerImpl = (FacetPointersManagerImpl)manager; + if (manager instanceof FacetPointersManagerImpl managerImpl) { managerImpl.refreshPointers(); } } diff --git a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java index 4f61bead1be6..9b4c370f99de 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java +++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java @@ -891,8 +891,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction, HintManag if (value instanceof UsageNode) { Usage usage = ((UsageNode)value).getUsage(); - if (usage instanceof UsageInfoAdapter) { - UsageInfoAdapter adapter = (UsageInfoAdapter)usage; + if (usage instanceof UsageInfoAdapter adapter) { file = adapter.getPath(); if (adapter.isValid()) { selectedUsagePromises.add(adapter.getMergedInfosAsync()); diff --git a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesTable.java b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesTable.java index 642e5d8dbe31..c55a9f479c09 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesTable.java +++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesTable.java @@ -159,8 +159,7 @@ public class ShowUsagesTable extends JBTable implements DataProvider { List usages = selectedUsages.get(); if (usages != null) { for (Object usage : usages) { - if (usage instanceof UsageInfo) { - UsageInfo usageInfo = (UsageInfo)usage; + if (usage instanceof UsageInfo usageInfo) { UsageViewUtil.navigateTo(usageInfo, true); PsiElement element = usageInfo.getElement(); @@ -247,8 +246,7 @@ public class ShowUsagesTable extends JBTable implements DataProvider { @Override protected String getElementText(@NotNull Object element) { - if (!(element instanceof UsageNode)) return element.toString(); - UsageNode node = (UsageNode)element; + if (!(element instanceof UsageNode node)) return element.toString(); if (node instanceof ShowUsagesAction.StringNode) return ""; Usage usage = node.getUsage(); if (usage == getTable().MORE_USAGES_SEPARATOR || usage == getTable().USAGES_OUTSIDE_SCOPE_SEPARATOR || usage == getTable().USAGES_FILTERED_OUT_SEPARATOR) return ""; diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectTask.java b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectTask.java index d61ca6285359..b7bf5d9508ba 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectTask.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectTask.java @@ -360,8 +360,7 @@ final class FindInProjectTask { return true; }); } - else if (obj instanceof VirtualFile) { - VirtualFile file = (VirtualFile)obj; + else if (obj instanceof VirtualFile file) { if (file instanceof VirtualFileWithId && visitedFiles.set(((VirtualFileWithId)file).getId())) { return true; } diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupDirectoryChooser.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupDirectoryChooser.java index c249f574df8c..98a7c24a57d7 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupDirectoryChooser.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupDirectoryChooser.java @@ -55,8 +55,7 @@ public class FindPopupDirectoryChooser extends JPanel { myDirectoryComboBox.setEditable(true); Component editorComponent = myDirectoryComboBox.getEditor().getEditorComponent(); - if (editorComponent instanceof JTextField) { - JTextField field = (JTextField)editorComponent; + if (editorComponent instanceof JTextField field) { field.getDocument().addDocumentListener(new DocumentAdapter() { @Override protected void textChanged(@NotNull DocumentEvent e) { diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java index 1e3cd0ae56f2..3724643a7c39 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java @@ -455,8 +455,7 @@ public class FindPopupPanel extends JBPanel implements FindUI, D header.cbFileFilter.addItemListener(liveResultsPreviewUpdateListener); header.fileMaskField.addActionListener(__ -> scheduleResultsUpdate()); Component editorComponent = header.fileMaskField.getEditor().getEditorComponent(); - if (editorComponent instanceof EditorTextField) { - EditorTextField etf = (EditorTextField) editorComponent; + if (editorComponent instanceof EditorTextField etf) { etf.addDocumentListener(new DocumentListener() { @Override public void documentChanged(@NotNull com.intellij.openapi.editor.event.DocumentEvent event) { diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java index 1fc64ac0684d..a1df04b32681 100644 --- a/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java +++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java @@ -86,8 +86,7 @@ public abstract class FacetBasedDetectedFrameworkDescription) { - final FacetBasedDetectedFrameworkDescription description = (FacetBasedDetectedFrameworkDescription)framework; + if (framework instanceof FacetBasedDetectedFrameworkDescription description) { if (underlyingId.equals(description.myFacetType.getId()) && myDetector.isSuitableUnderlyingFacetConfiguration(description.getConfiguration(), myConfiguration, myRelatedFiles)) { return true; @@ -130,10 +129,9 @@ public abstract class FacetBasedDetectedFrameworkDescription consumer) { TreeUtil.traverse(getRoot(), node -> { - if (node instanceof DetectedFrameworkTreeNodeBase) { - final DetectedFrameworkTreeNodeBase frameworkNode = (DetectedFrameworkTreeNodeBase)node; + if (node instanceof DetectedFrameworkTreeNodeBase frameworkNode) { if (!frameworkNode.isChecked()) { consumer.consume(frameworkNode); } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/DefaultSearchEverywhereClassifier.java b/platform/lang-impl/src/com/intellij/ide/actions/DefaultSearchEverywhereClassifier.java index 2556599838f6..52a553c9052e 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/DefaultSearchEverywhereClassifier.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/DefaultSearchEverywhereClassifier.java @@ -33,8 +33,7 @@ public class DefaultSearchEverywhereClassifier implements SearchEverywhereClassi @Override public boolean isSymbol(@Nullable Object o) { - if (o instanceof PsiElement) { - final PsiElement e = (PsiElement)o; + if (o instanceof PsiElement e) { return !e.getLanguage().is(Language.findLanguageByID("JAVA")) || !(e.getParent() instanceof PsiFile); } return false; @@ -43,8 +42,7 @@ public class DefaultSearchEverywhereClassifier implements SearchEverywhereClassi @Nullable @Override public VirtualFile getVirtualFile(@NotNull Object o) { - if (o instanceof PsiElement) { - final PsiElement element = (PsiElement)o; + if (o instanceof PsiElement element) { final PsiFile file = element.getContainingFile(); return file != null ? file.getVirtualFile() : null; } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java b/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java index 6f7d42803ab6..442a47ce8e26 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java @@ -97,8 +97,7 @@ public class ExternalJavaDocAction extends AnAction { final List finalUrls = urls; ApplicationManager.getApplication().invokeLater(() -> { if (ContainerUtil.isEmpty(finalUrls)) { - if (element != null && provider instanceof ExternalDocumentationProvider) { - ExternalDocumentationProvider externalDocumentationProvider = (ExternalDocumentationProvider)provider; + if (element != null && provider instanceof ExternalDocumentationProvider externalDocumentationProvider) { if (externalDocumentationProvider.canPromptToConfigureDocumentation(element)) { externalDocumentationProvider.promptToConfigureDocumentation(element); } @@ -151,8 +150,7 @@ public class ExternalJavaDocAction extends AnAction { final DocumentationProvider provider = DocumentationManager.getProviderFromElement(element); boolean enabled; - if (provider instanceof ExternalDocumentationProvider) { - final ExternalDocumentationProvider edProvider = (ExternalDocumentationProvider)provider; + if (provider instanceof ExternalDocumentationProvider edProvider) { enabled = CompositeDocumentationProvider.hasUrlsFor(provider, element, originalElement) || edProvider.canPromptToConfigureDocumentation(element); } else { diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java index c4e62f6c74b6..94e38847372a 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java @@ -42,8 +42,7 @@ public class GotoActionAction extends SearchEverywhereBaseAction implements Dumb ApplicationManager.getApplication().invokeLater(() -> { if (project != null && project.isDisposed()) return; - if (element instanceof OptionDescription) { - OptionDescription optionDescription = (OptionDescription)element; + if (element instanceof OptionDescription optionDescription) { if (optionDescription.hasExternalEditor()) { optionDescription.invokeInternalEditor(); } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java index 63a4f3bf8523..737997f55ebd 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java @@ -238,8 +238,7 @@ public class GotoFileItemProvider extends DefaultChooseByNameItemProvider { Object[] items = indexResult.apply(matchResult.elementName); ProgressManager.checkCanceled(); for (Object item : items) { - if (!(item instanceof PsiFileSystemItem)) continue; - PsiFileSystemItem psiItem = (PsiFileSystemItem)item; + if (!(item instanceof PsiFileSystemItem psiItem)) continue; if (!scope.contains(psiItem.getVirtualFile())) continue; String qualifier = getParentPath(psiItem); if (qualifier != null) { @@ -443,8 +442,7 @@ public class GotoFileItemProvider extends DefaultChooseByNameItemProvider { for (MatchResult matchResult : group) { for (Object o : myModel.getElementsByName(matchResult.elementName, adjusted, indicator)) { ProgressManager.checkCanceled(); - if (o instanceof PsiFileSystemItem) { - PsiFileSystemItem psiItem = (PsiFileSystemItem)o; + if (o instanceof PsiFileSystemItem psiItem) { String qualifier = getParentPath(psiItem); if (qualifier != null) return true; } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/RelatedItemLineMarkerGotoAdapter.java b/platform/lang-impl/src/com/intellij/ide/actions/RelatedItemLineMarkerGotoAdapter.java index 435bbeb408c2..a14600433d3f 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/RelatedItemLineMarkerGotoAdapter.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/RelatedItemLineMarkerGotoAdapter.java @@ -49,9 +49,8 @@ public class RelatedItemLineMarkerGotoAdapter extends GotoRelatedProvider { } List items = new ArrayList<>(); for (LineMarkerProvider provider : providers) { - if (provider instanceof RelatedItemLineMarkerProvider) { + if (provider instanceof RelatedItemLineMarkerProvider relatedItemLineMarkerProvider) { List> markers = new ArrayList<>(); - RelatedItemLineMarkerProvider relatedItemLineMarkerProvider = (RelatedItemLineMarkerProvider)provider; for (PsiElement parent : parents) { ContainerUtil.addIfNotNull(markers, relatedItemLineMarkerProvider.getLineMarkerInfo(parent)); } @@ -71,8 +70,7 @@ public class RelatedItemLineMarkerGotoAdapter extends GotoRelatedProvider { Collection items = marker.createGotoRelatedItems(); for (GotoRelatedItem item : items) { PsiElement element = item.getElement(); - if (element instanceof PsiFile) { - PsiFile file = (PsiFile)element; + if (element instanceof PsiFile file) { if (addedFiles.contains(file)) { continue; } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/runAnything/activity/RunAnythingRunConfigurationProvider.java b/platform/lang-impl/src/com/intellij/ide/actions/runAnything/activity/RunAnythingRunConfigurationProvider.java index bfab70c522e4..5416818d4895 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/runAnything/activity/RunAnythingRunConfigurationProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/runAnything/activity/RunAnythingRunConfigurationProvider.java @@ -34,8 +34,7 @@ public abstract class RunAnythingRunConfigurationProvider extends RunAnythingPro Object value = wrapper.getValue(); Project project = fetchProject(dataContext); - if (value instanceof RunnerAndConfigurationSettings) { - RunnerAndConfigurationSettings runnerAndConfigurationSettings = (RunnerAndConfigurationSettings)value; + if (value instanceof RunnerAndConfigurationSettings runnerAndConfigurationSettings) { if (!RunManager.getInstance(project).hasSettings(runnerAndConfigurationSettings)) { RunManager.getInstance(project).addConfiguration(runnerAndConfigurationSettings); RunConfigurationOptionUsagesCollector.logAddNew( diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionSearchEverywhereContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionSearchEverywhereContributor.java index 6851321f1107..3859d765bf65 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionSearchEverywhereContributor.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionSearchEverywhereContributor.java @@ -177,8 +177,7 @@ public class ActionSearchEverywhereContributor implements WeightedSearchEverywhe Object selected = item.value; - if (selected instanceof BooleanOptionDescription) { - final BooleanOptionDescription option = (BooleanOptionDescription)selected; + if (selected instanceof BooleanOptionDescription option) { if (selected instanceof BooleanOptionDescription.RequiresRebuild) { myModel.clearCaches(); // release references to plugin actions so that the plugin can be unloaded successfully myProvider.clearIntentions(); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionsEqualityProvider.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionsEqualityProvider.java index dd64c421caac..213e7d8a96ce 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionsEqualityProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ActionsEqualityProvider.java @@ -27,8 +27,7 @@ public class ActionsEqualityProvider extends AbstractEqualityProvider { item = ((GotoActionModel.MatchedValue)item).value; } - if (item instanceof GotoActionModel.ActionWrapper) { - GotoActionModel.ActionWrapper wrapper = (GotoActionModel.ActionWrapper)item; + if (item instanceof GotoActionModel.ActionWrapper wrapper) { return wrapper.getAction(); } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/PSIPresentationBgRendererWrapper.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/PSIPresentationBgRendererWrapper.java index d523fc8d092b..1ae342ecdc1d 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/PSIPresentationBgRendererWrapper.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/PSIPresentationBgRendererWrapper.java @@ -83,8 +83,7 @@ public class PSIPresentationBgRendererWrapper implements WeightedSearchEverywher private static FoundItemDescriptor element2presentation(FoundItemDescriptor elementDescriptor, Function presentationCalculator) { - if (elementDescriptor.getItem() instanceof PsiElement) { - PsiElement psi = (PsiElement)elementDescriptor.getItem(); + if (elementDescriptor.getItem() instanceof PsiElement psi) { TargetPresentation presentation = presentationCalculator.apply(psi); return new FoundItemDescriptor<>(new PsiItemWithPresentation(psi, presentation), elementDescriptor.getWeight()); } @@ -124,9 +123,7 @@ public class PSIPresentationBgRendererWrapper implements WeightedSearchEverywher @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - if (!(value instanceof PsiItemWithPresentation)) return delegateRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - - PsiItemWithPresentation itemAndPresentation = (PsiItemWithPresentation)value; + if (!(value instanceof PsiItemWithPresentation itemAndPresentation)) return delegateRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); TargetPresentation presentation = itemAndPresentation.getPresentation(); PsiElementListCellRenderer.ItemMatchers matchers = getItemMatchers(list, itemAndPresentation); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SEResultsListFactory.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SEResultsListFactory.java index f45ed0da7596..b9f67abc2fe4 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SEResultsListFactory.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SEResultsListFactory.java @@ -90,8 +90,7 @@ abstract class SEResultsListFactory { component = detachParent(renderer.getListCellRendererComponent(list, value, index, selected, true)); } - if (component instanceof JComponent) { - JComponent jComponent = (JComponent)component; + if (component instanceof JComponent jComponent) { if (!ExperimentalUI.isNewUI()) { jComponent.setBorder( new EmptyBorder(jComponent.getBorder() == GotoActionModel.GotoActionListCellRenderer.TOGGLE_BUTTON_BORDER diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java index 4c304f748542..96e7c42ba23a 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java @@ -105,8 +105,7 @@ public class TopHitSEContributor implements SearchEverywhereContributor @Override public boolean processSelectedItem(@NotNull Object selected, int modifiers, @NotNull String text) { - if (selected instanceof BooleanOptionDescription) { - final BooleanOptionDescription option = (BooleanOptionDescription) selected; + if (selected instanceof BooleanOptionDescription option) { option.setOptionState(!option.isOptionEnabled()); return false; } diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/AbstractUrlFavoriteAdapter.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/AbstractUrlFavoriteAdapter.java index dc91e9fb89c4..62e7ebb00be8 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/AbstractUrlFavoriteAdapter.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/AbstractUrlFavoriteAdapter.java @@ -28,8 +28,7 @@ public class AbstractUrlFavoriteAdapter extends AbstractUrl { } @Nullable Bookmark createBookmark(@NotNull Project project) { - if (myNodeProvider instanceof AbstractUrlFavoriteConverter) { - var converter = (AbstractUrlFavoriteConverter)myNodeProvider; + if (myNodeProvider instanceof AbstractUrlFavoriteConverter converter) { var bookmark = converter.createBookmark(project, url, moduleName); if (bookmark != null) return bookmark; var id = myNodeProvider.getFavoriteTypeId(); diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoriteTreeNodeDescriptor.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoriteTreeNodeDescriptor.java index 6f0464c6305c..593e5bd7eeb9 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoriteTreeNodeDescriptor.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoriteTreeNodeDescriptor.java @@ -55,8 +55,7 @@ public final class FavoriteTreeNodeDescriptor extends PresentableNodeDescriptor< if (nodeElement instanceof PsiDirectory) { return VfsUtilCore.getRelativeLocation(((PsiDirectory)nodeElement).getVirtualFile(), project.getBaseDir()); } - if (nodeElement instanceof PsiFile) { - final PsiFile containingFile = (PsiFile)nodeElement; + if (nodeElement instanceof PsiFile containingFile) { return VfsUtilCore.getRelativeLocation(containingFile.getVirtualFile(), project.getBaseDir()); } } @@ -64,8 +63,7 @@ public final class FavoriteTreeNodeDescriptor extends PresentableNodeDescriptor< if (nodeElement instanceof LibraryGroupElement) { return ((LibraryGroupElement)nodeElement).getModule().getName(); } - if (nodeElement instanceof NamedLibraryElement) { - final NamedLibraryElement namedLibraryElement = ((NamedLibraryElement)nodeElement); + if (nodeElement instanceof NamedLibraryElement namedLibraryElement) { final Module module = namedLibraryElement.getModule(); return (module != null ? module.getName() : "") + ":" + namedLibraryElement.getOrderEntry().getPresentableName(); } @@ -98,8 +96,7 @@ public final class FavoriteTreeNodeDescriptor extends PresentableNodeDescriptor< @Nullable public FavoriteTreeNodeDescriptor getFavoritesRoot() { FavoriteTreeNodeDescriptor descriptor = this; - while (descriptor != null && descriptor.getParentDescriptor() instanceof FavoriteTreeNodeDescriptor) { - FavoriteTreeNodeDescriptor parent = (FavoriteTreeNodeDescriptor)descriptor.getParentDescriptor(); + while (descriptor != null && descriptor.getParentDescriptor() instanceof FavoriteTreeNodeDescriptor parent) { if (parent != null && parent.getParentDescriptor() == null) { return descriptor; } diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java index 973d88cb9a0a..4b210b574cfb 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java @@ -522,15 +522,13 @@ public final class FavoritesManager implements PersistentStateComponent return true; } } - if (element instanceof NamedLibraryElement) { - NamedLibraryElement namedLibraryElement = (NamedLibraryElement)element; + if (element instanceof NamedLibraryElement namedLibraryElement) { final VirtualFile[] files = namedLibraryElement.getOrderEntry().getRootFiles(OrderRootType.CLASSES); if (ArrayUtil.find(files, vFile) > -1) { return true; } } - if (element instanceof ModuleGroup) { - ModuleGroup group = (ModuleGroup)element; + if (element instanceof ModuleGroup group) { final Collection modules = group.modulesInGroup(myProject, true); for (Module module : modules) { ModuleRootManager.getInstance(module).getFileIndex().iterateContent(contentIterator); diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java index 1698a129279e..203f24238e65 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java @@ -119,8 +119,8 @@ public class AddToFavoritesAction extends AnAction { if (object instanceof PsiElement) { Module containingModule = null; if (inProjectView && ProjectView.getInstance(project).isShowModules(currentViewId)) { - if (pane != null && pane.getSelectedDescriptor() != null && pane.getSelectedDescriptor().getElement() instanceof AbstractTreeNode) { - AbstractTreeNode abstractTreeNode = ((AbstractTreeNode)pane.getSelectedDescriptor().getElement()); + if (pane != null && pane.getSelectedDescriptor() != null && + pane.getSelectedDescriptor().getElement() instanceof AbstractTreeNode abstractTreeNode) { while (abstractTreeNode != null && !(abstractTreeNode.getParent() instanceof AbstractModuleNode)) { abstractTreeNode = abstractTreeNode.getParent(); } diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTabAsTree.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTabAsTree.java index e6b03c5eedc0..ad7fdd69f92a 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTabAsTree.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTabAsTree.java @@ -99,8 +99,7 @@ abstract class FileTemplateTabAsTree extends FileTemplateTab { setBackground(UIUtil.getTreeBackground(sel, hasFocus)); setForeground(UIUtil.getTreeForeground(sel, hasFocus)); - if (value instanceof FileTemplateNode) { - final FileTemplateNode node = (FileTemplateNode)value; + if (value instanceof FileTemplateNode node) { setText((String) node.getUserObject()); setIcon(node.getIcon()); diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java index 54288fe9d479..d1fc98ea9377 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java @@ -124,10 +124,9 @@ public abstract class HierarchyBrowserBase extends SimpleToolWindowPanel impleme } TreeModel model = tree.getModel(); Object root = model.getRoot(); - if (!(root instanceof DefaultMutableTreeNode)) { + if (!(root instanceof DefaultMutableTreeNode node)) { return PsiElement.EMPTY_ARRAY; } - DefaultMutableTreeNode node = (DefaultMutableTreeNode)root; HierarchyNodeDescriptor descriptor = getDescriptor(node); Set result = new HashSet<>(); if (descriptor != null) { @@ -146,8 +145,7 @@ public abstract class HierarchyBrowserBase extends SimpleToolWindowPanel impleme return; } for (Object child : children) { - if (child instanceof HierarchyNodeDescriptor) { - HierarchyNodeDescriptor childDescriptor = (HierarchyNodeDescriptor)child; + if (child instanceof HierarchyNodeDescriptor childDescriptor) { collectElements(childDescriptor, out); } } @@ -165,8 +163,7 @@ public abstract class HierarchyBrowserBase extends SimpleToolWindowPanel impleme ArrayList list = new ArrayList<>(paths.length); for (TreePath path : paths) { Object lastPathComponent = path.getLastPathComponent(); - if (lastPathComponent instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)lastPathComponent; + if (lastPathComponent instanceof DefaultMutableTreeNode node) { HierarchyNodeDescriptor descriptor = getDescriptor(node); if (descriptor != null) { list.add(descriptor); diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyNodeRenderer.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyNodeRenderer.java index e5e9c0b15111..a382b870fa97 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyNodeRenderer.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyNodeRenderer.java @@ -33,8 +33,7 @@ public final class HierarchyNodeRenderer extends NodeRenderer { boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { Object userObject = TreeUtil.getUserObject(value); - if (userObject instanceof HierarchyNodeDescriptor) { - HierarchyNodeDescriptor descriptor = (HierarchyNodeDescriptor)userObject; + if (userObject instanceof HierarchyNodeDescriptor descriptor) { var tagIconAndText = TagManager.getTagIconAndText(descriptor.getPsiElement()); descriptor.getHighlightedText().customize(this); setIcon(IconUtil.rowIcon(tagIconAndText.first, fixIconIfNeeded(descriptor.getIcon(), selected, hasFocus))); diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeStructure.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeStructure.java index 14a9da996fb0..3540afc7ddcb 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeStructure.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeStructure.java @@ -70,8 +70,7 @@ public abstract class HierarchyTreeStructure extends AbstractTreeStructure { @Override public final boolean isToBuildChildrenInBackground(@NotNull Object element) { - if (element instanceof HierarchyNodeDescriptor){ - HierarchyNodeDescriptor descriptor = (HierarchyNodeDescriptor)element; + if (element instanceof HierarchyNodeDescriptor descriptor){ Object[] cachedChildren = descriptor.getCachedChildren(); return cachedChildren == null && descriptor.isValid(); } @@ -80,8 +79,7 @@ public abstract class HierarchyTreeStructure extends AbstractTreeStructure { @Override public final Object @NotNull [] getChildElements(@NotNull Object element) { - if (element instanceof HierarchyNodeDescriptor) { - HierarchyNodeDescriptor descriptor = (HierarchyNodeDescriptor)element; + if (element instanceof HierarchyNodeDescriptor descriptor) { Object[] cachedChildren = descriptor.getCachedChildren(); if (cachedChildren == null) { if (descriptor.isValid()) { diff --git a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java index 68550ff6fd76..5504c4827df1 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java @@ -386,8 +386,7 @@ public final class StructureViewWrapperImpl implements StructureViewWrapper, Dis myFileEditor = editor; Disposer.register(this, myStructureView); - if (myStructureView instanceof StructureViewComposite) { - final StructureViewComposite composite = (StructureViewComposite)myStructureView; + if (myStructureView instanceof StructureViewComposite composite) { final StructureViewComposite.StructureViewDescriptor[] views = composite.getStructureViews(); myPanels = new JPanel[views.length]; names = new String[views.length]; diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/NavigatableRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/NavigatableRule.java index 6b559034d266..86cb49bde32f 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/NavigatableRule.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/NavigatableRule.java @@ -29,8 +29,7 @@ public class NavigatableRule implements GetDataRule { @Override public Object getData(@NotNull DataProvider dataProvider) { final Navigatable navigatable = CommonDataKeys.NAVIGATABLE.getData(dataProvider); - if (navigatable instanceof OpenFileDescriptor) { - final OpenFileDescriptor openFileDescriptor = (OpenFileDescriptor)navigatable; + if (navigatable instanceof OpenFileDescriptor openFileDescriptor) { if (openFileDescriptor.getFile().isValid()) { return openFileDescriptor; diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/DefaultNavBarExtension.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/DefaultNavBarExtension.java index 7f1be2cc5416..c67e92660ea9 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/DefaultNavBarExtension.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/DefaultNavBarExtension.java @@ -46,8 +46,7 @@ public class DefaultNavBarExtension extends AbstractNavBarModelExtension { final String libraryName = ((LibraryOrderEntry)object).getLibraryName(); return libraryName != null ? libraryName : CodeInsightBundle.message("package.dependencies.library.node.text"); } - else if (object instanceof ModuleOrderEntry) { - final ModuleOrderEntry moduleOrderEntry = (ModuleOrderEntry)object; + else if (object instanceof ModuleOrderEntry moduleOrderEntry) { return moduleOrderEntry.getModuleName(); } return null; @@ -68,8 +67,7 @@ public class DefaultNavBarExtension extends AbstractNavBarModelExtension { else if (object instanceof Module) { return processChildren((Module)object, processor); } - else if (object instanceof PsiDirectoryContainer) { - final PsiDirectoryContainer psiPackage = (PsiDirectoryContainer)object; + else if (object instanceof PsiDirectoryContainer psiPackage) { final PsiDirectory[] psiDirectories = ReadAction.compute(() -> rootElement instanceof Module ? psiPackage.getDirectories( GlobalSearchScope.moduleScope((Module)rootElement)) @@ -149,8 +147,7 @@ public class DefaultNavBarExtension extends AbstractNavBarModelExtension { return containingDirectory; } } - else if (psiElement instanceof PsiDirectory) { - PsiDirectory psiDirectory = (PsiDirectory)psiElement; + else if (psiElement instanceof PsiDirectory psiDirectory) { Project project = psiElement.getProject(); PsiDirectory parentDirectory = psiDirectory.getParentDirectory(); if (parentDirectory == null) { diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarIdeView.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarIdeView.java index 4948d4c32ea8..039585fe2be5 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarIdeView.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarIdeView.java @@ -28,8 +28,7 @@ public final class NavBarIdeView implements IdeView { public void selectElement(PsiElement element) { myPanel.getModel().updateModel(element, null); - if (element instanceof Navigatable) { - final Navigatable navigatable = (Navigatable)element; + if (element instanceof Navigatable navigatable) { if (navigatable.canNavigate()) { ((Navigatable)element).navigate(true); } diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java index 7f64ec5bf681..14b1c470c2e0 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java @@ -343,8 +343,7 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis static Object expandDirsWithJustOneSubdir(Object target) { if (target instanceof PsiElement && !((PsiElement)target).isValid()) return target; - if (target instanceof PsiDirectory) { - PsiDirectory directory = (PsiDirectory)target; + if (target instanceof PsiDirectory directory) { for (VirtualFile file = directory.getVirtualFile(), next; ; file = next) { VirtualFile[] children = file.getChildren(); VirtualFile child = children.length == 1 ? children[0] : null; @@ -664,8 +663,7 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis protected void doubleClick(final Object object) { Object target = ObjectUtils.chooseNotNull(getNavigatable(object), object); - if (target instanceof Navigatable) { - Navigatable navigatable = (Navigatable)target; + if (target instanceof Navigatable navigatable) { if (navigatable.canNavigate()) { navigatable.navigate(true); } @@ -758,8 +756,7 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis } public static boolean isExpandable(Object obj) { - if (!(obj instanceof PsiElement)) return true; - PsiElement psiElement = (PsiElement)obj; + if (!(obj instanceof PsiElement psiElement)) return true; for (NavBarModelExtension modelExtension : NavBarModelExtension.EP_NAME.getExtensionList()) { Boolean expand = modelExtension.shouldExpandOnClick(psiElement); if (expand != null) return expand; diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java index 0050f027f2a8..a157794c2229 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java @@ -166,8 +166,7 @@ public final class NavBarPresentation { return getErrorAttributes(); } } - else if (object instanceof Project) { - Project project = (Project)object; + else if (object instanceof Project project) { Module[] modules = ReadAction.compute(() -> ModuleManager.getInstance(project).getModules()); WolfTheProblemSolver problemSolver = WolfTheProblemSolver.getInstance(project); for (Module module : modules) { diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarUpdateQueue.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarUpdateQueue.java index 9ecead3b6f2a..172694af9446 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarUpdateQueue.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarUpdateQueue.java @@ -129,8 +129,7 @@ public class NavBarUpdateQueue extends MergingUpdateQueue { } else { final Window window = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow(); - if (window instanceof Dialog) { - final Dialog dialog = (Dialog)window; + if (window instanceof Dialog dialog) { if (dialog.isModal() && !SwingUtilities.isDescendingFrom(myPanel, dialog)) { return; } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java index d23e8e3cbc01..50cd5189333d 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java @@ -55,12 +55,11 @@ public abstract class BaseProjectTreeBuilder extends AbstractTreeBuilder { @NotNull @Override public Promise revalidateElement(@NotNull Object element) { - if (!(element instanceof AbstractTreeNode)) { + if (!(element instanceof AbstractTreeNode node)) { return Promises.rejectedPromise(); } final AsyncPromise result = new AsyncPromise<>(); - AbstractTreeNode node = (AbstractTreeNode)element; final Object value = node.getValue(); final VirtualFile virtualFile = PsiUtilCore.getVirtualFile(ObjectUtils.tryCast(value, PsiElement.class)); batch(indicator -> { @@ -372,8 +371,7 @@ public abstract class BaseProjectTreeBuilder extends AbstractTreeBuilder { @Override protected boolean validateNode(@NotNull final Object child) { - if (child instanceof ProjectViewNode) { - final ProjectViewNode projectViewNode = (ProjectViewNode)child; + if (child instanceof ProjectViewNode projectViewNode) { return projectViewNode.validate(); } return true; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPSIPane.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPSIPane.java index 4b2ac31f2118..2dddc26cd58d 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPSIPane.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPSIPane.java @@ -89,8 +89,7 @@ public abstract class AbstractProjectViewPSIPane extends AbstractProjectViewPane Disposer.register(this, new TreeUpdater<>(painter, treePaneScroll, myTree) { @Override protected void update(ErrorStripePainter painter, int index, Object object) { - if (object instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)object; + if (object instanceof DefaultMutableTreeNode node) { object = node.getUserObject(); } super.update(painter, index, getStripe(object, myTree.isExpanded(index))); @@ -299,8 +298,7 @@ public abstract class AbstractProjectViewPSIPane extends AbstractProjectViewPane */ protected ErrorStripe getStripe(Object object, boolean expanded) { if (expanded && object instanceof PsiDirectoryNode) return null; - if (object instanceof PresentableNodeDescriptor) { - PresentableNodeDescriptor node = (PresentableNodeDescriptor)object; + if (object instanceof PresentableNodeDescriptor node) { TextAttributesKey key = node.getPresentation().getTextAttributesKey(); TextAttributes attributes = key == null ? null : EditorColorsManager.getInstance().getSchemeForCurrentUITheme().getAttributes(key); Color color = attributes == null ? null : attributes.getErrorStripeColor(); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java index 0a1fd1a4b025..de74b75467bd 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java @@ -632,8 +632,7 @@ public abstract class AbstractProjectViewPane implements DataProvider, Disposabl @Nullable protected Module getNodeModule(@Nullable final Object element) { - if (element instanceof PsiElement) { - PsiElement psiElement = (PsiElement)element; + if (element instanceof PsiElement psiElement) { return ModuleUtilCore.findModuleForPsiElement(psiElement); } return null; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPaneWithAsyncSupport.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPaneWithAsyncSupport.java index 40ace1764fa0..c476fd036318 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPaneWithAsyncSupport.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPaneWithAsyncSupport.java @@ -82,8 +82,7 @@ public abstract class AbstractProjectViewPaneWithAsyncSupport extends AbstractPr Disposer.register(this, new TreeUpdater<>(painter, treePaneScroll, myTree) { @Override protected void update(ErrorStripePainter painter, int index, Object object) { - if (object instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)object; + if (object instanceof DefaultMutableTreeNode node) { object = node.getUserObject(); } super.update(painter, index, getStripe(object, myTree.isExpanded(index))); @@ -228,8 +227,7 @@ public abstract class AbstractProjectViewPaneWithAsyncSupport extends AbstractPr */ protected ErrorStripe getStripe(Object object, boolean expanded) { if (expanded && object instanceof PsiDirectoryNode) return null; - if (object instanceof PresentableNodeDescriptor) { - PresentableNodeDescriptor node = (PresentableNodeDescriptor)object; + if (object instanceof PresentableNodeDescriptor node) { TextAttributesKey key = node.getPresentation().getTextAttributesKey(); TextAttributes attributes = key == null ? null : EditorColorsManager.getInstance().getSchemeForCurrentUITheme().getAttributes(key); Color color = attributes == null ? null : attributes.getErrorStripeColor(); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AsyncProjectViewSupport.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AsyncProjectViewSupport.java index 8f3dacaa250a..9bc4628d1bea 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AsyncProjectViewSupport.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AsyncProjectViewSupport.java @@ -145,8 +145,7 @@ public class AsyncProjectViewSupport { } public ActionCallback select(JTree tree, Object object, VirtualFile file) { - if (object instanceof AbstractTreeNode) { - AbstractTreeNode node = (AbstractTreeNode)object; + if (object instanceof AbstractTreeNode node) { object = node.getValue(); LOG.debug("select AbstractTreeNode"); } @@ -189,12 +188,10 @@ public class AsyncProjectViewSupport { private static boolean selectPaths(@NotNull JTree tree, @NotNull List paths, @NotNull TreeVisitor visitor) { if (paths.isEmpty()) return false; if (paths.size() > 1) { - if (visitor instanceof ProjectViewNodeVisitor) { - ProjectViewNodeVisitor nodeVisitor = (ProjectViewNodeVisitor)visitor; + if (visitor instanceof ProjectViewNodeVisitor nodeVisitor) { return selectPaths(tree, new SelectionDescriptor(nodeVisitor.getElement(), nodeVisitor.getFile(), paths)); } - if (visitor instanceof ProjectViewFileVisitor) { - ProjectViewFileVisitor fileVisitor = (ProjectViewFileVisitor)visitor; + if (visitor instanceof ProjectViewFileVisitor fileVisitor) { return selectPaths(tree, new SelectionDescriptor(null, fileVisitor.getElement(), paths)); } } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/GroupByTypeComparator.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/GroupByTypeComparator.java index f728b25a92cf..3ed473ab8c5e 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/GroupByTypeComparator.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/GroupByTypeComparator.java @@ -47,9 +47,7 @@ public class GroupByTypeComparator implements Comparator> { } } - if (descriptor1 instanceof ProjectViewNode && descriptor2 instanceof ProjectViewNode) { - ProjectViewNode node1 = (ProjectViewNode)descriptor1; - ProjectViewNode node2 = (ProjectViewNode)descriptor2; + if (descriptor1 instanceof ProjectViewNode node1 && descriptor2 instanceof ProjectViewNode node2) { NodeSortSettings settings = new NodeSortSettings(isManualOrder(), isFoldersAlwaysOnTop(), isSortByType()); int sortResult = node1.getSortOrder(settings).compareTo(node2.getSortOrder(settings)); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/LibraryModuleGroupUrl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/LibraryModuleGroupUrl.java index 360a86ad0fef..e94aa1bc8578 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/LibraryModuleGroupUrl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/LibraryModuleGroupUrl.java @@ -45,8 +45,7 @@ public class LibraryModuleGroupUrl extends AbstractUrl { @Override public AbstractUrl createUrlByElement(Object element) { - if (element instanceof LibraryGroupElement) { - LibraryGroupElement libraryGroupElement = (LibraryGroupElement)element; + if (element instanceof LibraryGroupElement libraryGroupElement) { return new LibraryModuleGroupUrl(libraryGroupElement.getModule() != null ? libraryGroupElement.getModule().getName() : null); } return null; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroupUrl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroupUrl.java index 87a56df3f9e3..846eeaf874db 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroupUrl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroupUrl.java @@ -43,8 +43,7 @@ public class ModuleGroupUrl extends AbstractUrl { @Override public AbstractUrl createUrlByElement(Object element) { - if (element instanceof ModuleGroup) { - ModuleGroup group = (ModuleGroup)element; + if (element instanceof ModuleGroup group) { final String[] groupPath = group.getGroupPath(); return new ModuleGroupUrl(StringUtil.join(groupPath, ";")); } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleUrl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleUrl.java index 278e1ac9bece..cdc749edf63a 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleUrl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleUrl.java @@ -42,8 +42,7 @@ public class ModuleUrl extends AbstractUrl { @Override public AbstractUrl createUrlByElement(Object element) { - if (element instanceof Module) { - Module module = (Module)element; + if (element instanceof Module module) { return new ModuleUrl("", module.getName()); } return null; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/NamedLibraryUrl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/NamedLibraryUrl.java index 240ed34b0868..0e69d8fa3bb3 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/NamedLibraryUrl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/NamedLibraryUrl.java @@ -50,8 +50,7 @@ public class NamedLibraryUrl extends AbstractUrl { @Override public AbstractUrl createUrlByElement(Object element) { - if (element instanceof NamedLibraryElement) { - NamedLibraryElement libraryElement = (NamedLibraryElement)element; + if (element instanceof NamedLibraryElement libraryElement) { Module context = libraryElement.getModule(); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectTreeBuilder.java index 1b439a913a58..a233eb7195d7 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectTreeBuilder.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectTreeBuilder.java @@ -157,8 +157,7 @@ public class ProjectTreeBuilder extends BaseProjectTreeBuilder { } private void updateNodesContaining(@NotNull Collection filesToRefresh, @NotNull DefaultMutableTreeNode rootNode) { - if (!(rootNode.getUserObject() instanceof ProjectViewNode)) return; - ProjectViewNode node = (ProjectViewNode)rootNode.getUserObject(); + if (!(rootNode.getUserObject() instanceof ProjectViewNode node)) return; Collection containingFiles = null; for (VirtualFile virtualFile : filesToRefresh) { if (!virtualFile.isValid()) { diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDeleteElementProvider.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDeleteElementProvider.java index 3992905d71f1..ecdd575cb117 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDeleteElementProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDeleteElementProvider.java @@ -69,8 +69,7 @@ public abstract class ProjectViewDeleteElementProvider implements DeleteProvider PsiElement[] elements = getSelectedPSIElements(dataContext); for (int idx = 0; idx < elements.length; idx++) { final PsiElement element = elements[idx]; - if (element instanceof PsiDirectory) { - PsiDirectory directory = (PsiDirectory)element; + if (element instanceof PsiDirectory directory) { final ProjectViewDirectoryHelper directoryHelper = ProjectViewDirectoryHelper.getInstance(project); if (hideEmptyMiddlePackages(dataContext) && directory.getChildren().length == 0 && diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDropTarget.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDropTarget.java index 2cd51da0f361..1adcc5a77ede 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDropTarget.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDropTarget.java @@ -330,8 +330,7 @@ abstract class ProjectViewDropTarget implements DnDNativeTarget { } final PsiDirectory psiDirectory; - if (targetElement instanceof PsiDirectoryContainer) { - final PsiDirectoryContainer directoryContainer = (PsiDirectoryContainer)targetElement; + if (targetElement instanceof PsiDirectoryContainer directoryContainer) { final PsiDirectory[] psiDirectories = directoryContainer.getDirectories(); psiDirectory = psiDirectories.length != 0 ? psiDirectories[0] : null; } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index 8968d651f69d..0d8f1778b6ca 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -940,8 +940,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo viewSelectionChanged(); Object multicaster = EditorFactory.getInstance().getEventMulticaster(); - if (multicaster instanceof EditorEventMulticasterEx) { - EditorEventMulticasterEx ex = (EditorEventMulticasterEx)multicaster; + if (multicaster instanceof EditorEventMulticasterEx ex) { ex.addFocusChangeListener(new FocusChangeListener() { @Override public void focusLost(@NotNull Editor editor, @NotNull FocusEvent event) { @@ -1214,8 +1213,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo ProjectViewNode descriptor = TreeUtil.getLastUserObject(ProjectViewNode.class, path); if (descriptor != null) { Object element = descriptor.getValue(); - if (element instanceof PsiElement) { - PsiElement psiElement = (PsiElement)element; + if (element instanceof PsiElement psiElement) { if (!psiElement.isValid()) return null; return psiElement; } @@ -1742,8 +1740,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo @Nullable private SimpleSelectInContext getSelectInContext(@Nullable FileEditor fileEditor) { - if (fileEditor instanceof TextEditor) { - TextEditor textEditor = (TextEditor)fileEditor; + if (fileEditor instanceof TextEditor textEditor) { PsiFile psiFile = PsiDocumentManager.getInstance(myProject).getPsiFile(textEditor.getEditor().getDocument()); return psiFile == null ? null : new EditorSelectInContext(psiFile, textEditor.getEditor()); } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java index c1e5bc284488..97eb0734682b 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java @@ -99,8 +99,7 @@ public class ProjectViewTree extends DnDAwareTree { @Nullable @Override public Color getFileColorFor(Object object) { - if (object instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)object; + if (object instanceof DefaultMutableTreeNode node) { object = node.getUserObject(); } if (object instanceof PresentableNodeDescriptor) { diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractPsiBasedNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractPsiBasedNode.java index 86051c3d7b88..2fd2ca85ff56 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractPsiBasedNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractPsiBasedNode.java @@ -132,8 +132,7 @@ public abstract class AbstractPsiBasedNode extends ProjectViewNode @Nullable private VirtualFile getVirtualFileForValue() { Object value = getEqualityObject(); - if (value instanceof SmartPsiElementPointer) { - SmartPsiElementPointer pointer = (SmartPsiElementPointer)value; + if (value instanceof SmartPsiElementPointer pointer) { return pointer.getVirtualFile(); // do not retrieve PSI element } PsiElement psiElement = extractPsiFromValue(); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ExternalLibrariesNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ExternalLibrariesNode.java index 4c868f95b04a..621b7b18b822 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ExternalLibrariesNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ExternalLibrariesNode.java @@ -56,8 +56,7 @@ public class ExternalLibrariesNode extends ProjectViewNode { final ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module); final OrderEntry[] orderEntries = moduleRootManager.getOrderEntries(); for (final OrderEntry orderEntry : orderEntries) { - if (orderEntry instanceof LibraryOrderEntry) { - final LibraryOrderEntry libraryOrderEntry = (LibraryOrderEntry)orderEntry; + if (orderEntry instanceof LibraryOrderEntry libraryOrderEntry) { final Library library = libraryOrderEntry.getLibrary(); if (library == null) continue; String libraryPresentableName = libraryOrderEntry.getPresentableName(); @@ -76,8 +75,7 @@ public class ExternalLibrariesNode extends ProjectViewNode { children.add(new NamedLibraryElementNode(project, new NamedLibraryElement(null, libraryOrderEntry), getSettings())); } } - else if (orderEntry instanceof JdkOrderEntry) { - final JdkOrderEntry jdkOrderEntry = (JdkOrderEntry)orderEntry; + else if (orderEntry instanceof JdkOrderEntry jdkOrderEntry) { final Sdk jdk = jdkOrderEntry.getJdk(); if (jdk != null) { if (processedSdk.contains(jdk)) continue; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupElement.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupElement.java index b618127e9095..a8e45b4e4731 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupElement.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupElement.java @@ -38,9 +38,7 @@ public final class LibraryGroupElement { public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof LibraryGroupElement)) return false; - - final LibraryGroupElement libraryGroupElement = (LibraryGroupElement)o; + if (!(o instanceof LibraryGroupElement libraryGroupElement)) return false; if (!myModule.equals(libraryGroupElement.myModule)) return false; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupNode.java index 4d8c2517dc5d..ad299f61bd32 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupNode.java @@ -41,8 +41,7 @@ public class LibraryGroupNode extends ProjectViewNode { List> children = new ArrayList<>(); OrderEntry[] orderEntries = moduleRootManager.getOrderEntries(); for (final OrderEntry orderEntry : orderEntries) { - if (orderEntry instanceof LibraryOrderEntry) { - final LibraryOrderEntry libraryOrderEntry = (LibraryOrderEntry)orderEntry; + if (orderEntry instanceof LibraryOrderEntry libraryOrderEntry) { final Library library = libraryOrderEntry.getLibrary(); if (library == null) { continue; @@ -55,8 +54,7 @@ public class LibraryGroupNode extends ProjectViewNode { children.add(new NamedLibraryElementNode(getProject(), new NamedLibraryElement(module, libraryOrderEntry), getSettings())); } } - else if (orderEntry instanceof JdkOrderEntry) { - final JdkOrderEntry jdkOrderEntry = (JdkOrderEntry)orderEntry; + else if (orderEntry instanceof JdkOrderEntry jdkOrderEntry) { final Sdk jdk = jdkOrderEntry.getJdk(); if (jdk != null) { children.add(new NamedLibraryElementNode(getProject(), new NamedLibraryElement(module, jdkOrderEntry), getSettings())); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElement.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElement.java index 531b5cbc7110..37165fe2511a 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElement.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElement.java @@ -45,9 +45,7 @@ public final class NamedLibraryElement { public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof NamedLibraryElement)) return false; - - final NamedLibraryElement namedLibraryElement = (NamedLibraryElement)o; + if (!(o instanceof NamedLibraryElement namedLibraryElement)) return false; if (!myEntry.equals(namedLibraryElement.myEntry)) return false; if (!Comparing.equal(myContextModule, namedLibraryElement.myContextModule)) return false; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElementNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElementNode.java index 7076da910eab..e95ef1cbc3ba 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElementNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElementNode.java @@ -83,8 +83,7 @@ public class NamedLibraryElementNode extends ProjectViewNode implements Navig */ @Nullable private static VirtualFile getVirtualFile(Object element) { - if (element instanceof PsiDirectory) { - PsiDirectory directory = (PsiDirectory)element; + if (element instanceof PsiDirectory directory) { return directory.getVirtualFile(); } return element instanceof VirtualFile ? (VirtualFile)element : null; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiTreeAnchorizer.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiTreeAnchorizer.java index 69da4c578d44..f76f2ce644b0 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiTreeAnchorizer.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiTreeAnchorizer.java @@ -29,8 +29,7 @@ public class PsiTreeAnchorizer extends TreeAnchorizer { @NotNull @Override public Object createAnchor(@NotNull Object element) { - if (element instanceof PsiElement) { - PsiElement psi = (PsiElement)element; + if (element instanceof PsiElement psi) { return ReadAction.compute(() -> { if (!psi.isValid()) return psi; return SmartPointerManager.getInstance(psi.getProject()).createSmartPsiElementPointer(psi); diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/NamedScopeFilter.java b/platform/lang-impl/src/com/intellij/ide/scopeView/NamedScopeFilter.java index 2f89a9794d7e..e80e364d042f 100644 --- a/platform/lang-impl/src/com/intellij/ide/scopeView/NamedScopeFilter.java +++ b/platform/lang-impl/src/com/intellij/ide/scopeView/NamedScopeFilter.java @@ -53,8 +53,7 @@ public final class NamedScopeFilter implements VirtualFileFilter { if (set == null) return false; Project project = holder.getProject(); - if (set instanceof PackageSetBase) { - PackageSetBase base = (PackageSetBase)set; + if (set instanceof PackageSetBase base) { return base.contains(file, project, holder); } PsiFile psiFile = PackageSetBase.getPsiFile(file, project); diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewTreeModel.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewTreeModel.java index e96db4974819..dd092b6ae477 100644 --- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewTreeModel.java +++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewTreeModel.java @@ -101,8 +101,7 @@ final class ScopeViewTreeModel extends BaseTreeModel> implem } else { Object component = path.getLastPathComponent(); - if (component instanceof ProjectFileNode) { - ProjectFileNode node = (ProjectFileNode)component; + if (component instanceof ProjectFileNode node) { notifyStructureChanged(node.getVirtualFile()); } } @@ -277,8 +276,7 @@ final class ScopeViewTreeModel extends BaseTreeModel> implem } boolean resolveCompactedFolder = !flattenPackages && file.isDirectory() && root.getSettings().isCompactDirectories(); find(file, null, found -> { - if (found instanceof Node) { - Node node = (Node)found; + if (found instanceof Node node) { if (resolveCompactedFolder) { AbstractTreeNode parent = node.getParent(); if (parent instanceof Node) { @@ -372,14 +370,12 @@ final class ScopeViewTreeModel extends BaseTreeModel> implem @NotNull @Override public List> getChildren(Object object) { - if (object instanceof AbstractTreeNode && model.isValidThread()) { - AbstractTreeNode parent = (AbstractTreeNode)object; + if (object instanceof AbstractTreeNode parent && model.isValidThread()) { Collection children = parent.getChildren(); if (!children.isEmpty()) { List> result = new SmartList<>(); children.forEach(child -> { - if (child instanceof AbstractTreeNode) { - AbstractTreeNode node = (AbstractTreeNode)child; + if (child instanceof AbstractTreeNode node) { node.setParent(parent); node.update(); result.add(node); @@ -400,8 +396,7 @@ final class ScopeViewTreeModel extends BaseTreeModel> implem if (expanded && object instanceof Node) { return null; } - if (object instanceof PresentableNodeDescriptor) { - PresentableNodeDescriptor node = (PresentableNodeDescriptor)object; + if (object instanceof PresentableNodeDescriptor node) { TextAttributesKey key = node.getPresentation().getTextAttributesKey(); TextAttributes attributes = key == null ? null : EditorColorsManager.getInstance().getSchemeForCurrentUITheme().getAttributes(key); Color color = attributes == null ? null : attributes.getErrorStripeColor(); @@ -440,8 +435,7 @@ final class ScopeViewTreeModel extends BaseTreeModel> implem @Override public final boolean canRepresent(Object element) { // may be called from unexpected thread - if (element instanceof PsiFileSystemItem) { - PsiFileSystemItem item = (PsiFileSystemItem)element; + if (element instanceof PsiFileSystemItem item) { element = item.getVirtualFile(); } return element instanceof VirtualFile && canRepresent((VirtualFile)element); @@ -1013,8 +1007,7 @@ final class ScopeViewTreeModel extends BaseTreeModel> implem HashMap map = new HashMap<>(); nodes.forEach(node -> { Object id = node.node.getRootID(); - if (id instanceof Module) { - Module module = (Module)id; + if (id instanceof Module module) { Group group = map.get(module); if (group == null) { group = new Group(module); @@ -1250,8 +1243,7 @@ final class ScopeViewTreeModel extends BaseTreeModel> implem private static boolean is(@Nullable Icon icon, @NotNull Icon expected) { if (expected.equals(icon)) return true; - if (icon instanceof CompositeIcon) { - CompositeIcon composite = (CompositeIcon)icon; + if (icon instanceof CompositeIcon composite) { for (int i = 0; i < composite.getIconCount(); i++) { if (is(composite.getIcon(i), expected)) return true; } @@ -1259,8 +1251,7 @@ final class ScopeViewTreeModel extends BaseTreeModel> implem if (icon instanceof DeferredIcon) { return false; // do not calculate complex icons at this point } - if (icon instanceof RetrievableIcon) { - RetrievableIcon retrievable = (RetrievableIcon)icon; + if (icon instanceof RetrievableIcon retrievable) { if (retrievable.isComplex()) { return false; } diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/nodes/BasePsiNode.java b/platform/lang-impl/src/com/intellij/ide/scopeView/nodes/BasePsiNode.java index 9705a03e82c7..bdf13ef51ac7 100644 --- a/platform/lang-impl/src/com/intellij/ide/scopeView/nodes/BasePsiNode.java +++ b/platform/lang-impl/src/com/intellij/ide/scopeView/nodes/BasePsiNode.java @@ -87,9 +87,7 @@ public class BasePsiNode extends PackageDependenciesNode { return super.equals(o); } if (this == o) return true; - if (!(o instanceof BasePsiNode)) return false; - - final BasePsiNode methodNode = (BasePsiNode)o; + if (!(o instanceof BasePsiNode methodNode)) return false; if (!Comparing.equal(getPsiElement(), methodNode.getPsiElement())) return false; diff --git a/platform/lang-impl/src/com/intellij/ide/todo/SmartTodoItemPointer.java b/platform/lang-impl/src/com/intellij/ide/todo/SmartTodoItemPointer.java index 8e8447719e60..3417baa3c79e 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/SmartTodoItemPointer.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/SmartTodoItemPointer.java @@ -44,10 +44,9 @@ public final class SmartTodoItemPointer { } public boolean equals(Object obj){ - if(!(obj instanceof SmartTodoItemPointer)){ + if(!(obj instanceof SmartTodoItemPointer pointer)){ return false; } - SmartTodoItemPointer pointer=(SmartTodoItemPointer)obj; if (!(myTodoItem.getFile().equals(pointer.myTodoItem.getFile())&& myRangeMarker.getStartOffset()==pointer.myRangeMarker.getStartOffset()&& myRangeMarker.getEndOffset()==pointer.myRangeMarker.getEndOffset()&& diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoCompositeRenderer.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoCompositeRenderer.java index c861d2e2a6fe..b987745cd345 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoCompositeRenderer.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoCompositeRenderer.java @@ -43,9 +43,7 @@ final class TodoCompositeRenderer implements TreeCellRenderer { myMultiLineRenderer.getTreeCellRendererComponent(tree, obj, selected, expanded, leaf, row, hasFocus); result = myMultiLineRenderer; } - else if (userObject instanceof NodeDescriptor && userObject instanceof HighlightedRegionProvider) { - NodeDescriptor descriptor = (NodeDescriptor)userObject; - HighlightedRegionProvider regionProvider = (HighlightedRegionProvider)userObject; + else if (userObject instanceof NodeDescriptor descriptor && userObject instanceof HighlightedRegionProvider regionProvider) { myColorTreeCellRenderer.getTreeCellRendererComponent(tree, obj, selected, expanded, leaf, row, hasFocus); for (HighlightedRegion region : regionProvider.getHighlightedRegions()) { myColorTreeCellRenderer.addHighlighter(region.startOffset, region.endOffset, region.textAttributes); diff --git a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java index 83a656902d4c..e67a15c1ca31 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java @@ -205,8 +205,7 @@ public class DirectoryChooserModuleTreeView implements DirectoryChooserView { @Override public void customizeCellRenderer(@NotNull JTree tree, Object nodeValue, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { final Object value = ((DefaultMutableTreeNode)nodeValue).getUserObject(); - if (value instanceof DirectoryChooser.ItemWrapper) { - DirectoryChooser.ItemWrapper wrapper = (DirectoryChooser.ItemWrapper)value; + if (value instanceof DirectoryChooser.ItemWrapper wrapper) { DirectoryChooser.PathFragment[] fragments = wrapper.getFragments(); for (DirectoryChooser.PathFragment fragment : fragments) { append(fragment.getText(), @@ -214,12 +213,10 @@ public class DirectoryChooserModuleTreeView implements DirectoryChooserView { } setIcon(wrapper.getIcon()); } - else if (value instanceof Module) { - final Module module = (Module)value; + else if (value instanceof Module module) { append(myModuleGrouper.getShortenedName(module), SimpleTextAttributes.REGULAR_ATTRIBUTES); setIcon(ModuleType.get(module).getIcon()); - } else if (value instanceof ModuleGroup) { - ModuleGroup moduleGroup = (ModuleGroup)value; + } else if (value instanceof ModuleGroup moduleGroup) { append(moduleGroup.toString(), SimpleTextAttributes.REGULAR_ATTRIBUTES); setIcon(PlatformIcons.CLOSED_MODULE_GROUP_ICON); } diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java index babc66c5972b..7ee62a863734 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java +++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java @@ -461,8 +461,7 @@ public final class FileStructurePopup implements Disposable, TreeActionsOwner { List fileStructureNodeProviders = new ArrayList<>(); if (myTreeActionsOwner != null) { for (Filter filter : myTreeModel.getFilters()) { - if (filter instanceof FileStructureFilter) { - FileStructureFilter fsFilter = (FileStructureFilter)filter; + if (filter instanceof FileStructureFilter fsFilter) { myTreeActionsOwner.setActionIncluded(fsFilter, true); fileStructureFilters.add(fsFilter); } @@ -1008,8 +1007,7 @@ public final class FileStructurePopup implements Disposable, TreeActionsOwner { List elements = SpeedSearchObjectWithWeight.findElement(s, this); SpeedSearchObjectWithWeight best = ContainerUtil.getFirstItem(elements); if (best == null) return null; - if (myInitialElement instanceof PsiElement) { - PsiElement initial = (PsiElement)myInitialElement; + if (myInitialElement instanceof PsiElement initial) { // find children of the initial element SpeedSearchObjectWithWeight bestForParent = find(initial, elements, FileStructurePopup::isParent); if (bestForParent != null) return bestForParent.node; diff --git a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java index 0c88359caf92..4581fc5115bb 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java +++ b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java @@ -548,8 +548,7 @@ public class MemberChooser extends DialogWrapper implemen ParentNode newRoot = new ParentNode(null, new MemberChooserObjectBase(getAllContainersNodeName()), new Ref<>(0)); while (children.hasMoreElements()) { final ParentNode nextElement = (ParentNode)children.nextElement(); - if (nextElement instanceof ContainerNode) { - final ContainerNode containerNode = (ContainerNode)nextElement; + if (nextElement instanceof ContainerNode containerNode) { Enumeration memberNodes = containerNode.children(); List memberNodesList = new ArrayList<>(); while (memberNodes.hasMoreElements()) { @@ -679,8 +678,7 @@ public class MemberChooser extends DialogWrapper implemen if (paths == null) return; for (int i = 0; i < paths.length; i++) { Object node = paths[i].getLastPathComponent(); - if (node instanceof MemberNode) { - final MemberNode memberNode = (MemberNode)node; + if (node instanceof MemberNode memberNode) { if (e.isAddedPath(i)) { if (!mySelectedNodes.contains(memberNode)) { mySelectedNodes.add(memberNode); diff --git a/platform/lang-impl/src/com/intellij/ide/util/ModuleRendererFactory.java b/platform/lang-impl/src/com/intellij/ide/util/ModuleRendererFactory.java index 90c077a30e35..edd1b78d43b6 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/ModuleRendererFactory.java +++ b/platform/lang-impl/src/com/intellij/ide/util/ModuleRendererFactory.java @@ -63,10 +63,9 @@ public abstract class ModuleRendererFactory { return null; } Component component = renderer.getListCellRendererComponent(new JList<>(), element, -1, false, false); - if (!(component instanceof JLabel)) { + if (!(component instanceof JLabel label)) { return null; } - JLabel label = (JLabel)component; return new TextWithIcon(label.getText(), label.getIcon()); } } diff --git a/platform/lang-impl/src/com/intellij/ide/util/NavigationItemListCellRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/NavigationItemListCellRenderer.java index 705f7f1b2a3d..73036440e00f 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/NavigationItemListCellRenderer.java +++ b/platform/lang-impl/src/com/intellij/ide/util/NavigationItemListCellRenderer.java @@ -103,8 +103,7 @@ public class NavigationItemListCellRenderer extends JPanel implements ListCellRe setIcon(IconUtil.getEmptyIcon(false)); append(LangBundle.message("label.invalid"), SimpleTextAttributes.ERROR_ATTRIBUTES); } - else if (value instanceof NavigationItem) { - NavigationItem item = (NavigationItem)value; + else if (value instanceof NavigationItem item) { ItemPresentation presentation = item.getPresentation(); assert presentation != null: "PSI elements displayed in choose by name lists must return a non-null value from getPresentation(): element " + item + ", class " + item.getClass().getName(); diff --git a/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java b/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java index 7bec58b6231d..fee637207bdb 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java @@ -281,8 +281,7 @@ public final class TreeFileChooserDialog extends DialogWrapper implements TreeFi if (path == null) return null; final DefaultMutableTreeNode node = (DefaultMutableTreeNode)path.getLastPathComponent(); final Object userObject = node.getUserObject(); - if (!(userObject instanceof ProjectViewNode)) return null; - ProjectViewNode pvNode = (ProjectViewNode) userObject; + if (!(userObject instanceof ProjectViewNode pvNode)) return null; VirtualFile vFile = pvNode.getVirtualFile(); if (vFile != null && !vFile.isDirectory()) { return PsiManager.getInstance(myProject).findFile(vFile); @@ -438,8 +437,7 @@ public final class TreeFileChooserDialog extends DialogWrapper implements TreeFi continue; } else { - if (o instanceof ProjectViewNode) { - final ProjectViewNode projectViewNode = (ProjectViewNode)o; + if (o instanceof ProjectViewNode projectViewNode) { if (!projectViewNode.canHaveChildrenMatching(condition)) { continue; } diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java index 841f9df4b39a..aa5ae4397964 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java @@ -688,8 +688,7 @@ public abstract class ChooseByNameBase implements ChooseByNameViewModel { private static Set getShortcuts(@NotNull String actionId) { Set result = new HashSet<>(); for (Shortcut shortcut : KeymapUtil.getActiveKeymapShortcuts(actionId).getShortcuts()) { - if (shortcut instanceof KeyboardShortcut) { - KeyboardShortcut keyboardShortcut = (KeyboardShortcut)shortcut; + if (shortcut instanceof KeyboardShortcut keyboardShortcut) { result.add(keyboardShortcut.getFirstKeyStroke()); } } @@ -1610,8 +1609,7 @@ public abstract class ChooseByNameBase implements ChooseByNameViewModel { @NotNull Collection usages, @NotNull List targets) { for (Object o : matchElementsArray) { - if (o instanceof PsiElement) { - PsiElement element = (PsiElement)o; + if (o instanceof PsiElement element) { if (element.getTextRange() != null) { usages.add(new MyUsageInfo2UsageAdapter(element, false)); } @@ -1666,9 +1664,7 @@ public abstract class ChooseByNameBase implements ChooseByNameViewModel { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof MyUsageInfo2UsageAdapter)) return false; - - MyUsageInfo2UsageAdapter adapter = (MyUsageInfo2UsageAdapter)o; + if (!(o instanceof MyUsageInfo2UsageAdapter adapter)) return false; if (mySeparateGroup != adapter.mySeparateGroup) return false; if (!myElement.equals(adapter.myElement)) return false; diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java index 70094202e73a..037c4d2313f9 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java @@ -272,8 +272,7 @@ public final class GotoActionModel implements ChooseByNameModel, Comparator implements @Override protected boolean acceptItem(final NavigationItem item) { - if (item instanceof PsiFile) { - final PsiFile file = (PsiFile)item; + if (item instanceof PsiFile file) { final Collection types = getFilterItems(); // if language substitutors are used, PsiFile.getFileType() can be different from // PsiFile.getVirtualFile().getFileType() diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ListChooseByNameModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ListChooseByNameModel.java index 3bc4688e4cf8..57bf81eaf829 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ListChooseByNameModel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ListChooseByNameModel.java @@ -95,8 +95,7 @@ public class ListChooseByNameModel extends SimpleCho final Color bg = isSelected ? UIUtil.getListSelectionBackground(true) : UIUtil.getListBackground(); panel.setBackground(bg); - if (value instanceof ChooseByNameItem) { - final ChooseByNameItem item = (ChooseByNameItem) value; + if (value instanceof ChooseByNameItem item) { final Color fg; fg = isSelected ? NamedColorUtil.getListSelectionForeground(true) : UIUtil.getListForeground(); diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java index 9cec0dd76f7d..ccba01c4b5f3 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java @@ -247,8 +247,7 @@ public class ScopeChooserConfigurable extends MasterDetailsComponent implements @Override protected boolean wasObjectStored(Object editableObject) { - if (editableObject instanceof NamedScope) { - NamedScope scope = (NamedScope)editableObject; + if (editableObject instanceof NamedScope scope) { final String scopeId = scope.getScopeId(); return myLocalScopesManager.getScope(scopeId) != null || mySharedScopesManager.getScope(scopeId) != null; } @@ -483,8 +482,7 @@ public class ScopeChooserConfigurable extends MasterDetailsComponent implements if (selectionPath != null) { MyNode node = (MyNode)selectionPath.getLastPathComponent(); NamedConfigurable configurable = node.getConfigurable(); - if (configurable instanceof ScopeConfigurable) { - final ScopeConfigurable scopeConfigurable = (ScopeConfigurable)configurable; + if (configurable instanceof ScopeConfigurable scopeConfigurable) { PackageSet set = scopeConfigurable.getEditableObject().getValue(); if (set != null) { if (scopeConfigurable.getHolder() == mySharedScopesManager) { diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeEditorPanel.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeEditorPanel.java index 74fba3a5027d..8350a7fc7409 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeEditorPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeEditorPanel.java @@ -625,8 +625,7 @@ public final class ScopeEditorPanel implements Disposable { boolean leaf, int row, boolean hasFocus) { - if (value instanceof PackageDependenciesNode) { - PackageDependenciesNode node = (PackageDependenciesNode)value; + if (value instanceof PackageDependenciesNode node) { setIcon(node.getIcon()); setForeground(UIUtil.getTreeForeground(selected, hasFocus)); diff --git a/platform/lang-impl/src/com/intellij/internal/cfgView/ShowControlFlowHandler.java b/platform/lang-impl/src/com/intellij/internal/cfgView/ShowControlFlowHandler.java index 00c70e373585..bfcac9f2c260 100644 --- a/platform/lang-impl/src/com/intellij/internal/cfgView/ShowControlFlowHandler.java +++ b/platform/lang-impl/src/com/intellij/internal/cfgView/ShowControlFlowHandler.java @@ -135,8 +135,7 @@ public class ShowControlFlowHandler implements CodeInsightActionHandler { for (Instruction instruction : flow.getInstructions()) { printInstruction(builder, instruction, provider); - if (instruction instanceof ConditionalInstruction) { - ConditionalInstruction conditionalInstruction = (ConditionalInstruction)instruction; + if (instruction instanceof ConditionalInstruction conditionalInstruction) { builder.append("\n").append("Its ").append(conditionalInstruction.getResult()). append(" branch, condition: ").append(conditionalInstruction.getCondition().getText()); } diff --git a/platform/lang-impl/src/com/intellij/internal/statistic/tools/InspectionsUsagesCollector.java b/platform/lang-impl/src/com/intellij/internal/statistic/tools/InspectionsUsagesCollector.java index a93a730e4a01..9275e5edf301 100644 --- a/platform/lang-impl/src/com/intellij/internal/statistic/tools/InspectionsUsagesCollector.java +++ b/platform/lang-impl/src/com/intellij/internal/statistic/tools/InspectionsUsagesCollector.java @@ -260,8 +260,7 @@ public final class InspectionsUsagesCollector extends ProjectUsagesCollector { Map set = new HashMap<>(options.size()); for (Content option : options) { - if (option instanceof Element) { - Element el = (Element)option; + if (option instanceof Element el) { Attribute nameAttr = el.getAttribute("name"); Attribute valueAttr = el.getAttribute("value"); if (nameAttr != null && valueAttr != null) { diff --git a/platform/lang-impl/src/com/intellij/lang/javascript/boilerplate/GithubTagListProvider.java b/platform/lang-impl/src/com/intellij/lang/javascript/boilerplate/GithubTagListProvider.java index 32759ae5d91d..357b0d2513f9 100644 --- a/platform/lang-impl/src/com/intellij/lang/javascript/boilerplate/GithubTagListProvider.java +++ b/platform/lang-impl/src/com/intellij/lang/javascript/boilerplate/GithubTagListProvider.java @@ -143,12 +143,10 @@ public class GithubTagListProvider { @NotNull private static ImmutableSet toGithubTagList(@NotNull JsonElement jsonElement) throws GeneratorException { - if (jsonElement instanceof JsonArray) { - JsonArray array = (JsonArray) jsonElement; + if (jsonElement instanceof JsonArray array) { ImmutableSet.Builder tags = ImmutableSet.builder(); for (JsonElement element : array) { - if (element instanceof JsonObject) { - JsonObject obj = (JsonObject) element; + if (element instanceof JsonObject obj) { JsonElement nameElement = obj.get("name"); String name = null; if (nameElement != null) { diff --git a/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/AbsoluteSymbolPosition.java b/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/AbsoluteSymbolPosition.java index 7965c7886fa9..f6ec34358bdf 100644 --- a/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/AbsoluteSymbolPosition.java +++ b/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/AbsoluteSymbolPosition.java @@ -26,8 +26,7 @@ class AbsoluteSymbolPosition { @Override public boolean equals(Object obj) { - if (obj instanceof AbsoluteSymbolPosition) { - AbsoluteSymbolPosition other = (AbsoluteSymbolPosition)obj; + if (obj instanceof AbsoluteSymbolPosition other) { if (pageNumber == other.pageNumber && symbolOffsetInPage == other.symbolOffsetInPage) { return true; } diff --git a/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/EditorModel.java b/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/EditorModel.java index b5eed9b7f811..73133ed4e123 100644 --- a/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/EditorModel.java +++ b/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/EditorModel.java @@ -118,8 +118,7 @@ public class EditorModel { private void insertGlobalScrollBarIntoEditorComponent() { JComponent mainPanelInEditor = editor.getComponent(); LayoutManager layout = mainPanelInEditor.getLayout(); - if (layout instanceof BorderLayout) { - BorderLayout borderLayout = (BorderLayout)layout; + if (layout instanceof BorderLayout borderLayout) { Component originalCentralComponent = borderLayout.getLayoutComponent(BorderLayout.CENTER); JBLayeredPane intermediatePane = new JBLayeredPane() { diff --git a/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileEditorImpl.java b/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileEditorImpl.java index 1d86c5e5ed02..2c0db7b22c64 100644 --- a/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileEditorImpl.java +++ b/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileEditorImpl.java @@ -118,8 +118,7 @@ public class LargeFileEditorImpl extends UserDataHolderBase implements LargeFile @Override public void setState(@NotNull FileEditorState state) { - if (state instanceof LargeFileEditorState) { - LargeFileEditorState largeFileEditorState = (LargeFileEditorState)state; + if (state instanceof LargeFileEditorState largeFileEditorState) { editorModel.setCaretAndShow(largeFileEditorState.caretPageNumber, largeFileEditorState.caretSymbolOffsetInPage); } diff --git a/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileEditorState.java b/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileEditorState.java index f9173e518785..72a9b25d921c 100644 --- a/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileEditorState.java +++ b/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileEditorState.java @@ -12,8 +12,7 @@ class LargeFileEditorState implements FileEditorState { @Override public boolean canBeMergedWith(@NotNull FileEditorState otherState, @NotNull FileEditorStateLevel level) { - if (otherState instanceof LargeFileEditorState) { - LargeFileEditorState state = (LargeFileEditorState)otherState; + if (otherState instanceof LargeFileEditorState state) { return caretPageNumber == state.caretPageNumber && caretSymbolOffsetInPage == state.caretSymbolOffsetInPage; } diff --git a/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileRegexSearchNotificationProvider.java b/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileRegexSearchNotificationProvider.java index 46ce0b5919f3..4ddfe1fadbd9 100644 --- a/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileRegexSearchNotificationProvider.java +++ b/platform/lang-impl/src/com/intellij/largeFilesEditor/editor/LargeFileRegexSearchNotificationProvider.java @@ -23,9 +23,8 @@ public final class LargeFileRegexSearchNotificationProvider implements EditorNot public @Nullable Function collectNotificationData(@NotNull Project project, @NotNull VirtualFile file) { return fileEditor -> { - if (!(fileEditor instanceof LargeFileEditor)) return null; + if (!(fileEditor instanceof LargeFileEditor largeFileEditor)) return null; - LargeFileEditor largeFileEditor = (LargeFileEditor)fileEditor; Editor editor = largeFileEditor.getEditor(); if (editor.getUserData(HIDDEN_KEY) != null) return null; diff --git a/platform/lang-impl/src/com/intellij/largeFilesEditor/search/SearchResult.java b/platform/lang-impl/src/com/intellij/largeFilesEditor/search/SearchResult.java index 794b25fdf54e..593b3f00cc7c 100644 --- a/platform/lang-impl/src/com/intellij/largeFilesEditor/search/SearchResult.java +++ b/platform/lang-impl/src/com/intellij/largeFilesEditor/search/SearchResult.java @@ -43,8 +43,7 @@ public class SearchResult { return true; } - if (target instanceof SearchResult) { - SearchResult targetResult = (SearchResult)target; + if (target instanceof SearchResult targetResult) { if (startPosition.equals(targetResult.startPosition) && endPostion.equals(targetResult.endPostion) && contextPrefix.equals(targetResult.contextPrefix) diff --git a/platform/lang-impl/src/com/intellij/model/BranchServiceImpl.java b/platform/lang-impl/src/com/intellij/model/BranchServiceImpl.java index c091048376df..8e92e412d6c6 100644 --- a/platform/lang-impl/src/com/intellij/model/BranchServiceImpl.java +++ b/platform/lang-impl/src/com/intellij/model/BranchServiceImpl.java @@ -25,8 +25,7 @@ class BranchServiceImpl extends BranchService implements Disposable { public void documentChanged(@NotNull DocumentEvent event) { Document document = event.getDocument(); VirtualFile file = FileDocumentManager.getInstance().getFile(document); - if (file instanceof BranchedVirtualFileImpl) { - BranchedVirtualFileImpl branchedFile = (BranchedVirtualFileImpl)file; + if (file instanceof BranchedVirtualFileImpl branchedFile) { branchedFile.getBranch().registerDocumentChange(document, event, branchedFile); } } diff --git a/platform/lang-impl/src/com/intellij/model/psi/impl/PsiElement2Declaration.java b/platform/lang-impl/src/com/intellij/model/psi/impl/PsiElement2Declaration.java index a17bc39587ca..73353e4d6746 100644 --- a/platform/lang-impl/src/com/intellij/model/psi/impl/PsiElement2Declaration.java +++ b/platform/lang-impl/src/com/intellij/model/psi/impl/PsiElement2Declaration.java @@ -96,8 +96,7 @@ class PsiElement2Declaration implements PsiSymbolDeclaration { @Nullable private static TextRange getDeclarationRangeFromPom(@NotNull PomTarget target, @NotNull PsiElement declaringElement) { - if (target instanceof PsiDeclaredTarget) { - PsiDeclaredTarget declaredTarget = (PsiDeclaredTarget)target; + if (target instanceof PsiDeclaredTarget declaredTarget) { TextRange nameIdentifierRange = declaredTarget.getNameIdentifierRange(); if (nameIdentifierRange != null) { PsiElement navigationElement = declaredTarget.getNavigationElement(); diff --git a/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java b/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java index 55404cdbb412..0cbedad8a608 100644 --- a/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java +++ b/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java @@ -64,8 +64,7 @@ public class ModulesDependenciesPanel extends JPanel implements Disposable { @Override public void customizeCellRenderer(@NotNull JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { Object userObject = ((DefaultMutableTreeNode)value).getUserObject(); - if (userObject instanceof MyUserObject) { - MyUserObject node = (MyUserObject)userObject; + if (userObject instanceof MyUserObject node) { setIcon(ModuleType.get(node.myModule).getIcon()); append(node.myModule.getName(), node.myInCycle ? SimpleTextAttributes.ERROR_ATTRIBUTES : SimpleTextAttributes.REGULAR_ATTRIBUTES); } @@ -428,8 +427,7 @@ public class ModulesDependenciesPanel extends JPanel implements Disposable { } if (LangDataKeys.MODULE_CONTEXT.is(dataId)) { TreePath selectionPath = myTree.getLeadSelectionPath(); - if (selectionPath != null && selectionPath.getLastPathComponent() instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)selectionPath.getLastPathComponent(); + if (selectionPath != null && selectionPath.getLastPathComponent() instanceof DefaultMutableTreeNode node) { if (node.getUserObject() instanceof MyUserObject) { return ((MyUserObject)node.getUserObject()).myModule; } @@ -440,8 +438,7 @@ public class ModulesDependenciesPanel extends JPanel implements Disposable { } if (CommonDataKeys.NAVIGATABLE.is(dataId)) { TreePath selectionPath = myTree.getLeadSelectionPath(); - if (selectionPath != null && selectionPath.getLastPathComponent() instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)selectionPath.getLastPathComponent(); + if (selectionPath != null && selectionPath.getLastPathComponent() instanceof DefaultMutableTreeNode node) { if (node.getUserObject() instanceof MyUserObject) { return node.getUserObject(); } diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/UnknownInvalidSdk.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/UnknownInvalidSdk.java index 488c16366aca..ea185883a7fb 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/UnknownInvalidSdk.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/UnknownInvalidSdk.java @@ -78,8 +78,7 @@ public class UnknownInvalidSdk implements UnknownSdk { @Nullable private static UnknownInvalidSdk resolveInvalidSdk(@NotNull Sdk sdk) { SdkTypeId type = sdk.getSdkType(); - if (!(type instanceof SdkType)) return null; - SdkType sdkType = (SdkType)type; + if (!(type instanceof SdkType sdkType)) return null; //for tests //noinspection TestOnlyProblems diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/impl/DetectedRootsChooserDialog.java b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/impl/DetectedRootsChooserDialog.java index d5956d6b3902..23707ec1bc18 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/impl/DetectedRootsChooserDialog.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/impl/DetectedRootsChooserDialog.java @@ -121,8 +121,7 @@ public class DetectedRootsChooserDialog extends DialogWrapper { CheckboxTreeTable treeTable = new CheckboxTreeTable(root, new CheckboxTree.CheckboxTreeCellRenderer(true) { @Override public void customizeRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { - if (!(value instanceof VirtualFileCheckedTreeNode)) return; - VirtualFileCheckedTreeNode node = (VirtualFileCheckedTreeNode)value; + if (!(value instanceof VirtualFileCheckedTreeNode node)) return; VirtualFile file = node.getFile(); @NlsSafe String text; SimpleTextAttributes attributes; diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java index cba50fe7952d..70c9602e7729 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java @@ -74,8 +74,7 @@ public class ProjectSettingsService { @Nullable private static Configurable getLibrarySettingsConfigurable(OrderEntry orderEntry) { - if (!(orderEntry instanceof LibraryOrderEntry)) return null; - LibraryOrderEntry libOrderEntry = (LibraryOrderEntry)orderEntry; + if (!(orderEntry instanceof LibraryOrderEntry libOrderEntry)) return null; Library lib = libOrderEntry.getLibrary(); if (lib instanceof LibraryEx) { Project project = libOrderEntry.getOwnerModule().getProject(); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListItem.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListItem.java index 65597f136534..da5bd205ea5f 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListItem.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListItem.java @@ -39,8 +39,7 @@ public abstract class SdkListItem { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof SdkReferenceItem)) return false; - SdkReferenceItem item = (SdkReferenceItem)o; + if (!(o instanceof SdkReferenceItem item)) return false; return sdkType.equals(item.sdkType) && name.equals(item.name); } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListModel.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListModel.java index dd8feb84edd2..d16c9e9b83ca 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListModel.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListModel.java @@ -114,8 +114,7 @@ public final class SdkListModel extends AbstractListModel implement public @Nullable SdkItem findSdkItem(@Nullable Sdk value) { if (value == null) return null; for (SdkListItem item : myItems) { - if (!(item instanceof SdkItem)) continue; - SdkItem sdkItem = (SdkItem)item; + if (!(item instanceof SdkItem sdkItem)) continue; if (sdkItem.hasSameSdk(value)) { return sdkItem; } @@ -126,8 +125,7 @@ public final class SdkListModel extends AbstractListModel implement public @Nullable SdkItem findSdkItem(@Nullable String sdkName) { if (sdkName == null) return null; for (SdkListItem item : myItems) { - if (!(item instanceof SdkItem)) continue; - SdkItem sdkItem = (SdkItem)item; + if (!(item instanceof SdkItem sdkItem)) continue; Sdk sdk = sdkItem.sdk; if (sdkName.equals(sdk.getName())) { return sdkItem; diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListModelBuilder.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListModelBuilder.java index 7aac332f5b0e..1a12b6412613 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListModelBuilder.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListModelBuilder.java @@ -289,8 +289,7 @@ public final class SdkListModelBuilder { return true; } - if (item instanceof SuggestedItem) { - SuggestedItem suggestedItem = (SuggestedItem)item; + if (item instanceof SuggestedItem suggestedItem) { String homePath = suggestedItem.homePath; ProgressManager.getInstance().run(new Task.Modal(myProject, diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListPresenter.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListPresenter.java index 803dd77ac5d4..372d5f70eb98 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListPresenter.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListPresenter.java @@ -195,8 +195,7 @@ public class SdkListPresenter extends ColoredListCellRenderer { getAccessibleContext().setAccessibleName(ProjectBundle.message("jdk.combo.box.no.sdk.item.accessibility")); setIcon(null); } - else if (value instanceof SdkReferenceItem) { - SdkReferenceItem item = (SdkReferenceItem)value; + else if (value instanceof SdkReferenceItem item) { SdkAppearanceService.getInstance() .forSdk(item.sdkType, item.name, null, item.hasValidPath, false, selected) diff --git a/platform/lang-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java b/platform/lang-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java index a0bb32dd6380..21f0760d7e04 100644 --- a/platform/lang-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java +++ b/platform/lang-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java @@ -119,10 +119,9 @@ public final class ProjectWindowActionGroup extends DefaultActionGroup { } final AnAction[] children = getChildren(null); for (AnAction child : children) { - if (!(child instanceof ProjectWindowAction)) { + if (!(child instanceof ProjectWindowAction windowAction)) { continue; } - final ProjectWindowAction windowAction = (ProjectWindowAction) child; if (projectLocation.equals(windowAction.getProjectLocation())) { return windowAction; } @@ -134,10 +133,9 @@ public final class ProjectWindowActionGroup extends DefaultActionGroup { List result = null; final AnAction[] children = getChildren(null); for (AnAction child : children) { - if (!(child instanceof ProjectWindowAction)) { + if (!(child instanceof ProjectWindowAction windowAction)) { continue; } - final ProjectWindowAction windowAction = (ProjectWindowAction) child; if (projectName.equals(windowAction.getProjectName())) { if (result == null) { result = new ArrayList<>(); diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java index ed56f03631f3..7f034f161372 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java @@ -208,9 +208,7 @@ public class DirectoryNode extends PackageDependenciesNode { return super.equals(o); } if (this == o) return true; - if (!(o instanceof DirectoryNode)) return false; - - final DirectoryNode packageNode = (DirectoryNode)o; + if (!(o instanceof DirectoryNode packageNode)) return false; if (!toString().equals(packageNode.toString())) return false; diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileNode.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileNode.java index de87ed0d444a..411e567f01b8 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileNode.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileNode.java @@ -101,9 +101,7 @@ public class FileNode extends PackageDependenciesNode implements Comparable result = new HashSet<>(); for (int i = 0; i < parent.getChildCount(); i++){ final TreeNode treeNode = parent.getChildAt(i); - if (treeNode instanceof PackageDependenciesNode){ - final PackageDependenciesNode node = (PackageDependenciesNode)treeNode; + if (treeNode instanceof PackageDependenciesNode node){ if (element instanceof PsiDirectory && node.getPsiElement() == element){ return new PackageDependenciesNode[] {node}; } diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/LibraryNode.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/LibraryNode.java index 4cf233244ec0..3ffbfd42f4f3 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/LibraryNode.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/LibraryNode.java @@ -57,9 +57,7 @@ public class LibraryNode extends PackageDependenciesNode { return super.equals(o); } if (this == o) return true; - if (!(o instanceof LibraryNode)) return false; - - final LibraryNode libraryNode = (LibraryNode)o; + if (!(o instanceof LibraryNode libraryNode)) return false; if (!myLibraryOrJdk.equals(libraryNode.myLibraryOrJdk)) return false; diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleGroupNode.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleGroupNode.java index d3600f63f167..400532f1d92f 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleGroupNode.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleGroupNode.java @@ -67,9 +67,7 @@ public class ModuleGroupNode extends PackageDependenciesNode { return super.equals(o); } if (this == o) return true; - if (!(o instanceof ModuleGroupNode)) return false; - - final ModuleGroupNode moduleNode = (ModuleGroupNode)o; + if (!(o instanceof ModuleGroupNode moduleNode)) return false; return Comparing.equal(myModuleGroup, moduleNode.myModuleGroup); } diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java index dcbb0d8f74c0..e5e876dd4f57 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java @@ -93,9 +93,8 @@ public class ModuleNode extends PackageDependenciesNode implements NavigatableWi return super.equals(o); } if (this == o) return true; - if (!(o instanceof ModuleNode)) return false; + if (!(o instanceof ModuleNode moduleNode)) return false; - final ModuleNode moduleNode = (ModuleNode)o; return Comparing.equal(myModule, moduleNode.myModule); } diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/PackageTreeExpansionMonitor.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/PackageTreeExpansionMonitor.java index 1033a082b070..ff29e0b1c2ea 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/PackageTreeExpansionMonitor.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/PackageTreeExpansionMonitor.java @@ -23,8 +23,7 @@ public final class PackageTreeExpansionMonitor { Enumeration enumeration = ((DefaultMutableTreeNode)tree.getModel().getRoot()).breadthFirstEnumeration(); while (enumeration.hasMoreElements()) { final Object nextElement = enumeration.nextElement(); - if (nextElement instanceof PackageDependenciesNode) { //do not include root - PackageDependenciesNode child = (PackageDependenciesNode)nextElement; + if (nextElement instanceof PackageDependenciesNode child) { //do not include root if (child.equals(node)) { return new TreePath(child.getPath()); } diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java index a51114336bd3..af90d4218ec8 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java @@ -131,9 +131,8 @@ public class ProjectPatternProvider extends PatternDialectProvider { else if (node instanceof LibraryNode) { return new FilePatternPackageSet(node.toString(), recursively ? "*/" : "*", false); } - else if (node instanceof FileNode) { + else if (node instanceof FileNode fNode) { if (recursively) return null; - FileNode fNode = (FileNode)node; final PsiFile file = (PsiFile)fNode.getPsiElement(); if (file == null) return null; final VirtualFile virtualFile = file.getVirtualFile(); diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/HighlightingChooser.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/HighlightingChooser.java index b866082b101d..8fa4fd5961a6 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/HighlightingChooser.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/HighlightingChooser.java @@ -225,8 +225,7 @@ class HighlightElementRenderer implements ListCellRenderer fileTargetContexts = new ArrayList<>(); for (PsiFileSystemItem context : contexts) { - if (context instanceof VirtualPsiDirectory) { - VirtualPsiDirectory virtual = (VirtualPsiDirectory)context; + if (context instanceof VirtualPsiDirectory virtual) { fileTargetContexts.add(new FileTargetContext(virtual.getRoot(), virtual.getPathToCreate())); } else { diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java index 6bacf2a2fff3..6329239b32b3 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java @@ -153,8 +153,7 @@ public final class InjectedLanguageUtil extends InjectedLanguageUtilBase { Project project = hostEditor.getProject(); if (project == null) project = injectedFile.getProject(); Document document = PsiDocumentManager.getInstance(project).getDocument(injectedFile); - if (!(document instanceof DocumentWindowImpl)) return hostEditor; - DocumentWindowImpl documentWindow = (DocumentWindowImpl)document; + if (!(document instanceof DocumentWindowImpl documentWindow)) return hostEditor; if (hostCaret != null && hostCaret.hasSelection()) { int selstart = hostCaret.getSelectionStart(); if (selstart != -1) { diff --git a/platform/lang-impl/src/com/intellij/psi/search/scope/EditorSelectionLocalSearchScope.java b/platform/lang-impl/src/com/intellij/psi/search/scope/EditorSelectionLocalSearchScope.java index 9bd43965112b..83077cd16a77 100644 --- a/platform/lang-impl/src/com/intellij/psi/search/scope/EditorSelectionLocalSearchScope.java +++ b/platform/lang-impl/src/com/intellij/psi/search/scope/EditorSelectionLocalSearchScope.java @@ -106,8 +106,7 @@ public class EditorSelectionLocalSearchScope extends RangeBasedLocalSearchScope @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof EditorSelectionLocalSearchScope)) return false; - EditorSelectionLocalSearchScope other = (EditorSelectionLocalSearchScope)o; + if (!(o instanceof EditorSelectionLocalSearchScope other)) return false; VirtualFile[] files = getVirtualFiles(); VirtualFile[] otherFiles = other.getVirtualFiles(); diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java index e3bd78d4e95b..e44835dbbe65 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java @@ -53,8 +53,7 @@ public abstract class BaseRefactoringAction extends AnAction { if (ActionPlaces.isPopupPlace(place)) { final RefactoringActionHandler handler = getHandler(context); if (handler == null) return false; - if (handler instanceof ContextAwareActionHandler) { - ContextAwareActionHandler contextAwareActionHandler = (ContextAwareActionHandler)handler; + if (handler instanceof ContextAwareActionHandler contextAwareActionHandler) { if (!contextAwareActionHandler.isAvailableForQuickList(editor, file, context)) { return false; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java index eb085f86bb6a..1b99b425946a 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java @@ -418,8 +418,7 @@ public abstract class ChangeSignatureDialogBase ContainerUtil.addIfNotNull(added, targetDirectory.copyFileFrom(name, file))); } - else if (elementToCopy instanceof PsiDirectory) { - PsiDirectory directory = (PsiDirectory)elementToCopy; + else if (elementToCopy instanceof PsiDirectory directory) { if (directory.equals(targetDirectory)) { return; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java index d864a88777d4..8b7ad948b03a 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java @@ -124,8 +124,7 @@ public class InvertBooleanProcessor extends BaseRefactoringProcessor { private static UsageInfo[] extractUsagesForElement(PsiElement element, UsageInfo[] usages) { final ArrayList extractedUsages = new ArrayList<>(usages.length); for (UsageInfo usage : usages) { - if (usage instanceof MoveRenameUsageInfo) { - MoveRenameUsageInfo usageInfo = (MoveRenameUsageInfo)usage; + if (usage instanceof MoveRenameUsageInfo usageInfo) { if (element.equals(usageInfo.getReferencedElement())) { extractedUsages.add(usageInfo); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java b/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java index 77cea79fd712..f43b1aecd4b7 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java +++ b/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java @@ -52,8 +52,7 @@ public final class FileReferenceContextUtil { private static boolean encodeFileReference(PsiElement element, PsiFileReference ref, Map map, int refIndex) { final ResolveResult[] results = ref.multiResolve(false); for (ResolveResult result : results) { - if (result.getElement() instanceof PsiFileSystemItem) { - PsiFileSystemItem fileSystemItem = (PsiFileSystemItem)result.getElement(); + if (result.getElement() instanceof PsiFileSystemItem fileSystemItem) { element.putCopyableUserData(REF_FILE_SYSTEM_ITEM_KEY, Pair.create(fileSystemItem, refIndex)); map.put(element.getText(), fileSystemItem); return true; diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java index b9d162b3f7e0..5e59687497b2 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java +++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java @@ -41,8 +41,7 @@ public final class CommonMoveUtil { if (usage instanceof NonCodeUsageInfo) { nonCodeUsages.add((NonCodeUsageInfo)usage); } - else if (usage instanceof MoveRenameUsageInfo) { - final MoveRenameUsageInfo moveRenameUsage = (MoveRenameUsageInfo)usage; + else if (usage instanceof MoveRenameUsageInfo moveRenameUsage) { final PsiElement oldElement = moveRenameUsage.getReferencedElement(); final PsiElement newElement = oldToNewElementsMapping.get(oldElement); LOG.assertTrue(newElement != null, oldElement); diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesHandler.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesHandler.java index c65d82c407c9..22514371e998 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesHandler.java @@ -42,8 +42,7 @@ public class MoveFilesOrDirectoriesHandler extends MoveHandlerDelegate { public boolean canMove(final PsiElement[] elements, final PsiElement targetContainer, @Nullable PsiReference reference) { HashSet names = new HashSet<>(); for (PsiElement element : elements) { - if (element instanceof PsiFile) { - PsiFile file = (PsiFile)element; + if (element instanceof PsiFile file) { String name = file.getName(); if (names.contains(name)) { return false; diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java index 6d19700585b7..a598581d7431 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java @@ -202,8 +202,7 @@ public class MoveFilesOrDirectoriesProcessor extends BaseRefactoringProcessor { processDirectoryFiles(movedFiles, oldToNewMap, psiElement); } } - else if (element instanceof PsiFile) { - final PsiFile movedFile = (PsiFile)element; + else if (element instanceof PsiFile movedFile) { MoveFileHandler.forElement(movedFile).prepareMovedFile(movedFile, newParent, oldToNewMap); PsiFile moving = newParent.findFile(movedFile.getName()); @@ -342,8 +341,7 @@ public class MoveFilesOrDirectoriesProcessor extends BaseRefactoringProcessor { } private static void processDirectoryFiles(@NotNull List> movedFiles, @NotNull Map oldToNewMap, @NotNull PsiElement psiElement) { - if (psiElement instanceof PsiFile) { - final PsiFile movedFile = (PsiFile)psiElement; + if (psiElement instanceof PsiFile movedFile) { movedFiles.add(SmartPointerManager.createPointer(movedFile)); MoveFileHandler.forElement(movedFile).prepareMovedFile(movedFile, movedFile.getParent(), oldToNewMap); } @@ -356,8 +354,7 @@ public class MoveFilesOrDirectoriesProcessor extends BaseRefactoringProcessor { protected void retargetUsages(UsageInfo @NotNull [] usages, @NotNull Map oldToNewMap) { for (UsageInfo usageInfo : usages) { - if (usageInfo instanceof MyUsageInfo) { - final MyUsageInfo info = (MyUsageInfo)usageInfo; + if (usageInfo instanceof MyUsageInfo info) { PsiElement element = info.myTarget; if (info.getReference() instanceof FileReference || info.getReference() instanceof PsiDynaReference) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java index ff38751ff91b..d6ebbb82caa3 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java +++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java @@ -148,8 +148,7 @@ public final class MoveFilesOrDirectoriesUtil { int[] choice = elements.length > 1 || elements[0] instanceof PsiDirectory ? new int[]{-1} : null; List els = new ArrayList<>(); for (PsiElement psiElement : adjustedElements) { - if (psiElement instanceof PsiFile) { - PsiFile file = (PsiFile)psiElement; + if (psiElement instanceof PsiFile file) { if (CopyFilesOrDirectoriesHandler.checkFileExist(targetDirectory, choice, file, file.getName(), RefactoringBundle.message("command.name.move"))) continue; } @@ -177,8 +176,7 @@ public final class MoveFilesOrDirectoriesUtil { if (element instanceof PsiDirectory) { doJustMoveDirectory((PsiDirectory)element, targetDirectory, MoveFilesOrDirectoriesUtil.class); } - else if (element instanceof PsiFile) { - final PsiFile movedFile = (PsiFile)element; + else if (element instanceof PsiFile movedFile) { PsiFile moving = targetDirectory.findFile(movedFile.getName()); if (moving == null) { doMoveFile(movedFile, targetDirectory); diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java index 70df27248cb0..1aba77cb94c1 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java @@ -205,8 +205,7 @@ public class RenameProcessor extends BaseRefactoringProcessor { try { for (Iterator> iterator = myAllRenames.entrySet().iterator(); iterator.hasNext(); ) { Map.Entry entry = iterator.next(); - if (entry.getKey() instanceof PsiFile) { - final PsiFile file = (PsiFile)entry.getKey(); + if (entry.getKey() instanceof PsiFile file) { final PsiDirectory containingDirectory = file.getContainingDirectory(); if (CopyFilesOrDirectoriesHandler.checkFileExist(containingDirectory, choice, file, entry.getValue(), RefactoringBundle.message("command.name.rename"))) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java index fabcfe4b8a81..4e11f1324e63 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java @@ -189,8 +189,7 @@ public class VariableInplaceRenamer extends InplaceRefactoring { } private static boolean handleSelectionIntersection(@NotNull Editor editor, @NotNull TextRange selectedRange) { - if (editor instanceof EditorWindow) { - EditorWindow editorWindow = (EditorWindow)editor; + if (editor instanceof EditorWindow editorWindow) { Editor hostEditor = editorWindow.getDelegate(); PsiFile injected = editorWindow.getInjectedFile(); TextRange hostSelectedRange = InjectedLanguageManager.getInstance(hostEditor.getProject()).injectedToHost(injected, selectedRange); diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UsageHolder.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UsageHolder.java index d69bc9f352df..8be8f0f5f9a3 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UsageHolder.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UsageHolder.java @@ -38,8 +38,7 @@ class UsageHolder { myElementPointer = SmartPointerManager.getInstance(project).createSmartPsiElementPointer(element); for (UsageInfo usageInfo : usageInfos) { - if (!(usageInfo instanceof SafeDeleteReferenceUsageInfo)) continue; - final SafeDeleteReferenceUsageInfo usage = (SafeDeleteReferenceUsageInfo)usageInfo; + if (!(usageInfo instanceof SafeDeleteReferenceUsageInfo usage)) continue; if (usage.getReferencedElement() != element) continue; if (!usage.isSafeDelete()) { diff --git a/platform/lang-impl/src/com/intellij/slicer/SlicePanel.java b/platform/lang-impl/src/com/intellij/slicer/SlicePanel.java index 83b7e1d0a68c..c950e43c4b52 100644 --- a/platform/lang-impl/src/com/intellij/slicer/SlicePanel.java +++ b/platform/lang-impl/src/com/intellij/slicer/SlicePanel.java @@ -276,8 +276,7 @@ public abstract class SlicePanel extends JPanel implements DataProvider, Disposa private static SliceNode fromPath(TreePath path) { Object lastPathComponent = path.getLastPathComponent(); - if (lastPathComponent instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)lastPathComponent; + if (lastPathComponent instanceof DefaultMutableTreeNode node) { Object userObject = node.getUserObject(); if (userObject instanceof SliceNode) { return (SliceNode)userObject; @@ -324,8 +323,7 @@ public abstract class SlicePanel extends JPanel implements DataProvider, Disposa final ArrayList navigatables = new ArrayList<>(); for (TreePath path : paths) { Object lastPathComponent = path.getLastPathComponent(); - if (lastPathComponent instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)lastPathComponent; + if (lastPathComponent instanceof DefaultMutableTreeNode node) { Object userObject = node.getUserObject(); if (userObject instanceof Navigatable) { navigatables.add((Navigatable)userObject); diff --git a/platform/lang-impl/src/com/intellij/slicer/SliceTreeBuilder.java b/platform/lang-impl/src/com/intellij/slicer/SliceTreeBuilder.java index d7038e799507..a67b2bc7e3e1 100644 --- a/platform/lang-impl/src/com/intellij/slicer/SliceTreeBuilder.java +++ b/platform/lang-impl/src/com/intellij/slicer/SliceTreeBuilder.java @@ -17,11 +17,9 @@ public class SliceTreeBuilder { public volatile boolean analysisInProgress; public static final Comparator> SLICE_NODE_COMPARATOR = (o1, o2) -> { - if (!(o1 instanceof SliceNode) || !(o2 instanceof SliceNode)) { + if (!(o1 instanceof SliceNode node1) || !(o2 instanceof SliceNode node2)) { return AlphaComparator.INSTANCE.compare(o1, o2); } - SliceNode node1 = (SliceNode)o1; - SliceNode node2 = (SliceNode)o2; SliceUsage usage1 = node1.getValue(); SliceUsage usage2 = node2.getValue(); diff --git a/platform/lang-impl/src/com/intellij/slicer/SliceUsageCellRendererBase.java b/platform/lang-impl/src/com/intellij/slicer/SliceUsageCellRendererBase.java index 28282f13faa1..c615862fb18e 100644 --- a/platform/lang-impl/src/com/intellij/slicer/SliceUsageCellRendererBase.java +++ b/platform/lang-impl/src/com/intellij/slicer/SliceUsageCellRendererBase.java @@ -20,8 +20,7 @@ public abstract class SliceUsageCellRendererBase extends ColoredTreeCellRenderer DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode)value; Object userObject = treeNode.getUserObject(); if (userObject == null) return; - if (userObject instanceof MyColoredTreeCellRenderer) { - MyColoredTreeCellRenderer node = (MyColoredTreeCellRenderer)userObject; + if (userObject instanceof MyColoredTreeCellRenderer node) { node.customizeCellRenderer(this, tree, value, selected, expanded, leaf, row, hasFocus); if (node instanceof SliceNode) { setToolTipText(((SliceNode)node).getPresentation().getTooltip()); diff --git a/platform/lang-impl/src/com/intellij/tools/BaseToolsPanel.java b/platform/lang-impl/src/com/intellij/tools/BaseToolsPanel.java index 981b05b41b1d..c236327f0535 100644 --- a/platform/lang-impl/src/com/intellij/tools/BaseToolsPanel.java +++ b/platform/lang-impl/src/com/intellij/tools/BaseToolsPanel.java @@ -272,9 +272,8 @@ public abstract class BaseToolsPanel extends JPanel { if (node != null) { if (isMovingAvailable(node, direction)) { moveNode(node, direction); - if (node.getUserObject() instanceof Tool) { + if (node.getUserObject() instanceof Tool tool) { ToolsGroup group = (ToolsGroup)(((CheckedTreeNode)node.getParent()).getUserObject()); - Tool tool = (Tool)node.getUserObject(); moveElementInsideGroup(tool, group, direction); } TreePath path = new TreePath(node.getPath()); @@ -412,8 +411,7 @@ public abstract class BaseToolsPanel extends JPanel { return; } myIsModified = true; - if (node.getUserObject() instanceof Tool) { - Tool tool = (Tool)node.getUserObject(); + if (node.getUserObject() instanceof Tool tool) { CheckedTreeNode parentNode = (CheckedTreeNode)node.getParent(); ((ToolsGroup)parentNode.getUserObject()).removeElement(tool); removeNodeFromParent(node); diff --git a/platform/lang-impl/src/com/intellij/tools/FilterInfo.java b/platform/lang-impl/src/com/intellij/tools/FilterInfo.java index 62c59524b1c4..aaee19d4337d 100644 --- a/platform/lang-impl/src/com/intellij/tools/FilterInfo.java +++ b/platform/lang-impl/src/com/intellij/tools/FilterInfo.java @@ -61,8 +61,7 @@ public class FilterInfo implements JDOMExternalizable { } public boolean equals(Object object) { - if (!(object instanceof FilterInfo)) return false; - FilterInfo other = (FilterInfo)object; + if (!(object instanceof FilterInfo other)) return false; return Objects.equals(myName, other.myName) && Objects.equals(myDescription, other.myDescription) && Objects.equals(myRegExp, other.myRegExp); diff --git a/platform/lang-impl/src/com/intellij/tools/Tool.java b/platform/lang-impl/src/com/intellij/tools/Tool.java index 4c641c45e253..55c15640a6b7 100644 --- a/platform/lang-impl/src/com/intellij/tools/Tool.java +++ b/platform/lang-impl/src/com/intellij/tools/Tool.java @@ -231,11 +231,10 @@ public class Tool implements SchemeElement { } public boolean equals(Object obj) { - if (!(obj instanceof Tool)) { + if (!(obj instanceof Tool source)) { return false; } - Tool source = (Tool)obj; return Objects.equals(myName, source.myName) && Objects.equals(myDescription, source.myDescription) && diff --git a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java index aab31c6e37e2..5d33f9183ba9 100644 --- a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java +++ b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java @@ -336,8 +336,7 @@ public final class DeferredIconImpl extends JBScalableIcon implements Deferre checkDoesntReferenceThis(layer); } } - else if (icon instanceof com.intellij.ui.icons.RowIcon) { - final com.intellij.ui.icons.RowIcon rowIcon = (RowIcon)icon; + else if (icon instanceof RowIcon rowIcon) { final int count = rowIcon.getIconCount(); for (int i = 0; i < count; i++) { checkDoesntReferenceThis(rowIcon.getIcon(i)); diff --git a/platform/lang-impl/src/com/intellij/ui/DuplicateNodeRenderer.java b/platform/lang-impl/src/com/intellij/ui/DuplicateNodeRenderer.java index 8a0434aac93e..0ff0704b2564 100644 --- a/platform/lang-impl/src/com/intellij/ui/DuplicateNodeRenderer.java +++ b/platform/lang-impl/src/com/intellij/ui/DuplicateNodeRenderer.java @@ -32,8 +32,7 @@ public final class DuplicateNodeRenderer { TreePath accumPath = null; while (node != null) { Object userObject = node.getUserObject(); - if (!(userObject instanceof DuplicatableNode)) break; - DuplicatableNode duplicatableNode = (DuplicatableNode)userObject; + if (!(userObject instanceof DuplicatableNode duplicatableNode)) break; Object duplicate = duplicatableNode.getDuplicate(); if (duplicate == null) break; accumPath = accumRect == null ? path : accumPath.getParentPath(); diff --git a/platform/lang-impl/src/com/intellij/ui/popup/util/ItemWrapperListRenderer.java b/platform/lang-impl/src/com/intellij/ui/popup/util/ItemWrapperListRenderer.java index 6af25afafd44..c38335214873 100644 --- a/platform/lang-impl/src/com/intellij/ui/popup/util/ItemWrapperListRenderer.java +++ b/platform/lang-impl/src/com/intellij/ui/popup/util/ItemWrapperListRenderer.java @@ -32,8 +32,7 @@ public class ItemWrapperListRenderer extends ColoredListCellRenderer { @Override protected void customizeCellRenderer(@NotNull JList list, Object value, int index, boolean selected, boolean hasFocus) { - if (value instanceof ItemWrapper) { - final ItemWrapper wrapper = (ItemWrapper)value; + if (value instanceof ItemWrapper wrapper) { wrapper.setupRenderer(this, myProject, selected); if (myAccessory != null) { wrapper.updateAccessoryView(myAccessory); diff --git a/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java b/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java index 7048baf52ff9..ded0acc4d527 100644 --- a/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java +++ b/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java @@ -93,8 +93,7 @@ public final class MasterDetailPopupBuilder implements MasterController { } private void removeSelectedItems() { - if (myChooserComponent instanceof JList) { - JList list = (JList)myChooserComponent; + if (myChooserComponent instanceof JList list) { ListModel listModel = list.getModel(); int index = list.getSelectedIndex(); diff --git a/platform/lang-impl/src/com/intellij/usageView/impl/UsageContextCallHierarchyPanel.java b/platform/lang-impl/src/com/intellij/usageView/impl/UsageContextCallHierarchyPanel.java index 6dc4738ba743..04226243e72a 100644 --- a/platform/lang-impl/src/com/intellij/usageView/impl/UsageContextCallHierarchyPanel.java +++ b/platform/lang-impl/src/com/intellij/usageView/impl/UsageContextCallHierarchyPanel.java @@ -111,8 +111,7 @@ public class UsageContextCallHierarchyPanel extends UsageContextPanelBase { if (providerTarget == null) return null; HierarchyBrowser browser = provider.createHierarchyBrowser(providerTarget); - if (browser instanceof HierarchyBrowserBaseEx) { - HierarchyBrowserBaseEx browserEx = (HierarchyBrowserBaseEx)browser; + if (browser instanceof HierarchyBrowserBaseEx browserEx) { // do not steal focus when scrolling through nodes browserEx.changeView(CallHierarchyBrowserBase.getCallerType(), false); } diff --git a/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesIndexer.java b/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesIndexer.java index c9b31540781d..f72712f0d8f4 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesIndexer.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesIndexer.java @@ -187,8 +187,7 @@ class UnindexedFilesIndexer extends DumbModeTask { @Override public @Nullable UnindexedFilesIndexer tryMergeWith(@NotNull DumbModeTask taskFromQueue) { - if (!(taskFromQueue instanceof UnindexedFilesIndexer)) return null; - UnindexedFilesIndexer otherIndexingTask = (UnindexedFilesIndexer)taskFromQueue; + if (!(taskFromQueue instanceof UnindexedFilesIndexer otherIndexingTask)) return null; Map> largeMap = otherIndexingTask.providerToFiles.size() > providerToFiles.size() ? otherIndexingTask.providerToFiles : providerToFiles; diff --git a/platform/lang-impl/src/com/intellij/util/indexing/dependenciesCache/RescannedRootsUtil.java b/platform/lang-impl/src/com/intellij/util/indexing/dependenciesCache/RescannedRootsUtil.java index 787ad92c3cc0..1f622dfaca26 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/dependenciesCache/RescannedRootsUtil.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/dependenciesCache/RescannedRootsUtil.java @@ -67,8 +67,7 @@ class RescannedRootsUtil { List filesFromIndexableSetContributors = new ArrayList<>(); ProjectFileIndex index = ProjectFileIndex.getInstance(project); - if (!(index instanceof ProjectFileIndexImpl)) return Collections.emptyList(); - ProjectFileIndexImpl fileIndex = (ProjectFileIndexImpl)index; + if (!(index instanceof ProjectFileIndexImpl fileIndex)) return Collections.emptyList(); ArrayList result = new ArrayList<>(); Iterator iterator = reincludedRoots.iterator(); VirtualFileUrlManager urlManager = ApplicationManager.getApplication().getService(VirtualFileUrlManager.class); diff --git a/platform/lang-impl/src/com/intellij/util/indexing/events/IndexedFilesListener.java b/platform/lang-impl/src/com/intellij/util/indexing/events/IndexedFilesListener.java index 1ec4b546d3e6..fcd322f98296 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/events/IndexedFilesListener.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/events/IndexedFilesListener.java @@ -92,8 +92,7 @@ public abstract class IndexedFilesListener implements AsyncFileListener { if (event instanceof VFileContentChangeEvent) { fileToIndex = event.getFile(); } - else if (event instanceof VFileCopyEvent) { - final VFileCopyEvent ce = (VFileCopyEvent)event; + else if (event instanceof VFileCopyEvent ce) { final VirtualFile copy = ce.getNewParent().findChild(ce.getNewChildName()); if (copy != null) { fileToIndex = copy; @@ -111,8 +110,7 @@ public abstract class IndexedFilesListener implements AsyncFileListener { fileToIndex = event.getFile(); onlyContentDependent = false; } - else if (event instanceof VFilePropertyChangeEvent) { - final VFilePropertyChangeEvent pce = (VFilePropertyChangeEvent)event; + else if (event instanceof VFilePropertyChangeEvent pce) { String propertyName = pce.getPropertyName(); if (propertyName.equals(VirtualFile.PROP_NAME)) { // indexes may depend on file name diff --git a/platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java b/platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java index 2ce58b6232e1..266df5af0b5a 100644 --- a/platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java +++ b/platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java @@ -206,8 +206,7 @@ public class InstalledPackagesPanel extends JPanel { final Set packagesShouldBePostponed = getPackagesToPostpone(); for (int row : rows) { final Object packageObj = myPackagesTableModel.getValueAt(row, 0); - if (packageObj instanceof InstalledPackage) { - InstalledPackage pkg = (InstalledPackage)packageObj; + if (packageObj instanceof InstalledPackage pkg) { final String packageName = pkg.getName(); final String currentVersion = pkg.getVersion(); final String availableVersion = (String)myPackagesTableModel.getValueAt(row, 2); @@ -319,8 +318,7 @@ public class InstalledPackagesPanel extends JPanel { final int index = selected[i]; if (index >= myPackagesTable.getRowCount()) continue; final Object value = myPackagesTable.getValueAt(index, 0); - if (value instanceof InstalledPackage) { - final InstalledPackage pkg = (InstalledPackage)value; + if (value instanceof InstalledPackage pkg) { if (!canUninstallPackage(pkg)) { canUninstall = false; } diff --git a/platform/lang-impl/src/com/intellij/webcore/packaging/ManagePackagesDialog.java b/platform/lang-impl/src/com/intellij/webcore/packaging/ManagePackagesDialog.java index 67faba4e60d8..bef97fdffe65 100644 --- a/platform/lang-impl/src/com/intellij/webcore/packaging/ManagePackagesDialog.java +++ b/platform/lang-impl/src/com/intellij/webcore/packaging/ManagePackagesDialog.java @@ -208,8 +208,7 @@ public class ManagePackagesDialog extends DialogWrapper { @Override public void actionPerformed(ActionEvent event) { final Object pyPackage = myPackages.getSelectedValue(); - if (pyPackage instanceof RepoPackage) { - RepoPackage repoPackage = (RepoPackage)pyPackage; + if (pyPackage instanceof RepoPackage repoPackage) { String extraOptions = null; if (myOptionsCheckBox.isEnabled() && myOptionsCheckBox.isSelected()) { diff --git a/platform/lvcs-impl/src/com/intellij/history/core/ByteContentRetriever.java b/platform/lvcs-impl/src/com/intellij/history/core/ByteContentRetriever.java index 384e8bcf5d86..d03c9e730730 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/ByteContentRetriever.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/ByteContentRetriever.java @@ -97,8 +97,7 @@ public class ByteContentRetriever extends ChangeSetsProcessor { private void recordContentAndTimestamp(ChangeSet c) { // todo what if the path is being changed during changes? for (Change each : c.getChanges()) { - if (!(each instanceof ContentChange)) continue; - ContentChange cc = (ContentChange)each; + if (!(each instanceof ContentChange cc)) continue; if (!cc.affectsPath(myPath)) continue; myCurrentFileTimestamp = cc.getOldTimestamp(); diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java b/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java index 403e1bad7af9..417e8e823da5 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java @@ -243,15 +243,13 @@ public class IdeaGateway { @NotNull public static Iterable iterateDBChildren(VirtualFile f) { - if (!(f instanceof NewVirtualFile)) return Collections.emptyList(); - NewVirtualFile nf = (NewVirtualFile)f; + if (!(f instanceof NewVirtualFile nf)) return Collections.emptyList(); return nf.iterInDbChildrenWithoutLoadingVfsFromOtherProjects(); } @NotNull public static Iterable loadAndIterateChildren(VirtualFile f) { - if (!(f instanceof NewVirtualFile)) return Collections.emptyList(); - NewVirtualFile nf = (NewVirtualFile)f; + if (!(f instanceof NewVirtualFile nf)) return Collections.emptyList(); return Arrays.asList(nf.getChildren()); } diff --git a/platform/platform-api/src/com/intellij/ide/actions/exclusion/TreeNodeExclusionAction.java b/platform/platform-api/src/com/intellij/ide/actions/exclusion/TreeNodeExclusionAction.java index c48ad2cdbf5e..7c8d898f65ae 100644 --- a/platform/platform-api/src/com/intellij/ide/actions/exclusion/TreeNodeExclusionAction.java +++ b/platform/platform-api/src/com/intellij/ide/actions/exclusion/TreeNodeExclusionAction.java @@ -34,11 +34,10 @@ abstract class TreeNodeExclusionAction extends AnAction { } final Component component = e.getData(PlatformCoreDataKeys.CONTEXT_COMPONENT); final Presentation presentation = e.getPresentation(); - if (!(component instanceof JTree) || !exclusionProcessor.isActionEnabled(myIsExclude)) { + if (!(component instanceof JTree tree) || !exclusionProcessor.isActionEnabled(myIsExclude)) { presentation.setEnabledAndVisible(false); return; } - JTree tree = (JTree) component; List selection = TreePathRoots.collect(tree.getSelectionPaths()); if (selection.isEmpty()) { presentation.setEnabledAndVisible(false); diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java index 8c4766f1fdf4..69e362c80dff 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java @@ -294,8 +294,7 @@ public class AbstractTreeUi { if (!canUpdateBusyState) return; - if (myTree instanceof Tree) { - Tree tree = (Tree)myTree; + if (myTree instanceof Tree tree) { boolean isBusy = !isReady(true) || forcedBusy; if (isBusy && tree.isShowing()) { tree.setPaintBusy(true); @@ -309,8 +308,7 @@ public class AbstractTreeUi { } private void setHoldSize(boolean holdSize) { - if (myTree instanceof Tree) { - Tree tree = (Tree)myTree; + if (myTree instanceof Tree tree) { tree.setHoldSize(holdSize); } } @@ -2885,9 +2883,7 @@ public class AbstractTreeUi { } public static boolean isLoadingChildrenFor(Object nodeObject) { - if (!(nodeObject instanceof DefaultMutableTreeNode)) return false; - - DefaultMutableTreeNode node = (DefaultMutableTreeNode)nodeObject; + if (!(nodeObject instanceof DefaultMutableTreeNode node)) return false; int loadingNodes = 0; for (int i = 0; i < Math.min(node.getChildCount(), 2); i++) { @@ -2905,9 +2901,7 @@ public class AbstractTreeUi { @Nullable private DefaultMutableTreeNode getParentLoadingInBackground(@NotNull Object nodeObject) { - if (!(nodeObject instanceof DefaultMutableTreeNode)) return null; - - DefaultMutableTreeNode node = (DefaultMutableTreeNode)nodeObject; + if (!(nodeObject instanceof DefaultMutableTreeNode node)) return null; TreeNode eachParent = node.getParent(); @@ -3041,8 +3035,7 @@ public class AbstractTreeUi { selectedIndex = parentNode.getIndex(childNode); } - if (childNode.getParent() instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode parent = (DefaultMutableTreeNode)childNode.getParent(); + if (childNode.getParent() instanceof DefaultMutableTreeNode parent) { if (myTree.isExpanded(new TreePath(parent.getPath()))) { if (parent.getChildCount() == 1 && parent.getChildAt(0) == childNode) { insertLoadingNode(parent, false); @@ -3199,8 +3192,7 @@ public class AbstractTreeUi { processInnerChange(new TreeRunnable("AbstractTreeUi.expandPath") { @Override public void perform() { - if (path.getLastPathComponent() instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)path.getLastPathComponent(); + if (path.getLastPathComponent() instanceof DefaultMutableTreeNode node) { if (node.getChildCount() > 0 && !myTree.isExpanded(path)) { if (!canSmartExpand) { myNotForSmartExpand.add(node); @@ -3824,8 +3816,7 @@ public class AbstractTreeUi { Set result = new LinkedHashSet<>(); if (paths != null) { for (TreePath eachPath : paths) { - if (eachPath.getLastPathComponent() instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode eachNode = (DefaultMutableTreeNode)eachPath.getLastPathComponent(); + if (eachPath.getLastPathComponent() instanceof DefaultMutableTreeNode eachNode) { if (eachNode == myRootNode && !myTree.isRootVisible()) continue; Object eachElement = getElementFor(eachNode); if (eachElement != null) { @@ -4990,8 +4981,7 @@ public class AbstractTreeUi { * @return {@code true} if element is {@code null} or if it contains a {@code null} value */ private static boolean isNodeNull(Object element) { - if (element instanceof AbstractTreeNode) { - AbstractTreeNode node = (AbstractTreeNode)element; + if (element instanceof AbstractTreeNode node) { element = node.getValue(); } return element == null; diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/NodeRenderer.java b/platform/platform-api/src/com/intellij/ide/util/treeView/NodeRenderer.java index 5907b21cca56..7bc6724c8058 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/NodeRenderer.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/NodeRenderer.java @@ -37,8 +37,7 @@ public class NodeRenderer extends ColoredTreeCellRenderer { public void customizeCellRenderer(@NotNull JTree tree, @NlsSafe Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { @NlsSafe Object node = TreeUtil.getUserObject(value); - if (node instanceof NodeDescriptor) { - NodeDescriptor descriptor = (NodeDescriptor)node; + if (node instanceof NodeDescriptor descriptor) { // TODO: use this color somewhere Color color = descriptor.getColor(); setIcon(fixIconIfNeeded(descriptor.getIcon(), selected, hasFocus)); @@ -46,8 +45,7 @@ public class NodeRenderer extends ColoredTreeCellRenderer { ItemPresentation p0 = getPresentation(node); - if (p0 instanceof PresentationData) { - PresentationData presentation = (PresentationData)p0; + if (p0 instanceof PresentationData presentation) { Color color = node instanceof NodeDescriptor ? ((NodeDescriptor)node).getColor() : null; setIcon(fixIconIfNeeded(presentation.getIcon(false), selected, hasFocus)); diff --git a/platform/platform-api/src/com/intellij/openapi/MnemonicWrapper.java b/platform/platform-api/src/com/intellij/openapi/MnemonicWrapper.java index 9f49928b7bf5..91a9c6fc472a 100644 --- a/platform/platform-api/src/com/intellij/openapi/MnemonicWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/MnemonicWrapper.java @@ -23,8 +23,7 @@ abstract class MnemonicWrapper implements Runnable, Proper return null; } for (PropertyChangeListener listener : component.getPropertyChangeListeners()) { - if (listener instanceof MnemonicWrapper) { - MnemonicWrapper wrapper = (MnemonicWrapper)listener; + if (listener instanceof MnemonicWrapper wrapper) { wrapper.run(); // update mnemonics immediately return wrapper; } diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/KeyboardModifierGestureShortcut.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/KeyboardModifierGestureShortcut.java index 01f182664dba..3caae116eb7e 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/KeyboardModifierGestureShortcut.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/KeyboardModifierGestureShortcut.java @@ -53,9 +53,8 @@ public class KeyboardModifierGestureShortcut extends Shortcut { @Override public boolean startsWith(@NotNull final Shortcut sc) { - if (!(sc instanceof KeyboardModifierGestureShortcut)) return false; + if (!(sc instanceof KeyboardModifierGestureShortcut other)) return false; - final KeyboardModifierGestureShortcut other = (KeyboardModifierGestureShortcut)sc; if (myType.equals(other.myType)) { if (myStroke.getModifiers() != other.myStroke.getModifiers()) return false; return other.myStroke.getKeyCode() != -1 || other.myStroke.getKeyCode() == myStroke.getKeyCode(); diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/MouseShortcut.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/MouseShortcut.java index 9d18bae3ab9c..f7247757994e 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/MouseShortcut.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/MouseShortcut.java @@ -35,8 +35,7 @@ public class MouseShortcut extends Shortcut { private final int myClickCount; public static int getButton(MouseEvent event) { - if (event instanceof MouseWheelEvent) { - MouseWheelEvent wheel = (MouseWheelEvent)event; + if (event instanceof MouseWheelEvent wheel) { return 0 < wheel.getPreciseWheelRotation() ? BUTTON_WHEEL_DOWN : BUTTON_WHEEL_UP; diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java index 6ead279af785..b8e1f3bb08bb 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java @@ -311,9 +311,8 @@ public final class ActionUtil { public static void doPerformActionOrShowPopup(@NotNull AnAction action, @NotNull AnActionEvent e, @Nullable Consumer popupShow) { - if (action instanceof ActionGroup && !e.getPresentation().isPerformGroup()) { + if (action instanceof ActionGroup group && !e.getPresentation().isPerformGroup()) { DataContext dataContext = e.getDataContext(); - ActionGroup group = (ActionGroup)action; String place = ActionPlaces.getActionGroupPopupPlace(e.getPlace()); ListPopup popup = JBPopupFactory.getInstance().createActionGroupPopup( e.getPresentation().getText(), group, dataContext, @@ -443,8 +442,7 @@ public final class ActionUtil { @NotNull ActionListener action, @NotNull ShortcutSet shortcuts) { for (Shortcut shortcut : shortcuts.getShortcuts()) { - if (shortcut instanceof KeyboardShortcut) { - KeyboardShortcut ks = (KeyboardShortcut)shortcut; + if (shortcut instanceof KeyboardShortcut ks) { KeyStroke first = ks.getFirstKeyStroke(); KeyStroke second = ks.getSecondKeyStroke(); if (second == null) { @@ -462,8 +460,7 @@ public final class ActionUtil { @NotNull Predicate condition) { for (AnAction child : group.getChildren(null)) { if (condition.test(child)) return true; - if (child instanceof ActionGroup) { - ActionGroup childGroup = (ActionGroup)child; + if (child instanceof ActionGroup childGroup) { if ((processPopupSubGroups || !childGroup.isPopup()) && anyActionFromGroupMatches(childGroup, processPopupSubGroups, condition)) { return true; } diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/CheckboxAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/CheckboxAction.java index 3e9260841413..7c9f01d288fc 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/CheckboxAction.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/CheckboxAction.java @@ -48,8 +48,7 @@ public abstract class CheckboxAction extends ToggleAction implements CustomCompo @Override public void updateCustomComponent(@NotNull JComponent component, @NotNull Presentation presentation) { - if (component instanceof JCheckBox) { - JCheckBox checkBox = (JCheckBox)component; + if (component instanceof JCheckBox checkBox) { updateCustomComponent(checkBox, presentation); } } diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ThreeStateCheckboxAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ThreeStateCheckboxAction.java index d28725924820..c0c2a4764c50 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ThreeStateCheckboxAction.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ThreeStateCheckboxAction.java @@ -73,8 +73,7 @@ public abstract class ThreeStateCheckboxAction extends AnAction implements Custo @Override public void updateCustomComponent(@NotNull JComponent component, @NotNull Presentation presentation) { - if (component instanceof ThreeStateCheckBox) { - ThreeStateCheckBox checkBox = (ThreeStateCheckBox)component; + if (component instanceof ThreeStateCheckBox checkBox) { CheckboxAction.updateCheckboxPresentation(checkBox, presentation); ThreeStateCheckBox.State property = presentation.getClientProperty(STATE_PROPERTY); diff --git a/platform/platform-api/src/com/intellij/openapi/editor/DocumentFragment.java b/platform/platform-api/src/com/intellij/openapi/editor/DocumentFragment.java index 0e8b7ea4a2ed..1d1f20e0c717 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/DocumentFragment.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/DocumentFragment.java @@ -36,9 +36,7 @@ public class DocumentFragment { public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof DocumentFragment)) return false; - - final DocumentFragment documentFragment = (DocumentFragment)o; + if (!(o instanceof DocumentFragment documentFragment)) return false; if (!myDocument.equals(documentFragment.myDocument)) return false; if (!myTextRange.equals(documentFragment.myTextRange)) return false; diff --git a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java index f0bc8f23519a..d689ae2fe556 100644 --- a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java +++ b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java @@ -59,8 +59,7 @@ public final class KeymapUtil { public static @NlsSafe String getShortcutText(@NotNull Shortcut shortcut) { String s = ""; - if (shortcut instanceof KeyboardShortcut) { - KeyboardShortcut keyboardShortcut = (KeyboardShortcut)shortcut; + if (shortcut instanceof KeyboardShortcut keyboardShortcut) { String acceleratorText = getKeystrokeText(keyboardShortcut.getFirstKeyStroke()); if (!acceleratorText.isEmpty()) { @@ -75,8 +74,7 @@ public final class KeymapUtil { else if (shortcut instanceof MouseShortcut) { s = getMouseShortcutText((MouseShortcut)shortcut); } - else if (shortcut instanceof KeyboardModifierGestureShortcut) { - final KeyboardModifierGestureShortcut gestureShortcut = (KeyboardModifierGestureShortcut)shortcut; + else if (shortcut instanceof KeyboardModifierGestureShortcut gestureShortcut) { s = gestureShortcut.getType() == KeyboardGestureAction.ModifierType.dblClick ? "Press, release and hold " : "Hold "; s += getKeystrokeText(gestureShortcut.getStroke()); } @@ -561,8 +559,7 @@ public final class KeymapUtil { @Nullable public static KeyStroke getKeyStroke(@NotNull final ShortcutSet shortcutSet) { final Shortcut[] shortcuts = shortcutSet.getShortcuts(); - if (shortcuts.length == 0 || !(shortcuts[0] instanceof KeyboardShortcut)) return null; - final KeyboardShortcut shortcut = (KeyboardShortcut)shortcuts[0]; + if (shortcuts.length == 0 || !(shortcuts[0] instanceof KeyboardShortcut shortcut)) return null; if (shortcut.getSecondKeyStroke() != null) { return null; } @@ -577,10 +574,9 @@ public final class KeymapUtil { } Set result = new HashSet<>(); for (Shortcut shortcut : shortcuts) { - if (!(shortcut instanceof KeyboardShortcut)) { + if (!(shortcut instanceof KeyboardShortcut kbShortcut)) { continue; } - KeyboardShortcut kbShortcut = (KeyboardShortcut)shortcut; if (kbShortcut.getSecondKeyStroke() != null) { continue; } @@ -616,8 +612,7 @@ public final class KeymapUtil { @NotNull @NonNls String actionId) { final MouseShortcut syntheticShortcut = new MouseShortcut(MouseEvent.BUTTON1, modifiers, 1); for (Shortcut shortcut : activeKeymap.getShortcuts(actionId)) { - if (shortcut instanceof MouseShortcut) { - final MouseShortcut mouseShortcut = (MouseShortcut)shortcut; + if (shortcut instanceof MouseShortcut mouseShortcut) { if (mouseShortcut.getModifiers() == syntheticShortcut.getModifiers()) { return true; } diff --git a/platform/platform-api/src/com/intellij/openapi/roots/ui/util/CompositeAppearance.java b/platform/platform-api/src/com/intellij/openapi/roots/ui/util/CompositeAppearance.java index 9ad6ba021278..ce5342a2d212 100644 --- a/platform/platform-api/src/com/intellij/openapi/roots/ui/util/CompositeAppearance.java +++ b/platform/platform-api/src/com/intellij/openapi/roots/ui/util/CompositeAppearance.java @@ -66,8 +66,7 @@ public class CompositeAppearance implements ModifiableCellAppearanceEx { public boolean equals(Object obj) { synchronized (mySections) { - if (!(obj instanceof CompositeAppearance)) return false; - CompositeAppearance appearance = (CompositeAppearance)obj; + if (!(obj instanceof CompositeAppearance appearance)) return false; if (SwingUtilities.isEventDispatchThread()) { return appearance.mySections.equals(mySections); } @@ -155,8 +154,7 @@ public class CompositeAppearance implements ModifiableCellAppearanceEx { } public boolean equals(Object obj) { - if (!(obj instanceof TextSection)) return false; - TextSection section = (TextSection)obj; + if (!(obj instanceof TextSection section)) return false; return section.ATTRIBUTES.equals(ATTRIBUTES) && section.TEXT.equals(TEXT); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxWithWidePopup.java b/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxWithWidePopup.java index 774a34d1846a..f87a234c7454 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxWithWidePopup.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxWithWidePopup.java @@ -31,8 +31,7 @@ public class ComboBoxWithWidePopup extends JComboBox { @Override public void setRenderer(ListCellRenderer renderer) { - if (renderer instanceof SimpleColoredComponent) { - SimpleColoredComponent scc = (SimpleColoredComponent)renderer; + if (renderer instanceof SimpleColoredComponent scc) { scc.getIpad().top = scc.getIpad().bottom = 0; } super.setRenderer(new AdjustingListCellRenderer(renderer)); @@ -70,9 +69,8 @@ public class ComboBoxWithWidePopup extends JComboBox { @Override public Component getListCellRendererComponent(JList list, E value, int index, boolean isSelected, boolean cellHasFocus) { - if (index == -1 && value instanceof String && !isValid()) { + if (index == -1 && value instanceof String stringValue && !isValid()) { int minLength = getMinLength(); - String stringValue = (String)value; if (getSize().width == 0) { if (stringValue.length() > minLength) { diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java index 64d506a345ea..576a382db38a 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java @@ -1306,8 +1306,7 @@ public abstract class DialogWrapper { if (centerPanel != null) { centerPanel.putClientProperty(DIALOG_CONTENT_PANEL_PROPERTY, true); centerSection.add(centerPanel, BorderLayout.CENTER); - if (centerPanel instanceof DialogPanel) { - DialogPanel dialogPanel = (DialogPanel)centerPanel; + if (centerPanel instanceof DialogPanel dialogPanel) { myPreferredFocusedComponentFromPanel = dialogPanel.getPreferredFocusedComponent(); dialogPanel.registerValidators(myDisposable, map -> { setOKActionEnabled(ContainerUtil.and(map.values(), info -> info.okEnabled)); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java index 06c64b92aa58..53fab858b9b4 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java @@ -127,8 +127,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom MasterDetailsComponent.this.addNotify(); TreeModel m = myTree.getModel(); - if (m instanceof DefaultTreeModel) { - DefaultTreeModel model = (DefaultTreeModel)m; + if (m instanceof DefaultTreeModel model) { for (int eachRow = 0; eachRow < myTree.getRowCount(); eachRow++) { TreePath eachPath = myTree.getPathForRow(eachRow); Object component = eachPath.getLastPathComponent(); @@ -222,8 +221,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom final TreePath path = myTree.getSelectionPath(); if (path != null) { final Object lastPathComp = path.getLastPathComponent(); - if (!(lastPathComp instanceof MyNode)) return; - final MyNode node = (MyNode)lastPathComp; + if (!(lastPathComp instanceof MyNode node)) return; setSelectedNode(node); } else { setSelectedNode(null); @@ -528,8 +526,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom @Nullable public Object getSelectedObject() { final TreePath selectionPath = myTree.getSelectionPath(); - if (selectionPath != null && selectionPath.getLastPathComponent() instanceof MyNode) { - MyNode node = (MyNode)selectionPath.getLastPathComponent(); + if (selectionPath != null && selectionPath.getLastPathComponent() instanceof MyNode node) { final NamedConfigurable configurable = node.getConfigurable(); LOG.assertTrue(configurable != null, "already disposed"); return configurable.getEditableObject(); @@ -749,8 +746,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom boolean leaf, int row, boolean hasFocus) { - if (value instanceof MyNode) { - final MyNode node = (MyNode)value; + if (value instanceof MyNode node) { renderIcon(node, expanded); renderName(node); } diff --git a/platform/platform-api/src/com/intellij/ui/CheckBoxList.java b/platform/platform-api/src/com/intellij/ui/CheckBoxList.java index db7e03d0d3a5..999fd57c1aba 100644 --- a/platform/platform-api/src/com/intellij/ui/CheckBoxList.java +++ b/platform/platform-api/src/com/intellij/ui/CheckBoxList.java @@ -204,8 +204,7 @@ public class CheckBoxList extends JBList { bounds.x = 0; bounds.y = 0; component.setBounds(bounds); - if (component instanceof Container) { - Container c = (Container)component; + if (component instanceof Container c) { Component found = c.findComponentAt(x, y); if (found == checkBox) { Point checkBoxLocation = getChildLocationRelativeToAncestor(component, checkBox); diff --git a/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java b/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java index 5a45f71d7a5b..816e97b0bcf2 100644 --- a/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java +++ b/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java @@ -139,8 +139,7 @@ public class CheckboxTreeBase extends Tree { @Override public final Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { invalidate(); - if (value instanceof CheckedTreeNode) { - CheckedTreeNode node = (CheckedTreeNode)value; + if (value instanceof CheckedTreeNode node) { State state = getNodeStatus(node); myCheckbox.setVisible(true); diff --git a/platform/platform-api/src/com/intellij/ui/CheckboxTreeHelper.java b/platform/platform-api/src/com/intellij/ui/CheckboxTreeHelper.java index 565016fdbf0d..c4e7ead793be 100644 --- a/platform/platform-api/src/com/intellij/ui/CheckboxTreeHelper.java +++ b/platform/platform-api/src/com/intellij/ui/CheckboxTreeHelper.java @@ -106,8 +106,7 @@ public class CheckboxTreeHelper { final Enumeration children = node.children(); while (children.hasMoreElements()) { final Object o = children.nextElement(); - if (!(o instanceof CheckedTreeNode)) continue; - CheckedTreeNode child = (CheckedTreeNode)o; + if (!(o instanceof CheckedTreeNode child)) continue; changeNodeState(child, false); uncheckChildren(child); } @@ -117,8 +116,7 @@ public class CheckboxTreeHelper { final Enumeration children = node.children(); while (children.hasMoreElements()) { final Object o = children.nextElement(); - if (!(o instanceof CheckedTreeNode)) continue; - CheckedTreeNode child = (CheckedTreeNode)o; + if (!(o instanceof CheckedTreeNode child)) continue; changeNodeState(child, true); checkChildren(child); } @@ -132,8 +130,7 @@ public class CheckboxTreeHelper { TreePath treePath = tree.getLeadSelectionPath(); if (treePath == null) return; final Object o = treePath.getLastPathComponent(); - if (!(o instanceof CheckedTreeNode)) return; - CheckedTreeNode firstNode = (CheckedTreeNode)o; + if (!(o instanceof CheckedTreeNode firstNode)) return; if (!firstNode.isEnabled()) return; toggleNode(tree, firstNode); boolean checked = firstNode.isChecked(); @@ -142,8 +139,7 @@ public class CheckboxTreeHelper { for (int i = 0; selectionPaths != null && i < selectionPaths.length; i++) { final TreePath selectionPath = selectionPaths[i]; final Object o1 = selectionPath.getLastPathComponent(); - if (!(o1 instanceof CheckedTreeNode)) continue; - CheckedTreeNode node = (CheckedTreeNode)o1; + if (!(o1 instanceof CheckedTreeNode node)) continue; setNodeState(tree, node, checked); } @@ -166,7 +162,7 @@ public class CheckboxTreeHelper { int row = tree.getRowForLocation(e.getX(), e.getY()); if (row < 0) return false; final Object o = tree.getPathForRow(row).getLastPathComponent(); - if (!(o instanceof CheckedTreeNode)) return false; + if (!(o instanceof CheckedTreeNode node)) return false; Rectangle rowBounds = tree.getRowBounds(row); cellRenderer.setBounds(rowBounds); cellRenderer.validate(); @@ -175,7 +171,6 @@ public class CheckboxTreeHelper { if (checkBounds.height == 0) checkBounds.height = checkBounds.width = rowBounds.height; - final CheckedTreeNode node = (CheckedTreeNode)o; if (checkBounds.contains(e.getPoint()) && cellRenderer.myCheckbox.isVisible()) { if (node.isEnabled()) { toggleNode(tree, node); diff --git a/platform/platform-api/src/com/intellij/ui/ClearTextAction.java b/platform/platform-api/src/com/intellij/ui/ClearTextAction.java index e00ca97922f8..c13c595722c1 100644 --- a/platform/platform-api/src/com/intellij/ui/ClearTextAction.java +++ b/platform/platform-api/src/com/intellij/ui/ClearTextAction.java @@ -19,8 +19,7 @@ public final class ClearTextAction extends AnAction implements DumbAware { @Override public void actionPerformed(@NotNull AnActionEvent e) { final Component component = e.getData(PlatformCoreDataKeys.CONTEXT_COMPONENT); - if (component instanceof JTextComponent) { - final JTextComponent textComponent = (JTextComponent)component; + if (component instanceof JTextComponent textComponent) { textComponent.setText(""); } } @@ -29,8 +28,7 @@ public final class ClearTextAction extends AnAction implements DumbAware { @Override public void update(@NotNull AnActionEvent e) { final Component component = e.getData(PlatformCoreDataKeys.CONTEXT_COMPONENT); - if (component instanceof JTextComponent) { - final JTextComponent textComponent = (JTextComponent)component; + if (component instanceof JTextComponent textComponent) { e.getPresentation().setEnabled(textComponent.getText().length() > 0 && ((JTextComponent)component).isEditable()); } else { diff --git a/platform/platform-api/src/com/intellij/ui/GuiUtils.java b/platform/platform-api/src/com/intellij/ui/GuiUtils.java index 435af62c3e66..456f0de67752 100644 --- a/platform/platform-api/src/com/intellij/ui/GuiUtils.java +++ b/platform/platform-api/src/com/intellij/ui/GuiUtils.java @@ -81,12 +81,11 @@ public final class GuiUtils { public static void replaceJSplitPaneWithIDEASplitter(JComponent root, boolean useOnePixelDivider) { final Container parent = root.getParent(); - if (root instanceof JSplitPane) { + if (root instanceof JSplitPane pane) { // we can painlessly replace only splitter which is the only child in container if (parent.getComponents().length != 1 && !(parent instanceof Splitter)) { return; } - final JSplitPane pane = (JSplitPane)root; final Component component1 = pane.getTopComponent(); final Component component2 = pane.getBottomComponent(); final int orientation = pane.getOrientation(); @@ -113,8 +112,7 @@ public final class GuiUtils { }); } - if (parent instanceof Splitter) { - final Splitter psplitter = (Splitter)parent; + if (parent instanceof Splitter psplitter) { if (psplitter.getFirstComponent() == root) { psplitter.setFirstComponent(splitter); } @@ -178,10 +176,9 @@ public final class GuiUtils { ((TitledBorder)border).setTitleColor(color); } } - else if (component instanceof JLabel) { + else if (component instanceof JLabel label) { Color color = NamedColorUtil.getInactiveTextColor(); @NonNls String changeColorString = ""; - final JLabel label = (JLabel)component; @NonNls String text = label.getText(); if (text != null && text.startsWith("")) { if (StringUtil.startsWithConcatenation(text, "", changeColorString) && enabled) { diff --git a/platform/platform-api/src/com/intellij/ui/HighlightedText.java b/platform/platform-api/src/com/intellij/ui/HighlightedText.java index 295b1d2c5a07..a8801b5f9a63 100644 --- a/platform/platform-api/src/com/intellij/ui/HighlightedText.java +++ b/platform/platform-api/src/com/intellij/ui/HighlightedText.java @@ -34,9 +34,7 @@ public final class HighlightedText { } public boolean equals(Object o) { - if (!(o instanceof HighlightedText)) return false; - - HighlightedText highlightedText = (HighlightedText)o; + if (!(o instanceof HighlightedText highlightedText)) return false; return StringUtil.equals(myBuffer, highlightedText.myBuffer) && myHighlightedRegions.equals(highlightedText.myHighlightedRegions); diff --git a/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java b/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java index 6ed9d059a504..0756faaf0fe5 100644 --- a/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java +++ b/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java @@ -55,8 +55,7 @@ public abstract class ListCellRendererWrapper implements ListCellRenderer } Component component = myRenderer != null ? myRenderer.getListCellRendererComponent(list, value, index, selected, hasFocus) : new JBLabel(); - if (component instanceof JLabel) { - JLabel label = (JLabel)component; + if (component instanceof JLabel label) { label.setIcon(myIcon); if (myText != null) label.setText(myText); if (myForeground != null) label.setForeground(myForeground); diff --git a/platform/platform-api/src/com/intellij/ui/OptionGroup.java b/platform/platform-api/src/com/intellij/ui/OptionGroup.java index 8321e322d3f6..1a5c96cb9d79 100644 --- a/platform/platform-api/src/com/intellij/ui/OptionGroup.java +++ b/platform/platform-api/src/com/intellij/ui/OptionGroup.java @@ -65,8 +65,7 @@ public class OptionGroup implements PanelWithAnchor { int left = myIndented.get(i) ? IdeBorderFactory.TITLED_BORDER_INDENT : 0; Object option = myOptions.get(i); - if (option instanceof JComponent) { - JComponent component = (JComponent)option; + if (option instanceof JComponent component) { panel.add(component, new GridBagConstraints(0, i, REMAINDER, 1, 1, 0, WEST, getFill(component), JBUI.insets(top, left, 0, 0), 0, 0)); } else { @@ -131,8 +130,8 @@ public class OptionGroup implements PanelWithAnchor { double maxWidth = -1; JComponent anchor = null; for (Object o : myOptions) { - if (o instanceof Pair && ((Pair)o).first instanceof AnchorableComponent && ((Pair)o).first instanceof JComponent) { - JComponent component = (JComponent)((Pair)o).first; + if (o instanceof Pair && ((Pair)o).first instanceof AnchorableComponent && + ((Pair)o).first instanceof JComponent component) { if (component.getPreferredSize().getWidth() > maxWidth) { maxWidth = component.getPreferredSize().getWidth(); anchor = component; diff --git a/platform/platform-api/src/com/intellij/ui/RelativeFont.java b/platform/platform-api/src/com/intellij/ui/RelativeFont.java index f821088fcbc9..1a264c0763aa 100644 --- a/platform/platform-api/src/com/intellij/ui/RelativeFont.java +++ b/platform/platform-api/src/com/intellij/ui/RelativeFont.java @@ -184,8 +184,7 @@ public final class RelativeFont implements PropertyChangeListener { @Override public void propertyChange(PropertyChangeEvent event) { - if (!(event.getNewValue() instanceof MyFont) && (event.getSource() instanceof Component) && PROPERTY.equals(event.getPropertyName())) { - Component component = (Component)event.getSource(); + if (!(event.getNewValue() instanceof MyFont) && (event.getSource() instanceof Component component) && PROPERTY.equals(event.getPropertyName())) { Font font = derive(event.getNewValue() instanceof Font ? (Font)event.getNewValue() : component.getFont()); if (font != null) { component.setFont(new MyFont(font)); diff --git a/platform/platform-api/src/com/intellij/ui/ScrollingUtil.java b/platform/platform-api/src/com/intellij/ui/ScrollingUtil.java index 69eac52982fc..d8ebae2e264a 100644 --- a/platform/platform-api/src/com/intellij/ui/ScrollingUtil.java +++ b/platform/platform-api/src/com/intellij/ui/ScrollingUtil.java @@ -197,8 +197,7 @@ public final class ScrollingUtil { if (c instanceof JList) { ensureRangeIsVisible((JList)c, top, bottom); } - else if (c instanceof JTable) { - JTable table = (JTable)c; + else if (c instanceof JTable table) { Rectangle cellBounds = getCellBounds(table, top, bottom); cellBounds.x = 0; table.scrollRectToVisible(cellBounds); diff --git a/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java b/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java index 2867b8f191c1..a0ca5c7e0d6e 100644 --- a/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java +++ b/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java @@ -391,8 +391,7 @@ class DefaultScrollBarUI extends ScrollBarUI { if (isTrackClickable()) return false; // redispatch current event to the view Container parent = myScrollBar.getParent(); - if (parent instanceof JScrollPane) { - JScrollPane pane = (JScrollPane)parent; + if (parent instanceof JScrollPane pane) { Component view = pane.getViewport().getView(); if (view != null) { Point point = event.getLocationOnScreen(); diff --git a/platform/platform-api/src/com/intellij/ui/components/JBScrollBar.java b/platform/platform-api/src/com/intellij/ui/components/JBScrollBar.java index 435535d5cefb..d74f76659b23 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBScrollBar.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBScrollBar.java @@ -189,8 +189,7 @@ public class JBScrollBar extends JScrollBar implements TopComponent, Interpolabl public void setValue(int value) { int delay = 0; Component parent = getParent(); - if (parent instanceof JBScrollPane) { - JBScrollPane pane = (JBScrollPane)parent; + if (parent instanceof JBScrollPane pane) { JViewport viewport = pane.getViewport(); if (viewport != null && ScrollSettings.isEligibleFor(viewport.getView()) && ScrollSettings.isInterpolationEligibleFor(this)) { delay = pane.getInitialDelay(getValueIsAdjusting()); @@ -261,8 +260,7 @@ public class JBScrollBar extends JScrollBar implements TopComponent, Interpolabl private JViewport getViewport() { Component parent = getParent(); - if (parent instanceof JScrollPane) { - JScrollPane pane = (JScrollPane)parent; + if (parent instanceof JScrollPane pane) { return pane.getViewport(); } return null; diff --git a/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java b/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java index ae6ca96bc5f6..eba1c119d516 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java @@ -177,8 +177,7 @@ public class JBScrollPane extends JScrollPane { Field field = BasicScrollPaneUI.class.getDeclaredField("mouseScrollListener"); field.setAccessible(true); Object value = field.get(ui); - if (value instanceof MouseWheelListener) { - MouseWheelListener oldListener = (MouseWheelListener)value; + if (value instanceof MouseWheelListener oldListener) { MouseWheelListener newListener = new JBMouseWheelListener(oldListener); field.set(ui, newListener); // replace listener if field updated successfully @@ -329,8 +328,7 @@ public class JBScrollPane extends JScrollPane { public static boolean canBePreprocessed(@NotNull MouseEvent e, @NotNull JScrollBar bar) { if (e.getID() == MouseEvent.MOUSE_MOVED || e.getID() == MouseEvent.MOUSE_PRESSED) { ScrollBarUI ui = bar.getUI(); - if (ui instanceof BasicScrollBarUI) { - BasicScrollBarUI bui = (BasicScrollBarUI)ui; + if (ui instanceof BasicScrollBarUI bui) { try { Rectangle rect = (Rectangle)ReflectionUtil.getDeclaredMethod(BasicScrollBarUI.class, "getThumbBounds", ArrayUtil.EMPTY_CLASS_ARRAY).invoke(bui); Point point = SwingUtilities.convertPoint(e.getComponent(), e.getX(), e.getY(), bar); @@ -340,8 +338,7 @@ public class JBScrollPane extends JScrollPane { return true; } } - else if (ui instanceof DefaultScrollBarUI) { - DefaultScrollBarUI dui = (DefaultScrollBarUI)ui; + else if (ui instanceof DefaultScrollBarUI dui) { Point point = e.getLocationOnScreen(); SwingUtilities.convertPointFromScreen(point, bar); return !dui.isThumbContains(point.x, point.y); diff --git a/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java b/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java index 626ffd618bad..5da0dc65b271 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java @@ -84,8 +84,7 @@ public class JBTabbedPane extends JTabbedPane implements HierarchyListener { public void setTitleAt(int index, @NlsContexts.TabTitle String title) { super.setTitleAt(index, title); Component tabComponent = getTabComponentAt(index); - if (tabComponent instanceof JLabel) { - JLabel label = (JLabel) tabComponent; + if (tabComponent instanceof JLabel label) { if (Boolean.TRUE.equals(label.getClientProperty(LABEL_FROM_TABBED_PANE))) { label.setText(title); } diff --git a/platform/platform-api/src/com/intellij/ui/components/JBViewport.java b/platform/platform-api/src/com/intellij/ui/components/JBViewport.java index 63811288ef91..9a1b28888bf0 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBViewport.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBViewport.java @@ -44,8 +44,7 @@ public class JBViewport extends JViewport implements ZoomableViewport { @DirtyUI @Override public void layoutContainer(Container parent) { - if (parent instanceof JViewport) { - JViewport viewport = (JViewport)parent; + if (parent instanceof JViewport viewport) { Component view = viewport.getView(); if (view != null) { Container grand = viewport.getParent(); @@ -62,8 +61,7 @@ public class JBViewport extends JViewport implements ZoomableViewport { @DirtyUI @Override public Dimension preferredLayoutSize(Container parent) { - if (parent instanceof JViewport) { - JViewport viewport = (JViewport)parent; + if (parent instanceof JViewport viewport) { Dimension size = getPreferredScrollableViewportSize(viewport.getView()); if (size != null) return size; // may be null for for tables or custom components } @@ -324,8 +322,7 @@ public class JBViewport extends JViewport implements ZoomableViewport { private static Insets getInnerInsets(JComponent view) { Border border = view.getBorder(); - if (border instanceof ViewBorder) { - ViewBorder vb = (ViewBorder)border; + if (border instanceof ViewBorder vb) { border = vb.myBorder; } return border == null ? null : border.getBorderInsets(view); @@ -333,8 +330,7 @@ public class JBViewport extends JViewport implements ZoomableViewport { static Insets getViewInsets(JComponent view) { Border border = view.getBorder(); - if (border instanceof ViewBorder) { - ViewBorder vb = (ViewBorder)border; + if (border instanceof ViewBorder vb) { Insets insets = JBInsets.emptyInsets(); vb.addViewInsets(view, insets); return insets; @@ -401,8 +397,7 @@ public class JBViewport extends JViewport implements ZoomableViewport { private static void updateBorder(@Nullable Component view) { if (ScrollSettings.isNotSupportedYet(view)) return; - if (view instanceof JComponent) { - JComponent component = (JComponent)view; + if (view instanceof JComponent component) { Border border = component.getBorder(); if (border instanceof ViewBorder) return; // already set component.setBorder(border == null || border instanceof UIResource @@ -449,10 +444,8 @@ public class JBViewport extends JViewport implements ZoomableViewport { } if (!myInsets.equals(insets)) { myInsets.set(insets.top, insets.left, insets.bottom, insets.right); - if (view instanceof JComponent) { - JComponent component = (JComponent)view; - if (component instanceof JTree) { - JTree tree = (JTree)component; + if (view instanceof JComponent component) { + if (component instanceof JTree tree) { TreeUtil.invalidateCacheAndRepaint(tree.getUI()); } component.revalidate(); diff --git a/platform/platform-api/src/com/intellij/ui/components/MacScrollBarUI.java b/platform/platform-api/src/com/intellij/ui/components/MacScrollBarUI.java index 11636af735f1..c618c389c782 100644 --- a/platform/platform-api/src/com/intellij/ui/components/MacScrollBarUI.java +++ b/platform/platform-api/src/com/intellij/ui/components/MacScrollBarUI.java @@ -120,8 +120,7 @@ class MacScrollBarUI extends DefaultScrollBarUI { */ private static void pauseThumbAnimation(JScrollBar bar) { Object object = bar == null ? null : bar.getUI(); - if (object instanceof MacScrollBarUI) { - MacScrollBarUI ui = (MacScrollBarUI)object; + if (object instanceof MacScrollBarUI ui) { if (0 < ui.myAnimationBehavior.getThumbFrame()) ui.myAnimationBehavior.onThumbMove(); } } diff --git a/platform/platform-api/src/com/intellij/ui/components/OnOffButton.java b/platform/platform-api/src/com/intellij/ui/components/OnOffButton.java index beb9ee6b9178..ffb2be9873fd 100644 --- a/platform/platform-api/src/com/intellij/ui/components/OnOffButton.java +++ b/platform/platform-api/src/com/intellij/ui/components/OnOffButton.java @@ -90,14 +90,13 @@ public class OnOffButton extends JToggleButton { @Override public void paint(Graphics g, JComponent c) { - if (!(c instanceof OnOffButton)) return; + if (!(c instanceof OnOffButton button)) return; int toggleArc = JBUIScale.scale(3); int buttonArc = JBUIScale.scale(5); int vGap = JBUIScale.scale(3); int hGap = JBUIScale.scale(3); - OnOffButton button = (OnOffButton)c; Dimension size = button.getSize(); int w = size.width - 2 * vGap; int h = size.height - 2 * hGap; diff --git a/platform/platform-api/src/com/intellij/ui/components/breadcrumbs/Breadcrumbs.java b/platform/platform-api/src/com/intellij/ui/components/breadcrumbs/Breadcrumbs.java index af06b36bfb86..281ed78cc0ef 100644 --- a/platform/platform-api/src/com/intellij/ui/components/breadcrumbs/Breadcrumbs.java +++ b/platform/platform-api/src/com/intellij/ui/components/breadcrumbs/Breadcrumbs.java @@ -150,8 +150,7 @@ public class Breadcrumbs extends JBPanelWithEmptyText { g.setColor(getBackground()); g.fillRect(0, 0, getWidth(), getHeight()); } - if (g instanceof Graphics2D) { - Graphics2D g2d = (Graphics2D)g; + if (g instanceof Graphics2D g2d) { g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, getKeyForCurrentScope(!Registry.is("editor.breadcrumbs.system.font"))); for (CrumbView view : views) { @@ -287,8 +286,7 @@ public class Breadcrumbs extends JBPanelWithEmptyText { @Override public Dimension preferredLayoutSize(Container container) { Dimension size = new Dimension(); - if (container instanceof Breadcrumbs) { - Breadcrumbs breadcrumbs = (Breadcrumbs)container; + if (container instanceof Breadcrumbs breadcrumbs) { breadcrumbs.updatePreferredSize(size, breadcrumbs.getScale()); } JBInsets.addTo(size, container.getInsets()); @@ -297,8 +295,7 @@ public class Breadcrumbs extends JBPanelWithEmptyText { @Override public void layoutContainer(Container container) { - if (container instanceof Breadcrumbs) { - Breadcrumbs breadcrumbs = (Breadcrumbs)container; + if (container instanceof Breadcrumbs breadcrumbs) { Rectangle bounds = new Rectangle(breadcrumbs.getWidth(), breadcrumbs.getHeight()); JBInsets.removeFrom(bounds, breadcrumbs.getInsets()); int scale = breadcrumbs.getScale(); diff --git a/platform/platform-api/src/com/intellij/ui/hover/ListHoverListener.java b/platform/platform-api/src/com/intellij/ui/hover/ListHoverListener.java index ad293b89f2c0..1a351b5743e7 100644 --- a/platform/platform-api/src/com/intellij/ui/hover/ListHoverListener.java +++ b/platform/platform-api/src/com/intellij/ui/hover/ListHoverListener.java @@ -36,8 +36,7 @@ public abstract class ListHoverListener extends HoverListener { private final AtomicInteger indexHolder = new AtomicInteger(-1); private void update(@NotNull Component component, @NotNull ToIntFunction> indexFunc) { - if (component instanceof JList) { - JList list = (JList)component; + if (component instanceof JList list) { int indexNew = indexFunc.applyAsInt(list); int indexOld = indexHolder.getAndSet(indexNew); if (indexNew != indexOld) onHover(list, indexNew); diff --git a/platform/platform-api/src/com/intellij/ui/hover/TableHoverListener.java b/platform/platform-api/src/com/intellij/ui/hover/TableHoverListener.java index 739aaa5d8574..a0d129aba156 100644 --- a/platform/platform-api/src/com/intellij/ui/hover/TableHoverListener.java +++ b/platform/platform-api/src/com/intellij/ui/hover/TableHoverListener.java @@ -39,8 +39,7 @@ public abstract class TableHoverListener extends HoverListener { private final AtomicInteger columnHolder = new AtomicInteger(-1); private void update(@NotNull Component component, @NotNull ToIntFunction rowFunc, @NotNull ToIntFunction columnFunc) { - if (component instanceof JTable) { - JTable table = (JTable)component; + if (component instanceof JTable table) { int rowNew = rowFunc.applyAsInt(table); int rowOld = rowHolder.getAndSet(rowNew); int columnNew = columnFunc.applyAsInt(table); diff --git a/platform/platform-api/src/com/intellij/ui/hover/TreeHoverListener.java b/platform/platform-api/src/com/intellij/ui/hover/TreeHoverListener.java index f360f5e322c3..e49c3fbbca6a 100644 --- a/platform/platform-api/src/com/intellij/ui/hover/TreeHoverListener.java +++ b/platform/platform-api/src/com/intellij/ui/hover/TreeHoverListener.java @@ -36,8 +36,7 @@ public abstract class TreeHoverListener extends HoverListener { private final AtomicInteger rowHolder = new AtomicInteger(-1); private void update(@NotNull Component component, @NotNull ToIntFunction rowFunc) { - if (component instanceof JTree) { - JTree tree = (JTree)component; + if (component instanceof JTree tree) { int rowNew = rowFunc.applyAsInt(tree); int rowOld = rowHolder.getAndSet(rowNew); if (rowNew != rowOld) onHover(tree, rowNew); diff --git a/platform/platform-api/src/com/intellij/ui/mac/touchbar/Touchbar.java b/platform/platform-api/src/com/intellij/ui/mac/touchbar/Touchbar.java index 203f7e22e7ae..51018b20f94f 100644 --- a/platform/platform-api/src/com/intellij/ui/mac/touchbar/Touchbar.java +++ b/platform/platform-api/src/com/intellij/ui/mac/touchbar/Touchbar.java @@ -119,8 +119,7 @@ public final class Touchbar { if (EXPAND_OPTION_BUTTONS) { DefaultActionGroup options = null; for (JButton jb : buttons) { - if (jb instanceof JBOptionButton) { - final JBOptionButton ob = (JBOptionButton)jb; + if (jb instanceof JBOptionButton ob) { final Action[] opts = ob.getOptions(); if (opts != null) { for (Action a : opts) { diff --git a/platform/platform-api/src/com/intellij/ui/scroll/MouseWheelSmoothScroll.java b/platform/platform-api/src/com/intellij/ui/scroll/MouseWheelSmoothScroll.java index fe15d9527092..5fe6a59cbae6 100644 --- a/platform/platform-api/src/com/intellij/ui/scroll/MouseWheelSmoothScroll.java +++ b/platform/platform-api/src/com/intellij/ui/scroll/MouseWheelSmoothScroll.java @@ -78,10 +78,9 @@ public final class MouseWheelSmoothScroll { if (event.getSource() instanceof JScrollPane) { JViewport viewport = ((JScrollPane)event.getSource()).getViewport(); - if (viewport.getView() instanceof Scrollable) { + if (viewport.getView() instanceof Scrollable scrollable) { int orientation = bar.getOrientation(); boolean isVertical = orientation == Adjustable.VERTICAL; - Scrollable scrollable = (Scrollable)viewport.getView(); int scroll = abs(event.getUnitsToScroll()); Rectangle rect = viewport.getViewRect(); int delta = 0; diff --git a/platform/platform-api/src/com/intellij/ui/table/JBTable.java b/platform/platform-api/src/com/intellij/ui/table/JBTable.java index e223c8cb6c3e..893ca4d6a045 100644 --- a/platform/platform-api/src/com/intellij/ui/table/JBTable.java +++ b/platform/platform-api/src/com/intellij/ui/table/JBTable.java @@ -385,8 +385,7 @@ public class JBTable extends JTable implements ComponentWithEmptyText, Component public void setModel(@NotNull TableModel model) { super.setModel(model); - if (model instanceof SortableColumnModel) { - final SortableColumnModel sortableModel = (SortableColumnModel)model; + if (model instanceof SortableColumnModel sortableModel) { if (sortableModel.isSortable()) { final TableRowSorter rowSorter = createRowSorter(model); rowSorter.setSortsOnUpdates(isSortOnUpdates()); @@ -725,8 +724,7 @@ public class JBTable extends JTable implements ComponentWithEmptyText, Component public Component prepareRenderer(@NotNull TableCellRenderer renderer, int row, int column) { Component result = super.prepareRenderer(renderer, row, column); - if (result instanceof JComponent && !isCellSelected(row, column)) { - JComponent component = (JComponent)result; + if (result instanceof JComponent component && !isCellSelected(row, column)) { if (isStriped()) { if (isTableDecorationSupported()) { setRendererBackground(component, row % 2 == 1 ? getBackground() : ObjectUtils.chooseNotNull(getStripeColor(), getBackground())); @@ -1047,9 +1045,8 @@ public class JBTable extends JTable implements ComponentWithEmptyText, Component int row, int column) { Component delegate = renderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - if (!(delegate instanceof JLabel)) return delegate; + if (!(delegate instanceof JLabel cmp)) return delegate; - JLabel cmp = (JLabel)delegate; cmp.setHorizontalAlignment(SwingConstants.LEFT); Border border = cmp.getBorder(); JBEmptyBorder indent = JBUI.Borders.emptyLeft(8); diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java index da6f2e683e8e..8c0a261c1873 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java @@ -3368,8 +3368,7 @@ public class JBTabsImpl extends JComponent private void applyResetComponents() { for (int i = 0; i < getComponentCount(); i++) { final Component each = getComponent(i); - if (each instanceof JComponent) { - final JComponent jc = (JComponent)each; + if (each instanceof JComponent jc) { if (!UIUtil.isClientPropertyTrue(jc, LAYOUT_DONE)) { layout(jc, new Rectangle(0, 0, 0, 0)); } @@ -3618,8 +3617,7 @@ public class JBTabsImpl extends JComponent // Note: Unlike a JTabbedPane, JBTabsImpl has many more child types than just pages. // So we wrap TabLabel instances with their corresponding AccessibleTabPage, while // leaving other types of children untouched. - if (accessibleChild instanceof TabLabel) { - TabLabel label = (TabLabel)accessibleChild; + if (accessibleChild instanceof TabLabel label) { return myInfo2Page.get(label.getInfo()); } return accessibleChild; diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTreeStructure.java b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTreeStructure.java index 62215faface0..194ba0d27568 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTreeStructure.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTreeStructure.java @@ -42,9 +42,8 @@ public abstract class SimpleTreeStructure extends AbstractTreeStructure { } private static void cleanUpCaches(SimpleNode node) { - if (!(node instanceof CachingSimpleNode)) return; + if (!(node instanceof CachingSimpleNode cachingNode)) return; - final CachingSimpleNode cachingNode = ((CachingSimpleNode) node); SimpleNode[] cached = cachingNode.getCached(); if (cached == null) return; diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java index 0104e55e80d1..b4f4a672e0cd 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java @@ -91,8 +91,7 @@ public class Tree extends JTree implements ComponentWithEmptyText, ComponentWith TreePath newPath = getPathForLocation(p.x, p.y); if (newPath != null && !newPath.equals(rollOverPath)) { TreeCellRenderer renderer = getCellRenderer(); - if (newPath.getLastPathComponent() instanceof TreeNode) { - TreeNode node = (TreeNode)newPath.getLastPathComponent(); + if (newPath.getLastPathComponent() instanceof TreeNode node) { JComponent c = (JComponent)renderer.getTreeCellRendererComponent( Tree.this, node, isPathSelected(newPath), @@ -508,8 +507,7 @@ public class Tree extends JTree implements ComponentWithEmptyText, ComponentWith int lastIndex = -1; for (int i = 0; i < kids.length; i++) { Object kid = kids[i]; - if (kid instanceof PresentableNodeDescriptor) { - PresentableNodeDescriptor eachKid = (PresentableNodeDescriptor)kid; + if (kid instanceof PresentableNodeDescriptor eachKid) { if (!node.isHighlightableContentNode(eachKid)) continue; if (first == null) { first = eachKid; @@ -525,16 +523,14 @@ public class Tree extends JTree implements ComponentWithEmptyText, ComponentWith if (isExpanded(getPath(last))) { if (lastIndex + 1 < kids.length) { Object child = kids[lastIndex + 1]; - if (child instanceof PresentableNodeDescriptor) { - PresentableNodeDescriptor nextKid = (PresentableNodeDescriptor)child; + if (child instanceof PresentableNodeDescriptor nextKid) { int nextRow = getRowForPath(getPath(nextKid)); last = TreeUtil.getLastUserObject(PresentableNodeDescriptor.class, getPathForRow(nextRow - 1)); } } else { NodeDescriptor parentNode = node.getParentDescriptor(); - if (parentNode instanceof PresentableNodeDescriptor) { - PresentableNodeDescriptor ppd = (PresentableNodeDescriptor)parentNode; + if (parentNode instanceof PresentableNodeDescriptor ppd) { int nodeIndex = node.getIndex(); if (nodeIndex + 1 < structure.getChildElements(ppd).length) { PresentableNodeDescriptor nextChild = ppd.getChildToHighlightAt(nodeIndex + 1); @@ -725,8 +721,7 @@ public class Tree extends JTree implements ComponentWithEmptyText, ComponentWith public void mouseExited(MouseEvent e) { if (UIUtil.isUnderWin10LookAndFeel() && rollOverPath != null) { TreeCellRenderer renderer = getCellRenderer(); - if (rollOverPath.getLastPathComponent() instanceof TreeNode) { - TreeNode node = (TreeNode)rollOverPath.getLastPathComponent(); + if (rollOverPath.getLastPathComponent() instanceof TreeNode node) { JComponent c = (JComponent)renderer.getTreeCellRendererComponent( Tree.this, node, isPathSelected(rollOverPath), @@ -746,8 +741,7 @@ public class Tree extends JTree implements ComponentWithEmptyText, ComponentWith Point p = e.getPoint(); TreePath path = getPathForLocation(p.x, p.y); if (path != null) { - if (path.getLastPathComponent() instanceof TreeNode) { - TreeNode node = (TreeNode)path.getLastPathComponent(); + if (path.getLastPathComponent() instanceof TreeNode node) { JComponent c = (JComponent)getCellRenderer().getTreeCellRendererComponent( Tree.this, node, isPathSelected(path), isExpanded(path), diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTable.java b/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTable.java index b942f4437425..6f853d19526a 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTable.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTable.java @@ -336,8 +336,7 @@ public class TreeTable extends JBTable { @Override public boolean editCellAt(int row, int column, EventObject e) { boolean editResult = super.editCellAt(row, column, e); - if (e instanceof MouseEvent && isTreeColumn(column)){ - MouseEvent me = (MouseEvent)e; + if (e instanceof MouseEvent me && isTreeColumn(column)){ int y = me.getY(); if (getRowHeight() != myTree.getRowHeight()) { diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTableTree.java b/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTableTree.java index eedd2f37b4f9..cb387b0944f0 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTableTree.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTableTree.java @@ -44,8 +44,7 @@ public class TreeTableTree extends Tree { public void updateUI() { super.updateUI(); TreeCellRenderer tcr = super.getCellRenderer(); - if (tcr instanceof DefaultTreeCellRenderer) { - DefaultTreeCellRenderer dtcr = (DefaultTreeCellRenderer)tcr; + if (tcr instanceof DefaultTreeCellRenderer dtcr) { dtcr.setTextSelectionColor(UIUtil.getTableSelectionForeground()); dtcr.setBackgroundSelectionColor(UIUtil.getTableSelectionBackground(true)); } diff --git a/platform/platform-api/src/com/intellij/util/ContentsUtil.java b/platform/platform-api/src/com/intellij/util/ContentsUtil.java index 387d0a759e39..f4610395ddde 100644 --- a/platform/platform-api/src/com/intellij/util/ContentsUtil.java +++ b/platform/platform-api/src/com/intellij/util/ContentsUtil.java @@ -52,8 +52,7 @@ public class ContentsUtil { } public static void closeContentTab(@NotNull ContentManager contentManager, @NotNull Content content) { - if (content instanceof TabbedContent) { - TabbedContent tabbedContent = (TabbedContent)content; + if (content instanceof TabbedContent tabbedContent) { if (tabbedContent.hasMultipleTabs()) { JComponent component = tabbedContent.getComponent(); tabbedContent.removeContent(component); diff --git a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java index 980889b1dcb1..704ac60872c3 100644 --- a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java +++ b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java @@ -467,8 +467,7 @@ public class HttpConfigurable implements PersistentStateComponent promiseVisit(@NotNull JTree tree, @NotNull TreeVisitor visitor) { TreeModel model = tree.getModel(); - if (model instanceof TreeVisitor.Acceptor) { - TreeVisitor.Acceptor acceptor = (TreeVisitor.Acceptor)model; + if (model instanceof TreeVisitor.Acceptor acceptor) { return acceptor.accept(visitor); } if (model == null) return Promises.rejectedPromise("tree model is not set"); diff --git a/platform/platform-impl/src/com/intellij/accessibility/TextFieldWithListAccessibleContext.java b/platform/platform-impl/src/com/intellij/accessibility/TextFieldWithListAccessibleContext.java index 21956d6d7d92..56f9855f609c 100644 --- a/platform/platform-impl/src/com/intellij/accessibility/TextFieldWithListAccessibleContext.java +++ b/platform/platform-impl/src/com/intellij/accessibility/TextFieldWithListAccessibleContext.java @@ -44,8 +44,7 @@ public class TextFieldWithListAccessibleContext extends JTextComponent.Accessibl Object oldValue, Object newValue) { if (accessibleChangeSupport != null) { - if (newValue instanceof PropertyChangeEvent) { - PropertyChangeEvent pce = (PropertyChangeEvent)newValue; + if (newValue instanceof PropertyChangeEvent pce) { accessibleChangeSupport.firePropertyChange(pce); } else { accessibleChangeSupport.firePropertyChange(propertyName, diff --git a/platform/platform-impl/src/com/intellij/application/options/colors/AbstractFontOptionsPanel.java b/platform/platform-impl/src/com/intellij/application/options/colors/AbstractFontOptionsPanel.java index 12823aeeb920..e9ae2ab65f51 100644 --- a/platform/platform-impl/src/com/intellij/application/options/colors/AbstractFontOptionsPanel.java +++ b/platform/platform-impl/src/com/intellij/application/options/colors/AbstractFontOptionsPanel.java @@ -368,8 +368,7 @@ public abstract class AbstractFontOptionsPanel extends JPanel implements Options */ private void syncFontFamilies(AWTEvent event) { Object source = event.getSource(); - if (source instanceof AbstractFontCombo) { - AbstractFontCombo combo = (AbstractFontCombo)source; + if (source instanceof AbstractFontCombo combo) { if (combo.isEnabled() && combo.isShowing() && combo.getSelectedItem() != null) { syncFontFamilies(); } @@ -381,8 +380,7 @@ public abstract class AbstractFontOptionsPanel extends JPanel implements Options return; } FontPreferences fontPreferences = getFontPreferences(); - if (fontPreferences instanceof ModifiableFontPreferences) { - ModifiableFontPreferences modifiableFontPreferences = (ModifiableFontPreferences)fontPreferences; + if (fontPreferences instanceof ModifiableFontPreferences modifiableFontPreferences) { modifiableFontPreferences.clearFonts(); modifiableFontPreferences.setUseLigatures(myEnableLigaturesCheckbox.isSelected()); String primaryFontFamily = myPrimaryCombo.getFontName(); diff --git a/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontDescriptionPanel.java b/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontDescriptionPanel.java index 472c3c0fc0e5..ed3922ceba26 100644 --- a/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontDescriptionPanel.java +++ b/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontDescriptionPanel.java @@ -166,8 +166,7 @@ public class ColorAndFontDescriptionPanel extends JPanel implements OptionsPanel public void reset(@NotNull EditorSchemeAttributeDescriptor attrDescription) { try { myUiEventsEnabled = false; - if (!(attrDescription instanceof ColorAndFontDescription)) return; - ColorAndFontDescription description = (ColorAndFontDescription)attrDescription; + if (!(attrDescription instanceof ColorAndFontDescription description)) return; if (description.isFontEnabled()) { myLabelFont.setEnabled(description.isEditable()); @@ -264,8 +263,7 @@ public class ColorAndFontDescriptionPanel extends JPanel implements OptionsPanel @Override public void apply(@NotNull EditorSchemeAttributeDescriptor attrDescription, EditorColorsScheme scheme) { - if (!(attrDescription instanceof ColorAndFontDescription)) return; - ColorAndFontDescription description = (ColorAndFontDescription)attrDescription; + if (!(attrDescription instanceof ColorAndFontDescription description)) return; description.setInherited(myInheritAttributesBox.isSelected()); if (description.isInherited()) { diff --git a/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java b/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java index e29c9c30da7c..27ac3d3a7e1e 100644 --- a/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java +++ b/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java @@ -225,8 +225,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract } public boolean saveSchemeAs(@NotNull EditorColorsScheme editorScheme, @NotNull String name) { - if (editorScheme instanceof MyColorScheme) { - MyColorScheme scheme = (MyColorScheme)editorScheme; + if (editorScheme instanceof MyColorScheme scheme) { EditorColorsScheme clone = (EditorColorsScheme)scheme.getParentScheme().clone(); scheme.apply(clone); if (clone instanceof AbstractColorsScheme) { diff --git a/platform/platform-impl/src/com/intellij/application/options/colors/RainbowDescriptionPanel.java b/platform/platform-impl/src/com/intellij/application/options/colors/RainbowDescriptionPanel.java index 1ac1852784e2..bb1cbc3c26d8 100644 --- a/platform/platform-impl/src/com/intellij/application/options/colors/RainbowDescriptionPanel.java +++ b/platform/platform-impl/src/com/intellij/application/options/colors/RainbowDescriptionPanel.java @@ -98,8 +98,7 @@ public class RainbowDescriptionPanel extends JPanel implements OptionsPanelImpl. @Override public void reset(@NotNull EditorSchemeAttributeDescriptor attributeDescriptor) { - if (!(attributeDescriptor instanceof RainbowAttributeDescriptor)) return; - RainbowAttributeDescriptor descriptor = (RainbowAttributeDescriptor)attributeDescriptor; + if (!(attributeDescriptor instanceof RainbowAttributeDescriptor descriptor)) return; EditorColorsScheme editedColorsScheme = descriptor.getScheme(); Boolean rainbowOn = RainbowHighlighter.isRainbowEnabled(editedColorsScheme, descriptor.getLanguage()); @@ -129,8 +128,7 @@ public class RainbowDescriptionPanel extends JPanel implements OptionsPanelImpl. @Override public void apply(@NotNull EditorSchemeAttributeDescriptor attributeDescriptor, EditorColorsScheme scheme) { - if (!(attributeDescriptor instanceof RainbowAttributeDescriptor)) return; - RainbowAttributeDescriptor descriptor = (RainbowAttributeDescriptor)attributeDescriptor; + if (!(attributeDescriptor instanceof RainbowAttributeDescriptor descriptor)) return; boolean isDefaultLanguage = descriptor.getLanguage() == null; RainbowHighlighter.setRainbowEnabled(scheme, diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.java b/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.java index 9e6245da58cf..27cc76b98cb0 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.java @@ -257,8 +257,7 @@ final class ITNProxy { append(builder, "error.redacted", Boolean.toString(true)); } - if (eventData instanceof AbstractMessage) { - AbstractMessage messageObj = (AbstractMessage)eventData; + if (eventData instanceof AbstractMessage messageObj) { for (Attachment attachment : messageObj.getIncludedAttachments()) { append(builder, "attachment.name", attachment.getName()); append(builder, "attachment.value", attachment.getEncodedBytes()); diff --git a/platform/platform-impl/src/com/intellij/externalDependencies/impl/ExternalDependenciesConfigurable.java b/platform/platform-impl/src/com/intellij/externalDependencies/impl/ExternalDependenciesConfigurable.java index b57ade26ddc4..0491df3a3a87 100644 --- a/platform/platform-impl/src/com/intellij/externalDependencies/impl/ExternalDependenciesConfigurable.java +++ b/platform/platform-impl/src/com/intellij/externalDependencies/impl/ExternalDependenciesConfigurable.java @@ -78,8 +78,7 @@ public class ExternalDependenciesConfigurable implements SearchableConfigurable @Override protected void customizeCellRenderer(@NotNull JList list, ProjectExternalDependency dependency, int index, boolean selected, boolean hasFocus) { - if (dependency instanceof DependencyOnPlugin) { - DependencyOnPlugin value = (DependencyOnPlugin)dependency; + if (dependency instanceof DependencyOnPlugin value) { append(getPluginNameById(value.getPluginId()), SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES); String minVersion = value.getMinVersion(); String maxVersion = value.getMaxVersion(); diff --git a/platform/platform-impl/src/com/intellij/ide/IdePopupManager.java b/platform/platform-impl/src/com/intellij/ide/IdePopupManager.java index ffbf2a66a9cc..6682dc737cdd 100644 --- a/platform/platform-impl/src/com/intellij/ide/IdePopupManager.java +++ b/platform/platform-impl/src/com/intellij/ide/IdePopupManager.java @@ -73,8 +73,7 @@ public final class IdePopupManager implements IdeEventQueue.EventDispatcher { shouldCloseAllPopup = true; } - if (!shouldCloseAllPopup && ultimateParentForEventWindow instanceof IdeFrame) { - IdeFrame ultimateParentWindowForEvent = (IdeFrame)ultimateParentForEventWindow; + if (!shouldCloseAllPopup && ultimateParentForEventWindow instanceof IdeFrame ultimateParentWindowForEvent) { if (ultimateParentWindowForEvent.isInFullScreen() && !ultimateParentForFocusedComponent.equals(ultimateParentForEventWindow)) { shouldCloseAllPopup = true; @@ -85,9 +84,8 @@ public final class IdePopupManager implements IdeEventQueue.EventDispatcher { closeAllPopups(); } } - else if (e instanceof KeyEvent) { + else if (e instanceof KeyEvent keyEvent) { // the following is copied from IdeKeyEventDispatcher - KeyEvent keyEvent = (KeyEvent)e; Object source = keyEvent.getSource(); if (myIgnoreNextKeyTypedEvent) { if (KeyEvent.KEY_TYPED == e.getID()) return true; diff --git a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java index 872373955611..ad1761eff5cc 100644 --- a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java +++ b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java @@ -219,9 +219,8 @@ public class IdeTooltipManager implements Disposable, AWTEventListener { } private void showForComponent(Component c, MouseEvent me, boolean now) { - if (!(c instanceof JComponent)) return; + if (!(c instanceof JComponent comp)) return; - JComponent comp = (JComponent)c; Window wnd = SwingUtilities.getWindowAncestor(comp); if (wnd == null) return; diff --git a/platform/platform-impl/src/com/intellij/ide/LocalCopyPasteManager.java b/platform/platform-impl/src/com/intellij/ide/LocalCopyPasteManager.java index 5fda7badfcf6..db7acf320f91 100644 --- a/platform/platform-impl/src/com/intellij/ide/LocalCopyPasteManager.java +++ b/platform/platform-impl/src/com/intellij/ide/LocalCopyPasteManager.java @@ -105,8 +105,7 @@ public class LocalCopyPasteManager implements ClientCopyPasteManager { return content; } - if (content instanceof KillRingTransferable) { - KillRingTransferable killRingContent = (KillRingTransferable)content; + if (content instanceof KillRingTransferable killRingContent) { if (killRingContent.isReadyToCombine() && !myData.isEmpty()) { Transferable prev = myData.get(0); if (prev instanceof KillRingTransferable) { diff --git a/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacro.java b/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacro.java index 8c74dbac730c..de8f0f33a3a6 100644 --- a/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacro.java +++ b/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacro.java @@ -103,9 +103,8 @@ public final class ActionMacro { final ActionDescriptor[] actions = getActions(); for (ActionDescriptor action : actions) { Element actionNode = null; - if (action instanceof TypedDescriptor) { + if (action instanceof TypedDescriptor typedDescriptor) { actionNode = new Element(ELEMENT_TYPING); - TypedDescriptor typedDescriptor = (TypedDescriptor)action; actionNode.setText(typedDescriptor.getText().replaceAll(" ", " ")); actionNode.setAttribute(ATTRIBUTE_KEY_CODES, unparseKeyCodes( Couple.of(typedDescriptor.getKeyCodes(), typedDescriptor.getKeyModifiers()))); @@ -145,9 +144,7 @@ public final class ActionMacro { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ActionMacro)) return false; - - final ActionMacro actionMacro = (ActionMacro)o; + if (!(o instanceof ActionMacro actionMacro)) return false; if (!myActions.equals(actionMacro.myActions)) return false; if (!myName.equals(actionMacro.myName)) return false; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ChangeLAFAnimator.java b/platform/platform-impl/src/com/intellij/ide/actions/ChangeLAFAnimator.java index 5d303be2beb2..b1acf9bfb01d 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ChangeLAFAnimator.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ChangeLAFAnimator.java @@ -61,9 +61,8 @@ final class ChangeLAFAnimator { Window[] windows = Window.getWindows(); myMap = new LinkedHashMap<>(); for (Window window : windows) { - if (window instanceof RootPaneContainer && window.isShowing()) { + if (window instanceof RootPaneContainer rootPaneContainer && window.isShowing()) { Rectangle bounds = window.getBounds(); - RootPaneContainer rootPaneContainer = (RootPaneContainer)window; JLayeredPane layeredPane = rootPaneContainer.getLayeredPane(); BufferedImage image = ImageUtil.createImage(window.getGraphicsConfiguration(), bounds.width, bounds.height, BufferedImage.TYPE_INT_ARGB); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/MaximizeActiveDialogAction.java b/platform/platform-impl/src/com/intellij/ide/actions/MaximizeActiveDialogAction.java index 1ed4b343380e..83bf4371b5b5 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/MaximizeActiveDialogAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/MaximizeActiveDialogAction.java @@ -52,8 +52,7 @@ public final class MaximizeActiveDialogAction extends WindowAction { if (!canBeNormalized(dialog)) return; JRootPane rootPane = dialog.getRootPane(); Object value = rootPane.getClientProperty(NORMAL_BOUNDS); - if (value instanceof Rectangle) { - Rectangle bounds = (Rectangle)value; + if (value instanceof Rectangle bounds) { ScreenUtil.fitToScreen(bounds); dialog.setBounds(bounds); rootPane.putClientProperty(NORMAL_BOUNDS, null); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ScrollTreeToCenterAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ScrollTreeToCenterAction.java index fcf809b97592..d32919c5ad67 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ScrollTreeToCenterAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ScrollTreeToCenterAction.java @@ -16,8 +16,7 @@ public class ScrollTreeToCenterAction extends AnAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { final Component component = e.getData(PlatformCoreDataKeys.CONTEXT_COMPONENT); - if (component instanceof JTree) { - JTree tree = (JTree)component; + if (component instanceof JTree tree) { final int[] selection = tree.getSelectionRows(); if (selection != null && selection.length > 0) { TreeUtil.showRowCentered(tree, selection [0], false); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java index ddda1de7770e..d407c3e46a1f 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java @@ -140,8 +140,7 @@ public final class Switcher extends BaseSwitcherAction { public boolean onClick(@NotNull MouseEvent e, int clickCount) { if (pinned && (e.isControlDown() || e.isMetaDown() || e.isShiftDown())) return false; final Object source = e.getSource(); - if (source instanceof JList) { - JList jList = (JList)source; + if (source instanceof JList jList) { if (jList.getSelectedIndex() == -1 && jList.getAnchorSelectionIndex() != -1) { jList.setSelectedIndex(jList.getAnchorSelectionIndex()); } @@ -529,8 +528,7 @@ public final class Switcher extends BaseSwitcherAction { private void addForbiddenMnemonics(@NotNull Map keymap, @NotNull String actionId) { for (Shortcut shortcut : ActionUtil.getShortcutSet(actionId).getShortcuts()) { - if (shortcut instanceof KeyboardShortcut) { - KeyboardShortcut keyboardShortcut = (KeyboardShortcut)shortcut; + if (shortcut instanceof KeyboardShortcut keyboardShortcut) { keymap.put(onKeyRelease.getForbiddenMnemonic(keyboardShortcut.getFirstKeyStroke()), null); } } @@ -573,8 +571,7 @@ public final class Switcher extends BaseSwitcherAction { for (int i = selected.length - 1; i >= 0; i--) { selectedIndex = selected[i]; SwitcherListItem item = selectedList.getModel().getElementAt(selectedIndex); - if (item instanceof SwitcherVirtualFile) { - SwitcherVirtualFile svf = (SwitcherVirtualFile)item; + if (item instanceof SwitcherVirtualFile svf) { VirtualFile virtualFile = svf.getFile(); FileEditorManagerImpl fileEditorManager = (FileEditorManagerImpl)FileEditorManager.getInstance(project); EditorWindow window = findAppropriateWindow(svf.getWindow()); @@ -708,8 +705,7 @@ public final class Switcher extends BaseSwitcherAction { final FileEditorManagerImpl manager = (FileEditorManagerImpl)FileEditorManager.getInstance(project); EditorWindow splitWindow = null; for (Object value : values) { - if (value instanceof SwitcherVirtualFile) { - SwitcherVirtualFile item = (SwitcherVirtualFile)value; + if (value instanceof SwitcherVirtualFile item) { VirtualFile file = item.getFile(); if (mode == RIGHT_SPLIT) { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/WindowAction.java b/platform/platform-impl/src/com/intellij/ide/actions/WindowAction.java index ab4e4cbfed14..6ab68a197670 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/WindowAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/WindowAction.java @@ -53,8 +53,7 @@ public abstract class WindowAction extends AnAction implements DumbAware { } private static @Nullable JRootPane getRootPane(@Nullable Window window) { - if (window instanceof RootPaneContainer) { - RootPaneContainer container = (RootPaneContainer)window; + if (window instanceof RootPaneContainer container) { return container.getRootPane(); } return null; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ZoomCurrentWindowAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ZoomCurrentWindowAction.java index 7542a959ce80..fa82659ea2f8 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ZoomCurrentWindowAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ZoomCurrentWindowAction.java @@ -31,8 +31,7 @@ public class ZoomCurrentWindowAction extends MacWindowActionBase { final Component focusOwner = IdeFocusManager.getGlobalInstance().getFocusOwner(); if (focusOwner != null) { final Window window = focusOwner instanceof JFrame ? (Window)focusOwner : SwingUtilities.getWindowAncestor(focusOwner); - if (window instanceof JFrame) { - JFrame frame = (JFrame)window; + if (window instanceof JFrame frame) { if (frame.getExtendedState() == Frame.NORMAL) { frame.setExtendedState(Frame.MAXIMIZED_BOTH); } diff --git a/platform/platform-impl/src/com/intellij/ide/browsers/ConfigurableWebBrowser.java b/platform/platform-impl/src/com/intellij/ide/browsers/ConfigurableWebBrowser.java index 620bceab0d05..20383059dcb8 100644 --- a/platform/platform-impl/src/com/intellij/ide/browsers/ConfigurableWebBrowser.java +++ b/platform/platform-impl/src/com/intellij/ide/browsers/ConfigurableWebBrowser.java @@ -124,11 +124,10 @@ final class ConfigurableWebBrowser extends WebBrowser { if (this == o) { return true; } - if (!(o instanceof ConfigurableWebBrowser)) { + if (!(o instanceof ConfigurableWebBrowser browser)) { return false; } - ConfigurableWebBrowser browser = (ConfigurableWebBrowser)o; return getId().equals(browser.getId()) && family.equals(browser.family) && active == browser.active && diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/DnDEventImpl.java b/platform/platform-impl/src/com/intellij/ide/dnd/DnDEventImpl.java index 1abefab4f8d1..e07f7d1e44dd 100644 --- a/platform/platform-impl/src/com/intellij/ide/dnd/DnDEventImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/dnd/DnDEventImpl.java @@ -284,12 +284,10 @@ public class DnDEventImpl extends UserDataHolderBase implements Transferable, Dn if( this == o ) { return true; } - if( !(o instanceof DnDEventImpl) ) { + if( !(o instanceof DnDEventImpl event) ) { return false; } - final DnDEventImpl event = (DnDEventImpl) o; - if( myDropPossible != event.myDropPossible ) { return false; } diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java index 8c2446e664c4..367202f21486 100644 --- a/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java @@ -176,8 +176,7 @@ public final class DnDManagerImpl extends DnDManager { DnDEventImpl currentEvent = myCurrentEvent; - if (myCurrentEvent == null && aComponentOverDragging instanceof JComponent) { - JComponent jComp = (JComponent)aComponentOverDragging; + if (myCurrentEvent == null && aComponentOverDragging instanceof JComponent jComp) { DnDTarget target = getTarget(jComp); if (target instanceof DnDNativeTarget) { DnDEventImpl event = (DnDEventImpl)jComp.getClientProperty(DnDNativeTarget.EVENT_KEY); @@ -393,8 +392,7 @@ public final class DnDManagerImpl extends DnDManager { // update selected row bounds according to the visible rectangle RelativePoint point = rectangle.getPoint(); Component component = point == null ? null : point.getOriginalComponent(); - if (component instanceof JTree) { - JTree tree = (JTree)component; + if (component instanceof JTree tree) { Rectangle visible = tree.getVisibleRect(); int dx = point.getOriginalPoint().x - visible.x; if (aType == DnDEvent.DropTargetHighlightingType.RECTANGLE || dx < 0) { @@ -405,8 +403,7 @@ public final class DnDManagerImpl extends DnDManager { bounds.width = visible.width - dx; } } - else if (component instanceof JList) { - JList list = (JList)component; + else if (component instanceof JList list) { if (JList.VERTICAL == list.getLayoutOrientation()) { Rectangle visible = list.getVisibleRect(); int dx = point.getOriginalPoint().x - visible.x; diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/aware/DnDAwareTree.java b/platform/platform-impl/src/com/intellij/ide/dnd/aware/DnDAwareTree.java index 9bab2f978d98..b27654eabacb 100644 --- a/platform/platform-impl/src/com/intellij/ide/dnd/aware/DnDAwareTree.java +++ b/platform/platform-impl/src/com/intellij/ide/dnd/aware/DnDAwareTree.java @@ -122,8 +122,7 @@ public class DnDAwareTree extends Tree implements DnDAware { private static final TransferHandler DEFAULT_TRANSFER_HANDLER = new TransferHandler() { @Override protected Transferable createTransferable(JComponent component) { - if (component instanceof JTree) { - JTree tree = (JTree)component; + if (component instanceof JTree tree) { TreePath[] selection = tree.getSelectionPaths(); if (selection != null && selection.length > 1) { return new TransferableList<>(selection) { diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/ErrorViewStructure.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/ErrorViewStructure.java index 02cafd92f3c4..c292985ed2bb 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/ErrorViewStructure.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/ErrorViewStructure.java @@ -467,8 +467,7 @@ public class ErrorViewStructure extends AbstractTreeStructure { if (element == myRoot) { return; } - if (element instanceof GroupingElement) { - GroupingElement groupingElement = (GroupingElement)element; + if (element instanceof GroupingElement groupingElement) { removeGroup(groupingElement.getName()); final VirtualFile virtualFile = groupingElement.getFile(); if (virtualFile != null) { @@ -480,8 +479,7 @@ public class ErrorViewStructure extends AbstractTreeStructure { }); } } - else if (element instanceof NavigatableMessageElement){ - final NavigatableMessageElement navElement = (NavigatableMessageElement)element; + else if (element instanceof NavigatableMessageElement navElement){ final GroupingElement parent = navElement.getParent(); if (parent != null) { synchronized (myLock) { diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeEditor.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeEditor.java index 58c2e4299892..f6a4ddd6d3d2 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeEditor.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeEditor.java @@ -61,8 +61,7 @@ public final class NewErrorTreeEditor extends AbstractCellEditor implements Tree @Override public Component getTreeCellEditorComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row) { final ErrorTreeElement element = getElement(value); - if (element instanceof EditableMessageElement) { - EditableMessageElement editableMessageElement = (EditableMessageElement)element; + if (element instanceof EditableMessageElement editableMessageElement) { final CustomizeColoredTreeCellRenderer leftSelfRenderer = editableMessageElement.getLeftSelfRenderer(); final TreeCellEditor rightSelfEditor = editableMessageElement.getRightSelfEditor(); myColoredTreeCellRenderer.setCurrentCallback(leftSelfRenderer); diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/impl/ErrorViewTextExporter.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/impl/ErrorViewTextExporter.java index 0ea031b9aadc..1c6a0356df3d 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/impl/ErrorViewTextExporter.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/impl/ErrorViewTextExporter.java @@ -70,13 +70,12 @@ public class ErrorViewTextExporter implements ExporterToTextFile { final String newline = System.lineSeparator(); Object[] children = myStructure.getChildElements(element); for (final Object child : children) { - if (!(child instanceof ErrorTreeElement)) { + if (!(child instanceof ErrorTreeElement childElement)) { continue; } if (!withUsages && child instanceof NavigatableMessageElement) { continue; } - final ErrorTreeElement childElement = (ErrorTreeElement)child; if (buffer.length() > 0) { buffer.append(newline); } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginHeaderPanel.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginHeaderPanel.java index 666f96e248a2..b40c7e901254 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginHeaderPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginHeaderPanel.java @@ -62,8 +62,7 @@ public class PluginHeaderPanel { myCategory.setText(plugin.getCategory() == null ? IdeBundle.message("label.category.unknown") : StringUtil.toUpperCase(plugin.getCategory())); //NON-NLS String versionText; boolean showVersion = !plugin.isBundled() || plugin.allowBundledUpdate(); - if (plugin instanceof PluginNode) { - final PluginNode node = (PluginNode)plugin; + if (plugin instanceof PluginNode node) { myRating.setRate(node.getRating()); myDownloads.setText(IdeBundle.message("label.plugin.0.downloads", node.getDownloads())); versionText = showVersion ? "v" + node.getVersion() : null; //NON-NLS diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/BaselinePanel.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/BaselinePanel.java index 23e93112d54c..6c61e4466141 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/BaselinePanel.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/BaselinePanel.java @@ -114,8 +114,7 @@ public class BaselinePanel extends NonOpaquePanel { int x = 0; int calcBaseWidth = calculateBaseWidth(parent); - if (myBaseComponent instanceof JLabel) { - JLabel label = (JLabel)myBaseComponent; + if (myBaseComponent instanceof JLabel label) { label.setToolTipText(calcBaseWidth < baseSize.width ? label.getText() : null); } @@ -182,8 +181,7 @@ public class BaselinePanel extends NonOpaquePanel { Dimension baseSize = myBaseComponent.getPreferredSize(); myBaseComponent.setBounds(x, parent.getInsets().top, width, baseSize.height); - if (myBaseComponent instanceof JLabel) { - JLabel label = (JLabel)myBaseComponent; + if (myBaseComponent instanceof JLabel label) { label.setToolTipText(width < baseSize.width ? label.getText() : null); } } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.java index 53e41f5f2338..4c9d31055c10 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.java @@ -789,8 +789,7 @@ public final class PluginDetailsPageComponent extends MultiPanel { else { boolean syncLoading = true; IdeaPluginDescriptor descriptor = component.getPluginDescriptor(); - if (descriptor instanceof PluginNode) { - PluginNode node = (PluginNode)descriptor; + if (descriptor instanceof PluginNode node) { if (!node.detailsLoaded()) { syncLoading = false; doLoad(component, () -> { @@ -966,8 +965,7 @@ public final class PluginDetailsPageComponent extends MultiPanel { String rating = null; String downloads = null; String size = null; - if (myPlugin instanceof PluginNode) { - PluginNode pluginNode = (PluginNode)myPlugin; + if (myPlugin instanceof PluginNode pluginNode) { rating = pluginNode.getPresentableRating(); downloads = pluginNode.getPresentableDownloads(); size = pluginNode.getPresentableSize(); diff --git a/platform/platform-impl/src/com/intellij/ide/startup/StartupActionScriptManager.java b/platform/platform-impl/src/com/intellij/ide/startup/StartupActionScriptManager.java index 0518428a1c26..257dace5f672 100644 --- a/platform/platform-impl/src/com/intellij/ide/startup/StartupActionScriptManager.java +++ b/platform/platform-impl/src/com/intellij/ide/startup/StartupActionScriptManager.java @@ -127,8 +127,7 @@ public final class StartupActionScriptManager { return new CopyCommand(Paths.get(((CopyCommand)command).mySource), destination); } } - else if (command instanceof UnzipCommand) { - UnzipCommand unzipCommand = (UnzipCommand)command; + else if (command instanceof UnzipCommand unzipCommand) { Path destination = mapPath(unzipCommand.myDestination, oldTarget, newTarget); if (destination != null) { return new UnzipCommand(Path.of(unzipCommand.mySource), destination, unzipCommand.myFilenameFilter); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/ColorBlindnessInternalAction.java b/platform/platform-impl/src/com/intellij/ide/ui/ColorBlindnessInternalAction.java index adf75dcbce2d..9f44a88f98ae 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/ColorBlindnessInternalAction.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/ColorBlindnessInternalAction.java @@ -121,8 +121,7 @@ public class ColorBlindnessInternalAction extends DumbAwareAction { myCombo.addItemListener(event -> { if (ItemEvent.SELECTED == event.getStateChange()) { Object object = event.getItem(); - if (object instanceof FilterItem) { - FilterItem item = (FilterItem)object; + if (object instanceof FilterItem item) { if (item.myFilter instanceof MutableFilter) { showSlider(myFirstSlider, listener); showSlider(mySecondSlider, listener); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/UITheme.java b/platform/platform-impl/src/com/intellij/ide/ui/UITheme.java index 4bfe0142562e..fa8e20a90a63 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/UITheme.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/UITheme.java @@ -201,9 +201,7 @@ public final class UITheme { }; Object palette = theme.icons.get("ColorPalette"); - if (palette instanceof Map) { - @SuppressWarnings("rawtypes") - Map colors = (Map)palette; + if (palette instanceof @SuppressWarnings("rawtypes")Map colors) { for (Object o : colors.keySet()) { String colorKey = o.toString(); PaletteScope scope = paletteScopeManager.getScope(colorKey); @@ -213,8 +211,7 @@ public final class UITheme { String key = toColorString(colorKey, theme.isDark()); Object v = colors.get(colorKey); - if (v instanceof String) { - String value = (String)v; + if (v instanceof String value) { Object namedColor = theme.colors != null ? theme.colors.get(value) : null; if (namedColor instanceof String) { value = (String)namedColor; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/ActionUrl.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/ActionUrl.java index 1aacbf44e819..aac459096315 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/customization/ActionUrl.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/ActionUrl.java @@ -245,10 +245,9 @@ public final class ActionUrl implements JDOMExternalizable { @Override public boolean equals(Object object) { - if (!(object instanceof ActionUrl)) { + if (!(object instanceof ActionUrl url)) { return false; } - ActionUrl url = (ActionUrl)object; Object comp = myComponent instanceof Pair ? ((Pair)myComponent).first : myComponent; Object thatComp = url.myComponent instanceof Pair ? ((Pair)url.myComponent).first : url.myComponent; return Comparing.equal(comp, thatComp) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java index bc8044248d72..3e591ed9547d 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java @@ -451,8 +451,7 @@ public class CustomizableActionsPanel { @Override protected void doOKAction() { Object selectedItem = myComboBox.getSelectedItem(); - if (selectedItem instanceof ActionIconInfo) { - ActionIconInfo selectedInfo = (ActionIconInfo)selectedItem; + if (selectedItem instanceof ActionIconInfo selectedInfo) { if (setCustomIcon(mySelectedSchema, myNode, selectedInfo, getContentPane())) { myActionsTree.repaint(); CustomActionsSchema.setCustomizationSchemaForCurrentProjects(); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java index 468e49b79c64..f5303efd7ebb 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java @@ -133,8 +133,7 @@ public final class CustomizationUtil { } } for (int i = 0; i < reorderedChildren.size(); i++) { - if (reorderedChildren.get(i) instanceof ActionGroup) { - final ActionGroup groupToCorrect = (ActionGroup)reorderedChildren.get(i); + if (reorderedChildren.get(i) instanceof ActionGroup groupToCorrect) { final AnAction correctedAction = correctActionGroup(groupToCorrect, schema, "", rootGroupName, false); reorderedChildren.set(i, correctedAction); } @@ -248,9 +247,7 @@ public final class CustomizationUtil { @Nullable private static TreePath getTreePath(final int positionInPath, final List path, final Object root) { - if (!(root instanceof DefaultMutableTreeNode)) return null; - - final DefaultMutableTreeNode treeNode = ((DefaultMutableTreeNode)root); + if (!(root instanceof DefaultMutableTreeNode treeNode)) return null; final String pathElement; if (path.size() > positionInPath) { @@ -379,8 +376,7 @@ public final class CustomizationUtil { else if (obj instanceof Separator) { text = "-------------"; } - else if (obj instanceof QuickList) { - QuickList quickList = (QuickList)obj; + else if (obj instanceof QuickList quickList) { text = quickList.getDisplayName(); if (UISettings.getInstance().getShowInplaceCommentsInternal()) { description = quickList.getActionId(); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaTableHeaderUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaTableHeaderUI.java index 9e0b80825cb8..ca57b86c06f8 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaTableHeaderUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaTableHeaderUI.java @@ -137,8 +137,7 @@ public class DarculaTableHeaderUI extends BasicTableHeaderUI { } private boolean isExpandableHintShown(TableColumn column) { - if (column != null && header instanceof ComponentWithExpandableItems) { - ComponentWithExpandableItems c = (ComponentWithExpandableItems)header; + if (column != null && header instanceof ComponentWithExpandableItems c) { return column == ContainerUtil.getFirstItem(c.getExpandableItemsHandler().getExpandedItems()); } return false; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/ComboBoxButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/ComboBoxButtonUI.java index 575abbb811be..8cc64da52a3e 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/ComboBoxButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/ComboBoxButtonUI.java @@ -24,8 +24,7 @@ public class ComboBoxButtonUI extends DarculaButtonUI { public void paint(Graphics g, JComponent c) { super.paint(g, c); - if (!(c instanceof ComboBoxAction.ComboBoxButton)) return; - ComboBoxAction.ComboBoxButton button = (ComboBoxAction.ComboBoxButton)c; + if (!(c instanceof ComboBoxAction.ComboBoxButton button)) return; if (!button.isArrowVisible()) { return; @@ -71,8 +70,7 @@ public class ComboBoxButtonUI extends DarculaButtonUI { @Override protected Dimension getDarculaButtonSize(JComponent c, Dimension prefSize) { - if (!(c instanceof ComboBoxAction.ComboBoxButton)) return prefSize; - ComboBoxAction.ComboBoxButton button = (ComboBoxAction.ComboBoxButton)c; + if (!(c instanceof ComboBoxAction.ComboBoxButton button)) return prefSize; Dimension buttonSize = super.getDarculaButtonSize(c, prefSize); Insets i = button.getInsets(); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java index e26ac546213d..9aaef13bbba4 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java @@ -69,9 +69,8 @@ public class DarculaButtonUI extends BasicButtonUI { } public static boolean isSmallVariant(Component c) { - if (!(c instanceof AbstractButton)) return false; + if (!(c instanceof AbstractButton b)) return false; - AbstractButton b = (AbstractButton)c; boolean smallVariant = b.getClientProperty("ActionToolbar.smallVariant") == Boolean.TRUE; ComboBoxAction a = (ComboBoxAction)b.getClientProperty("styleCombo"); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java index 9d90e17b7bb3..1b4a207dcfa8 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java @@ -595,8 +595,7 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border, ErrorB super.configureEditor(); installEditorKeyListener(comboBox.getEditor()); - if (editor instanceof JComponent) { - JComponent jEditor = (JComponent)editor; + if (editor instanceof JComponent jEditor) { jEditor.setOpaque(false); jEditor.setBorder(JBUI.Borders.empty()); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaSpinnerBorder.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaSpinnerBorder.java index 163eed232a87..c435121d3a4b 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaSpinnerBorder.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaSpinnerBorder.java @@ -73,8 +73,7 @@ public class DarculaSpinnerBorder implements Border, UIResource, ErrorBorderCapa public static boolean isFocused(Component c) { if (c.hasFocus()) return true; - if (c instanceof JSpinner) { - JSpinner spinner = (JSpinner)c; + if (c instanceof JSpinner spinner) { if (spinner.getEditor() != null) { synchronized (spinner.getEditor().getTreeLock()) { return spinner.getEditor().getComponent(0).hasFocus(); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/MainToolbarComboBoxButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/MainToolbarComboBoxButtonUI.java index df4011a69b2e..be14261490f1 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/MainToolbarComboBoxButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/MainToolbarComboBoxButtonUI.java @@ -73,8 +73,7 @@ public class MainToolbarComboBoxButtonUI extends DarculaButtonUI { @Override public void paint(Graphics g, JComponent c) { - if (!(c instanceof ComboBoxAction.ComboBoxButton)) return; - ComboBoxAction.ComboBoxButton button = (ComboBoxAction.ComboBoxButton)c; + if (!(c instanceof ComboBoxAction.ComboBoxButton button)) return; if (button.getClientProperty(HOVER_PROP) == Boolean.TRUE) paintBackground(g, button, HOVER_COLOR); else if (c.isOpaque()) paintBackground(g, button, button.getBackground()); @@ -83,8 +82,7 @@ public class MainToolbarComboBoxButtonUI extends DarculaButtonUI { @Override protected void paintContents(Graphics g, AbstractButton c) { - if (!(c instanceof ComboBoxAction.ComboBoxButton)) return; - ComboBoxAction.ComboBoxButton button = (ComboBoxAction.ComboBoxButton)c; + if (!(c instanceof ComboBoxAction.ComboBoxButton button)) return; FontMetrics fm = UIUtilities.getFontMetrics(button, g); int width = button.getWidth(); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java index de01df9c6f07..9f97459d5065 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java @@ -209,8 +209,7 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple @Override public boolean value(Object o) { - if (o instanceof MouseEvent) { - MouseEvent me = (MouseEvent)o; + if (o instanceof MouseEvent me) { if (getActionUnder(me.getPoint()) != null) { if (me.getID() == MouseEvent.MOUSE_CLICKED) { //noinspection SSBasedInspection @@ -556,8 +555,7 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple icons.clear(); if (ExtendableTextComponent.VARIANT.equals(variant)) { JTextComponent component = getComponent(); - if (component instanceof ExtendableTextComponent) { - ExtendableTextComponent field = (ExtendableTextComponent)component; + if (component instanceof ExtendableTextComponent field) { for (Extension extension : field.getExtensions()) { if (extension != null) addExtension(extension); } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/IdeaPopupMenuUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/IdeaPopupMenuUI.java index 5869acee9b14..f283317dec24 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/IdeaPopupMenuUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/IdeaPopupMenuUI.java @@ -85,8 +85,7 @@ public final class IdeaPopupMenuUI extends BasicPopupMenuUI { int count = parent.getComponentCount(); for (int i = 0; i < count; i++) { Component item = parent.getComponent(i); - if (item instanceof JMenuItem) { - JMenuItem menuItem = (JMenuItem)item; + if (item instanceof JMenuItem menuItem) { Icon icon = menuItem.isEnabled() ? menuItem.getIcon() : menuItem.getDisabledIcon(); if (icon != null) { return false; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java index 766467b23f5d..0dc9c5592ca6 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java @@ -52,12 +52,10 @@ public final class SearchUtil { static void processConfigurables(@NotNull List configurables, @NotNull Map> options, boolean i18n) { for (final Configurable configurable : configurables) { - if (!(configurable instanceof SearchableConfigurable)) { + if (!(configurable instanceof SearchableConfigurable searchableConfigurable)) { continue; } - final SearchableConfigurable searchableConfigurable = (SearchableConfigurable)configurable; - Set configurableOptions = new TreeSet<>(); options.put(searchableConfigurable, configurableOptions); @@ -65,8 +63,7 @@ public final class SearchUtil { extension.beforeConfigurable(searchableConfigurable, configurableOptions); } - if (configurable instanceof MasterDetails) { - final MasterDetails md = (MasterDetails)configurable; + if (configurable instanceof MasterDetails md) { md.initUi(); processComponent(searchableConfigurable, configurableOptions, md.getMaster(), i18n); processComponent(searchableConfigurable, configurableOptions, md.getDetails().getComponent(), i18n); @@ -143,8 +140,7 @@ public final class SearchUtil { } } final Border border = component.getBorder(); - if (border instanceof TitledBorder) { - final TitledBorder titledBorder = (TitledBorder)border; + if (border instanceof TitledBorder titledBorder) { final String title = titledBorder.getTitle(); if (title != null) { processUILabel(title, configurableOptions, path, i18n); @@ -359,8 +355,7 @@ public final class SearchUtil { return true; } } - else if (rootComponent instanceof JTabbedPane) { - final JTabbedPane tabbedPane = (JTabbedPane)rootComponent; + else if (rootComponent instanceof JTabbedPane tabbedPane) { final Set paths = SearchableOptionsRegistrar.getInstance().getInnerPaths(configurable, option); for (String path : paths) { diff --git a/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java b/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java index e563ccbabf05..024cad35cda7 100644 --- a/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java +++ b/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java @@ -55,8 +55,7 @@ final class TopAnomaliesAction extends ActionGroup { top.clear(); Window[] windows = Window.getWindows(); for (Window window : windows) { - if (window.isVisible() && (window instanceof JFrame)) { - JFrame f = (JFrame)window; + if (window.isVisible() && (window instanceof JFrame f)) { checkParents((JComponent)f.getContentPane(), top, LIMIT); } } @@ -103,8 +102,7 @@ final class TopAnomaliesAction extends ActionGroup { top.clear(); Window[] windows = Window.getWindows(); for (Window window : windows) { - if (window.isVisible() && (window instanceof JFrame)) { - JFrame f = (JFrame)window; + if (window.isVisible() && (window instanceof JFrame f)) { checkClientProperties((JComponent)f.getContentPane(), top, LIMIT); } } diff --git a/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java b/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java index b348a8036690..64954418e2fe 100644 --- a/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java +++ b/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java @@ -182,8 +182,7 @@ final class FocusDebuggerAction extends AnAction implements DumbAware { @Override public void eventDispatched(AWTEvent event) { - if (event instanceof FocusEvent) { - FocusEvent focusEvent = (FocusEvent)event; + if (event instanceof FocusEvent focusEvent) { Component fromComponent = focusEvent.getComponent(); Component oppositeComponent = focusEvent.getOppositeComponent(); diff --git a/platform/platform-impl/src/com/intellij/internal/focus/FocusTracesAction.java b/platform/platform-impl/src/com/intellij/internal/focus/FocusTracesAction.java index 69aadd8fefb0..e3fd3477439b 100644 --- a/platform/platform-impl/src/com/intellij/internal/focus/FocusTracesAction.java +++ b/platform/platform-impl/src/com/intellij/internal/focus/FocusTracesAction.java @@ -43,10 +43,9 @@ final class FocusTracesAction extends AnAction implements DumbAware { } final IdeFocusManager manager = IdeFocusManager.getGlobalInstance(); - if (!(manager instanceof FocusManagerImpl)) { + if (!(manager instanceof FocusManagerImpl focusManager)) { return; } - final FocusManagerImpl focusManager = (FocusManagerImpl)manager; myActive = !myActive; if (myActive) { diff --git a/platform/platform-impl/src/com/intellij/internal/inspector/ComponentPropertiesCollector.java b/platform/platform-impl/src/com/intellij/internal/inspector/ComponentPropertiesCollector.java index abe9683d750a..7c875f219b51 100644 --- a/platform/platform-impl/src/com/intellij/internal/inspector/ComponentPropertiesCollector.java +++ b/platform/platform-impl/src/com/intellij/internal/inspector/ComponentPropertiesCollector.java @@ -263,8 +263,7 @@ public final class ComponentPropertiesCollector { } private void addToolbarInfo(Object component) { - if (component instanceof ActionToolbarImpl) { - ActionToolbarImpl toolbar = (ActionToolbarImpl)component; + if (component instanceof ActionToolbarImpl toolbar) { myProperties.addAll(UiInspectorUtil.collectActionGroupInfo("Toolbar", toolbar.getActionGroup(), toolbar.getPlace())); JComponent targetComponent = ReflectionUtil.getField(ActionToolbarImpl.class, toolbar, JComponent.class, "myTargetComponent"); @@ -295,8 +294,7 @@ public final class ComponentPropertiesCollector { private void addLayoutProperties(@NotNull Container component) { LayoutManager layout = component.getLayout(); - if (layout instanceof GridBagLayout) { - GridBagLayout bagLayout = (GridBagLayout)layout; + if (layout instanceof GridBagLayout bagLayout) { GridBagConstraints defaultConstraints = ReflectionUtil.getField(GridBagLayout.class, bagLayout, GridBagConstraints.class, "defaultConstraints"); @@ -311,8 +309,7 @@ public final class ComponentPropertiesCollector { addSubValue(UiInspectorUtil.getComponentName(child), toString(bagLayout.getConstraints(child))); } } - else if (layout instanceof BorderLayout) { - BorderLayout borderLayout = (BorderLayout)layout; + else if (layout instanceof BorderLayout borderLayout) { myProperties.add(new PropertyBean("BorderLayout constraints", String.format("hgap - %s, vgap - %s", borderLayout.getHgap(), borderLayout.getVgap()))); @@ -321,8 +318,7 @@ public final class ComponentPropertiesCollector { addSubValue(UiInspectorUtil.getComponentName(child), borderLayout.getConstraints(child)); } } - else if (layout instanceof CardLayout) { - CardLayout cardLayout = (CardLayout)layout; + else if (layout instanceof CardLayout cardLayout) { Integer currentCard = ReflectionUtil.getField(CardLayout.class, cardLayout, null, "currentCard"); //noinspection UseOfObsoleteCollectionType Vector vector = ReflectionUtil.getField(CardLayout.class, cardLayout, Vector.class, "vector"); diff --git a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java index 78eda17f7c3f..321057f676cb 100644 --- a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java +++ b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java @@ -138,8 +138,7 @@ public final class UiInspectorAction extends UiMouseAction implements LightEditC component = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner(); } if (component != null) { - if (component instanceof JComponent) { - JComponent jComp = (JComponent)component; + if (component instanceof JComponent jComp) { jComp.putClientProperty(CLICK_INFO, getClickInfoNode(me, jComp)); jComp.putClientProperty(CLICK_INFO_POINT, me.getPoint()); } @@ -203,8 +202,7 @@ public final class UiInspectorAction extends UiMouseAction implements LightEditC return Pair.create(clickInfo, rendererComponent); } } - if (component instanceof JTable) { - JTable table = (JTable)component; + if (component instanceof JTable table) { int row = table.rowAtPoint(me.getPoint()); int column = table.columnAtPoint(me.getPoint()); if (row != -1 && column != -1) { diff --git a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorUtil.java b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorUtil.java index 52848b447ca6..499e8dbab414 100644 --- a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorUtil.java +++ b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorUtil.java @@ -115,8 +115,7 @@ public final class UiInspectorUtil { private static void recursiveCollectGroupIds(@NotNull ActionGroup group, @NotNull Set result) { for (AnAction action : group.getChildren(null)) { - if (action instanceof ActionGroup) { - ActionGroup child = (ActionGroup)action; + if (action instanceof ActionGroup child) { ContainerUtil.addIfNotNull(result, getActionId(child)); recursiveCollectGroupIds(child, result); } diff --git a/platform/platform-impl/src/com/intellij/internal/inspector/components/HierarchyTree.java b/platform/platform-impl/src/com/intellij/internal/inspector/components/HierarchyTree.java index 98c23768cead..153a2337da3b 100644 --- a/platform/platform-impl/src/com/intellij/internal/inspector/components/HierarchyTree.java +++ b/platform/platform-impl/src/com/intellij/internal/inspector/components/HierarchyTree.java @@ -299,8 +299,7 @@ public abstract class HierarchyTree extends JTree implements TreeSelectionListen Color foreground = UIUtil.getTreeForeground(selected, hasFocus); Color background = selected ? UIUtil.getTreeSelectionBackground(hasFocus) : null; boolean isRenderer = false; - if (value instanceof ComponentNode) { - ComponentNode componentNode = (ComponentNode)value; + if (value instanceof ComponentNode componentNode) { isRenderer = componentNode.getUserObject() instanceof List; Component component = componentNode.getComponent(); diff --git a/platform/platform-impl/src/com/intellij/internal/inspector/components/ValueCellRenderer.java b/platform/platform-impl/src/com/intellij/internal/inspector/components/ValueCellRenderer.java index eaa0b6f6558a..51cdcbc406e3 100644 --- a/platform/platform-impl/src/com/intellij/internal/inspector/components/ValueCellRenderer.java +++ b/platform/platform-impl/src/com/intellij/internal/inspector/components/ValueCellRenderer.java @@ -340,8 +340,7 @@ final class ValueCellRenderer implements TableCellRenderer { return (Map)table; } - if (table instanceof Object[]) { - Object[] arr = (Object[])table; + if (table instanceof Object[] arr) { Map properties = new HashMap<>(); for (int i = 0; i < arr.length; i += 2) { if (arr[i].equals(UiInspectorAction.ADDED_AT_STACKTRACE)) continue; diff --git a/platform/platform-impl/src/com/intellij/jps/impl/JpsIdePluginManagerImpl.java b/platform/platform-impl/src/com/intellij/jps/impl/JpsIdePluginManagerImpl.java index 34632ecb079a..8a1006a25dcb 100644 --- a/platform/platform-impl/src/com/intellij/jps/impl/JpsIdePluginManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/jps/impl/JpsIdePluginManagerImpl.java @@ -211,8 +211,7 @@ public final class JpsIdePluginManagerImpl extends JpsPluginManager { Map, Element>> foldersToUpdate = new HashMap<>(); for (ContentEntry contentEntry : ModuleRootManager.getInstance(module).getContentEntries()) { for (SourceFolder folder : contentEntry.getSourceFolders()) { - if (folder.getRootType() instanceof UnknownSourceRootType) { - UnknownSourceRootType type = (UnknownSourceRootType)folder.getRootType(); + if (folder.getRootType() instanceof UnknownSourceRootType type) { JpsModuleSourceRootPropertiesSerializer serializer = serializers.get(type.getUnknownTypeId()); if (serializer != null) { UnknownSourceRootTypeProperties properties = folder.getJpsElement().getProperties(type); diff --git a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java index 97feb71f20a5..75c7517bbc6d 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java @@ -709,8 +709,7 @@ public final class NotificationsManagerImpl extends NotificationsManager { Balloon balloon = builder.createBalloon(); - if (balloon instanceof BalloonImpl) { - var balloonImpl = (BalloonImpl)balloon; + if (balloon instanceof BalloonImpl balloonImpl) { balloonImpl.getContent().addMouseListener(new MouseAdapter() { }); balloon.setAnimationEnabled(false); @@ -989,8 +988,7 @@ public final class NotificationsManagerImpl extends NotificationsManager { } private void handleEvent(MouseEvent e, boolean pressed, boolean moved) { - if (e.getSource() instanceof JEditorPane) { - JEditorPane pane = (JEditorPane)e.getSource(); + if (e.getSource() instanceof JEditorPane pane) { int pos = pane.viewToModel2D(e.getPoint()); if (pos >= 0) { HTMLDocument document = (HTMLDocument)pane.getDocument(); @@ -1547,12 +1545,10 @@ public final class NotificationsManagerImpl extends NotificationsManager { private static void cutWidth(@NotNull Component component, @NotNull Dimension size, int width) { size.width = width; component.setPreferredSize(size); - if (component instanceof JButton) { - JButton button = (JButton)component; + if (component instanceof JButton button) { button.setToolTipText(button.getText()); } - else if (component instanceof JLabel) { - JLabel label = (JLabel)component; + else if (component instanceof JLabel label) { label.setToolTipText(label.getText()); } } diff --git a/platform/platform-impl/src/com/intellij/notification/impl/widget/IdeNotificationArea.java b/platform/platform-impl/src/com/intellij/notification/impl/widget/IdeNotificationArea.java index ba53c1a39519..7933f3366d27 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/widget/IdeNotificationArea.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/widget/IdeNotificationArea.java @@ -160,9 +160,7 @@ public class IdeNotificationArea extends JLabel implements CustomStatusBarWidget @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof TextIcon)) return false; - - TextIcon icon = (TextIcon)o; + if (!(o instanceof TextIcon icon)) return false; if (myWidth != icon.myWidth) return false; if (!myComponent.equals(icon.myComponent)) return false; diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickList.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickList.java index 3cd2c732d267..a70710a81e1f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickList.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickList.java @@ -65,11 +65,10 @@ public class QuickList extends ExternalizableSchemeAdapter implements Serializab if (this == o) { return true; } - if (!(o instanceof QuickList)) { + if (!(o instanceof QuickList quickList)) { return false; } - QuickList quickList = (QuickList)o; return Arrays.equals(myActionIds, quickList.myActionIds) && Comparing.strEqual(myDescription, quickList.myDescription) && getName().equals(quickList.getName()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/ToolbarLabelAction.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/ToolbarLabelAction.java index f9278bebb2f5..a5240206255a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/ToolbarLabelAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/ToolbarLabelAction.java @@ -114,8 +114,7 @@ public abstract class ToolbarLabelAction extends DumbAwareAction implements Cust return new HyperlinkListener() { @Override public void hyperlinkUpdate(HyperlinkEvent e) { - if (e.getInputEvent() instanceof MouseEvent) { - MouseEvent mouseEvent = (MouseEvent)e.getInputEvent(); + if (e.getInputEvent() instanceof MouseEvent mouseEvent) { switch (mouseEvent.getID()) { case MouseEvent.MOUSE_ENTERED -> tooltip.mouseEntered(mouseEvent); case MouseEvent.MOUSE_EXITED -> tooltip.mouseExited(mouseEvent); diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButtonWithText.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButtonWithText.java index de6c335e52ad..6706433ddede 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButtonWithText.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButtonWithText.java @@ -270,9 +270,8 @@ public class ActionButtonWithText extends ActionButton { final ShortcutSet shortcutSet = myAction.getShortcutSet(); final Shortcut[] shortcuts = shortcutSet.getShortcuts(); for (Shortcut shortcut : shortcuts) { - if (!(shortcut instanceof KeyboardShortcut)) continue; + if (!(shortcut instanceof KeyboardShortcut keyboardShortcut)) continue; - KeyboardShortcut keyboardShortcut = (KeyboardShortcut)shortcut; if (keyboardShortcut.getSecondKeyStroke() == null) { // we are interested only in "mnemonic-like" shortcuts final KeyStroke keyStroke = keyboardShortcut.getFirstKeyStroke(); final int modifiers = keyStroke.getModifiers(); diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java index 8bf3f37ca5d5..25920050d757 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java @@ -1577,8 +1577,7 @@ public class ActionManagerImpl extends ActionManagerEx implements Disposable { for (Shortcut shortcut : shortcuts) { // Shortcut can be a MouseShortcut here. // For example, `IdeaVIM` often assigns them - if (shortcut instanceof KeyboardShortcut) { - KeyboardShortcut kb = (KeyboardShortcut)shortcut; + if (shortcut instanceof KeyboardShortcut kb) { if (kb.getSecondKeyStroke() == null) { return (KeyboardShortcut)shortcut; } diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionMenu.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionMenu.java index 323c154046dd..22d69a04398a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionMenu.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionMenu.java @@ -469,8 +469,7 @@ public final class ActionMenu extends JBMenu { @Override public void eventDispatched(AWTEvent event) { - if (event instanceof ComponentEvent) { - ComponentEvent componentEvent = (ComponentEvent)event; + if (event instanceof ComponentEvent componentEvent) { Component component = componentEvent.getComponent(); JPopupMenu popup = ComponentUtil.getParentOfType((Class)JPopupMenu.class, component); if (popup != null && popup.getInvoker() == myComponent && popup.isShowing()) { diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java index 191edec3a39a..e625948856a8 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java @@ -1242,8 +1242,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct myMinimumButtonSize = JBDimension.create(myMinimumButtonSizeFunction.get(), true); for (int i = getComponentCount() - 1; i >= 0; i--) { final Component component = getComponent(i); - if (component instanceof ActionButton) { - final ActionButton button = (ActionButton)component; + if (component instanceof ActionButton button) { button.setMinimumButtonSize(myMinimumButtonSizeFunction); } else if (component instanceof JLabel && LOADING_LABEL.equals(component.getName())) { diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionUpdater.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionUpdater.java index c1a4f98b9a0e..50f6f5428791 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionUpdater.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionUpdater.java @@ -662,9 +662,8 @@ final class ActionUpdater { return JBTreeTraverser.from(o -> { if (o == group) return null; if (isDumb && !o.isDumbAware()) return null; - if (!(o instanceof ActionGroup)) return null; - ActionGroup oo = (ActionGroup)o; - Presentation presentation = update(oo, strategy); + if (!(o instanceof ActionGroup oo)) return null; + Presentation presentation = update(oo, strategy); if (presentation == null || !presentation.isVisible()) { return null; } diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.java index 941151b8af72..a57be7493ecd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.java @@ -142,8 +142,7 @@ class ButtonToolbarImpl extends JPanel { // don't update toolbar if there is currently active modal dialog final Window window = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow(); - if (window instanceof Dialog) { - final Dialog dialog = (Dialog)window; + if (window instanceof Dialog dialog) { if (dialog.isModal() && !SwingUtilities.isDescendingFrom(ButtonToolbarImpl.this, dialog)) { return; } diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ChameleonAction.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ChameleonAction.java index 7818fd3b5c26..0f9f787763ac 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ChameleonAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ChameleonAction.java @@ -42,8 +42,7 @@ public class ChameleonAction extends AnAction { } @Nullable ChameleonAction addAction(@NotNull AnAction action, @Nullable ProjectType projectType) { - if (action instanceof ActionStub) { - ActionStub actionStub = (ActionStub)action; + if (action instanceof ActionStub actionStub) { action = ActionManagerImpl.convertStub(actionStub); if (action == null) return this; diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ToolbarUpdater.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ToolbarUpdater.java index 26b4d99608a6..00a126d452aa 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ToolbarUpdater.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ToolbarUpdater.java @@ -154,9 +154,8 @@ public abstract class ToolbarUpdater implements Activatable { @Override public boolean equals(Object obj) { - if (!(obj instanceof MyUpdateRunnable)) return false; + if (!(obj instanceof MyUpdateRunnable that)) return false; - MyUpdateRunnable that = (MyUpdateRunnable)obj; if (myHash != that.myHash) return false; ToolbarUpdater updater1 = myUpdaterRef.get(); diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java index f15ef75dc882..29d928aa5e96 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java @@ -97,8 +97,7 @@ public final class Utils { Component component = dataContext.getData(PlatformCoreDataKeys.CONTEXT_COMPONENT); return newPreCachedDataContext(component); } - else if (dataContext instanceof CustomizedDataContext) { - CustomizedDataContext context = (CustomizedDataContext)dataContext; + else if (dataContext instanceof CustomizedDataContext context) { DataContext delegate = wrapToAsyncDataContext(context.getParent()); if (delegate == DataContext.EMPTY_CONTEXT) { return new PreCachedDataContext(null).prependProvider(context.getCustomDataProvider()); diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/CommandMerger.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/CommandMerger.java index d0b419db6e01..00d91c119785 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/CommandMerger.java +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/CommandMerger.java @@ -67,8 +67,7 @@ public final class CommandMerger { } private void addActionToSharedStack(@NotNull UndoableAction action) { - if (action instanceof AdjustableUndoableAction) { - AdjustableUndoableAction adjustable = (AdjustableUndoableAction)action; + if (action instanceof AdjustableUndoableAction adjustable) { DocumentReference[] affected = action.getAffectedDocuments(); if (affected == null) { return; diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java index 4eb1afa77d54..1970896f9e22 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java @@ -173,10 +173,9 @@ abstract class UndoRedo { private static Map> decompose(@NotNull UndoableGroup group, boolean isRedo) { Map> reference2Ranges = new HashMap<>(); for (UndoableAction action : group.getActions()) { - if (!(action instanceof AdjustableUndoableAction)) { + if (!(action instanceof AdjustableUndoableAction adjustable)) { continue; } - AdjustableUndoableAction adjustable = (AdjustableUndoableAction)action; DocumentReference[] affected = adjustable.getAffectedDocuments(); if (affected == null) { continue; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/CopyAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/CopyAction.java index 89887659123c..88c46e76dd66 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/CopyAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/CopyAction.java @@ -113,8 +113,7 @@ public class CopyAction extends TextComponentEditorAction implements HintManager if (transferable != null) { CopyPasteManager.getInstance().setContents(transferable); - if (editor instanceof EditorEx) { - EditorEx ex = (EditorEx)editor; + if (editor instanceof EditorEx ex) { if (ex.isStickySelection()) { ex.setStickySelection(false); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/CtrlYActionChooser.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/CtrlYActionChooser.java index e9b90a8dd7ca..a8a5f32077f2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/CtrlYActionChooser.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/CtrlYActionChooser.java @@ -51,8 +51,7 @@ public final class CtrlYActionChooser { } private static boolean isCtrlY(AWTEvent event) { - if (!(event instanceof KeyEvent)) return false; - KeyEvent keyEvent = (KeyEvent)event; + if (!(event instanceof KeyEvent keyEvent)) return false; int modifiers = keyEvent.getModifiers(); return (keyEvent.getKeyCode() == KeyEvent.VK_Y && ((modifiers & InputEvent.CTRL_MASK) != 0) && diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/EscapeAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/EscapeAction.java index 56bc06fd0f04..b1b942b32dd6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/EscapeAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/EscapeAction.java @@ -20,8 +20,7 @@ public class EscapeAction extends EditorAction { private static class Handler extends EditorActionHandler { @Override public void doExecute(@NotNull Editor editor, @Nullable Caret caret, DataContext dataContext) { - if (editor instanceof EditorEx) { - EditorEx editorEx = (EditorEx)editor; + if (editor instanceof EditorEx editorEx) { if (editorEx.isStickySelection()) { editorEx.setStickySelection(false); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/KillRingUtil.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/KillRingUtil.java index d3e8c74da985..5eaca329adb9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/KillRingUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/KillRingUtil.java @@ -43,8 +43,7 @@ public final class KillRingUtil { String s = document.getCharsSequence().subSequence(startOffset, endOffset).toString(); s = StringUtil.convertLineSeparators(s); CopyPasteManager.getInstance().setContents(new KillRingTransferable(s, document, startOffset, endOffset, cut)); - if (editor instanceof EditorEx) { - EditorEx ex = (EditorEx)editor; + if (editor instanceof EditorEx ex) { if (ex.isStickySelection()) { ex.setStickySelection(false); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java index 2b5d0454aa5a..014b59176bf9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java @@ -42,9 +42,8 @@ public class PasteFromX11Action extends EditorAction { else { boolean rightPlace = true; final InputEvent inputEvent = e.getInputEvent(); - if (inputEvent instanceof MouseEvent) { + if (inputEvent instanceof MouseEvent me) { rightPlace = false; - final MouseEvent me = (MouseEvent)inputEvent; if (dataContext.getData(EditorGutter.KEY) == null) { final Component component = SwingUtilities.getDeepestComponentAt(me.getComponent(), me.getX(), me.getY()); rightPlace = !(component instanceof JScrollBar); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ResetFontSizeAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ResetFontSizeAction.java index 97456d9b7724..1bdcdec05e84 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ResetFontSizeAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ResetFontSizeAction.java @@ -147,10 +147,9 @@ public final class ResetFontSizeAction extends EditorAction { public void update(@NotNull AnActionEvent e) { Editor editor = e.getData(CommonDataKeys.EDITOR); if (e.getPlace().equals(ActionPlaces.POPUP) && editor != null) { - if (!(editor instanceof EditorEx)) { + if (!(editor instanceof EditorEx editorEx)) { return; } - EditorEx editorEx = (EditorEx)editor; Strategy strategy = getStrategy(editorEx); float toReset = strategy.getFontSize(); //noinspection DialogTitleCapitalization diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/SwapSelectionBoundariesAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/SwapSelectionBoundariesAction.java index 916e6b687b20..e319b317c581 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/SwapSelectionBoundariesAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/SwapSelectionBoundariesAction.java @@ -43,8 +43,7 @@ public class SwapSelectionBoundariesAction extends EditorAction { final int end = caret.getSelectionEnd(); boolean moveToEnd = caret.getOffset() == start; - if (editor instanceof EditorEx) { - EditorEx editorEx = (EditorEx)editor; + if (editor instanceof EditorEx editorEx) { if (editorEx.isStickySelection()) { editorEx.setStickySelection(false); editorEx.setStickySelection(true); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleStickySelectionModeAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleStickySelectionModeAction.java index 8c920688393f..609cabef080c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleStickySelectionModeAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleStickySelectionModeAction.java @@ -38,11 +38,10 @@ public class ToggleStickySelectionModeAction extends EditorAction { static class Handler extends EditorActionHandler { @Override public void doExecute(@NotNull Editor editor, @Nullable Caret caret, DataContext dataContext) { - if (!(editor instanceof EditorEx)) { + if (!(editor instanceof EditorEx ex)) { return; } - - EditorEx ex = (EditorEx)editor; + ex.setStickySelection(!ex.isStickySelection()); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java index 1a8e9cdaafc8..c704d905f2ad 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java @@ -738,8 +738,7 @@ public final class EditorColorsManagerImpl extends EditorColorsManager implement @Override public void lookAndFeelChanged(@NotNull LafManager source) { - if (!(source.getCurrentLookAndFeel() instanceof UIThemeBasedLookAndFeelInfo)) return; - UIThemeBasedLookAndFeelInfo themeInfo = (UIThemeBasedLookAndFeelInfo)source.getCurrentLookAndFeel(); + if (!(source.getCurrentLookAndFeel() instanceof UIThemeBasedLookAndFeelInfo themeInfo)) return; if (themeInfo.getName().contains("Solarized")) { if (isDark && themeInfo.getTheme().isDark() || !isDark && !themeInfo.getTheme().isDark()) { diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java index 1c3ab0b6ddeb..1e4a27673675 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java @@ -80,8 +80,7 @@ public final class EditorUtil { } public static int getLastVisualLineColumnNumber(@NotNull Editor editor, final int line) { - if (editor instanceof EditorImpl) { - EditorImpl editorImpl = (EditorImpl)editor; + if (editor instanceof EditorImpl editorImpl) { int lineEndOffset = line >= editorImpl.getVisibleLineCount() ? editor.getDocument().getTextLength() : new VisualLinesIterator(editorImpl, line).getVisualLineEndOffset(); return editor.offsetToVisualPosition(lineEndOffset, true, true).column; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java index ac5e61af9798..71c3d4e866fc 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java @@ -2714,8 +2714,7 @@ final class EditorGutterComponentImpl extends EditorGutterComponentEx implements private static final HoverStateListener HOVER_STATE_LISTENER = new HoverStateListener() { @Override protected void hoverChanged(@NotNull Component component, boolean hovered) { - if (component instanceof EditorGutterComponentImpl && ExperimentalUI.isNewUI()) { - EditorGutterComponentImpl gutter = (EditorGutterComponentImpl)component; + if (component instanceof EditorGutterComponentImpl gutter && ExperimentalUI.isNewUI()) { gutter.myAlphaContext.setVisible(hovered); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index b8caee70010e..57de820e60e0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -5032,8 +5032,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi } else { FoldRegion foldRegion = event.getCollapsedFoldRegion(); - if (foldRegion instanceof CustomFoldRegion) { - CustomFoldRegion customFoldRegion = (CustomFoldRegion)foldRegion; + if (foldRegion instanceof CustomFoldRegion customFoldRegion) { ActionGroup group = customFoldRegion.getRenderer().getContextMenuGroup(customFoldRegion); if (group != null) return group; } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ErrorStripeMarkerImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ErrorStripeMarkerImpl.java index 6e3ed2771e96..168914ad936e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ErrorStripeMarkerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ErrorStripeMarkerImpl.java @@ -48,8 +48,7 @@ class ErrorStripeMarkerImpl extends RangeMarkerImpl { } else if (intervalStart() != myHighlighter.getStartOffset() || intervalEnd() != myHighlighter.getEndOffset()) { String extendedHighlighterInfo = ""; - if (myHighlighter instanceof PersistentRangeHighlighterImpl) { - PersistentRangeHighlighterImpl h = (PersistentRangeHighlighterImpl)myHighlighter; + if (myHighlighter instanceof PersistentRangeHighlighterImpl h) { extendedHighlighterInfo = "(prev state: " + h.prevStartOffset + "-" + h.prevEndOffset + ", stamps match: " + (h.modificationStamp == (byte)e.getDocument().getModificationStamp()) + ")"; } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/LineLayout.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/LineLayout.java index 41eaf3f87861..7d7dcc0a1e4c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/LineLayout.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/LineLayout.java @@ -197,8 +197,7 @@ abstract class LineLayout { private static int[] getCommentPrefixAndOrSuffixBoundaries(char[] text, int start, int end, IElementType token) { if (token == null) return null; Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(token.getLanguage()); - if (!(commenter instanceof CodeDocumentationAwareCommenter)) return null; - CodeDocumentationAwareCommenter cdaCommenter = (CodeDocumentationAwareCommenter)commenter; + if (!(commenter instanceof CodeDocumentationAwareCommenter cdaCommenter)) return null; if (token.equals(cdaCommenter.getLineCommentTokenType())) { String prefix = cdaCommenter.getLineCommentPrefix(); if (prefix != null) prefix = prefix.stripTrailing(); // some commenters (e.g. for Python) include space in comment prefix diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaret.java b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaret.java index 339e45363669..e15dd586128e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaret.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaret.java @@ -89,8 +89,7 @@ class TextComponentCaret extends UserDataHolderBase implements Caret { int caretPos = textComponent.getCaretPosition(); int line; int lineStart; - if (textComponent instanceof JTextArea) { - final JTextArea textArea = (JTextArea)textComponent; + if (textComponent instanceof JTextArea textArea) { try { line = textArea.getLineOfOffset(caretPos); lineStart = textArea.getLineStartOffset(line); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java index 300410f26c73..7fe8ac348a5f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java @@ -353,8 +353,7 @@ public class FileSystemTreeImpl implements FileSystemTree { private boolean isLeaf(TreePath path) { Object component = path.getLastPathComponent(); - if (component instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)component; + if (component instanceof DefaultMutableTreeNode node) { return node.isLeaf(); } return myAsyncTreeModel.isLeaf(component); @@ -365,8 +364,7 @@ public class FileSystemTreeImpl implements FileSystemTree { if (component instanceof DefaultMutableTreeNode) { DefaultMutableTreeNode node = (DefaultMutableTreeNode)component; Object userObject = node.getUserObject(); - if (userObject instanceof FileNodeDescriptor) { - FileNodeDescriptor descriptor = (FileNodeDescriptor)userObject; + if (userObject instanceof FileNodeDescriptor descriptor) { return descriptor.getElement().getFile(); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java index f11440c3e751..3c74d5866570 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java @@ -417,8 +417,7 @@ public class FileTextFieldImpl implements FileTextField, Disposable { InputMap map = myPathTextField.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); if (map != null) { Object object = map.get(KeyStroke.getKeyStrokeForEvent(e)); - if (object instanceof Action) { - Action action = (Action)object; + if (object instanceof Action action) { if (action.isEnabled()) { action.actionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, "action")); e.consume(); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileTreeStructure.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileTreeStructure.java index de4ac6f71db6..3e6d51fb42c1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileTreeStructure.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileTreeStructure.java @@ -63,11 +63,10 @@ public class FileTreeStructure extends AbstractTreeStructure { @Override public Object @NotNull [] getChildElements(@NotNull Object nodeElement) { - if (!(nodeElement instanceof FileElement)) { + if (!(nodeElement instanceof FileElement element)) { return ArrayUtilRt.EMPTY_OBJECT_ARRAY; } - FileElement element = (FileElement)nodeElement; VirtualFile file = element.getFile(); if (file == null || !file.isValid()) { @@ -110,8 +109,7 @@ public class FileTreeStructure extends AbstractTreeStructure { @Override public @Nullable Object getParentElement(@NotNull Object element) { - if (element instanceof FileElement) { - final FileElement fileElement = (FileElement)element; + if (element instanceof FileElement fileElement) { final VirtualFile elementFile = getValidFile(fileElement); VirtualFile rootElementFile = myRootElement.getFile(); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileRenderer.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileRenderer.java index cfbd73c4c6dd..532d64c2d2b1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileRenderer.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileRenderer.java @@ -59,16 +59,14 @@ public class FileRenderer { String comment = null; boolean hidden = false; boolean valid = true; - if (value instanceof FileNode) { - FileNode node = (FileNode)value; + if (value instanceof FileNode node) { icon = node.getIcon(); name = node.getName(); comment = node.getComment(); hidden = node.isHidden(); valid = node.isValid(); } - else if (value instanceof VirtualFile) { - VirtualFile file = (VirtualFile)value; + else if (value instanceof VirtualFile file) { name = file.getName(); hidden = isFileHidden(file); valid = file.isValid(); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileTreeModel.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileTreeModel.java index c0c22cd70c98..4ad640b1d897 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileTreeModel.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileTreeModel.java @@ -174,16 +174,13 @@ public final class FileTreeModel extends AbstractTreeModel implements InvokerSup if (event instanceof VFilePropertyChangeEvent) { if (hasEntry(event.getFile())) files.add(event.getFile()); } - else if (event instanceof VFileCreateEvent) { - VFileCreateEvent create = (VFileCreateEvent)event; + else if (event instanceof VFileCreateEvent create) { if (hasEntry(create.getParent())) parents.add(create.getParent()); } - else if (event instanceof VFileCopyEvent) { - VFileCopyEvent copy = (VFileCopyEvent)event; + else if (event instanceof VFileCopyEvent copy) { if (hasEntry(copy.getNewParent())) parents.add(copy.getNewParent()); } - else if (event instanceof VFileMoveEvent) { - VFileMoveEvent move = (VFileMoveEvent)event; + else if (event instanceof VFileMoveEvent move) { if (hasEntry(move.getNewParent())) parents.add(move.getNewParent()); if (hasEntry(move.getOldParent())) parents.add(move.getOldParent()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/TextEditorWithPreview.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/TextEditorWithPreview.java index 4c71a435636c..b5cdc4649287 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/TextEditorWithPreview.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/TextEditorWithPreview.java @@ -215,8 +215,7 @@ public class TextEditorWithPreview extends UserDataHolderBase implements TextEdi @Override public void setState(@NotNull FileEditorState state) { - if (state instanceof MyFileEditorState) { - final MyFileEditorState compositeState = (MyFileEditorState)state; + if (state instanceof MyFileEditorState compositeState) { if (compositeState.getFirstState() != null) { myEditor.setState(compositeState.getFirstState()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.java index eaff7793feea..9c052c99fd57 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.java @@ -168,8 +168,7 @@ public class TextEditorProvider implements DefaultPlatformFileEditorProvider, public static Document @NotNull [] getDocuments(@NotNull FileEditor editor) { Document[] result; - if (editor instanceof DocumentsEditor) { - DocumentsEditor documentsEditor = (DocumentsEditor)editor; + if (editor instanceof DocumentsEditor documentsEditor) { result = documentsEditor.getDocuments(); } else if (editor instanceof TextEditor) { diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorState.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorState.java index 6a48bb1981d5..adc9b660acf4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorState.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorState.java @@ -62,12 +62,10 @@ public final class TextEditorState implements FileEditorState { @Override public boolean equals(Object o) { - if (!(o instanceof TextEditorState)) { + if (!(o instanceof TextEditorState textEditorState)) { return false; } - final TextEditorState textEditorState = (TextEditorState)o; - if (!Arrays.equals(CARETS, textEditorState.CARETS)) return false; if (RELATIVE_CARET_POSITION != textEditorState.RELATIVE_CARET_POSITION) return false; CodeFoldingState localFoldingState = getFoldingState(); @@ -82,8 +80,7 @@ public final class TextEditorState implements FileEditorState { @Override public boolean canBeMergedWith(@NotNull FileEditorState otherState, @NotNull FileEditorStateLevel level) { - if (!(otherState instanceof TextEditorState)) return false; - TextEditorState other = (TextEditorState)otherState; + if (!(otherState instanceof TextEditorState other)) return false; return level == FileEditorStateLevel.NAVIGATION && CARETS.length == 1 && other.CARETS.length == 1 && @@ -107,12 +104,10 @@ public final class TextEditorState implements FileEditorState { @Override public boolean equals(Object o) { - if (!(o instanceof CaretState)) { + if (!(o instanceof CaretState caretState)) { return false; } - final CaretState caretState = (CaretState)o; - if (COLUMN != caretState.COLUMN) return false; if (LINE != caretState.LINE) return false; if (VISUAL_COLUMN_ADJUSTMENT != caretState.VISUAL_COLUMN_ADJUSTMENT) return false; diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeDetectionService.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeDetectionService.java index 293a9b8f7567..e292274189fa 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeDetectionService.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeDetectionService.java @@ -108,8 +108,7 @@ final class FileTypeDetectionService implements Disposable { @Nullable AsyncFileListener.ChangeApplier prepareChange(@NotNull List events) { Collection files = ContainerUtil.map2SetNotNull(events, event -> { - if (event instanceof VFileContentChangeEvent) { - VFileContentChangeEvent changeEvent = (VFileContentChangeEvent)event; + if (event instanceof VFileContentChangeEvent changeEvent) { VirtualFile file = changeEvent.getFile(); if (changeEvent.getOldLength() == 0) { // when something is written to the empty file, clear the file detection-from-content cache, because the file type can change from Unknown to e.g., Text diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java index a806191b5f83..d8510ab1094b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java @@ -506,8 +506,7 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent if (!fileType.getName().equals(fileTypeName)) { LOG.error(new PluginException("Incorrect name specified in , should be " + fileType.getName() + ", actual " + fileTypeName, pluginId)); } - if (fileType instanceof LanguageFileType) { - LanguageFileType languageFileType = (LanguageFileType)fileType; + if (fileType instanceof LanguageFileType languageFileType) { String expectedLanguage = languageFileType.isSecondary() ? null : languageFileType.getLanguage().getID(); if (!Objects.equals(bean.language, expectedLanguage)) { LOG.error(new PluginException("Incorrect language specified in for " + fileType.getName() + @@ -928,8 +927,7 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent myPatternsTable.removeAllAssociations(ftd); myInitialAssociations.removeAllAssociations(fileType); mySchemeManager.removeScheme(fileType.getName()); - if (fileType instanceof FileTypeIdentifiableByVirtualFile) { - FileTypeIdentifiableByVirtualFile fakeFileType = (FileTypeIdentifiableByVirtualFile)fileType; + if (fileType instanceof FileTypeIdentifiableByVirtualFile fakeFileType) { mySpecialFileTypes = ArrayUtil.remove(mySpecialFileTypes, fakeFileType, FileTypeIdentifiableByVirtualFile.ARRAY_FACTORY); } if (pluginDescriptor != null) { @@ -1659,9 +1657,8 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent if (fileType == PlainTextFileType.INSTANCE) return; for (FileNameMatcher matcher : pair.matchers) { registerReDetectedMapping(fileType.getName(), matcher); - if (matcher instanceof ExtensionFileNameMatcher) { + if (matcher instanceof ExtensionFileNameMatcher extMatcher) { // also check exact file name matcher - ExtensionFileNameMatcher extMatcher = (ExtensionFileNameMatcher)matcher; registerReDetectedMapping(fileType.getName(), new ExactFileNameMatcher("." + extMatcher.getExtension())); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java index 9669a9bd0536..9b06bc942bb8 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java @@ -276,8 +276,7 @@ public final class IdeKeyEventDispatcher { } } - if (window instanceof JDialog) { - final JDialog dialog = (JDialog)window; + if (window instanceof JDialog dialog) { if (!dialog.isModal()) { final Window owner = dialog.getOwner(); return owner != null && isModalContext(owner); @@ -511,8 +510,7 @@ public final class IdeKeyEventDispatcher { private static @Nullable KeyStroke getSecondKeystroke(@NotNull AnAction action, @NotNull KeyStroke firstKeyStroke) { Shortcut[] shortcuts = action.getShortcutSet().getShortcuts(); for (Shortcut shortcut : shortcuts) { - if (shortcut instanceof KeyboardShortcut) { - KeyboardShortcut keyShortcut = (KeyboardShortcut)shortcut; + if (shortcut instanceof KeyboardShortcut keyShortcut) { if (firstKeyStroke.equals(keyShortcut.getFirstKeyStroke())) { KeyStroke secondKeyStroke = keyShortcut.getSecondKeyStroke(); if (secondKeyStroke != null) return secondKeyStroke; @@ -783,11 +781,10 @@ public final class IdeKeyEventDispatcher { addActionsFromActiveKeymap(sc); - if (myContext.getSecondStrokeActions().isEmpty() && sc instanceof KeyboardShortcut) { + if (myContext.getSecondStrokeActions().isEmpty() && sc instanceof KeyboardShortcut keyboardShortcut) { // little trick to invoke action which second stroke is a key w/o modifiers, but user still // holds the modifier key(s) of the first stroke - final KeyboardShortcut keyboardShortcut = (KeyboardShortcut)sc; final KeyStroke firstKeyStroke = keyboardShortcut.getFirstKeyStroke(); final KeyStroke secondKeyStroke = keyboardShortcut.getSecondKeyStroke(); @@ -935,9 +932,8 @@ public final class IdeKeyEventDispatcher { } private static JRootPane getMenuActionsHolder(Component component) { - if (component instanceof JPopupMenu) { + if (component instanceof JPopupMenu menu) { // BasicPopupMenuUI.MenuKeyboardHelper#stateChanged - JPopupMenu menu = (JPopupMenu)component; return SwingUtilities.getRootPane(menu.getInvoker()); } return SwingUtilities.getRootPane(component); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java index 8f5c918dc46f..7935845411d9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java @@ -319,8 +319,7 @@ public final class IdeMouseEventDispatcher { } private static boolean doVerticalDiagramScrolling(@Nullable Component component, @NotNull MouseEvent event) { - if (component != null && event instanceof MouseWheelEvent && isDiagramViewComponent(component.getParent())) { - MouseWheelEvent mwe = (MouseWheelEvent)event; + if (component != null && event instanceof MouseWheelEvent mwe && isDiagramViewComponent(component.getParent())) { if (!mwe.isShiftDown() && mwe.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL && JBScrollPane.isScrollEvent(mwe)) { JScrollBar scrollBar = findVerticalScrollBar(component); if (scrollBar != null) { @@ -344,8 +343,7 @@ public final class IdeMouseEventDispatcher { if (isDiagramViewComponent(component)) { JComponent view = (JComponent)component; for (int i = 0; i < view.getComponentCount(); i++) { - if (view.getComponent(i) instanceof JScrollBar) { - JScrollBar scrollBar = (JScrollBar)view.getComponent(i); + if (view.getComponent(i) instanceof JScrollBar scrollBar) { if (scrollBar.getOrientation() == Adjustable.VERTICAL) { return scrollBar.isVisible() ? scrollBar : null; } @@ -365,9 +363,8 @@ public final class IdeMouseEventDispatcher { private static boolean isHorizontalScrolling(Component c, MouseEvent e) { if ( c != null - && e instanceof MouseWheelEvent + && e instanceof MouseWheelEvent mwe && isDiagramViewComponent(c.getParent())) { - final MouseWheelEvent mwe = (MouseWheelEvent)e; return mwe.isShiftDown() && mwe.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL && JBScrollPane.isScrollEvent(mwe) @@ -387,8 +384,7 @@ public final class IdeMouseEventDispatcher { if (isDiagramViewComponent(c)) { final JComponent view = (JComponent)c; for (int i = 0; i < view.getComponentCount(); i++) { - if (view.getComponent(i) instanceof JScrollBar) { - final JScrollBar scrollBar = (JScrollBar)view.getComponent(i); + if (view.getComponent(i) instanceof JScrollBar scrollBar) { if (scrollBar.getOrientation() == Adjustable.HORIZONTAL) { return scrollBar.isVisible() ? scrollBar : null; } diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ModifierKeyDoubleClickHandler.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ModifierKeyDoubleClickHandler.java index bf8dbfad843d..771fd4d22eb0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ModifierKeyDoubleClickHandler.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ModifierKeyDoubleClickHandler.java @@ -81,14 +81,13 @@ public final class ModifierKeyDoubleClickHandler { public static class MyEventDispatcher implements IdeEventQueue.EventDispatcher { @Override public boolean dispatch(@NotNull AWTEvent event) { - if (!(event instanceof KeyEvent)) { + if (!(event instanceof KeyEvent keyEvent)) { return false; } ModifierKeyDoubleClickHandler doubleClickHandler = getInstance(); boolean result = false; - KeyEvent keyEvent = (KeyEvent)event; for (MyDispatcher dispatcher : doubleClickHandler.myDispatchers.values()) { if (dispatcher.dispatch(keyEvent)) { result = true; diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/SystemShortcuts.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/SystemShortcuts.java index 85cb6e1572af..022f9560c0b2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/SystemShortcuts.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/SystemShortcuts.java @@ -156,10 +156,9 @@ public final class SystemShortcuts { Map result = null; final Shortcut[] actionShortcuts = computeOnEdt(() -> keymap.getShortcuts(actionId)); for (Shortcut sc : actionShortcuts) { - if (!(sc instanceof KeyboardShortcut)) { + if (!(sc instanceof KeyboardShortcut ksc)) { continue; } - final KeyboardShortcut ksc = (KeyboardShortcut)sc; for (@NotNull KeyStroke sks : myKeyStroke2SysShortcut.keySet()) { if (ksc.getFirstKeyStroke().equals(sks) || sks.equals(ksc.getSecondKeyStroke())) { if (result == null) result = new HashMap<>(); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java index 120ecfd19f2c..3abf1a5f378b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java @@ -407,8 +407,7 @@ public final class ActionsTree { @Nullable private String getPath(DefaultMutableTreeNode node, boolean presentable) { final Object userObject = node.getUserObject(); - if (userObject instanceof String) { - String actionId = (String)userObject; + if (userObject instanceof String actionId) { final TreeNode parent = node.getParent(); if (parent instanceof DefaultMutableTreeNode) { diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java index 3844ded86b95..bff08dbc75ce 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java @@ -198,8 +198,7 @@ public final class ActionsTreeUtil { if (id != null) { return id; } - if (action instanceof DefaultActionGroup) { - final DefaultActionGroup group = (DefaultActionGroup)action; + if (action instanceof DefaultActionGroup group) { if (group.getChildrenCount() == 0) return IdeBundle.message("action.empty.group.text"); final AnAction[] children = group.getChildActionsOrStubs(); for (AnAction child : children) { @@ -238,8 +237,7 @@ public final class ActionsTreeUtil { LOG.error(groupName + " contains null actions"); continue; } - if (action instanceof ActionGroup) { - ActionGroup childGroup = (ActionGroup)action; + if (action instanceof ActionGroup childGroup) { Group subGroup = createGroup(childGroup, getName(action), null, null, forceAsPopup, filtered, normalizeSeparators); if (forceAsPopup || childGroup.isPopup() || StringUtil.isNotEmpty(childGroup.getTemplateText())) { if (subGroup.getSize() > 0 || @@ -524,8 +522,7 @@ public final class ActionsTreeUtil { } ActionManager actionManager = ActionManager.getInstance(); AnAction action = actionManager.getActionOrStub(groupId); - if (action instanceof DefaultActionGroup) { - DefaultActionGroup group = (DefaultActionGroup)action; + if (action instanceof DefaultActionGroup group) { AnAction[] children = group.getChildActionsOrStubs(); for (AnAction child : children) { String childId = actionManager.getId(child); @@ -587,8 +584,7 @@ public final class ActionsTreeUtil { final ArrayList list = mainGroup.getChildren(); for (Iterator i = list.iterator(); i.hasNext(); ) { final Object o = i.next(); - if (o instanceof Group) { - final Group group = (Group)o; + if (o instanceof Group group) { if (group.getSize() == 0) { if (!SearchUtil.isComponentHighlighted(group.getName(), filter, forceFiltering, null)) { i.remove(); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ChooseActionsDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ChooseActionsDialog.java index f6b4d7926e99..bddeebcbce27 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ChooseActionsDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ChooseActionsDialog.java @@ -93,8 +93,7 @@ public class ChooseActionsDialog extends DialogWrapper { ArrayList actions = new ArrayList<>(); for (TreePath path : paths) { Object node = path.getLastPathComponent(); - if (node instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode defNode = (DefaultMutableTreeNode)node; + if (node instanceof DefaultMutableTreeNode defNode) { Object userObject = defNode.getUserObject(); if (userObject instanceof String) { actions.add((String)userObject); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/Group.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/Group.java index 8422eb421d60..99062f02d772 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/Group.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/Group.java @@ -99,8 +99,7 @@ public class Group implements KeymapGroup { else if (child instanceof QuickList) { myIds.add(((QuickList)child).getActionId()); } - else if (child instanceof Group) { - Group childGroup = (Group)child; + else if (child instanceof Group childGroup) { myIds.addAll(childGroup.initIds()); if (childGroup.myId != null) { myIds.add(childGroup.myId); @@ -256,8 +255,7 @@ public class Group implements KeymapGroup { @Override public boolean equals(Object object) { - if (!(object instanceof Group)) return false; - final Group group = ((Group)object); + if (!(object instanceof Group group)) return false; if (group.getName() != null && getName() != null) { return group.getName().equals(getName()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutPanel.java index 624204d966d4..d3ec05157e01 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutPanel.java @@ -38,8 +38,7 @@ final class KeyboardShortcutPanel extends ShortcutPanel { IdeFocusManager.getGlobalInstance().doWhenFocusSettlesDown(() -> IdeFocusManager.getGlobalInstance().requestFocus(mySecondStroke, true)); } } - else if (event.getNewValue() instanceof KeyboardShortcut) { - KeyboardShortcut shortcut = (KeyboardShortcut)event.getNewValue(); + else if (event.getNewValue() instanceof KeyboardShortcut shortcut) { myFirstStroke.setKeyStroke(shortcut.getFirstKeyStroke()); mySecondStroke.setKeyStroke(shortcut.getSecondKeyStroke()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java index 4f7e9781ddb8..38827f81f232 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java @@ -777,8 +777,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi Keymap keymap() { if (mutable == null) { - if (parent instanceof KeymapPanel) { - KeymapPanel panel = (KeymapPanel)parent; + if (parent instanceof KeymapPanel panel) { mutable = panel.myManager.getMutableKeymap(selected); } else { @@ -814,9 +813,8 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi Shortcut[] actionShortcuts = keymap.getShortcuts(actionId); for (Shortcut sc: actionShortcuts) { - if (!(sc instanceof KeyboardShortcut)) + if (!(sc instanceof KeyboardShortcut ksc)) continue; - final KeyboardShortcut ksc = (KeyboardShortcut)sc; if (ks.equals(ksc.getFirstKeyStroke()) || ks.equals(ksc.getSecondKeyStroke())) { return ksc; } diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java index 6dfcd60e892b..6c1d164d8437 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java @@ -38,8 +38,7 @@ public final class ConfigurableExtensionPointUtil { if (filter != null && !filter.isIncluded(configurable)) { continue; } - if (configurable instanceof HierarchicalConfigurable) { - HierarchicalConfigurable wrapper = (HierarchicalConfigurable)configurable; + if (configurable instanceof HierarchicalConfigurable wrapper) { idToConfigurable.put(wrapper.getId(), wrapper); idsInEpOrder.add(wrapper.getId()); } @@ -155,8 +154,7 @@ public final class ConfigurableExtensionPointUtil { private static void replaceGroupWithSingleConfigurable(List list) { for (int i = 0; i < list.size(); i++) { Configurable configurable = list.get(i); - if (configurable instanceof SortedConfigurableGroup) { - SortedConfigurableGroup group = (SortedConfigurableGroup)configurable; + if (configurable instanceof SortedConfigurableGroup group) { configurable = getConfigurableToReplace(group.myList, group.getWeight()); if (configurable != null) { list.set(i, configurable); @@ -170,13 +168,11 @@ public final class ConfigurableExtensionPointUtil { replaceGroupWithSingleConfigurable(list); if (1 == list.size()) { Configurable configurable = list.get(0); - if (configurable instanceof SortedConfigurableGroup) { - SortedConfigurableGroup group = (SortedConfigurableGroup)configurable; + if (configurable instanceof SortedConfigurableGroup group) { group.myWeight = weight; // modify weight according to the replacing group return group; } - if (configurable instanceof ConfigurableWrapper) { - ConfigurableWrapper wrapper = (ConfigurableWrapper)configurable; + if (configurable instanceof ConfigurableWrapper wrapper) { wrapper.myWeight = weight; // modify weight according to the replacing group return wrapper; } @@ -265,12 +261,11 @@ public final class ConfigurableExtensionPointUtil { public static @NotNull Map> groupConfigurables(@NotNull List configurables) { Map> tree = new HashMap<>(); for (Configurable configurable : configurables) { - if (!(configurable instanceof HierarchicalConfigurable)) { + if (!(configurable instanceof HierarchicalConfigurable hierarchical)) { Node.add(tree, "other", configurable); continue; } - HierarchicalConfigurable hierarchical = (HierarchicalConfigurable)configurable; String id; try { id = hierarchical.getId(); @@ -422,8 +417,7 @@ public final class ConfigurableExtensionPointUtil { } if (configurables != null) { for (Configurable configurable : configurables) { - if (configurable instanceof ConfigurableWrapper) { - ConfigurableWrapper wrapper = (ConfigurableWrapper)configurable; + if (configurable instanceof ConfigurableWrapper wrapper) { bundle = wrapper.getExtensionPoint().findBundle(); if (getString(bundle, resource) != null) { return bundle; diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableVisitor.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableVisitor.java index 9cb9da72ebf9..27562d4203a8 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableVisitor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableVisitor.java @@ -60,8 +60,7 @@ public abstract class ConfigurableVisitor implements Predicate { } for (Configurable configurable : configurables) { - if (configurable instanceof Configurable.Composite) { - Configurable.Composite composite = (Configurable.Composite)configurable; + if (configurable instanceof Configurable.Composite composite) { Configurable result = find(visitor, composite.getConfigurables()); if (result != null) { return result; diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java index b69dfe975be4..d407aedb0f97 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java @@ -87,8 +87,7 @@ public class ConfigurableWrapper implements SearchableConfigurable, Weighted, Hi @Nullable public static T cast(@NotNull Class type, @Nullable UnnamedConfigurable configurable) { - if (configurable instanceof ConfigurableWrapper) { - ConfigurableWrapper wrapper = (ConfigurableWrapper)configurable; + if (configurable instanceof ConfigurableWrapper wrapper) { if (wrapper.myConfigurable == null) { Class configurableType = wrapper.getExtensionPoint().getConfigurableType(); if (configurableType != null) { diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/GlassPanel.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/GlassPanel.java index d4468dde850f..42191952d04a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/GlassPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/GlassPanel.java @@ -51,8 +51,7 @@ public class GlassPanel extends JComponent { final Area area = getComponentArea(surfaceComponent, lightComponent, 1); if (area == null) continue; - if (lightComponent instanceof JLabel) { - final JLabel label = (JLabel)lightComponent; + if (lightComponent instanceof JLabel label) { final Component labelFor = label.getLabelFor(); if (labelFor instanceof JComponent) { final Area labelForArea = getComponentArea(surfaceComponent, (JComponent)labelFor, 1); diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java index 858765fa3ac6..de6fa460e5f6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java @@ -211,8 +211,7 @@ class ConfigurableEditor extends AbstractEditor implements AnActionListener, AWT } // heavy-weight popup opens new window with the corresponding parent if (popup != null && editor == popup.getParent()) { - if (popup instanceof JDialog) { - JDialog dialog = (JDialog)popup; + if (popup instanceof JDialog dialog) { return Dialog.ModalityType.MODELESS == dialog.getModalityType(); } return popup instanceof JWindow; diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsDialog.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsDialog.java index 5c733b192a17..31ddc8b4c89b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsDialog.java @@ -122,8 +122,7 @@ public class SettingsDialog extends DialogWrapper implements DataProvider { @Override public Object getData(@NotNull String dataId) { - if (myEditor instanceof DataProvider) { - DataProvider provider = (DataProvider)myEditor; + if (myEditor instanceof DataProvider provider) { return provider.getData(dataId); } return null; diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java index 9642311b4a21..bb1330fdc4c1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java @@ -291,8 +291,7 @@ public final class SettingsEditor extends AbstractEditor implements DataProvider }); for (ConfigurableGroup group : groups) { - if (group instanceof MutableConfigurableGroup) { - MutableConfigurableGroup mutable = (MutableConfigurableGroup)group; + if (group instanceof MutableConfigurableGroup mutable) { Disposer.register(this, mutable); mutable.addListener(createReloadListener(groups)); } diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsSearch.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsSearch.java index e909db19700d..5f7ece392c19 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsSearch.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsSearch.java @@ -83,8 +83,7 @@ abstract class SettingsSearch extends SearchTextField implements KeyListener { @Override public void keyTyped(KeyEvent event) { Object source = event.getSource(); - if (source instanceof JTree) { - JTree tree = (JTree)source; + if (source instanceof JTree tree) { if (!hasAction(KeyStroke.getKeyStrokeForEvent(event), tree.getInputMap())) { delegateKeyEvent(event); } diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsTreeView.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsTreeView.java index d05428691593..96138957ac54 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsTreeView.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsTreeView.java @@ -287,8 +287,7 @@ public class SettingsTreeView extends JComponent implements Accessible, Disposab @Nullable Transferable createTransferable(@Nullable InputEvent event) { - if (event instanceof MouseEvent) { - MouseEvent mouse = (MouseEvent)event; + if (event instanceof MouseEvent mouse) { Point location = mouse.getLocationOnScreen(); SwingUtilities.convertPointFromScreen(location, myTree); return createTransferable(myTree.getClosestPathForLocation(location.x, location.y)); @@ -356,12 +355,10 @@ public class SettingsTreeView extends JComponent implements Accessible, Disposab @ApiStatus.Internal public static @Nullable Project prepareProject(@Nullable CachingSimpleNode parent, @Nullable Configurable configurable) { - if (configurable instanceof ConfigurableWrapper) { - ConfigurableWrapper wrapper = (ConfigurableWrapper)configurable; + if (configurable instanceof ConfigurableWrapper wrapper) { return wrapper.getExtensionPoint().getProject(); } - if (configurable instanceof SortedConfigurableGroup) { - SortedConfigurableGroup group = (SortedConfigurableGroup)configurable; + if (configurable instanceof SortedConfigurableGroup group) { Configurable[] configurables = group.getConfigurables(); if (configurables.length != 0) { Project project = prepareProject(parent, configurables[0]); @@ -403,8 +400,7 @@ public class SettingsTreeView extends JComponent implements Accessible, Disposab @Nullable private static MyNode extractNode(@Nullable Object object) { - if (object instanceof TreePath) { - TreePath path = (TreePath)object; + if (object instanceof TreePath path) { object = path.getLastPathComponent(); } if (object instanceof DefaultMutableTreeNode) { @@ -546,8 +542,7 @@ public class SettingsTreeView extends JComponent implements Accessible, Disposab if (myConfigurable instanceof ConfigurableTreeRenderer) { myRenderer = (ConfigurableTreeRenderer)myConfigurable; } - else if (myConfigurable instanceof ConfigurableWrapper) { - ConfigurableWrapper wrapper = (ConfigurableWrapper)myConfigurable; + else if (myConfigurable instanceof ConfigurableWrapper wrapper) { UnnamedConfigurable configurable = wrapper.getRawConfigurable(); if (configurable instanceof ConfigurableTreeRenderer) { myRenderer = (ConfigurableTreeRenderer)configurable; @@ -814,8 +809,7 @@ public class SettingsTreeView extends JComponent implements Accessible, Disposab public String getToolTipText(MouseEvent event) { if (event != null) { Component component = getDeepestRendererComponentAt(event.getX(), event.getY()); - if (component instanceof JLabel) { - JLabel label = (JLabel)component; + if (component instanceof JLabel label) { if (label.getIcon() != null) { String text = label.getToolTipText(); if (text != null) { diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java index 4ee992a44b3c..24e5a2fbe443 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java @@ -993,8 +993,7 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer { } private static void setupSelectionOnPreferredComponent(final JComponent component) { - if (component instanceof JTextField) { - JTextField field = (JTextField)component; + if (component instanceof JTextField field) { String text = field.getText(); if (text != null && field.getClientProperty(HAVE_INITIAL_SELECTION) == null) { field.setSelectionStart(0); diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/ActionCommand.java b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/ActionCommand.java index 7254871e66f2..f7a02900db76 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/ActionCommand.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/ActionCommand.java @@ -44,8 +44,7 @@ public class ActionCommand extends TypeCommand { final Shortcut[] sc = getActiveKeymapShortcuts(actionName).getShortcuts(); KeyStroke stroke = null; for (Shortcut each : sc) { - if (each instanceof KeyboardShortcut) { - final KeyboardShortcut ks = (KeyboardShortcut)each; + if (each instanceof KeyboardShortcut ks) { final KeyStroke first = ks.getFirstKeyStroke(); final KeyStroke second = ks.getSecondKeyStroke(); if (second == null) { diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/DetectedPluginsPanel.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/DetectedPluginsPanel.java index 46f9781f3613..f8c50d446d0c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/DetectedPluginsPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/DetectedPluginsPanel.java @@ -49,9 +49,8 @@ public final class DetectedPluginsPanel extends OrderPanel { int row, int column) { setBorder(null); - if (!(value instanceof PluginDownloader)) return; + if (!(value instanceof PluginDownloader downloader)) return; - PluginDownloader downloader = (PluginDownloader)value; String pluginName = downloader.getPluginName(); append(pluginName, SimpleTextAttributes.REGULAR_ATTRIBUTES); diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/LabelTextReplacingUtil.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/LabelTextReplacingUtil.java index 7510f06f5229..2fc3911d0196 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/LabelTextReplacingUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/LabelTextReplacingUtil.java @@ -19,15 +19,13 @@ public final class LabelTextReplacingUtil { */ public static void replaceText(JComponent component) { for (Component child : UIUtil.uiTraverser(component)) { - if (child instanceof JLabel) { - final JLabel label = (JLabel)child; + if (child instanceof JLabel label) { String oldText = label.getText(); if (oldText != null) { label.setText(doReplace(oldText)); } } - else if (child instanceof AbstractButton) { - AbstractButton button = (AbstractButton)child; + else if (child instanceof AbstractButton button) { String oldText = button.getText(); if (oldText != null) { button.setText(doReplace(oldText)); diff --git a/platform/platform-impl/src/com/intellij/openapi/util/WindowStateServiceImpl.java b/platform/platform-impl/src/com/intellij/openapi/util/WindowStateServiceImpl.java index 678548cc35a2..da0858fcad38 100644 --- a/platform/platform-impl/src/com/intellij/openapi/util/WindowStateServiceImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/util/WindowStateServiceImpl.java @@ -243,20 +243,17 @@ abstract class WindowStateServiceImpl extends WindowStateService implements Modi @Nullable private static GraphicsConfiguration getConfiguration(@Nullable Object object) { - if (object instanceof Project) { - Project project = (Project)object; + if (object instanceof Project project) { object = WindowManager.getInstance().getFrame(project); if (object == null) LOG.warn("cannot find a project frame for " + project); } - if (object instanceof Window) { - Window window = (Window)object; + if (object instanceof Window window) { GraphicsConfiguration configuration = window.getGraphicsConfiguration(); if (configuration != null) return configuration; object = ScreenUtil.getScreenDevice(window.getBounds()); if (object == null) LOG.warn("cannot find a device for " + window); } - if (object instanceof GraphicsDevice) { - GraphicsDevice device = (GraphicsDevice)object; + if (object instanceof GraphicsDevice device) { object = device.getDefaultConfiguration(); if (object == null) LOG.warn("cannot find a configuration for " + device); } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePartNode.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePartNode.java index 0bb16a4e3cd1..a113e57a6e66 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePartNode.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePartNode.java @@ -52,8 +52,7 @@ class FilePartNode { assert nameId > 0 || nameId == JAR_SEPARATOR_NAME_ID : nameId + "; " + getClass(); this.nameId = nameId; myFileOrUrl = fileOrUrl; - if (fileOrUrl instanceof VirtualFile) { - VirtualFile file = (VirtualFile)fileOrUrl; + if (fileOrUrl instanceof VirtualFile file) { assert file.getFileSystem() == myFS : "myFs=" + myFS + "; myFile().getFileSystem()=" + file.getFileSystem() + "; " + fileOrUrl; if (file.getParent() == null && fs instanceof ArchiveFileSystem) { assert nameId == JAR_SEPARATOR_NAME_ID : nameId; @@ -454,8 +453,7 @@ class FilePartNode { if (leaves == null) { return null; } - if (leaves instanceof VirtualFilePointerImpl) { - VirtualFilePointerImpl leaf = (VirtualFilePointerImpl)leaves; + if (leaves instanceof VirtualFilePointerImpl leaf) { return leaf.myListener == listener ? leaf : null; } VirtualFilePointerImpl[] array = (VirtualFilePointerImpl[])leaves; diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java index 7df002460935..a19120d1a2ef 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java @@ -572,18 +572,15 @@ public final class VirtualFilePointerManagerImpl extends VirtualFilePointerManag for (VFileEvent event : events) { ProgressManager.checkCanceled(); VirtualFileSystem vfs = event.getFileSystem(); - if (!(vfs instanceof VirtualFilePointerCapableFileSystem) || !(vfs instanceof NewVirtualFileSystem)) continue; - NewVirtualFileSystem fs = (NewVirtualFileSystem)vfs; - if (event instanceof VFileDeleteEvent) { - VFileDeleteEvent deleteEvent = (VFileDeleteEvent)event; + if (!(vfs instanceof VirtualFilePointerCapableFileSystem) || !(vfs instanceof NewVirtualFileSystem fs)) continue; + if (event instanceof VFileDeleteEvent deleteEvent) { VirtualFileSystemEntry file = (VirtualFileSystemEntry)deleteEvent.getFile(); VirtualFileSystemEntry parent = (VirtualFileSystemEntry)FilePartNode.getParentThroughJar(file, file.getFileSystem()); if (parent != null) { addRelevantPointers(file, parent, FilePartNode.getNameId(file), toFirePointers, toUpdateNodes, true, fs, event); } } - else if (event instanceof VFileCreateEvent) { - VFileCreateEvent createEvent = (VFileCreateEvent)event; + else if (event instanceof VFileCreateEvent createEvent) { boolean fireSubdirectoryPointers; if (createEvent.isDirectory()) { // when a new empty directory "/a/b" is created, there's no need to fire any deeper pointers like "/a/b/c/d.txt" - they're not created yet @@ -599,13 +596,11 @@ public final class VirtualFilePointerManagerImpl extends VirtualFilePointerManag addRelevantPointers(null, (VirtualFileSystemEntry)createEvent.getParent(), createEvent.getChildNameId(), toFirePointers, toUpdateNodes, fireSubdirectoryPointers, fs, event); } - else if (event instanceof VFileCopyEvent) { - VFileCopyEvent copyEvent = (VFileCopyEvent)event; + else if (event instanceof VFileCopyEvent copyEvent) { addRelevantPointers(null, (VirtualFileSystemEntry)copyEvent.getNewParent(), toNameId(copyEvent.getNewChildName()), toFirePointers, toUpdateNodes, true, fs, event); } - else if (event instanceof VFileMoveEvent) { - VFileMoveEvent moveEvent = (VFileMoveEvent)event; + else if (event instanceof VFileMoveEvent moveEvent) { VirtualFileSystemEntry eventFile = (VirtualFileSystemEntry)moveEvent.getFile(); int newNameId = FilePartNode.getNameId(eventFile); // files deleted from eventFile and created in moveEvent.getNewParent() @@ -616,8 +611,7 @@ public final class VirtualFilePointerManagerImpl extends VirtualFilePointerManag addRelevantPointers(eventFile, parent, newNameId, toFirePointers, toUpdateNodes, true, fs, event); } } - else if (event instanceof VFilePropertyChangeEvent) { - VFilePropertyChangeEvent change = (VFilePropertyChangeEvent)event; + else if (event instanceof VFilePropertyChangeEvent change) { if (VirtualFile.PROP_NAME.equals(change.getPropertyName()) && !Comparing.equal(change.getOldValue(), change.getNewValue())) { VirtualFileSystemEntry eventFile = (VirtualFileSystemEntry)change.getFile(); VirtualFileSystemEntry parent = (VirtualFileSystemEntry)FilePartNode.getParentThroughJar(eventFile, eventFile.getFileSystem()); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/FilePathInterner.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/FilePathInterner.java index 266d8111350e..66f64f1e3b5a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/FilePathInterner.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/FilePathInterner.java @@ -100,8 +100,7 @@ public final class FilePathInterner extends WeakInterner { @Override public boolean equals(Object obj) { - if (!(obj instanceof FileSeparatedCharSequence)) return false; - FileSeparatedCharSequence other = (FileSeparatedCharSequence)obj; + if (!(obj instanceof FileSeparatedCharSequence other)) return false; return Arrays.equals(nameIds, other.nameIds); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java index e522abdc9996..e0e0831ddea1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java @@ -697,9 +697,8 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable { @NotNull InputStream nativeStream, long fileLength, boolean readOnly) { - if (nativeStream instanceof BufferExposingByteArrayInputStream) { + if (nativeStream instanceof BufferExposingByteArrayInputStream byteStream) { // optimization - BufferExposingByteArrayInputStream byteStream = (BufferExposingByteArrayInputStream )nativeStream; byte[] bytes = byteStream.getInternalBuffer(); storeContentToStorage(fileLength, file, readOnly, bytes, bytes.length); return nativeStream; @@ -881,16 +880,14 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable { eventsToRemove.add(event); continue; } - if (event instanceof VFileCreateEvent) { - VFileCreateEvent createEvent = (VFileCreateEvent)event; + if (event instanceof VFileCreateEvent createEvent) { VirtualDirectoryImpl parent = (VirtualDirectoryImpl)createEvent.getParent(); Object createEvents = toCreate.get(parent); if (createEvents == null) { toCreate.put(parent, createEvent); } else { - if (createEvents instanceof VFileCreateEvent) { - VFileCreateEvent prevEvent = (VFileCreateEvent)createEvents; + if (createEvents instanceof VFileCreateEvent prevEvent) { Set children = parent.isCaseSensitive() ? new LinkedHashSet<>() : CollectionFactory.createLinkedCustomHashingStrategySet(CASE_INSENSITIVE_STRATEGY); children.add(prevEvent); toCreate.put(parent, children); @@ -922,8 +919,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable { } private static String getAlternativePath(@NotNull VFileEvent event) { - if (event instanceof VFilePropertyChangeEvent && ((VFilePropertyChangeEvent)event).getPropertyName().equals(VirtualFile.PROP_NAME)) { - VFilePropertyChangeEvent pce = (VFilePropertyChangeEvent)event; + if (event instanceof VFilePropertyChangeEvent pce && ((VFilePropertyChangeEvent)event).getPropertyName().equals(VirtualFile.PROP_NAME)) { VirtualFile parent = pce.getFile().getParent(); String newName = (String)pce.getNewValue(); return parent == null ? newName : parent.getPath()+"/"+newName; @@ -931,8 +927,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable { if (event instanceof VFileCopyEvent) { return ((VFileCopyEvent)event).getFile().getPath(); } - if (event instanceof VFileMoveEvent) { - VFileMoveEvent vme = (VFileMoveEvent)event; + if (event instanceof VFileMoveEvent vme) { String newName = vme.getFile().getName(); return vme.getNewParent().getPath() + "/" + newName; } @@ -1082,8 +1077,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable { boolean hasValidEvents = false; for (int i = start; i < end; i++) { VFileEvent event = events.get(i).getFileEvent(); - if (!(event instanceof VFileDeleteEvent) || toIgnore.contains(event) || !event.isValid()) continue; - VFileDeleteEvent de = (VFileDeleteEvent)event; + if (!(event instanceof VFileDeleteEvent de) || toIgnore.contains(event) || !event.isValid()) continue; VirtualDirectoryImpl parent = (VirtualDirectoryImpl)de.getFile().getParent(); if (grouped == null) { grouped = new MultiMap<>(end - start); @@ -1338,8 +1332,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable { String rootName; String rootPath; FileAttributes attributes; - if (fs instanceof ArchiveFileSystem) { - ArchiveFileSystem afs = (ArchiveFileSystem)fs; + if (fs instanceof ArchiveFileSystem afs) { VirtualFile localFile = afs.findLocalByRootPath(path); if (localFile == null) return null; rootName = localFile.getName(); @@ -1473,12 +1466,10 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable { VFileCreateEvent ce = (VFileCreateEvent)event; executeCreateChild(ce.getParent(), ce.getChildName(), ce.getAttributes(), ce.getSymlinkTarget(), ce.isEmptyDirectory()); } - else if (event instanceof VFileDeleteEvent) { - VFileDeleteEvent deleteEvent = (VFileDeleteEvent)event; + else if (event instanceof VFileDeleteEvent deleteEvent) { executeDelete(deleteEvent); } - else if (event instanceof VFileContentChangeEvent) { - VFileContentChangeEvent contentUpdateEvent = (VFileContentChangeEvent)event; + else if (event instanceof VFileContentChangeEvent contentUpdateEvent) { VirtualFile file = contentUpdateEvent.getFile(); long length = contentUpdateEvent.getNewLength(); long timestamp = contentUpdateEvent.getNewTimestamp(); @@ -1492,16 +1483,13 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable { executeTouch(file, contentUpdateEvent.isFromRefresh(), contentUpdateEvent.getModificationStamp(), length, timestamp); } - else if (event instanceof VFileCopyEvent) { - VFileCopyEvent ce = (VFileCopyEvent)event; + else if (event instanceof VFileCopyEvent ce) { executeCreateChild(ce.getNewParent(), ce.getNewChildName(), null, null, ce.getFile().getChildren().length == 0); } - else if (event instanceof VFileMoveEvent) { - VFileMoveEvent moveEvent = (VFileMoveEvent)event; + else if (event instanceof VFileMoveEvent moveEvent) { executeMove(moveEvent.getFile(), moveEvent.getNewParent()); } - else if (event instanceof VFilePropertyChangeEvent) { - VFilePropertyChangeEvent propertyChangeEvent = (VFilePropertyChangeEvent)event; + else if (event instanceof VFilePropertyChangeEvent propertyChangeEvent) { VirtualFile file = propertyChangeEvent.getFile(); Object newValue = propertyChangeEvent.getNewValue(); switch (propertyChangeEvent.getPropertyName()) { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/ex/IdeFocusTraversalPolicy.java b/platform/platform-impl/src/com/intellij/openapi/wm/ex/IdeFocusTraversalPolicy.java index 44bae08513a9..988dd7575d99 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/ex/IdeFocusTraversalPolicy.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/ex/IdeFocusTraversalPolicy.java @@ -111,8 +111,7 @@ public class IdeFocusTraversalPolicy extends LayoutFocusTraversalPolicy { } } - if (component instanceof JTabbedPane) { - JTabbedPane tabbedPane = (JTabbedPane)component; + if (component instanceof JTabbedPane tabbedPane) { Component selectedComponent = tabbedPane.getSelectedComponent(); if (selectedComponent instanceof JComponent) { return getPreferredFocusedComponent((JComponent)selectedComponent); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java index 707d4c07d609..48ccf5287b59 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java @@ -58,8 +58,7 @@ public final class FocusManagerImpl extends IdeFocusManager implements Disposabl ApplicationManager.getApplication().getMessageBus().connect().subscribe(ApplicationActivationListener.TOPIC, new AppListener()); StartupUiUtil.addAwtListener(e -> { - if (e instanceof FocusEvent) { - final FocusEvent fe = (FocusEvent)e; + if (e instanceof FocusEvent fe) { final Component c = fe.getComponent(); if (c instanceof Window || c == null) return; diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java index 1639e9641fea..da4234cda832 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java @@ -275,11 +275,10 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo if (SystemInfo.isKDE && !KDE_DISABLE_ROOT_MNEMONIC_PROCESSING) { // root menu items doesn't catch mnemonic shortcuts (in KDE), so process them inside IDE IdeEventQueue.getInstance().addDispatcher(e -> { - if (!(e instanceof KeyEvent)) { + if (!(e instanceof KeyEvent event)) { return false; } - final KeyEvent event = (KeyEvent)e; if (!event.isAltDown()) { return false; } @@ -527,14 +526,12 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo return null; } MenuItemInternal result = null; - if (each instanceof ActionMenuItem) { - final ActionMenuItem ami = (ActionMenuItem)each; + if (each instanceof ActionMenuItem ami) { result = new MenuItemInternal(parent, -1, System.identityHashCode(ami), ami.isToggleable() ? GlobalMenuLib.ITEM_CHECK : GlobalMenuLib.ITEM_SIMPLE, ami.getAnAction()); result.jitem = ami; } - else if (each instanceof ActionMenu) { - final ActionMenu am2 = (ActionMenu)each; + else if (each instanceof ActionMenu am2) { result = new MenuItemInternal(parent, -1, System.identityHashCode(am2), GlobalMenuLib.ITEM_SUBMENU, am2.getAnAction()); result.jitem = am2; } @@ -595,8 +592,7 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo } } if (cmi != null) { - if (deepness > 1 && (each instanceof ActionMenu)) { - final ActionMenu jmiEach = (ActionMenu)each; + if (deepness > 1 && (each instanceof ActionMenu jmiEach)) { jmiEach.removeAll(); jmiEach.fillMenu(); _syncChildren(cmi, jmiEach, deepness - 1, stats); @@ -717,7 +713,7 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo } return; } - if (!(jmi instanceof ActionMenu)) { + if (!(jmi instanceof ActionMenu am)) { LOG.debug("corresponding (opening) swing item isn't instance of ActionMenu, class=" + jmi.getClass().getName() + ", event source: " + @@ -727,7 +723,6 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo mi.lastFilledMs = timeMs; - final ActionMenu am = (ActionMenu)jmi; am.removeAll(); am.fillMenu(); _syncChildren(mi, am, DONT_FILL_SUBMENU ? 1 : 2, @@ -762,7 +757,7 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo } return; } - if (!(jmi instanceof ActionMenuItem)) { + if (!(jmi instanceof ActionMenuItem ami)) { LOG.debug("corresponding (clicked) swing item isn't instance of ActionMenuItem, class=" + jmi.getClass().getName() + ", event source: " + @@ -770,7 +765,6 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo return; } - final ActionMenuItem ami = (ActionMenuItem)jmi; ApplicationManager.getApplication().invokeLater(() -> ami.doClick()); } } @@ -959,12 +953,10 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo return null; } - if (!(target instanceof JMenuItem)) { + if (!(target instanceof JMenuItem jmi)) { return null; } - final JMenuItem jmi = (JMenuItem)target; - // find by text final String label = jmi.getText(); if (label != null && !label.isEmpty()) { @@ -1074,7 +1066,7 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo if (TRACE_CLEARING) _trace("corresponding (closing) swing item is null - nothing to clear, event source: ", this); return; } - if (!(jitem instanceof ActionMenu)) { + if (!(jitem instanceof ActionMenu am)) { LOG.debug("corresponding (closing) swing item isn't instance of ActionMenu, class=" + jitem.getClass().getName() + ", event source: " + @@ -1082,7 +1074,6 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo return; } - final ActionMenu am = (ActionMenu)jitem; am.clearItems(); clearChildrenSwingRefs(); _onSwingCleared(System.currentTimeMillis()); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameDecorator.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameDecorator.java index 4e61b859873d..4ff40c8adc7c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameDecorator.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameDecorator.java @@ -196,8 +196,7 @@ public abstract class IdeFrameDecorator implements IdeFrameImpl.FrameDecorator { myRequestedState = state; X11UiUtil.toggleFullScreenMode(frame); - if (frame.getJMenuBar() instanceof IdeMenuBar) { - IdeMenuBar frameMenuBar = (IdeMenuBar)frame.getJMenuBar(); + if (frame.getJMenuBar() instanceof IdeMenuBar frameMenuBar) { frameMenuBar.onToggleFullScreen(state); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowShadowPainter.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowShadowPainter.java index 7faae54b4076..e0deb79498b0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowShadowPainter.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowShadowPainter.java @@ -93,16 +93,13 @@ final class WindowShadowPainter extends AbstractPainter { private static Rectangle getShadowBounds(Point point, Window window) { if (!window.isShowing()) return null; if (!window.isDisplayable()) return null; - if (window instanceof Frame) { - Frame frame = (Frame)window; + if (window instanceof Frame frame) { if (!frame.isUndecorated()) return null; } - if (window instanceof Dialog) { - Dialog dialog = (Dialog)window; + if (window instanceof Dialog dialog) { if (!dialog.isUndecorated()) return null; } - if (window instanceof RootPaneContainer) { - RootPaneContainer container = (RootPaneContainer)window; + if (window instanceof RootPaneContainer container) { JRootPane root = container.getRootPane(); if (root != null) { Object property = root.getClientProperty("Window.shadow"); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java index 41b6366d7f14..d9af17a32254 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java @@ -666,8 +666,7 @@ public final class ToolWindowContentUi implements ContentUI, DataProvider { private void processHide(@NotNull MouseEvent e) { IdeEventQueue.getInstance().blockNextEvents(e); final Component c = e.getComponent(); - if (c instanceof BaseLabel) { - final BaseLabel tab = (BaseLabel)c; + if (c instanceof BaseLabel tab) { if (tab.getContent() != null) { if (contentManager.canCloseContents() && tab.getContent().isCloseable()) { contentManager.removeContent(tab.getContent(), true, true, true); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/CardActionsPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/CardActionsPanel.java index 3af5c9115e9f..dfd7ec9c944e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/CardActionsPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/CardActionsPanel.java @@ -77,8 +77,7 @@ public class CardActionsPanel extends JPanel { if (!USE_ICONS) { presentation.setIcon(null); } - if (action instanceof ActionGroup) { - ActionGroup childGroup = (ActionGroup)action; + if (action instanceof ActionGroup childGroup) { if (childGroup.isPopup()) { final String id = String.valueOf(++nCards); createCardForGroup(childGroup, id, parentId); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java index b3cf36736987..b74823366d17 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java @@ -86,8 +86,7 @@ public class RecentProjectPanel extends JPanel { myPathShortener = new UniqueNameBuilder<>(SystemProperties.getUserHome(), File.separator); Collection pathsToCheck = new HashSet<>(); for (AnAction action : recentProjectActions) { - if (action instanceof ReopenProjectAction) { - ReopenProjectAction item = (ReopenProjectAction)action; + if (action instanceof ReopenProjectAction item) { myPathShortener.addPath(item, item.getProjectPath()); pathsToCheck.add(item.getProjectPath()); } @@ -483,13 +482,11 @@ public class RecentProjectPanel extends JPanel { setBackground(back); - if (value instanceof ReopenProjectAction) { - ReopenProjectAction item = (ReopenProjectAction)value; + if (value instanceof ReopenProjectAction item) { myName.setText(item.getTemplatePresentation().getText()); myPath.setText(getTitle2Text(item, myPath, JBUIScale.scale(40))); } - else if (value instanceof ProjectGroupActionGroup) { - final ProjectGroupActionGroup group = (ProjectGroupActionGroup)value; + else if (value instanceof ProjectGroupActionGroup group) { myName.setText(group.getGroup().getName()); myPath.setText(""); } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreenComponentFactory.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreenComponentFactory.java index c1928825915a..f18ee31a1845 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreenComponentFactory.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreenComponentFactory.java @@ -293,8 +293,7 @@ public final class WelcomeScreenComponentFactory { panel.setVisible(false); Topics.subscribe(WelcomeBalloonLayoutImpl.BALLOON_NOTIFICATION_TOPIC, parentDisposable, types -> { BalloonLayout balloonLayout = WelcomeFrame.getInstance().getBalloonLayout(); - if (balloonLayout instanceof WelcomeBalloonLayoutImpl) { - WelcomeBalloonLayoutImpl welcomeBalloonLayout = (WelcomeBalloonLayoutImpl)balloonLayout; + if (balloonLayout instanceof WelcomeBalloonLayoutImpl welcomeBalloonLayout) { if (welcomeBalloonLayout.getLocationComponent() == null) { welcomeBalloonLayout.setLocationComponent(actionLink); } diff --git a/platform/platform-impl/src/com/intellij/packageDependencies/ui/TreeExpansionMonitor.java b/platform/platform-impl/src/com/intellij/packageDependencies/ui/TreeExpansionMonitor.java index 8ff84214d062..9370b14be54c 100644 --- a/platform/platform-impl/src/com/intellij/packageDependencies/ui/TreeExpansionMonitor.java +++ b/platform/platform-impl/src/com/intellij/packageDependencies/ui/TreeExpansionMonitor.java @@ -28,8 +28,7 @@ public abstract class TreeExpansionMonitor { Enumeration enumeration = ((DefaultMutableTreeNode)tree.getModel().getRoot()).breadthFirstEnumeration(); while (enumeration.hasMoreElements()) { final Object nextElement = enumeration.nextElement(); - if (nextElement instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode child = (DefaultMutableTreeNode)nextElement; + if (nextElement instanceof DefaultMutableTreeNode child) { if (equality.test(child, node)) { return new TreePath(child.getPath()); } diff --git a/platform/platform-impl/src/com/intellij/patterns/compiler/PatternCompilerImpl.java b/platform/platform-impl/src/com/intellij/patterns/compiler/PatternCompilerImpl.java index 479ae835f316..4c2231f5d968 100644 --- a/platform/platform-impl/src/com/intellij/patterns/compiler/PatternCompilerImpl.java +++ b/platform/platform-impl/src/com/intellij/patterns/compiler/PatternCompilerImpl.java @@ -415,8 +415,7 @@ public final class PatternCompilerImpl implements PatternCompiler { } private static void dumpType(GenericDeclaration owner, Type type, StringBuilder sb, Map, Collection>> classes) { - if (type instanceof Class) { - final Class aClass = (Class)type; + if (type instanceof Class aClass) { final Class enclosingClass = aClass.getEnclosingClass(); if (enclosingClass != null) { sb.append(enclosingClass.getSimpleName()).append("_"); @@ -429,21 +428,18 @@ public final class PatternCompilerImpl implements PatternCompiler { dumpTypeParametersArray(owner, aClass.getTypeParameters(), sb, "<", ">", classes); } } - else if (type instanceof TypeVariable) { - TypeVariable typeVariable = (TypeVariable)type; + else if (type instanceof TypeVariable typeVariable) { sb.append(typeVariable.getName()); if (typeVariable.getGenericDeclaration() == owner) { dumpTypeParametersArray(null, typeVariable.getBounds(), sb, " extends ", "", classes); } } - else if (type instanceof WildcardType) { - final WildcardType wildcardType = (WildcardType)type; + else if (type instanceof WildcardType wildcardType) { sb.append("?"); dumpTypeParametersArray(owner, wildcardType.getUpperBounds(), sb, " extends ", "", classes); dumpTypeParametersArray(owner, wildcardType.getLowerBounds(), sb, " super ", "", classes); } - else if (type instanceof ParameterizedType) { - final ParameterizedType parameterizedType = (ParameterizedType)type; + else if (type instanceof ParameterizedType parameterizedType) { final Type raw = parameterizedType.getRawType(); dumpType(null, raw, sb, classes); dumpTypeParametersArray(owner, parameterizedType.getActualTypeArguments(), sb, "<", ">", classes); diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java index 6e44e98fe451..6a76eb2ba16b 100644 --- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java @@ -129,8 +129,7 @@ public final class BalloonImpl implements Balloon, IdeTooltip.Ui, ScreenAreaCons } final int id = e.getID(); - if (e instanceof MouseEvent) { - final MouseEvent me = (MouseEvent)e; + if (e instanceof MouseEvent me) { final boolean insideBalloon = isInsideBalloon(me); boolean forcedExit = id == MouseEvent.MOUSE_EXITED && me.getButton() != MouseEvent.NOBUTTON && !myBlockClicks; @@ -188,8 +187,7 @@ public final class BalloonImpl implements Balloon, IdeTooltip.Ui, ScreenAreaCons } } - if ((myHideOnKey || myHideListener != null) && e instanceof KeyEvent && id == KeyEvent.KEY_PRESSED) { - final KeyEvent ke = (KeyEvent)e; + if ((myHideOnKey || myHideListener != null) && e instanceof KeyEvent ke && id == KeyEvent.KEY_PRESSED) { if (myHideListener != null) { if (ke.getKeyCode() == KeyEvent.VK_ESCAPE) { myHideListener.run(); @@ -387,15 +385,13 @@ public final class BalloonImpl implements Balloon, IdeTooltip.Ui, ScreenAreaCons if (!myDialogMode) { for (Component component : UIUtil.uiTraverser(myContent)) { - if (component instanceof JLabel) { - JLabel label = (JLabel)component; + if (component instanceof JLabel label) { if (label.getDisplayedMnemonic() != '\0' || label.getDisplayedMnemonicIndex() >= 0) { myDialogMode = true; break; } } - else if (component instanceof JCheckBox) { - JCheckBox checkBox = (JCheckBox)component; + else if (component instanceof JCheckBox checkBox) { if (checkBox.getMnemonic() >= 0 || checkBox.getDisplayedMnemonicIndex() >= 0) { myDialogMode = true; break; diff --git a/platform/platform-impl/src/com/intellij/ui/CardLayoutPanel.java b/platform/platform-impl/src/com/intellij/ui/CardLayoutPanel.java index 83d886e86fc1..32f0b7631cc0 100644 --- a/platform/platform-impl/src/com/intellij/ui/CardLayoutPanel.java +++ b/platform/platform-impl/src/com/intellij/ui/CardLayoutPanel.java @@ -104,8 +104,7 @@ public abstract class CardLayoutPanel extends JCompo for (Component component : getComponents()) { component.setVisible(component == value); } - if (value instanceof JScrollPane) { - JScrollPane pane = (JScrollPane)value; + if (value instanceof JScrollPane pane) { JViewport viewport = pane.getViewport(); if (viewport != null) { Component view = viewport.getView(); diff --git a/platform/platform-impl/src/com/intellij/ui/ComboBoxTableCellRenderer.java b/platform/platform-impl/src/com/intellij/ui/ComboBoxTableCellRenderer.java index c9f64b6d9e1f..d1581880169e 100644 --- a/platform/platform-impl/src/com/intellij/ui/ComboBoxTableCellRenderer.java +++ b/platform/platform-impl/src/com/intellij/ui/ComboBoxTableCellRenderer.java @@ -46,13 +46,11 @@ public final class ComboBoxTableCellRenderer extends JPanel implements TableCell @Override @SuppressWarnings("unchecked") public JComponent getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - if (value instanceof ListWithSelection) { - ListWithSelection tags = (ListWithSelection)value; + if (value instanceof ListWithSelection tags) { if (tags.getSelection() == null) tags.selectFirst(); updateCombobox(tags, tags.getSelection()); } - else if (value instanceof Enum) { - Enum selectedValue = (Enum)value; + else if (value instanceof Enum selectedValue) { updateCombobox(EnumSet.allOf(selectedValue.getDeclaringClass()), selectedValue); } else { diff --git a/platform/platform-impl/src/com/intellij/ui/ExpandableActions.java b/platform/platform-impl/src/com/intellij/ui/ExpandableActions.java index 100d84b2b8b5..60518dbd3374 100644 --- a/platform/platform-impl/src/com/intellij/ui/ExpandableActions.java +++ b/platform/platform-impl/src/com/intellij/ui/ExpandableActions.java @@ -27,8 +27,7 @@ public abstract class ExpandableActions extends DumbAwareAction { private static Expandable getExpandable(AnActionEvent event) { Object component = event.getData(CONTEXT_COMPONENT); if (component instanceof Expandable) return (Expandable)component; - if (component instanceof JComponent) { - JComponent container = (JComponent)component; + if (component instanceof JComponent container) { Object property = container.getClientProperty(Expandable.class); if (property instanceof Expandable) return (Expandable)property; } diff --git a/platform/platform-impl/src/com/intellij/ui/FinderRecursivePanel.java b/platform/platform-impl/src/com/intellij/ui/FinderRecursivePanel.java index 313b8083e61f..cf2d309fa71d 100644 --- a/platform/platform-impl/src/com/intellij/ui/FinderRecursivePanel.java +++ b/platform/platform-impl/src/com/intellij/ui/FinderRecursivePanel.java @@ -638,8 +638,7 @@ public abstract class FinderRecursivePanel extends OnePixelSplitter implement T value = getSelectedValue(); if (value != null) { myChild = createRightComponent(value); - if (myChild instanceof FinderRecursivePanel) { - FinderRecursivePanel childPanel = (FinderRecursivePanel)myChild; + if (myChild instanceof FinderRecursivePanel childPanel) { if (withUpdatePanel) { childPanel.initPanel(); } diff --git a/platform/platform-impl/src/com/intellij/ui/FontInfoRenderer.java b/platform/platform-impl/src/com/intellij/ui/FontInfoRenderer.java index 258f4104b633..ff42608bb28f 100644 --- a/platform/platform-impl/src/com/intellij/ui/FontInfoRenderer.java +++ b/platform/platform-impl/src/com/intellij/ui/FontInfoRenderer.java @@ -16,8 +16,7 @@ public class FontInfoRenderer extends ColoredListCellRenderer { Font font = list.getFont(); @NlsSafe String text = value == null ? "" : value.toString(); append(text); - if (value instanceof FontInfo) { - FontInfo info = (FontInfo)value; + if (value instanceof FontInfo info) { Integer size = getFontSize(); Font f = info.getFont(size != null ? size : font.getSize()); if (f.canDisplayUpTo(text) == -1) { diff --git a/platform/platform-impl/src/com/intellij/ui/HintHint.java b/platform/platform-impl/src/com/intellij/ui/HintHint.java index d46a2bf3f203..0866eb1fdb20 100644 --- a/platform/platform-impl/src/com/intellij/ui/HintHint.java +++ b/platform/platform-impl/src/com/intellij/ui/HintHint.java @@ -214,8 +214,7 @@ public class HintHint { c.setForeground(getTextForeground()); c.setBackground(getTextBackground()); c.setFont(getTextFont()); - if (c instanceof JComponent) { - JComponent jc = (JComponent)c; + if (c instanceof JComponent jc) { jc.setOpaque(isOpaqueAllowed()); jc.setBorder(isOwnBorderAllowed() ? BorderFactory.createCompoundBorder(BorderFactory.createLineBorder(Color.black), BorderFactory.createEmptyBorder(0, 5, 0, 5)) : null); } diff --git a/platform/platform-impl/src/com/intellij/ui/MultilineTreeCellRenderer.java b/platform/platform-impl/src/com/intellij/ui/MultilineTreeCellRenderer.java index 58efd2cfb2d6..88775f32ee10 100644 --- a/platform/platform-impl/src/com/intellij/ui/MultilineTreeCellRenderer.java +++ b/platform/platform-impl/src/com/intellij/ui/MultilineTreeCellRenderer.java @@ -326,8 +326,7 @@ public abstract class MultilineTreeCellRenderer extends JComponent implements Ac private int getChildIndent(JTree tree) { TreeUI newUI = tree.getUI(); - if (newUI instanceof BasicTreeUI) { - BasicTreeUI btreeui = (BasicTreeUI)newUI; + if (newUI instanceof BasicTreeUI btreeui) { return btreeui.getLeftChildIndent() + btreeui.getRightChildIndent(); } else { diff --git a/platform/platform-impl/src/com/intellij/ui/ShowUIDefaultsAction.java b/platform/platform-impl/src/com/intellij/ui/ShowUIDefaultsAction.java index cbc99d7212b2..4867489cb4b2 100644 --- a/platform/platform-impl/src/com/intellij/ui/ShowUIDefaultsAction.java +++ b/platform/platform-impl/src/com/intellij/ui/ShowUIDefaultsAction.java @@ -164,8 +164,7 @@ public class ShowUIDefaultsAction extends AnAction implements DumbAware { updateValue(pair, newInsets, row, column); changed.set(true); } - } else if (value instanceof UIUtil.GrayFilter) { - UIUtil.GrayFilter f = (UIUtil.GrayFilter)value; + } else if (value instanceof UIUtil.GrayFilter f) { String oldFilter = String.format("%d,%d,%d", f.getBrightness(), f.getContrast(), f.getAlpha()); UIUtil.GrayFilter newValue = editGrayFilter(key.toString(), oldFilter); if (newValue != null) { @@ -180,8 +179,7 @@ public class ShowUIDefaultsAction extends AnAction implements DumbAware { setValueAt(newValue, row, column); changed.set(true); } - } else if (value instanceof Dimension) { - Dimension d = (Dimension)value; + } else if (value instanceof Dimension d) { String oldDimension = String.format("%d,%d", d.width, d.height); Dimension newDimension = editDimension(key.toString(), oldDimension); if (newDimension != null) { @@ -225,8 +223,7 @@ public class ShowUIDefaultsAction extends AnAction implements DumbAware { } final JLabel label = new JLabel(value == null ? "" : value.toString()); final JPanel panel = simplePanel(label); - if (value instanceof Color) { - final Color c = (Color)value; + if (value instanceof Color c) { label.setText(String.format(" [%d,%d,%d] #%s", c.getRed(), c.getGreen(), c.getBlue(), StringUtil.toUpperCase(ColorUtil.toHex(c)))); Color fg = ColorUtil.isDark(c) ? Gray.xFF : Gray.x00; label.setForeground(fg); diff --git a/platform/platform-impl/src/com/intellij/ui/WindowMoveListener.java b/platform/platform-impl/src/com/intellij/ui/WindowMoveListener.java index b5151dc5f8ff..0316d3b06dec 100644 --- a/platform/platform-impl/src/com/intellij/ui/WindowMoveListener.java +++ b/platform/platform-impl/src/com/intellij/ui/WindowMoveListener.java @@ -52,8 +52,7 @@ public class WindowMoveListener extends WindowMouseListener { if (event.isConsumed()) return; if (BUTTON1_MASK == (BUTTON1_MASK & event.getModifiers()) && 1 < event.getClickCount()) { Component view = getView(getContent(event)); - if (view instanceof Frame) { - Frame frame = (Frame)view; + if (view instanceof Frame frame) { int state = frame.getExtendedState(); if (!isStateSet(Frame.ICONIFIED, state) && frame.isResizable()) { event.consume(); diff --git a/platform/platform-impl/src/com/intellij/ui/WindowRoundedCornersManager.java b/platform/platform-impl/src/com/intellij/ui/WindowRoundedCornersManager.java index af2a9a75e302..fe2bba58241a 100644 --- a/platform/platform-impl/src/com/intellij/ui/WindowRoundedCornersManager.java +++ b/platform/platform-impl/src/com/intellij/ui/WindowRoundedCornersManager.java @@ -53,12 +53,10 @@ public final class WindowRoundedCornersManager { else if (params instanceof Color) { params = new Object[] {Float.valueOf(IdeaPopupMenuUI.CORNER_RADIUS.getFloat()), Integer.valueOf(1), params}; } - else if (params instanceof Object[]) { - Object[] values = (Object[])params; - if (values.length != 2 || !(values[0] instanceof PopupCornerType) || !(values[1] instanceof Color)) { + else if (params instanceof Object[] values) { + if (values.length != 2 || !(values[0] instanceof PopupCornerType cornerType) || !(values[1] instanceof Color)) { return; } - PopupCornerType cornerType = (PopupCornerType)values[0]; JBValue radius = cornerType == PopupCornerType.RoundedTooltip ? JBUI.CurrentTheme.Tooltip.CORNER_RADIUS : IdeaPopupMenuUI.CORNER_RADIUS; params = new Object[]{Float.valueOf(radius.getFloat()), Integer.valueOf(1), values[1]}; @@ -81,12 +79,10 @@ public final class WindowRoundedCornersManager { else if (params instanceof Color) { params = new Object[]{"full", params}; } - else if (params instanceof Object[]) { - Object[] values = (Object[])params; - if (values.length != 2 || !(values[0] instanceof PopupCornerType) || !(values[1] instanceof Color)) { + else if (params instanceof Object[] values) { + if (values.length != 2 || !(values[0] instanceof PopupCornerType cornerType) || !(values[1] instanceof Color)) { return; } - PopupCornerType cornerType = (PopupCornerType)values[0]; params = new Object[]{cornerType == PopupCornerType.RoundedTooltip ? "small" : "full", values[1]}; } else if (!(params instanceof String)) { diff --git a/platform/platform-impl/src/com/intellij/ui/components/GradientViewport.java b/platform/platform-impl/src/com/intellij/ui/components/GradientViewport.java index 19af81527bb8..59d8c2c019c2 100644 --- a/platform/platform-impl/src/com/intellij/ui/components/GradientViewport.java +++ b/platform/platform-impl/src/com/intellij/ui/components/GradientViewport.java @@ -91,8 +91,7 @@ public class GradientViewport extends JBViewport { y3 -= myInsets.bottom; } Component parent = myAlways ? null : getParent(); - if (parent instanceof JScrollPane) { - JScrollPane pane = (JScrollPane)parent; + if (parent instanceof JScrollPane pane) { JScrollBar vBar = pane.getVerticalScrollBar(); if (vBar != null && vBar.isVisible()) { if (vBar.getX() < getX()) { diff --git a/platform/platform-impl/src/com/intellij/ui/components/SliderSelectorAction.java b/platform/platform-impl/src/com/intellij/ui/components/SliderSelectorAction.java index 563f5bd1ff13..3f047f298d50 100644 --- a/platform/platform-impl/src/com/intellij/ui/components/SliderSelectorAction.java +++ b/platform/platform-impl/src/com/intellij/ui/components/SliderSelectorAction.java @@ -125,9 +125,8 @@ public class SliderSelectorAction extends DumbAwareAction { } protected void show(AnActionEvent e, JPanel result, JBPopup popup, InputEvent inputEvent) { - if (inputEvent instanceof MouseEvent) { + if (inputEvent instanceof MouseEvent inputEvent1) { int width = result.getPreferredSize().width; - MouseEvent inputEvent1 = (MouseEvent)inputEvent; Point point1 = new Point(inputEvent1.getX() - width / 2, inputEvent1.getY()); RelativePoint point = new RelativePoint(inputEvent1.getComponent(), point1); popup.show(point); diff --git a/platform/platform-impl/src/com/intellij/ui/components/TestTextFieldAction.java b/platform/platform-impl/src/com/intellij/ui/components/TestTextFieldAction.java index 9641e9540d71..f07f600e963a 100644 --- a/platform/platform-impl/src/com/intellij/ui/components/TestTextFieldAction.java +++ b/platform/platform-impl/src/com/intellij/ui/components/TestTextFieldAction.java @@ -57,8 +57,7 @@ public class TestTextFieldAction extends DumbAwareAction { private final JPanel center = new JPanel(new GridBagLayout()) { @Override protected void paintComponent(Graphics g) { - if (g instanceof Graphics2D && gradient.isSelected()) { - Graphics2D g2d = (Graphics2D)g; + if (g instanceof Graphics2D g2d && gradient.isSelected()) { Rectangle bounds = new Rectangle(getWidth(), getHeight()); g2d.setPaint(new LinearGradientPaint( bounds.x, bounds.y, bounds.width, bounds.height, new float[]{0, 1}, diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ActionsLoader.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ActionsLoader.java index 36b1065899c3..ed7ea9114e2e 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ActionsLoader.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ActionsLoader.java @@ -195,8 +195,7 @@ final class ActionsLoader { ret.put(0L, result); Customizer customizer = new Customizer(null, null, (parentInfo, butt, presentation) -> { - if (butt.getAnAction() instanceof FNKeyAction) { - final FNKeyAction act = ((FNKeyAction)butt.getAnAction()); + if (butt.getAnAction() instanceof FNKeyAction act) { butt.setWidth(FN_WIDTH); butt.setIcon(null); final String hint = presentation.getText() == null || presentation.getText().isEmpty() ? " " : presentation.getText(); diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxDefault.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxDefault.java index 23d5d749bc60..f754f4464d28 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxDefault.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxDefault.java @@ -125,7 +125,7 @@ final class CtxDefault { return; } - if (!(runButtons instanceof DefaultActionGroup)) { + if (!(runButtons instanceof DefaultActionGroup group)) { LOG.debug("RunnersGroup for touchbar isn't a group"); return; } @@ -135,7 +135,6 @@ final class CtxDefault { return; } - DefaultActionGroup group = (DefaultActionGroup)runButtons; for (Executor executor : Executor.EXECUTOR_EXTENSION_NAME.getExtensionList()) { if (executor.getId().equals(ToolWindowId.RUN) || executor.getId().equals(ToolWindowId.DEBUG)) { group.add(actionManager.getAction(executor.getId()), actionManager); diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxDialogs.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxDialogs.java index 16078fb757f3..ef4b7c2f8dfa 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxDialogs.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxDialogs.java @@ -78,9 +78,8 @@ final class CtxDialogs { final TouchbarActionCustomizations ac = TouchbarActionCustomizations.getCustomizations(button.getAnAction()); if (ac != null) { isDefault = ac.isDefault(); - if (!isDefault && ac.getComponent() instanceof JButton) { + if (!isDefault && ac.getComponent() instanceof JButton jb) { // also check properties of JButton - final JButton jb = (JButton)ac.getComponent(); isDefault = jb.getAction() != null ? jb.getAction().getValue(DialogWrapper.DEFAULT_ACTION) != null : jb.isDefaultButton(); } diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxPopup.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxPopup.java index 2a92f5e5178a..9edd2a7ddbaa 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/CtxPopup.java @@ -24,12 +24,10 @@ final class CtxPopup { static private final boolean DISABLED = Boolean.getBoolean("touchbar.popups.disable"); static @Nullable Disposable showPopupItems(@NotNull JBPopup popup, @NotNull JComponent popupComponent) { - if (DISABLED || !(popup instanceof ListPopupImpl)) { + if (DISABLED || !(popup instanceof @NotNull ListPopupImpl listPopup)) { return null; } - @NotNull ListPopupImpl listPopup = (ListPopupImpl)popup; - final TBPanel tb = createScrubberBarFromPopup(listPopup); TouchBarsManager.registerAndShow(popupComponent, tb); diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/Helpers.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/Helpers.java index 409f33556768..303330f9ca50 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/Helpers.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/Helpers.java @@ -194,8 +194,7 @@ public final class Helpers { if (childAction == null) { continue; } - if (childAction instanceof ActionGroup) { - final ActionGroup childGroup = (ActionGroup)childAction; + if (childAction instanceof ActionGroup childGroup) { collectLeafActions(childGroup, out); continue; } diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ItemsContainer.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ItemsContainer.java index 614b5c5155cc..84b101a5c0e9 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ItemsContainer.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ItemsContainer.java @@ -120,15 +120,13 @@ final class ItemsContainer { synchronized void softClear(@NotNull Map actPool, @NotNull Map groupPool) { myItems.forEach((item -> { - if (item instanceof TBItemAnActionButton) { - final TBItemAnActionButton actItem = (TBItemAnActionButton)item; + if (item instanceof TBItemAnActionButton actItem) { TBItemAnActionButton prev = actPool.put(actItem.getAnAction(), actItem); if (prev != null) { // just for insurance prev.releaseNativePeer(); } } - if (item instanceof TBItemGroup) { - final TBItemGroup group = (TBItemGroup)item; + if (item instanceof TBItemGroup group) { TBItemGroup prev = groupPool.put(group.size(), group); if (prev != null) { // just for insurance prev.releaseNativePeer(); diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBPanelActionGroup.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBPanelActionGroup.java index ee6d158945ef..f82061cc9dd4 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBPanelActionGroup.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBPanelActionGroup.java @@ -219,8 +219,7 @@ class TBPanelActionGroup extends TBPanel { // 1. create separator // NOTE: we don't add separator into Main (or Principal) groups // just add separator into current list of actions - if (action instanceof Separator) { - final Separator sep = (Separator)action; + if (action instanceof Separator sep) { int increment = 1; if (sep.getText() != null) { if (sep.getText().equals(ourSmallSeparatorText)) { diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java index b9b4e83709bb..c561e9ce7a5e 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java @@ -112,12 +112,10 @@ final class TouchBarsManager { } private static void processFocusEvent(AWTEvent e) { - if (!(e.getSource() instanceof Component)) { + if (!(e.getSource() instanceof Component src)) { return; } - final Component src = (Component)e.getSource(); - // NOTE: WindowEvent.WINDOW_GAINED_FOCUS can be fired when frame focused if (e.getID() == FocusEvent.FOCUS_GAINED) { // find current (showing) component/touchbar corresponding to event window @@ -545,8 +543,7 @@ final class TouchBarsManager { myLastShownTouchbar = tb; - if (myLastShownTouchbar instanceof TBPanelActionGroup) { - final TBPanelActionGroup atb = (TBPanelActionGroup)myLastShownTouchbar; + if (myLastShownTouchbar instanceof TBPanelActionGroup atb) { atb.startUpdateTimer(); // timer can "sleep" sometimes (when user doesn't send input for expamle) diff --git a/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java b/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java index b938652282a8..dd6dc1a5351d 100644 --- a/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java +++ b/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java @@ -119,11 +119,10 @@ public class MacColorPipette extends ColorPipetteBase { } private static void applyRenderingHints(@NotNull Graphics graphics) { - if (!(graphics instanceof Graphics2D)) { + if (!(graphics instanceof Graphics2D g2d)) { return; } - Graphics2D g2d = (Graphics2D)graphics; GraphicsUtil.applyRenderingHints(g2d); g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); diff --git a/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegTabbedPaneUI.java b/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegTabbedPaneUI.java index abeb5f71c6ac..14e597a34300 100644 --- a/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegTabbedPaneUI.java +++ b/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegTabbedPaneUI.java @@ -23,8 +23,7 @@ public class BegTabbedPaneUI extends MetalTabbedPaneUI { public void installUI(JComponent c) { super.installUI(c); Object clientProperty = UIUtil.getTabbedPanePaintContentBorder(c); - if (clientProperty instanceof Boolean) { - Boolean aBoolean = (Boolean)clientProperty; + if (clientProperty instanceof Boolean aBoolean) { myPaintContentBorder = aBoolean.booleanValue(); } } diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java index 24c2bf72c3ab..48a41d882a52 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java @@ -809,8 +809,7 @@ public class AbstractPopup implements JBPopup, ScreenAreaConsumer, AlignedPopup public final void cancel() { InputEvent inputEvent = null; AWTEvent event = IdeEventQueue.getInstance().getTrueCurrentEvent(); - if (event instanceof InputEvent && myPopup != null) { - InputEvent ie = (InputEvent)event; + if (event instanceof InputEvent ie && myPopup != null) { Window window = myPopup.getWindow(); if (window != null && UIUtil.isDescendingFrom(ie.getComponent(), window)) { inputEvent = ie; @@ -1629,8 +1628,7 @@ public class AbstractPopup implements JBPopup, ScreenAreaConsumer, AlignedPopup myWindow.removeWindowListener(myWindowListener); } - if (myWindow instanceof RootPaneContainer) { - RootPaneContainer container = (RootPaneContainer)myWindow; + if (myWindow instanceof RootPaneContainer container) { JRootPane root = container.getRootPane(); root.putClientProperty(KEY, null); if (root.getGlassPane() instanceof IdeGlassPaneImpl) { diff --git a/platform/platform-impl/src/com/intellij/ui/popup/MovablePopup.java b/platform/platform-impl/src/com/intellij/ui/popup/MovablePopup.java index e58244ac255b..a53916c22b48 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/MovablePopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/MovablePopup.java @@ -291,8 +291,7 @@ public class MovablePopup { } private static JRootPane getRootPane(Window window) { - if (window instanceof RootPaneContainer) { - RootPaneContainer container = (RootPaneContainer)window; + if (window instanceof RootPaneContainer container) { return container.getRootPane(); } return null; diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java index ea391eecddb8..e1b187a1d7af 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java @@ -466,8 +466,7 @@ public class PopupFactoryImpl extends JBPopupFactory { public @NotNull RelativePoint guessBestPopupLocation(@NotNull JComponent component) { Point popupMenuPoint = null; final Rectangle visibleRect = component.getVisibleRect(); - if (component instanceof JList) { // JList - JList list = (JList)component; + if (component instanceof JList list) { // JList int firstVisibleIndex = list.getFirstVisibleIndex(); int lastVisibleIndex = list.getLastVisibleIndex(); int[] selectedIndices = list.getSelectedIndices(); @@ -479,8 +478,7 @@ public class PopupFactoryImpl extends JBPopupFactory { } } } - else if (component instanceof JTree) { // JTree - JTree tree = (JTree)component; + else if (component instanceof JTree tree) { // JTree TreePath[] paths = tree.getSelectionPaths(); if (paths != null && paths.length > 0) { TreePath pathFound = null; @@ -502,8 +500,7 @@ public class PopupFactoryImpl extends JBPopupFactory { } } } - else if (component instanceof JTable) { - JTable table = (JTable)component; + else if (component instanceof JTable table) { int column = table.getColumnModel().getSelectionModel().getLeadSelectionIndex(); int row = Math.max(table.getSelectionModel().getLeadSelectionIndex(), table.getSelectionModel().getAnchorSelectionIndex()); Rectangle rect = table.getCellRect(row, column, false); @@ -512,8 +509,7 @@ public class PopupFactoryImpl extends JBPopupFactory { } popupMenuPoint = new Point(rect.x, rect.y + rect.height - 1); } - else if (component instanceof PopupOwner) { - PopupOwner popupOwner = (PopupOwner)component; + else if (component instanceof PopupOwner popupOwner) { JComponent popupComponent = popupOwner.getPopupComponent(); if (popupComponent == null || popupComponent == popupOwner) { popupMenuPoint = ((PopupOwner)component).getBestPopupPosition(); diff --git a/platform/platform-impl/src/com/intellij/ui/popup/list/ComboBoxPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/list/ComboBoxPopup.java index 2fa8e8afa254..97bff804a532 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/list/ComboBoxPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/list/ComboBoxPopup.java @@ -167,8 +167,7 @@ public class ComboBoxPopup extends ListPopupImpl { boolean cellHasFocus) { //noinspection unchecked Component component = myContext.getRenderer().getListCellRendererComponent(list, (T)value, index, isSelected, cellHasFocus); - if (component instanceof JComponent && !(component instanceof JSeparator || component instanceof TitledSeparator)) { - JComponent jComponent = (JComponent)component; + if (component instanceof JComponent jComponent && !(component instanceof JSeparator || component instanceof TitledSeparator)) { if (!(component instanceof GroupedElementsRenderer.MyComponent)) { jComponent.setBorder(COMBO_ITEM_BORDER); } diff --git a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java index 2fd557964e90..132b9e29f94c 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java @@ -518,8 +518,7 @@ public class ListPopupImpl extends WizardPopup implements ListPopup, NextStepHan Point point = myList.indexToLocation(myList.getSelectedIndex()); SwingUtilities.convertPointToScreen(point, myList); myChild = createPopup(this, nextStep, parentValue); - if (myChild instanceof ListPopup) { - ListPopup child = (ListPopup)myChild; + if (myChild instanceof ListPopup child) { for (ListSelectionListener listener : myList.getListSelectionListeners()) { child.addListSelectionListener(listener); } diff --git a/platform/platform-impl/src/com/intellij/ui/render/RenderingHelper.java b/platform/platform-impl/src/com/intellij/ui/render/RenderingHelper.java index 4831fed84e71..d442ef9dfd66 100644 --- a/platform/platform-impl/src/com/intellij/ui/render/RenderingHelper.java +++ b/platform/platform-impl/src/com/intellij/ui/render/RenderingHelper.java @@ -77,8 +77,7 @@ public final class RenderingHelper { } private static int getExpandableHintIndex(@NotNull JComponent component) { - if (component instanceof ComponentWithExpandableItems) { - ComponentWithExpandableItems c = (ComponentWithExpandableItems)component; + if (component instanceof ComponentWithExpandableItems c) { Collection items = c.getExpandableItemsHandler().getExpandedItems(); Object item = items.isEmpty() ? null : items.iterator().next(); if (item instanceof Integer) return (Integer)item; diff --git a/platform/platform-impl/src/com/intellij/ui/stripe/ErrorStripe.java b/platform/platform-impl/src/com/intellij/ui/stripe/ErrorStripe.java index 28f18b90642f..f04f6d500c90 100644 --- a/platform/platform-impl/src/com/intellij/ui/stripe/ErrorStripe.java +++ b/platform/platform-impl/src/com/intellij/ui/stripe/ErrorStripe.java @@ -32,8 +32,7 @@ public final class ErrorStripe implements Comparable { @Override public boolean equals(Object object) { if (object == this) return true; - if (object instanceof ErrorStripe) { - ErrorStripe stripe = (ErrorStripe)object; + if (object instanceof ErrorStripe stripe) { return stripe.myLayer == myLayer && stripe.myColor.getRGB() == myColor.getRGB(); } return false; diff --git a/platform/platform-impl/src/com/intellij/ui/stripe/Updater.java b/platform/platform-impl/src/com/intellij/ui/stripe/Updater.java index f8d6e58f7036..845248891b5d 100644 --- a/platform/platform-impl/src/com/intellij/ui/stripe/Updater.java +++ b/platform/platform-impl/src/com/intellij/ui/stripe/Updater.java @@ -49,8 +49,7 @@ public abstract class Updater implements Dis DaemonCodeAnalyzerSettings settings = DaemonCodeAnalyzerSettings.getInstance(); myPainter.setMinimalThickness(settings == null ? 2 : Math.min(settings.getErrorStripeMarkMinHeight(), JBUIScale.scale(4))); myPainter.setErrorStripeGap(Registry.intValue("error.stripe.gap", 0)); - if (myPainter instanceof ExtraErrorStripePainter) { - ExtraErrorStripePainter extra = (ExtraErrorStripePainter)myPainter; + if (myPainter instanceof ExtraErrorStripePainter extra) { extra.setGroupSwap(!myScrollBar.getComponentOrientation().isLeftToRight()); } myPainter.paint(g, x, y, width, height, object); diff --git a/platform/platform-impl/src/com/intellij/ui/tree/AbstractTreeNodeVisitor.java b/platform/platform-impl/src/com/intellij/ui/tree/AbstractTreeNodeVisitor.java index f4f5afc58f83..141f415a0577 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/AbstractTreeNodeVisitor.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/AbstractTreeNodeVisitor.java @@ -47,8 +47,7 @@ public abstract class AbstractTreeNodeVisitor implements TreeVisitor { if (component instanceof AbstractTreeNode) { return visit(path, (AbstractTreeNode)component, element); } - if (component instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)component; + if (component instanceof DefaultMutableTreeNode node) { Object object = node.getUserObject(); if (object instanceof AbstractTreeNode) { return visit(path, (AbstractTreeNode)object, element); diff --git a/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java b/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java index efa5004c2751..4b5e4666eee4 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java @@ -94,8 +94,7 @@ public final class AsyncTreeModel extends AbstractTreeModel implements Searchabl Disposer.register(this, (Disposable)model); } foreground = Invoker.forEventDispatchThread(this); - if (model instanceof InvokerSupplier) { - InvokerSupplier supplier = (InvokerSupplier)model; + if (model instanceof InvokerSupplier supplier) { background = supplier.getInvoker(); } else { @@ -544,8 +543,7 @@ public final class AsyncTreeModel extends AbstractTreeModel implements Searchabl Node loaded = new Node(object, LeafState.get(object, model)); if (loaded.leafState == LeafState.ALWAYS || isObsolete()) return loaded; - if (model instanceof ChildrenProvider) { - ChildrenProvider provider = (ChildrenProvider)model; + if (model instanceof ChildrenProvider provider) { List children = provider.getChildren(object); if (children == null) throw new ProcessCanceledException(); // cancel this command loaded.children = load(children.size(), index -> children.get(index)); diff --git a/platform/platform-impl/src/com/intellij/ui/tree/RestoreSelectionListener.java b/platform/platform-impl/src/com/intellij/ui/tree/RestoreSelectionListener.java index b9eaa94c7b9c..e23f329d9e6b 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/RestoreSelectionListener.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/RestoreSelectionListener.java @@ -22,8 +22,7 @@ public final class RestoreSelectionListener implements TreeSelectionListener { TreePath path = event.getOldLeadSelectionPath(); if (path != null && null != path.getParentPath()) { Object source = event.getSource(); - if (source instanceof JTree) { - JTree tree = (JTree)source; + if (source instanceof JTree tree) { if (tree.getSelectionModel().isSelectionEmpty()) { invokeLater(() -> { // restore selection later, because nodes are removed before they are inserted diff --git a/platform/platform-impl/src/com/intellij/ui/tree/StructureTreeModel.java b/platform/platform-impl/src/com/intellij/ui/tree/StructureTreeModel.java index 30fe45e0568f..ba504efcce54 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/StructureTreeModel.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/StructureTreeModel.java @@ -138,8 +138,7 @@ public class StructureTreeModel private @NotNull CompletableFuture onValidThread(@NotNull TreePath path, @NotNull Function function) { Object component = path.getLastPathComponent(); - if (component instanceof Node) { - Node node = (Node)component; + if (component instanceof Node node) { return onValidThread(__ -> disposed || isNodeRemoved(node) ? null : function.apply(node)); } @@ -318,8 +317,7 @@ public class StructureTreeModel } private Node getNode(Object object, boolean validateChildren) { - if (disposed || !(object instanceof Node) || !isValidThread()) return null; - Node node = (Node)object; + if (disposed || !(object instanceof Node node) || !isValidThread()) return null; if (isNodeRemoved(node)) return null; if (validateChildren) validateChildren(node); return node; diff --git a/platform/platform-impl/src/com/intellij/ui/tree/project/ProjectFileNodeUpdater.java b/platform/platform-impl/src/com/intellij/ui/tree/project/ProjectFileNodeUpdater.java index fa3a93ad4979..38ba64cba01d 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/project/ProjectFileNodeUpdater.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/project/ProjectFileNodeUpdater.java @@ -49,16 +49,13 @@ public abstract class ProjectFileNodeUpdater { @Override public void after(@NotNull List events) { for (VFileEvent event : events) { - if (event instanceof VFileCreateEvent) { - VFileCreateEvent create = (VFileCreateEvent)event; + if (event instanceof VFileCreateEvent create) { updateFromFile(create.getParent()); } - else if (event instanceof VFileCopyEvent) { - VFileCopyEvent copy = (VFileCopyEvent)event; + else if (event instanceof VFileCopyEvent copy) { updateFromFile(copy.getNewParent()); } - else if (event instanceof VFileMoveEvent) { - VFileMoveEvent move = (VFileMoveEvent)event; + else if (event instanceof VFileMoveEvent move) { updateFromFile(move.getNewParent()); updateFromFile(move.getOldParent()); updateFromFile(move.getFile()); diff --git a/platform/platform-impl/src/com/intellij/ui/tree/ui/ClassicPainter.java b/platform/platform-impl/src/com/intellij/ui/tree/ui/ClassicPainter.java index 5a6e13f78ec8..f7be0200f787 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/ui/ClassicPainter.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/ui/ClassicPainter.java @@ -99,8 +99,7 @@ final class ClassicPainter implements Control.Painter { } private static void paintLine(@NotNull Graphics g, int x, int y, int width, int height) { - if (g instanceof Graphics2D) { - Graphics2D g2d = (Graphics2D)g; + if (g instanceof Graphics2D g2d) { double dx = x + width / 2.0 - PaintUtil.devPixel(g2d); LinePainter2D.paint(g2d, dx, y, dx, y + height, LinePainter2D.StrokeType.CENTERED, 1, RenderingHints.VALUE_ANTIALIAS_ON); } diff --git a/platform/platform-impl/src/com/intellij/ui/tree/ui/ModelAccessor.java b/platform/platform-impl/src/com/intellij/ui/tree/ui/ModelAccessor.java index 8f1107663757..59957e735060 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/ui/ModelAccessor.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/ui/ModelAccessor.java @@ -36,8 +36,7 @@ final class ModelAccessor { */ ModelAccessor(@NotNull TreeModel model) { this.model = model; - if (model instanceof InvokerSupplier) { - InvokerSupplier supplier = (InvokerSupplier)model; + if (model instanceof InvokerSupplier supplier) { invoker = supplier.getInvoker(); } else { @@ -123,8 +122,7 @@ final class ModelAccessor { if (obsolescent.isObsolete()) return null; List list = emptyList(); if (state != LeafState.ALWAYS) { - if (model instanceof ChildrenProvider) { - ChildrenProvider provider = (ChildrenProvider)model; + if (model instanceof ChildrenProvider provider) { List children = provider.getChildren(node); if (children == null) throw new ProcessCanceledException(); list = getChildren(obsolescent, children.size(), children::get); diff --git a/platform/platform-impl/src/com/intellij/ui/win/WinDockDelegate.java b/platform/platform-impl/src/com/intellij/ui/win/WinDockDelegate.java index 630e92e2bf00..9fde2ac4e3ae 100644 --- a/platform/platform-impl/src/com/intellij/ui/win/WinDockDelegate.java +++ b/platform/platform-impl/src/com/intellij/ui/win/WinDockDelegate.java @@ -76,13 +76,11 @@ public final class WinDockDelegate implements SystemDock.Delegate { int i = 0; for (final var action : actions) { - if (!(action instanceof ReopenProjectAction)) { + if (!(action instanceof ReopenProjectAction reopenProjectAction)) { LOG.debug("Failed to convert an action \"" + action + "\" to Jump Task: the action is not ReopenProjectAction"); continue; } - final ReopenProjectAction reopenProjectAction = (ReopenProjectAction)action; - final @SystemIndependent String projectPath = reopenProjectAction.getProjectPath(); final @SystemDependent String projectPathSystem = PathUtil.toSystemDependentName(projectPath); diff --git a/platform/platform-impl/src/com/intellij/util/ContentUtilEx.java b/platform/platform-impl/src/com/intellij/util/ContentUtilEx.java index 1c85113b2a68..21c62743e310 100644 --- a/platform/platform-impl/src/com/intellij/util/ContentUtilEx.java +++ b/platform/platform-impl/src/com/intellij/util/ContentUtilEx.java @@ -180,8 +180,7 @@ public final class ContentUtilEx extends ContentsUtil { */ public static boolean closeContentTab(@NotNull ContentManager manager, @NotNull Condition condition) { for (Content content : manager.getContents()) { - if (content instanceof TabbedContent && ((TabbedContent)content).hasMultipleTabs()) { - TabbedContent tabbedContent = (TabbedContent)content; + if (content instanceof TabbedContent tabbedContent && ((TabbedContent)content).hasMultipleTabs()) { JComponent component = findContentComponent(tabbedContent, condition); if (component != null) { tabbedContent.removeContent(component); diff --git a/platform/platform-impl/src/com/intellij/util/concurrency/Invoker.java b/platform/platform-impl/src/com/intellij/util/concurrency/Invoker.java index db013a5a9659..492a7069b8ac 100644 --- a/platform/platform-impl/src/com/intellij/util/concurrency/Invoker.java +++ b/platform/platform-impl/src/com/intellij/util/concurrency/Invoker.java @@ -284,8 +284,7 @@ public abstract class Invoker implements Disposable { promise.setError("disposed"); return false; // the current invoker is disposed } - if (supplier instanceof Obsolescent) { - Obsolescent obsolescent = (Obsolescent)supplier; + if (supplier instanceof Obsolescent obsolescent) { if (obsolescent.isObsolete()) { if (LOG.isTraceEnabled()) LOG.debug("Task is obsolete"); promise.setError("obsolete"); diff --git a/platform/platform-impl/src/com/intellij/util/ui/ChildFocusWatcher.java b/platform/platform-impl/src/com/intellij/util/ui/ChildFocusWatcher.java index bfd868801c6c..4dbee61ff973 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/ChildFocusWatcher.java +++ b/platform/platform-impl/src/com/intellij/util/ui/ChildFocusWatcher.java @@ -18,8 +18,7 @@ public abstract class ChildFocusWatcher implements AWTEventListener, Disposable @Override public void eventDispatched(final AWTEvent event) { - if (event instanceof FocusEvent) { - final FocusEvent fe = (FocusEvent)event; + if (event instanceof FocusEvent fe) { final Component component = fe.getComponent(); if (component == null) return; if (!SwingUtilities.isDescendingFrom(component, myParent)) return; diff --git a/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java b/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java index f327dedab781..0260f8169d69 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java +++ b/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java @@ -41,8 +41,7 @@ public final class OwnerOptional { } } - if (owner instanceof Dialog) { - Dialog ownerDialog = (Dialog)owner; + if (owner instanceof Dialog ownerDialog) { if (!ownerDialog.isModal() && !UIUtil.isPossibleOwner(ownerDialog)) { while (owner instanceof Dialog && !((Dialog)owner).isModal()) { owner = owner.getOwner(); @@ -85,8 +84,7 @@ public final class OwnerOptional { public OwnerOptional ifFrame(Consumer consumer) { if (myPermanentOwner instanceof Frame) { - if (myPermanentOwner instanceof IdeFrame.Child) { - IdeFrame.Child ideFrameChild = (IdeFrame.Child)myPermanentOwner; + if (myPermanentOwner instanceof IdeFrame.Child ideFrameChild) { myPermanentOwner = WindowManager.getInstance().getFrame(ideFrameChild.getProject()); } consumer.consume((Frame)this.myPermanentOwner); diff --git a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java index 3c7b982f141a..af949237faa7 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java +++ b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java @@ -117,8 +117,7 @@ public final class SwingHelper { panel.setLayout(new BoxLayout(panel, axis)); for (Component child : children) { panel.add(child, childAlignment); - if (child instanceof JComponent) { - JComponent jChild = (JComponent)child; + if (child instanceof JComponent jChild) { if (verticalOrientation) { jChild.setAlignmentX(childAlignment); } @@ -809,15 +808,13 @@ public final class SwingHelper { @Nullable public static Component getComponentFromRecentMouseEvent() { AWTEvent event = IdeEventQueue.getInstance().getTrueCurrentEvent(); - if (event instanceof MouseEvent) { - MouseEvent mouseEvent = (MouseEvent)event; + if (event instanceof MouseEvent mouseEvent) { Component component = mouseEvent.getComponent(); if (component != null) { component = SwingUtilities.getDeepestComponentAt(component, mouseEvent.getX(), mouseEvent.getY()); if (component != null) { - if (component instanceof JTabbedPane) { + if (component instanceof JTabbedPane tabbedPane) { mouseEvent = SwingUtilities.convertMouseEvent(mouseEvent.getComponent(), mouseEvent, component); - JTabbedPane tabbedPane = (JTabbedPane)component; int index = tabbedPane.getUI().tabForCoordinate(tabbedPane, mouseEvent.getX(), mouseEvent.getY()); if (index != -1) return tabbedPane.getComponentAt(index); } diff --git a/platform/platform-impl/src/com/intellij/util/ui/table/ComboBoxTableCellEditor.java b/platform/platform-impl/src/com/intellij/util/ui/table/ComboBoxTableCellEditor.java index b781e789c34d..feee43c90ea9 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/table/ComboBoxTableCellEditor.java +++ b/platform/platform-impl/src/com/intellij/util/ui/table/ComboBoxTableCellEditor.java @@ -65,8 +65,7 @@ public class ComboBoxTableCellEditor extends DefaultCellEditor { @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - if (value instanceof ListWithSelection) { - ListWithSelection options = (ListWithSelection)value; + if (value instanceof ListWithSelection options) { comboBox.setModel(new CollectionComboBoxModel(options)); if (options.getSelection() == null) { diff --git a/platform/platform-impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsPanel.java b/platform/platform-impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsPanel.java index 86e0179d3e03..669c922c0a0e 100644 --- a/platform/platform-impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsPanel.java +++ b/platform/platform-impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsPanel.java @@ -131,8 +131,7 @@ public abstract class BreadcrumbsPanel extends JComponent implements Disposable add(BorderLayout.CENTER, pane); EditorGutter gutter = editor.getGutter(); - if (gutter instanceof EditorGutterComponentEx) { - EditorGutterComponentEx gutterComponent = (EditorGutterComponentEx)gutter; + if (gutter instanceof EditorGutterComponentEx gutterComponent) { MouseEventAdapter mouseListener = new MouseEventAdapter<>(gutterComponent) { @NotNull @Override @@ -262,8 +261,7 @@ public abstract class BreadcrumbsPanel extends JComponent implements Disposable protected abstract Iterable computeCrumbs(int offset); protected void navigateToCrumb(Crumb crumb, boolean withSelection) { - if (crumb instanceof NavigatableCrumb) { - NavigatableCrumb navigatableCrumb = (NavigatableCrumb)crumb; + if (crumb instanceof NavigatableCrumb navigatableCrumb) { myUserCaretChange = false; navigatableCrumb.navigate(myEditor, withSelection); } diff --git a/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedProxy.java b/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedProxy.java index c33b8b4c9306..d44f306046c4 100644 --- a/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedProxy.java +++ b/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedProxy.java @@ -124,8 +124,7 @@ public final class AdvancedProxy { } catch (CodeGenerationException e) { final Throwable throwable = e.getCause(); - if (throwable instanceof InvocationTargetException) { - final InvocationTargetException targetException = (InvocationTargetException)throwable; + if (throwable instanceof InvocationTargetException targetException) { final Throwable cause = targetException.getCause(); ExceptionUtil.rethrowUnchecked(cause); } diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLines.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLines.java index 35c02e5bb904..fd6e66d15c22 100644 --- a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLines.java +++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLines.java @@ -31,8 +31,7 @@ public class ChangedLines { @Override public boolean equals(Object obj) { - if (obj instanceof ChangedLines) { - ChangedLines line = (ChangedLines)obj; + if (obj instanceof ChangedLines line) { return from == line.from && to == line.to; } diff --git a/platform/platform-tests/testSrc/com/intellij/ide/settings/ConfigurableExtensionPointUtilTest.java b/platform/platform-tests/testSrc/com/intellij/ide/settings/ConfigurableExtensionPointUtilTest.java index 0ec04ef0d204..ade9edfdec77 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/settings/ConfigurableExtensionPointUtilTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/settings/ConfigurableExtensionPointUtilTest.java @@ -175,12 +175,10 @@ public class ConfigurableExtensionPointUtilTest extends LightPlatformTestCase { } private static void matchNodesDeeply(@NotNull Configurable configurable, @NotNull Node node) { - if (configurable instanceof SearchableConfigurable) { - SearchableConfigurable searchableConfigurable = (SearchableConfigurable) configurable; + if (configurable instanceof SearchableConfigurable searchableConfigurable) { assertEquals(node.getId(), searchableConfigurable.getId()); List children = Collections.emptyList(); - if (configurable instanceof Configurable.Composite) { - Configurable.Composite composite = (Configurable.Composite) configurable; + if (configurable instanceof Configurable.Composite composite) { children = Arrays.asList(composite.getConfigurables()); } assertEquals(node.getChildren().size(), children.size()); @@ -480,8 +478,7 @@ public class ConfigurableExtensionPointUtilTest extends LightPlatformTestCase { private static Node node(Configurable configurable) { SearchableConfigurable sc = (SearchableConfigurable)configurable; - if (configurable instanceof Configurable.Composite) { - Configurable.Composite composite = (Configurable.Composite)configurable; + if (configurable instanceof Configurable.Composite composite) { return node(sc.getId(), Arrays.asList(composite.getConfigurables())); } return node(sc.getId()); @@ -520,8 +517,7 @@ public class ConfigurableExtensionPointUtilTest extends LightPlatformTestCase { @Override public boolean equals(Object object) { - if (object instanceof Node) { - Node node = (Node)object; + if (object instanceof Node node) { if (node.myId == null ? myId == null : node.myId.equals(myId)) { return node.myChildren.equals(myChildren); } diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java index d3ae1a042578..451d1a41ac5e 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java @@ -1003,10 +1003,9 @@ public class FileTypesTest extends HeavyPlatformTestCase { public void testEveryLanguageHasOnePrimaryFileType() { Map map = new HashMap<>(); for (FileType type : myFileTypeManager.getRegisteredFileTypes()) { - if (!(type instanceof LanguageFileType)) { + if (!(type instanceof LanguageFileType languageFileType)) { continue; } - LanguageFileType languageFileType = (LanguageFileType)type; if (!languageFileType.isSecondary()) { String id = languageFileType.getLanguage().getID(); LanguageFileType oldFileType = map.get(id); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSRecordsStorageTestBase.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSRecordsStorageTestBase.java index 36cac2515875..304d56a5b375 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSRecordsStorageTestBase.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSRecordsStorageTestBase.java @@ -359,8 +359,7 @@ public abstract class PersistentFSRecordsStorageTestBase { record.setParent(this.parentRef); record.setNameId(this.nameRef); diff --git a/platform/platform-tests/testSrc/com/intellij/ui/tree/AsyncTreeModelTest.java b/platform/platform-tests/testSrc/com/intellij/ui/tree/AsyncTreeModelTest.java index f0ebba5425d2..7762612f49e1 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/tree/AsyncTreeModelTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/tree/AsyncTreeModelTest.java @@ -527,8 +527,7 @@ public final class AsyncTreeModelTest { } private void runOnModelThread(@NotNull Runnable task) { - if (model instanceof InvokerSupplier) { - InvokerSupplier supplier = (InvokerSupplier)model; + if (model instanceof InvokerSupplier supplier) { supplier.getInvoker().invoke(wrap(task)); } else { @@ -729,8 +728,7 @@ public final class AsyncTreeModelTest { @Override public boolean equals(Object object) { if (!mutable) return super.equals(object); - if (object instanceof Node) { - Node node = (Node)object; + if (object instanceof Node node) { if (node.mutable) return Objects.equals(getUserObject(), node.getUserObject()); } return false; diff --git a/platform/platform-tests/testSrc/com/intellij/ui/tree/TreeTest.java b/platform/platform-tests/testSrc/com/intellij/ui/tree/TreeTest.java index 0e4d3c9e6dfd..1968a9ead624 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/tree/TreeTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/tree/TreeTest.java @@ -58,8 +58,7 @@ public class TreeTest implements Disposable { public void invokeAfterProcessing(@NotNull Runnable runnable) { TreeModel model = tree.getModel(); - if (model instanceof AsyncTreeModel) { - AsyncTreeModel async = (AsyncTreeModel)model; + if (model instanceof AsyncTreeModel async) { if (async.isProcessing()) { invokeLater(() -> invokeAfterProcessing(runnable)); return; // do nothing if delayed diff --git a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java index 7fbf7840d440..3cd29f06e341 100644 --- a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java +++ b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java @@ -268,8 +268,7 @@ public class BoundedScheduledExecutorTest extends CatchLogErrorsInAllThreadsTest } static void checkEveryPossibleSubmitThrows(ExecutorService executor) { - if (executor instanceof ScheduledExecutorService) { - ScheduledExecutorService s = (ScheduledExecutorService)executor; + if (executor instanceof ScheduledExecutorService s) { UsefulTestCase.assertThrows(RejectedExecutionException.class, () -> s.schedule(EmptyRunnable.getInstance(), 10, TimeUnit.SECONDS)); UsefulTestCase.assertThrows(RejectedExecutionException.class, () -> s.schedule(()->null, 10, TimeUnit.SECONDS)); UsefulTestCase.assertThrows(IncorrectOperationException.class, "bad for hibernation", () -> s.scheduleAtFixedRate(()->{}, 10, 1, TimeUnit.SECONDS)); diff --git a/platform/platform-tests/testSrc/com/intellij/util/io/PagedFileStorageLockFreeTest.java b/platform/platform-tests/testSrc/com/intellij/util/io/PagedFileStorageLockFreeTest.java index 5e5f6d32b026..7423e7b0312f 100644 --- a/platform/platform-tests/testSrc/com/intellij/util/io/PagedFileStorageLockFreeTest.java +++ b/platform/platform-tests/testSrc/com/intellij/util/io/PagedFileStorageLockFreeTest.java @@ -409,8 +409,7 @@ public class PagedFileStorageLockFreeTest { } catch (ExecutionException e) { final Throwable cause = e.getCause(); - if (cause instanceof IOException) { - IOException exception = (IOException)cause; + if (cause instanceof IOException exception) { if (exception.getMessage().contains("already closed")) { //ok, executable continue; diff --git a/platform/platform-util-io/src/com/intellij/execution/process/ScriptRunnerUtil.java b/platform/platform-util-io/src/com/intellij/execution/process/ScriptRunnerUtil.java index 5ec3351c46ed..a8b385bbb1ec 100644 --- a/platform/platform-util-io/src/com/intellij/execution/process/ScriptRunnerUtil.java +++ b/platform/platform-util-io/src/com/intellij/execution/process/ScriptRunnerUtil.java @@ -221,8 +221,7 @@ public final class ScriptRunnerUtil { return; } processHandler.destroyProcess(); - if (processHandler instanceof KillableProcess) { - KillableProcess killableProcess = (KillableProcess) processHandler; + if (processHandler instanceof KillableProcess killableProcess) { if (killableProcess.canKillProcess()) { if (!processHandler.waitFor(millisTimeout)) { // doing 'force quite' diff --git a/platform/platform-util-io/src/com/intellij/util/UrlImpl.java b/platform/platform-util-io/src/com/intellij/util/UrlImpl.java index 83a68e3f0cdf..3e3d8fbd10da 100644 --- a/platform/platform-util-io/src/com/intellij/util/UrlImpl.java +++ b/platform/platform-util-io/src/com/intellij/util/UrlImpl.java @@ -147,18 +147,16 @@ public final class UrlImpl implements Url { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof UrlImpl)) return false; + if (!(o instanceof UrlImpl url)) return false; - UrlImpl url = (UrlImpl)o; return StringUtil.equals(scheme, url.scheme) && StringUtil.equals(authority, url.authority) && getPath().equals(url.getPath()) && StringUtil.equals(parameters, url.parameters); } @Override public boolean equalsIgnoreCase(@Nullable Url o) { if (this == o) return true; - if (!(o instanceof UrlImpl)) return false; + if (!(o instanceof UrlImpl url)) return false; - UrlImpl url = (UrlImpl)o; return StringUtil.equalsIgnoreCase(scheme, url.scheme) && StringUtil.equalsIgnoreCase(authority, url.authority) && getPath().equalsIgnoreCase(url.getPath()) && diff --git a/platform/platform-util-netty/src/org/jetbrains/io/Decoder.java b/platform/platform-util-netty/src/org/jetbrains/io/Decoder.java index afdd8a073a87..4b42ebfbe251 100644 --- a/platform/platform-util-netty/src/org/jetbrains/io/Decoder.java +++ b/platform/platform-util-netty/src/org/jetbrains/io/Decoder.java @@ -18,8 +18,7 @@ public abstract class Decoder extends ChannelInboundHandlerAdapter { @Override public final void channelRead(ChannelHandlerContext context, Object message) throws Exception { - if (message instanceof ByteBuf) { - ByteBuf input = (ByteBuf)message; + if (message instanceof ByteBuf input) { try { messageReceived(context, input); } diff --git a/platform/platform-util-netty/src/org/jetbrains/io/PortUnificationServerHandler.java b/platform/platform-util-netty/src/org/jetbrains/io/PortUnificationServerHandler.java index 234293d1e03c..a7f0763fdc2c 100644 --- a/platform/platform-util-netty/src/org/jetbrains/io/PortUnificationServerHandler.java +++ b/platform/platform-util-netty/src/org/jetbrains/io/PortUnificationServerHandler.java @@ -100,8 +100,7 @@ final class PortUnificationServerHandler extends Decoder { pipeline.addLast(new ChannelOutboundHandlerAdapter() { @Override public void write(ChannelHandlerContext context, Object message, ChannelPromise promise) throws Exception { - if (message instanceof HttpResponse) { - HttpResponse response = (HttpResponse)message; + if (message instanceof HttpResponse response) { logger.debug("OUT HTTP: " + response); } super.write(context, message, promise); diff --git a/platform/projectModel-api/src/com/intellij/openapi/module/ModuleUtilCore.java b/platform/projectModel-api/src/com/intellij/openapi/module/ModuleUtilCore.java index 5351e4e3c856..9910d182a6a0 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/module/ModuleUtilCore.java +++ b/platform/projectModel-api/src/com/intellij/openapi/module/ModuleUtilCore.java @@ -174,8 +174,7 @@ public class ModuleUtilCore { for (Module dependentModule : dependentModules) { OrderEntry[] orderEntries = ModuleRootManager.getInstance(dependentModule).getOrderEntries(); for (OrderEntry o : orderEntries) { - if (o instanceof ModuleOrderEntry) { - ModuleOrderEntry orderEntry = (ModuleOrderEntry)o; + if (o instanceof ModuleOrderEntry orderEntry) { if (orderEntry.getModule() == module) { if (orderEntry.isExported()) { collectModulesDependsOn(dependentModule, result); diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java b/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java index e413afad47df..960baa911341 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java @@ -104,8 +104,7 @@ public final class LibraryUtil { } ContainerUtil.addAll(roots, files); } - } else if (includeJdk && entry instanceof JdkOrderEntry) { - JdkOrderEntry jdkEntry = (JdkOrderEntry)entry; + } else if (includeJdk && entry instanceof JdkOrderEntry jdkEntry) { VirtualFile[] files = includeSourceFiles ? jdkEntry.getRootFiles(OrderRootType.SOURCES) : null; if (files == null || files.length == 0) { files = jdkEntry.getRootFiles(OrderRootType.CLASSES); diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java index ec594ae5aaf3..13795e7ab35a 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java @@ -221,8 +221,7 @@ public final class OrderEntryUtil { OrderEntry[] orderEntries = model.getOrderEntries(); List libraries = new ArrayList<>(); for (OrderEntry orderEntry : orderEntries) { - if (orderEntry instanceof LibraryOrderEntry) { - final LibraryOrderEntry entry = (LibraryOrderEntry)orderEntry; + if (orderEntry instanceof LibraryOrderEntry entry) { if (entry.isModuleLevel()) { libraries.add(entry.getLibrary()); } diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java index 1d85fcac56ed..d074649934ef 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java @@ -256,8 +256,7 @@ abstract class OrderEnumeratorBase extends OrderEnumerator implements OrderEnume } boolean exported = !(entry instanceof JdkOrderEntry); - if (entry instanceof ExportableOrderEntry) { - ExportableOrderEntry exportableEntry = (ExportableOrderEntry)entry; + if (entry instanceof ExportableOrderEntry exportableEntry) { if (shouldAdd == OrderEnumerationHandler.AddDependencyType.DEFAULT) { final DependencyScope scope = exportableEntry.getScope(); boolean forTestCompile = scope.isForTestCompile() || @@ -278,8 +277,7 @@ abstract class OrderEnumeratorBase extends OrderEnumerator implements OrderEnume if (myExportedOnly) return ProcessEntryAction.SKIP; if (myRecursivelyExportedOnly && !firstLevel) return ProcessEntryAction.SKIP; } - if (myRecursively && entry instanceof ModuleOrderEntry) { - ModuleOrderEntry moduleOrderEntry = (ModuleOrderEntry)entry; + if (myRecursively && entry instanceof ModuleOrderEntry moduleOrderEntry) { final Module depModule = moduleOrderEntry.getModule(); if (depModule != null && shouldProcessRecursively(customHandlers)) { return ProcessEntryAction.RECURSE(depModule); diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java index 428bac1b1571..44ba939d93ab 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java @@ -76,8 +76,7 @@ class OrderRootsEnumeratorImpl implements OrderRootsEnumerator { collectModuleRoots(type, ((ModuleSourceOrderEntry)orderEntry).getRootModel(), result, true, !myOrderEnumerator.isProductionOnly(), customHandlers); } - else if (orderEntry instanceof ModuleOrderEntry) { - ModuleOrderEntry moduleOrderEntry = (ModuleOrderEntry)orderEntry; + else if (orderEntry instanceof ModuleOrderEntry moduleOrderEntry) { final Module module = moduleOrderEntry.getModule(); if (module != null) { ModuleRootModel rootModel = myOrderEnumerator.getRootModel(module); @@ -116,8 +115,7 @@ class OrderRootsEnumeratorImpl implements OrderRootsEnumerator { boolean includeTests = !myOrderEnumerator.isProductionOnly(); collectModuleRootsUrls(type, ((ModuleSourceOrderEntry)orderEntry).getRootModel(), result, true, includeTests, customHandlers); } - else if (orderEntry instanceof ModuleOrderEntry) { - ModuleOrderEntry moduleOrderEntry = (ModuleOrderEntry)orderEntry; + else if (orderEntry instanceof ModuleOrderEntry moduleOrderEntry) { final Module module = moduleOrderEntry.getModule(); if (module != null) { ModuleRootModel rootModel = myOrderEnumerator.getRootModel(module); diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java index ad54e5e25e57..d09b7e619071 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java @@ -230,8 +230,7 @@ class RootIndex { } for (OrderEntry orderEntry : moduleRootManager.getOrderEntries()) { - if (orderEntry instanceof LibraryOrSdkOrderEntry) { - LibraryOrSdkOrderEntry entry = (LibraryOrSdkOrderEntry)orderEntry; + if (orderEntry instanceof LibraryOrSdkOrderEntry entry) { VirtualFile[] sourceRoots = myRootSupplier.getLibraryRoots(entry, OrderRootType.SOURCES); VirtualFile[] classRoots = myRootSupplier.getLibraryRoots(entry, OrderRootType.CLASSES); @@ -573,8 +572,7 @@ class RootIndex { final ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module); List handlers = OrderEnumeratorBase.getCustomHandlers(module); for (OrderEntry orderEntry : moduleRootManager.getOrderEntries()) { - if (orderEntry instanceof ModuleOrderEntry) { - ModuleOrderEntry moduleOrderEntry = (ModuleOrderEntry)orderEntry; + if (orderEntry instanceof ModuleOrderEntry moduleOrderEntry) { final Module depModule = moduleOrderEntry.getModule(); if (depModule != null) { Node node = graph.myNodes.get(depModule); @@ -726,8 +724,7 @@ class RootIndex { for (final Module module : ModuleManager.getInstance(myProject).getModules()) { final ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module); for (OrderEntry orderEntry : moduleRootManager.getOrderEntries()) { - if (orderEntry instanceof LibraryOrSdkOrderEntry) { - final LibraryOrSdkOrderEntry entry = (LibraryOrSdkOrderEntry)orderEntry; + if (orderEntry instanceof LibraryOrSdkOrderEntry entry) { for (final VirtualFile sourceRoot : myRootSupplier.getLibraryRoots(entry, OrderRootType.SOURCES)) { libSourceRootEntries.putValue(sourceRoot, orderEntry); } diff --git a/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java b/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java index 27a33e1064d9..364b447273c7 100644 --- a/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java +++ b/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java @@ -252,16 +252,13 @@ public class PsiElement2UsageTargetAdapter myPresentableText = presentation == null ? UsageViewUtil.createNodeText(element) : presentation.getPresentableText(); myLocationText = presentation == null ? null : StringUtil.nullize(presentation.getLocationString()); if (myIcon == null) { - if (element instanceof PsiMetaOwner) { - final PsiMetaOwner psiMetaOwner = (PsiMetaOwner)element; + if (element instanceof PsiMetaOwner psiMetaOwner) { final PsiMetaData metaData = psiMetaOwner.getMetaData(); - if (metaData instanceof PsiPresentableMetaData) { - final PsiPresentableMetaData psiPresentableMetaData = (PsiPresentableMetaData)metaData; + if (metaData instanceof PsiPresentableMetaData psiPresentableMetaData) { if (myIcon == null) myIcon = psiPresentableMetaData.getIcon(); } } - else if (element instanceof PsiFile) { - final PsiFile psiFile = (PsiFile)element; + else if (element instanceof PsiFile psiFile) { final VirtualFile virtualFile = psiFile.getVirtualFile(); if (virtualFile != null) { myIcon = VirtualFilePresentation.getIcon(virtualFile); diff --git a/platform/refactoring/src/com/intellij/refactoring/BaseRefactoringProcessor.java b/platform/refactoring/src/com/intellij/refactoring/BaseRefactoringProcessor.java index 48ab5c58871f..6ca4847fcd44 100644 --- a/platform/refactoring/src/com/intellij/refactoring/BaseRefactoringProcessor.java +++ b/platform/refactoring/src/com/intellij/refactoring/BaseRefactoringProcessor.java @@ -361,8 +361,7 @@ public abstract class BaseRefactoringProcessor implements Runnable { Set dynamicUsagesCodeFiles = new HashSet<>(); for (Usage usage : usages) { - if (usage instanceof PsiElementUsage) { - final PsiElementUsage elementUsage = (PsiElementUsage)usage; + if (usage instanceof PsiElementUsage elementUsage) { final PsiElement element = elementUsage.getElement(); if (element == null) continue; final PsiFile containingFile = element.getContainingFile(); diff --git a/platform/refactoring/src/com/intellij/refactoring/rename/RenameUtil.java b/platform/refactoring/src/com/intellij/refactoring/rename/RenameUtil.java index 617b2b699cdc..91135929d013 100644 --- a/platform/refactoring/src/com/intellij/refactoring/rename/RenameUtil.java +++ b/platform/refactoring/src/com/intellij/refactoring/rename/RenameUtil.java @@ -186,8 +186,7 @@ public final class RenameUtil { } private static String getStringToReplace(PsiElement element, String newName, boolean nonJava, final RenamePsiElementProcessorBase theProcessor) { - if (element instanceof PsiMetaOwner) { - final PsiMetaOwner psiMetaOwner = (PsiMetaOwner)element; + if (element instanceof PsiMetaOwner psiMetaOwner) { final PsiMetaData metaData = psiMetaOwner.getMetaData(); if (metaData != null) { return metaData.getName(); @@ -320,8 +319,7 @@ public final class RenameUtil { TextRange replaceRange = TextRange.create(segment); // re-map usages to upper host from injected document to avoid duplicated replacements - while (document instanceof DocumentWindow) { - DocumentWindow documentWindow = (DocumentWindow)document; + while (document instanceof DocumentWindow documentWindow) { replaceRange = documentWindow.injectedToHost(replaceRange); document = documentWindow.getDelegate(); } diff --git a/platform/refactoring/src/com/intellij/refactoring/util/CommonRefactoringUtil.java b/platform/refactoring/src/com/intellij/refactoring/util/CommonRefactoringUtil.java index d488549dfcad..647a7afcf41b 100644 --- a/platform/refactoring/src/com/intellij/refactoring/util/CommonRefactoringUtil.java +++ b/platform/refactoring/src/com/intellij/refactoring/util/CommonRefactoringUtil.java @@ -175,8 +175,7 @@ public final class CommonRefactoringUtil { boolean seenNonWritablePsiFilesWithoutVirtualFile = false; for (PsiElement element : elements) { - if (element instanceof PsiDirectory) { - final PsiDirectory dir = (PsiDirectory)element; + if (element instanceof PsiDirectory dir) { final VirtualFile vFile = dir.getVirtualFile(); if (vFile.getFileSystem().isReadOnly()) { failed.add(vFile); diff --git a/platform/remote-core/src/remote/RemoteConnectionCredentialsWrapper.java b/platform/remote-core/src/remote/RemoteConnectionCredentialsWrapper.java index 2f94752ee26b..782745214b20 100644 --- a/platform/remote-core/src/remote/RemoteConnectionCredentialsWrapper.java +++ b/platform/remote-core/src/remote/RemoteConnectionCredentialsWrapper.java @@ -92,8 +92,7 @@ public class RemoteConnectionCredentialsWrapper { @Override public boolean equals(Object obj) { - if (obj instanceof RemoteConnectionCredentialsWrapper) { - RemoteConnectionCredentialsWrapper w = (RemoteConnectionCredentialsWrapper)obj; + if (obj instanceof RemoteConnectionCredentialsWrapper w) { try { Object credentials = getCredentials(); Object counterCredentials = w.getCredentials(); diff --git a/platform/remote-core/src/remote/ext/CredentialsManager.java b/platform/remote-core/src/remote/ext/CredentialsManager.java index c833271740a5..54ee44980b02 100644 --- a/platform/remote-core/src/remote/ext/CredentialsManager.java +++ b/platform/remote-core/src/remote/ext/CredentialsManager.java @@ -44,8 +44,7 @@ public abstract class CredentialsManager { } private static void recogniseCredentialType(@Nullable SdkAdditionalData additionalData, @NotNull CredentialsType credentialsType) { - if (!(additionalData instanceof RemoteSdkAdditionalData)) return; - RemoteSdkAdditionalData data = (RemoteSdkAdditionalData)additionalData; + if (!(additionalData instanceof RemoteSdkAdditionalData data)) return; if (data.getRemoteConnectionType() != CredentialsType.UNKNOWN) return; String credentialsId = data.connectionCredentials().getId(); @@ -71,8 +70,7 @@ public abstract class CredentialsManager { } private static void forgetCredentialType(@Nullable SdkAdditionalData additionalData, @NotNull CredentialsType credentialsType) { - if (!(additionalData instanceof RemoteSdkAdditionalData)) return; - RemoteSdkAdditionalData data = (RemoteSdkAdditionalData)additionalData; + if (!(additionalData instanceof RemoteSdkAdditionalData data)) return; if (data.getRemoteConnectionType() != credentialsType) return; Element root = new Element("root"); data.connectionCredentials().save(root); diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/DeployToServerRunConfigurationExtensionsManager.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/DeployToServerRunConfigurationExtensionsManager.java index 1c29dd72ec17..f9767447a99e 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/DeployToServerRunConfigurationExtensionsManager.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/DeployToServerRunConfigurationExtensionsManager.java @@ -20,8 +20,7 @@ public class DeployToServerRunConfigurationExtensionsManager public void patchDeploymentTask(@NotNull DeploymentTask deploymentTask) { RunProfile runProfile = deploymentTask.getExecutionEnvironment().getRunProfile(); - if (runProfile instanceof DeployToServerRunConfiguration) { - DeployToServerRunConfiguration runConfiguration = (DeployToServerRunConfiguration)runProfile; + if (runProfile instanceof DeployToServerRunConfiguration runConfiguration) { processApplicableExtensions(runConfiguration, next -> { next.patchDeploymentTask(runConfiguration, deploymentTask); return null; diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java index 4eec0f839175..a477f71dce9b 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java @@ -205,8 +205,7 @@ public final class ServersTreeStructure { if (selectedRunConfigOrSourceType instanceof RunnerAndConfigurationSettings) { ProgramRunnerUtil.executeConfiguration((RunnerAndConfigurationSettings)selectedRunConfigOrSourceType, executor); } - else if (selectedRunConfigOrSourceType instanceof SingletonDeploymentSourceType) { - SingletonDeploymentSourceType sourceType = (SingletonDeploymentSourceType)selectedRunConfigOrSourceType; + else if (selectedRunConfigOrSourceType instanceof SingletonDeploymentSourceType sourceType) { configurationManager.createAndRunConfiguration(serverType, RemoteServerNode.this.getValue(), sourceType); } else { diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestTreeRenderer.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestTreeRenderer.java index e6a786d69f31..436c4389bf6f 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestTreeRenderer.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestTreeRenderer.java @@ -45,12 +45,10 @@ public class TestTreeRenderer extends ColoredTreeCellRenderer { myDurationOffset = 0; final DefaultMutableTreeNode node = (DefaultMutableTreeNode) value; final Object userObj = node.getUserObject(); - if (userObj instanceof SMTRunnerNodeDescriptor) { - final SMTRunnerNodeDescriptor desc = (SMTRunnerNodeDescriptor)userObj; + if (userObj instanceof SMTRunnerNodeDescriptor desc) { final SMTestProxy testProxy = desc.getElement(); - if (testProxy instanceof SMTestProxy.SMRootTestProxy) { - SMTestProxy.SMRootTestProxy rootTestProxy = (SMTestProxy.SMRootTestProxy) testProxy; + if (testProxy instanceof SMTestProxy.SMRootTestProxy rootTestProxy) { if (rootTestProxy.isLeaf()) { TestsPresentationUtil.formatRootNodeWithoutChildren(rootTestProxy, this); } else { diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/request/StatsRequestBuilder.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/request/StatsRequestBuilder.java index bb10c1a94b5c..991ebe0deea8 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/request/StatsRequestBuilder.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/request/StatsRequestBuilder.java @@ -140,8 +140,7 @@ public class StatsRequestBuilder { Proxy proxy = info.getProxy(); if (proxy.type() == Proxy.Type.HTTP || proxy.type() == Proxy.Type.SOCKS) { SocketAddress proxyAddress = proxy.address(); - if (proxyAddress instanceof InetSocketAddress) { - InetSocketAddress address = (InetSocketAddress)proxyAddress; + if (proxyAddress instanceof InetSocketAddress address) { String hostName = address.getHostString(); int port = address.getPort(); builder.proxy(ProxySelector.of(new InetSocketAddress(hostName, port))); diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventSerializer.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventSerializer.java index 05e1d864fec3..ab8778c418a7 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventSerializer.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventSerializer.java @@ -20,22 +20,19 @@ public final class ExternalSystemEventSerializer { @NotNull public static String serialize(@NotNull ExternalSystemEvent event) { String prefix = event.getTimestamp() + " " + event.getEventType().name() + " " + event.getRecorderId(); - if (event instanceof ExternalUploadFinishedEvent) { - ExternalUploadFinishedEvent failed = (ExternalUploadFinishedEvent)event; + if (event instanceof ExternalUploadFinishedEvent failed) { if (isNotEmpty(failed.getError())) { return prefix + " " + escape(failed.getError()); } return prefix; } - else if (event instanceof ExternalUploadSendEvent) { - ExternalUploadSendEvent finished = (ExternalUploadSendEvent)event; + else if (event instanceof ExternalUploadSendEvent finished) { String hashedFiles = filesToString(finished.getSuccessfullySentFiles()); String errors = errorsToString(finished.getErrors()); return prefix + " " + finished.getSucceed() + " " + finished.getFailed() + " " + finished.getTotal() + " " + hashedFiles + " " + errors; } - else if (event instanceof ExternalSystemErrorEvent) { - ExternalSystemErrorEvent error = (ExternalSystemErrorEvent)event; + else if (event instanceof ExternalSystemErrorEvent error) { return prefix + " " + escape(error.getEvent()) + " " + escape(error.getErrorClass()); } return prefix; diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java b/platform/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java index 1780b761ae31..b5dd90325caf 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java @@ -255,9 +255,7 @@ public class MatchOptions implements JDOMExternalizable { public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof MatchOptions)) return false; - - final MatchOptions matchOptions = (MatchOptions)o; + if (!(o instanceof MatchOptions matchOptions)) return false; if (caseSensitiveMatch != matchOptions.caseSensitiveMatch) return false; if (looseMatching != matchOptions.looseMatching) return false; diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/MatchVariableConstraint.java b/platform/structuralsearch/source/com/intellij/structuralsearch/MatchVariableConstraint.java index 8b6c2da3f71d..858c43fe186e 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/MatchVariableConstraint.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/MatchVariableConstraint.java @@ -411,11 +411,9 @@ public class MatchVariableConstraint extends NamedScriptableDefinition { public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof MatchVariableConstraint)) return false; + if (!(o instanceof MatchVariableConstraint other)) return false; if (!super.equals(o)) return false; - final MatchVariableConstraint other = (MatchVariableConstraint)o; - if (exprTypeWithinHierarchy != other.exprTypeWithinHierarchy) return false; if (formalArgTypeWithinHierarchy != other.formalArgTypeWithinHierarchy) return false; if (greedy != other.greedy) return false; diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/NamedScriptableDefinition.java b/platform/structuralsearch/source/com/intellij/structuralsearch/NamedScriptableDefinition.java index bc4e1c06b755..dfae9f57e052 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/NamedScriptableDefinition.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/NamedScriptableDefinition.java @@ -64,9 +64,8 @@ public abstract class NamedScriptableDefinition implements JDOMExternalizable { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof NamedScriptableDefinition)) return false; + if (!(o instanceof NamedScriptableDefinition that)) return false; - final NamedScriptableDefinition that = (NamedScriptableDefinition)o; return name.equals(that.name) && scriptCodeConstraint.equals(that.scriptCodeConstraint); } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/Scopes.java b/platform/structuralsearch/source/com/intellij/structuralsearch/Scopes.java index 49a373c11da9..718f292a5700 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/Scopes.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/Scopes.java @@ -47,8 +47,7 @@ public final class Scopes { else if (scope instanceof ModuleWithDependenciesScope) { return ((ModuleWithDependenciesScope)scope).getModule().getName(); } - else if (scope instanceof GlobalSearchScopesCore.DirectoryScope) { - final GlobalSearchScopesCore.DirectoryScope directoryScope = (GlobalSearchScopesCore.DirectoryScope)scope; + else if (scope instanceof GlobalSearchScopesCore.DirectoryScope directoryScope) { final String url = directoryScope.getDirectory().getPresentableUrl(); return directoryScope.isWithSubdirectories() ? "*" + url : url; } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/XmlMatchUtil.java b/platform/structuralsearch/source/com/intellij/structuralsearch/XmlMatchUtil.java index 3248cd131308..f48eb9fa272c 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/XmlMatchUtil.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/XmlMatchUtil.java @@ -44,18 +44,16 @@ public final class XmlMatchUtil { public static PsiElement getElementToMatch(XmlAttributeValue attributeValue) { final PsiElement child = attributeValue.getFirstChild(); - if (!(child instanceof XmlToken)) { + if (!(child instanceof XmlToken token)) { return null; } - final XmlToken token = (XmlToken)child; if (token.getTokenType() != XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER) { return null; } final PsiElement sibling = child.getNextSibling(); - if (!(sibling instanceof XmlToken)) { + if (!(sibling instanceof XmlToken secondToken)) { return sibling; } - final XmlToken secondToken = (XmlToken)sibling; return (secondToken.getTokenType() == XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER) ? null : secondToken; } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlMatchingVisitor.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlMatchingVisitor.java index 24a62beb63d7..62d01382f9b5 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlMatchingVisitor.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/XmlMatchingVisitor.java @@ -110,8 +110,7 @@ public class XmlMatchingVisitor extends XmlElementVisitor { public void visitXmlComment(@NotNull XmlComment comment) { super.visitXmlComment(comment); final PsiElement element = myMatchingVisitor.getElement(); - if (!(element instanceof XmlComment)) return; - final XmlComment other = (XmlComment)element; + if (!(element instanceof XmlComment other)) return; final XmlToken text = XmlUtil.getTokenOfType(comment, XmlTokenType.XML_COMMENT_CHARACTERS); assert text != null; final CompiledPattern pattern = myMatchingVisitor.getMatchContext().getPattern(); diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SubstitutionHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SubstitutionHandler.java index ebd217744b41..ee3af4cb2186 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SubstitutionHandler.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SubstitutionHandler.java @@ -102,8 +102,7 @@ public class SubstitutionHandler extends MatchingHandler { private static @Nullable T findPredicate(@Nullable MatchPredicate start, @NotNull Class aClass) { if (start == null) return null; if (aClass.isInstance(start)) return aClass.cast(start); - if (start instanceof AndPredicate) { - final AndPredicate binaryPredicate = (AndPredicate)start; + if (start instanceof AndPredicate binaryPredicate) { final T firstBranchCheck = findPredicate(binaryPredicate.getFirst(), aClass); if (firstBranchCheck != null) return firstBranchCheck; return findPredicate(binaryPredicate.getSecond(), aClass); diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java index fdf0f392a979..c00ea1e1e30b 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java @@ -120,8 +120,7 @@ public class ScriptSupport { final ErrorCollector errorCollector = e.getErrorCollector(); final List errors = errorCollector.getErrors(); for (Message error : errors) { - if (error instanceof SyntaxErrorMessage) { - final SyntaxErrorMessage syntaxError = (SyntaxErrorMessage)error; + if (error instanceof SyntaxErrorMessage syntaxError) { final SyntaxException cause = syntaxError.getCause(); throw new MalformedPatternException(cause.getLocalizedMessage()); } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplaceOptions.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplaceOptions.java index a25220b6fb0e..1f464eefd09c 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplaceOptions.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ReplaceOptions.java @@ -160,9 +160,7 @@ public class ReplaceOptions implements JDOMExternalizable { public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ReplaceOptions)) return false; - - final ReplaceOptions replaceOptions = (ReplaceOptions)o; + if (!(o instanceof ReplaceOptions replaceOptions)) return false; if (myToReformatAccordingToStyle != replaceOptions.myToReformatAccordingToStyle) return false; if (toShortenFQN != replaceOptions.toShortenFQN) return false; diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java index 3e69c49a0274..1934a47440aa 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java @@ -249,8 +249,7 @@ public abstract class Configuration implements JDOMExternalizable { public abstract void removeUnusedVariables(); public boolean equals(Object configuration) { - if (!(configuration instanceof Configuration)) return false; - final Configuration other = (Configuration)configuration; + if (!(configuration instanceof Configuration other)) return false; return Objects.equals(category, other.category) && name.equals(other.name); } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ExistingTemplatesComponent.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ExistingTemplatesComponent.java index 1a658da4630f..a9d3e2d9e9a3 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ExistingTemplatesComponent.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ExistingTemplatesComponent.java @@ -208,14 +208,12 @@ public final class ExistingTemplatesComponent { private void removeTemplate(Project project) { final Object selection = patternTree.getLastSelectedPathComponent(); - if (!(selection instanceof DefaultMutableTreeNode)) { + if (!(selection instanceof DefaultMutableTreeNode node)) { return; } - final DefaultMutableTreeNode node = (DefaultMutableTreeNode)selection; - if (!(node.getUserObject() instanceof Configuration)) { + if (!(node.getUserObject() instanceof Configuration configuration)) { return; } - final Configuration configuration = (Configuration)node.getUserObject(); if (configuration.isPredefined()) { return; } @@ -319,10 +317,9 @@ public final class ExistingTemplatesComponent { @Override protected Transferable createTransferable(JComponent c) { final Object selection = tree.getLastSelectedPathComponent(); - if (!(selection instanceof DefaultMutableTreeNode)) { + if (!(selection instanceof DefaultMutableTreeNode node)) { return null; } - final DefaultMutableTreeNode node = (DefaultMutableTreeNode)selection; if (!(node.getUserObject() instanceof Configuration)) { return null; } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/FileTypeInfo.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/FileTypeInfo.java index b55c425a2383..ee5ff03f2866 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/FileTypeInfo.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/FileTypeInfo.java @@ -68,8 +68,7 @@ class FileTypeInfo { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof FileTypeInfo)) return false; - final FileTypeInfo info = (FileTypeInfo)o; + if (!(o instanceof FileTypeInfo info)) return false; return myFileType == info.myFileType && myDialect == info.myDialect && myContext == info.myContext; diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ScopePanel.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ScopePanel.java index ce0ecbca36c2..d463412716f4 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ScopePanel.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ScopePanel.java @@ -138,12 +138,10 @@ public class ScopePanel extends JPanel { final Scopes.Type scopeType = Scopes.getType(selectedScope); myUpdating = true; try { - if (selectedScope instanceof ModuleWithDependenciesScope) { - final ModuleWithDependenciesScope scope = (ModuleWithDependenciesScope)selectedScope; + if (selectedScope instanceof ModuleWithDependenciesScope scope) { myModulesComboBox.setItem(scope.getModule()); } - else if (selectedScope instanceof GlobalSearchScopesCore.DirectoryScope) { - final GlobalSearchScopesCore.DirectoryScope directoryScope = (GlobalSearchScopesCore.DirectoryScope)selectedScope; + else if (selectedScope instanceof GlobalSearchScopesCore.DirectoryScope directoryScope) { myDirectoryComboBox.setDirectory(directoryScope.getDirectory()); myDirectoryComboBox.setRecursive(directoryScope.isWithSubdirectories()); } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java index b8385ef44ffe..023a01fd67ed 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java @@ -744,8 +744,7 @@ public final class StructuralSearchDialog extends DialogWrapper implements Docum if (myEditConfigOnly) return; final SearchScope scope = myScopePanel.getScope(); - if (scope instanceof GlobalSearchScopesCore.DirectoryScope) { - final GlobalSearchScopesCore.DirectoryScope directoryScope = (GlobalSearchScopesCore.DirectoryScope)scope; + if (scope instanceof GlobalSearchScopesCore.DirectoryScope directoryScope) { FindInProjectSettings.getInstance(myProject).addDirectory(directoryScope.getDirectory().getPresentableUrl()); } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchUsageTarget.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchUsageTarget.java index a679afe5e1f2..996bd9583998 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchUsageTarget.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchUsageTarget.java @@ -97,8 +97,7 @@ class StructuralSearchUsageTarget implements ConfigurableUsageTarget, ItemPresen assert scope != null; final String scopeString = scope.getDisplayName(); final String result; - if (myConfiguration instanceof ReplaceConfiguration) { - final ReplaceConfiguration replaceConfiguration = (ReplaceConfiguration)myConfiguration; + if (myConfiguration instanceof ReplaceConfiguration replaceConfiguration) { final String replacement = replaceConfiguration.getReplaceOptions().getReplacement(); result = SSRBundle.message("replace.occurrences.of.0.with.1.in.2", pattern, replacement, scopeString); } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/CountFilter.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/CountFilter.java index e478e2a6aa32..247f3fa63fd5 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/CountFilter.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/CountFilter.java @@ -29,10 +29,9 @@ public class CountFilter extends FilterAction { @Override public @NotNull String getShortText(NamedScriptableDefinition variable) { - if (!(variable instanceof MatchVariableConstraint)) { + if (!(variable instanceof MatchVariableConstraint constraint)) { return ""; } - final MatchVariableConstraint constraint = (MatchVariableConstraint)variable; final int minCount = constraint.getMinCount(); final int maxCount = constraint.getMaxCount(); if (minCount == 1 && maxCount == 1) { diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/ReferenceFilter.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/ReferenceFilter.java index c475bae73791..5c50a932061d 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/ReferenceFilter.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/ReferenceFilter.java @@ -33,10 +33,9 @@ public class ReferenceFilter extends FilterAction { @Override public @NotNull String getShortText(NamedScriptableDefinition variable) { - if (!(variable instanceof MatchVariableConstraint)) { + if (!(variable instanceof MatchVariableConstraint constraint)) { return ""; } - final MatchVariableConstraint constraint = (MatchVariableConstraint)variable; if (StringUtil.isEmpty(constraint.getReferenceConstraint())) { return ""; } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/TextFilter.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/TextFilter.java index e8239a7fa8c5..ec1db6dc2c21 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/TextFilter.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/TextFilter.java @@ -30,10 +30,9 @@ public class TextFilter extends FilterAction { @Override public @NotNull String getShortText(NamedScriptableDefinition variable) { - if (!(variable instanceof MatchVariableConstraint)) { + if (!(variable instanceof MatchVariableConstraint constraint)) { return ""; } - final MatchVariableConstraint constraint = (MatchVariableConstraint)variable; final String text = constraint.getRegExp(); if (text.isEmpty()) { return constraint.isWithinHierarchy() ? SSRBundle.message("hierarchy.tooltip.message") : ""; diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/TypeFilter.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/TypeFilter.java index a4830a1ebea0..ba3b0e7449e5 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/TypeFilter.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/filters/TypeFilter.java @@ -34,10 +34,9 @@ public class TypeFilter extends FilterAction { @Override public @NotNull String getShortText(NamedScriptableDefinition variable) { - if (!(variable instanceof MatchVariableConstraint)) { + if (!(variable instanceof MatchVariableConstraint constraint)) { return ""; } - final MatchVariableConstraint constraint = (MatchVariableConstraint)variable; if (constraint.getNameOfExprType().isEmpty()) { return ""; } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/util/SmartPsiPointer.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/util/SmartPsiPointer.java index 047fcaf47b6e..c51751ee3d02 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/util/SmartPsiPointer.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/util/SmartPsiPointer.java @@ -39,10 +39,9 @@ public class SmartPsiPointer { } public boolean equals(Object o) { - if (!(o instanceof SmartPsiPointer)) { + if (!(o instanceof SmartPsiPointer ref)) { return false; } - final SmartPsiPointer ref = (SmartPsiPointer)o; return ref.pointer.equals(pointer); } diff --git a/platform/tasks-platform-api/src/com/intellij/tasks/ChangeListInfo.java b/platform/tasks-platform-api/src/com/intellij/tasks/ChangeListInfo.java index 6f502a05ec06..50123f7d6acc 100644 --- a/platform/tasks-platform-api/src/com/intellij/tasks/ChangeListInfo.java +++ b/platform/tasks-platform-api/src/com/intellij/tasks/ChangeListInfo.java @@ -37,9 +37,7 @@ public class ChangeListInfo { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ChangeListInfo)) return false; - - ChangeListInfo that = (ChangeListInfo)o; + if (!(o instanceof ChangeListInfo that)) return false; return Objects.equals(id, that.id); } diff --git a/platform/tasks-platform-api/src/com/intellij/tasks/CustomTaskState.java b/platform/tasks-platform-api/src/com/intellij/tasks/CustomTaskState.java index 7954b08dbcef..2eab73e75a9e 100644 --- a/platform/tasks-platform-api/src/com/intellij/tasks/CustomTaskState.java +++ b/platform/tasks-platform-api/src/com/intellij/tasks/CustomTaskState.java @@ -61,9 +61,7 @@ public class CustomTaskState { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof CustomTaskState)) return false; - - final CustomTaskState state = (CustomTaskState)o; + if (!(o instanceof CustomTaskState state)) return false; return myId.equals(state.myId); } diff --git a/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepository.java b/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepository.java index b2b1eaa6a155..9fadd7da22b8 100644 --- a/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepository.java +++ b/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepository.java @@ -276,9 +276,8 @@ public abstract class TaskRepository { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof TaskRepository)) return false; + if (!(o instanceof TaskRepository that)) return false; - TaskRepository that = (TaskRepository)o; if (!Comparing.equal(myType, that.myType)) return false; if (isShared() != that.isShared()) return false; if (getUrl() != null ? !getUrl().equals(that.getUrl()) : that.getUrl() != null) return false; diff --git a/platform/testFramework/src/com/intellij/mock/MockPsiElement.java b/platform/testFramework/src/com/intellij/mock/MockPsiElement.java index 751e5443c425..b21e06b926c8 100644 --- a/platform/testFramework/src/com/intellij/mock/MockPsiElement.java +++ b/platform/testFramework/src/com/intellij/mock/MockPsiElement.java @@ -312,8 +312,7 @@ public class MockPsiElement extends UserDataHolderBase implements PsiElement, Na @Nullable protected T findDeclaration(String name, Class aClass) { for (final PsiElement declaration : myDeclarations) { - if (declaration instanceof PsiNamedElement) { - final PsiNamedElement psiNamedElement = (PsiNamedElement)declaration; + if (declaration instanceof PsiNamedElement psiNamedElement) { if (name.equals(psiNamedElement.getName()) && aClass.isInstance(psiNamedElement)) { return (T)psiNamedElement; } diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java index fe13b961ad77..899f354de788 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java @@ -317,8 +317,7 @@ public final class PlatformTestUtil { private static boolean isBusy(@NotNull JTree tree, TreeModel model) { UIUtil.dispatchAllInvocationEvents(); - if (model instanceof AsyncTreeModel) { - AsyncTreeModel async = (AsyncTreeModel)model; + if (model instanceof AsyncTreeModel async) { if (async.isProcessing()) return true; UIUtil.dispatchAllInvocationEvents(); return async.isProcessing(); diff --git a/platform/testFramework/src/com/intellij/testFramework/TestIndexingModeSupporter.java b/platform/testFramework/src/com/intellij/testFramework/TestIndexingModeSupporter.java index 9d17c2aa5450..7fae93cec85f 100644 --- a/platform/testFramework/src/com/intellij/testFramework/TestIndexingModeSupporter.java +++ b/platform/testFramework/src/com/intellij/testFramework/TestIndexingModeSupporter.java @@ -114,8 +114,7 @@ public interface TestIndexingModeSupporter { if (handler.shouldIgnore(declaredMethod)) continue; TestIndexingModeSupporter aCase = constructor.newInstance(); aCase.setIndexingMode(handler.getIndexingMode()); - if (aCase instanceof TestCase) { - TestCase testCase = (TestCase)aCase; + if (aCase instanceof TestCase testCase) { testCase.setName(methodName); if (UsefulTestCase.IS_UNDER_TEAMCITY) { Test wrapper = IndexingModeTestHandler.wrapForTeamCity(testCase, handler.getIndexingMode()); diff --git a/platform/testFramework/src/com/intellij/testFramework/propertyBased/RandomActivityInterceptor.java b/platform/testFramework/src/com/intellij/testFramework/propertyBased/RandomActivityInterceptor.java index f609db3c1b76..7d6c22a7db2c 100644 --- a/platform/testFramework/src/com/intellij/testFramework/propertyBased/RandomActivityInterceptor.java +++ b/platform/testFramework/src/com/intellij/testFramework/propertyBased/RandomActivityInterceptor.java @@ -42,8 +42,7 @@ public class RandomActivityInterceptor extends UiInterceptors.UiInterceptor nodes) { TreeNode parent = node.getParent(); - if (parent == myRoot || !(parent instanceof GroupNode)) return; - GroupNode parentNode = (GroupNode)parent; + if (parent == myRoot || !(parent instanceof GroupNode parentNode)) return; List otherNodes; synchronized (parentNode) { otherNodes = ContainerUtil.filter(parentNode.getChildren(), n -> n.isExcluded() != almostAllChildrenExcluded); @@ -832,8 +831,7 @@ public class UsageViewImpl implements UsageViewEx { TreePath path = event.getPath(); Object component = path.getLastPathComponent(); - if (component instanceof Node) { - Node node = (Node)component; + if (component instanceof Node node) { if (!myExpandingCollapsing && node.needsUpdate()) { List toUpdate = new ArrayList<>(); checkNodeValidity(node, path, toUpdate); @@ -851,8 +849,7 @@ public class UsageViewImpl implements UsageViewEx { TreeUIHelper.getInstance().installTreeSpeedSearch(myTree, o -> { Object value = o.getLastPathComponent(); TreeCellRenderer renderer = myTree.getCellRenderer(); - if (renderer instanceof UsageViewTreeCellRenderer) { - UsageViewTreeCellRenderer coloredRenderer = (UsageViewTreeCellRenderer)renderer; + if (renderer instanceof UsageViewTreeCellRenderer coloredRenderer) { return coloredRenderer.getPlainTextForNode(value); } return value == null ? null : value.toString(); @@ -1817,14 +1814,12 @@ public class UsageViewImpl implements UsageViewEx { Set usages = getReadOnlyUsages(); Set result = new HashSet<>(); for (Usage usage : usages) { - if (usage instanceof UsageInFile) { - UsageInFile usageInFile = (UsageInFile)usage; + if (usage instanceof UsageInFile usageInFile) { VirtualFile file = usageInFile.getFile(); if (file != null && file.isValid()) result.add(file); } - if (usage instanceof UsageInFiles) { - UsageInFiles usageInFiles = (UsageInFiles)usage; + if (usage instanceof UsageInFiles usageInFiles) { ContainerUtil.addAll(result, usageInFiles.getFiles()); } } @@ -1903,8 +1898,7 @@ public class UsageViewImpl implements UsageViewEx { @Nullable private Navigatable getNavigatableForNode(@NotNull DefaultMutableTreeNode node, boolean allowRequestFocus) { Object userObject = node.getUserObject(); - if (userObject instanceof Navigatable) { - Navigatable navigatable = (Navigatable)userObject; + if (userObject instanceof Navigatable navigatable) { return navigatable.canNavigate() ? new Navigatable() { @Override public void navigate(boolean requestFocus) { @@ -2146,8 +2140,7 @@ public class UsageViewImpl implements UsageViewEx { boolean globallyEnabled = !isSearchInProgress() && !DumbService.isDumb(myProject); for (int i = 0; i < getComponentCount(); ++i) { Component component = getComponent(i); - if (component instanceof JButton) { - JButton button = (JButton)component; + if (component instanceof JButton button) { Action action = button.getAction(); if (action != null) { if (myNeedUpdateButtons) { diff --git a/platform/usageView-impl/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java b/platform/usageView-impl/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java index 218f5f448471..773ddc2f4666 100644 --- a/platform/usageView-impl/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java +++ b/platform/usageView-impl/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java @@ -67,8 +67,7 @@ final class UsageViewTreeCellRenderer extends ColoredTreeCellRenderer { } myCalculated = false; - if (value instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode)value; + if (value instanceof DefaultMutableTreeNode treeNode) { Object userObject = treeNode.getUserObject(); Rectangle visibleRect = ((JViewport)tree.getParent()).getViewRect(); @@ -90,7 +89,7 @@ final class UsageViewTreeCellRenderer extends ColoredTreeCellRenderer { if (myCalculated) return; myCalculated = true; - if (userObject instanceof UsageTarget) { + if (userObject instanceof UsageTarget usageTarget) { LOG.assertTrue(treeNode instanceof Node); if (!((Node)treeNode).isValid()) { if (!getCharSequence(false).toString().contains(UsageViewBundle.message("node.invalid"))) { @@ -99,7 +98,6 @@ final class UsageViewTreeCellRenderer extends ColoredTreeCellRenderer { return; } - UsageTarget usageTarget = (UsageTarget)userObject; final ItemPresentation presentation = usageTarget.getPresentation(); LOG.assertTrue(presentation != null); if (showAsReadOnly) { @@ -192,12 +190,10 @@ final class UsageViewTreeCellRenderer extends ColoredTreeCellRenderer { } } - if (value instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode)value; + if (value instanceof DefaultMutableTreeNode treeNode) { Object userObject = treeNode.getUserObject(); - if (userObject instanceof UsageTarget) { - UsageTarget usageTarget = (UsageTarget)userObject; + if (userObject instanceof UsageTarget usageTarget) { if (usageTarget.isValid()) { final ItemPresentation presentation = usageTarget.getPresentation(); LOG.assertTrue(presentation != null); @@ -294,10 +290,8 @@ final class UsageViewTreeCellRenderer extends ColoredTreeCellRenderer { } static @NlsContexts.Tooltip String getTooltipFromPresentation(final Object value) { - if (value instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode)value; - if (treeNode instanceof UsageNode) { - UsageNode node = (UsageNode)treeNode; + if (value instanceof DefaultMutableTreeNode treeNode) { + if (treeNode instanceof UsageNode node) { return node.getUsage().getPresentation().getTooltipText(); } } diff --git a/platform/usageView-impl/src/com/intellij/usages/impl/rules/DirectoryGroupingRule.java b/platform/usageView-impl/src/com/intellij/usages/impl/rules/DirectoryGroupingRule.java index c66e6b3c2640..e15ae8d49f00 100644 --- a/platform/usageView-impl/src/com/intellij/usages/impl/rules/DirectoryGroupingRule.java +++ b/platform/usageView-impl/src/com/intellij/usages/impl/rules/DirectoryGroupingRule.java @@ -61,8 +61,7 @@ public class DirectoryGroupingRule extends SingleParentUsageGroupingRule impleme @Nullable @Override protected UsageGroup getParentGroupFor(@NotNull Usage usage, UsageTarget @NotNull [] targets) { - if (usage instanceof UsageInFile) { - UsageInFile usageInFile = (UsageInFile)usage; + if (usage instanceof UsageInFile usageInFile) { VirtualFile file = usageInFile.getFile(); if (file != null) { if (file instanceof VirtualFileWindow) { diff --git a/platform/usageView-impl/src/com/intellij/usages/impl/rules/DirectoryStructureGroupingRule.java b/platform/usageView-impl/src/com/intellij/usages/impl/rules/DirectoryStructureGroupingRule.java index 91d2a03de294..a08bec276a07 100644 --- a/platform/usageView-impl/src/com/intellij/usages/impl/rules/DirectoryStructureGroupingRule.java +++ b/platform/usageView-impl/src/com/intellij/usages/impl/rules/DirectoryStructureGroupingRule.java @@ -31,11 +31,10 @@ class DirectoryStructureGroupingRule implements DumbAware, UsageGroupingRuleEx { @Override public @NotNull List getParentGroupsFor(@NotNull Usage usage, UsageTarget @NotNull [] targets) { - if (!(usage instanceof UsageInFile)) { + if (!(usage instanceof UsageInFile usageInFile)) { return Collections.emptyList(); } List result = new ArrayList<>(); - UsageInFile usageInFile = (UsageInFile)usage; VirtualFile file = usageInFile.getFile(); if (file == null) { return Collections.emptyList(); diff --git a/platform/usageView-impl/src/com/intellij/usages/impl/rules/FileGroupingRule.java b/platform/usageView-impl/src/com/intellij/usages/impl/rules/FileGroupingRule.java index 9911af39d061..62dbdf173e2a 100644 --- a/platform/usageView-impl/src/com/intellij/usages/impl/rules/FileGroupingRule.java +++ b/platform/usageView-impl/src/com/intellij/usages/impl/rules/FileGroupingRule.java @@ -87,9 +87,7 @@ public class FileGroupingRule extends SingleParentUsageGroupingRule implements D public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof FileUsageGroup)) return false; - - final FileUsageGroup fileUsageGroup = (FileUsageGroup)o; + if (!(o instanceof FileUsageGroup fileUsageGroup)) return false; return myFile.equals(fileUsageGroup.myFile); } diff --git a/platform/usageView-impl/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java b/platform/usageView-impl/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java index 4dddba24effc..c70454d246df 100644 --- a/platform/usageView-impl/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java +++ b/platform/usageView-impl/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java @@ -40,8 +40,7 @@ class ModuleGroupingRule implements UsageGroupingRuleEx, DumbAware { @NotNull @Override public List getParentGroupsFor(@NotNull Usage usage, UsageTarget @NotNull [] targets) { - if (usage instanceof UsageInModule) { - UsageInModule usageInModule = (UsageInModule)usage; + if (usage instanceof UsageInModule usageInModule) { Module module = usageInModule.getModule(); if (module != null) { if (myFlattenModules) { @@ -59,8 +58,7 @@ class ModuleGroupingRule implements UsageGroupingRuleEx, DumbAware { } } - if (usage instanceof UsageInLibrary) { - UsageInLibrary usageInLibrary = (UsageInLibrary)usage; + if (usage instanceof UsageInLibrary usageInLibrary) { OrderEntry entry = usageInLibrary.getLibraryEntry(); if (entry != null) return Collections.singletonList(new LibraryUsageGroup(entry)); @@ -155,9 +153,7 @@ class ModuleGroupingRule implements UsageGroupingRuleEx, DumbAware { public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ModuleUsageGroup)) return false; - - final ModuleUsageGroup moduleUsageGroup = (ModuleUsageGroup)o; + if (!(o instanceof ModuleUsageGroup moduleUsageGroup)) return false; return myModule.equals(moduleUsageGroup.myModule); } diff --git a/platform/usageView-impl/src/com/intellij/usages/impl/rules/UsageScopeGroupingRule.java b/platform/usageView-impl/src/com/intellij/usages/impl/rules/UsageScopeGroupingRule.java index 1437c757efae..bde191952b9e 100644 --- a/platform/usageView-impl/src/com/intellij/usages/impl/rules/UsageScopeGroupingRule.java +++ b/platform/usageView-impl/src/com/intellij/usages/impl/rules/UsageScopeGroupingRule.java @@ -27,10 +27,9 @@ class UsageScopeGroupingRule extends SingleParentUsageGroupingRule implements Du @Nullable @Override protected UsageGroup getParentGroupFor(@NotNull Usage usage, UsageTarget @NotNull [] targets) { - if (!(usage instanceof PsiElementUsage)) { + if (!(usage instanceof PsiElementUsage elementUsage)) { return null; } - PsiElementUsage elementUsage = (PsiElementUsage)usage; PsiElement element = elementUsage.getElement(); VirtualFile virtualFile = PsiUtilCore.getVirtualFile(element); @@ -115,8 +114,7 @@ class UsageScopeGroupingRule extends SingleParentUsageGroupingRule implements Du public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof UsageScopeGroup)) return false; - final UsageScopeGroup usageTypeGroup = (UsageScopeGroup)o; + if (!(o instanceof UsageScopeGroup usageTypeGroup)) return false; return myCode == usageTypeGroup.myCode; } diff --git a/platform/usageView-impl/src/com/intellij/usages/impl/rules/UsageTypeGroupingRule.java b/platform/usageView-impl/src/com/intellij/usages/impl/rules/UsageTypeGroupingRule.java index 464c2726c622..9fd57624c0a1 100644 --- a/platform/usageView-impl/src/com/intellij/usages/impl/rules/UsageTypeGroupingRule.java +++ b/platform/usageView-impl/src/com/intellij/usages/impl/rules/UsageTypeGroupingRule.java @@ -21,8 +21,7 @@ public class UsageTypeGroupingRule extends SingleParentUsageGroupingRule impleme UsageType usageType = ((UsageWithType)usage).getUsageType(); return usageType == null ? null : new UsageTypeGroup(usageType); } - if (usage instanceof PsiElementUsage) { - PsiElementUsage elementUsage = (PsiElementUsage)usage; + if (usage instanceof PsiElementUsage elementUsage) { PsiElement element = elementUsage.getElement(); UsageType usageType = getUsageType(element, targets); @@ -33,8 +32,7 @@ public class UsageTypeGroupingRule extends SingleParentUsageGroupingRule impleme if (usageType != null) return new UsageTypeGroup(usageType); - if (usage instanceof ReadWriteAccessUsage) { - ReadWriteAccessUsage u = (ReadWriteAccessUsage)usage; + if (usage instanceof ReadWriteAccessUsage u) { if (u.isAccessedForWriting()) return new UsageTypeGroup(UsageType.WRITE); if (u.isAccessedForReading()) return new UsageTypeGroup(UsageType.READ); } @@ -107,8 +105,7 @@ public class UsageTypeGroupingRule extends SingleParentUsageGroupingRule impleme public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof UsageTypeGroup)) return false; - final UsageTypeGroup usageTypeGroup = (UsageTypeGroup)o; + if (!(o instanceof UsageTypeGroup usageTypeGroup)) return false; return myUsageType.equals(usageTypeGroup.myUsageType); } diff --git a/platform/usageView/src/com/intellij/usages/PsiElementUsageGroupBase.java b/platform/usageView/src/com/intellij/usages/PsiElementUsageGroupBase.java index 55cfba31377e..d07c2b1e2c17 100644 --- a/platform/usageView/src/com/intellij/usages/PsiElementUsageGroupBase.java +++ b/platform/usageView/src/com/intellij/usages/PsiElementUsageGroupBase.java @@ -90,8 +90,7 @@ public class PsiElementUsageGroupBase imp @Override public boolean equals(final Object obj) { - if (!(obj instanceof PsiElementUsageGroupBase)) return false; - PsiElementUsageGroupBase group = (PsiElementUsageGroupBase)obj; + if (!(obj instanceof PsiElementUsageGroupBase group)) return false; if (isValid() && group.isValid()) { return getElement().getManager().areElementsEquivalent(getElement(), group.getElement()); } diff --git a/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java b/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java index 3e33f0db7f94..5f8c4819e956 100644 --- a/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java +++ b/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java @@ -389,8 +389,7 @@ public class UsageInfo2UsageAdapter implements UsageInModule, UsageInfoAdapter, @Override public boolean merge(@NotNull MergeableUsage other) { - if (!(other instanceof UsageInfo2UsageAdapter)) return false; - UsageInfo2UsageAdapter u2 = (UsageInfo2UsageAdapter)other; + if (!(other instanceof UsageInfo2UsageAdapter u2)) return false; assert u2 != this; if (myLineNumber != u2.myLineNumber || !Comparing.equal(getFile(), u2.getFile())) return false; UsageInfo[] merged = ArrayUtil.mergeArrays(getMergedInfos(), u2.getMergedInfos()); diff --git a/platform/util/concurrency/com/intellij/concurrency/ConcurrentIntObjectHashMap.java b/platform/util/concurrency/com/intellij/concurrency/ConcurrentIntObjectHashMap.java index e4c4ba8ca435..3ae5bb80b8d8 100644 --- a/platform/util/concurrency/com/intellij/concurrency/ConcurrentIntObjectHashMap.java +++ b/platform/util/concurrency/com/intellij/concurrency/ConcurrentIntObjectHashMap.java @@ -156,8 +156,7 @@ final class ConcurrentIntObjectHashMap implements ConcurrentIntObjectMap { @Override public final boolean equals(Object o) { - if (!(o instanceof Entry)) return false; - Entry e = (Entry)o; + if (!(o instanceof Entry e)) return false; if (e.getKey() != key) return false; Object v = e.getValue(); Object u = val; @@ -621,9 +620,8 @@ final class ConcurrentIntObjectHashMap implements ConcurrentIntObjectMap { } } } - else if (f instanceof TreeBin) { + else if (f instanceof TreeBin t) { validated = true; - TreeBin t = (TreeBin)f; TreeNode r, p; if ((r = t.root) != null && (p = r.findTreeNode(hash, key)) != null) { @@ -1269,8 +1267,7 @@ final class ConcurrentIntObjectHashMap implements ConcurrentIntObjectMap { setTabAt(tab, i, fwd); advance = true; } - else if (f instanceof TreeBin) { - TreeBin t = (TreeBin)f; + else if (f instanceof TreeBin t) { TreeNode lo = null, loTail = null; TreeNode hi = null, hiTail = null; int lc = 0, hc = 0; diff --git a/platform/util/concurrency/com/intellij/concurrency/ConcurrentLongObjectHashMap.java b/platform/util/concurrency/com/intellij/concurrency/ConcurrentLongObjectHashMap.java index ca3c2085bb25..1d132f22ab75 100644 --- a/platform/util/concurrency/com/intellij/concurrency/ConcurrentLongObjectHashMap.java +++ b/platform/util/concurrency/com/intellij/concurrency/ConcurrentLongObjectHashMap.java @@ -157,8 +157,7 @@ final class ConcurrentLongObjectHashMap implements ConcurrentLongObjectMap @Override public final boolean equals(Object o) { - if (!(o instanceof LongEntry)) return false; - LongEntry e = (LongEntry)o; + if (!(o instanceof LongEntry e)) return false; if (e.getKey() != key) return false; Object v = e.getValue(); Object u = val; @@ -621,9 +620,8 @@ final class ConcurrentLongObjectHashMap implements ConcurrentLongObjectMap } } } - else if (f instanceof TreeBin) { + else if (f instanceof TreeBin t) { validated = true; - TreeBin t = (TreeBin)f; TreeNode r, p; if ((r = t.root) != null && (p = r.findTreeNode(hash, key)) != null) { @@ -1268,8 +1266,7 @@ final class ConcurrentLongObjectHashMap implements ConcurrentLongObjectMap setTabAt(tab, i, fwd); advance = true; } - else if (f instanceof TreeBin) { - TreeBin t = (TreeBin)f; + else if (f instanceof TreeBin t) { TreeNode lo = null, loTail = null; TreeNode hi = null, hiTail = null; int lc = 0, hc = 0; @@ -2616,8 +2613,7 @@ final class ConcurrentLongObjectHashMap implements ConcurrentLongObjectMap @Override public boolean contains(Object o) { - if (!(o instanceof LongEntry)) return false; - LongEntry e = (LongEntry)o; + if (!(o instanceof LongEntry e)) return false; Object r = map.get(e.getKey()); if (r == null) return false; Object v = e.getValue(); @@ -2626,8 +2622,7 @@ final class ConcurrentLongObjectHashMap implements ConcurrentLongObjectMap @Override public boolean remove(Object o) { - if (!(o instanceof LongEntry)) return false; - LongEntry e = (LongEntry)o; + if (!(o instanceof LongEntry e)) return false; Object v = e.getValue(); return map.remove(e.getKey(), v); } diff --git a/platform/util/ui/src/com/intellij/openapi/wm/FocusWatcher.java b/platform/util/ui/src/com/intellij/openapi/wm/FocusWatcher.java index 10ed02738f2f..f269477932b1 100644 --- a/platform/util/ui/src/com/intellij/openapi/wm/FocusWatcher.java +++ b/platform/util/ui/src/com/intellij/openapi/wm/FocusWatcher.java @@ -67,8 +67,7 @@ public class FocusWatcher implements ContainerListener, FocusListener { return; } - if (component instanceof Container) { - Container container = (Container)component; + if (component instanceof Container container) { int componentCount = container.getComponentCount(); for (int i = 0; i < componentCount; i++) { deinstall(container.getComponent(i)); @@ -120,8 +119,7 @@ public class FocusWatcher implements ContainerListener, FocusListener { } private void installImpl(Component component) { - if (component instanceof Container) { - Container container = (Container)component; + if (component instanceof Container container) { synchronized (container.getTreeLock()) { int componentCount = container.getComponentCount(); for (int i = 0; i < componentCount; i++) { diff --git a/platform/util/ui/src/com/intellij/ui/ComponentUtil.java b/platform/util/ui/src/com/intellij/ui/ComponentUtil.java index 1bbb99f200f9..61722aa0a2ed 100644 --- a/platform/util/ui/src/com/intellij/ui/ComponentUtil.java +++ b/platform/util/ui/src/com/intellij/ui/ComponentUtil.java @@ -33,11 +33,10 @@ public final class ComponentUtil { } public static boolean isMinimized(@Nullable Window window) { - if (!(window instanceof Frame)) { + if (!(window instanceof Frame frame)) { return false; } - Frame frame = (Frame)window; return frame.getExtendedState() == Frame.ICONIFIED; } diff --git a/platform/util/ui/src/com/intellij/ui/JBAutoScroller.java b/platform/util/ui/src/com/intellij/ui/JBAutoScroller.java index 60aa5333ea26..565295628063 100644 --- a/platform/util/ui/src/com/intellij/ui/JBAutoScroller.java +++ b/platform/util/ui/src/com/intellij/ui/JBAutoScroller.java @@ -51,8 +51,7 @@ public final class JBAutoScroller implements ActionListener { component.putClientProperty(SCROLL_HANDLER_KEY, handler); } - if (component instanceof JTable) { - JTable t = (JTable)component; + if (component instanceof JTable t) { new MoveTableCellEditorOnAutoscrollFix(t); new ScrollOnTableSelectionChangeFix(t, locker); } diff --git a/platform/util/ui/src/com/intellij/ui/JBColor.java b/platform/util/ui/src/com/intellij/ui/JBColor.java index 5b8288052aae..eb95514f0589 100644 --- a/platform/util/ui/src/com/intellij/ui/JBColor.java +++ b/platform/util/ui/src/com/intellij/ui/JBColor.java @@ -152,8 +152,7 @@ public class JBColor extends Color { private static Color findPatternMatch(@NotNull String name) { Object value = UIManager.get("*"); - if (value instanceof Map) { - Map map = (Map)value; + if (value instanceof Map map) { Object o = UIManager.get("*cache"); if (!(o instanceof Map)) { o = new HashMap(); diff --git a/platform/util/ui/src/com/intellij/ui/TableUtil.java b/platform/util/ui/src/com/intellij/ui/TableUtil.java index 17c48627b38f..e43289f82bdd 100644 --- a/platform/util/ui/src/com/intellij/ui/TableUtil.java +++ b/platform/util/ui/src/com/intellij/ui/TableUtil.java @@ -62,7 +62,7 @@ public final class TableUtil { @NotNull public static List removeSelectedItems(@NotNull JTable table, @Nullable ItemChecker applyable) { final TableModel model = table.getModel(); - if (!(model instanceof ItemRemovable)) { + if (!(model instanceof ItemRemovable itemRemovable)) { throw new RuntimeException("model must be instance of ItemRemovable"); } @@ -71,7 +71,6 @@ public final class TableUtil { } final List removedItems = new SmartList<>(); - final ItemRemovable itemRemovable = (ItemRemovable)model; final int columnCount = model.getColumnCount(); doRemoveSelectedItems(table, new ItemRemovable() { @Override diff --git a/platform/util/ui/src/com/intellij/ui/paint/PaintUtil.java b/platform/util/ui/src/com/intellij/ui/paint/PaintUtil.java index 9f7a9f0a4658..a6a535aacf09 100644 --- a/platform/util/ui/src/com/intellij/ui/paint/PaintUtil.java +++ b/platform/util/ui/src/com/intellij/ui/paint/PaintUtil.java @@ -304,8 +304,7 @@ public final class PaintUtil { g.scale(1.0 / scaleX, 1.0 / scaleY); try { Shape clip = g.getClip(); - if (clip instanceof Rectangle2D && isFractionalScale(transform)) { - Rectangle2D rect = (Rectangle2D)clip; + if (clip instanceof Rectangle2D rect && isFractionalScale(transform)) { double x = rect.getX(); double y = rect.getY(); double w = rect.getWidth(); diff --git a/platform/util/ui/src/com/intellij/ui/scale/ScaleContext.java b/platform/util/ui/src/com/intellij/ui/scale/ScaleContext.java index 7fe1d18c0eeb..43ef85989425 100644 --- a/platform/util/ui/src/com/intellij/ui/scale/ScaleContext.java +++ b/platform/util/ui/src/com/intellij/ui/scale/ScaleContext.java @@ -168,10 +168,9 @@ public class ScaleContext extends UserScaleContext { @Override protected boolean updateAll(@NotNull T scaleContext) { boolean updated = super.updateAll(scaleContext); - if (!(scaleContext instanceof ScaleContext)) { + if (!(scaleContext instanceof ScaleContext context)) { return updated; } - ScaleContext context = (ScaleContext)scaleContext; if (compRef != null) { compRef.clear(); @@ -183,8 +182,7 @@ public class ScaleContext extends UserScaleContext { @Override public boolean equals(Object obj) { - if (super.equals(obj) && obj instanceof ScaleContext) { - ScaleContext that = (ScaleContext)obj; + if (super.equals(obj) && obj instanceof ScaleContext that) { return that.sysScale.value == sysScale.value; } return false; diff --git a/platform/util/ui/src/com/intellij/ui/scale/UserScaleContext.java b/platform/util/ui/src/com/intellij/ui/scale/UserScaleContext.java index 0442bd8c2ac2..d9d153c06408 100644 --- a/platform/util/ui/src/com/intellij/ui/scale/UserScaleContext.java +++ b/platform/util/ui/src/com/intellij/ui/scale/UserScaleContext.java @@ -229,9 +229,8 @@ public class UserScaleContext { @Override public boolean equals(Object obj) { if (obj == this) return true; - if (!(obj instanceof UserScaleContext)) return false; + if (!(obj instanceof UserScaleContext that)) return false; - UserScaleContext that = (UserScaleContext)obj; return that.usrScale.value == usrScale.value && that.objScale.value == objScale.value; } diff --git a/platform/util/ui/src/com/intellij/util/ui/EmptyIcon.java b/platform/util/ui/src/com/intellij/util/ui/EmptyIcon.java index 3ee026d398ea..58946e8e01ed 100644 --- a/platform/util/ui/src/com/intellij/util/ui/EmptyIcon.java +++ b/platform/util/ui/src/com/intellij/util/ui/EmptyIcon.java @@ -126,9 +126,7 @@ import java.util.Map; @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof EmptyIcon)) return false; - - final EmptyIcon icon = (EmptyIcon)o; + if (!(o instanceof EmptyIcon icon)) return false; if (scaleVal(height, DerivedScaleType.PIX_SCALE) != icon.scaleVal(icon.height, DerivedScaleType.PIX_SCALE)) return false; if (scaleVal(width, DerivedScaleType.PIX_SCALE) != icon.scaleVal(icon.width, DerivedScaleType.PIX_SCALE)) return false; diff --git a/platform/util/ui/src/com/intellij/util/ui/FocusUtil.java b/platform/util/ui/src/com/intellij/util/ui/FocusUtil.java index 5cbe46afdce8..dc918ebe3e96 100644 --- a/platform/util/ui/src/com/intellij/util/ui/FocusUtil.java +++ b/platform/util/ui/src/com/intellij/util/ui/FocusUtil.java @@ -55,11 +55,10 @@ public final class FocusUtil { } public static Component getDefaultComponentInPanel(Component component) { - if (!(component instanceof JPanel)) { + if (!(component instanceof JPanel container)) { return null; } - JPanel container = (JPanel)component; FocusTraversalPolicy policy = container.getFocusTraversalPolicy(); if (policy == null) { return container; diff --git a/platform/util/ui/src/com/intellij/util/ui/GraphicsUtil.java b/platform/util/ui/src/com/intellij/util/ui/GraphicsUtil.java index 4bd89a4354e5..fb2ae200f685 100644 --- a/platform/util/ui/src/com/intellij/util/ui/GraphicsUtil.java +++ b/platform/util/ui/src/com/intellij/util/ui/GraphicsUtil.java @@ -56,8 +56,7 @@ public final class GraphicsUtil { } public static void setupAntialiasing(Graphics g2, boolean enableAA, boolean ignoreSystemSettings) { - if (g2 instanceof Graphics2D) { - Graphics2D g = (Graphics2D)g2; + if (g2 instanceof Graphics2D g) { Toolkit tk = Toolkit.getDefaultToolkit(); Map map = (Map)tk.getDesktopProperty(DESKTOP_HINTS); if (map != null && !ignoreSystemSettings) { diff --git a/platform/util/ui/src/com/intellij/util/ui/ImageUtil.java b/platform/util/ui/src/com/intellij/util/ui/ImageUtil.java index d158ae43e1cb..3552ae125097 100644 --- a/platform/util/ui/src/com/intellij/util/ui/ImageUtil.java +++ b/platform/util/ui/src/com/intellij/util/ui/ImageUtil.java @@ -99,8 +99,7 @@ public final class ImageUtil { */ @NotNull public static BufferedImage createImage(Graphics g, double width, double height, int type, @NotNull PaintUtil.RoundingMode rm) { - if (g instanceof Graphics2D) { - Graphics2D g2d = (Graphics2D)g; + if (g instanceof Graphics2D g2d) { if (JreHiDpiUtil.isJreHiDPI(g2d)) { return RetinaImage.create(g2d, width, height, type, rm); } @@ -122,8 +121,7 @@ public final class ImageUtil { @NotNull public static BufferedImage toBufferedImage(@NotNull Image image, boolean inUserSize, boolean ensureOneComponent) { - if (image instanceof JBHiDPIScaledImage) { - JBHiDPIScaledImage jbImage = (JBHiDPIScaledImage)image; + if (image instanceof JBHiDPIScaledImage jbImage) { Image delegate = jbImage.getDelegate(); if (delegate != null) image = delegate; if (inUserSize) { @@ -297,8 +295,7 @@ public final class ImageUtil { @NotNull public static BufferedImage clipImage(@NotNull BufferedImage image, @NotNull Shape clip) { - if (image instanceof JBHiDPIScaledImage) { - JBHiDPIScaledImage scaledImage = (JBHiDPIScaledImage)image; + if (image instanceof JBHiDPIScaledImage scaledImage) { Image delegate = scaledImage.getDelegate(); if (delegate == null) return doClipImage(scaledImage, clip); BufferedImage clippedImage = doClipImage(toBufferedImage(delegate), clip); diff --git a/platform/util/ui/src/com/intellij/util/ui/JBDimension.java b/platform/util/ui/src/com/intellij/util/ui/JBDimension.java index 610e49de5c05..0b9afa9e8ff8 100644 --- a/platform/util/ui/src/com/intellij/util/ui/JBDimension.java +++ b/platform/util/ui/src/com/intellij/util/ui/JBDimension.java @@ -212,9 +212,8 @@ public class JBDimension extends Dimension { @Override public boolean equals(Object obj) { if (obj == this) return true; - if (!(obj instanceof JBDimension)) return false; + if (!(obj instanceof JBDimension that)) return false; - JBDimension that = (JBDimension)obj; return size2D.equals(that.size2D); } } diff --git a/platform/util/ui/src/com/intellij/util/ui/JBHtmlEditorKit.java b/platform/util/ui/src/com/intellij/util/ui/JBHtmlEditorKit.java index 7e4b83e51ca7..b345c1cfae96 100644 --- a/platform/util/ui/src/com/intellij/util/ui/JBHtmlEditorKit.java +++ b/platform/util/ui/src/com/intellij/util/ui/JBHtmlEditorKit.java @@ -294,8 +294,7 @@ public class JBHtmlEditorKit extends HTMLEditorKit { private static void setUnderlined(boolean underlined, @NotNull Element element) { AttributeSet attributes = element.getAttributes(); Object attribute = attributes.getAttribute(HTML.Tag.A); - if (attribute instanceof MutableAttributeSet) { - MutableAttributeSet a = (MutableAttributeSet)attribute; + if (attribute instanceof MutableAttributeSet a) { Object href = a.getAttribute(HTML.Attribute.HREF); Pair aRange = findRangeOfParentTagWithGivenAttribute(element, href, HTML.Tag.A, HTML.Attribute.HREF); diff --git a/platform/util/ui/src/com/intellij/util/ui/MultiResolutionImageProvider.java b/platform/util/ui/src/com/intellij/util/ui/MultiResolutionImageProvider.java index 4b6dacc88b34..d4941fd4a67a 100644 --- a/platform/util/ui/src/com/intellij/util/ui/MultiResolutionImageProvider.java +++ b/platform/util/ui/src/com/intellij/util/ui/MultiResolutionImageProvider.java @@ -25,8 +25,7 @@ public final class MultiResolutionImageProvider { private static final class Converter { @Nullable public static Image convert(Image jbImage) { - if (jbImage instanceof JBHiDPIScaledImage) { - JBHiDPIScaledImage scaledImage = (JBHiDPIScaledImage)jbImage; + if (jbImage instanceof JBHiDPIScaledImage scaledImage) { Image lowResImage = ImageUtil.toBufferedImage(scaledImage, true); Image highResImage = ImageUtil.toBufferedImage(scaledImage); return new BaseMultiResolutionImage(lowResImage, highResImage); diff --git a/platform/util/ui/src/com/intellij/util/ui/StartupUiUtil.java b/platform/util/ui/src/com/intellij/util/ui/StartupUiUtil.java index 3be0c7f77f60..5d50a0d1cc72 100644 --- a/platform/util/ui/src/com/intellij/util/ui/StartupUiUtil.java +++ b/platform/util/ui/src/com/intellij/util/ui/StartupUiUtil.java @@ -175,8 +175,7 @@ public final class StartupUiUtil { Graphics2D invG = null; double scale = 1; - if (image instanceof JBHiDPIScaledImage) { - JBHiDPIScaledImage hidpiImage = (JBHiDPIScaledImage)image; + if (image instanceof JBHiDPIScaledImage hidpiImage) { Image delegate = hidpiImage.getDelegate(); if (delegate != null) image = delegate; scale = hidpiImage.getScale(); diff --git a/platform/util/ui/src/com/intellij/util/ui/tree/WideSelectionTreeUI.java b/platform/util/ui/src/com/intellij/util/ui/tree/WideSelectionTreeUI.java index 5a3f19762f0e..6f225d616b7f 100644 --- a/platform/util/ui/src/com/intellij/util/ui/tree/WideSelectionTreeUI.java +++ b/platform/util/ui/src/com/intellij/util/ui/tree/WideSelectionTreeUI.java @@ -57,8 +57,7 @@ public class WideSelectionTreeUI extends BasicTreeUI { @Override public void actionPerformed(ActionEvent event) { Object source = event.getSource(); - if (source instanceof JTree) { - JTree tree = (JTree)source; + if (source instanceof JTree tree) { TreePath path = tree.getLeadSelectionPath(); if (path != null) { if (tree.isExpanded(path) || tree.getModel().isLeaf(path.getLastPathComponent())) { @@ -81,8 +80,7 @@ public class WideSelectionTreeUI extends BasicTreeUI { @Override public void actionPerformed(ActionEvent event) { Object source = event.getSource(); - if (source instanceof JTree) { - JTree tree = (JTree)source; + if (source instanceof JTree tree) { TreePath path = tree.getLeadSelectionPath(); if (path != null) { if (tree.isExpanded(path)) { diff --git a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/vcs/changes/Change.java b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/vcs/changes/Change.java index c70220e376a3..7bb4777dd0f9 100644 --- a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/vcs/changes/Change.java +++ b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/vcs/changes/Change.java @@ -132,8 +132,7 @@ public class Change { public boolean equals(final Object o) { if (this == o) return true; - if ((!(o instanceof Change))) return false; - final Change otherChange = ((Change)o); + if ((!(o instanceof Change otherChange))) return false; final ContentRevision br1 = getBeforeRevision(); final ContentRevision br2 = otherChange.getBeforeRevision(); diff --git a/platform/vcs-impl/src/com/intellij/diff/Block.java b/platform/vcs-impl/src/com/intellij/diff/Block.java index 151d507d2d6f..95e42e23693b 100644 --- a/platform/vcs-impl/src/com/intellij/diff/Block.java +++ b/platform/vcs-impl/src/com/intellij/diff/Block.java @@ -124,8 +124,7 @@ public class Block { } public boolean equals(Object object) { - if (!(object instanceof Block)) return false; - Block other = (Block)object; + if (!(object instanceof Block other)) return false; return myStart == other.myStart && myEnd == other.myEnd && Arrays.equals(mySource, other.mySource); diff --git a/platform/vcs-impl/src/com/intellij/ide/todo/CommitChecksTodosTreeBuilder.java b/platform/vcs-impl/src/com/intellij/ide/todo/CommitChecksTodosTreeBuilder.java index 97bec8f7c29a..5ae62bfa54f2 100644 --- a/platform/vcs-impl/src/com/intellij/ide/todo/CommitChecksTodosTreeBuilder.java +++ b/platform/vcs-impl/src/com/intellij/ide/todo/CommitChecksTodosTreeBuilder.java @@ -50,8 +50,7 @@ public class CommitChecksTodosTreeBuilder extends CustomChangelistTodosTreeBuild HashSet ids = new HashSet<>(); for (Change change : changes) { - if (change instanceof ChangeListChange) { - ChangeListChange changeListChange = (ChangeListChange)change; + if (change instanceof ChangeListChange changeListChange) { ids.add(changeListChange.getChangeListId()); } else { diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java index 01efffb305ac..fcd9644cbe09 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java @@ -81,8 +81,7 @@ public final class UnifiedDiffWriter { // because GitPatchReader is not ready for mixed style patches List noContentPatches = new ArrayList<>(); for (FilePatch filePatch : patches) { - if (!(filePatch instanceof TextFilePatch)) continue; - TextFilePatch patch = (TextFilePatch)filePatch; + if (!(filePatch instanceof TextFilePatch patch)) continue; if (patch.hasNoModifiedContent()) { noContentPatches.add(patch); continue; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java index 30d2b2a0bdcc..51569a87cfc5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java @@ -402,8 +402,7 @@ public class VcsNotifier { } @Nls StringBuilder content = new StringBuilder(); for (Exception e : errors) { - if (e instanceof VcsException) { - VcsException vcsException = (VcsException)e; + if (e instanceof VcsException vcsException) { for (String message : vcsException.getMessages()) { content.append(message.replace(LINE_SEPARATOR, BR)).append(BR); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java index 5d53ce538d15..4f633c79e9a6 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java @@ -184,8 +184,7 @@ public class AnnotateDiffViewerAction { private static FileAnnotationLoader createThreesideAnnotationsLoader(@NotNull Project project, @NotNull DiffRequest request, @NotNull ThreeSide side) { - if (request instanceof ContentDiffRequest) { - ContentDiffRequest requestEx = (ContentDiffRequest)request; + if (request instanceof ContentDiffRequest requestEx) { if (requestEx.getContents().size() == 3) { DiffContent content = side.select(requestEx.getContents()); FileAnnotationLoader loader = createAnnotationsLoader(project, content); @@ -218,8 +217,7 @@ public class AnnotateDiffViewerAction { } } - if (request instanceof ContentDiffRequest) { - ContentDiffRequest requestEx = (ContentDiffRequest)request; + if (request instanceof ContentDiffRequest requestEx) { if (requestEx.getContents().size() == 2) { DiffContent content = side.select(requestEx.getContents()); return createAnnotationsLoader(project, content); @@ -293,8 +291,7 @@ public class AnnotateDiffViewerAction { public static class MyDiffExtension extends DiffExtension { @Override public void onViewerCreated(@NotNull DiffViewer diffViewer, @NotNull DiffContext context, @NotNull DiffRequest request) { - if (diffViewer instanceof DiffViewerBase) { - DiffViewerBase viewer = (DiffViewerBase)diffViewer; + if (diffViewer instanceof DiffViewerBase viewer) { viewer.addListener(new MyDiffViewerListener(viewer)); } } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java index aa5b9527da23..054cdd89121b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java @@ -346,8 +346,7 @@ public final class ChangeDiffRequestProducer implements DiffRequestProducer, Cha @NotNull Change change, @NotNull ContentDiffRequest request) { if (project == null) return null; - if (!(change instanceof ChangeListChange)) return null; - ChangeListChange changeListChange = (ChangeListChange)change; + if (!(change instanceof ChangeListChange changeListChange)) return null; List contents = request.getContents(); if (contents.size() != 2) return null; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/LocalChangeListDiffTool.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/LocalChangeListDiffTool.java index f2295efeae29..e06f02026865 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/LocalChangeListDiffTool.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/LocalChangeListDiffTool.java @@ -49,8 +49,7 @@ public final class LocalChangeListDiffTool { @Override public boolean canShow(@NotNull DiffContext context, @NotNull DiffRequest request) { - if (!(request instanceof LocalChangeListDiffRequest)) return false; - LocalChangeListDiffRequest localRequest = (LocalChangeListDiffRequest)request; + if (!(request instanceof LocalChangeListDiffRequest localRequest)) return false; return localRequest.getLineStatusTracker() instanceof PartialLocalLineStatusTracker; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangeListRenderer.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangeListRenderer.java index 0e76998a8512..4761aa19ae1d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangeListRenderer.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangeListRenderer.java @@ -71,8 +71,7 @@ public class CommittedChangeListRenderer extends ColoredTreeCellRenderer { public void customize(JComponent tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { Object userObject = ((DefaultMutableTreeNode)value).getUserObject(); - if (userObject instanceof CommittedChangeList) { - CommittedChangeList changeList = (CommittedChangeList)userObject; + if (userObject instanceof CommittedChangeList changeList) { renderChangeList(tree, changeList); } else if (userObject instanceof String) { @@ -175,8 +174,7 @@ public class CommittedChangeListRenderer extends ColoredTreeCellRenderer { public static int getRowX(JTree tree, int depth) { if (tree == null) return 0; final TreeUI ui = tree.getUI(); - if (ui instanceof BasicTreeUI) { - final BasicTreeUI treeUI = ((BasicTreeUI)ui); + if (ui instanceof BasicTreeUI treeUI) { return (treeUI.getLeftChildIndent() + treeUI.getRightChildIndent()) * depth; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowserDialogPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowserDialogPanel.java index e69373ca7713..a416cb7b71e0 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowserDialogPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowserDialogPanel.java @@ -108,8 +108,7 @@ public class CommittedChangesBrowserDialogPanel extends JPanel { gb.gridwidth = 2; myLeftPanel.add(listContainer, gb); - if (tableModel instanceof CommittedChangesNavigation) { - final CommittedChangesNavigation navigation = (CommittedChangesNavigation) tableModel; + if (tableModel instanceof CommittedChangesNavigation navigation) { final JButton backButton = new JButton(VcsBundle.message("changes.button.older")); final JButton forwardButton = new JButton(VcsBundle.message("changes.button.newer")); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java index 3d5f42ccaa38..43c208a78053 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java @@ -129,8 +129,7 @@ public final class CommittedChangesCache extends SimplePersistentStateComponent< public boolean isMaxCountSupportedForProject() { for (AbstractVcs vcs : ProjectLevelVcsManager.getInstance(myProject).getAllActiveVcss()) { final CommittedChangesProvider provider = vcs.getCommittedChangesProvider(); - if (provider instanceof CachingCommittedChangesProvider) { - final CachingCommittedChangesProvider cachingProvider = (CachingCommittedChangesProvider)provider; + if (provider instanceof CachingCommittedChangesProvider cachingProvider) { if (!cachingProvider.isMaxCountSupported()) { return false; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ignore/psi/IgnoreEntryManipulator.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ignore/psi/IgnoreEntryManipulator.java index 0f6b99cdb7d0..76288859ed40 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ignore/psi/IgnoreEntryManipulator.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ignore/psi/IgnoreEntryManipulator.java @@ -47,10 +47,9 @@ public class IgnoreEntryManipulator extends AbstractElementManipulator 0) { component.append(VcsBundle.message("patch.apply.stripped.description", patchInProgress.getCurrentStrip()), diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/DefaultPatchBaseVersionProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/DefaultPatchBaseVersionProvider.java index bfbf43824451..f3b078241018 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/DefaultPatchBaseVersionProvider.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/DefaultPatchBaseVersionProvider.java @@ -61,8 +61,7 @@ public final class DefaultPatchBaseVersionProvider { if (revision != null) { boolean loadedExactRevision = false; - if (historyProvider instanceof VcsBaseRevisionAdviser) { - VcsBaseRevisionAdviser revisionAdviser = (VcsBaseRevisionAdviser)historyProvider; + if (historyProvider instanceof VcsBaseRevisionAdviser revisionAdviser) { loadedExactRevision = revisionAdviser.getBaseVersionContent(pathBeforeRename, processor, revision.asString()); } else { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java index 7666a94c6c7c..9d5a98507d3b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java @@ -162,9 +162,7 @@ public final class ShelvedChange { @Override public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof ShelvedChange)) return false; - - final ShelvedChange that = (ShelvedChange)o; + if (!(o instanceof ShelvedChange that)) return false; if (!Objects.equals(myAfterPath, that.myAfterPath)) return false; if (!Objects.equals(myBeforePath, that.myBeforePath)) return false; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserChangeListNode.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserChangeListNode.java index efa302dbd64d..a4b8794752f0 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserChangeListNode.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserChangeListNode.java @@ -39,8 +39,7 @@ public class ChangesBrowserChangeListNode extends ChangesBrowserNode @Override public void render(@NotNull ChangesBrowserNodeRenderer renderer, final boolean selected, final boolean expanded, final boolean hasFocus) { - if (userObject instanceof LocalChangeList) { - final LocalChangeList list = ((LocalChangeList)userObject); + if (userObject instanceof LocalChangeList list) { String listName = list.getName(); if (StringUtil.isEmptyOrSpaces(listName)) listName = VcsBundle.message("changes.nodetitle.empty.changelist.name"); renderer.appendTextWithIssueLinks(listName, list.isDefault() ? SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java index 680008bb34bb..2ae3275332c6 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java @@ -509,9 +509,8 @@ public class TreeModelBuilder implements ChangesViewModelBuilder { } if (parent instanceof ChangesBrowserModuleNode && - childUserObject instanceof FilePath) { + childUserObject instanceof FilePath childPath) { FilePath parentPath = ((ChangesBrowserModuleNode)parent).getModuleRoot(); - FilePath childPath = (FilePath)childUserObject; if (!parentPath.equals(childPath)) return null; parent.remove(0); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java index ac6c64373ba7..ca8258994251 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java @@ -122,8 +122,7 @@ public class VcsDirectoryConfigurationPanel extends JPanel implements Disposable @Override protected void customizeCellRenderer(@NotNull JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) { - if (value instanceof MapInfo) { - MapInfo info = (MapInfo)value; + if (value instanceof MapInfo info) { SimpleTextAttributes textAttributes = getAttributes(info); if (!selected && (info == MapInfo.SEPARATOR || info.type == MapInfo.Type.UNREGISTERED)) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java index 876c9cc9e6fe..e9ce8d182499 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java @@ -190,15 +190,13 @@ public final class FileHistoryPanelImpl extends JPanel implements DataProvider, } private static void makeBold(Component component) { - if (component instanceof JComponent) { - JComponent jComponent = (JComponent)component; + if (component instanceof JComponent jComponent) { Font font = jComponent.getFont(); if (font != null) { jComponent.setFont(font.deriveFont(Font.BOLD)); } } - else if (component instanceof Container) { - Container container = (Container)component; + else if (component instanceof Container container) { for (int i = 0; i < container.getComponentCount(); i++) { makeBold(container.getComponent(i)); } @@ -763,8 +761,7 @@ public final class FileHistoryPanelImpl extends JPanel implements DataProvider, @Override public TableCellRenderer getCustomizedRenderer(VcsFileRevision revision, TableCellRenderer renderer) { if (renderer instanceof AuthorCellRenderer) { - if (revision instanceof VcsFileRevisionEx) { - VcsFileRevisionEx ex = (VcsFileRevisionEx)revision; + if (revision instanceof VcsFileRevisionEx ex) { @Nls StringBuilder sb = new StringBuilder(StringUtil.notNullize(ex.getAuthor())); if (ex.getAuthorEmail() != null) sb.append(" <").append(ex.getAuthorEmail()).append(">"); // NON-NLS if (ex.getCommitterName() != null && !Objects.equals(ex.getAuthor(), ex.getCommitterName())) { @@ -812,8 +809,7 @@ public final class FileHistoryPanelImpl extends JPanel implements DataProvider, @Override protected void customizeCellRenderer(@NotNull JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) { setOpaque(selected); - if (value instanceof String) { - String message = (String)value; + if (value instanceof String message) { myIssueLinkRenderer.appendTextWithLinks(message, getDefaultAttributes()); SpeedSearchUtil.applySpeedSearchHighlighting(table, this, false, selected); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/FileOrDirectoryTreeNode.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/FileOrDirectoryTreeNode.java index b48c09ce5d9d..7494d73752e3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/FileOrDirectoryTreeNode.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/FileOrDirectoryTreeNode.java @@ -93,8 +93,7 @@ public abstract class FileOrDirectoryTreeNode extends AbstractTreeNode implement super.setUserObject(userObject); } finally { - if (oldObject instanceof VirtualFilePointer) { - VirtualFilePointer pointer = (VirtualFilePointer)oldObject; + if (oldObject instanceof VirtualFilePointer pointer) { Disposer.dispose((Disposable)pointer); } } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java index 8106625cb574..5b4782bffb9c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java @@ -261,8 +261,7 @@ public class UpdateInfoTree extends PanelWithActionsAndCloseButton { myNext = null; while (myEnum.hasMoreElements()) { final Object o = myEnum.nextElement(); - if (o instanceof FileTreeNode) { - final FileTreeNode treeNode = (FileTreeNode)o; + if (o instanceof FileTreeNode treeNode) { VirtualFilePointer filePointer = treeNode.getFilePointer(); FilePath filePath = getFilePath(filePointer); diff --git a/platform/vcs-impl/src/com/intellij/vcs/changes/ChangeListScope.java b/platform/vcs-impl/src/com/intellij/vcs/changes/ChangeListScope.java index d82de19f514a..3f044dbdc1ea 100644 --- a/platform/vcs-impl/src/com/intellij/vcs/changes/ChangeListScope.java +++ b/platform/vcs-impl/src/com/intellij/vcs/changes/ChangeListScope.java @@ -34,8 +34,7 @@ public final class ChangeListScope extends FilteredNamedScope implements Weighed @Override public boolean equals(Object object) { if (object == this) return true; - if (object instanceof ChangeListScope) { - ChangeListScope scope = (ChangeListScope)object; + if (object instanceof ChangeListScope scope) { return scope.getIcon() == getIcon() && scope.getScopeId().equals(getScopeId()); } return false; diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/GraphCommitImpl.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/GraphCommitImpl.java index b645af157ca5..7cf2a5b3bc57 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/GraphCommitImpl.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/GraphCommitImpl.java @@ -23,8 +23,7 @@ abstract class AbstractGraphCommit extends ImmutableList imp @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof GraphCommit)) return false; - GraphCommit commit = (GraphCommit)o; + if (!(o instanceof GraphCommit commit)) return false; return getId().equals(commit.getId()); } @@ -74,8 +73,7 @@ public final class GraphCommitImpl extends AbstractGraphCommit= array.length) { throw new ArrayIndexOutOfBoundsException(index); } diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedActionManager.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedActionManager.java index fdf3ddf001b7..bd6be3240a30 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedActionManager.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedActionManager.java @@ -311,8 +311,7 @@ final class CollapsedActionManager { if (graphElement == null) return null; if (graphElement instanceof GraphEdge && ((GraphEdge)graphElement).getType() == GraphEdgeType.DOTTED) return (GraphEdge)graphElement; - if (graphElement instanceof GraphNode) { - GraphNode node = (GraphNode)graphElement; + if (graphElement instanceof GraphNode node) { for (GraphEdge edge : graph.getAdjacentEdges(node.getNodeIndex(), EdgeFilter.NORMAL_ALL)) { if (edge.getType() == GraphEdgeType.DOTTED) return edge; } diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/GraphElementComparatorByLayoutIndex.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/GraphElementComparatorByLayoutIndex.java index 27e977db78eb..3391e9a7cd29 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/GraphElementComparatorByLayoutIndex.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/GraphElementComparatorByLayoutIndex.java @@ -36,9 +36,7 @@ public class GraphElementComparatorByLayoutIndex implements Comparator, Object> context = new HashMap<>(); if (!(change instanceof MergedChange)) { @@ -386,8 +385,7 @@ public final class VcsLogChangesBrowser extends FilterableChangesBrowser { @NotNull Change change, @NotNull Map, Object> context, boolean forDiffPreview) { - if (change instanceof MergedChange) { - MergedChange mergedChange = (MergedChange)change; + if (change instanceof MergedChange mergedChange) { if (mergedChange.getSourceChanges().size() == 2) { if (forDiffPreview) { putFilePathsIntoMergedChangeContext(mergedChange, context); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java index 96c73d767c44..061f37898cf2 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java @@ -942,9 +942,7 @@ public class VcsLogGraphTable extends TableWithProgress implements DataProvider, @Override public boolean shouldSelectCell(EventObject anEvent) { - if (!(anEvent instanceof MouseEvent)) return true; - - MouseEvent e = (MouseEvent)anEvent; + if (!(anEvent instanceof MouseEvent e)) return true; int row = rowAtPoint(e.getPoint()); if (row < 0 || row >= getRowCount()) return true; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUiUtil.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUiUtil.java index 5809425500a4..7d25e1d32698 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUiUtil.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUiUtil.java @@ -176,9 +176,8 @@ public final class VcsLogUiUtil { if (place == null) return ActionCallback.DONE; Object value = place.getPath(PLACE_KEY); - if (!(value instanceof CommitId)) return ActionCallback.REJECTED; + if (!(value instanceof CommitId commitId)) return ActionCallback.REJECTED; - CommitId commitId = (CommitId)value; ActionCallback callback = new ActionCallback(); ListenableFuture future = VcsLogNavigationUtil.jumpToCommit(myUi, commitId.getHash(), commitId.getRoot(), diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VisiblePackRefresherImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VisiblePackRefresherImpl.java index 0f1b8586f78e..c899f15253a0 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VisiblePackRefresherImpl.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VisiblePackRefresherImpl.java @@ -478,8 +478,7 @@ public class VisiblePackRefresherImpl implements VisiblePackRefresher, Disposabl } public static boolean isVisibleKeyFor(@NotNull VcsLogProgress.ProgressKey key, @NotNull String logId) { - if (key instanceof VisiblePackProgressKey) { - VisiblePackProgressKey visiblePackProgressKey = (VisiblePackProgressKey)key; + if (key instanceof VisiblePackProgressKey visiblePackProgressKey) { return visiblePackProgressKey.getLogId().equals(logId) && visiblePackProgressKey.isVisible(); } return false; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java index fc5ef4ed40b1..ea0d85d8dba2 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java @@ -419,8 +419,7 @@ public final class XDebuggerManagerImpl extends XDebuggerManager implements Pers Editor editor = e.getEditor(); if (editor.getProject() != myProject || editor.getEditorKind() != EditorKind.MAIN_EDITOR) return; EditorGutter editorGutter = editor.getGutter(); - if (editorGutter instanceof EditorGutterComponentEx) { - EditorGutterComponentEx gutter = (EditorGutterComponentEx)editorGutter; + if (editorGutter instanceof EditorGutterComponentEx gutter) { if (e.getArea() == EditorMouseEventArea.LINE_NUMBERS_AREA) { int line = EditorUtil.yToLogicalLineNoCustomRenderers(editor, e.getMouseEvent().getY()); Document document = editor.getDocument(); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/AttachToProcessActionBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/AttachToProcessActionBase.java index a4112d738d5a..4949f9dee6fc 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/AttachToProcessActionBase.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/AttachToProcessActionBase.java @@ -120,8 +120,7 @@ public abstract class AttachToProcessActionBase extends AnAction implements Dumb popup.setCaption(((AttachToProcessItem)item).getSelectedDebugger().getDebuggerSelectedTitle()); } - if (item instanceof AttachHostItem) { - AttachHostItem hostItem = (AttachHostItem)item; + if (item instanceof AttachHostItem hostItem) { String attachHostName = hostItem.getText(project); attachHostName = StringUtil.shortenTextWithEllipsis(attachHostName, 50, 0); @@ -679,8 +678,7 @@ public abstract class AttachToProcessActionBase extends AnAction implements Dumb @Override public PopupStep onChosen(AttachItem selectedValue, boolean finalChoice) { - if (selectedValue instanceof AttachToProcessItem) { - AttachToProcessItem attachToProcessItem = (AttachToProcessItem)selectedValue; + if (selectedValue instanceof AttachToProcessItem attachToProcessItem) { if (finalChoice) { addToRecent(myProject, attachToProcessItem); return doFinalStep(() -> attachToProcessItem.startDebugSession(myProject)); @@ -690,8 +688,7 @@ public abstract class AttachToProcessActionBase extends AnAction implements Dumb } } - if (selectedValue instanceof AttachHostItem) { - AttachHostItem attachHostItem = (AttachHostItem)selectedValue; + if (selectedValue instanceof AttachHostItem attachHostItem) { return new AsyncPopupStep() { @Override public PopupStep call() { diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/grouping/XBreakpointGroupingByTypeRule.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/grouping/XBreakpointGroupingByTypeRule.java index 251deaf9991c..5054f71e9fae 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/grouping/XBreakpointGroupingByTypeRule.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/grouping/XBreakpointGroupingByTypeRule.java @@ -41,8 +41,7 @@ public class XBreakpointGroupingByTypeRule extends XBreakpointGroupingRule groups) { - if (b instanceof XBreakpoint) { - final XBreakpoint breakpoint = (XBreakpoint)b; + if (b instanceof XBreakpoint breakpoint) { for (XBreakpointTypeGroup group : groups) { if (group.getBreakpointType() == breakpoint.getType()) { return group; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java index 42382f68aff4..ee66e650d099 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java @@ -242,9 +242,7 @@ public class BreakpointItemsTreeController implements BreakpointsCheckboxTree.De if (!default1 && default2) return 1; return b1.compareTo(b2); } - if (o1 instanceof BreakpointsGroupNode && o2 instanceof BreakpointsGroupNode) { - final BreakpointsGroupNode group1 = (BreakpointsGroupNode)o1; - final BreakpointsGroupNode group2 = (BreakpointsGroupNode)o2; + if (o1 instanceof BreakpointsGroupNode group1 && o2 instanceof BreakpointsGroupNode group2) { if (group1.getLevel() != group2.getLevel()) { return group1.getLevel() - group2.getLevel(); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsTreeCellRenderer.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsTreeCellRenderer.java index e7fb4f69f2a0..87a329d8bb9f 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsTreeCellRenderer.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsTreeCellRenderer.java @@ -34,8 +34,7 @@ class BreakpointsTreeCellRenderer { boolean selected, boolean expanded, ColoredTreeCellRenderer renderer) { - if (value instanceof BreakpointItemNode) { - BreakpointItemNode node = (BreakpointItemNode)value; + if (value instanceof BreakpointItemNode node) { BreakpointItem breakpoint = node.getBreakpointItem(); breakpoint.setupRenderer(renderer, project, selected); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerInstanceTreeCreator.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerInstanceTreeCreator.java index 5027d6d7434a..9259bab64d1e 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerInstanceTreeCreator.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerInstanceTreeCreator.java @@ -60,8 +60,7 @@ public class XDebuggerInstanceTreeCreator implements DebuggerTreeCreator> resultConsumer) { - if (node instanceof XValueNodeImpl) { - XValueNodeImpl valueNode = (XValueNodeImpl)node; + if (node instanceof XValueNodeImpl valueNode) { resultConsumer.onSuccess(Pair.create(valueNode.getValueContainer().getInstanceEvaluator(), valueNode.getName())); } } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerTreeCreator.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerTreeCreator.java index bd20686be92a..397e6d6770fa 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerTreeCreator.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerTreeCreator.java @@ -63,8 +63,7 @@ public class XDebuggerTreeCreator implements DebuggerTreeCreator> resultConsumer) { - if (node instanceof XValueNodeImpl) { - XValueNodeImpl valueNode = (XValueNodeImpl)node; + if (node instanceof XValueNodeImpl valueNode) { resultConsumer.onSuccess(Pair.create(valueNode.getValueContainer(), valueNode.getName())); } } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java index ce1b6fb6d669..dc5612c8049c 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java @@ -108,8 +108,7 @@ public class XValueHint extends AbstractValueHint { VirtualFile file; ConsoleView consoleView = ConsoleViewImpl.CONSOLE_VIEW_IN_EDITOR_VIEW.get(editor); - if (consoleView instanceof LanguageConsoleView) { - LanguageConsoleView console = ((LanguageConsoleView)consoleView); + if (consoleView instanceof LanguageConsoleView console) { file = console.getHistoryViewer() == editor ? console.getVirtualFile() : null; } else { diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerFramesList.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerFramesList.java index 1ae245d5dca8..ea652b833e69 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerFramesList.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerFramesList.java @@ -64,8 +64,7 @@ public class XDebuggerFramesList extends DebuggerFramesList implements DataProvi StringBuilder plainBuf = new StringBuilder(); TextTransferable.ColoredStringBuilder coloredTextContainer = new TextTransferable.ColoredStringBuilder(); for (Object value : items) { - if (value instanceof ItemWithSeparatorAbove) { - ItemWithSeparatorAbove item = (ItemWithSeparatorAbove)value; + if (value instanceof ItemWithSeparatorAbove item) { if (item.hasSeparatorAbove()) { String caption = " - " + StringUtil.notNullize(item.getCaptionAboveOf()); plainBuf.append(caption).append('\n'); @@ -535,8 +534,7 @@ public class XDebuggerFramesList extends DebuggerFramesList implements DataProvi } private static void updateHover(@NotNull Component component, @Nullable Point point) { - if (!(component instanceof XDebuggerFramesList)) return; - var list = ((XDebuggerFramesList)component); + if (!(component instanceof XDebuggerFramesList list)) return; var oldHoverIndex = getHoveredIndex(component); ClientProperty.put(list, HOVER_POSITION, null); ClientProperty.put(list, HOVER_BOUNDS, null); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/actions/XMoveWatchDown.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/actions/XMoveWatchDown.java index 204d647acf8b..44763940dad3 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/actions/XMoveWatchDown.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/actions/XMoveWatchDown.java @@ -30,8 +30,7 @@ public class XMoveWatchDown extends XWatchesTreeActionBase { List nodes = getSelectedNodes(tree, WatchNodeImpl.class); if (nodes.size() == 1) { XDebuggerTreeNode root = tree.getRoot(); - if (root instanceof WatchesRootNode) { - WatchesRootNode rootNode = (WatchesRootNode)root; + if (root instanceof WatchesRootNode rootNode) { int size = rootNode.getWatchChildren().size() - 1 + rootNode.headerNodesCount(); return root.getIndex(nodes.get(0)) < size; } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java index 6c6d92290d33..3c454849df17 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java @@ -55,8 +55,7 @@ public abstract class DebuggerSessionTabBase extends RunTab { } protected void attachNotificationTo(final Content content) { - if (myConsole instanceof ObservableConsoleView) { - ObservableConsoleView observable = (ObservableConsoleView)myConsole; + if (myConsole instanceof ObservableConsoleView observable) { AtomicBoolean alertFired = new AtomicBoolean(); observable.addChangeListener(new ObservableConsoleView.ChangeListener() { @Override diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java index 2c73a2d6f284..f5308d90bdca 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java @@ -80,10 +80,9 @@ public class XDebuggerTree extends DnDAwareTree implements DataProvider, Disposa private static final TransferHandler DEFAULT_TRANSFER_HANDLER = new TransferHandler() { @Override protected Transferable createTransferable(JComponent c) { - if (!(c instanceof XDebuggerTree)) { + if (!(c instanceof XDebuggerTree tree)) { return null; } - XDebuggerTree tree = (XDebuggerTree)c; TreePath[] selectedPaths = tree.getSelectionPaths(); if (selectedPaths == null || selectedPaths.length == 0) { return null; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeRestorer.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeRestorer.java index ada37c4f68dd..4eeff6e207bf 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeRestorer.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeRestorer.java @@ -57,8 +57,7 @@ public class XDebuggerTreeRestorer implements XDebuggerTreeListener, TreeSelecti } private void restoreNode(final XDebuggerTreeNode treeNode, final XDebuggerTreeState.NodeInfo parentInfo) { - if (treeNode instanceof RestorableStateNode) { - RestorableStateNode node = (RestorableStateNode)treeNode; + if (treeNode instanceof RestorableStateNode node) { if (node.isComputed()) { doRestoreNode(node, parentInfo.getChild(node)); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeState.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeState.java index a580549920fe..00fef0a8629c 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeState.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeState.java @@ -68,8 +68,7 @@ public final class XDebuggerTreeState { @Nullable private static NodeInfo createNode(final XDebuggerTreeNode node, boolean selected) { - if (node instanceof RestorableStateNode) { - RestorableStateNode valueNode = (RestorableStateNode)node; + if (node instanceof RestorableStateNode valueNode) { if (valueNode.isComputed()) { return new NodeInfo(valueNode.getName(), valueNode.getRawValue(), selected); } diff --git a/platform/xdebugger-testFramework/src/com/intellij/xdebugger/XDebuggerTestUtil.java b/platform/xdebugger-testFramework/src/com/intellij/xdebugger/XDebuggerTestUtil.java index 42cfa6409f88..094284192fda 100644 --- a/platform/xdebugger-testFramework/src/com/intellij/xdebugger/XDebuggerTestUtil.java +++ b/platform/xdebugger-testFramework/src/com/intellij/xdebugger/XDebuggerTestUtil.java @@ -339,8 +339,7 @@ public class XDebuggerTestUtil { public static void setBreakpointCondition(Project project, int line, final String condition) { XBreakpointManager breakpointManager = XDebuggerManager.getInstance(project).getBreakpointManager(); for (XBreakpoint breakpoint : getBreakpoints(breakpointManager)) { - if (breakpoint instanceof XLineBreakpoint) { - final XLineBreakpoint lineBreakpoint = (XLineBreakpoint)breakpoint; + if (breakpoint instanceof XLineBreakpoint lineBreakpoint) { if (lineBreakpoint.getLine() == line) { WriteAction.runAndWait(() -> lineBreakpoint.setCondition(condition)); @@ -352,8 +351,7 @@ public class XDebuggerTestUtil { public static void setBreakpointLogExpression(Project project, int line, final String logExpression) { XBreakpointManager breakpointManager = XDebuggerManager.getInstance(project).getBreakpointManager(); for (XBreakpoint breakpoint : getBreakpoints(breakpointManager)) { - if (breakpoint instanceof XLineBreakpoint) { - final XLineBreakpoint lineBreakpoint = (XLineBreakpoint)breakpoint; + if (breakpoint instanceof XLineBreakpoint lineBreakpoint) { if (lineBreakpoint.getLine() == line) { WriteAction.runAndWait(() -> { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspectionVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspectionVisitor.java index 5d41d825b623..5443d6689086 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspectionVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspectionVisitor.java @@ -81,13 +81,11 @@ public abstract class BaseInspectionVisitor extends JavaElementVisitor { protected final void registerClassError(@NotNull PsiClass aClass, Object... infos) { final PsiElement nameIdentifier; - if (aClass instanceof PsiEnumConstantInitializer) { - final PsiEnumConstantInitializer enumConstantInitializer = (PsiEnumConstantInitializer)aClass; + if (aClass instanceof PsiEnumConstantInitializer enumConstantInitializer) { final PsiEnumConstant enumConstant = enumConstantInitializer.getEnumConstant(); nameIdentifier = enumConstant.getNameIdentifier(); } - else if (aClass instanceof PsiAnonymousClass) { - final PsiAnonymousClass anonymousClass = (PsiAnonymousClass)aClass; + else if (aClass instanceof PsiAnonymousClass anonymousClass) { nameIdentifier = anonymousClass.getBaseClassReference(); } else { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/PackageGlobalInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/PackageGlobalInspection.java index a7b4ff896759..a38dfffb46f7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/PackageGlobalInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/PackageGlobalInspection.java @@ -61,8 +61,7 @@ public abstract class PackageGlobalInspection extends BaseGlobalInspection { String packageName = ReadAction.nonBlocking(() -> { if (!scope.contains(file)) return null; final PsiFile element = PsiManager.getInstance(scope.getProject()).findFile(file); - if (!(element instanceof PsiClassOwner)) return null; - final PsiClassOwner classOwner = (PsiClassOwner)element; + if (!(element instanceof PsiClassOwner classOwner)) return null; return classOwner.getPackageName(); }).executeSynchronously(); if (packageName == null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java index 3ee28ff87be5..b99a37eaffea 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java @@ -99,11 +99,10 @@ public class DeclareCollectionAsInterfaceInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiJavaCodeReferenceElement)) { + if (!(parent instanceof PsiJavaCodeReferenceElement referenceElement)) { return; } final StringBuilder newElementText = new StringBuilder(typeString); - final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)parent; final PsiReferenceParameterList parameterList = referenceElement.getParameterList(); if (parameterList != null) { newElementText.append(parameterList.getText()); @@ -139,8 +138,7 @@ public class DeclareCollectionAsInterfaceInspection extends BaseInspection { } } } - if (variable instanceof PsiParameter) { - final PsiParameter parameter = (PsiParameter)variable; + if (variable instanceof PsiParameter parameter) { final PsiElement scope = parameter.getDeclarationScope(); if (scope instanceof PsiMethod) { if (ignorePrivateMethodsAndFields) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java index 0582659723b1..5c7c2e06fa8a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java @@ -74,8 +74,7 @@ public class InstanceofChainInspection extends BaseInspection { return; } final PsiStatement previousStatement = PsiTreeUtil.getPrevSiblingOfType(ifStatement, PsiStatement.class); - if (previousStatement instanceof PsiIfStatement) { - final PsiIfStatement previousIfStatement = (PsiIfStatement)previousStatement; + if (previousStatement instanceof PsiIfStatement previousIfStatement) { final PsiExpression condition = previousIfStatement.getCondition(); if (chainCheck(condition, null) != Check.NEITHER) { return; @@ -126,11 +125,10 @@ public class InstanceofChainInspection extends BaseInspection { else if (check != Check.CLASS_EQUALITY && isInstanceofExpression(condition)) { return Check.INSTANCEOF; } - else if (condition instanceof PsiPolyadicExpression) { + else if (condition instanceof PsiPolyadicExpression polyadicExpression) { if (check != Check.INSTANCEOF && isClassEqualityExpression(condition)) { return Check.CLASS_EQUALITY; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)condition; final PsiExpression[] operands = polyadicExpression.getOperands(); for (PsiExpression operand : operands) { final Check chainCheck = chainCheck(operand, check); @@ -140,13 +138,11 @@ public class InstanceofChainInspection extends BaseInspection { } return Check.NEITHER; } - else if (condition instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)condition; + else if (condition instanceof PsiParenthesizedExpression parenthesizedExpression) { condition = parenthesizedExpression.getExpression(); continue; } - else if (condition instanceof PsiUnaryExpression) { - final PsiUnaryExpression unaryOperation = (PsiUnaryExpression)condition; + else if (condition instanceof PsiUnaryExpression unaryOperation) { condition = unaryOperation.getOperand(); continue; } @@ -155,10 +151,9 @@ public class InstanceofChainInspection extends BaseInspection { } private boolean isClassEqualityExpression(PsiExpression expression) { - if (!(expression instanceof PsiBinaryExpression)) { + if (!(expression instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; if (binaryExpression.getOperationTokenType() != JavaTokenType.EQEQ) { return false; } @@ -168,19 +163,17 @@ public class InstanceofChainInspection extends BaseInspection { private boolean isClassObjectAccessExpression(PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiClassObjectAccessExpression)) { + if (!(expression instanceof PsiClassObjectAccessExpression classObjectAccessExpression)) { return false; } - final PsiClassObjectAccessExpression classObjectAccessExpression = (PsiClassObjectAccessExpression)expression; final PsiTypeElement typeElement = classObjectAccessExpression.getOperand(); return !ignoreInstanceofOnLibraryClasses || !LibraryUtil.isTypeInLibrary(typeElement.getType()); } private boolean isInstanceofExpression(PsiExpression expression) { - if (!(expression instanceof PsiInstanceOfExpression)) { + if (!(expression instanceof PsiInstanceOfExpression instanceOfExpression)) { return false; } - final PsiInstanceOfExpression instanceOfExpression = (PsiInstanceOfExpression)expression; final PsiTypeElement typeElement = instanceOfExpression.getCheckType(); return !ignoreInstanceofOnLibraryClasses || typeElement == null || !LibraryUtil.isTypeInLibrary(typeElement.getType()); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OptionalUsedAsFieldOrParameterTypeInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OptionalUsedAsFieldOrParameterTypeInspection.java index 4d9657e3a6c8..d6e92e21652d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OptionalUsedAsFieldOrParameterTypeInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OptionalUsedAsFieldOrParameterTypeInspection.java @@ -33,12 +33,10 @@ public class OptionalUsedAsFieldOrParameterTypeInspection extends BaseInspection protected String buildErrorString(Object... infos) { final PsiTypeElement typeElement = (PsiTypeElement)infos[0]; final PsiElement parent = typeElement.getParent(); - if (parent instanceof PsiField) { - final PsiField field = (PsiField)parent; + if (parent instanceof PsiField field) { return InspectionGadgetsBundle.message("optional.used.as.field.type.problem.descriptor", field.getName()); } - else if (parent instanceof PsiParameter) { - final PsiParameter parameter = (PsiParameter)parent; + else if (parent instanceof PsiParameter parameter) { return InspectionGadgetsBundle.message("optional.used.as.parameter.type.problem.descriptor", parameter.getName()); } throw new AssertionError(); @@ -61,10 +59,9 @@ public class OptionalUsedAsFieldOrParameterTypeInspection extends BaseInspection public void visitParameter(@NotNull PsiParameter parameter) { super.visitParameter(parameter); final PsiElement scope = parameter.getDeclarationScope(); - if (!(scope instanceof PsiMethod)) { + if (!(scope instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)scope; if (MethodUtils.hasSuper(method)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java index d7b2719e1f55..279ae0f4287d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java @@ -127,8 +127,7 @@ public class OverlyStrongTypeCastInspection extends BaseInspection { if (TypeUtils.isTypeParameter(expectedType)) { return; } - if (expectedType instanceof PsiArrayType) { - final PsiArrayType arrayType = (PsiArrayType)expectedType; + if (expectedType instanceof PsiArrayType arrayType) { final PsiType componentType = arrayType.getDeepComponentType(); if (TypeUtils.isTypeParameter(componentType)) { return; @@ -140,14 +139,12 @@ public class OverlyStrongTypeCastInspection extends BaseInspection { if (PsiPrimitiveType.getUnboxedType(type) != null || PsiPrimitiveType.getUnboxedType(expectedType) != null) { return; } - if (expectedType instanceof PsiClassType) { - final PsiClassType expectedClassType = (PsiClassType)expectedType; + if (expectedType instanceof PsiClassType expectedClassType) { final PsiClassType expectedRawType = expectedClassType.rawType(); if (type.equals(expectedRawType)) { return; } - if (type instanceof PsiClassType) { - final PsiClassType classType = (PsiClassType)type; + if (type instanceof PsiClassType classType) { final PsiClassType rawType = classType.rawType(); if (rawType.equals(expectedRawType)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToNullInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToNullInspection.java index 449fdf869185..bfbf864022b6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToNullInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToNullInspection.java @@ -45,18 +45,16 @@ public class AssignmentToNullInspection extends BaseInspection { @Override protected InspectionGadgetsFix buildFix(Object... infos) { final Object info = infos[0]; - if (!(info instanceof PsiReferenceExpression)) { + if (!(info instanceof PsiReferenceExpression referenceExpression)) { return null; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)info; if (TypeUtils.isOptional(referenceExpression.getType())) { return null; } final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return null; } - final PsiVariable variable = (PsiVariable)target; if (NullableNotNullManager.isNotNull(variable)) { return null; } @@ -96,11 +94,9 @@ public class AssignmentToNullInspection extends BaseInspection { parent instanceof PsiTypeCastExpression) { parent = parent.getParent(); } - if (!(parent instanceof PsiAssignmentExpression)) { + if (!(parent instanceof PsiAssignmentExpression assignmentExpression)) { return; } - final PsiAssignmentExpression assignmentExpression = - (PsiAssignmentExpression)parent; final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression()); if (lhs == null || isReferenceToNullableVariable(lhs)) { return; @@ -110,16 +106,13 @@ public class AssignmentToNullInspection extends BaseInspection { private boolean isReferenceToNullableVariable( PsiExpression lhs) { - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)lhs; final PsiElement element = referenceExpression.resolve(); - if (!(element instanceof PsiVariable)) { + if (!(element instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)element; if (ignoreAssignmentsToFields && variable instanceof PsiField) { return true; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToStaticFieldFromInstanceMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToStaticFieldFromInstanceMethodInspection.java index 82efbfcf2296..80dc9176fe77 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToStaticFieldFromInstanceMethodInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToStaticFieldFromInstanceMethodInspection.java @@ -68,10 +68,9 @@ public class AssignmentToStaticFieldFromInstanceMethodInspection if (referent == null) { return; } - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField fieldReferenced)) { return; } - final PsiField fieldReferenced = (PsiField)referent; if (!fieldReferenced.hasModifierProperty(PsiModifier.STATIC)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToSuperclassFieldInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToSuperclassFieldInspection.java index 583c012c7599..d482e16e4d8c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToSuperclassFieldInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToSuperclassFieldInspection.java @@ -59,20 +59,18 @@ public class AssignmentToSuperclassFieldInspection extends BaseInspection { } private void checkSuperclassField(PsiExpression expression) { - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; final PsiExpression qualifierExpression = referenceExpression.getQualifierExpression(); if (qualifierExpression != null && !(qualifierExpression instanceof PsiThisExpression) && !(qualifierExpression instanceof PsiSuperExpression)) { return; } final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return; } - final PsiField field = (PsiField)target; final PsiClass fieldClass = field.getContainingClass(); if (fieldClass == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/BaseAssignmentToParameterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/BaseAssignmentToParameterInspection.java index f488131e59aa..4c25e30a47eb 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/BaseAssignmentToParameterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/BaseAssignmentToParameterInspection.java @@ -82,15 +82,13 @@ public abstract class BaseAssignmentToParameterInspection extends BaseInspection @Nullable private PsiParameter getParameter(PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return null; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; final PsiElement variable = referenceExpression.resolve(); - if (!(variable instanceof PsiParameter)) { + if (!(variable instanceof PsiParameter parameter)) { return null; } - final PsiParameter parameter = (PsiParameter)variable; return !isApplicable(parameter) ? null : parameter; } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java index 293f78090504..d6b2c3d827fa 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java @@ -47,8 +47,7 @@ public class IncrementDecrementUsedAsExpressionInspection extends BaseInspection @NotNull public String buildErrorString(Object... infos) { final Object info = infos[0]; - if (info instanceof PsiPostfixExpression) { - final PsiPostfixExpression postfixExpression = (PsiPostfixExpression)info; + if (info instanceof PsiPostfixExpression postfixExpression) { final IElementType tokenType = postfixExpression.getOperationTokenType(); if (tokenType.equals(JavaTokenType.PLUSPLUS)) { return InspectionGadgetsBundle.message( @@ -203,8 +202,7 @@ public class IncrementDecrementUsedAsExpressionInspection extends BaseInspection parent.addBefore(newStatement, statement); } } - else if (operand instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)operand; + else if (operand instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); if (target != null) { final SearchScope useScope = target.getUseScope(); @@ -218,9 +216,8 @@ public class IncrementDecrementUsedAsExpressionInspection extends BaseInspection } } } - if (statement instanceof PsiLoopStatement) { + if (statement instanceof PsiLoopStatement loopStatement) { // in/decrement inside loop statement condition - final PsiLoopStatement loopStatement = (PsiLoopStatement)statement; final PsiStatement body = loopStatement.getBody(); if (body instanceof PsiBlockStatement) { final PsiBlockStatement blockStatement = (PsiBlockStatement)body; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java index dd523d310130..32228456f59c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java @@ -148,25 +148,22 @@ public class ReplaceAssignmentWithOperatorAssignmentInspection extends BaseInspe @Override public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiAssignmentExpression)) { + if (!(element instanceof PsiAssignmentExpression expression)) { return; } - final PsiAssignmentExpression expression = (PsiAssignmentExpression)element; final PsiExpression lhs = expression.getLExpression(); PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(expression.getRExpression()); - if (rhs instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)rhs; + if (rhs instanceof PsiTypeCastExpression typeCastExpression) { final PsiType castType = typeCastExpression.getType(); if (castType == null || !castType.equals(lhs.getType())) { return; } rhs = PsiUtil.skipParenthesizedExprDown(typeCastExpression.getOperand()); } - if (!(rhs instanceof PsiPolyadicExpression)) { + if (!(rhs instanceof PsiPolyadicExpression polyadicExpression)) { return; } CommentTracker ct = new CommentTracker(); - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)rhs; final String newExpression = calculateReplacementExpression(lhs, polyadicExpression, ct); PsiReplacementUtil.replaceExpression(expression, newExpression, ct); } @@ -188,18 +185,16 @@ public class ReplaceAssignmentWithOperatorAssignmentInspection extends BaseInspe } final PsiExpression lhs = assignment.getLExpression(); PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(assignment.getRExpression()); - if (rhs instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)rhs; + if (rhs instanceof PsiTypeCastExpression typeCastExpression) { final PsiType castType = typeCastExpression.getType(); if (castType == null || !castType.equals(lhs.getType())) { return; } rhs = PsiUtil.skipParenthesizedExprDown(typeCastExpression.getOperand()); } - if (!(rhs instanceof PsiPolyadicExpression)) { + if (!(rhs instanceof PsiPolyadicExpression polyadicExpression)) { return; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)rhs; final PsiExpression[] operands = polyadicExpression.getOperands(); if (operands.length < 2) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/IncompatibleMaskInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/IncompatibleMaskInspection.java index 4fef14792b5f..3743f0855e43 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/IncompatibleMaskInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/IncompatibleMaskInspection.java @@ -152,11 +152,9 @@ public class IncompatibleMaskInspection extends BaseInspection { if (expression == null) { return false; } - if (!(expression instanceof PsiBinaryExpression)) { + if (!(expression instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = - (PsiBinaryExpression)expression; final IElementType tokenType = binaryExpression.getOperationTokenType(); if (!tokenType.equals(JavaTokenType.OR) && diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java index 7068058f9410..a22e46b6230c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java @@ -152,8 +152,7 @@ public class PointlessBitwiseExpressionInspection extends BaseInspection { private static PsiExpression extractDecrementedValue(PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (expression instanceof PsiBinaryExpression) { - PsiBinaryExpression binOp = (PsiBinaryExpression)expression; + if (expression instanceof PsiBinaryExpression binOp) { if (binOp.getOperationTokenType().equals(MINUS)) { Number right = JavaPsiMathUtil.getNumberFromLiteral(binOp.getROperand()); if ((right instanceof Integer || right instanceof Long) && right.longValue() == 1L) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualityInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualityInspection.java index b2baec8c634f..c7daa89ffad0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualityInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualityInspection.java @@ -73,11 +73,10 @@ public class ArrayEqualityInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiBinaryExpression)) { + if (!(parent instanceof PsiBinaryExpression binaryExpression)) { return; } CommentTracker commentTracker = new CommentTracker(); - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)parent; final IElementType tokenType = binaryExpression.getOperationTokenType(); @NonNls final StringBuilder newExpressionText = new StringBuilder(); if (JavaTokenType.NE.equals(tokenType)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java index fd736340a049..2d8b79a9c4d0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java @@ -71,10 +71,9 @@ public class ArrayHashCodeInspection extends BaseInspection { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); if (qualifier == null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayObjectsEqualsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayObjectsEqualsInspection.java index 977b7a1e58e2..9a6098ce3472 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayObjectsEqualsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayObjectsEqualsInspection.java @@ -83,10 +83,9 @@ public class ArrayObjectsEqualsInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent().getParent(); - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; CommentTracker commentTracker = new CommentTracker(); String newExpression = "java.util.Arrays." + myKind.getNewMethodName() + commentTracker.text(methodCallExpression.getArgumentList()); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/AssertWithSideEffectsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/AssertWithSideEffectsInspection.java index 5c5cb667e91e..09782a600d70 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/AssertWithSideEffectsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/AssertWithSideEffectsInspection.java @@ -144,10 +144,9 @@ public class AssertWithSideEffectsInspection extends BaseInspection { private void checkExpression(PsiExpression operand) { operand = PsiUtil.skipParenthesizedExprDown(operand); - if (!(operand instanceof PsiReferenceExpression)) { + if (!(operand instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)operand; final PsiElement target = referenceExpression.resolve(); if (target instanceof PsiField) { mutatedField = ((PsiField)target).getName(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/BaseEqualsVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/BaseEqualsVisitor.java index 04180f55a7fb..c78d5e381c8a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/BaseEqualsVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/BaseEqualsVisitor.java @@ -116,8 +116,7 @@ abstract class BaseEqualsVisitor extends BaseInspectionVisitor { //example: Predicate.not(Predicate.isEqual("1")) or predicate.or(Predicate.isEqual("1")) or predicate.and(Predicate.isEqual("1")) final PsiElement parent = PsiUtil.skipParenthesizedExprUp(highestPredicate.getParent()); - if (parent instanceof PsiExpressionList && parent.getParent() instanceof PsiExpression) { - final PsiExpression psiExpressionNextParent = (PsiExpression)parent.getParent(); + if (parent instanceof PsiExpressionList && parent.getParent() instanceof PsiExpression psiExpressionNextParent) { if (PREDICATE_NOT_OR_AND.matches(psiExpressionNextParent)) { highestPredicate = psiExpressionNextParent; continue; @@ -158,10 +157,9 @@ abstract class BaseEqualsVisitor extends BaseInspectionVisitor { @Nullable private static PsiType findPredicateExpectedType(@NotNull PsiExpression predicate) { final PsiType expectedType = ExpectedTypeUtils.findExpectedType(predicate, true); - if (!(expectedType instanceof PsiClassType)) { + if (!(expectedType instanceof PsiClassType classType)) { return null; } - PsiClassType classType = (PsiClassType)expectedType; if (classType.getParameterCount() != 1 || !PsiTypesUtil.classNameEquals(classType, JAVA_UTIL_FUNCTION_PREDICATE)) { return null; } @@ -170,8 +168,7 @@ abstract class BaseEqualsVisitor extends BaseInspectionVisitor { if (parameter == null || parameter.equalsToText(JAVA_LANG_OBJECT)) { return null; } - if (parameter instanceof PsiWildcardType) { - PsiWildcardType psiWildcardType = (PsiWildcardType)parameter; + if (parameter instanceof PsiWildcardType psiWildcardType) { parameter = psiWildcardType.isSuper() ? psiWildcardType.getSuperBound() : parameter; } return parameter; @@ -202,10 +199,9 @@ abstract class BaseEqualsVisitor extends BaseInspectionVisitor { } protected static PsiType getType(PsiExpression expression) { - if (!(expression instanceof PsiNewExpression)) { + if (!(expression instanceof PsiNewExpression newExpression)) { return expression.getType(); } - final PsiNewExpression newExpression = (PsiNewExpression)expression; final PsiAnonymousClass anonymousClass = newExpression.getAnonymousClass(); return anonymousClass != null ? anonymousClass.getBaseClassType() : expression.getType(); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java index b3b1acd618d3..84aae45f5e7c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java @@ -65,8 +65,7 @@ public class CastConflictsWithInstanceofInspection extends BaseInspection { return; } final PsiExpression operand = PsiUtil.skipParenthesizedExprDown(expression.getOperand()); - if (!(operand instanceof PsiReferenceExpression)) return; - PsiReferenceExpression referenceExpression = (PsiReferenceExpression)operand; + if (!(operand instanceof PsiReferenceExpression referenceExpression)) return; PsiType castType1 = castType.getType(); PsiInstanceOfExpression conflictingInstanceof = InstanceOfUtils.getConflictingInstanceof(castType1, referenceExpression, expression); if (conflictingInstanceof == null) return; @@ -88,22 +87,19 @@ public class CastConflictsWithInstanceofInspection extends BaseInspection { final PsiElement element = descriptor.getPsiElement(); final PsiTypeElement castTypeElement; final PsiReferenceExpression reference; - if (element instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)element; + if (element instanceof PsiTypeCastExpression typeCastExpression) { castTypeElement = typeCastExpression.getCastType(); final PsiExpression operand = typeCastExpression.getOperand(); if (!(operand instanceof PsiReferenceExpression)) { return; } reference = (PsiReferenceExpression)operand; - } else if (element instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; + } else if (element instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (!(qualifier instanceof PsiClassObjectAccessExpression)) { + if (!(qualifier instanceof PsiClassObjectAccessExpression classObjectAccessExpression)) { return; } - final PsiClassObjectAccessExpression classObjectAccessExpression = (PsiClassObjectAccessExpression)qualifier; castTypeElement = classObjectAccessExpression.getOperand(); final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastToIncompatibleInterfaceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastToIncompatibleInterfaceInspection.java index ff837eb4c21d..7273fcd84d2b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastToIncompatibleInterfaceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastToIncompatibleInterfaceInspection.java @@ -49,20 +49,18 @@ public class CastToIncompatibleInterfaceInspection extends BaseInspection { return; } final PsiType castType = castTypeElement.getType(); - if (!(castType instanceof PsiClassType)) { + if (!(castType instanceof PsiClassType castClassType)) { return; } - final PsiClassType castClassType = (PsiClassType)castType; final PsiExpression operand = expression.getOperand(); if (operand == null) { return; } final PsiType operandType = operand.getType(); - if (!(operandType instanceof PsiClassType)) { + if (!(operandType instanceof PsiClassType operandClassType)) { return; } - final PsiClassType operandClassType = (PsiClassType)operandType; if (!castClassType.isConvertibleFrom(operandClassType)) { // don't warn on red code return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java index b22219dd93bc..569a866b6a25 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java @@ -53,21 +53,19 @@ public class ClassNewInstanceInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiReferenceExpression)) { + if (!(parent instanceof PsiReferenceExpression methodExpression)) { return; } - final PsiReferenceExpression methodExpression = (PsiReferenceExpression)parent; final PsiExpression qualifier = methodExpression.getQualifierExpression(); if (qualifier == null) { return; } final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return; } final PsiElement parentOfType = PsiTreeUtil.getParentOfType(element, PsiMethod.class, PsiTryStatement.class, PsiLambdaExpression.class); - if (parentOfType instanceof PsiTryStatement) { - final PsiTryStatement tryStatement = (PsiTryStatement)parentOfType; + if (parentOfType instanceof PsiTryStatement tryStatement) { addCatchBlock(tryStatement, "java.lang.NoSuchMethodException", "java.lang.reflect.InvocationTargetException"); } else if (parentOfType instanceof PsiLambdaExpression) { @@ -81,7 +79,6 @@ public class ClassNewInstanceInspection extends BaseInspection { final PsiMethod method = (PsiMethod)parentOfType; addThrowsClause(method, "java.lang.NoSuchMethodException", "java.lang.reflect.InvocationTargetException"); } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; @NonNls final String newExpression = qualifier.getText() + ".getConstructor().newInstance()"; PsiReplacementUtil.replaceExpression(methodCallExpression, newExpression, new CommentTracker()); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EqualsWhichDoesntCheckParameterClassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EqualsWhichDoesntCheckParameterClassInspection.java index 0ae5f033f488..950914a4dfa4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EqualsWhichDoesntCheckParameterClassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EqualsWhichDoesntCheckParameterClassInspection.java @@ -91,10 +91,9 @@ public class EqualsWhichDoesntCheckParameterClassInspection extends BaseInspecti if (statement == null) { return false; } - if (!(statement instanceof PsiReturnStatement)) { + if (!(statement instanceof PsiReturnStatement returnStatement)) { return true; // incomplete code } - final PsiReturnStatement returnStatement = (PsiReturnStatement)statement; final PsiExpression returnValue = returnStatement.getReturnValue(); final Object constant = ExpressionUtils.computeConstantExpression(returnValue); if (Boolean.FALSE.equals(constant)) { @@ -110,10 +109,9 @@ public class EqualsWhichDoesntCheckParameterClassInspection extends BaseInspecti } private static boolean isIdentityEquals(PsiExpression expression, PsiParameter parameter) { - if (!(expression instanceof PsiBinaryExpression)) { + if (!(expression instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; final PsiExpression lhs = binaryExpression.getLOperand(); final PsiExpression rhs = binaryExpression.getROperand(); return isIdentityEquals(lhs, rhs, parameter) || isIdentityEquals(rhs, lhs, parameter); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java index 41efd751eddf..8ee9884eba52 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java @@ -135,8 +135,7 @@ public class ImplicitArrayToStringInspection extends BaseInspection { final PsiElement parent = expression.getParent(); if (parent instanceof PsiExpressionList) { final PsiElement grandParent = parent.getParent(); - if (grandParent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; + if (grandParent instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); if ("valueOf".equals(methodExpression.getReferenceName())) { PsiReplacementUtil.replaceExpressionAndShorten(methodCallExpression, newExpressionText, commentTracker); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IncorrectDateTimeFormatInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IncorrectDateTimeFormatInspection.java index 26a7f5ef183b..7dc4e32e0b29 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IncorrectDateTimeFormatInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IncorrectDateTimeFormatInspection.java @@ -99,8 +99,7 @@ public class IncorrectDateTimeFormatInspection extends AbstractBaseJavaLocalInsp private void processExpression(@NotNull PsiExpression expression) { Object patternObject = ExpressionUtils.computeConstantExpression(expression); - if (!(patternObject instanceof String)) return; - String pattern = (String)patternObject; + if (!(patternObject instanceof String pattern)) return; record Token(char character, int pos, int length) {} List tokens = new ArrayList<>(); int optionalDepth = 0; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InnerClassReferencedViaSubclassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InnerClassReferencedViaSubclassInspection.java index 4ee6136917b3..2336b8a066fd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InnerClassReferencedViaSubclassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InnerClassReferencedViaSubclassInspection.java @@ -78,20 +78,17 @@ public class InnerClassReferencedViaSubclassInspection extends BaseInspection im public void visitReferenceElement(@NotNull PsiJavaCodeReferenceElement reference) { super.visitReferenceElement(reference); final PsiElement qualifier = reference.getQualifier(); - if (!(qualifier instanceof PsiJavaCodeReferenceElement)) { + if (!(qualifier instanceof PsiJavaCodeReferenceElement qualifierReference)) { return; } - final PsiJavaCodeReferenceElement qualifierReference = (PsiJavaCodeReferenceElement)qualifier; final PsiElement qualifierTarget = qualifierReference.resolve(); - if (!(qualifierTarget instanceof PsiClass)) { + if (!(qualifierTarget instanceof PsiClass qualifierClass)) { return; } - final PsiClass qualifierClass = (PsiClass)qualifierTarget; final PsiElement target = reference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)target; final PsiClass containingClass = aClass.getContainingClass(); if (containingClass == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java index 959db29bf073..4711683815cf 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java @@ -46,16 +46,14 @@ public class InstanceofIncompatibleInterfaceInspection extends BaseInspection { return; } final PsiType castType = castTypeElement.getType(); - if (!(castType instanceof PsiClassType)) { + if (!(castType instanceof PsiClassType castClassType)) { return; } - final PsiClassType castClassType = (PsiClassType)castType; final PsiExpression operand = expression.getOperand(); final PsiType operandType = operand.getType(); - if (!(operandType instanceof PsiClassType)) { + if (!(operandType instanceof PsiClassType operandClassType)) { return; } - final PsiClassType operandClassType = (PsiClassType)operandType; final PsiClass castClass = castClassType.resolve(); if (castClass == null || !castClass.isInterface()) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java index 04a5cb0a996f..fc67f662da40 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java @@ -46,10 +46,9 @@ public class MathRandomCastToIntInspection extends BaseInspection { protected InspectionGadgetsFix buildFix(Object... infos) { final PsiTypeCastExpression expression = (PsiTypeCastExpression)infos[0]; final PsiElement parent = expression.getParent(); - if (!(parent instanceof PsiPolyadicExpression)) { + if (!(parent instanceof PsiPolyadicExpression polyadicExpression)) { return null; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; final IElementType tokenType = polyadicExpression.getOperationTokenType(); if (JavaTokenType.ASTERISK != tokenType || polyadicExpression.getType() == null) { return null; @@ -71,15 +70,13 @@ public class MathRandomCastToIntInspection extends BaseInspection { while (parent instanceof PsiPrefixExpression) { parent = parent.getParent(); } - if (!(parent instanceof PsiTypeCastExpression)) { + if (!(parent instanceof PsiTypeCastExpression typeCastExpression)) { return; } - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)parent; final PsiElement grandParent = typeCastExpression.getParent(); - if (!(grandParent instanceof PsiPolyadicExpression)) { + if (!(grandParent instanceof PsiPolyadicExpression polyadicExpression)) { return; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)grandParent; final PsiExpression operand = typeCastExpression.getOperand(); if (operand == null) { return; @@ -123,7 +120,7 @@ public class MathRandomCastToIntInspection extends BaseInspection { while (operand instanceof PsiPrefixExpression) { operand = ((PsiPrefixExpression)operand).getOperand(); } - if (!(operand instanceof PsiMethodCallExpression)) { + if (!(operand instanceof PsiMethodCallExpression methodCallExpression)) { return; } final PsiTypeElement castType = expression.getCastType(); @@ -135,7 +132,6 @@ public class MathRandomCastToIntInspection extends BaseInspection { .equals(type)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)operand; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); @NonNls final String referenceName = methodExpression.getReferenceName(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedArrayReadWriteInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedArrayReadWriteInspection.java index 39a82714eb3c..a0b718e69a42 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedArrayReadWriteInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedArrayReadWriteInspection.java @@ -119,13 +119,11 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection { if (expression == null) { return false; } - if (expression instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)expression; + if (expression instanceof PsiNewExpression newExpression) { final PsiArrayInitializerExpression arrayInitializer = newExpression.getArrayInitializer(); return mayBeAccessedElsewhere(arrayInitializer); } - else if (expression instanceof PsiArrayInitializerExpression) { - final PsiArrayInitializerExpression arrayInitializerExpression = (PsiArrayInitializerExpression)expression; + else if (expression instanceof PsiArrayInitializerExpression arrayInitializerExpression) { for (PsiExpression initializer : arrayInitializerExpression.getInitializers()) { if (mayBeAccessedElsewhere(initializer)) { return true; @@ -139,17 +137,14 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection { else if (expression instanceof PsiArrayAccessExpression) { return true; } - else if (expression instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)expression; + else if (expression instanceof PsiTypeCastExpression typeCastExpression) { return mayBeAccessedElsewhere(typeCastExpression.getOperand()); } - else if (expression instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)expression; + else if (expression instanceof PsiConditionalExpression conditionalExpression) { return mayBeAccessedElsewhere(conditionalExpression.getThenExpression()) || mayBeAccessedElsewhere(conditionalExpression.getElseExpression()); } - else if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + else if (expression instanceof PsiMethodCallExpression methodCallExpression) { final PsiMethod method = methodCallExpression.resolveMethod(); if (method == null) { return true; @@ -179,13 +174,11 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection { if (initializer == null) { return true; } - if (initializer instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)initializer; + if (initializer instanceof PsiNewExpression newExpression) { final PsiArrayInitializerExpression arrayInitializer = newExpression.getArrayInitializer(); return arrayInitializer == null || isZeroSizeArrayExpression(arrayInitializer); } - if (initializer instanceof PsiArrayInitializerExpression) { - final PsiArrayInitializerExpression arrayInitializerExpression = (PsiArrayInitializerExpression)initializer; + if (initializer instanceof PsiArrayInitializerExpression arrayInitializerExpression) { final PsiExpression[] initializers = arrayInitializerExpression.getInitializers(); return initializers.length == 0; } @@ -212,8 +205,7 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection { if (!expression.isReferenceTo(myVariable)) return; if (PsiUtil.isAccessedForWriting(expression)) { final PsiElement parent = PsiTreeUtil.skipParentsOfType(expression, PsiParenthesizedExpression.class); - if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + if (parent instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression rhs = assignmentExpression.getRExpression(); if (mayBeAccessedElsewhere(rhs)) { myWritten = true; @@ -231,8 +223,7 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection { } myIsReferenced = true; PsiElement parent = getParent(expression); - if (parent instanceof PsiArrayAccessExpression) { - PsiArrayAccessExpression arrayAccessExpression = (PsiArrayAccessExpression)parent; + if (parent instanceof PsiArrayAccessExpression arrayAccessExpression) { parent = getParent(parent); while (parent instanceof PsiArrayAccessExpression && ((PsiArrayAccessExpression)parent).getArrayExpression() == arrayAccessExpression) { @@ -256,25 +247,21 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection { myRead = true; } } - else if (parent instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)parent; + else if (parent instanceof PsiReferenceExpression referenceExpression) { final String name = referenceExpression.getReferenceName(); if ("clone".equals(name) && referenceExpression.getParent() instanceof PsiMethodCallExpression) { myRead = true; } } - else if (parent instanceof PsiForeachStatement) { - final PsiForeachStatement foreachStatement = (PsiForeachStatement)parent; + else if (parent instanceof PsiForeachStatement foreachStatement) { final PsiExpression iteratedValue = foreachStatement.getIteratedValue(); if (PsiTreeUtil.isAncestor(iteratedValue, expression, false)) { myRead = true; } } - else if (parent instanceof PsiExpressionList) { - final PsiExpressionList expressionList = (PsiExpressionList)parent; + else if (parent instanceof PsiExpressionList expressionList) { parent = parent.getParent(); - if (parent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)parent; + if (parent instanceof PsiMethodCallExpression methodCallExpression) { final PsiMethod method = methodCallExpression.resolveMethod(); if (method != null) { final PsiClass aClass = method.getContainingClass(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java index 03b3b95c7bd8..460b627baf5d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java @@ -206,10 +206,9 @@ public class MismatchedStringBuilderQueryUpdateInspection extends BaseInspection if (queried) return; super.visitReferenceExpression(expression); final PsiElement parent = ParenthesesUtils.getParentSkipParentheses(expression); - if (!(parent instanceof PsiPolyadicExpression)) { + if (!(parent instanceof PsiPolyadicExpression polyadicExpression)) { return; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; final IElementType tokenType = polyadicExpression.getOperationTokenType(); if (!JavaTokenType.PLUS.equals(tokenType)) { return; @@ -274,16 +273,13 @@ public class MismatchedStringBuilderQueryUpdateInspection extends BaseInspection private static boolean isVariableValueUsed(PsiExpression expression) { final PsiElement parent = expression.getParent(); - if (parent instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)parent; + if (parent instanceof PsiParenthesizedExpression parenthesizedExpression) { return isVariableValueUsed(parenthesizedExpression); } - if (parent instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; + if (parent instanceof PsiPolyadicExpression polyadicExpression) { return isVariableValueUsed(polyadicExpression); } - if (parent instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)parent; + if (parent instanceof PsiTypeCastExpression typeCastExpression) { return isVariableValueUsed(typeCastExpression); } if (parent instanceof PsiReturnStatement) { @@ -298,13 +294,11 @@ public class MismatchedStringBuilderQueryUpdateInspection extends BaseInspection else if (parent instanceof PsiArrayInitializerExpression) { return true; } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression rhs = assignmentExpression.getRExpression(); return expression.equals(rhs); } - else if (parent instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)parent; + else if (parent instanceof PsiVariable variable) { final PsiExpression initializer = variable.getInitializer(); return expression.equals(initializer); } @@ -313,25 +307,21 @@ public class MismatchedStringBuilderQueryUpdateInspection extends BaseInspection } static boolean hasReferenceToVariable(PsiVariable variable, PsiElement element) { - if (element instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element; + if (element instanceof PsiReferenceExpression referenceExpression) { return referenceExpression.isReferenceTo(variable); } - else if (element instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)element; + else if (element instanceof PsiParenthesizedExpression parenthesizedExpression) { final PsiExpression expression = parenthesizedExpression.getExpression(); return hasReferenceToVariable(variable, expression); } - else if (element instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; + else if (element instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String name = methodExpression.getReferenceName(); if (returnSelfNames.contains(name)) { return hasReferenceToVariable(variable, methodExpression.getQualifierExpression()); } } - else if (element instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)element; + else if (element instanceof PsiConditionalExpression conditionalExpression) { final PsiExpression thenExpression = conditionalExpression.getThenExpression(); if (hasReferenceToVariable(variable, thenExpression)) { return true; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringCaseInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringCaseInspection.java index a4f5103b6efa..c0aa506b9f54 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringCaseInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringCaseInspection.java @@ -74,8 +74,7 @@ public class MismatchedStringCaseInspection extends AbstractBaseJavaLocalInspect if (str != null) { return fromConstant(str); } - if (expression instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression call) { if (CASE_PRESERVING_METHODS.test(call)) { return fromExpression(call.getMethodExpression().getQualifierExpression(), energy - 1); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NewObjectEqualityInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NewObjectEqualityInspection.java index 3efac74893c2..bc3c09722c55 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NewObjectEqualityInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NewObjectEqualityInspection.java @@ -77,8 +77,7 @@ public class NewObjectEqualityInspection extends BaseInspection { private static PsiExpression resolveExpression(PsiExpression expression) { PsiElement parent = expression.getParent(); expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiReferenceExpression)) return expression; - PsiReferenceExpression reference = (PsiReferenceExpression)expression; + if (!(expression instanceof PsiReferenceExpression reference)) return expression; PsiLocalVariable variable = tryCast(reference.resolve(), PsiLocalVariable.class); if (variable == null) return expression; PsiExpression initializer = variable.getInitializer(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NonFinalFieldsVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NonFinalFieldsVisitor.java index f0616e0b6967..cce9b64fc6d6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NonFinalFieldsVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NonFinalFieldsVisitor.java @@ -33,10 +33,9 @@ class NonFinalFieldsVisitor extends BaseInspectionVisitor { @NotNull PsiReferenceExpression expression) { super.visitReferenceExpression(expression); final PsiElement element = expression.resolve(); - if (!(element instanceof PsiField)) { + if (!(element instanceof PsiField field)) { return; } - final PsiField field = (PsiField)element; if (field.hasModifierProperty(PsiModifier.FINAL)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java index 131106270960..d8d85476325d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java @@ -125,12 +125,11 @@ public class NullArgumentToVariableArgMethodInspection extends BaseInspection { return null; } final PsiType type1 = lastParameter.getType(); - if (!(type1 instanceof PsiEllipsisType)) { + if (!(type1 instanceof PsiEllipsisType ellipsisType)) { return null; } - final PsiEllipsisType ellipsisType = (PsiEllipsisType)type1; - final PsiArrayType arrayType = (PsiArrayType)ellipsisType.toArrayType(); + final PsiArrayType arrayType = (PsiArrayType)ellipsisType.toArrayType(); final PsiType componentType = arrayType.getComponentType(); if (checkArray) { if (!componentType.equals(TypeUtils.getObjectType(call))) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NumberEqualityInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NumberEqualityInspection.java index 975d32591169..82a376502296 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NumberEqualityInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NumberEqualityInspection.java @@ -198,13 +198,11 @@ public class NumberEqualityInspection extends BaseInspection { private static PsiElement getElementMustContainNumberEquality(PsiElement element, boolean isNegated, boolean areBothOperandsComparedWithNull) { final PsiElement result; - if (element instanceof PsiConditionalExpression) { - final PsiConditionalExpression ternary = (PsiConditionalExpression) element; + if (element instanceof PsiConditionalExpression ternary) { final PsiElement thenExpression = skipParenthesizedExprDown(ternary.getThenExpression()); final PsiElement elseExpression = skipParenthesizedExprDown(ternary.getElseExpression()); result = isNegated ^ areBothOperandsComparedWithNull ? thenExpression : elseExpression; - } else if (element instanceof PsiIfStatement) { - final PsiIfStatement ifStatement = (PsiIfStatement) element; + } else if (element instanceof PsiIfStatement ifStatement) { final PsiElement thenBranch = ifStatement.getThenBranch(); final PsiElement elseBranch = ifStatement.getElseBranch(); result = isNegated ^ areBothOperandsComparedWithNull ? thenBranch : elseBranch; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java index f766cb84cd38..9048db975aa4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java @@ -181,10 +181,9 @@ public class ObjectEqualityInspection extends BaseInspection { } private boolean isThisReference(@Nullable PsiExpression expression, @Nullable PsiClass psiClass) { - if (!(expression instanceof PsiThisExpression)) { + if (!(expression instanceof PsiThisExpression thisExpression)) { return false; } - final PsiThisExpression thisExpression = (PsiThisExpression)expression; final PsiJavaCodeReferenceElement qualifier = thisExpression.getQualifier(); return qualifier == null || psiClass != null && qualifier.isReferenceTo(psiClass); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectToStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectToStringInspection.java index 81f9ac2f29d5..ae44fb44c4d2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectToStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectToStringInspection.java @@ -119,10 +119,9 @@ public class ObjectToStringInspection extends BaseInspection { } else if ("valueOf".equals(name)) { final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); - if (!(qualifierExpression instanceof PsiReferenceExpression)) { + if (!(qualifierExpression instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifierExpression; final String canonicalText = referenceExpression.getCanonicalText(); if (!CommonClassNames.JAVA_LANG_STRING.equals(canonicalText)) { return; @@ -141,7 +140,7 @@ public class ObjectToStringInspection extends BaseInspection { if (expression == null) return; final PsiType type = expression.getType(); - if (!(type instanceof PsiClassType)) return; + if (!(type instanceof PsiClassType classType)) return; if (IGNORE_TOSTRING && MethodUtils.isToString(PsiTreeUtil.getParentOfType(expression, PsiMethod.class))) return; @@ -156,7 +155,6 @@ public class ObjectToStringInspection extends BaseInspection { if (IGNORE_NONNLS && NonNlsUtils.isNonNlsAnnotatedUse(expression)) return; - final PsiClassType classType = (PsiClassType)type; if (type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) return; final PsiClass referencedClass = classType.resolve(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReflectionForUnavailableAnnotationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReflectionForUnavailableAnnotationInspection.java index 266d9a95ae84..d29185dee7dd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReflectionForUnavailableAnnotationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReflectionForUnavailableAnnotationInspection.java @@ -106,14 +106,13 @@ public class ReflectionForUnavailableAnnotationInspection extends BaseInspection if (arg == null) { return; } - if (!(arg instanceof PsiClassObjectAccessExpression)) { + if (!(arg instanceof PsiClassObjectAccessExpression classObjectAccessExpression)) { return; } final PsiExpression qualifier = methodExpression.getQualifierExpression(); if (!TypeUtils.expressionHasTypeOrSubtype(qualifier, "java.lang.reflect.AnnotatedElement")) { return; } - final PsiClassObjectAccessExpression classObjectAccessExpression = (PsiClassObjectAccessExpression)arg; final PsiTypeElement operand = classObjectAccessExpression.getOperand(); final PsiClass annotationClass = PsiTypesUtil.getPsiClass(operand.getType()); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReplaceAllDotInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReplaceAllDotInspection.java index bdca179b4378..d1350c1448b9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReplaceAllDotInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReplaceAllDotInspection.java @@ -89,10 +89,9 @@ public class ReplaceAllDotInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiLiteralExpression)) { + if (!(element instanceof PsiLiteralExpression expression)) { return; } - final PsiLiteralExpression expression = (PsiLiteralExpression)element; final String text = expression.getText(); final StringBuilder newExpression = new StringBuilder(); int length = text.length(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java index 4add4ac62508..54d3203f94b6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java @@ -141,10 +141,9 @@ public class StaticCallOnSubclassInspection extends BaseInspection implements Cl return; } final PsiElement referent = ((PsiReference)qualifier).resolve(); - if (!(referent instanceof PsiClass)) { + if (!(referent instanceof PsiClass referencedClass)) { return; } - final PsiClass referencedClass = (PsiClass)referent; final PsiClass declaringClass = method.getContainingClass(); if (declaringClass == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java index 94c969aa1ce2..513d9cc46953 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java @@ -87,18 +87,16 @@ public class StaticFieldReferenceOnSubclassInspection extends BaseInspection imp return; } final PsiElement referent = expression.resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return; } - final PsiField field = (PsiField)referent; if (!field.hasModifierProperty(PsiModifier.STATIC)) { return; } final PsiElement qualifierReferent = ((PsiReferenceExpression)qualifier).resolve(); - if (!(qualifierReferent instanceof PsiClass)) { + if (!(qualifierReferent instanceof PsiClass referencedClass)) { return; } - final PsiClass referencedClass = (PsiClass)qualifierReferent; final PsiClass declaringClass = field.getContainingClass(); if (declaringClass == null || declaringClass.equals(referencedClass)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInFormatCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInFormatCallInspection.java index 41aa4be3c46c..56e9d63606e4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInFormatCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInFormatCallInspection.java @@ -53,10 +53,9 @@ public class StringConcatenationInFormatCallInspection extends BaseInspection { private void checkFormatString(PsiMethodCallExpression call, PsiExpression formatString) { formatString = PsiUtil.skipParenthesizedExprDown(formatString); - if (!(formatString instanceof PsiPolyadicExpression)) return; + if (!(formatString instanceof PsiPolyadicExpression polyadicExpression)) return; if (!ExpressionUtils.hasStringType(formatString)) return; if (PsiUtil.isConstantExpression(formatString)) return; - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)formatString; final PsiExpression[] operands = polyadicExpression.getOperands(); if (!ContainerUtil.exists(operands, o -> ExpressionUtils.nonStructuralChildren(o).anyMatch( c -> c instanceof PsiReferenceExpression || c instanceof PsiMethodCallExpression || c instanceof PsiArrayAccessExpression))) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java index cecb4b8ac4c6..51920495c9ed 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java @@ -67,15 +67,13 @@ public class StringConcatenationInMessageFormatCallInspection extends BaseInspec @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiBinaryExpression)) { + if (!(element instanceof PsiBinaryExpression binaryExpression)) { return; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)element; final PsiElement parent = binaryExpression.getParent(); - if (!(parent instanceof PsiExpressionList)) { + if (!(parent instanceof PsiExpressionList expressionList)) { return; } - final PsiExpressionList expressionList = (PsiExpressionList)parent; final PsiExpression lhs = binaryExpression.getLOperand(); final PsiExpression rhs = binaryExpression.getROperand(); if (rhs == null) { @@ -103,8 +101,7 @@ public class StringConcatenationInMessageFormatCallInspection extends BaseInspec @Nullable private static PsiExpression addParameter(PsiExpression expression, int parameterNumber) { - if (expression instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; + if (expression instanceof PsiBinaryExpression binaryExpression) { final PsiExpression rhs = binaryExpression.getROperand(); if (rhs == null) { return null; @@ -116,8 +113,7 @@ public class StringConcatenationInMessageFormatCallInspection extends BaseInspec rhs.replace(newExpression); return expression; } - else if (expression instanceof PsiLiteralExpression) { - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)expression; + else if (expression instanceof PsiLiteralExpression literalExpression) { final Object value = literalExpression.getValue(); if (!(value instanceof String)) { return null; @@ -167,13 +163,12 @@ public class StringConcatenationInMessageFormatCallInspection extends BaseInspec if (formatArgumentType == null || !formatArgumentType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return; } - if (!(formatArgument instanceof PsiBinaryExpression)) { + if (!(formatArgument instanceof PsiBinaryExpression binaryExpression)) { return; } if (PsiUtil.isConstantExpression(formatArgument)) { return; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)formatArgument; final PsiExpression lhs = binaryExpression.getLOperand(); final PsiType lhsType = lhs.getType(); if (lhsType == null || !lhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { @@ -193,15 +188,13 @@ public class StringConcatenationInMessageFormatCallInspection extends BaseInspec return false; } final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); - if (!(qualifierExpression instanceof PsiReferenceExpression)) { + if (!(qualifierExpression instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifierExpression; final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return false; } - final PsiClass aClass = (PsiClass)target; return InheritanceUtil.isInheritor(aClass, "java.text.MessageFormat"); } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringEqualsCharSequenceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringEqualsCharSequenceInspection.java index 49899f833c62..dd5e5c3dedd0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringEqualsCharSequenceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringEqualsCharSequenceInspection.java @@ -42,10 +42,9 @@ public class StringEqualsCharSequenceInspection extends BaseInspection { return false; } final PsiElement target = expression.resolve(); - if (!(target instanceof PsiMethod)) { + if (!(target instanceof PsiMethod method)) { return false; } - final PsiMethod method = (PsiMethod)target; final PsiClass aClass = method.getContainingClass(); return aClass != null && CommonClassNames.JAVA_LANG_STRING.equals(aClass.getQualifiedName()); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousArrayCastInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousArrayCastInspection.java index 7457a550bb99..11a438221b55 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousArrayCastInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousArrayCastInspection.java @@ -72,10 +72,9 @@ public class SuspiciousArrayCastInspection extends BaseInspection { } private static boolean isCollectionToArrayCall(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); if (argumentList.getExpressionCount() != 1) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousComparatorCompareInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousComparatorCompareInspection.java index 2670a7723a1f..efb06701de14 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousComparatorCompareInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousComparatorCompareInspection.java @@ -250,10 +250,9 @@ public class SuspiciousComparatorCompareInspection extends BaseInspection { return; } final PsiElement target = expression.resolve(); - if (!(target instanceof PsiParameter)) { + if (!(target instanceof PsiParameter parameter)) { return; } - final PsiParameter parameter = (PsiParameter)target; parameters.remove(parameter); if (parameters.isEmpty()) { stopWalking(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousToArrayCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousToArrayCallInspection.java index 26a70bdb2080..733ae3a46ab6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousToArrayCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousToArrayCallInspection.java @@ -155,10 +155,9 @@ public class SuspiciousToArrayCallInspection extends BaseInspection { @NotNull PsiMethodCallExpression expression, PsiType argumentType, PsiType itemType) { - if (!(argumentType instanceof PsiArrayType)) { + if (!(argumentType instanceof PsiArrayType arrayType)) { return; } - final PsiArrayType arrayType = (PsiArrayType)argumentType; final PsiType componentType = arrayType.getComponentType(); PsiType actualType = getActualItemTypeIfMismatch(arrayType, expression, itemType); if (actualType != null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/TextLabelInSwitchStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/TextLabelInSwitchStatementInspection.java index c56c98b2cb25..fd25b6f9315e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/TextLabelInSwitchStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/TextLabelInSwitchStatementInspection.java @@ -55,10 +55,9 @@ public class TextLabelInSwitchStatementInspection extends BaseInspection { return; } for (PsiStatement statement : body.getStatements()) { - if (!(statement instanceof PsiLabeledStatement)) { + if (!(statement instanceof PsiLabeledStatement labeledStatement)) { continue; } - final PsiLabeledStatement labeledStatement = (PsiLabeledStatement)statement; registerError(labeledStatement.getLabelIdentifier(), block); } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThisPassedAsArgumentVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThisPassedAsArgumentVisitor.java index acfeffbc0ce5..cdce18bde9b3 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThisPassedAsArgumentVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThisPassedAsArgumentVisitor.java @@ -64,8 +64,7 @@ class ThisPassedAsArgumentVisitor extends JavaRecursiveElementWalkingVisitor { } private static boolean isThisExpression(PsiExpression expression) { - if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { return isThisExpression(parenthesizedExpression.getExpression()); } return expression instanceof PsiThisExpression; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java index 3872cdfd6b6c..60ca103c185f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java @@ -158,9 +158,8 @@ public class ThrowableNotThrownInspection extends BaseInspection { return checkDeep && !isUsedElsewhere((PsiLocalVariable)parent); } } - else if (parent instanceof PsiExpressionStatement) { + else if (parent instanceof PsiExpressionStatement expressionStatement) { // void method (like printStackTrace()) provides no result, thus can't be ignored - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)parent; final PsiExpression expression1 = expressionStatement.getExpression(); return !PsiTypes.voidType().equals(expression1.getType()); } @@ -174,17 +173,15 @@ public class ThrowableNotThrownInspection extends BaseInspection { || parent instanceof PsiIfStatement || parent instanceof PsiAssertStatement) { return false; } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression rhs = assignmentExpression.getRExpression(); if (!PsiTreeUtil.isAncestor(rhs, expression, false)) { return false; } final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression()); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; final PsiElement target = referenceExpression.resolve(); if (!(target instanceof PsiLocalVariable)) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/UseOfPropertiesAsHashtableInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/UseOfPropertiesAsHashtableInspection.java index f9963d321c03..1e9e1b72bf88 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/UseOfPropertiesAsHashtableInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/UseOfPropertiesAsHashtableInspection.java @@ -92,10 +92,9 @@ public class UseOfPropertiesAsHashtableInspection extends BaseInspection impleme final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); CommentTracker commentTracker = new CommentTracker(); @NonNls final StringBuilder newExpression = new StringBuilder(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/VariableNotUsedInsideIfInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/VariableNotUsedInsideIfInspection.java index c5eb9f4ba792..bada110b1f87 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/VariableNotUsedInsideIfInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/VariableNotUsedInsideIfInspection.java @@ -50,10 +50,9 @@ public class VariableNotUsedInsideIfInspection extends BaseInspection { public void visitConditionalExpression(@NotNull PsiConditionalExpression expression) { super.visitConditionalExpression(expression); final PsiExpression condition = PsiUtil.skipParenthesizedExprDown(expression.getCondition()); - if (!(condition instanceof PsiBinaryExpression)) { + if (!(condition instanceof PsiBinaryExpression binaryExpression)) { return; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)condition; final PsiReferenceExpression referenceExpression = extractVariableReference(binaryExpression); if (referenceExpression == null) { return; @@ -75,10 +74,9 @@ public class VariableNotUsedInsideIfInspection extends BaseInspection { public void visitIfStatement(@NotNull PsiIfStatement statement) { super.visitIfStatement(statement); final PsiExpression condition = PsiUtil.skipParenthesizedExprDown(statement.getCondition()); - if (!(condition instanceof PsiBinaryExpression)) { + if (!(condition instanceof PsiBinaryExpression binaryExpression)) { return; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)condition; final PsiReferenceExpression referenceExpression = extractVariableReference(binaryExpression); if (referenceExpression == null) { return; @@ -98,10 +96,9 @@ public class VariableNotUsedInsideIfInspection extends BaseInspection { private boolean checkVariableUsage(PsiReferenceExpression referenceExpression, PsiElement thenContext, PsiElement elseContext) { final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)target; if (thenContext != null && (contextExits(thenContext) || VariableAccessUtils.variableIsAssigned(variable, thenContext))) { return false; } @@ -136,8 +133,7 @@ public class VariableNotUsedInsideIfInspection extends BaseInspection { } private static boolean contextExits(PsiElement context) { - if (context instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)context; + if (context instanceof PsiBlockStatement blockStatement) { final PsiStatement lastStatement = ControlFlowUtils.getLastStatementInBlock(blockStatement.getCodeBlock()); return statementExits(lastStatement); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java index 4fd3094de5ae..a4d12692f625 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java @@ -94,10 +94,9 @@ public class ClassInitializerInspection extends BaseInspection { return; } final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiClassInitializer)) { + if (!(grandParent instanceof PsiClassInitializer initializer)) { return; } - final PsiClassInitializer initializer = (PsiClassInitializer)grandParent; final PsiClass aClass = initializer.getContainingClass(); if (aClass == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java index ff8693c39eae..408f0a1c0f36 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java @@ -94,10 +94,9 @@ public class ListenerMayUseAdapterInspection extends BaseInspection { final PsiMethod[] methods = aClass.getMethods(); if (methods.length > 0) { final PsiElement target = element.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass interfaceClass)) { return; } - final PsiClass interfaceClass = (PsiClass)target; for (PsiMethod method : methods) { if (!ControlFlowUtils.isEmptyCodeBlock(method.getBody())) { continue; @@ -148,10 +147,9 @@ public class ListenerMayUseAdapterInspection extends BaseInspection { private void checkReference(@NotNull PsiClass aClass, @NotNull PsiJavaCodeReferenceElement implementsReference) { final PsiElement target = implementsReference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass implementsClass)) { return; } - final PsiClass implementsClass = (PsiClass)target; @NonNls final String className = implementsClass.getQualifiedName(); if (className == null || !className.endsWith("Listener")) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassCanBeEnumInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassCanBeEnumInspection.java index 267e6b34dbcf..ea94868831ff 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassCanBeEnumInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassCanBeEnumInspection.java @@ -53,10 +53,9 @@ public class UtilityClassCanBeEnumInspection extends BaseInspection implements C return; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiClass)) { + if (!(parent instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)parent; for (PsiMethod constructor : aClass.getConstructors()) { constructor.delete(); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneInNonCloneableClassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneInNonCloneableClassInspection.java index 24fbdf620ed5..e2eab9d1a69e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneInNonCloneableClassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneInNonCloneableClassInspection.java @@ -42,8 +42,7 @@ public class CloneInNonCloneableClassInspection extends BaseInspection { @NotNull public String buildErrorString(Object... infos) { final PsiClass aClass = (PsiClass)infos[0]; - if (aClass instanceof PsiAnonymousClass) { - final PsiAnonymousClass anonymousClass = (PsiAnonymousClass)aClass; + if (aClass instanceof PsiAnonymousClass anonymousClass) { final String text = anonymousClass.getBaseClassType().getPresentableText(); return InspectionGadgetsBundle.message("clone.method.in.non.cloneable.anonymous.class.problem.descriptor", text); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneReturnsClassTypeInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneReturnsClassTypeInspection.java index 3f6ca6b6cc04..2ab420b219ac 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneReturnsClassTypeInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneReturnsClassTypeInspection.java @@ -66,10 +66,9 @@ public class CloneReturnsClassTypeInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiTypeElement)) { + if (!(element instanceof PsiTypeElement typeElement)) { return; } - final PsiTypeElement typeElement = (PsiTypeElement)element; final PsiElement parent = typeElement.getParent(); if (!(parent instanceof PsiMethod)) { return; @@ -124,8 +123,7 @@ public class CloneReturnsClassTypeInspection extends BaseInspection { final PsiType returnType = typeElement.getType(); final PsiClass aClass = PsiUtil.resolveClassInClassTypeOnly(returnType); PsiClass containingClass = method.getContainingClass(); - if (containingClass instanceof PsiAnonymousClass) { - final PsiAnonymousClass anonymousClass = (PsiAnonymousClass)containingClass; + if (containingClass instanceof PsiAnonymousClass anonymousClass) { final PsiClassType baseClassType = anonymousClass.getBaseClassType(); containingClass = PsiUtil.resolveClassInClassTypeOnly(baseClassType); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/BooleanExpressionMayBeConditionalInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/BooleanExpressionMayBeConditionalInspection.java index 4d128bac80ff..9fa6183f59d8 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/BooleanExpressionMayBeConditionalInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/BooleanExpressionMayBeConditionalInspection.java @@ -62,17 +62,14 @@ public class BooleanExpressionMayBeConditionalInspection extends BaseInspection @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiBinaryExpression)) { + if (!(element instanceof PsiBinaryExpression binaryExpression)) { return; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)element; final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(binaryExpression.getLOperand()); final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(binaryExpression.getROperand()); - if (!(lhs instanceof PsiBinaryExpression) || !(rhs instanceof PsiBinaryExpression)) { + if (!(lhs instanceof PsiBinaryExpression lBinaryExpression) || !(rhs instanceof PsiBinaryExpression rBinaryExpression)) { return; } - final PsiBinaryExpression lBinaryExpression = (PsiBinaryExpression)lhs; - final PsiBinaryExpression rBinaryExpression = (PsiBinaryExpression)rhs; final PsiExpression llhs = PsiUtil.skipParenthesizedExprDown(lBinaryExpression.getLOperand()); final PsiExpression lrhs = PsiUtil.skipParenthesizedExprDown(rBinaryExpression.getLOperand()); if (llhs == null || lrhs == null) { @@ -117,11 +114,9 @@ public class BooleanExpressionMayBeConditionalInspection extends BaseInspection } final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(expression.getLOperand()); final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(expression.getROperand()); - if (!(lhs instanceof PsiBinaryExpression) || !(rhs instanceof PsiBinaryExpression)) { + if (!(lhs instanceof PsiBinaryExpression lBinaryExpression) || !(rhs instanceof PsiBinaryExpression rBinaryExpression)) { return; } - final PsiBinaryExpression lBinaryExpression = (PsiBinaryExpression)lhs; - final PsiBinaryExpression rBinaryExpression = (PsiBinaryExpression)rhs; final IElementType lTokenType = lBinaryExpression.getOperationTokenType(); final IElementType rTokenType = rBinaryExpression.getOperationTokenType(); if (!JavaTokenType.ANDAND.equals(lTokenType) || !JavaTokenType.ANDAND.equals(rTokenType)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalCanBePushedInsideExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalCanBePushedInsideExpressionInspection.java index 77d225b36be0..b71465e504e2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalCanBePushedInsideExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalCanBePushedInsideExpressionInspection.java @@ -121,10 +121,9 @@ public class ConditionalCanBePushedInsideExpressionInspection extends BaseInspec return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiExpressionList)) { + if (!(parent instanceof PsiExpressionList expressionList)) { return false; } - final PsiExpressionList expressionList = (PsiExpressionList)parent; if (expressionList.getExpressionCount() != 1) { return false; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java index ad341df76dad..db9784605d76 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java @@ -93,8 +93,7 @@ public class ConfusingElseInspection extends BaseInspection implements CleanupLo anchor = parent; parent = anchor.getParent(); } - if (elseBranch instanceof PsiBlockStatement) { - final PsiBlockStatement elseBlock = (PsiBlockStatement)elseBranch; + if (elseBranch instanceof PsiBlockStatement elseBlock) { final PsiCodeBlock block = elseBlock.getCodeBlock(); final PsiElement[] children = block.getChildren(); if (children.length > 2) { @@ -147,8 +146,7 @@ public class ConfusingElseInspection extends BaseInspection implements CleanupLo private boolean parentCompletesNormally(PsiElement element) { PsiElement parent = element.getParent(); - while (parent instanceof PsiIfStatement) { - final PsiIfStatement ifStatement = (PsiIfStatement)parent; + while (parent instanceof PsiIfStatement ifStatement) { final PsiStatement elseBranch = ifStatement.getElseBranch(); if (elseBranch != element) { return true; @@ -167,8 +165,7 @@ public class ConfusingElseInspection extends BaseInspection implements CleanupLo private PsiStatement getNextStatement(PsiIfStatement statement) { while (true) { final PsiElement parent = statement.getParent(); - if (parent instanceof PsiIfStatement) { - final PsiIfStatement parentIfStatement = (PsiIfStatement)parent; + if (parent instanceof PsiIfStatement parentIfStatement) { final PsiStatement elseBranch = parentIfStatement.getElseBranch(); if (elseBranch == statement) { statement = parentIfStatement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java index ad790b7a9b7a..222a8ecdbc30 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java @@ -88,8 +88,7 @@ public class DefaultNotLastCaseInSwitchInspection extends BaseInspection impleme boolean labelSeen = false; for (int i = statements.length - 1; i >= 0; i--) { final PsiStatement child = statements[i]; - if (child instanceof PsiSwitchLabelStatementBase) { - final PsiSwitchLabelStatementBase label = (PsiSwitchLabelStatementBase)child; + if (child instanceof PsiSwitchLabelStatementBase label) { PsiElement defaultElement = SwitchUtils.findDefaultElement(label); if (defaultElement != null) { if (labelSeen) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java index d4337cb07abc..f30efdf43b9b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java @@ -62,12 +62,10 @@ public class DoubleNegationInspection extends BaseInspection implements CleanupL protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement expression = descriptor.getPsiElement(); CommentTracker tracker = new CommentTracker(); - if (expression instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression; + if (expression instanceof PsiPrefixExpression prefixExpression) { final PsiExpression operand = PsiUtil.skipParenthesizedExprDown(prefixExpression.getOperand()); PsiReplacementUtil.replaceExpression(prefixExpression, BoolUtils.getNegatedExpressionText(operand, tracker), tracker); - } else if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + } else if (expression instanceof PsiPolyadicExpression polyadicExpression) { final PsiExpression[] operands = polyadicExpression.getOperands(); final int length = operands.length; if (length == 2) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DuplicateConditionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DuplicateConditionInspection.java index 12716ea2692c..a6c248e812bd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DuplicateConditionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DuplicateConditionInspection.java @@ -87,8 +87,7 @@ public class DuplicateConditionInspection extends BaseInspection { PsiElement parent = PsiUtil.skipParenthesizedExprUp(expression.getParent()); if (parent instanceof PsiIfStatement) return; - if (parent instanceof PsiBinaryExpression) { - final PsiBinaryExpression parentExpression = (PsiBinaryExpression)parent; + if (parent instanceof PsiBinaryExpression parentExpression) { if (tokenType.equals(parentExpression.getOperationTokenType())) return; } @@ -120,8 +119,7 @@ public class DuplicateConditionInspection extends BaseInspection { private void collectConditionsForExpression(PsiExpression condition, Set conditions, IElementType wantedTokenType) { condition = PsiUtil.skipParenthesizedExprDown(condition); if (condition == null) return; - if (condition instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)condition; + if (condition instanceof PsiPolyadicExpression polyadicExpression) { final IElementType tokenType = polyadicExpression.getOperationTokenType(); if (wantedTokenType.equals(tokenType)) { final PsiExpression[] operands = polyadicExpression.getOperands(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ExpressionMayBeFactorizedInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ExpressionMayBeFactorizedInspection.java index ef6d9b03d377..4460a846b7c4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ExpressionMayBeFactorizedInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ExpressionMayBeFactorizedInspection.java @@ -59,11 +59,9 @@ public class ExpressionMayBeFactorizedInspection extends BaseInspection { } final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(expression.getLOperand()); final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(expression.getROperand()); - if (!(lhs instanceof PsiBinaryExpression) || !(rhs instanceof PsiBinaryExpression)) { + if (!(lhs instanceof PsiBinaryExpression lBinaryExpression) || !(rhs instanceof PsiBinaryExpression rBinaryExpression)) { return; } - final PsiBinaryExpression lBinaryExpression = (PsiBinaryExpression)lhs; - final PsiBinaryExpression rBinaryExpression = (PsiBinaryExpression)rhs; final IElementType lTokenType = lBinaryExpression.getOperationTokenType(); final IElementType rTokenType = rBinaryExpression.getOperationTokenType(); if (!innerTokens.contains(lTokenType) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java index a0181ff38d6d..38d17cb47f5e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java @@ -122,8 +122,7 @@ public class FallthruInSwitchStatementInspection extends BaseInspection { return; } final PsiElement previousSibling = PsiTreeUtil.skipWhitespacesBackward(statement); - if (previousSibling instanceof PsiComment) { - final PsiComment comment = (PsiComment)previousSibling; + if (previousSibling instanceof PsiComment comment) { final String commentText = comment.getText(); if (commentPattern.matcher(commentText).find() && JavaSuppressionUtil.getSuppressedInspectionIdsIn(comment) == null) { continue; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java index 8a3fc9579180..d53ac42ff0a5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java @@ -119,8 +119,7 @@ public class ForLoopReplaceableByWhileInspection extends BaseInspection implemen final PsiStatement update = forStatement.getUpdate(); if (update != null) { final PsiStatement[] updateStatements; - if (update instanceof PsiExpressionListStatement) { - final PsiExpressionListStatement expressionListStatement = (PsiExpressionListStatement)update; + if (update instanceof PsiExpressionListStatement expressionListStatement) { final PsiExpressionList expressionList = expressionListStatement.getExpressionList(); final PsiExpression[] expressions = expressionList.getExpressions(); updateStatements = new PsiStatement[expressions.length]; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopWithMissingComponentInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopWithMissingComponentInspection.java index daef4e9a0685..c5ac49c0f362 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopWithMissingComponentInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopWithMissingComponentInspection.java @@ -111,17 +111,15 @@ public class ForLoopWithMissingComponentInspection extends BaseInspection { private boolean isCollectionLoopStatement(PsiForStatement forStatement) { final PsiStatement initialization = forStatement.getInitialization(); - if (!(initialization instanceof PsiDeclarationStatement)) { + if (!(initialization instanceof PsiDeclarationStatement declaration)) { return false; } - final PsiDeclarationStatement declaration = (PsiDeclarationStatement)initialization; final PsiElement[] declaredElements = declaration.getDeclaredElements(); final PsiExpression condition = forStatement.getCondition(); for (PsiElement declaredElement : declaredElements) { - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable variable)) { continue; } - final PsiVariable variable = (PsiVariable)declaredElement; if (TypeUtils.variableHasTypeOrSubtype(variable, "java.util.ListIterator")) { if (isHasNext(condition, variable) || isHasPrevious(condition, variable)) { return true; @@ -154,8 +152,7 @@ public class ForLoopWithMissingComponentInspection extends BaseInspection { } private boolean isCallToBooleanZeroArgumentMethod(@NonNls String methodName, PsiExpression expression, PsiVariable calledOn) { - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression polyadicExpression) { for (PsiExpression operand : polyadicExpression.getOperands()) { if (isCallToBooleanZeroArgumentMethod(methodName, operand, calledOn)) { return true; @@ -163,19 +160,17 @@ public class ForLoopWithMissingComponentInspection extends BaseInspection { } return false; } - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression call)) { return false; } - final PsiMethodCallExpression call = (PsiMethodCallExpression)expression; if (!MethodCallUtils.isCallToMethod(call, null, PsiTypes.booleanType(), methodName)) { return false; } final PsiReferenceExpression methodExpression = call.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (!(qualifier instanceof PsiReferenceExpression)) { + if (!(qualifier instanceof PsiReferenceExpression referenceExpression)) { return true; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifier; final PsiElement target = referenceExpression.resolve(); return calledOn.equals(target); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java index 64199c310fae..2a640e4f06cf 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java @@ -314,8 +314,7 @@ public class IfStatementWithIdenticalBranchesInspection extends AbstractBaseJava Map referenceToNewName = new HashMap<>(); Map variableToNewName = new HashMap<>(); for (ExtractionUnit unit : units) { - if (unit instanceof VariableDeclarationUnit) { - VariableDeclarationUnit declarationUnit = (VariableDeclarationUnit)unit; + if (unit instanceof VariableDeclarationUnit declarationUnit) { PsiLocalVariable thenVariable = declarationUnit.myThenVariable; PsiLocalVariable elseVariable = declarationUnit.myElseVariable; String baseName = substitutionTable.get(elseVariable); @@ -785,8 +784,7 @@ public class IfStatementWithIdenticalBranchesInspection extends AbstractBaseJava boolean variableRenameRequired() { return ContainerUtil.or(myHeadUnitsOfThen, unit -> { - if (unit instanceof VariableDeclarationUnit) { - VariableDeclarationUnit declarationUnit = (VariableDeclarationUnit)unit; + if (unit instanceof VariableDeclarationUnit declarationUnit) { if (!Objects.equals(declarationUnit.myThenVariable.getName(), declarationUnit.myElseVariable.getName())) { return true; } @@ -1266,12 +1264,10 @@ public class IfStatementWithIdenticalBranchesInspection extends AbstractBaseJava protected Match referenceExpressionsMatch(PsiReferenceExpression first, PsiReferenceExpression second) { PsiElement firstElement = first.resolve(); PsiElement secondElement = second.resolve(); - if (firstElement instanceof PsiLocalVariable && - secondElement instanceof PsiLocalVariable && + if (firstElement instanceof PsiLocalVariable firstVar && + secondElement instanceof PsiLocalVariable secondVar && myLocalVariables.contains(firstElement) && myLocalVariables.contains(secondElement)) { - PsiLocalVariable secondVar = (PsiLocalVariable)secondElement; - PsiLocalVariable firstVar = (PsiLocalVariable)firstElement; if (firstVar.getType().equals(secondVar.getType())) { String firstVarName = firstVar.getName(); String secondVarName = secondVar.getName(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/InfiniteLoopStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/InfiniteLoopStatementInspection.java index 127758766499..737cdac167c6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/InfiniteLoopStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/InfiniteLoopStatementInspection.java @@ -102,18 +102,15 @@ public class InfiniteLoopStatementInspection extends BaseInspection { PsiElement parent = PsiTreeUtil.findFirstParent(statement, element -> element instanceof PsiMethod || element instanceof PsiLambdaExpression || element instanceof PsiAnonymousClass); - if (parent instanceof PsiMethod) { - PsiMethod method = (PsiMethod)parent; + if (parent instanceof PsiMethod method) { if (method.hasModifier(JvmModifier.PRIVATE)) { PsiClass aClass = method.getContainingClass(); boolean allUsagesAreInThreadStart = StreamEx.ofTree((PsiElement)aClass, element -> StreamEx.of(element.getChildren())) .filter(element -> { - if (element instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)element; + if (element instanceof PsiMethodCallExpression call) { return call.getMethodExpression().isReferenceTo(method); } - if (element instanceof PsiMethodReferenceExpression) { - PsiMethodReferenceExpression methodReference = (PsiMethodReferenceExpression)element; + if (element instanceof PsiMethodReferenceExpression methodReference) { return methodReference.isReferenceTo(method); } return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopConditionNotUpdatedInsideLoopInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopConditionNotUpdatedInsideLoopInspection.java index 3992028c91a2..b2cd579c2305 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopConditionNotUpdatedInsideLoopInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopConditionNotUpdatedInsideLoopInspection.java @@ -135,9 +135,7 @@ public class LoopConditionNotUpdatedInsideLoopInspection extends BaseInspection if (PsiUtil.isConstantExpression(condition) || ExpressionUtils.isNullLiteral(condition)) { return true; } - if (condition instanceof PsiInstanceOfExpression) { - final PsiInstanceOfExpression instanceOfExpression = - (PsiInstanceOfExpression)condition; + if (condition instanceof PsiInstanceOfExpression instanceOfExpression) { final PsiExpression operand = instanceOfExpression.getOperand(); return isConditionNotUpdated(operand, context, notUpdated); } @@ -147,11 +145,10 @@ public class LoopConditionNotUpdatedInsideLoopInspection extends BaseInspection ((PsiParenthesizedExpression)condition).getExpression(); return isConditionNotUpdated(expression, context, notUpdated); } - else if (condition instanceof PsiPolyadicExpression) { + else if (condition instanceof PsiPolyadicExpression polyadicExpression) { // while (value != x) { ... } // while (value != (x + y)) { ... } // while (b1 && b2) { ... } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)condition; for (PsiExpression operand : polyadicExpression.getOperands()) { if (!isConditionNotUpdated(operand, context, notUpdated)) { return false; @@ -159,12 +156,9 @@ public class LoopConditionNotUpdatedInsideLoopInspection extends BaseInspection } return true; } - else if (condition instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)condition; + else if (condition instanceof PsiReferenceExpression referenceExpression) { final PsiElement element = referenceExpression.resolve(); - if (element instanceof PsiField) { - final PsiField field = (PsiField)element; + if (element instanceof PsiField field) { final PsiType type = field.getType(); if (field.hasModifierProperty(PsiModifier.FINAL) && type.getArrayDimensions() == 0) { @@ -195,14 +189,13 @@ public class LoopConditionNotUpdatedInsideLoopInspection extends BaseInspection } } } - else if (condition instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)condition; + else if (condition instanceof PsiPrefixExpression prefixExpression) { if (!PsiUtil.isIncrementDecrementOperation(prefixExpression)) { final PsiExpression operand = prefixExpression.getOperand(); return isConditionNotUpdated(operand, context, notUpdated); } } - else if (condition instanceof PsiArrayAccessExpression) { + else if (condition instanceof PsiArrayAccessExpression accessExpression) { // Actually the contents of the array could change nevertheless // if it is accessed through a different reference like this: // int[] local_ints = new int[]{1, 2}; @@ -210,14 +203,11 @@ public class LoopConditionNotUpdatedInsideLoopInspection extends BaseInspection // while (local_ints[0] > 0) { other_ints[0]--; } // // Keep this check? - final PsiArrayAccessExpression accessExpression = (PsiArrayAccessExpression)condition; final PsiExpression indexExpression = accessExpression.getIndexExpression(); return isConditionNotUpdated(indexExpression, context, notUpdated) && isConditionNotUpdated(accessExpression.getArrayExpression(), context, notUpdated); } - else if (condition instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditionalExpression = - (PsiConditionalExpression)condition; + else if (condition instanceof PsiConditionalExpression conditionalExpression) { final PsiExpression thenExpression = conditionalExpression.getThenExpression(); final PsiExpression elseExpression = diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java index e06224ea3fed..482ff352ba68 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java @@ -70,8 +70,7 @@ public class LoopWithImplicitTerminationConditionInspection final PsiStatement body = parent.getBody(); final boolean firstStatement = !(parent instanceof PsiDoWhileStatement); final PsiStatement statement; - if (body instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)body; + if (body instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiStatement[] statements = codeBlock.getStatements(); if (statements.length == 0) { @@ -87,10 +86,9 @@ public class LoopWithImplicitTerminationConditionInspection else { statement = body; } - if (!(statement instanceof PsiIfStatement)) { + if (!(statement instanceof PsiIfStatement ifStatement)) { return; } - final PsiIfStatement ifStatement = (PsiIfStatement)statement; final PsiExpression ifCondition = ifStatement.getCondition(); if (ifCondition == null) { return; @@ -120,12 +118,10 @@ public class LoopWithImplicitTerminationConditionInspection replacedStatement.delete(); return; } - if (!(replacingStatement instanceof PsiBlockStatement)) { + if (!(replacingStatement instanceof PsiBlockStatement blockStatement)) { replacedStatement.replace(replacingStatement); return; } - final PsiBlockStatement blockStatement = - (PsiBlockStatement)replacingStatement; final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiElement[] children = codeBlock.getChildren(); @@ -182,8 +178,7 @@ public class LoopWithImplicitTerminationConditionInspection private static boolean isLoopWithImplicitTerminationCondition(PsiLoopStatement statement, boolean firstStatement) { final PsiStatement body = statement.getBody(); final PsiStatement bodyStatement; - if (body instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)body; + if (body instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiStatement[] statements = codeBlock.getStatements(); if (statements.length == 0) { @@ -203,10 +198,9 @@ public class LoopWithImplicitTerminationConditionInspection } private static boolean isImplicitTerminationCondition(@Nullable PsiStatement statement) { - if (!(statement instanceof PsiIfStatement)) { + if (!(statement instanceof PsiIfStatement ifStatement)) { return false; } - final PsiIfStatement ifStatement = (PsiIfStatement)statement; final PsiStatement thenBranch = ifStatement.getThenBranch(); if (containsUnlabeledBreakStatement(thenBranch)) { return true; @@ -217,10 +211,9 @@ public class LoopWithImplicitTerminationConditionInspection } static boolean containsUnlabeledBreakStatement(@Nullable PsiStatement statement) { - if (!(statement instanceof PsiBlockStatement)) { + if (!(statement instanceof PsiBlockStatement blockStatement)) { return isUnlabeledBreakStatement(statement); } - final PsiBlockStatement blockStatement = (PsiBlockStatement)statement; final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiStatement firstStatement = ControlFlowUtils.getOnlyStatementInBlock(codeBlock); return isUnlabeledBreakStatement(firstStatement); @@ -228,11 +221,9 @@ public class LoopWithImplicitTerminationConditionInspection private static boolean isUnlabeledBreakStatement( @Nullable PsiStatement statement) { - if (!(statement instanceof PsiBreakStatement)) { + if (!(statement instanceof PsiBreakStatement breakStatement)) { return false; } - final PsiBreakStatement breakStatement = - (PsiBreakStatement)statement; final PsiIdentifier identifier = breakStatement.getLabelIdentifier(); return identifier == null; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalExpressionInspection.java index 6adce1589922..764508857b4b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalExpressionInspection.java @@ -46,15 +46,13 @@ public class NegatedConditionalExpressionInspection extends BaseInspection imple @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent(); - if (!(element instanceof PsiPrefixExpression)) { + if (!(element instanceof PsiPrefixExpression prefixExpression)) { return; } - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)element; final PsiExpression operand = PsiUtil.skipParenthesizedExprDown(prefixExpression.getOperand()); - if (!(operand instanceof PsiConditionalExpression)) { + if (!(operand instanceof PsiConditionalExpression conditionalExpression)) { return; } - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)operand; final StringBuilder newExpression = new StringBuilder(); final PsiExpression condition = conditionalExpression.getCondition(); CommentTracker tracker = new CommentTracker(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedEqualityExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedEqualityExpressionInspection.java index 13408109f52d..bf7e517ca294 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedEqualityExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedEqualityExpressionInspection.java @@ -43,18 +43,16 @@ public class NegatedEqualityExpressionInspection extends BaseInspection implemen protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiPrefixExpression)) { + if (!(parent instanceof PsiPrefixExpression prefixExpression)) { return; } - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)parent; if (!JavaTokenType.EXCL.equals(prefixExpression.getOperationTokenType())) { return; } final PsiExpression operand = PsiUtil.skipParenthesizedExprDown(prefixExpression.getOperand()); - if (!(operand instanceof PsiBinaryExpression)) { + if (!(operand instanceof PsiBinaryExpression binaryExpression)) { return; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)operand; final IElementType tokenType = binaryExpression.getOperationTokenType(); CommentTracker commentTracker = new CommentTracker(); StringBuilder text = new StringBuilder(commentTracker.text(binaryExpression.getLOperand())); @@ -90,10 +88,9 @@ public class NegatedEqualityExpressionInspection extends BaseInspection implemen return; } final PsiExpression operand = PsiUtil.skipParenthesizedExprDown(expression.getOperand()); - if (!(operand instanceof PsiBinaryExpression)) { + if (!(operand instanceof PsiBinaryExpression binaryExpression)) { return; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)operand; final IElementType tokenType = binaryExpression.getOperationTokenType(); if (JavaTokenType.EQEQ.equals(tokenType)) { registerError(expression.getOperationSign(), "=="); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedIfElseInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedIfElseInspection.java index ed08aeec631e..67a21922fbc5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedIfElseInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedIfElseInspection.java @@ -100,8 +100,7 @@ public class NegatedIfElseInspection extends BaseInspection { final String negatedCondition = BoolUtils.getNegatedExpressionText(condition, tracker); String elseText = tracker.text(elseBranch); final PsiElement lastChild = elseBranch.getLastChild(); - if (lastChild instanceof PsiComment) { - final PsiComment comment = (PsiComment)lastChild; + if (lastChild instanceof PsiComment comment) { final IElementType tokenType = comment.getTokenType(); if (JavaTokenType.END_OF_LINE_COMMENT.equals(tokenType)) { elseText += '\n'; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/PointlessIndexOfComparisonInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/PointlessIndexOfComparisonInspection.java index eace21c2365e..ed6075b6943e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/PointlessIndexOfComparisonInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/PointlessIndexOfComparisonInspection.java @@ -117,10 +117,9 @@ public class PointlessIndexOfComparisonInspection extends BaseInspection { } final Object object = ExpressionUtils.computeConstantExpression(rhs); - if (!(object instanceof Integer)) { + if (!(object instanceof Integer integer)) { return false; } - final Integer integer = (Integer)object; final int constant = integer.intValue(); final IElementType tokenType = sign.getTokenType(); if (tokenType == null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/PointlessNullCheckInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/PointlessNullCheckInspection.java index ab7698f8eaee..bfae8ed147f0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/PointlessNullCheckInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/PointlessNullCheckInspection.java @@ -135,8 +135,7 @@ public class PointlessNullCheckInspection extends BaseInspection implements Clea @Nullable private static PsiReferenceExpression getReferenceFromBooleanCall(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) return null; - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (!(expression instanceof PsiMethodCallExpression call)) return null; if (!PsiTypes.booleanType().equals(call.getType())) return null; PsiExpression qualifier = call.getMethodExpression().getQualifierExpression(); if (qualifier != null && SideEffectChecker.mayHaveSideEffects(qualifier)) return null; @@ -175,8 +174,7 @@ public class PointlessNullCheckInspection extends BaseInspection implements Clea @Nullable private PsiReferenceExpression getReferenceFromOrChain(PsiExpression expression) { - if (!(expression instanceof PsiPolyadicExpression)) return null; - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + if (!(expression instanceof PsiPolyadicExpression polyadicExpression)) return null; final IElementType tokenType = polyadicExpression.getOperationTokenType(); if (JavaTokenType.OROR != tokenType) return null; final PsiExpression[] operands = polyadicExpression.getOperands(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableBooleanExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableBooleanExpressionInspection.java index acda1d758ad5..adcf3e8f5111 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableBooleanExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableBooleanExpressionInspection.java @@ -44,8 +44,7 @@ public class SimplifiableBooleanExpressionInspection extends BaseInspection impl @Override protected String buildErrorString(Object... infos) { final Object info = infos[0]; - if (info instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)info; + if (info instanceof PsiPrefixExpression prefixExpression) { return InspectionGadgetsBundle.message("boolean.expression.can.be.simplified.problem.descriptor", calculateReplacementExpression(prefixExpression, new CommentTracker())); } @@ -76,12 +75,10 @@ public class SimplifiableBooleanExpressionInspection extends BaseInspection impl final PsiElement element = descriptor.getPsiElement(); CommentTracker commentTracker = new CommentTracker(); final String replacement; - if (element instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)element; + if (element instanceof PsiPrefixExpression prefixExpression) { replacement = calculateReplacementExpression(prefixExpression, commentTracker); } - else if (element instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)element; + else if (element instanceof PsiBinaryExpression binaryExpression) { replacement = calculateReplacementExpression(binaryExpression, commentTracker); } else { @@ -98,10 +95,9 @@ public class SimplifiableBooleanExpressionInspection extends BaseInspection impl @NonNls static String calculateReplacementExpression(PsiPrefixExpression expression, CommentTracker commentTracker) { final PsiExpression operand = PsiUtil.skipParenthesizedExprDown(expression.getOperand()); - if (!(operand instanceof PsiBinaryExpression)) { + if (!(operand instanceof PsiBinaryExpression binaryExpression)) { return null; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)operand; final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(binaryExpression.getLOperand()); final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(binaryExpression.getROperand()); if (lhs == null || rhs == null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableEqualsExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableEqualsExpressionInspection.java index 35a26695b7bb..bbddfe685079 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableEqualsExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableEqualsExpressionInspection.java @@ -85,28 +85,25 @@ public class SimplifiableEqualsExpressionInspection extends BaseInspection imple protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = ParenthesesUtils.getParentSkipParentheses(element); - if (!(parent instanceof PsiPolyadicExpression)) { + if (!(parent instanceof PsiPolyadicExpression polyadicExpression)) { return; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; final PsiExpression[] operands = polyadicExpression.getOperands(); if (operands.length != 2) { return; } PsiExpression operand = PsiUtil.skipParenthesizedExprDown(operands[1]); @NonNls final StringBuilder newExpressionText = new StringBuilder(); - if (operand instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)operand; + if (operand instanceof PsiPrefixExpression prefixExpression) { if (!JavaTokenType.EXCL.equals(prefixExpression.getOperationTokenType())) { return; } newExpressionText.append('!'); operand = PsiUtil.skipParenthesizedExprDown(prefixExpression.getOperand()); } - if (!(operand instanceof PsiMethodCallExpression)) { + if (!(operand instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)operand; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String referenceName = methodExpression.getReferenceName(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); @@ -196,10 +193,9 @@ public class SimplifiableEqualsExpressionInspection extends BaseInspection imple return; } final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(operands[1]); - if (!(rhs instanceof PsiPrefixExpression)) { + if (!(rhs instanceof PsiPrefixExpression prefixExpression)) { return; } - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)rhs; if (!JavaTokenType.EXCL.equals(prefixExpression.getOperationTokenType())) { return; } @@ -217,10 +213,9 @@ public class SimplifiableEqualsExpressionInspection extends BaseInspection imple } private boolean isEqualsConstant(PsiExpression expression, PsiVariable variable) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String methodName = methodExpression.getReferenceName(); if (!HardcodedMethodConstants.EQUALS.equals(methodName) && !HardcodedMethodConstants.EQUALS_IGNORE_CASE.equals(methodName)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SwitchStatementWithConfusingDeclarationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SwitchStatementWithConfusingDeclarationInspection.java index 118cc47e75e8..10c246ba2fde 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SwitchStatementWithConfusingDeclarationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SwitchStatementWithConfusingDeclarationInspection.java @@ -65,12 +65,10 @@ public class SwitchStatementWithConfusingDeclarationInspection extends BaseInspe final PsiStatement[] statements = body.getStatements(); final LocalVariableAccessVisitor visitor = new LocalVariableAccessVisitor(variablesInPreviousBranches); for (final PsiStatement child : statements) { - if (child instanceof PsiDeclarationStatement) { - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)child; + if (child instanceof PsiDeclarationStatement declarationStatement) { final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); for (final PsiElement declaredElement : declaredElements) { - if (declaredElement instanceof PsiLocalVariable) { - final PsiLocalVariable localVariable = (PsiLocalVariable)declaredElement; + if (declaredElement instanceof PsiLocalVariable localVariable) { variablesInCurrentBranch.add(localVariable); } } @@ -99,10 +97,9 @@ public class SwitchStatementWithConfusingDeclarationInspection extends BaseInspe return; } final PsiElement element = referenceExpression.resolve(); - if (!(element instanceof PsiLocalVariable)) { + if (!(element instanceof PsiLocalVariable accessedVariable)) { return; } - final PsiLocalVariable accessedVariable = (PsiLocalVariable)element; if (myVariablesInPreviousBranches.contains(accessedVariable)) { myVariablesInPreviousBranches.remove(accessedVariable); registerVariableError(accessedVariable); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java index 669820d656b7..338fbbdce51c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java @@ -144,10 +144,9 @@ public class TrivialIfInspection extends BaseInspection implements CleanupLocalI return; } final PsiStatement thenBranch = ControlFlowUtils.stripBraces(statement.getThenBranch()); - if (!(thenBranch instanceof PsiAssertStatement)) { + if (!(thenBranch instanceof PsiAssertStatement assertStatement)) { return; } - final PsiAssertStatement assertStatement = (PsiAssertStatement)thenBranch; final PsiExpression assertCondition = assertStatement.getAssertCondition(); if (assertCondition == null) { return; @@ -211,10 +210,9 @@ public class TrivialIfInspection extends BaseInspection implements CleanupLocalI return false; } final PsiStatement thenBranch = ControlFlowUtils.stripBraces(ifStatement.getThenBranch()); - if (!(thenBranch instanceof PsiAssertStatement)) { + if (!(thenBranch instanceof PsiAssertStatement assertStatement)) { return false; } - final PsiAssertStatement assertStatement = (PsiAssertStatement)thenBranch; return assertStatement.getAssertCondition() != null; } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryBreakInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryBreakInspection.java index 14e3a011aa8d..4d665828cf6b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryBreakInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryBreakInspection.java @@ -49,8 +49,7 @@ public class UnnecessaryBreakInspection extends BaseInspection { else if (statement.getLabelIdentifier() == null) { return; } - if (exitedStatement instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)exitedStatement; + if (exitedStatement instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock block = blockStatement.getCodeBlock(); if (ControlFlowUtils.blockCompletesWithStatement(block, statement)) { registerError(statement.getFirstChild()); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java index 99f9897aad1a..c081b5f273ed 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java @@ -72,8 +72,7 @@ public class UnnecessaryContinueInspection extends BaseInspection { public void visitContinueStatement(@NotNull PsiContinueStatement statement) { final PsiStatement continuedStatement = statement.findContinuedStatement(); PsiStatement body = null; - if (continuedStatement instanceof PsiLoopStatement) { - final PsiLoopStatement loopStatement = (PsiLoopStatement)continuedStatement; + if (continuedStatement instanceof PsiLoopStatement loopStatement) { body = loopStatement.getBody(); } if (body == null) { @@ -85,8 +84,7 @@ public class UnnecessaryContinueInspection extends BaseInspection { if (ControlFlowUtils.isInFinallyBlock(statement, continuedStatement)) { return; } - if (body instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)body; + if (body instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock block = blockStatement.getCodeBlock(); if (ControlFlowUtils.blockCompletesWithStatement(block, statement)) { registerError(statement.getFirstChild()); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java index a2c1317d0bd6..4fa19176a377 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java @@ -179,10 +179,9 @@ public class UnnecessaryDefaultInspection extends BaseInspection { final Set checked = new HashSet<>(); for (PsiReferenceExpression expression : expressions) { final PsiElement parent = PsiTreeUtil.skipParentsOfType(expression, PsiParenthesizedExpression.class); - if (!(parent instanceof PsiAssignmentExpression)) { + if (!(parent instanceof PsiAssignmentExpression assignmentExpression)) { continue; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; if (JavaTokenType.EQ != assignmentExpression.getOperationTokenType()) { continue; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryReturnInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryReturnInspection.java index 4a7926917722..8cf40cfcaddc 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryReturnInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryReturnInspection.java @@ -101,8 +101,7 @@ public class UnnecessaryReturnInspection extends BaseInspection implements Clean } final PsiElement methodParent = PsiTreeUtil.getParentOfType(statement, PsiMethod.class, PsiLambdaExpression.class); PsiCodeBlock codeBlock = null; - if (methodParent instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)methodParent; + if (methodParent instanceof PsiMethod method) { codeBlock = method.getBody(); if (isInConstructorRef != null) { isInConstructorRef.set(method.isConstructor()); @@ -111,11 +110,10 @@ public class UnnecessaryReturnInspection extends BaseInspection implements Clean return false; } } - else if (methodParent instanceof PsiLambdaExpression) { + else if (methodParent instanceof PsiLambdaExpression lambdaExpression) { if (isInConstructorRef != null) { isInConstructorRef.set(false); } - final PsiLambdaExpression lambdaExpression = (PsiLambdaExpression)methodParent; if (checkReturnType && !PsiTypes.voidType().equals(LambdaUtil.getFunctionalInterfaceReturnType(lambdaExpression))) { return false; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java index dcb83943a45a..4babccc54499 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java @@ -69,10 +69,9 @@ public class ConstantValueVariableUseInspection extends BaseInspection implement @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiExpression)) { + if (!(element instanceof PsiExpression expression)) { return; } - final PsiExpression expression = (PsiExpression)element; PsiReplacementUtil.replaceExpression(expression, myText); } } @@ -116,10 +115,9 @@ public class ConstantValueVariableUseInspection extends BaseInspection implement if (body == null) { return false; } - if (!(condition instanceof PsiPolyadicExpression)) { + if (!(condition instanceof PsiPolyadicExpression polyadicExpression)) { return false; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)condition; final IElementType tokenType = polyadicExpression.getOperationTokenType(); if (JavaTokenType.ANDAND == tokenType) { for (PsiExpression operand : polyadicExpression.getOperands()) { @@ -161,18 +159,16 @@ public class ConstantValueVariableUseInspection extends BaseInspection implement } } expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return false; } if (target instanceof PsiField) { return false; } - final PsiVariable variable = (PsiVariable)target; final VariableReadVisitor visitor = new VariableReadVisitor(variable); body.accept(visitor); if (!visitor.isRead()) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/LawOfDemeterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/LawOfDemeterInspection.java index cbf3062e7b27..debac5967a0b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/LawOfDemeterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/LawOfDemeterInspection.java @@ -97,14 +97,12 @@ public class LawOfDemeterInspection extends BaseInspection { public boolean violatesLawOfDemeter(PsiExpression expression) { final PsiElement qualifier = PsiUtil.skipParenthesizedExprUp(expression); - if (qualifier instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifier; + if (qualifier instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); if (target instanceof PsiParameter) { return false; } - else if (target instanceof PsiField) { - final PsiField field = (PsiField)target; + else if (target instanceof PsiField field) { if (field.hasModifierProperty(PsiModifier.STATIC)) { return false; } @@ -124,8 +122,7 @@ public class LawOfDemeterInspection extends BaseInspection { return violatesLawOfDemeter(definition); } } - else if (qualifier instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)qualifier; + else if (qualifier instanceof PsiMethodCallExpression methodCallExpression) { if (isCallToSuspiciousMethod(methodCallExpression)) { return true; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ScopeUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ScopeUtils.java index c06a201cf207..a3cceabf6556 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ScopeUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ScopeUtils.java @@ -83,16 +83,13 @@ final class ScopeUtils { // make common parent may only be for-statement if first reference is // the initialization of the for statement or the initialization is // empty. - if (commonParent instanceof PsiForStatement) { - final PsiForStatement forStatement = (PsiForStatement)commonParent; + if (commonParent instanceof PsiForStatement forStatement) { final PsiElement referenceElement = referenceElements.get(0); final PsiStatement initialization = forStatement.getInitialization(); if (!(initialization instanceof PsiEmptyStatement)) { - if (initialization instanceof PsiExpressionStatement) { - final PsiExpressionStatement statement = (PsiExpressionStatement)initialization; + if (initialization instanceof PsiExpressionStatement statement) { final PsiExpression expression = statement.getExpression(); - if (expression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; + if (expression instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression lExpression = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression()); if (!lExpression.equals(referenceElement)) { commonParent = PsiTreeUtil.getParentOfType(commonParent, PsiCodeBlock.class); @@ -133,8 +130,7 @@ final class ScopeUtils { } while (!result.equals(scope)) { final PsiElement element = getChildWhichContainsElement(result, scope); - if (element instanceof PsiForStatement) { - final PsiForStatement forStatement = (PsiForStatement)element; + if (element instanceof PsiForStatement forStatement) { if (forStatement.getInitialization() instanceof PsiEmptyStatement) { return element; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyDependenciesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyDependenciesInspection.java index b446c4636a51..4b3c94fe238c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyDependenciesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyDependenciesInspection.java @@ -43,8 +43,7 @@ public class ClassWithTooManyDependenciesInspection extends BaseGlobalInspection @NotNull AnalysisScope scope, @NotNull InspectionManager manager, @NotNull GlobalInspectionContext globalContext) { - if (refEntity instanceof RefClass) { - RefClass refClass = (RefClass)refEntity; + if (refEntity instanceof RefClass refClass) { if (!(refClass.getOwner() instanceof RefPackage)) { return null; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java index 87fc15c7a624..931a8b6c7b53 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java @@ -44,10 +44,9 @@ public class ClassWithTooManyDependentsInspection extends BaseGlobalInspection { @NotNull AnalysisScope analysisScope, @NotNull InspectionManager inspectionManager, @NotNull GlobalInspectionContext globalInspectionContext) { - if (!(refEntity instanceof RefClass)) { + if (!(refEntity instanceof RefClass refClass)) { return null; } - final RefClass refClass = (RefClass)refEntity; if (!(refClass.getOwner() instanceof RefPackage)) { return null; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java index ba055e01370a..b1ff082fe82c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java @@ -44,10 +44,9 @@ public class ClassWithTooManyTransitiveDependenciesInspection extends BaseGlobal @NotNull AnalysisScope analysisScope, @NotNull InspectionManager inspectionManager, @NotNull GlobalInspectionContext globalInspectionContext) { - if (!(refEntity instanceof RefClass)) { + if (!(refEntity instanceof RefClass refClass)) { return null; } - final RefClass refClass = (RefClass)refEntity; if (!(refClass.getOwner() instanceof RefPackage)) { return null; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java index 1746399639f3..3f0633baccef 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java @@ -44,10 +44,9 @@ public class ClassWithTooManyTransitiveDependentsInspection extends BaseGlobalIn @NotNull AnalysisScope analysisScope, @NotNull InspectionManager inspectionManager, @NotNull GlobalInspectionContext globalInspectionContext) { - if (!(refEntity instanceof RefClass)) { + if (!(refEntity instanceof RefClass refClass)) { return null; } - final RefClass refClass = (RefClass)refEntity; if (!(refClass.getOwner() instanceof RefPackage)) { return null; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java index c65b1d7321d9..eea1cdbaa5bf 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java @@ -53,10 +53,9 @@ public class CyclicClassDependencyInspection extends BaseGlobalInspection { @NotNull AnalysisScope analysisScope, @NotNull InspectionManager inspectionManager, @NotNull GlobalInspectionContext globalInspectionContext) { - if (!(refEntity instanceof RefClass)) { + if (!(refEntity instanceof RefClass refClass)) { return null; } - final RefClass refClass = (RefClass)refEntity; if (refClass.isAnonymous() || refClass.isLocalClass() || refClass.isSyntheticJSP()) { return null; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java index 9b38e2a7295f..37d887be0efa 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java @@ -39,10 +39,9 @@ public class CyclicPackageDependencyInspection extends BaseGlobalInspection { @NotNull AnalysisScope analysisScope, @NotNull InspectionManager inspectionManager, @NotNull GlobalInspectionContext globalInspectionContext) { - if (!(refEntity instanceof RefPackage)) { + if (!(refEntity instanceof RefPackage refPackage)) { return null; } - final RefPackage refPackage = (RefPackage)refEntity; final Set dependencies = DependencyUtils.calculateTransitiveDependenciesForPackage(refPackage); final Set dependents = DependencyUtils.calculateTransitiveDependentsForPackage(refPackage); final Set mutualDependents = new HashSet<>(dependencies); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/DependencyUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/DependencyUtils.java index 53668cd5d718..3c2643584951 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/DependencyUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/DependencyUtils.java @@ -122,8 +122,7 @@ public final class DependencyUtils { private static void tabulateDependentClasses(RefElement element, Set dependents) { addOwnerClassesToSet(element.getInReferences(), dependents); - if (element instanceof RefClass) { - final RefClass refClass = (RefClass)element; + if (element instanceof RefClass refClass) { addOwnerClassesToSet(refClass.getInTypeReferences(), dependents); } final List children = element.getChildren(); @@ -181,8 +180,7 @@ public final class DependencyUtils { } private static void tabulateDependencyPackages(RefEntity entity, Set dependencies) { - if (entity instanceof RefElement) { - final RefElement element = (RefElement)entity; + if (entity instanceof RefElement element) { final Collection references = element.getOutReferences(); for (RefElement reference : references) { final RefPackage refPackage = RefJavaUtil.getPackage(reference); @@ -214,8 +212,7 @@ public final class DependencyUtils { } private static void tabulateDependentPackages(RefEntity entity, Set dependents) { - if (entity instanceof RefElement) { - final RefElement element = (RefElement)entity; + if (entity instanceof RefElement element) { final Collection references = element.getInReferences(); for (RefElement reference : references) { final RefPackage refPackage = RefJavaUtil.getPackage(reference); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java index 867aa5c6cdca..498662cbdca0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java @@ -66,7 +66,7 @@ public class CaughtExceptionImmediatelyRethrownInspection extends BaseInspection public void visitThrowStatement(@NotNull PsiThrowStatement statement) { super.visitThrowStatement(statement); final PsiExpression expression = PsiUtil.skipParenthesizedExprDown(statement.getException()); - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return; } final PsiStatement previousStatement = PsiTreeUtil.getPrevSiblingOfType(statement, PsiStatement.class); @@ -78,17 +78,14 @@ public class CaughtExceptionImmediatelyRethrownInspection extends BaseInspection // e.g. if (notsure) throw e; return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiParameter)) { + if (!(target instanceof PsiParameter parameter)) { return; } - final PsiParameter parameter = (PsiParameter)target; final PsiElement declarationScope = parameter.getDeclarationScope(); - if (!(declarationScope instanceof PsiCatchSection)) { + if (!(declarationScope instanceof PsiCatchSection catchSection)) { return; } - final PsiCatchSection catchSection = (PsiCatchSection)declarationScope; final PsiCodeBlock block = PsiTreeUtil.getParentOfType(statement, PsiCodeBlock.class); if (block == null) { return; @@ -160,13 +157,11 @@ public class CaughtExceptionImmediatelyRethrownInspection extends BaseInspection processor.process(aClass); } } - else if (type instanceof PsiDisjunctionType) { - final PsiDisjunctionType disjunctionType = (PsiDisjunctionType)type; + else if (type instanceof PsiDisjunctionType disjunctionType) { for (PsiType disjunction : disjunctionType.getDisjunctions()) { - if (!(disjunction instanceof PsiClassType)) { + if (!(disjunction instanceof PsiClassType classType)) { continue; } - final PsiClassType classType = (PsiClassType)disjunction; final PsiClass aClass = classType.resolve(); if (aClass != null) { processor.process(aClass); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java index 4cec27297360..dc5c75fb6f4f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java @@ -112,8 +112,7 @@ public class EmptyFinallyBlockInspection extends BaseInspection implements Clean } private static void deleteUntilFinally(PsiElement element) { - if (element instanceof PsiJavaToken) { - final PsiJavaToken keyword = (PsiJavaToken)element; + if (element instanceof PsiJavaToken keyword) { final IElementType tokenType = keyword.getTokenType(); if (tokenType.equals(JavaTokenType.FINALLY_KEYWORD)) { keyword.delete(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java index 0d3ad90375a2..193c346b6b2b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java @@ -67,16 +67,14 @@ public class ErrorRethrownInspection extends BaseInspection { } private static boolean hasJavaLangErrorType(PsiType type) { - if (type instanceof PsiDisjunctionType) { - final PsiDisjunctionType disjunctionType = (PsiDisjunctionType)type; + if (type instanceof PsiDisjunctionType disjunctionType) { for (PsiType disjunction : disjunctionType.getDisjunctions()) { if (hasJavaLangErrorType(disjunction)) { return true; } } } - else if (type instanceof PsiClassType) { - final PsiClassType classType = (PsiClassType)type; + else if (type instanceof PsiClassType classType) { final PsiClass aClass = classType.resolve(); if (InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_ERROR) && !InheritanceUtil.isInheritor(aClass, "java.lang.ThreadDeath")) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ExceptionFromCatchWhichDoesntWrapInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ExceptionFromCatchWhichDoesntWrapInspection.java index b4d82d07e94a..d4c6f87f65a1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ExceptionFromCatchWhichDoesntWrapInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ExceptionFromCatchWhichDoesntWrapInspection.java @@ -89,8 +89,7 @@ public class ExceptionFromCatchWhichDoesntWrapInspection extends BaseInspection } if (ignoreCantWrap) { final PsiType thrownType = exception.getType(); - if (thrownType instanceof PsiClassType) { - final PsiClassType classType = (PsiClassType)thrownType; + if (thrownType instanceof PsiClassType classType) { final PsiClass exceptionClass = classType.resolve(); if (exceptionClass != null) { final PsiMethod[] constructors = exceptionClass.getConstructors(); @@ -162,10 +161,9 @@ public class ExceptionFromCatchWhichDoesntWrapInspection extends BaseInspection return true; } final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return true; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); for (PsiExpression argument : arguments) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/InstanceofCatchParameterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/InstanceofCatchParameterInspection.java index 0c26e0d495fe..b25e1a394b6a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/InstanceofCatchParameterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/InstanceofCatchParameterInspection.java @@ -51,15 +51,13 @@ public class InstanceofCatchParameterInspection extends BaseInspection { return; } final PsiExpression operand = PsiUtil.skipParenthesizedExprDown(exp.getOperand()); - if (!(operand instanceof PsiReferenceExpression)) { + if (!(operand instanceof PsiReferenceExpression ref)) { return; } - final PsiReferenceExpression ref = (PsiReferenceExpression)operand; final PsiElement referent = ref.resolve(); - if (!(referent instanceof PsiParameter)) { + if (!(referent instanceof PsiParameter parameter)) { return; } - final PsiParameter parameter = (PsiParameter)referent; if (!(parameter.getDeclarationScope() instanceof PsiCatchSection)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java index 38f83d506214..c2142d204f03 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java @@ -36,10 +36,9 @@ public class NewExceptionWithoutArgumentsInspection extends BaseInspection { return; } final PsiElement target = classReference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)target; if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_EXCEPTION)) { return; } @@ -59,10 +58,9 @@ public class NewExceptionWithoutArgumentsInspection extends BaseInspection { return; } final PsiElement target = expression.resolve(); - if (!(target instanceof PsiMethod)) { + if (!(target instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)target; if (method.getParameterList().getParametersCount() != 0) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java index 0f752becd0f5..59777c029b5f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java @@ -67,16 +67,14 @@ public class ThreadDeathRethrownInspection extends BaseInspection { } private static boolean hasJavaLangThreadDeathType(PsiType type) { - if (type instanceof PsiDisjunctionType) { - final PsiDisjunctionType disjunctionType = (PsiDisjunctionType)type; + if (type instanceof PsiDisjunctionType disjunctionType) { for (PsiType disjunction : disjunctionType.getDisjunctions()) { if (hasJavaLangThreadDeathType(disjunction)) { return true; } } } - else if (type instanceof PsiClassType) { - final PsiClassType classType = (PsiClassType)type; + else if (type instanceof PsiClassType classType) { final PsiClass aClass = classType.resolve(); if (InheritanceUtil.isInheritor(aClass, "java.lang.ThreadDeath")) { return true; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ThrowFromFinallyBlockInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ThrowFromFinallyBlockInspection.java index 90a2b7f65b2d..847037741d8f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ThrowFromFinallyBlockInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ThrowFromFinallyBlockInspection.java @@ -108,8 +108,7 @@ public class ThrowFromFinallyBlockInspection extends BaseInspection { if (finallyBlock == null) { return; } - if (exception instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)exception; + if (exception instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); if (target == null || !PsiTreeUtil.isAncestor(finallyBlock, target, true)) { // variable from outside finally block is thrown @@ -123,11 +122,10 @@ public class ThrowFromFinallyBlockInspection extends BaseInspection { private boolean isHidingOfPreviousException(PsiCodeBlock finallyBlock, PsiElement throwElement) { final PsiElement parent = finallyBlock.getParent(); - if (!(parent instanceof PsiTryStatement)) { + if (!(parent instanceof PsiTryStatement tryStatement)) { // never reached return false; } - final PsiTryStatement tryStatement = (PsiTryStatement)parent; final PsiCodeBlock[] catchBlocks = tryStatement.getCatchBlocks(); if (catchBlocks.length == 0) { return true; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java index 98871a8e36f9..9d3c6b6f827f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java @@ -38,10 +38,9 @@ public class ConvertToVarargsMethodFix extends InspectionGadgetsFix { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiMethod)) { + if (!(element instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)element; final Collection writtenElements = new ArrayList<>(); writtenElements.add(method); final Collection methodCalls = new ArrayList<>(); @@ -70,10 +69,9 @@ public class ConvertToVarargsMethodFix extends InspectionGadgetsFix { final PsiParameter lastParameter = parameters[parameters.length - 1]; lastParameter.normalizeDeclaration(); final PsiType type = lastParameter.getType(); - if (!(type instanceof PsiArrayType)) { + if (!(type instanceof PsiArrayType arrayType)) { return; } - final PsiArrayType arrayType = (PsiArrayType)type; final PsiType componentType = arrayType.getComponentType(); final PsiElementFactory factory = JavaPsiFacade.getElementFactory(method.getProject()); final PsiType ellipsisType = new PsiEllipsisType(componentType, TypeAnnotationProvider.Static.create(type.getAnnotations())); @@ -87,20 +85,18 @@ public class ConvertToVarargsMethodFix extends InspectionGadgetsFix { private static void makeMethodCallsVarargs(Collection referenceExpressions) { for (final PsiReferenceExpression referenceExpression : referenceExpressions) { final PsiElement parent = referenceExpression.getParent(); - if (!(parent instanceof PsiMethodCallExpression)) { + if (!(parent instanceof PsiMethodCallExpression methodCallExpression)) { continue; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)parent; final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); if (arguments.length == 0) { continue; } final PsiExpression lastArgument = arguments[arguments.length - 1]; - if (!(lastArgument instanceof PsiNewExpression)) { + if (!(lastArgument instanceof PsiNewExpression newExpression)) { continue; } - final PsiNewExpression newExpression = (PsiNewExpression)lastArgument; final PsiArrayInitializerExpression arrayInitializerExpression = newExpression.getArrayInitializer(); if (arrayInitializerExpression == null) { continue; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteCatchSectionFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteCatchSectionFix.java index 63a29f248312..45b3a276b357 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteCatchSectionFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteCatchSectionFix.java @@ -46,15 +46,13 @@ public class DeleteCatchSectionFix extends InspectionGadgetsFix { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiParameter)) { + if (!(parent instanceof PsiParameter parameter)) { return; } - final PsiParameter parameter = (PsiParameter)parent; final PsiElement grandParent = parameter.getParent(); - if (!(grandParent instanceof PsiCatchSection)) { + if (!(grandParent instanceof PsiCatchSection catchSection)) { return; } - final PsiCatchSection catchSection = (PsiCatchSection)grandParent; if (removeTryCatch) { BlockUtils.unwrapTryBlock(catchSection.getTryStatement()); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java index a33d05e89435..52f1b39659dd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java @@ -58,8 +58,7 @@ public class EqualityToEqualsFix extends InspectionGadgetsFix { final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(expression.getLOperand()); final Nullability nullability = NullabilityUtil.getExpressionNullability(expression.getLOperand(), true); if (nullability == Nullability.NULLABLE) return null; - if (lhs instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; + if (lhs instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); if (target instanceof PsiModifierListOwner) { NullableNotNullManager.getInstance(expression.getProject()); @@ -102,10 +101,9 @@ public class EqualityToEqualsFix extends InspectionGadgetsFix { public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement comparisonToken = descriptor.getPsiElement(); final PsiElement parent = comparisonToken.getParent(); - if (!(parent instanceof PsiBinaryExpression)) { + if (!(parent instanceof PsiBinaryExpression expression)) { return; } - final PsiBinaryExpression expression = (PsiBinaryExpression)parent; final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(expression.getLOperand()); final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(expression.getROperand()); if (lhs == null || rhs == null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToSafeEqualsFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToSafeEqualsFix.java index ef59c6d8a064..d4843c3fd1fd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToSafeEqualsFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToSafeEqualsFix.java @@ -78,10 +78,9 @@ public final class EqualityToSafeEqualsFix extends InspectionGadgetsFix implemen public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement comparisonToken = descriptor.getPsiElement(); final PsiElement parent = comparisonToken.getParent(); - if (!(parent instanceof PsiBinaryExpression)) { + if (!(parent instanceof PsiBinaryExpression expression)) { return; } - final PsiBinaryExpression expression = (PsiBinaryExpression)parent; final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(expression.getLOperand()); final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(expression.getROperand()); if (lhs == null || rhs == null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java index eefa9225d765..6d51091575ff 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java @@ -63,9 +63,7 @@ public final class MakeFieldFinalFix extends InspectionGadgetsFix { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiField field; - if (element instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)element; + if (element instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); if (!(target instanceof PsiField)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java index f0a1b8de565f..be145c16744f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java @@ -67,10 +67,9 @@ public final class MakeFieldStaticFinalFix extends InspectionGadgetsFix { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiField)) { + if (!(parent instanceof PsiField field)) { return; } - final PsiField field = (PsiField)parent; final PsiModifierList modifierList = field.getModifierList(); if (modifierList == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java index 5a91e90f647e..f8d291bfc232 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java @@ -36,8 +36,7 @@ public class MakeInitializerExplicitFix extends InspectionGadgetsFix { public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement fieldName = descriptor.getPsiElement(); final PsiElement parent = fieldName.getParent(); - if (!(parent instanceof PsiField)) return; - final PsiField field = (PsiField)parent; + if (!(parent instanceof PsiField field)) return; if (field.getInitializer() != null) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeMethodFinalFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeMethodFinalFix.java index bd91aef624b6..262fe582eb76 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeMethodFinalFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeMethodFinalFix.java @@ -73,8 +73,7 @@ public class MakeMethodFinalFix extends InspectionGadgetsFix { return (PsiMethod)element; } final PsiElement parent = element.getParent(); - if (parent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)parent; + if (parent instanceof PsiMethodCallExpression methodCall) { final PsiMethod method = methodCall.resolveMethod(); if (method == null || (element.isPhysical() && !FileModificationService.getInstance().preparePsiElementsForWrite(method))) { return null; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java index 5206eb6d300f..f03b7886951c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java @@ -66,8 +66,7 @@ public class NormalizeDeclarationFix extends InspectionGadgetsFix { return; } } - if (element instanceof PsiDeclarationStatement) { - PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)element; + if (element instanceof PsiDeclarationStatement declarationStatement) { final PsiElement grandParent = element.getParent(); if (grandParent instanceof PsiForStatement) { splitMultipleDeclarationInForStatementInitialization((PsiForStatement)grandParent); @@ -106,8 +105,7 @@ public class NormalizeDeclarationFix extends InspectionGadgetsFix { } } } - else if (element instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)element; + else if (element instanceof PsiMethod method) { final PsiTypeElement returnTypeElement = method.getReturnTypeElement(); if (returnTypeElement == null) { return; @@ -141,10 +139,9 @@ public class NormalizeDeclarationFix extends InspectionGadgetsFix { forStatement = BlockUtils.expandSingleStatementToBlockStatement(forStatement); } final PsiStatement initialization = forStatement.getInitialization(); - if (!(initialization instanceof PsiDeclarationStatement)) { + if (!(initialization instanceof PsiDeclarationStatement declarationStatement)) { return; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)initialization; final List variables = ContainerUtil.filterIsInstance(declarationStatement.getDeclaredElements(), PsiLocalVariable.class); final int min, max; @@ -194,8 +191,7 @@ public class NormalizeDeclarationFix extends InspectionGadgetsFix { } private static PsiLocalVariable tryResolveLocalVariable(PsiElement element) { - if (element instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element; + if (element instanceof PsiReferenceExpression referenceExpression) { if (referenceExpression.getQualifierExpression() == null) { return ObjectUtils.tryCast(referenceExpression.resolve(), PsiLocalVariable.class); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java index 5f8b64996452..c0dda94231df 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java @@ -333,7 +333,7 @@ public final class SerialVersionUIDBuilder extends JavaRecursiveElementVisitor { return; } final PsiElement element = reference.resolve(); - if (!(element instanceof PsiClass)) { + if (!(element instanceof PsiClass innerClass)) { return; } final PsiClass elementParentClass = @@ -343,7 +343,6 @@ public final class SerialVersionUIDBuilder extends JavaRecursiveElementVisitor { element.equals(parentClass)) { return; } - final PsiClass innerClass = (PsiClass)element; if (!innerClass.hasModifierProperty(PsiModifier.PRIVATE)) { return; } @@ -372,8 +371,7 @@ public final class SerialVersionUIDBuilder extends JavaRecursiveElementVisitor { getAccessMethodIndex(parentOfParentClass); parentOfParentClass = ClassUtils.getContainingClass(parentOfParentClass); } - if (element instanceof PsiField) { - final PsiField field = (PsiField)element; + if (element instanceof PsiField field) { if (field.hasModifierProperty(PsiModifier.PRIVATE)) { boolean isStatic = false; final PsiType type = field.getType(); @@ -400,17 +398,14 @@ public final class SerialVersionUIDBuilder extends JavaRecursiveElementVisitor { } @NonNls String name = null; final PsiElement parent = expression.getParent(); - if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignment = (PsiAssignmentExpression)parent; + if (parent instanceof PsiAssignmentExpression assignment) { if (assignment.getLExpression().equals(expression)) { name = ACCESS_METHOD_NAME_PREFIX + accessMethodIndex + "02"; signatureBuffer.append(returnTypeSignature); } } - else if (parent instanceof PsiPostfixExpression) { - final PsiPostfixExpression postfixExpression = - (PsiPostfixExpression)parent; + else if (parent instanceof PsiPostfixExpression postfixExpression) { final IElementType tokenType = postfixExpression.getOperationTokenType(); if (tokenType.equals(JavaTokenType.PLUSPLUS)) { name = ACCESS_METHOD_NAME_PREFIX + accessMethodIndex + @@ -421,8 +416,7 @@ public final class SerialVersionUIDBuilder extends JavaRecursiveElementVisitor { "10"; } } - else if (parent instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)parent; + else if (parent instanceof PsiPrefixExpression prefixExpression) { final IElementType tokenType = prefixExpression.getOperationTokenType(); if (tokenType.equals(JavaTokenType.PLUSPLUS)) { name = ACCESS_METHOD_NAME_PREFIX + accessMethodIndex + @@ -443,8 +437,7 @@ public final class SerialVersionUIDBuilder extends JavaRecursiveElementVisitor { nonPrivateMethods.add(methodSignature); } } - else if (element instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)element; + else if (element instanceof PsiMethod method) { if (method.hasModifierProperty(PsiModifier.PRIVATE) && clazz.equals(method.getContainingClass())) { final String signature; if (method.hasModifierProperty(PsiModifier.STATIC)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SamePackageImportInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SamePackageImportInspection.java index a0bdb3db48cb..b311b00b2693 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SamePackageImportInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SamePackageImportInspection.java @@ -55,10 +55,9 @@ public class SamePackageImportInspection extends BaseInspection implements Clean @Override public void visitImportList(@NotNull PsiImportList importList) { final PsiElement parent = importList.getParent(); - if (!(parent instanceof PsiJavaFile)) { + if (!(parent instanceof PsiJavaFile javaFile)) { return; } - final PsiJavaFile javaFile = (PsiJavaFile)parent; final String packageName = javaFile.getPackageName(); final PsiImportStatement[] importStatements = importList.getImportStatements(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ExtendsAnnotationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ExtendsAnnotationInspection.java index 691b2d3fdfff..8c441d65febe 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ExtendsAnnotationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ExtendsAnnotationInspection.java @@ -76,10 +76,9 @@ public class ExtendsAnnotationInspection extends BaseInspection { referenceList.getReferenceElements(); for (final PsiJavaCodeReferenceElement element : elements) { final PsiElement referent = element.resolve(); - if (!(referent instanceof PsiClass)) { + if (!(referent instanceof PsiClass psiClass)) { continue; } - final PsiClass psiClass = (PsiClass)referent; if (psiClass.isAnnotationType()) { registerError(element, containingClass); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ParameterTypePreventsOverridingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ParameterTypePreventsOverridingInspection.java index 41e5f062a7b1..7ee45cf63c7a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ParameterTypePreventsOverridingInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ParameterTypePreventsOverridingInspection.java @@ -60,10 +60,9 @@ public class ParameterTypePreventsOverridingInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiTypeElement)) { + if (!(element instanceof PsiTypeElement typeElement)) { return; } - final PsiTypeElement typeElement = (PsiTypeElement)element; final PsiElementFactory factory = JavaPsiFacade.getElementFactory(typeElement.getProject()); final PsiTypeElement newTypeElement = factory.createTypeElementFromText(myNewTypeText, typeElement); typeElement.replace(newTypeElement); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java index cab98f53abbc..3c27deb8373c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java @@ -283,8 +283,7 @@ public class RedundantMethodOverrideInspection extends BaseInspection { final PsiStatement statement = statements[0]; final PsiExpression expression; if (PsiTypes.voidType().equals(method.getReturnType())) { - if (statement instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; + if (statement instanceof PsiExpressionStatement expressionStatement) { expression = expressionStatement.getExpression(); } else { @@ -292,18 +291,16 @@ public class RedundantMethodOverrideInspection extends BaseInspection { } } else { - if (statement instanceof PsiReturnStatement) { - final PsiReturnStatement returnStatement = (PsiReturnStatement)statement; + if (statement instanceof PsiReturnStatement returnStatement) { expression = PsiUtil.skipParenthesizedExprDown(returnStatement.getReturnValue()); } else { return false; } } - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; if (!MethodCallUtils.isSuperMethodCall(methodCallExpression, method)) { return false; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java index 2ea747881abc..af7b789f81ca 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java @@ -107,10 +107,9 @@ class StaticInheritanceFix extends InspectionGadgetsFix { } final Query search = ReferencesSearch.search(field, scope, false); for (PsiReference reference : search) { - if (!(reference instanceof PsiReferenceExpression)) { + if (!(reference instanceof PsiReferenceExpression referenceExpression)) { continue; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)reference; if (!myReplaceInWholeProject) { boolean isInheritor = ReadAction.compute(() -> { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceInspection.java index 4a12d535ba70..7636504368c3 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceInspection.java @@ -62,10 +62,9 @@ public class StaticInheritanceInspection extends BaseInspection { implementsList.getReferenceElements(); for (final PsiJavaCodeReferenceElement reference : references) { final PsiElement target = reference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass targetClass)) { return; } - final PsiClass targetClass = (PsiClass)target; if (targetClass.isInterface() && interfaceContainsOnlyConstants(targetClass, new HashSet<>())) { registerError(reference); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/TypeParameterExtendsFinalClassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/TypeParameterExtendsFinalClassInspection.java index 987ad49547af..c132bb9b4311 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/TypeParameterExtendsFinalClassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/TypeParameterExtendsFinalClassInspection.java @@ -73,13 +73,11 @@ public class TypeParameterExtendsFinalClassInspection extends BaseInspection imp protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (parent instanceof PsiTypeParameter) { - final PsiTypeParameter typeParameter = (PsiTypeParameter)parent; + if (parent instanceof PsiTypeParameter typeParameter) { replaceTypeParameterUsagesWithType(typeParameter); new CommentTracker().deleteAndRestoreComments(typeParameter); } - else if (parent instanceof PsiTypeElement) { - final PsiTypeElement typeElement = (PsiTypeElement)parent; + else if (parent instanceof PsiTypeElement typeElement) { final PsiElement lastChild = typeElement.getLastChild(); if (lastChild == null) { return; @@ -139,15 +137,13 @@ public class TypeParameterExtendsFinalClassInspection extends BaseInspection imp public void visitTypeElement(@NotNull PsiTypeElement typeElement) { super.visitTypeElement(typeElement); final PsiType type = typeElement.getType(); - if (!(type instanceof PsiWildcardType)) { + if (!(type instanceof PsiWildcardType wildcardType)) { return; } - final PsiWildcardType wildcardType = (PsiWildcardType)type; final PsiType extendsBound = wildcardType.getExtendsBound(); - if (!(extendsBound instanceof PsiClassType)) { + if (!(extendsBound instanceof PsiClassType classType)) { return; } - final PsiClassType classType = (PsiClassType)extendsBound; for (PsiType typeParameter : classType.getParameters()) { if (typeParameter instanceof PsiWildcardType) { // if nested type has wildcard type parameter too, leave it @@ -202,8 +198,7 @@ public class TypeParameterExtendsFinalClassInspection extends BaseInspection imp return isWildcardRequired(typeElement, deconstructionPattern.getTypeElement(), type); } } - else if (ancestor instanceof PsiParameter) { - final PsiParameter parameter = (PsiParameter)ancestor; + else if (ancestor instanceof PsiParameter parameter) { final PsiElement scope = parameter.getDeclarationScope(); if (scope instanceof PsiMethod method) { if (MethodUtils.hasSuper(method)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/DoubleBraceInitializationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/DoubleBraceInitializationInspection.java index df407bfb107f..01976715f080 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/DoubleBraceInitializationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/DoubleBraceInitializationInspection.java @@ -54,27 +54,23 @@ public class DoubleBraceInitializationInspection extends BaseInspection implemen @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent(); - if (!(element instanceof PsiAnonymousClass)) { + if (!(element instanceof PsiAnonymousClass aClass)) { return; } - final PsiAnonymousClass aClass = (PsiAnonymousClass)element; final PsiElement parent = aClass.getParent(); - if (!(parent instanceof PsiNewExpression)) { + if (!(parent instanceof PsiNewExpression newExpression)) { return; } - final PsiNewExpression newExpression = (PsiNewExpression)parent; final PsiElement ancestor = PsiTreeUtil.skipParentsOfType(newExpression, PsiParenthesizedExpression.class); final String qualifierText; if (ancestor instanceof PsiVariable) { qualifierText = ((PsiVariable)ancestor).getName(); } - else if (ancestor instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)ancestor; + else if (ancestor instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression()); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; final PsiElement target = referenceExpression.resolve(); if (!(target instanceof PsiVariable)) { return; @@ -103,8 +99,7 @@ public class DoubleBraceInitializationInspection extends BaseInspection implemen if (anchor == null) { return; } - if (anchor instanceof PsiMember) { - final PsiMember member = (PsiMember)anchor; + if (anchor instanceof PsiMember member) { final PsiClassInitializer newInitializer = factory.createClassInitializer(); if (member.hasModifierProperty(PsiModifier.STATIC)) { final PsiModifierList modifierList = newInitializer.getModifierList(); @@ -141,10 +136,9 @@ public class DoubleBraceInitializationInspection extends BaseInspection implemen return; } final PsiElement expressionTarget = expression.resolve(); - if (!(expressionTarget instanceof PsiMember)) { + if (!(expressionTarget instanceof PsiMember member)) { return; } - final PsiMember member = (PsiMember)expressionTarget; final PsiClass containingClass = member.getContainingClass(); if (!InheritanceUtil.isInheritorOrSelf(target, containingClass, true)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/NonFinalStaticVariableUsedInClassInitializationVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/NonFinalStaticVariableUsedInClassInitializationVisitor.java index c8dee608a57e..2b1646230fec 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/NonFinalStaticVariableUsedInClassInitializationVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/NonFinalStaticVariableUsedInClassInitializationVisitor.java @@ -28,10 +28,9 @@ class NonFinalStaticVariableUsedInClassInitializationVisitor extends BaseInspect public void visitReferenceExpression(@NotNull PsiReferenceExpression expression) { super.visitReferenceExpression(expression); final PsiElement referent = expression.resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return; } - final PsiField field = (PsiField)referent; if (!field.hasModifierProperty(PsiModifier.STATIC)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/ThisEscapedInConstructorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/ThisEscapedInConstructorInspection.java index abc2f005288f..246b1849ed53 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/ThisEscapedInConstructorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/ThisEscapedInConstructorInspection.java @@ -54,17 +54,15 @@ public class ThisEscapedInConstructorInspection extends BaseInspection { final PsiClass containingClass = ClassUtils.getContainingClass(expression); if (qualifier != null) { final PsiElement element = qualifier.resolve(); - if (!(element instanceof PsiClass)) { + if (!(element instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)element; if (!aClass.equals(containingClass)) { return; } } final PsiElement parent = expression.getParent(); - if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + if (parent instanceof PsiAssignmentExpression assignmentExpression) { if (!thisEscapesToField(expression, assignmentExpression)) { return; } @@ -72,15 +70,13 @@ public class ThisEscapedInConstructorInspection extends BaseInspection { } else if (parent instanceof PsiExpressionList) { final PsiElement grandParent = parent.getParent(); - if (grandParent instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)grandParent; + if (grandParent instanceof PsiNewExpression newExpression) { if (!thisEscapesToConstructor(expression, newExpression)) { return; } registerError(expression); } - else if (grandParent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; + else if (grandParent instanceof PsiMethodCallExpression methodCallExpression) { if (!thisEscapesToMethod(expression, methodCallExpression)) { return; } @@ -112,10 +108,9 @@ public class ThisEscapedInConstructorInspection extends BaseInspection { return false; } final PsiElement element = referenceElement.resolve(); - if (!(element instanceof PsiClass)) { + if (!(element instanceof PsiClass constructorClass)) { return false; } - final PsiClass constructorClass = (PsiClass)element; return !PsiTreeUtil.isAncestor(containingClass, constructorClass, false) || constructorClass.hasModifierProperty(PsiModifier.STATIC); } @@ -126,15 +121,13 @@ public class ThisEscapedInConstructorInspection extends BaseInspection { return false; } final PsiExpression lExpression = assignmentExpression.getLExpression(); - if (!(lExpression instanceof PsiReferenceExpression)) { + if (!(lExpression instanceof PsiReferenceExpression leftExpression)) { return false; } - final PsiReferenceExpression leftExpression = (PsiReferenceExpression)lExpression; final PsiElement element = leftExpression.resolve(); - if (!(element instanceof PsiField)) { + if (!(element instanceof PsiField field)) { return false; } - final PsiField field = (PsiField)element; if (field.hasModifierProperty(PsiModifier.STATIC)) { return true; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java index 540f86acdbb8..463a41a4d64c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java @@ -108,10 +108,9 @@ public class AbsoluteAlignmentInUserInterfaceInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiReferenceExpression)) { + if (!(parent instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)parent; PsiReplacementUtil.replaceExpression(referenceExpression, myClassName + '.' + myReplacement); } } @@ -154,10 +153,9 @@ public class AbsoluteAlignmentInUserInterfaceInspection extends BaseInspection { private static String checkExpression(PsiReferenceExpression expression, String... classNames) { final PsiElement target = expression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return null; } - final PsiField field = (PsiField)target; final PsiClass containingClass = field.getContainingClass(); for (String className : classNames) { if (InheritanceUtil.isInheritor(containingClass, className)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NonNlsUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NonNlsUtils.java index d7df0d814048..7c106e779fe6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NonNlsUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NonNlsUtils.java @@ -42,9 +42,7 @@ public final class NonNlsUtils { return null; } final PsiExpression argument = arguments[0]; - if (argument instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)argument; + if (argument instanceof PsiReferenceExpression referenceExpression) { final PsiElement element = referenceExpression.resolve(); if (element instanceof PsiModifierListOwner) { return (PsiModifierListOwner)element; @@ -58,9 +56,7 @@ public final class NonNlsUtils { PsiReferenceExpression expression) { final PsiExpression qualifierExpression = expression.getQualifierExpression(); - if (qualifierExpression instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)qualifierExpression; + if (qualifierExpression instanceof PsiReferenceExpression referenceExpression) { final PsiElement element = referenceExpression.resolve(); if (element instanceof PsiModifierListOwner && !(element instanceof PsiClass)) { return (PsiModifierListOwner)element; @@ -74,9 +70,7 @@ public final class NonNlsUtils { if (isReferenceToNonNlsAnnotatedElement(expression)) { return true; } - if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = - (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression methodCallExpression) { final PsiMethod method = methodCallExpression.resolveMethod(); if (isNonNlsAnnotatedModifierListOwner(method)) { return true; @@ -87,9 +81,7 @@ public final class NonNlsUtils { methodExpression.getQualifierExpression(); return isNonNlsAnnotated(qualifier); } - else if (expression instanceof PsiArrayAccessExpression) { - final PsiArrayAccessExpression arrayAccessExpression = - (PsiArrayAccessExpression)expression; + else if (expression instanceof PsiArrayAccessExpression arrayAccessExpression) { final PsiExpression arrayExpression = arrayAccessExpression.getArrayExpression(); return isNonNlsAnnotated(arrayExpression); @@ -123,17 +115,13 @@ public final class NonNlsUtils { } } final boolean result; - if (element instanceof PsiExpressionList) { - final PsiExpressionList expressionList = - (PsiExpressionList)element; + if (element instanceof PsiExpressionList expressionList) { result = isNonNlsAnnotatedParameter(expression, expressionList); } else if (element instanceof PsiVariable) { result = isNonNlsAnnotatedModifierListOwner(element); } - else if (element instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = - (PsiAssignmentExpression)element; + else if (element instanceof PsiAssignmentExpression assignmentExpression) { result = isAssignmentToNonNlsAnnotatedVariable(assignmentExpression); } @@ -159,11 +147,9 @@ public final class NonNlsUtils { @Nullable private static T getCachedValue(PsiExpression expression, Key key) { final T data = expression.getUserData(key); - if (!(expression instanceof PsiBinaryExpression)) { + if (!(expression instanceof PsiBinaryExpression binaryExpression)) { return data; } - final PsiBinaryExpression binaryExpression = - (PsiBinaryExpression)expression; final PsiExpression lhs = binaryExpression.getLOperand(); T childData = null; if (lhs instanceof PsiBinaryExpression) { @@ -189,11 +175,9 @@ public final class NonNlsUtils { private static boolean isReferenceToNonNlsAnnotatedElement( @Nullable PsiExpression expression) { - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)expression; final PsiElement target = referenceExpression.resolve(); return isNonNlsAnnotatedModifierListOwner(target); } @@ -203,9 +187,7 @@ public final class NonNlsUtils { PsiExpressionList expressionList) { final PsiElement parent = expressionList.getParent(); final PsiParameterList parameterList; - if (parent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = - (PsiMethodCallExpression)parent; + if (parent instanceof PsiMethodCallExpression methodCallExpression) { if (isQualifierNonNlsAnnotated(methodCallExpression)) { return true; } @@ -215,8 +197,7 @@ public final class NonNlsUtils { } parameterList = method.getParameterList(); } - else if (parent instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)parent; + else if (parent instanceof PsiNewExpression newExpression) { final PsiMethod constructor = newExpression.resolveConstructor(); if (constructor == null) { return false; @@ -275,10 +256,9 @@ public final class NonNlsUtils { private static boolean isNonNlsAnnotatedModifierListOwner( @Nullable PsiElement element) { - if (!(element instanceof PsiModifierListOwner)) { + if (!(element instanceof PsiModifierListOwner variable)) { return false; } - final PsiModifierListOwner variable = (PsiModifierListOwner)element; return AnnotationUtil.isAnnotated(variable, AnnotationUtil.NON_NLS, CHECK_EXTERNAL); } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringTokenizerInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringTokenizerInspection.java index a83f34c2d8ce..605ff44a639b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringTokenizerInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringTokenizerInspection.java @@ -66,11 +66,9 @@ public class StringTokenizerInspection extends BaseInspection { private static boolean isTokenizingNonNlsAnnotatedElement( PsiExpression initializer) { - if (!(initializer instanceof PsiNewExpression)) { + if (!(initializer instanceof PsiNewExpression newExpression)) { return false; } - final PsiNewExpression newExpression = - (PsiNewExpression)initializer; final PsiExpressionList argumentList = newExpression.getArgumentList(); if (argumentList == null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java index faff3e4806b4..096b3a8ac06e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java @@ -35,10 +35,9 @@ public class ConnectionResourceInspection extends ResourceInspection { @Override protected boolean isResourceCreation(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; return MethodCallUtils.isCallToMethod(methodCallExpression, "javax.microedition.io.Connector", null, "open", (PsiType[])null); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java index 6c27b32231d4..ec8573017c66 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java @@ -104,15 +104,13 @@ public class MultiplyOrDivideByPowerOfTwoInspection @Override public InspectionGadgetsFix buildFix(Object... infos) { final PsiExpression expression = (PsiExpression)infos[0]; - if (expression instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; + if (expression instanceof PsiBinaryExpression binaryExpression) { final IElementType operationTokenType = binaryExpression.getOperationTokenType(); if (JavaTokenType.DIV.equals(operationTokenType)) { return null; } } - else if (expression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; + else if (expression instanceof PsiAssignmentExpression assignmentExpression) { final IElementType operationTokenType = assignmentExpression.getOperationTokenType(); if (JavaTokenType.DIVEQ.equals(operationTokenType)) { return null; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/OverlyLargePrimitiveArrayInitializerInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/OverlyLargePrimitiveArrayInitializerInspection.java index fc598dd7f954..92c250aaa414 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/OverlyLargePrimitiveArrayInitializerInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/OverlyLargePrimitiveArrayInitializerInspection.java @@ -83,9 +83,7 @@ public class OverlyLargePrimitiveArrayInitializerInspection } private int calculateNumElements(PsiExpression expression) { - if (expression instanceof PsiArrayInitializerExpression) { - final PsiArrayInitializerExpression arrayExpression = - (PsiArrayInitializerExpression)expression; + if (expression instanceof PsiArrayInitializerExpression arrayExpression) { final PsiExpression[] initializers = arrayExpression.getInitializers(); return Arrays.stream(initializers).mapToInt(this::calculateNumElements).sum(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/PrivateMemberAccessBetweenOuterAndInnerClassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/PrivateMemberAccessBetweenOuterAndInnerClassInspection.java index bb04cdc0699d..01524a7a7db2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/PrivateMemberAccessBetweenOuterAndInnerClassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/PrivateMemberAccessBetweenOuterAndInnerClassInspection.java @@ -152,10 +152,9 @@ public class PrivateMemberAccessBetweenOuterAndInnerClassInspection extends Base final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)element; final PsiElement target = referenceElement.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)target; final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project); final PsiMethod newConstructor = elementFactory.createConstructor(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java index cb41ea69452b..5d2ee6f8e1b8 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java @@ -36,10 +36,9 @@ public class RecordStoreResourceInspection extends ResourceInspection { @Override protected boolean isResourceCreation(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; return MethodCallUtils.isCallToMethod(methodCallExpression, "javax.microedition.rms.RecordStore", null, "openRecordStore", (PsiType[])null); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ShiftUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ShiftUtils.java index d90178397772..0335129e970f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ShiftUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ShiftUtils.java @@ -25,10 +25,9 @@ final class ShiftUtils { } public static boolean isPowerOfTwo(PsiExpression rhs) { - if (!(rhs instanceof PsiLiteralExpression)) { + if (!(rhs instanceof PsiLiteralExpression literal)) { return false; } - final PsiLiteralExpression literal = (PsiLiteralExpression)rhs; final Object value = literal.getValue(); if (!(value instanceof Number)) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java index 986f36d825bc..17a7241c1dce 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java @@ -138,10 +138,9 @@ public class SingleCharacterStartsWithInspection extends BaseInspection { if (!TypeUtils.isJavaLangString(type)) { return false; } - if (!(arg instanceof PsiLiteralExpression)) { + if (!(arg instanceof PsiLiteralExpression literal)) { return false; } - final PsiLiteralExpression literal = (PsiLiteralExpression)arg; final String value = (String)literal.getValue(); return value != null && value.length() == 1; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/PropertyValueSetToItselfInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/PropertyValueSetToItselfInspection.java index 22b59b79f7da..5dc12f0792bb 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/PropertyValueSetToItselfInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/PropertyValueSetToItselfInspection.java @@ -37,10 +37,9 @@ public class PropertyValueSetToItselfInspection extends BaseInspection { return; } final PsiExpression argument = arguments1[0]; - if (!(argument instanceof PsiMethodCallExpression)) { + if (!(argument instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)argument; if (!methodCallExpression.getArgumentList().isEmpty()) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java index 1dbbf0e74d46..a09dbfdef816 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java @@ -67,8 +67,7 @@ public class DanglingJavadocInspection extends BaseInspection { final PsiElement docComment = element.getParent(); final StringBuilder newCommentText = new StringBuilder(); for (PsiElement child = docComment.getFirstChild(); child != null; child = child.getNextSibling()) { - if (child instanceof PsiDocToken) { - final PsiDocToken docToken = (PsiDocToken)child; + if (child instanceof PsiDocToken docToken) { final IElementType tokenType = docToken.getTokenType(); if (JavaDocTokenType.DOC_COMMENT_START.equals(tokenType)) { newCommentText.append("/*"); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/PackageInfoWithoutPackageInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/PackageInfoWithoutPackageInspection.java index d5ca4582d9da..6e9a65f9b325 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/PackageInfoWithoutPackageInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/PackageInfoWithoutPackageInspection.java @@ -54,10 +54,9 @@ public class PackageInfoWithoutPackageInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiJavaFile)) { + if (!(element instanceof PsiJavaFile file)) { return; } - final PsiJavaFile file = (PsiJavaFile)element; file.setPackageName(myPackageName); } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java index 72d997edf67d..40275dc257e9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java @@ -54,10 +54,9 @@ public class UnnecessaryInheritDocInspection extends BaseInspection implements C @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiDocTag)) { + if (!(element instanceof PsiDocTag docTag)) { return; } - final PsiDocTag docTag = (PsiDocTag)element; final PsiElement parent = docTag.getParent(); if (parent instanceof PsiDocComment docComment) { final PsiDocTag[] docTags = docComment.getTags(); @@ -153,10 +152,9 @@ public class UnnecessaryInheritDocInspection extends BaseInspection implements C PsiTreeUtil.findChildOfType(valueElement, PsiJavaCodeReferenceElement.class); if (referenceElement != null) { final PsiElement target = referenceElement.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return false; } - final PsiClass aClass = (PsiClass)target; if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_EXCEPTION) || InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION)) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryJavaDocLinkInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryJavaDocLinkInspection.java index 8d2d16f2d8ac..3d7ebaacb8cb 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryJavaDocLinkInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryJavaDocLinkInspection.java @@ -102,10 +102,9 @@ public class UnnecessaryJavaDocLinkInspection extends BaseInspection implements protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiDocTag)) { + if (!(parent instanceof PsiDocTag docTag)) { return; } - final PsiDocTag docTag = (PsiDocTag)parent; final PsiDocComment docComment = docTag.getContainingComment(); if (docComment != null) { if (shouldDeleteEntireComment(docComment)) { @@ -183,10 +182,9 @@ public class UnnecessaryJavaDocLinkInspection extends BaseInspection implements Integer.valueOf(THIS_CLASS)); return; } - if (!(target instanceof PsiMethod)) { + if (!(target instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)target; if (!isSuperMethod(method, containingMethod)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoBoxingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoBoxingInspection.java index 6da0232d3eda..66e5df71d940 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoBoxingInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoBoxingInspection.java @@ -133,8 +133,7 @@ public class AutoBoxingInspection extends BaseInspection { newExpression = classToConstruct + ".valueOf(" + expressionText + ')'; } final PsiElement parent = expression.getParent(); - if (parent instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)parent; + if (parent instanceof PsiTypeCastExpression typeCastExpression) { PsiReplacementUtil.replaceExpression(typeCastExpression, newExpression, commentTracker); } else { PsiReplacementUtil.replaceExpression(expression, newExpression, commentTracker); @@ -142,10 +141,9 @@ public class AutoBoxingInspection extends BaseInspection { } private static boolean shortcutReplace(PsiExpression expression, String classToConstruct) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); if (qualifierExpression == null) { @@ -275,8 +273,7 @@ public class AutoBoxingInspection extends BaseInspection { @Override public void visitReferenceExpression(@NotNull PsiReferenceExpression expression) { super.visitReferenceExpression(expression); - if (expression instanceof PsiMethodReferenceExpression) { - final PsiMethodReferenceExpression methodReferenceExpression = (PsiMethodReferenceExpression)expression; + if (expression instanceof PsiMethodReferenceExpression methodReferenceExpression) { if (methodReferenceExpression.isConstructor()) { return; } @@ -285,10 +282,9 @@ public class AutoBoxingInspection extends BaseInspection { return; } final PsiElement target = methodReferenceExpression.resolve(); - if (!(target instanceof PsiMethod)) { + if (!(target instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)target; final PsiType returnType = method.getReturnType(); if (returnType == null || returnType.equals(PsiTypes.voidType()) || !TypeConversionUtil.isPrimitiveAndNotNull(returnType)) { return; @@ -328,15 +324,13 @@ public class AutoBoxingInspection extends BaseInspection { private boolean isAddedToCollection(PsiExpression expression) { final PsiElement parent = expression.getParent(); - if (!(parent instanceof PsiExpressionList)) { + if (!(parent instanceof PsiExpressionList expressionList)) { return false; } - final PsiExpressionList expressionList = (PsiExpressionList)parent; final PsiElement grandParent = expressionList.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); @NonNls final String methodName = methodExpression.getReferenceName(); if (!"put".equals(methodName) && !"set".equals(methodName) && !"add".equals(methodName)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java index 60f1317fbe4f..aaae772421fe 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java @@ -88,8 +88,7 @@ public class AutoUnboxingInspection extends BaseInspection { if (location instanceof PsiReferenceExpression) { reference = (PsiReferenceExpression)location; } - else if (location instanceof PsiArrayAccessExpression) { - final PsiArrayAccessExpression arrayAccessExpression = (PsiArrayAccessExpression)location; + else if (location instanceof PsiArrayAccessExpression arrayAccessExpression) { final PsiExpression expression = arrayAccessExpression.getArrayExpression(); if (!(expression instanceof PsiReferenceExpression)) { return true; @@ -136,12 +135,10 @@ public class AutoUnboxingInspection extends BaseInspection { final PsiElementFactory factory = psiFacade.getElementFactory(); final PsiElement parent = expression.getParent(); final String expressionText = expression.getText(); - if (parent instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)parent; + if (parent instanceof PsiTypeCastExpression typeCastExpression) { PsiReplacementUtil.replaceExpression(typeCastExpression, newExpressionText, commentTracker); } - else if (parent instanceof PsiPrefixExpression && !unboxedType.equalsToText("boolean")) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)parent; + else if (parent instanceof PsiPrefixExpression prefixExpression && !unboxedType.equalsToText("boolean")) { final IElementType tokenType = prefixExpression.getOperationTokenType(); if (JavaTokenType.PLUSPLUS.equals(tokenType)) { commentTracker.markUnchanged(expression); @@ -154,8 +151,7 @@ public class AutoUnboxingInspection extends BaseInspection { PsiReplacementUtil.replaceExpression(prefixExpression, prefixExpression.getOperationSign().getText() + newExpressionText, commentTracker); } } - else if (parent instanceof PsiPostfixExpression) { - final PsiPostfixExpression postfixExpression = (PsiPostfixExpression)parent; + else if (parent instanceof PsiPostfixExpression postfixExpression) { final IElementType tokenType = postfixExpression.getOperationTokenType(); final PsiElement grandParent = postfixExpression.getParent(); if (grandParent instanceof PsiExpressionStatement) { @@ -185,8 +181,7 @@ public class AutoUnboxingInspection extends BaseInspection { greatGrandParent.addAfter(newStatement, statement); } } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression lExpression = assignmentExpression.getLExpression(); if (expression.equals(lExpression)) { final PsiJavaToken operationSign = assignmentExpression.getOperationSign(); @@ -218,8 +213,7 @@ public class AutoUnboxingInspection extends BaseInspection { } final String expressionText = getExpressionText(expression, new StringBuilder()).toString(); final String boxMethodName = s_unboxingMethods.get(unboxedType.getCanonicalText()); - if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression methodCallExpression) { if (isValueOfCall(methodCallExpression)) { final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); @@ -255,8 +249,7 @@ public class AutoUnboxingInspection extends BaseInspection { } out.append(')'); } - else if (expression instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditional = (PsiConditionalExpression)expression; + else if (expression instanceof PsiConditionalExpression conditional) { out.append(conditional.getCondition().getText()).append('?'); getExpressionText(conditional.getThenExpression(), out); out.append(':'); @@ -299,15 +292,13 @@ public class AutoUnboxingInspection extends BaseInspection { @NonNls private static String computeConstantBooleanText(PsiExpression expression) { - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return null; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return null; } - final PsiField field = (PsiField)target; final PsiClass containingClass = field.getContainingClass(); if (containingClass == null) { return null; @@ -355,8 +346,7 @@ public class AutoUnboxingInspection extends BaseInspection { @Override public void visitReferenceExpression(@NotNull PsiReferenceExpression expression) { super.visitReferenceExpression(expression); - if (expression instanceof PsiMethodReferenceExpression) { - final PsiMethodReferenceExpression methodReferenceExpression = (PsiMethodReferenceExpression)expression; + if (expression instanceof PsiMethodReferenceExpression methodReferenceExpression) { if (methodReferenceExpression.isConstructor()) { return; } @@ -365,10 +355,9 @@ public class AutoUnboxingInspection extends BaseInspection { return; } final PsiElement target = methodReferenceExpression.resolve(); - if (!(target instanceof PsiMethod)) { + if (!(target instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)target; final PsiType returnType = method.getReturnType(); if (!TypeConversionUtil.isAssignableFromPrimitiveWrapper(returnType)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/ForeachStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/ForeachStatementInspection.java index c67501d026dd..92a92a0d5ee1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/ForeachStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/ForeachStatementInspection.java @@ -108,8 +108,7 @@ public class ForeachStatementInspection extends BaseInspection { newStatement.append(typeText).append(' ').append(iterationParameter.getName()).append(" = ").append(iterator).append(".next();"); } final PsiStatement body = statement.getBody(); - if (body instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)body; + if (body instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock block = blockStatement.getCodeBlock(); final PsiElement[] children = block.getChildren(); for (int i = 1; i < children.length - 1; i++) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java index 333bb9b8560f..a26a7d9109ac 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java @@ -133,8 +133,7 @@ public class VarargParameterInspection extends BaseInspection { final PsiEllipsisType type = (PsiEllipsisType)lastParameter.getType(); final PsiType componentType = type.getComponentType(); final String typeText; - if (componentType instanceof PsiClassType) { - final PsiClassType classType = (PsiClassType)componentType; + if (componentType instanceof PsiClassType classType) { typeText = classType.rawType().getCanonicalText(); } else { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ExpectedExceptionNeverThrownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ExpectedExceptionNeverThrownInspection.java index f4a9a68d44d0..80f0c6c55a03 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ExpectedExceptionNeverThrownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ExpectedExceptionNeverThrownInspection.java @@ -59,14 +59,13 @@ public class ExpectedExceptionNeverThrownInspection extends BaseInspection { break; } } - if (!(value instanceof PsiClassObjectAccessExpression)) { + if (!(value instanceof PsiClassObjectAccessExpression classObjectAccessExpression)) { return; } final PsiCodeBlock body = method.getBody(); if (body == null) { return; } - final PsiClassObjectAccessExpression classObjectAccessExpression = (PsiClassObjectAccessExpression)value; final PsiTypeElement operand = classObjectAccessExpression.getOperand(); final PsiType type = operand.getType(); final PsiClass aClass = PsiUtil.resolveClassInClassTypeOnly(type); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java index 2b8df8e025a7..b4a051c928cd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java @@ -56,10 +56,9 @@ public class MultipleExceptionsDeclaredOnTestMethodInspection extends BaseInspec @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiReferenceList)) { + if (!(element instanceof PsiReferenceList referenceList)) { return; } - final PsiReferenceList referenceList = (PsiReferenceList)element; final PsiJavaCodeReferenceElement[] referenceElements = referenceList.getReferenceElements(); for (PsiJavaCodeReferenceElement referenceElement : referenceElements) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LoggingConditionDisagreesWithLogStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LoggingConditionDisagreesWithLogStatementInspection.java index 6a178c9885ab..526c42dec132 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LoggingConditionDisagreesWithLogStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LoggingConditionDisagreesWithLogStatementInspection.java @@ -125,8 +125,7 @@ public class LoggingConditionDisagreesWithLogStatementInspection extends BaseIns return; } } - else if (condition instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)condition; + else if (condition instanceof PsiPrefixExpression prefixExpression) { if (!JavaTokenType.EXCL.equals(prefixExpression.getOperationTokenType())) { return; } @@ -143,10 +142,9 @@ public class LoggingConditionDisagreesWithLogStatementInspection extends BaseIns return; } final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (!(qualifier instanceof PsiReferenceExpression)) { + if (!(qualifier instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifier; final PsiElement target = referenceExpression.resolve(); if (target == null) { return; @@ -154,10 +152,9 @@ public class LoggingConditionDisagreesWithLogStatementInspection extends BaseIns final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)condition; final PsiReferenceExpression conditionMethodExpression = methodCallExpression.getMethodExpression(); final PsiExpression conditionQualifier = conditionMethodExpression.getQualifierExpression(); - if (!(conditionQualifier instanceof PsiReferenceExpression)) { + if (!(conditionQualifier instanceof PsiReferenceExpression conditionReferenceExpression)) { return; } - final PsiReferenceExpression conditionReferenceExpression = (PsiReferenceExpression)conditionQualifier; final PsiElement conditionTarget = conditionReferenceExpression.resolve(); if (!target.equals(conditionTarget)) { return; @@ -205,18 +202,16 @@ public class LoggingConditionDisagreesWithLogStatementInspection extends BaseIns @Nullable public static String getLoggingLevelFromArgument(PsiExpression argument) { - if (!(argument instanceof PsiReferenceExpression)) { + if (!(argument instanceof PsiReferenceExpression argumentReference)) { return null; } - final PsiReferenceExpression argumentReference = (PsiReferenceExpression)argument; if (!"java.util.logging.Level".equals(TypeUtils.resolvedClassName(argument.getType()))) { return null; } final PsiElement argumentTarget = argumentReference.resolve(); - if (!(argumentTarget instanceof PsiField)) { + if (!(argumentTarget instanceof PsiField field)) { return null; } - final PsiField field = (PsiField)argumentTarget; return StringUtil.toLowerCase(field.getName()); } } @@ -249,18 +244,16 @@ public class LoggingConditionDisagreesWithLogStatementInspection extends BaseIns final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); final PsiExpression argument = arguments[0]; - if (!(argument instanceof PsiReferenceExpression)) { + if (!(argument instanceof PsiReferenceExpression referenceExpression)) { return false; } if (!InheritanceUtil.isInheritor(argument.getType(), "org.apache.logging.log4j.Level")) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)argument; final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return false; } - final PsiField field = (PsiField)target; final String fieldName = field.getName(); return !StringUtil.toLowerCase(fieldName).equals(priority); } @@ -268,24 +261,21 @@ public class LoggingConditionDisagreesWithLogStatementInspection extends BaseIns final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); for (PsiExpression argument : arguments) { - if (!(argument instanceof PsiReferenceExpression)) { + if (!(argument instanceof PsiReferenceExpression argumentReference)) { continue; } - final PsiReferenceExpression argumentReference = (PsiReferenceExpression)argument; final PsiType type = argument.getType(); - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType classType)) { continue; } - final PsiClassType classType = (PsiClassType)type; final PsiClass aClass = classType.resolve(); if (!InheritanceUtil.isInheritor(aClass, "org.apache.log4j.Priority")) { continue; } final PsiElement argumentTarget = argumentReference.resolve(); - if (!(argumentTarget instanceof PsiField)) { + if (!(argumentTarget instanceof PsiField field)) { continue; } - final PsiField field = (PsiField)argumentTarget; final String fieldName = field.getName(); return !StringUtil.toLowerCase(fieldName).equals(priority); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ObsoleteCollectionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ObsoleteCollectionInspection.java index 65c78fd46812..4f3f693e70b3 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ObsoleteCollectionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ObsoleteCollectionInspection.java @@ -148,8 +148,7 @@ public class ObsoleteCollectionInspection extends BaseInspection { private boolean isRequiredObsoleteCollectionElement(PsiElement element) { final PsiElement parent = element.getParent(); - if (parent instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)parent; + if (parent instanceof PsiVariable variable) { final PsiType variableType = variable.getType(); if (isObsoleteCollectionType(variableType)) { return true; @@ -161,9 +160,7 @@ public class ObsoleteCollectionInspection extends BaseInspection { return true; } } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = - (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression lhs = assignmentExpression.getLExpression(); final PsiType lhsType = lhs.getType(); if (isObsoleteCollectionType(lhsType)) { @@ -173,16 +170,13 @@ public class ObsoleteCollectionInspection extends BaseInspection { else if (parent instanceof PsiMethodCallExpression) { return isRequiredObsoleteCollectionElement(parent); } - if (!(parent instanceof PsiExpressionList)) { + if (!(parent instanceof PsiExpressionList argumentList)) { return false; } - final PsiExpressionList argumentList = (PsiExpressionList)parent; final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiCallExpression)) { + if (!(grandParent instanceof PsiCallExpression callExpression)) { return false; } - final PsiCallExpression callExpression = - (PsiCallExpression)grandParent; final int index = getIndexOfArgument(argumentList, element); final PsiMethod method = callExpression.resolveMethod(); if (method == null) { @@ -198,10 +192,9 @@ public class ObsoleteCollectionInspection extends BaseInspection { return false; } final PsiType type = lastParameter.getType(); - if (!(type instanceof PsiEllipsisType)) { + if (!(type instanceof PsiEllipsisType ellipsisType)) { return false; } - final PsiEllipsisType ellipsisType = (PsiEllipsisType)type; final PsiType componentType = ellipsisType.getComponentType(); return isObsoleteCollectionType(componentType); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ThreadDumpStackInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ThreadDumpStackInspection.java index b4cd472de4ae..157faf45b9e1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ThreadDumpStackInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ThreadDumpStackInspection.java @@ -60,10 +60,9 @@ public class ThreadDumpStackInspection extends BaseInspection { final PsiReferenceExpression methodExpression = expression.getMethodExpression(); final PsiElement element = methodExpression.resolve(); - if (!(element instanceof PsiMethod)) { + if (!(element instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)element; final PsiClass aClass = method.getContainingClass(); if (aClass == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ThrowablePrintedToSystemOutInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ThrowablePrintedToSystemOutInspection.java index f9df03098207..4d4657245544 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ThrowablePrintedToSystemOutInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ThrowablePrintedToSystemOutInspection.java @@ -70,15 +70,13 @@ public class ThrowablePrintedToSystemOutInspection extends BaseInspection { return; } final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (!(qualifier instanceof PsiReferenceExpression)) { + if (!(qualifier instanceof PsiReferenceExpression qualifierReference)) { return; } - final PsiReferenceExpression qualifierReference = (PsiReferenceExpression)qualifier; final PsiElement target = qualifierReference.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return; } - final PsiField field = (PsiField)target; @NonNls final String fieldName = field.getName(); if (!"out".equals(fieldName) && !"err".equals(fieldName)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/UseOfObsoleteDateTimeApiInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/UseOfObsoleteDateTimeApiInspection.java index 5e8b681ca4db..8709cd7916b6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/UseOfObsoleteDateTimeApiInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/UseOfObsoleteDateTimeApiInspection.java @@ -60,9 +60,8 @@ public class UseOfObsoleteDateTimeApiInspection extends BaseInspection { } super.visitReferenceElement(referenceElement); final PsiElement target = referenceElement.resolve(); - if (!(target instanceof PsiClass)) return; + if (!(target instanceof PsiClass targetClass)) return; - final PsiClass targetClass = (PsiClass)target; if (!dateTimeNames.contains(targetClass.getQualifiedName())) { return; } @@ -70,14 +69,12 @@ public class UseOfObsoleteDateTimeApiInspection extends BaseInspection { PsiTypeElement typeElement = PsiTreeUtil.getTopmostParentOfType(referenceElement, PsiTypeElement.class); if (typeElement != null) { final PsiElement parent = typeElement.getParent(); - if (parent instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)parent; + if (parent instanceof PsiMethod method) { if (LibraryUtil.isOverrideOfLibraryMethod(method)) { return; } } - else if (parent instanceof PsiParameter) { - final PsiParameter parameter = (PsiParameter)parent; + else if (parent instanceof PsiParameter parameter) { if (LibraryUtil.isOverrideOfLibraryMethodParameter(parameter)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/NCSSVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/NCSSVisitor.java index ae6b8f531fb6..bc247324eea5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/NCSSVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/NCSSVisitor.java @@ -34,8 +34,7 @@ class NCSSVisitor extends JavaRecursiveElementWalkingVisitor { return; } final PsiElement parent = statement.getParent(); - if (parent instanceof PsiForStatement) { - final PsiForStatement forStatement = (PsiForStatement)parent; + if (parent instanceof PsiForStatement forStatement) { if (forStatement.getInitialization() == statement || forStatement.getUpdate() == statement) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/OverlyLongLambdaInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/OverlyLongLambdaInspection.java index 453a3ba106d8..f0c83bf015a0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/OverlyLongLambdaInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/OverlyLongLambdaInspection.java @@ -54,10 +54,9 @@ public class OverlyLongLambdaInspection extends MethodMetricInspection { @Override public void visitLambdaExpression(@NotNull PsiLambdaExpression expression) { final PsiElement body = expression.getBody(); - if (!(body instanceof PsiCodeBlock)) { + if (!(body instanceof PsiCodeBlock block)) { return; } - final PsiCodeBlock block = (PsiCodeBlock)body; final PsiJavaToken brace = block.getLBrace(); if (brace == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/ReturnPointCountVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/ReturnPointCountVisitor.java index b40d0551e787..f93e792c5758 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/ReturnPointCountVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/ReturnPointCountVisitor.java @@ -64,10 +64,9 @@ class ReturnPointCountVisitor extends JavaRecursiveElementWalkingVisitor { } private static boolean isGuardClause(PsiStatement statement) { - if (!(statement instanceof PsiIfStatement)) { + if (!(statement instanceof PsiIfStatement ifStatement)) { return false; } - final PsiIfStatement ifStatement = (PsiIfStatement)statement; if (ifStatement.getElseBranch() != null) { return false; } @@ -75,10 +74,9 @@ class ReturnPointCountVisitor extends JavaRecursiveElementWalkingVisitor { if (thenBranch instanceof PsiReturnStatement) { return true; } - if (!(thenBranch instanceof PsiBlockStatement)) { + if (!(thenBranch instanceof PsiBlockStatement blockStatement)) { return false; } - final PsiBlockStatement blockStatement = (PsiBlockStatement)thenBranch; final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiStatement containedStatement = ControlFlowUtils.getOnlyStatementInBlock(codeBlock); return containedStatement instanceof PsiReturnStatement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java index 66149905dda2..68347ad0578f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java @@ -66,17 +66,15 @@ public class CollectionsFieldAccessReplaceableByMethodCallInspection extends Bas return getUntypedCollectionsMethodCallText(referenceName); } final PsiType type = ExpectedTypeUtils.findExpectedType(referenceExpression, false); - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType classType)) { return getUntypedCollectionsMethodCallText(referenceName); } - final PsiClassType classType = (PsiClassType)type; final PsiType[] parameterTypes = classType.getParameters(); boolean useTypeParameter = false; final String[] canonicalTexts = new String[parameterTypes.length]; for (int i = 0, parameterTypesLength = parameterTypes.length; i < parameterTypesLength; i++) { final PsiType parameterType = parameterTypes[i]; - if (parameterType instanceof PsiWildcardType) { - final PsiWildcardType wildcardType = (PsiWildcardType)parameterType; + if (parameterType instanceof PsiWildcardType wildcardType) { final PsiType bound = wildcardType.getBound(); if (bound != null) { if (!bound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { @@ -124,10 +122,9 @@ public class CollectionsFieldAccessReplaceableByMethodCallInspection extends Bas @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiReferenceExpression)) { + if (!(element instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element; final String newMethodCallText = getCollectionsMethodCallText(referenceExpression); PsiReplacementUtil.replaceExpression(referenceExpression, "java.util." + newMethodCallText); } @@ -163,10 +160,9 @@ public class CollectionsFieldAccessReplaceableByMethodCallInspection extends Bas return; } final PsiElement target = expression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return; } - final PsiField field = (PsiField)target; final PsiClass containingClass = field.getContainingClass(); if (containingClass == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java index 6ff174453770..bdf00e992436 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java @@ -191,8 +191,7 @@ public class EqualsReplaceableByObjectsCallInspection extends BaseInspection imp * @return true if the pattern is matched */ private boolean registerProblem(@NotNull PsiBinaryExpression expression, PsiExpression rightOperand, boolean equal) { - if (rightOperand instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)rightOperand; + if (rightOperand instanceof PsiMethodCallExpression methodCallExpression) { final NullCheck nullCheck = NullCheck.create(expression.getLOperand()); if (nullCheck != null && nullCheck.isEqual != equal) { final PsiExpression nullCheckedExpression = nullCheck.compared; @@ -226,8 +225,7 @@ public class EqualsReplaceableByObjectsCallInspection extends BaseInspection imp @NotNull private PsiExpression checkEqualityBefore(@NotNull PsiExpression expression, boolean equal, PsiExpression part1, PsiExpression part2) { final PsiElement parent = PsiTreeUtil.skipParentsOfType(expression, PsiParenthesizedExpression.class); - if (parent instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)parent; + if (parent instanceof PsiBinaryExpression binaryExpression) { final IElementType tokenType = binaryExpression.getOperationTokenType(); if (equal && JavaTokenType.OROR.equals(tokenType) || !equal && JavaTokenType.ANDAND.equals(tokenType)) { if (PsiTreeUtil.isAncestor(binaryExpression.getROperand(), expression, false)) { @@ -243,10 +241,9 @@ public class EqualsReplaceableByObjectsCallInspection extends BaseInspection imp private boolean isEquality(PsiExpression expression, boolean equals, PsiExpression part1, PsiExpression part2) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiBinaryExpression)) { + if (!(expression instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; if (equals) { if (!JavaTokenType.EQEQ.equals(binaryExpression.getOperationTokenType())) { return false; @@ -282,8 +279,7 @@ public class EqualsReplaceableByObjectsCallInspection extends BaseInspection imp @Nullable private static PsiExpression findFinalVariableDefinition(@NotNull PsiReferenceExpression expression) { final PsiElement resolved = expression.resolve(); - if (resolved instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)resolved; + if (resolved instanceof PsiVariable variable) { if (variable.hasModifierProperty(PsiModifier.FINAL)) { return PsiUtil.skipParenthesizedExprDown(variable.getInitializer()); } @@ -314,8 +310,7 @@ public class EqualsReplaceableByObjectsCallInspection extends BaseInspection imp static Negated create(@Nullable PsiExpression maybeNegatedExpression) { boolean equal = true; PsiExpression expression = PsiUtil.skipParenthesizedExprDown(maybeNegatedExpression); - if (expression instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression; + if (expression instanceof PsiPrefixExpression prefixExpression) { if (JavaTokenType.EXCL.equals(prefixExpression.getOperationTokenType())) { equal = false; expression = PsiUtil.skipParenthesizedExprDown(prefixExpression.getOperand()); @@ -337,8 +332,7 @@ public class EqualsReplaceableByObjectsCallInspection extends BaseInspection imp @Nullable private static NullCheck create(@Nullable PsiExpression maybeNullCheckExpression) { final Negated n = Negated.create(maybeNullCheckExpression); - if (n != null && n.expression instanceof PsiBinaryExpression) { - PsiBinaryExpression binaryExpression = (PsiBinaryExpression)n.expression; + if (n != null && n.expression instanceof PsiBinaryExpression binaryExpression) { PsiExpression comparedWithNull = PsiUtil.skipParenthesizedExprDown(ExpressionUtils.getValueComparedWithNull(binaryExpression)); if (comparedWithNull != null) { boolean equal = JavaTokenType.EQEQ.equals(binaryExpression.getOperationTokenType()); @@ -363,8 +357,7 @@ public class EqualsReplaceableByObjectsCallInspection extends BaseInspection imp @Nullable private static EqualsCheck create(@Nullable PsiExpression maybeEqualsCheckExpression) { final Negated n = Negated.create(maybeEqualsCheckExpression); - if (n != null && n.expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression callExpression = (PsiMethodCallExpression)n.expression; + if (n != null && n.expression instanceof PsiMethodCallExpression callExpression) { if (HardcodedMethodConstants.EQUALS.equals(callExpression.getMethodExpression().getReferenceName())) { final PsiExpression argument = getArgumentExpression(callExpression); final PsiExpression qualifier = getQualifierExpression(callExpression); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java index 271f95cca438..37af90afd2ea 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java @@ -78,10 +78,9 @@ public class IndexOfReplaceableByContainsInspection @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiBinaryExpression)) { + if (!(element instanceof PsiBinaryExpression expression)) { return; } - final PsiBinaryExpression expression = (PsiBinaryExpression)element; final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(expression.getLOperand()); final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(expression.getROperand()); CommentTracker commentTracker = new CommentTracker(); @@ -183,10 +182,9 @@ public class IndexOfReplaceableByContainsInspection } final Object object = ExpressionUtils.computeConstantExpression(rhs); - if (!(object instanceof Integer)) { + if (!(object instanceof Integer integer)) { return false; } - final Integer integer = (Integer)object; final int constant = integer.intValue(); if (flipped) { if (constant == -1 && (JavaTokenType.NE.equals(tokenType) || diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/MethodCanBeVariableArityMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/MethodCanBeVariableArityMethodInspection.java index 5a838a52d5ff..5dfa6ffdd171 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/MethodCanBeVariableArityMethodInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/MethodCanBeVariableArityMethodInspection.java @@ -102,13 +102,12 @@ public class MethodCanBeVariableArityMethodInspection extends BaseInspection { } final PsiParameter lastParameter = parameters[parameters.length - 1]; final PsiType type = lastParameter.getType(); - if (!(type instanceof PsiArrayType) || type instanceof PsiEllipsisType) { + if (!(type instanceof PsiArrayType arrayType) || type instanceof PsiEllipsisType) { return; } if (NullableNotNullManager.isNullable(lastParameter)) { return; } - final PsiArrayType arrayType = (PsiArrayType)type; final PsiType componentType = arrayType.getComponentType(); if (ignoreMultiDimensionalArrayParameters && componentType instanceof PsiArrayType) { // don't report when it is multidimensional array diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java index 2048c168c1d3..a4f1f67f969f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java @@ -101,16 +101,14 @@ public class StringBufferReplaceableByStringBuilderInspection extends BaseInspec final PsiElementFactory factory = psiFacade.getElementFactory(); final PsiJavaCodeReferenceElement stringBuilderClassReference = factory.createClassReferenceElement(stringBuilderClass); final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiDeclarationStatement)) { + if (!(grandParent instanceof PsiDeclarationStatement declarationStatement)) { return; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)grandParent; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); for (PsiElement declaredElement : declaredElements) { - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable variable)) { continue; } - final PsiVariable variable = (PsiVariable)declaredElement; replaceWithStringBuilder(stringBuilderClassReference, variable); replaceAssignmentsWithStringBuilder(variable, stringBuilderClassReference); } @@ -121,8 +119,7 @@ public class StringBufferReplaceableByStringBuilderInspection extends BaseInspec VariableAccessUtils.getVariableReferences(variable, PsiUtil.getVariableCodeBlock(variable, null)); for (PsiReference reference : references) { final PsiElement referenceElement = PsiUtil.skipParenthesizedExprUp(reference.getElement().getParent()); - if (referenceElement instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)referenceElement; + if (referenceElement instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression rhs = assignmentExpression.getRExpression(); final PsiExpression newExpression = getNewStringBuffer(rhs); if (!(newExpression instanceof PsiNewExpression)) { @@ -184,10 +181,9 @@ public class StringBufferReplaceableByStringBuilderInspection extends BaseInspec return; } for (PsiElement declaredElement : declaredElements) { - if (!(declaredElement instanceof PsiLocalVariable)) { + if (!(declaredElement instanceof PsiLocalVariable variable)) { return; } - final PsiLocalVariable variable = (PsiLocalVariable)declaredElement; final PsiElement context = PsiTreeUtil.getParentOfType(variable, PsiCodeBlock.class, true, PsiClass.class); if (!isReplaceableStringBuffer(variable, context)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java index 74cb28157e08..21f094cdfff3 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java @@ -77,10 +77,9 @@ public class TryFinallyCanBeTryWithResourcesInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiTryStatement)) { + if (!(parent instanceof PsiTryStatement tryStatement)) { return; } - final PsiTryStatement tryStatement = (PsiTryStatement)parent; PsiCodeBlock tryBlock = tryStatement.getTryBlock(); if (tryBlock == null) return; Context context = Context.from(tryStatement); @@ -407,12 +406,10 @@ public class TryFinallyCanBeTryWithResourcesInspection extends BaseInspection { } private static boolean findAutoClosableVariableWithoutTry(PsiStatement statement, Set variables) { - if (statement instanceof PsiIfStatement) { - final PsiIfStatement ifStatement = (PsiIfStatement)statement; + if (statement instanceof PsiIfStatement ifStatement) { if (ifStatement.getElseBranch() != null) return false; final PsiExpression condition = ifStatement.getCondition(); - if (!(condition instanceof PsiBinaryExpression)) return false; - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)condition; + if (!(condition instanceof PsiBinaryExpression binaryExpression)) return false; final IElementType tokenType = binaryExpression.getOperationTokenType(); if (!JavaTokenType.NE.equals(tokenType)) return false; final PsiExpression lhs = binaryExpression.getLOperand(); @@ -434,8 +431,7 @@ public class TryFinallyCanBeTryWithResourcesInspection extends BaseInspection { if (thenBranch instanceof PsiExpressionStatement) { resourceVariable = findAutoCloseableVariable(thenBranch); } - else if (thenBranch instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)thenBranch; + else if (thenBranch instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); resourceVariable = findAutoCloseableVariable(ControlFlowUtils.getOnlyStatementInBlock(codeBlock)); } @@ -447,17 +443,14 @@ public class TryFinallyCanBeTryWithResourcesInspection extends BaseInspection { return true; } } - else if (statement instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; + else if (statement instanceof PsiExpressionStatement expressionStatement) { final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiMethodCallExpression)) return false; - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) return false; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String methodName = methodExpression.getReferenceName(); if (HardcodedMethodConstants.CLOSE.equals(methodName)) { final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (!(qualifier instanceof PsiReferenceExpression)) return false; - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifier; + if (!(qualifier instanceof PsiReferenceExpression referenceExpression)) return false; final PsiElement target = referenceExpression.resolve(); if (!(target instanceof PsiLocalVariable || target instanceof PsiParameter) || target instanceof PsiResourceVariable) return false; PsiVariable variable = (PsiVariable)target; @@ -486,8 +479,7 @@ public class TryFinallyCanBeTryWithResourcesInspection extends BaseInspection { private static boolean findAutoCloseableVariables(PsiStatement statement, Set variables) { if (findAutoClosableVariableWithoutTry(statement, variables)) return true; - if (statement instanceof PsiTryStatement) { - PsiTryStatement tryStatement = (PsiTryStatement)statement; + if (statement instanceof PsiTryStatement tryStatement) { if (tryStatement.getResourceList() != null || tryStatement.getFinallyBlock() != null) return true; PsiCodeBlock[] catchBlocks = tryStatement.getCatchBlocks(); if (catchBlocks.length != 1) return true; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryWithIdenticalCatchesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryWithIdenticalCatchesInspection.java index 7c97be887e86..f548a00a64a1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryWithIdenticalCatchesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryWithIdenticalCatchesInspection.java @@ -65,8 +65,7 @@ public class TryWithIdenticalCatchesInspection extends BaseInspection { @Override public boolean isSuppressedFor(@NotNull PsiElement element) { - if (element instanceof PsiCatchSection) { - final PsiCatchSection catchSection = (PsiCatchSection)element; + if (element instanceof PsiCatchSection catchSection) { final PsiParameter parameter = catchSection.getParameter(); if (parameter != null && super.isSuppressedFor(parameter)) { return true; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java index 14cbaa8924f8..fac0e62a388b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java @@ -301,12 +301,10 @@ public class UnnecessaryBoxingInspection extends BaseInspection { // Inferred type may change if boxing is removed; if it's possible if (typeElement != null && typeElement.isInferredType()) return true; } - else if (parent instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression castExpression = (PsiTypeCastExpression)parent; + else if (parent instanceof PsiTypeCastExpression castExpression) { return TypeUtils.isTypeParameter(castExpression.getType()); } - else if (parent instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)parent; + else if (parent instanceof PsiConditionalExpression conditionalExpression) { final PsiExpression thenExpression = conditionalExpression.getThenExpression(); final PsiExpression elseExpression = conditionalExpression.getElseExpression(); if (elseExpression == null || thenExpression == null) { @@ -324,8 +322,7 @@ public class UnnecessaryBoxingInspection extends BaseInspection { return false; } } - else if (parent instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; + else if (parent instanceof PsiPolyadicExpression polyadicExpression) { return isPossibleObjectComparison(boxingExpression, polyadicExpression); } return MethodCallUtils.isNecessaryForSurroundingMethodCall(boxingExpression, boxedExpression) || diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java index 9d1467b5ffdb..5e3be3e32974 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java @@ -93,10 +93,9 @@ public class UnnecessaryUnboxingInspection extends BaseInspection { public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement grandParent = element.getParent().getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCall)) { return; } - final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)grandParent; final PsiReferenceExpression methodExpression = methodCall.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); final PsiExpression strippedQualifier = PsiUtil.skipParenthesizedExprDown(qualifier); @@ -104,11 +103,9 @@ public class UnnecessaryUnboxingInspection extends BaseInspection { return; } CommentTracker commentTracker = new CommentTracker(); - if (strippedQualifier instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)strippedQualifier; + if (strippedQualifier instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); - if (target instanceof PsiField) { - final PsiField field = (PsiField)target; + if (target instanceof PsiField field) { final PsiClass containingClass = field.getContainingClass(); if (containingClass == null) { return; @@ -164,14 +161,12 @@ public class UnnecessaryUnboxingInspection extends BaseInspection { expression = (PsiExpression)parent; parent = parent.getParent(); } - if (parent instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; + if (parent instanceof PsiPolyadicExpression polyadicExpression) { if (isPossibleObjectComparison(expression, polyadicExpression)) { return true; } } - if (parent instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)parent; + if (parent instanceof PsiTypeCastExpression typeCastExpression) { final PsiTypeElement typeElement = typeCastExpression.getCastType(); if (typeElement == null) { return true; @@ -182,8 +177,7 @@ public class UnnecessaryUnboxingInspection extends BaseInspection { return true; } } - else if (parent instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)parent; + else if (parent instanceof PsiConditionalExpression conditionalExpression) { final PsiExpression thenExpression = conditionalExpression.getThenExpression(); if (thenExpression == null) { return true; @@ -236,10 +230,9 @@ public class UnnecessaryUnboxingInspection extends BaseInspection { } private boolean isUnboxingExpression(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); if (qualifier == null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ClassIndependentOfModuleInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ClassIndependentOfModuleInspection.java index 2f72246a99fe..19dc9c0a38d2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ClassIndependentOfModuleInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ClassIndependentOfModuleInspection.java @@ -39,10 +39,9 @@ public class ClassIndependentOfModuleInspection extends BaseGlobalInspection { @NotNull AnalysisScope scope, @NotNull InspectionManager manager, @NotNull GlobalInspectionContext globalContext) { - if (!(refEntity instanceof RefClass)) { + if (!(refEntity instanceof RefClass refClass)) { return null; } - final RefClass refClass = (RefClass)refEntity; final RefEntity owner = refClass.getOwner(); if (!(owner instanceof RefPackage)) { return null; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ClassOnlyUsedInOneModuleInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ClassOnlyUsedInOneModuleInspection.java index 8b6d30060c27..ca58c229d6b5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ClassOnlyUsedInOneModuleInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ClassOnlyUsedInOneModuleInspection.java @@ -42,10 +42,9 @@ public class ClassOnlyUsedInOneModuleInspection extends BaseGlobalInspection { @NotNull AnalysisScope scope, @NotNull InspectionManager manager, @NotNull GlobalInspectionContext globalContext) { - if (!(refEntity instanceof RefClass)) { + if (!(refEntity instanceof RefClass refClass)) { return null; } - final RefClass refClass = (RefClass)refEntity; final RefEntity owner = refClass.getOwner(); if (!(owner instanceof RefPackage)) { return null; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ModuleWithTooFewClassesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ModuleWithTooFewClassesInspection.java index 13f12780be37..60f4563a197a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ModuleWithTooFewClassesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ModuleWithTooFewClassesInspection.java @@ -52,14 +52,13 @@ public class ModuleWithTooFewClassesInspection extends BaseGlobalInspection { @NotNull AnalysisScope analysisScope, @NotNull InspectionManager inspectionManager, @NotNull GlobalInspectionContext globalInspectionContext) { - if (!(refEntity instanceof RefModule)) { + if (!(refEntity instanceof RefModule refModule)) { return null; } final Project project = inspectionManager.getProject(); if (ModuleManager.getInstance(project).getModules().length == 1) { return null; } - final RefModule refModule = (RefModule)refEntity; final ModuleFileIndex index = ModuleRootManager.getInstance(refModule.getModule()).getFileIndex(); final PsiManager psiManager = PsiManager.getInstance(project); final int[] count = {0}; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ModuleWithTooManyClassesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ModuleWithTooManyClassesInspection.java index 699de9d76a72..7af2d9dd9592 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ModuleWithTooManyClassesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/modularization/ModuleWithTooManyClassesInspection.java @@ -51,10 +51,9 @@ public class ModuleWithTooManyClassesInspection extends BaseGlobalInspection { @NotNull AnalysisScope analysisScope, @NotNull InspectionManager inspectionManager, @NotNull GlobalInspectionContext globalInspectionContext) { - if (!(refEntity instanceof RefModule)) { + if (!(refEntity instanceof RefModule refModule)) { return null; } - final RefModule refModule = (RefModule)refEntity; final ModuleFileIndex index = ModuleRootManager.getInstance(refModule.getModule()).getFileIndex(); final Project project = inspectionManager.getProject(); final PsiManager psiManager = PsiManager.getInstance(project); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/BadOddnessInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/BadOddnessInspection.java index 8bf10dc31b48..4e4b3711d37a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/BadOddnessInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/BadOddnessInspection.java @@ -67,10 +67,9 @@ public class BadOddnessInspection extends BaseInspection { } private static boolean isModTwo(PsiExpression exp) { - if (!(exp instanceof PsiBinaryExpression)) { + if (!(exp instanceof PsiBinaryExpression binary)) { return false; } - final PsiBinaryExpression binary = (PsiBinaryExpression)exp; final IElementType tokenType = binary.getOperationTokenType(); if (!JavaTokenType.PERC.equals(tokenType)) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastThatLosesPrecisionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastThatLosesPrecisionInspection.java index f76d98cd63a6..395354d3669e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastThatLosesPrecisionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastThatLosesPrecisionInspection.java @@ -102,8 +102,7 @@ public class CastThatLosesPrecisionInspection extends BaseInspection { if (result instanceof Character) { result = Integer.valueOf(((Character)result).charValue()); } - if (result instanceof Number) { - final Number number = (Number)result; + if (result instanceof Number number) { if (ignoreOverflowingByteCasts && PsiTypes.intType().equals(operandType) && PsiTypes.byteType().equals(castType)) { final int i = number.intValue(); if (i > Byte.MIN_VALUE && i <= 255) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastedLiteralMaybeJustLiteralInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastedLiteralMaybeJustLiteralInspection.java index 8efcd54c34d4..e537199f924f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastedLiteralMaybeJustLiteralInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastedLiteralMaybeJustLiteralInspection.java @@ -39,19 +39,16 @@ abstract class CastedLiteralMaybeJustLiteralInspection extends BaseInspection { if (expression instanceof PsiLiteralExpression) { out.append(expression.getText()).append(getSuffix()); } - else if (expression instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression; + else if (expression instanceof PsiPrefixExpression prefixExpression) { out.append(prefixExpression.getOperationSign().getText()); return buildReplacementText(prefixExpression.getOperand(), out); } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { out.append('('); buildReplacementText(parenthesizedExpression.getExpression(), out); out.append(')'); } - else if (expression instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)expression; + else if (expression instanceof PsiTypeCastExpression typeCastExpression) { buildReplacementText(typeCastExpression.getOperand(), out); } else { @@ -91,10 +88,9 @@ abstract class CastedLiteralMaybeJustLiteralInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiTypeCastExpression)) { + if (!(element instanceof PsiTypeCastExpression typeCastExpression)) { return; } - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)element; PsiReplacementUtil.replaceExpression(typeCastExpression, replacementString); } } @@ -117,10 +113,9 @@ abstract class CastedLiteralMaybeJustLiteralInspection extends BaseInspection { while (parent instanceof PsiPrefixExpression || parent instanceof PsiParenthesizedExpression) { parent = parent.getParent(); } - if (!(parent instanceof PsiTypeCastExpression)) { + if (!(parent instanceof PsiTypeCastExpression typeCastExpression)) { return; } - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)parent; final PsiType castType = typeCastExpression.getType(); if (!getCastType().equals(castType)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java index 284521e8043a..082a1c6cda06 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java @@ -50,8 +50,7 @@ public class CharUsedInArithmeticContextInspection extends BaseInspection { final List result = new ArrayList<>(); final PsiElement expression = (PsiElement)infos[0]; PsiElement parent = PsiUtil.skipParenthesizedExprUp(expression.getParent()); - if (parent instanceof PsiExpression) { - final PsiExpression binaryExpression = (PsiExpression)parent; + if (parent instanceof PsiExpression binaryExpression) { final PsiType type = binaryExpression.getType(); if (type instanceof PsiPrimitiveType && !type.equals(PsiTypes.charType())) { final String typeText = type.getCanonicalText(); @@ -85,10 +84,9 @@ public class CharUsedInArithmeticContextInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiLiteralExpression)) { + if (!(element instanceof PsiLiteralExpression literalExpression)) { return; } - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)element; final Object literal = literalExpression.getValue(); if (!(literal instanceof Character)) { return; @@ -121,10 +119,9 @@ public class CharUsedInArithmeticContextInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiExpression)) { + if (!(element instanceof PsiExpression expression)) { return; } - final PsiExpression expression = (PsiExpression)element; CommentTracker commentTracker = new CommentTracker(); final String expressionText = commentTracker.text(expression); PsiReplacementUtil.replaceExpression(expression, '(' + typeText + ')' + expressionText, commentTracker); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java index ec1b1d390c7b..2accb6e44b19 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java @@ -69,10 +69,9 @@ public class ComparisonToNaNInspection extends BaseInspection { public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiReferenceExpression nanExpression = (PsiReferenceExpression)descriptor.getPsiElement(); final PsiElement target = nanExpression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return; } - final PsiField field = (PsiField)target; final PsiClass containingClass = field.getContainingClass(); if (containingClass == null) { return; @@ -136,19 +135,17 @@ public class ComparisonToNaNInspection extends BaseInspection { } private static boolean isNaN(PsiExpression expression) { - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; @NonNls final String referenceName = referenceExpression.getReferenceName(); if (!"NaN".equals(referenceName)) { return false; } final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return false; } - final PsiField field = (PsiField)target; final PsiClass containingClass = field.getContainingClass(); if (containingClass == null) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java index c9021e521035..221066016ac2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java @@ -36,10 +36,9 @@ class ConvertOctalLiteralToDecimalFix extends InspectionGadgetsFix { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiLiteralExpression)) { + if (!(element instanceof PsiLiteralExpression literalExpression)) { return; } - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)element; replaceWithDecimalLiteral(literalExpression); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralsToDecimalsFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralsToDecimalsFix.java index 044191a8f102..a2bce5058658 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralsToDecimalsFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralsToDecimalsFix.java @@ -43,16 +43,14 @@ class ConvertOctalLiteralsToDecimalsFix extends InspectionGadgetsFix { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiArrayInitializerExpression)) { + if (!(element instanceof PsiArrayInitializerExpression arrayInitializerExpression)) { return; } - final PsiArrayInitializerExpression arrayInitializerExpression = (PsiArrayInitializerExpression)element; for (PsiExpression initializer : arrayInitializerExpression.getInitializers()) { initializer = PsiUtil.skipParenthesizedExprDown(initializer); - if (!(initializer instanceof PsiLiteralExpression)) { + if (!(initializer instanceof PsiLiteralExpression literal)) { continue; } - final PsiLiteralExpression literal = (PsiLiteralExpression)initializer; if (!ExpressionUtils.isOctalLiteral(literal)) { continue; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/DivideByZeroInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/DivideByZeroInspection.java index 4fa260078818..e2bb3026c01b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/DivideByZeroInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/DivideByZeroInspection.java @@ -52,8 +52,7 @@ public class DivideByZeroInspection extends BaseInspection { @Nullable @Override protected InspectionGadgetsFix buildFix(Object... infos) { - if (infos.length > 0 && infos[0] instanceof PsiBinaryExpression) { - PsiBinaryExpression binOp = (PsiBinaryExpression)infos[0]; + if (infos.length > 0 && infos[0] instanceof PsiBinaryExpression binOp) { if (binOp.getOperationTokenType().equals(JavaTokenType.DIV) && isZero(binOp.getLOperand())) { PsiType type = binOp.getType(); if (PsiTypes.doubleType().equals(type) || PsiTypes.floatType().equals(type)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java index 6c9e99325019..979356308298 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java @@ -62,22 +62,18 @@ public class FloatingPointEqualityInspection extends BaseInspection { private static boolean isInfinityOrZero(PsiExpression expression) { final Object value = ExpressionUtils.computeConstantExpression(expression); - if (value instanceof Double) { - final Double aDouble = (Double)value; + if (value instanceof Double aDouble) { final double v = aDouble.doubleValue(); return Double.isInfinite(v) || v == 0.0; } - else if (value instanceof Float) { - final Float aFloat = (Float)value; + else if (value instanceof Float aFloat) { final float v = aFloat.floatValue(); return Float.isInfinite(v) || v == 0.0f; } - else if (value instanceof Integer) { - final Integer integer = (Integer)value; + else if (value instanceof Integer integer) { return integer.intValue() == 0; } - else if (value instanceof Long) { - final Long aLong = (Long)value; + else if (value instanceof Long aLong) { return aLong.longValue() == 0; } return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java index 154861ad8eba..68cb486f2274 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java @@ -122,8 +122,7 @@ public class ImplicitNumericConversionInspection extends BaseInspection { } else { final PsiElement parent = expression.getParent(); - if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + if (parent instanceof PsiAssignmentExpression assignmentExpression) { final PsiJavaToken sign = assignmentExpression.getOperationSign(); if (!JavaTokenType.EQ.equals(sign.getTokenType())) { replaceCompoundAssignment(assignmentExpression); @@ -233,10 +232,9 @@ public class ImplicitNumericConversionInspection extends BaseInspection { } private static boolean isNegatedLiteral(PsiExpression expression) { - if (!(expression instanceof PsiPrefixExpression)) { + if (!(expression instanceof PsiPrefixExpression prefixExpression)) { return false; } - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression; final IElementType tokenType = prefixExpression.getOperationTokenType(); if (!JavaTokenType.MINUS.equals(tokenType)) { return false; @@ -320,8 +318,7 @@ public class ImplicitNumericConversionInspection extends BaseInspection { if (parent instanceof PsiParenthesizedExpression) { return; } - if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + if (parent instanceof PsiAssignmentExpression assignmentExpression) { if (assignmentExpression.getOperationTokenType() != JavaTokenType.EQ) { if (assignmentExpression.getLExpression() == expression) { final PsiExpression rhs = assignmentExpression.getRExpression(); @@ -359,8 +356,7 @@ public class ImplicitNumericConversionInspection extends BaseInspection { if (expressionType.equals(convertedType)) return false; if (ignoreConstantConversions) { PsiExpression rootExpression = expression; - while (rootExpression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)rootExpression; + while (rootExpression instanceof PsiParenthesizedExpression parenthesizedExpression) { rootExpression = parenthesizedExpression.getExpression(); } if (rootExpression instanceof PsiLiteralExpression || PsiUtil.isConstantExpression(rootExpression)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java index cfbf12ea0ed6..5c7831a9601e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java @@ -138,8 +138,7 @@ public class IntegerDivisionInFloatingPointContextInspection extends BaseInspect private static @NotNull PsiExpression getContainingExpression(@NotNull PsiExpression expression) { final PsiElement parent = expression.getParent(); - if (parent instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)parent; + if (parent instanceof PsiBinaryExpression binaryExpression) { return !ComparisonUtils.isComparisonOperation(binaryExpression.getOperationTokenType()) ? getContainingExpression(binaryExpression) : expression; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerMultiplicationImplicitCastToLongInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerMultiplicationImplicitCastToLongInspection.java index 96de033e00f2..b9d37d47e0cf 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerMultiplicationImplicitCastToLongInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerMultiplicationImplicitCastToLongInspection.java @@ -132,8 +132,7 @@ public class IntegerMultiplicationImplicitCastToLongInspection extends BaseInspe return hasMultiplication(((PsiPrefixExpression)expression).getOperand()); } - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyExpr = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression polyExpr) { final IElementType tokenType = polyExpr.getOperationTokenType(); if (tokenType == JavaTokenType.ASTERISK) { @@ -143,8 +142,7 @@ public class IntegerMultiplicationImplicitCastToLongInspection extends BaseInspe return hasInnerMultiplication(polyExpr); } - if (expression instanceof PsiConditionalExpression) { - final PsiConditionalExpression ternary = (PsiConditionalExpression)expression; + if (expression instanceof PsiConditionalExpression ternary) { return hasMultiplication(ternary.getThenExpression()) || hasMultiplication(ternary.getElseExpression()); } @@ -314,8 +312,7 @@ public class IntegerMultiplicationImplicitCastToLongInspection extends BaseInspe private PsiExpression getContainingExpression( PsiExpression expression) { final PsiElement parent = expression.getParent(); - if (parent instanceof PsiPolyadicExpression && TypeConversionUtil.isNumericType(((PsiPolyadicExpression)parent).getType())) { - final PsiPolyadicExpression polyParent = (PsiPolyadicExpression)parent; + if (parent instanceof PsiPolyadicExpression polyParent && TypeConversionUtil.isNumericType(((PsiPolyadicExpression)parent).getType())) { final IElementType tokenType = polyParent.getOperationTokenType(); if (!isShiftToken(tokenType) || expression == polyParent.getOperands()[0]) { return getContainingExpression((PsiExpression)parent); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/OctalAndDecimalIntegersMixedInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/OctalAndDecimalIntegersMixedInspection.java index 7c3179ea38b0..66939b7dda64 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/OctalAndDecimalIntegersMixedInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/OctalAndDecimalIntegersMixedInspection.java @@ -61,8 +61,7 @@ public class OctalAndDecimalIntegersMixedInspection extends BaseInspection { boolean hasOctalLiteral = false; for (PsiExpression initializer : initializers) { initializer = PsiUtil.skipParenthesizedExprDown(initializer); - if (initializer instanceof PsiLiteralExpression) { - final PsiLiteralExpression literal = (PsiLiteralExpression)initializer; + if (initializer instanceof PsiLiteralExpression literal) { if (isDecimalLiteral(literal)) { hasDecimalLiteral = true; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java index d7076ad599ca..147f706b048e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java @@ -157,10 +157,9 @@ public final class PointlessArithmeticExpressionInspection extends BaseInspectio @Override public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiPolyadicExpression)) { + if (!(element instanceof PsiPolyadicExpression expression)) { return; } - final PsiPolyadicExpression expression = (PsiPolyadicExpression)element; final CommentTracker tracker = new CommentTracker(); tracker.replaceExpressionAndRestoreComments(expression, calculateReplacementExpression(expression, tracker)); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java index c39dc0a478f9..dfe96d3cf3be 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java @@ -36,10 +36,9 @@ class RemoveLeadingZeroFix extends InspectionGadgetsFix { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiLiteralExpression)) { + if (!(element instanceof PsiLiteralExpression literal)) { return; } - final PsiLiteralExpression literal = (PsiLiteralExpression)element; removeLeadingZeroes(literal); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroesFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroesFix.java index 8cca9134f5a0..b927c55dd256 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroesFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroesFix.java @@ -43,16 +43,14 @@ class RemoveLeadingZeroesFix extends InspectionGadgetsFix { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiArrayInitializerExpression)) { + if (!(element instanceof PsiArrayInitializerExpression arrayInitializerExpression)) { return; } - final PsiArrayInitializerExpression arrayInitializerExpression = (PsiArrayInitializerExpression)element; for (PsiExpression initializer : arrayInitializerExpression.getInitializers()) { initializer = PsiUtil.skipParenthesizedExprDown(initializer); - if (!(initializer instanceof PsiLiteralExpression)) { + if (!(initializer instanceof PsiLiteralExpression literal)) { continue; } - final PsiLiteralExpression literal = (PsiLiteralExpression)initializer; if (!ExpressionUtils.isOctalLiteral(literal)) { continue; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java index 2b36305fbb99..970bf54d588b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java @@ -84,10 +84,9 @@ public final class UnaryPlusInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiPrefixExpression)) { + if (!(parent instanceof PsiPrefixExpression prefixExpression)) { return; } - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)parent; final PsiExpression operand = prefixExpression.getOperand(); if (operand == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java index 141a3673cdd0..d51ed0675f80 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java @@ -61,10 +61,9 @@ public final class UnnecessaryExplicitNumericCastInspection extends BaseInspecti protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); PsiElement parent = element.getParent(); - if (!(parent instanceof PsiTypeCastExpression)) { + if (!(parent instanceof PsiTypeCastExpression typeCastExpression)) { return; } - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)parent; if (!isUnnecessaryPrimitiveNumericCast(typeCastExpression)) { return; } @@ -121,9 +120,8 @@ public final class UnnecessaryExplicitNumericCastInspection extends BaseInspecti while (parent instanceof PsiParenthesizedExpression) { parent = parent.getParent(); } - if (parent instanceof PsiPrefixExpression) { + if (parent instanceof PsiPrefixExpression prefixExpression) { // JLS 5.6 Numeric Contexts - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)parent; final IElementType tokenType = prefixExpression.getOperationTokenType(); if (JavaTokenType.MINUS == tokenType || JavaTokenType.PLUS == tokenType || JavaTokenType.TILDE == tokenType) { if (TypeUtils.isNarrowingConversion(operandType, castType)) { @@ -139,8 +137,7 @@ public final class UnnecessaryExplicitNumericCastInspection extends BaseInspecti // cast to the same type is caught by "Redundant type cast" inspection return false; } - if (parent instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; + if (parent instanceof PsiPolyadicExpression polyadicExpression) { final IElementType tokenType = polyadicExpression.getOperationTokenType(); if (binaryPromotionOperators.contains(tokenType)) { if (TypeUtils.isNarrowingConversion(operandType, castType)) { @@ -185,13 +182,11 @@ public final class UnnecessaryExplicitNumericCastInspection extends BaseInspecti } return false; } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression assignmentExpression) { final PsiType lhsType = assignmentExpression.getType(); if (castType.equals(lhsType) && (isLegalAssignmentConversion(operand, lhsType) || isLegalWideningConversion(operand, lhsType))) return true; } - else if (parent instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)parent; + else if (parent instanceof PsiVariable variable) { final PsiTypeElement typeElement = variable.getTypeElement(); if (typeElement == null || typeElement.isInferredType()) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java index 182939cb9998..7924888f60fd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java @@ -65,8 +65,7 @@ public final class UnnecessaryUnaryMinusInspection extends BaseInspection { final PsiExpression parentExpression = (PsiExpression)prefixExpression.getParent(); final CommentTracker commentTracker = new CommentTracker(); @NonNls final StringBuilder newExpression = new StringBuilder(); - if (parentExpression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parentExpression; + if (parentExpression instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression lhs = assignmentExpression.getLExpression(); newExpression.append(commentTracker.text(lhs)); final IElementType tokenType = assignmentExpression.getOperationTokenType(); @@ -78,8 +77,7 @@ public final class UnnecessaryUnaryMinusInspection extends BaseInspection { } newExpression.append(commentTracker.text(operand)); } - else if (parentExpression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parentExpression; + else if (parentExpression instanceof PsiPolyadicExpression polyadicExpression) { int lastOperatorIndex = -1; IElementType lastOperator = null; for (PsiElement child = polyadicExpression.getFirstChild(); child != null; child = child.getNextSibling()) { @@ -179,8 +177,7 @@ public final class UnnecessaryUnaryMinusInspection extends BaseInspection { private static InspectionGadgetsFix createReplaceParentOperatorFix(@NotNull PsiPrefixExpression prefixExpr) { final PsiElement parent = prefixExpr.getParent(); - if (parent instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; + if (parent instanceof PsiPolyadicExpression polyadicExpression) { if (ExpressionUtils.hasType(polyadicExpression, CommonClassNames.JAVA_LANG_STRING)) { return null; } @@ -194,8 +191,7 @@ public final class UnnecessaryUnaryMinusInspection extends BaseInspection { } return new ReplaceParentOperatorFix(); } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression assignmentExpression) { if (ExpressionUtils.hasType(assignmentExpression, CommonClassNames.JAVA_LANG_STRING)) { return null; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java index 94e0d5525173..da2a24ab8d2f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java @@ -176,11 +176,10 @@ public class UnpredictableBigDecimalConstructorCallInspection extends BaseInspec return false; } } - else if (expression instanceof PsiPolyadicExpression) { + else if (expression instanceof PsiPolyadicExpression polyadicExpression) { if (ignoreComplexLiterals) { return false; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; for (PsiExpression operand : polyadicExpression.getOperands()) { if (!checkExpression(operand)) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/ClassOnlyUsedInOnePackageInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/ClassOnlyUsedInOnePackageInspection.java index db4036eff3bd..6d85fae02058 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/ClassOnlyUsedInOnePackageInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/ClassOnlyUsedInOnePackageInspection.java @@ -39,10 +39,9 @@ public class ClassOnlyUsedInOnePackageInspection extends BaseGlobalInspection { @NotNull AnalysisScope scope, @NotNull InspectionManager manager, @NotNull GlobalInspectionContext globalContext) { - if (!(refEntity instanceof RefClass)) { + if (!(refEntity instanceof RefClass refClass)) { return null; } - final RefClass refClass = (RefClass)refEntity; final RefEntity owner = refClass.getOwner(); if (!(owner instanceof RefPackage)) { return null; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/ClassUnconnectedToPackageInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/ClassUnconnectedToPackageInspection.java index 64bb39132f95..679a6022d434 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/ClassUnconnectedToPackageInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/ClassUnconnectedToPackageInspection.java @@ -32,10 +32,9 @@ public class ClassUnconnectedToPackageInspection extends BaseGlobalInspection { @NotNull AnalysisScope analysisScope, @NotNull InspectionManager manager, @NotNull GlobalInspectionContext globalInspectionContext) { - if (!(refEntity instanceof RefClass)) { + if (!(refEntity instanceof RefClass refClass)) { return null; } - final RefClass refClass = (RefClass)refEntity; final RefEntity owner = refClass.getOwner(); if (!(owner instanceof RefPackage)) { return null; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/DisjointPackageInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/DisjointPackageInspection.java index 9aa59c5ad3c5..1bdc4c5bd539 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/DisjointPackageInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/DisjointPackageInspection.java @@ -42,10 +42,9 @@ public class DisjointPackageInspection extends BaseGlobalInspection { @NotNull RefEntity refEntity, @NotNull AnalysisScope analysisScope, @NotNull InspectionManager inspectionManager, @NotNull GlobalInspectionContext globalInspectionContext) { - if (!(refEntity instanceof RefPackage)) { + if (!(refEntity instanceof RefPackage refPackage)) { return null; } - final RefPackage refPackage = (RefPackage)refEntity; final Set childClasses = StreamEx.of(refPackage.getChildren()).select(RefClass.class).toSet(); if (childClasses.isEmpty()) { return null; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java index d750f251d9c2..923951e7a48e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java @@ -78,10 +78,9 @@ public class ArraysAsListWithZeroOrOneArgumentInspection extends BaseInspection @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent().getParent(); - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiReferenceParameterList parameterList = methodExpression.getParameterList(); final CommentTracker commentTracker = new CommentTracker(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BooleanConstructorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BooleanConstructorInspection.java index 9ff604d8cb79..eceaacf7f7d1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BooleanConstructorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BooleanConstructorInspection.java @@ -75,10 +75,9 @@ public class BooleanConstructorInspection extends BaseInspection implements Clea @Override public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent(); - if (!(element instanceof PsiNewExpression)) { + if (!(element instanceof PsiNewExpression expression)) { return; } - final PsiNewExpression expression = (PsiNewExpression)element; final PsiExpressionList argumentList = expression.getArgumentList(); if (argumentList == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/CollectionContainsUrlInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/CollectionContainsUrlInspection.java index be03f019e13a..c8eddc373bb2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/CollectionContainsUrlInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/CollectionContainsUrlInspection.java @@ -54,7 +54,7 @@ public class CollectionContainsUrlInspection extends BaseInspection { return; } final PsiType type = typeElement.getType(); - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType classType)) { return; } final PsiJavaCodeReferenceElement referenceElement = @@ -62,7 +62,6 @@ public class CollectionContainsUrlInspection extends BaseInspection { if (referenceElement == null) { return; } - final PsiClassType classType = (PsiClassType)type; final PsiClass aClass = classType.resolve(); final ClassType collectionType = getClassType(aClass); @@ -155,11 +154,9 @@ public class CollectionContainsUrlInspection extends BaseInspection { expression.getMethodExpression(); final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); - if (!(qualifierExpression instanceof PsiReferenceExpression)) { + if (!(qualifierExpression instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)qualifierExpression; @NonNls final String methodName = methodExpression.getReferenceName(); if (collectionType == ClassType.SET && diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/CollectionReplaceableByEnumCollectionVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/CollectionReplaceableByEnumCollectionVisitor.java index f3370a81e716..2152dcede6d9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/CollectionReplaceableByEnumCollectionVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/CollectionReplaceableByEnumCollectionVisitor.java @@ -37,10 +37,9 @@ abstract class CollectionReplaceableByEnumCollectionVisitor extends BaseInspecti public final void visitNewExpression(@NotNull PsiNewExpression expression) { super.visitNewExpression(expression); final PsiType type = expression.getType(); - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType classType)) { return; } - PsiClassType classType = (PsiClassType)type; final PsiType expectedType = ExpectedTypeUtils.findExpectedType(expression, false); if (!(expectedType instanceof PsiClassType)) { return; @@ -53,7 +52,7 @@ abstract class CollectionReplaceableByEnumCollectionVisitor extends BaseInspecti return; } final PsiType argumentType = typeArguments[0]; - if (!(argumentType instanceof PsiClassType)) { + if (!(argumentType instanceof PsiClassType argumentClassType)) { return; } if (!TypeUtils.expressionHasTypeOrSubtype(expression, getBaseCollectionName())) { @@ -63,7 +62,6 @@ abstract class CollectionReplaceableByEnumCollectionVisitor extends BaseInspecti TypeUtils.expressionHasTypeOrSubtype(expression, getUnreplaceableCollectionNames())) { return; } - final PsiClassType argumentClassType = (PsiClassType)argumentType; final PsiClass argumentClass = argumentClassType.resolve(); if (argumentClass == null || !argumentClass.isEnum()) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java index 4fbb0e351d8e..1b8ff3129599 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java @@ -110,8 +110,7 @@ public class IfStatementMissingBreakInLoopInspection extends BaseInspection impl if (statement instanceof PsiDeclarationStatement) { collectVariables((PsiDeclarationStatement)statement, loopBody, nonFinalVariables, declaredVariables); } - else if (statement instanceof PsiIfStatement) { - PsiIfStatement ifStatement = (PsiIfStatement)statement; + else if (statement instanceof PsiIfStatement ifStatement) { PsiExpression condition = ifStatement.getCondition(); if (condition == null || mayHaveOutsideOfLoopSideEffects(condition, declaredVariables)) { return; @@ -147,8 +146,7 @@ public class IfStatementMissingBreakInLoopInspection extends BaseInspection impl private static PsiAssignmentExpression getAssignment(@NotNull PsiStatement statement) { if (!(statement instanceof PsiExpressionStatement)) return null; PsiExpression expression = ((PsiExpressionStatement)statement).getExpression(); - if (!(expression instanceof PsiAssignmentExpression)) return null; - PsiAssignmentExpression assignment = (PsiAssignmentExpression)expression; + if (!(expression instanceof PsiAssignmentExpression assignment)) return null; if (!JavaTokenType.EQ.equals(assignment.getOperationTokenType())) return null; return assignment; } @@ -186,8 +184,7 @@ public class IfStatementMissingBreakInLoopInspection extends BaseInspection impl Set usedVariables = VariableAccessUtils.collectUsedVariables(declaration); boolean hasNonFinalVariables = haveCommonElements(usedVariables, nonFinalVariables); for (PsiElement element : declaration.getDeclaredElements()) { - if (!(element instanceof PsiVariable)) continue; - PsiVariable variable = (PsiVariable)element; + if (!(element instanceof PsiVariable variable)) continue; declaredVariables.add(variable); if (hasNonFinalVariables || !HighlightControlFlowUtil.isEffectivelyFinal(variable, scope, null)) { nonFinalVariables.add(variable); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java index 717e44420756..9970550aa4bc 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java @@ -79,9 +79,8 @@ public class InstantiatingObjectToGetClassObjectInspection } private static StringBuilder getTypeText(PsiType type, StringBuilder text) { - if (type instanceof PsiArrayType) { + if (type instanceof PsiArrayType arrayType) { text.append("[]"); - final PsiArrayType arrayType = (PsiArrayType)type; getTypeText(arrayType.getComponentType(), text); } else if (type instanceof PsiClassType) { @@ -124,10 +123,9 @@ public class InstantiatingObjectToGetClassObjectInspection return; } final PsiExpression qualifier = PsiUtil.skipParenthesizedExprDown(methodExpression.getQualifierExpression()); - if (!(qualifier instanceof PsiNewExpression)) { + if (!(qualifier instanceof PsiNewExpression newExpression)) { return; } - final PsiNewExpression newExpression = (PsiNewExpression)qualifier; if (newExpression.getAnonymousClass() != null) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java index 9efaa5cf28f7..48575a46f880 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java @@ -144,8 +144,7 @@ public class KeySetIterationMayUseEntrySetInspection extends BaseInspection { for (PsiExpression access : accesses) { if (access instanceof PsiMethodCallExpression) { PsiElement parent = ParenthesesUtils.getParentSkipParentheses(access); - if (parent instanceof PsiLocalVariable) { - PsiLocalVariable var = (PsiLocalVariable)parent; + if (parent instanceof PsiLocalVariable var) { PsiElement varParent = var.getParent(); if (varParent instanceof PsiDeclarationStatement && varParent.getParent() == scope && @@ -276,12 +275,10 @@ public class KeySetIterationMayUseEntrySetInspection extends BaseInspection { final PsiElement parent = ParenthesesUtils.getParentSkipParentheses(expression); if (!(parent instanceof PsiExpressionList)) return false; final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) return false; - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) return false; if (!MAP_GET.test(methodCallExpression)) return false; PsiExpression qualifier = PsiUtil.skipParenthesizedExprDown(methodCallExpression.getMethodExpression().getQualifierExpression()); - if (!(qualifier instanceof PsiReferenceExpression)) return false; - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifier; + if (!(qualifier instanceof PsiReferenceExpression referenceExpression)) return false; if (!EquivalenceChecker.getCanonicalPsiEquivalence().expressionsAreEquivalent(myMapReference, referenceExpression)) return false; myParameterAccesses.add(methodCallExpression); return true; @@ -365,8 +362,7 @@ public class KeySetIterationMayUseEntrySetInspection extends BaseInspection { @Contract("null -> null") private static PsiReferenceExpression getMapReferenceFromKeySetCall(PsiExpression keySetCandidate) { - if (!(keySetCandidate instanceof PsiMethodCallExpression)) return null; - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)keySetCandidate; + if (!(keySetCandidate instanceof PsiMethodCallExpression methodCallExpression)) return null; if (!MAP_KEY_SET.test(methodCallExpression)) return null; PsiExpression qualifier = methodCallExpression.getMethodExpression().getQualifierExpression(); return tryCast(PsiUtil.skipParenthesizedExprDown(qualifier), PsiReferenceExpression.class); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java index 7ece42f32f6f..68a797e3bf13 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java @@ -104,10 +104,9 @@ public class LengthOneStringInIndexOfInspection extends BaseInspection implement return false; } final PsiElement grandparent = parent.getParent(); - if (!(grandparent instanceof PsiMethodCallExpression)) { + if (!(grandparent instanceof PsiMethodCallExpression call)) { return false; } - final PsiMethodCallExpression call = (PsiMethodCallExpression)grandparent; final PsiReferenceExpression methodExpression = call.getMethodExpression(); @NonNls final String name = methodExpression.getReferenceName(); if (!HardcodedMethodConstants.INDEX_OF.equals(name) && diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayCopyInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayCopyInspection.java index 2bec2d2799ed..bd8da5fa6ff2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayCopyInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayCopyInspection.java @@ -120,8 +120,7 @@ public class ManualArrayCopyInspection extends BaseInspection implements Cleanup @Nullable private static PsiArrayAccessExpression getLhsArrayAccessExpression(PsiForStatement forStatement) { PsiStatement body = forStatement.getBody(); - while (body instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)body; + while (body instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiStatement[] statements = codeBlock.getStatements(); if (statements.length == 2) { @@ -134,15 +133,13 @@ public class ManualArrayCopyInspection extends BaseInspection implements Cleanup return null; } } - if (!(body instanceof PsiExpressionStatement)) { + if (!(body instanceof PsiExpressionStatement expressionStatement)) { return null; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)body; final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiAssignmentExpression)) { + if (!(expression instanceof PsiAssignmentExpression assignmentExpression)) { return null; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; final PsiExpression lhs = assignmentExpression.getLExpression(); final PsiExpression deparenthesizedExpression = PsiUtil.skipParenthesizedExprDown(lhs); if (!(deparenthesizedExpression instanceof PsiArrayAccessExpression)) { @@ -154,8 +151,7 @@ public class ManualArrayCopyInspection extends BaseInspection implements Cleanup @Nullable private static PsiArrayAccessExpression getRhsArrayAccessExpression(PsiForStatement forStatement) { PsiStatement body = forStatement.getBody(); - while (body instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)body; + while (body instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiStatement[] statements = codeBlock.getStatements(); if (statements.length == 1 || statements.length == 2) { @@ -166,26 +162,22 @@ public class ManualArrayCopyInspection extends BaseInspection implements Cleanup } } final PsiExpression arrayAccessExpression; - if (body instanceof PsiDeclarationStatement) { - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)body; + if (body instanceof PsiDeclarationStatement declarationStatement) { final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); if (declaredElements.length != 1) { return null; } final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable variable)) { return null; } - final PsiVariable variable = (PsiVariable)declaredElement; arrayAccessExpression = variable.getInitializer(); } - else if (body instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)body; + else if (body instanceof PsiExpressionStatement expressionStatement) { final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiAssignmentExpression)) { + if (!(expression instanceof PsiAssignmentExpression assignmentExpression)) { return null; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; arrayAccessExpression = assignmentExpression.getRExpression(); } else { @@ -210,16 +202,14 @@ public class ManualArrayCopyInspection extends BaseInspection implements Cleanup return buildExpressionText(max, plusOne, commentTracker); } final Object minConstant = ExpressionUtils.computeConstantExpression(min); - if (minConstant instanceof Number) { - final Number minNumber = (Number)minConstant; + if (minConstant instanceof Number minNumber) { final int minValue = plusOne ? minNumber.intValue() - 1 : minNumber.intValue(); if (minValue == 0) { return buildExpressionText(max, false, commentTracker); } if (max instanceof PsiLiteralExpression) { final Object maxConstant = ExpressionUtils.computeConstantExpression(max); - if (maxConstant instanceof Number) { - final Number number = (Number)maxConstant; + if (maxConstant instanceof Number number) { return String.valueOf(number.intValue() - minValue); } } @@ -259,8 +249,7 @@ public class ManualArrayCopyInspection extends BaseInspection implements Cleanup } return buildExpressionText(initialValue, plusOne, commentTracker); } - else if (expression instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; + else if (expression instanceof PsiBinaryExpression binaryExpression) { final PsiExpression lhs = binaryExpression.getLOperand(); final PsiExpression rhs = binaryExpression.getROperand(); final String rhsText = buildOffsetText(rhs, variable, limitExpression, plusOne, commentTracker); @@ -313,13 +302,11 @@ public class ManualArrayCopyInspection extends BaseInspection implements Cleanup } private static boolean bodyIsArrayCopy(PsiStatement body, PsiVariable variable) { - if (body instanceof PsiExpressionStatement) { - final PsiExpressionStatement exp = (PsiExpressionStatement)body; + if (body instanceof PsiExpressionStatement exp) { final PsiExpression expression = exp.getExpression(); return expressionIsArrayCopy(expression, variable); } - else if (body instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)body; + else if (body instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiStatement[] statements = codeBlock.getStatements(); if (statements.length == 1) { @@ -327,19 +314,17 @@ public class ManualArrayCopyInspection extends BaseInspection implements Cleanup } else if (statements.length == 2) { final PsiStatement statement = statements[0]; - if (!(statement instanceof PsiDeclarationStatement)) { + if (!(statement instanceof PsiDeclarationStatement declarationStatement)) { return false; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)statement; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); if (declaredElements.length != 1) { return false; } final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable localVariable)) { return false; } - final PsiVariable localVariable = (PsiVariable)declaredElement; final PsiExpression initializer = localVariable.getInitializer(); if (!ExpressionUtils.isOffsetArrayAccess(initializer, variable)) { return false; @@ -355,10 +340,9 @@ public class ManualArrayCopyInspection extends BaseInspection implements Cleanup if (strippedExpression == null) { return false; } - if (!(strippedExpression instanceof PsiAssignmentExpression)) { + if (!(strippedExpression instanceof PsiAssignmentExpression assignment)) { return false; } - final PsiAssignmentExpression assignment = (PsiAssignmentExpression)strippedExpression; final IElementType tokenType = assignment.getOperationTokenType(); if (!tokenType.equals(JavaTokenType.EQ)) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java index 7ddca5671ecc..82a1fe7ac8d1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java @@ -64,28 +64,24 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem return null; } final PsiExpression arrayAccessExpression; - if (body instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)body; + if (body instanceof PsiExpressionStatement expressionStatement) { final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return null; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); PsiExpression[] expressions = argumentList.getExpressions(); arrayAccessExpression = expressions.length == 0 ? null : expressions[0]; } - else if (body instanceof PsiDeclarationStatement) { - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)body; + else if (body instanceof PsiDeclarationStatement declarationStatement) { final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); if (declaredElements.length != 1) { return null; } final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable variable)) { return null; } - final PsiVariable variable = (PsiVariable)declaredElement; arrayAccessExpression = variable.getInitializer(); } else { @@ -101,8 +97,7 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem @Nullable private static PsiStatement getBody(PsiLoopStatement forStatement) { PsiStatement body = forStatement.getBody(); - while (body instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)body; + while (body instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiStatement[] statements = codeBlock.getStatements(); body = statements.length == 0 ? null : statements[0]; @@ -135,8 +130,7 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem private static @Nullable @NonNls String getCollectionsAddAllText(PsiForeachStatement foreachStatement) { final PsiStatement body = getBody(foreachStatement); - if (!(body instanceof PsiExpressionStatement)) return null; - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)body; + if (!(body instanceof PsiExpressionStatement expressionStatement)) return null; final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expressionStatement.getExpression(); final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression collection = ExpressionUtils.getEffectiveQualifier(methodExpression); @@ -203,9 +197,7 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem public static String buildCollectionText(PsiForStatement forStatement) { PsiStatement body = forStatement.getBody(); - while (body instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = - (PsiBlockStatement)body; + while (body instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiStatement[] statements = codeBlock.getStatements(); if (statements.length == 2) { @@ -220,8 +212,7 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem } if (!(body instanceof PsiExpressionStatement)) return null; final PsiExpression expression = PsiUtil.skipParenthesizedExprDown(((PsiExpressionStatement)body).getExpression()); - if (!(expression instanceof PsiMethodCallExpression)) return null; - final PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (!(expression instanceof PsiMethodCallExpression call)) return null; PsiExpression qualifier = ExpressionUtils.getEffectiveQualifier(call.getMethodExpression()); return qualifier != null ? qualifier.getText() : null; } @@ -240,8 +231,7 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem if (expressionText.equals(variableName)) { return "0"; } - if (expression instanceof PsiBinaryExpression) { - PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; + if (expression instanceof PsiBinaryExpression binaryExpression) { final PsiExpression lhs = binaryExpression.getLOperand(); final PsiExpression rhs = binaryExpression.getROperand(); @@ -275,9 +265,7 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem return expressionText; } - if (expression instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = - (PsiBinaryExpression)expression; + if (expression instanceof PsiBinaryExpression binaryExpression) { final IElementType tokenType = binaryExpression.getOperationTokenType(); final PsiExpression lhs = binaryExpression.getLOperand(); @@ -369,13 +357,11 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem public void visitForStatement(@NotNull PsiForStatement statement) { super.visitForStatement(statement); final PsiStatement initialization = statement.getInitialization(); - if (!(initialization instanceof PsiDeclarationStatement)) return; - final PsiDeclarationStatement declaration = (PsiDeclarationStatement)initialization; + if (!(initialization instanceof PsiDeclarationStatement declaration)) return; final PsiElement[] declaredElements = declaration.getDeclaredElements(); if (declaredElements.length != 1) return; final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiLocalVariable)) return; - final PsiLocalVariable variable = (PsiLocalVariable)declaredElement; + if (!(declaredElement instanceof PsiLocalVariable variable)) return; final PsiExpression initialValue = variable.getInitializer(); if (initialValue == null) return; final PsiExpression condition = statement.getCondition(); @@ -398,8 +384,7 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem final PsiExpression iteratedValue = statement.getIteratedValue(); if (iteratedValue == null) return; final PsiType type = iteratedValue.getType(); - if (!(type instanceof PsiArrayType)) return; - final PsiArrayType arrayType = (PsiArrayType)type; + if (!(type instanceof PsiArrayType arrayType)) return; final PsiType componentType = arrayType.getComponentType(); if (componentType instanceof PsiPrimitiveType) return; final PsiParameter parameter = statement.getIterationParameter(); @@ -409,13 +394,11 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem } private static boolean bodyIsArrayToCollectionCopy(PsiStatement body, PsiVariable variable, boolean shouldBeOffsetArrayAccess) { - if (body instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)body; + if (body instanceof PsiExpressionStatement expressionStatement) { final PsiExpression expression = expressionStatement.getExpression(); return expressionIsArrayToCollectionCopy(expression, variable, shouldBeOffsetArrayAccess); } - else if (body instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)body; + else if (body instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiStatement[] statements = codeBlock.getStatements(); if (statements.length == 1) { @@ -423,13 +406,11 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem } else if (statements.length == 2) { final PsiStatement statement = statements[0]; - if (!(statement instanceof PsiDeclarationStatement)) return false; - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)statement; + if (!(statement instanceof PsiDeclarationStatement declarationStatement)) return false; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); if (declaredElements.length != 1) return false; final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) return false; - final PsiVariable localVariable = (PsiVariable)declaredElement; + if (!(declaredElement instanceof PsiVariable localVariable)) return false; final PsiExpression initializer = localVariable.getInitializer(); if (!ExpressionUtils.isOffsetArrayAccess(initializer, variable)) return false; return bodyIsArrayToCollectionCopy(statements[1], localVariable, false); @@ -443,8 +424,7 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection implem boolean shouldBeOffsetArrayAccess) { expression = PsiUtil.skipParenthesizedExprDown(expression); if (expression == null) return false; - if (!(expression instanceof PsiMethodCallExpression)) return false; - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) return false; final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); if (arguments.length != 1) return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/MethodReferenceVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/MethodReferenceVisitor.java index 7a3fddeb210a..9f301ab6c7e9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/MethodReferenceVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/MethodReferenceVisitor.java @@ -64,8 +64,7 @@ class MethodReferenceVisitor extends JavaRecursiveElementWalkingVisitor { m_referencesStaticallyAccessible = false; return; } - if (!(element instanceof PsiMember)) return; - PsiMember member = (PsiMember)element; + if (!(element instanceof PsiMember member)) return; if (member == m_method || member.hasModifierProperty(PsiModifier.STATIC) || member instanceof PsiClass && member.getContainingClass() == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java index 2cd6708ed881..be535c7b846c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java @@ -139,11 +139,9 @@ public class RandomDoubleForRandomIntegerInspection extends BaseInspection imple if (expression == null) { return false; } - if (!(expression instanceof PsiBinaryExpression)) { + if (!(expression instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = - (PsiBinaryExpression)expression; final IElementType tokenType = binaryExpression.getOperationTokenType(); return JavaTokenType.ASTERISK.equals(tokenType); } @@ -152,11 +150,9 @@ public class RandomDoubleForRandomIntegerInspection extends BaseInspection imple if (expression == null) { return false; } - if (!(expression instanceof PsiTypeCastExpression)) { + if (!(expression instanceof PsiTypeCastExpression castExpression)) { return false; } - final PsiTypeCastExpression castExpression = - (PsiTypeCastExpression)expression; final PsiType type = castExpression.getType(); return PsiTypes.intType().equals(type); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RedundantStringFormatCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RedundantStringFormatCallInspection.java index 800a8e036c35..edb939ec90bf 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RedundantStringFormatCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RedundantStringFormatCallInspection.java @@ -156,13 +156,11 @@ public final class RedundantStringFormatCallInspection extends LocalInspectionTo return false; } final PsiExpression expression = PsiUtil.skipParenthesizedExprDown(expr); - if (expression instanceof PsiLiteralExpression) { - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)expression; + if (expression instanceof PsiLiteralExpression literalExpression) { final String expressionText = literalExpression.getText(); return expressionText.contains("%n"); } - if (expression instanceof PsiCallExpression) { - final PsiCallExpression callExpression = (PsiCallExpression)expression; + if (expression instanceof PsiCallExpression callExpression) { final PsiMethod method = callExpression.resolveMethod(); if (method != null) { final PsiClass aClass = method.getContainingClass(); @@ -180,8 +178,7 @@ public final class RedundantStringFormatCallInspection extends LocalInspectionTo } } } - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression polyadicExpression) { final IElementType tokenType = polyadicExpression.getOperationTokenType(); if (!tokenType.equals(JavaTokenType.PLUS)) { return false; @@ -425,8 +422,8 @@ public final class RedundantStringFormatCallInspection extends LocalInspectionTo private static void removeRedundantStringFormatCall(@NotNull PsiMethodCallExpression stringFormat) { final PsiElement parent = PsiUtil.skipParenthesizedExprUp(stringFormat.getParent()); - if (parent instanceof PsiExpressionList && ((PsiExpressionList)parent).getExpressionCount() == 1 && parent.getParent() instanceof PsiMethodCallExpression){ - final PsiMethodCallExpression printCall = (PsiMethodCallExpression)parent.getParent(); + if (parent instanceof PsiExpressionList && ((PsiExpressionList)parent).getExpressionCount() == 1 && + parent.getParent() instanceof PsiMethodCallExpression printCall){ final PsiExpression[] args = stringFormat.getArgumentList().getExpressions(); if (args.length > 1) { new CommentTracker().deleteAndRestoreComments(args[0]); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInLoopsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInLoopsInspection.java index 5fb283089a01..6e61760c958c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInLoopsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInLoopsInspection.java @@ -219,18 +219,16 @@ public class StringConcatenationInLoopsInspection extends BaseInspection { while (parent instanceof PsiParenthesizedExpression || parent instanceof PsiPolyadicExpression) { parent = parent.getParent(); } - if (!(parent instanceof PsiAssignmentExpression)) { + if (!(parent instanceof PsiAssignmentExpression assignmentExpression)) { return false; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression()); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return false; } if (assignmentExpression.getOperationTokenType() == JavaTokenType.PLUSEQ) { return true; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; final PsiElement element = referenceExpression.resolve(); if (!(element instanceof PsiVariable)) { return false; @@ -241,8 +239,7 @@ public class StringConcatenationInLoopsInspection extends BaseInspection { private static boolean isAppended(PsiReferenceExpression otherRef, PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if(expression instanceof PsiPolyadicExpression) { - PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + if(expression instanceof PsiPolyadicExpression polyadicExpression) { if (polyadicExpression.getOperationTokenType().equals(JavaTokenType.PLUS)) { for (PsiExpression operand : polyadicExpression.getOperands()) { if (isSameReference(operand, otherRef) || isAppended(otherRef, operand)) return true; @@ -335,8 +332,7 @@ public class StringConcatenationInLoopsInspection extends BaseInspection { return true; } Predicate isPossiblyNullableWrite = ref -> { - if (!(ref instanceof PsiExpression)) return false; - PsiExpression expression = (PsiExpression)ref; + if (!(ref instanceof PsiExpression expression)) return false; if (!PsiUtil.isOnAssignmentLeftHand(expression)) return false; PsiAssignmentExpression assignment = PsiTreeUtil.getParentOfType(expression, PsiAssignmentExpression.class); if (assignment == null || assignment.getOperationTokenType() != JavaTokenType.EQ) return false; @@ -432,8 +428,7 @@ public class StringConcatenationInLoopsInspection extends BaseInspection { PsiReferenceExpression ref, CommentTracker ct) { PsiElement parent = PsiUtil.skipParenthesizedExprUp(ref.getParent()); - if(parent instanceof PsiAssignmentExpression) { - PsiAssignmentExpression assignment = (PsiAssignmentExpression)parent; + if(parent instanceof PsiAssignmentExpression assignment) { if(PsiUtil.skipParenthesizedExprDown(assignment.getLExpression()) == ref) { replaceInAssignment(variable, builderVariable, assignment, ct); return; @@ -459,8 +454,7 @@ public class StringConcatenationInLoopsInspection extends BaseInspection { } } } - if(parent instanceof PsiBinaryExpression) { - PsiBinaryExpression binOp = (PsiBinaryExpression)parent; + if(parent instanceof PsiBinaryExpression binOp) { if(ExpressionUtils.getValueComparedWithNull(binOp) != null) { return; } @@ -555,9 +549,8 @@ public class StringConcatenationInLoopsInspection extends BaseInspection { PsiExpression rValue = PsiUtil.skipParenthesizedExprDown(assignment.getRExpression()); String builderName = Objects.requireNonNull(builderVariable.getName()); if(assignment.getOperationTokenType().equals(JavaTokenType.EQ)) { - if (rValue instanceof PsiPolyadicExpression && + if (rValue instanceof PsiPolyadicExpression concat && ((PsiPolyadicExpression)rValue).getOperationTokenType().equals(JavaTokenType.PLUS)) { - PsiPolyadicExpression concat = (PsiPolyadicExpression)rValue; PsiExpression[] operands = concat.getOperands(); if (operands.length > 1) { // s = s + ...; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java index 34629d5a1468..e6eb7f8f6d91 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java @@ -75,12 +75,11 @@ public class StringEqualsEmptyStringInspection extends BaseInspection { } private static PsiExpression getCheckedExpression(boolean useIsEmpty, PsiExpression expression) { - if (useIsEmpty || !(expression instanceof PsiMethodCallExpression)) { + if (useIsEmpty || !(expression instanceof PsiMethodCallExpression callExpression)) { return expression; } // to replace stringBuffer.toString().equals("") with // stringBuffer.length() == 0 - final PsiMethodCallExpression callExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = callExpression.getMethodExpression(); final String referenceName = methodExpression.getReferenceName(); final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringVariableIsAppendedToVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringVariableIsAppendedToVisitor.java index 91a46dc25f87..49ef2cd50e45 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringVariableIsAppendedToVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringVariableIsAppendedToVisitor.java @@ -43,10 +43,9 @@ class StringVariableIsAppendedToVisitor extends JavaRecursiveElementWalkingVisit if (rhs == null) { return; } - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression reference)) { return; } - final PsiReferenceExpression reference = (PsiReferenceExpression)lhs; final PsiExpression qualifier = reference.getQualifierExpression(); if (qualifier != null) { return; @@ -78,13 +77,11 @@ class StringVariableIsAppendedToVisitor extends JavaRecursiveElementWalkingVisit final PsiElement referent = ((PsiReference)expression).resolve(); return variable.equals(referent); } - if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { final PsiExpression body = parenthesizedExpression.getExpression(); return isConcatenation(body); } - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression polyadicExpression) { for (PsiExpression operand : polyadicExpression.getOperands()) { if (isConcatenation(operand)) return true; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java index 4c86bbd75a3c..73c0487c1bde 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java @@ -106,10 +106,9 @@ public class UnnecessaryTemporaryOnConversionFromStringInspection extends BaseIn public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement grandParent = element.getParent().getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression expression)) { return; } - final PsiMethodCallExpression expression = (PsiMethodCallExpression)grandParent; final CommentTracker commentTracker = new CommentTracker(); final String newExpression = calculateReplacementExpression(expression, commentTracker, true); if (newExpression == null) return; @@ -146,10 +145,9 @@ public class UnnecessaryTemporaryOnConversionFromStringInspection extends BaseIn return; } final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (!(qualifier instanceof PsiNewExpression)) { + if (!(qualifier instanceof PsiNewExpression newExpression)) { return; } - final PsiNewExpression newExpression = (PsiNewExpression)qualifier; final PsiExpressionList argumentList = newExpression.getArgumentList(); if (argumentList == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java index 218a3fa31819..7980fe6a7ed6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java @@ -133,10 +133,9 @@ public class UnnecessaryTemporaryOnConversionToStringInspection extends BaseInsp return; } final PsiExpression qualifier = PsiUtil.deparenthesizeExpression(methodExpression.getQualifierExpression()); - if (!(qualifier instanceof PsiNewExpression)) { + if (!(qualifier instanceof PsiNewExpression newExpression)) { return; } - final PsiNewExpression newExpression = (PsiNewExpression)qualifier; final PsiExpressionList argumentList = newExpression.getArgumentList(); if (argumentList == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java index e90878d362cc..fada65057ade 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java @@ -213,14 +213,12 @@ public class HardcodedFileSeparatorsInspection extends BaseInspection { final PsiElement parent = ParenthesesUtils.getParentSkipParentheses(expression); if (parent != null) { final PsiElement grandParent = parent.getParent(); - if (grandParent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; + if (grandParent instanceof PsiMethodCallExpression methodCallExpression) { if (MethodCallUtils.isCallToRegexMethod(methodCallExpression) || myMethodMatcher.matches(methodCallExpression)) { return; } } - else if (grandParent instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)grandParent; + else if (grandParent instanceof PsiNewExpression newExpression) { if (TypeUtils.expressionHasTypeOrSubtype(newExpression, "javax.swing.ImageIcon")) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/UseOfSunClassesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/UseOfSunClassesInspection.java index 7a63c9abbaf0..33f5defc2715 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/UseOfSunClassesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/UseOfSunClassesInspection.java @@ -44,10 +44,9 @@ public class UseOfSunClassesInspection extends BaseInspection { super.visitVariable(variable); final PsiType type = variable.getType(); final PsiType deepComponentType = type.getDeepComponentType(); - if (!(deepComponentType instanceof PsiClassType)) { + if (!(deepComponentType instanceof PsiClassType classType)) { return; } - final PsiClassType classType = (PsiClassType)deepComponentType; @NonNls final String className = classType.getCanonicalText(); if (!className.startsWith("sun.")) { return; @@ -67,10 +66,9 @@ public class UseOfSunClassesInspection extends BaseInspection { if (type == null) { return; } - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType classType)) { return; } - final PsiClassType classType = (PsiClassType)type; @NonNls final String className = classType.getCanonicalText(); if (!className.startsWith("sun.")) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ArrayContentsAssignedVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ArrayContentsAssignedVisitor.java index f3d591c86f83..d5f7983cc0ac 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ArrayContentsAssignedVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ArrayContentsAssignedVisitor.java @@ -38,11 +38,9 @@ class ArrayContentsAssignedVisitor extends JavaRecursiveElementWalkingVisitor { super.visitAssignmentExpression(assignment); final PsiExpression lhs = assignment.getLExpression(); final PsiExpression arrayExpression = getDeepArrayExpression(lhs); - if (!(arrayExpression instanceof PsiReferenceExpression)) { + if (!(arrayExpression instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)arrayExpression; final PsiElement referent = referenceExpression.resolve(); if (referent == null) { return; @@ -66,11 +64,9 @@ class ArrayContentsAssignedVisitor extends JavaRecursiveElementWalkingVisitor { } final PsiExpression operand = expression.getOperand(); final PsiExpression arrayExpression = getDeepArrayExpression(operand); - if (!(arrayExpression instanceof PsiReferenceExpression)) { + if (!(arrayExpression instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)arrayExpression; final PsiElement referent = referenceExpression.resolve(); if (referent == null) { return; @@ -88,9 +84,7 @@ class ArrayContentsAssignedVisitor extends JavaRecursiveElementWalkingVisitor { } PsiExpression arrayExpression = ((PsiArrayAccessExpression)expression).getArrayExpression(); - while (arrayExpression instanceof PsiArrayAccessExpression) { - final PsiArrayAccessExpression arrayAccessExpression = - (PsiArrayAccessExpression)arrayExpression; + while (arrayExpression instanceof PsiArrayAccessExpression arrayAccessExpression) { arrayExpression = arrayAccessExpression.getArrayExpression(); } return arrayExpression; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/BoolUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/BoolUtils.java index c93f986e2a20..43a72097e586 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/BoolUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/BoolUtils.java @@ -43,10 +43,9 @@ public final class BoolUtils { private BoolUtils() {} public static boolean isNegation(@NotNull PsiExpression expression) { - if (!(expression instanceof PsiPrefixExpression)) { + if (!(expression instanceof PsiPrefixExpression prefixExp)) { return false; } - final PsiPrefixExpression prefixExp = (PsiPrefixExpression)expression; final IElementType tokenType = prefixExp.getOperationTokenType(); return JavaTokenType.EXCL.equals(tokenType); } @@ -63,10 +62,9 @@ public final class BoolUtils { @Nullable public static PsiExpression getNegated(PsiExpression expression) { - if (!(expression instanceof PsiPrefixExpression)) { + if (!(expression instanceof PsiPrefixExpression prefixExpression)) { return null; } - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression; final IElementType tokenType = prefixExpression.getOperationTokenType(); if (!JavaTokenType.EXCL.equals(tokenType)) { return null; @@ -94,10 +92,9 @@ public final class BoolUtils { */ public static int getLogicalOperandCount(@Nullable PsiExpression condition) { PsiExpression unparenthesizedExpression = PsiUtil.skipParenthesizedExprDown(condition); - if (!(unparenthesizedExpression instanceof PsiPolyadicExpression)) { + if (!(unparenthesizedExpression instanceof PsiPolyadicExpression infixExpression)) { return 1; } - PsiPolyadicExpression infixExpression= (PsiPolyadicExpression) unparenthesizedExpression; if (!ANDAND.equals(infixExpression.getOperationTokenType()) && !OROR.equals(infixExpression.getOperationTokenType()) && (PsiTypes.booleanType().equals(infixExpression.getOperands()[0].getType()) @@ -149,8 +146,7 @@ public final class BoolUtils { } private static String findSmartMethodNegation(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) return null; - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (!(expression instanceof PsiMethodCallExpression call)) return null; PsiMethodCallExpression copy = (PsiMethodCallExpression)call.copy(); for (PredicatedReplacement predicatedReplacement : ourReplacements) { if (predicatedReplacement.predicate.test(call)) { @@ -172,8 +168,7 @@ public final class BoolUtils { String smartNegation = findSmartMethodNegation(expression); if (smartNegation != null) return smartNegation; } - if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { PsiExpression operand = parenthesizedExpression.getExpression(); if (operand != null) { return '(' + getNegatedExpressionText(operand, tracker) + ')'; @@ -194,8 +189,7 @@ public final class BoolUtils { getNegatedExpressionText(((PsiAssignmentExpression)expression).getRExpression()); } } - if (expression instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)expression; + if (expression instanceof PsiConditionalExpression conditionalExpression) { final boolean needParenthesis = ParenthesesUtils.getPrecedence(conditionalExpression) >= precedence; final String text = tracker.text(conditionalExpression.getCondition()) + '?' + getNegatedExpressionText(conditionalExpression.getThenExpression(), tracker) + @@ -208,8 +202,7 @@ public final class BoolUtils { return ParenthesesUtils.getText(tracker.markUnchanged(negated), precedence); } } - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression polyadicExpression) { final IElementType tokenType = polyadicExpression.getOperationTokenType(); final PsiExpression[] operands = polyadicExpression.getOperands(); if (ComparisonUtils.isComparison(polyadicExpression)) { @@ -275,8 +268,7 @@ public final class BoolUtils { ancestor = (PsiExpression)parent; parent = ancestor.getParent(); } - if (parent instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixAncestor = (PsiPrefixExpression)parent; + if (parent instanceof PsiPrefixExpression prefixAncestor) { if (JavaTokenType.EXCL.equals(prefixAncestor.getOperationTokenType())) { return prefixAncestor; } @@ -287,10 +279,9 @@ public final class BoolUtils { @Contract("null -> false") public static boolean isBooleanLiteral(PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiLiteralExpression)) { + if (!(expression instanceof PsiLiteralExpression literalExpression)) { return false; } - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)expression; @NonNls final String text = literalExpression.getText(); return PsiKeyword.TRUE.equals(text) || PsiKeyword.FALSE.equals(text); } @@ -332,9 +323,7 @@ public final class BoolUtils { if (isNegation(expression2)) { return equivalence.expressionsAreEquivalent(getNegated(expression2), expression1); } - if (expression1 instanceof PsiBinaryExpression && expression2 instanceof PsiBinaryExpression) { - PsiBinaryExpression binOp1 = (PsiBinaryExpression)expression1; - PsiBinaryExpression binOp2 = (PsiBinaryExpression)expression2; + if (expression1 instanceof PsiBinaryExpression binOp1 && expression2 instanceof PsiBinaryExpression binOp2) { RelationType rel1 = DfaPsiUtil.getRelationByToken(binOp1.getOperationTokenType()); RelationType rel2 = DfaPsiUtil.getRelationByToken(binOp2.getOperationTokenType()); if (rel1 == null || rel2 == null) return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ClassUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ClassUtils.java index bf49b3d84b1b..107769a8fafd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ClassUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ClassUtils.java @@ -169,18 +169,14 @@ public final class ClassUtils { return false; } final PsiFile containingFile1 = element1.getContainingFile(); - if (!(containingFile1 instanceof PsiClassOwner)) { + if (!(containingFile1 instanceof PsiClassOwner containingJavaFile1)) { return false; } - final PsiClassOwner containingJavaFile1 = - (PsiClassOwner)containingFile1; final String packageName1 = containingJavaFile1.getPackageName(); final PsiFile containingFile2 = element2.getContainingFile(); - if (!(containingFile2 instanceof PsiClassOwner)) { + if (!(containingFile2 instanceof PsiClassOwner containingJavaFile2)) { return false; } - final PsiClassOwner containingJavaFile2 = - (PsiClassOwner)containingFile2; final String packageName2 = containingJavaFile2.getPackageName(); return packageName1.equals(packageName2); } @@ -272,10 +268,9 @@ public final class ClassUtils { if (parent == null || parent instanceof PsiFile) { return false; } - if (!(parent instanceof PsiClass)) { + if (!(parent instanceof PsiClass parentClass)) { return true; } - final PsiClass parentClass = (PsiClass)parent; return !parentClass.isInterface(); } @@ -434,17 +429,15 @@ public final class ClassUtils { if (field.equals(grandParent)) { return true; } - if (!(grandParent instanceof PsiAssignmentExpression)) { + if (!(grandParent instanceof PsiAssignmentExpression assignmentExpression)) { newOnlyAssignedToField = false; return false; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)grandParent; final PsiExpression lhs = assignmentExpression.getLExpression(); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { newOnlyAssignedToField = false; return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; final PsiElement target = referenceExpression.resolve(); if (!field.equals(target)) { newOnlyAssignedToField = false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CodeBlockSurrounder.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CodeBlockSurrounder.java index 20d0334e76bc..3e3ab047a0a5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CodeBlockSurrounder.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CodeBlockSurrounder.java @@ -130,8 +130,7 @@ public abstract class CodeBlockSurrounder { ((PsiAssignmentExpression)parent).getRExpression() == myExpression) { return ParentContext.ASSIGNMENT; } - if (parent instanceof PsiLocalVariable) { - PsiLocalVariable var = (PsiLocalVariable)parent; + if (parent instanceof PsiLocalVariable var) { if (!var.getTypeElement().isInferredType() || PsiTypesUtil.isDenotableType(var.getType(), parent)) { return ParentContext.ASSIGNMENT; } @@ -245,8 +244,7 @@ public abstract class CodeBlockSurrounder { if (parent instanceof PsiLambdaExpression) { return new LambdaCodeBlockSurrounder(expression, (PsiLambdaExpression)parent); } - if (parent instanceof PsiPolyadicExpression) { - PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; + if (parent instanceof PsiPolyadicExpression polyadicExpression) { IElementType type = polyadicExpression.getOperationTokenType(); if (type.equals(JavaTokenType.ANDAND) && polyadicExpression.getOperands()[0] != cur) { PsiElement conditionParent = PsiUtil.skipParenthesizedExprUp(polyadicExpression.getParent()); @@ -316,9 +314,8 @@ public abstract class CodeBlockSurrounder { } if (parent instanceof PsiResourceVariable) { PsiResourceList list = tryCast(parent.getParent(), PsiResourceList.class); - if (list != null && list.getParent() instanceof PsiTryStatement) { + if (list != null && list.getParent() instanceof PsiTryStatement tryStatement) { Iterator iterator = list.iterator(); - PsiTryStatement tryStatement = (PsiTryStatement)list.getParent(); if (iterator.hasNext() && iterator.next() == parent && tryStatement.getCatchBlocks().length == 0 && tryStatement.getFinallyBlock() == null) { return forStatement(tryStatement, expression); @@ -779,8 +776,7 @@ public abstract class CodeBlockSurrounder { (PsiConditionalExpression)PsiUtil.skipParenthesizedExprDown(upstreamResult.getExpression())); PsiElement parent = PsiUtil.skipParenthesizedExprUp(ternary.getParent()); PsiStatement statement = upstreamResult.getAnchor(); - if (parent instanceof PsiLocalVariable) { - PsiLocalVariable variable = (PsiLocalVariable)parent; + if (parent instanceof PsiLocalVariable variable) { variable.normalizeDeclaration(); PsiDeclarationStatement declaration = (PsiDeclarationStatement)variable.getParent(); PsiAssignmentExpression assignment = ExpressionUtils.splitDeclaration(declaration, project); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CollectionUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CollectionUtils.java index 4786de963549..adcc397b6cea 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CollectionUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CollectionUtils.java @@ -243,8 +243,7 @@ public final class CollectionUtils { public static boolean isEmptyArray(PsiVariable variable) { final PsiExpression initializer = variable.getInitializer(); - if (initializer instanceof PsiArrayInitializerExpression) { - final PsiArrayInitializerExpression arrayInitializerExpression = (PsiArrayInitializerExpression)initializer; + if (initializer instanceof PsiArrayInitializerExpression arrayInitializerExpression) { final PsiExpression[] initializers = arrayInitializerExpression.getInitializers(); return initializers.length == 0; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CommentTracker.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CommentTracker.java index 4b575f36d5ad..6fb36fb0c1c2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CommentTracker.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CommentTracker.java @@ -276,10 +276,8 @@ public final class CommentTracker { */ public @NotNull PsiElement replace(@NotNull PsiElement element, @NotNull PsiElement replacement) { final PsiElement parent = element.getParent(); - if (parent instanceof PsiPolyadicExpression && replacement instanceof PsiPolyadicExpression) { + if (parent instanceof PsiPolyadicExpression parentPolyadic && replacement instanceof PsiPolyadicExpression childPolyadic) { // flatten nested polyadic expressions - PsiPolyadicExpression parentPolyadic = (PsiPolyadicExpression)parent; - PsiPolyadicExpression childPolyadic = (PsiPolyadicExpression)replacement; IElementType parentTokenType = parentPolyadic.getOperationTokenType(); IElementType childTokenType = childPolyadic.getOperationTokenType(); if (PsiPrecedenceUtil.getPrecedenceForOperator(parentTokenType) == PsiPrecedenceUtil.getPrecedenceForOperator(childTokenType) && diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ComparisonUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ComparisonUtils.java index c23b804c8c98..c4348d4e1f8e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ComparisonUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ComparisonUtils.java @@ -57,10 +57,9 @@ public final class ComparisonUtils { } public static boolean isComparison(@Nullable PsiExpression expression) { - if (!(expression instanceof PsiPolyadicExpression)) { + if (!(expression instanceof PsiPolyadicExpression polyadicExpression)) { return false; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; final IElementType tokenType = polyadicExpression.getOperationTokenType(); return isComparisonOperation(tokenType); } @@ -78,10 +77,9 @@ public final class ComparisonUtils { * @return true, when this is an expression of the form {@code a == b} or {@code a != b}, false otherwise. */ public static boolean isEqualityComparison(@NotNull PsiExpression expression) { - if (!(expression instanceof PsiPolyadicExpression)) { + if (!(expression instanceof PsiPolyadicExpression polyadicExpression)) { return false; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; final IElementType tokenType = polyadicExpression.getOperationTokenType(); return tokenType.equals(JavaTokenType.EQEQ) || tokenType.equals(JavaTokenType.NE); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ConstructionUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ConstructionUtils.java index 09b51c42524e..2f903751e23a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ConstructionUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ConstructionUtils.java @@ -44,8 +44,7 @@ public final class ConstructionUtils { @Contract("null -> null") public static String getStringBuilderInitializerText(PsiExpression construction) { construction = PsiUtil.skipParenthesizedExprDown(construction); - if (!(construction instanceof PsiNewExpression)) return null; - final PsiNewExpression newExpression = (PsiNewExpression)construction; + if (!(construction instanceof PsiNewExpression newExpression)) return null; final PsiJavaCodeReferenceElement classReference = newExpression.getClassReference(); if (!isReferenceTo(classReference, CommonClassNames.JAVA_LANG_STRING_BUILDER, CommonClassNames.JAVA_LANG_STRING_BUFFER)) { return null; @@ -70,8 +69,7 @@ public final class ConstructionUtils { @Contract("null -> false") public static boolean isEmptyCollectionInitializer(PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (expression instanceof PsiNewExpression) { - PsiNewExpression newExpression = (PsiNewExpression)expression; + if (expression instanceof PsiNewExpression newExpression) { PsiExpressionList argumentList = newExpression.getArgumentList(); if (argumentList != null && argumentList.isEmpty() && newExpression.getAnonymousClass() == null) { PsiClassType type = ObjectUtils.tryCast(expression.getType(), PsiClassType.class); @@ -84,8 +82,7 @@ public final class ConstructionUtils { com.intellij.psi.util.InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_UTIL_MAP); } } - if (expression instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression call) { @NonNls String name = call.getMethodExpression().getReferenceName(); PsiExpressionList argumentList = call.getArgumentList(); if(name != null && name.startsWith("new") && argumentList.isEmpty()) { @@ -123,8 +120,7 @@ public final class ConstructionUtils { } } } - if (expression instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression call) { @NonNls String name = call.getMethodExpression().getReferenceName(); PsiExpressionList argumentList = call.getArgumentList(); if(name != null && name.startsWith("new") && !argumentList.isEmpty()) { @@ -173,8 +169,7 @@ public final class ConstructionUtils { com.intellij.psi.util.InheritanceUtil.isInheritor(t, CommonClassNames.JAVA_LANG_CLASS); return Stream.of(constructor.getParameterList().getParameters()).map(PsiParameter::getType).allMatch(allowedParameterType); } - if (expression instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression call) { if (ENUM_SET_NONE_OF.test(call)) return true; @NonNls String name = call.getMethodExpression().getReferenceName(); PsiExpressionList argumentList = call.getArgumentList(); @@ -202,8 +197,7 @@ public final class ConstructionUtils { */ public static boolean isEmptyArrayInitializer(@Nullable PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiNewExpression)) return false; - final PsiNewExpression newExpression = (PsiNewExpression)expression; + if (!(expression instanceof PsiNewExpression newExpression)) return false; final PsiExpression[] dimensions = newExpression.getArrayDimensions(); if (dimensions.length == 0) { final PsiArrayInitializerExpression arrayInitializer = newExpression.getArrayInitializer(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/DeclarationSearchUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/DeclarationSearchUtils.java index d17d3b1e0887..961c490bcb14 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/DeclarationSearchUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/DeclarationSearchUtils.java @@ -65,10 +65,9 @@ public final class DeclarationSearchUtils { } else if (def instanceof PsiReferenceExpression) { final PsiElement parent = def.getParent(); - if (!(parent instanceof PsiAssignmentExpression)) { + if (!(parent instanceof PsiAssignmentExpression assignmentExpression)) { return null; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; if (assignmentExpression.getOperationTokenType() != JavaTokenType.EQ) { return null; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/EqualityCheck.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/EqualityCheck.java index 422fc946de69..b88fd01b35a1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/EqualityCheck.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/EqualityCheck.java @@ -38,8 +38,7 @@ public final class EqualityCheck { @Contract("null -> null") public static EqualityCheck from(PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (expression instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression call) { if (MethodCallUtils.isEqualsCall(call)) { PsiExpression left = call.getMethodExpression().getQualifierExpression(); PsiExpression right = ArrayUtil.getFirstElement(call.getArgumentList().getExpressions()); @@ -50,8 +49,7 @@ public final class EqualityCheck { PsiExpression[] args = call.getArgumentList().getExpressions(); return new EqualityCheck(args[0], args[1], false); } - } else if (expression instanceof PsiConditionalExpression) { - PsiConditionalExpression ternary = (PsiConditionalExpression)expression; + } else if (expression instanceof PsiConditionalExpression ternary) { EqualityCheck nestedCheck = from(ternary.getThenExpression()); PsiExpression other = ternary.getElseExpression(); boolean equalsToNull = false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/EquivalenceChecker.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/EquivalenceChecker.java index 2b042e483725..26b977496760 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/EquivalenceChecker.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/EquivalenceChecker.java @@ -793,8 +793,7 @@ public class EquivalenceChecker { } private static PsiElement unwrapLambdaBody(PsiElement element) { - while (element instanceof PsiCodeBlock) { - final PsiCodeBlock codeBlock = (PsiCodeBlock)element; + while (element instanceof PsiCodeBlock codeBlock) { final PsiStatement[] statements = codeBlock.getStatements(); if (statements.length != 1) { break; @@ -845,8 +844,7 @@ public class EquivalenceChecker { else { return EXACT_MISMATCH; // incomplete code } - if (element1 instanceof PsiMember) { - final PsiMember member1 = (PsiMember)element1; + if (element1 instanceof PsiMember member1) { if (member1.hasModifierProperty(PsiModifier.STATIC)) { return EXACT_MATCH; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExceptionUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExceptionUtils.java index 0ef8768d8d64..2c88e52e4d0b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExceptionUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExceptionUtils.java @@ -48,8 +48,7 @@ public final class ExceptionUtils { @NotNull public static Set calculateExceptionsThrown(@Nullable PsiElement element, @NotNull Set out) { if (element == null) return out; - if (element instanceof PsiResourceList) { - final PsiResourceList resourceList = (PsiResourceList)element; + if (element instanceof PsiResourceList resourceList) { for (PsiResourceListElement resource : resourceList) { out.addAll(ExceptionUtil.getCloserExceptions(resource)); } @@ -60,25 +59,22 @@ public final class ExceptionUtils { } public static boolean isGenericExceptionClass(@Nullable PsiType exceptionType) { - if (!(exceptionType instanceof PsiClassType)) { + if (!(exceptionType instanceof PsiClassType classType)) { return false; } - final PsiClassType classType = (PsiClassType)exceptionType; final String className = classType.getCanonicalText(); return s_genericExceptionTypes.contains(className); } public static boolean isThrowableRethrown(PsiParameter throwable, PsiCodeBlock catchBlock) { final PsiStatement lastStatement = ControlFlowUtils.getLastStatementInBlock(catchBlock); - if (!(lastStatement instanceof PsiThrowStatement)) { + if (!(lastStatement instanceof PsiThrowStatement throwStatement)) { return false; } - final PsiThrowStatement throwStatement = (PsiThrowStatement)lastStatement; final PsiExpression expression = throwStatement.getException(); - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; final PsiElement element = referenceExpression.resolve(); return throwable.equals(element); } @@ -111,18 +107,15 @@ public final class ExceptionUtils { else if (statement instanceof PsiDoWhileStatement) { return doWhileThrowsException((PsiDoWhileStatement)statement); } - else if (statement instanceof PsiSynchronizedStatement) { - final PsiSynchronizedStatement synchronizedStatement = (PsiSynchronizedStatement)statement; + else if (statement instanceof PsiSynchronizedStatement synchronizedStatement) { final PsiCodeBlock body = synchronizedStatement.getBody(); return blockThrowsException(body); } - else if (statement instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)statement; + else if (statement instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); return blockThrowsException(codeBlock); } - else if (statement instanceof PsiLabeledStatement) { - final PsiLabeledStatement labeledStatement = (PsiLabeledStatement)statement; + else if (statement instanceof PsiLabeledStatement labeledStatement) { final PsiStatement statementLabeled = labeledStatement.getStatement(); return statementThrowsException(statementLabeled); } @@ -208,8 +201,7 @@ public final class ExceptionUtils { final Set out = new HashSet<>(5); for (PsiParameter parameter : statement.getCatchBlockParameters()) { final PsiType type = parameter.getType(); - if (type instanceof PsiDisjunctionType) { - final PsiDisjunctionType disjunctionType = (PsiDisjunctionType)type; + if (type instanceof PsiDisjunctionType disjunctionType) { out.addAll(disjunctionType.getDisjunctions()); } else { out.add(type); @@ -272,8 +264,7 @@ public final class ExceptionUtils { return; } final PsiType type = exception.getType(); - if (type instanceof PsiDisjunctionType) { - final PsiDisjunctionType disjunctionType = (PsiDisjunctionType)type; + if (type instanceof PsiDisjunctionType disjunctionType) { for (PsiType disjunction : disjunctionType.getDisjunctions()) { if (disjunction instanceof PsiClassType) { myThrownExceptionTypes.add((PsiClassType)disjunction); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpectedTypeUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpectedTypeUtils.java index a8352adcf460..50f2368aa479 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpectedTypeUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpectedTypeUtils.java @@ -129,11 +129,10 @@ public final class ExpectedTypeUtils { @Override public void visitArrayInitializerExpression(@NotNull PsiArrayInitializerExpression initializer) { final PsiType type = initializer.getType(); - if (!(type instanceof PsiArrayType)) { + if (!(type instanceof PsiArrayType arrayType)) { expectedType = null; return; } - final PsiArrayType arrayType = (PsiArrayType)type; expectedType = arrayType.getComponentType(); } @@ -260,15 +259,13 @@ public final class ExpectedTypeUtils { @Override public void visitExpressionStatement(@NotNull PsiExpressionStatement statement) { final PsiElement parent = statement.getParent(); - if (!(parent instanceof PsiSwitchLabeledRuleStatement)) { + if (!(parent instanceof PsiSwitchLabeledRuleStatement switchLabeledRuleStatement)) { return; } - final PsiSwitchLabeledRuleStatement switchLabeledRuleStatement = (PsiSwitchLabeledRuleStatement)parent; final PsiSwitchBlock block = switchLabeledRuleStatement.getEnclosingSwitchBlock(); - if (!(block instanceof PsiSwitchExpression)) { + if (!(block instanceof PsiSwitchExpression switchExpression)) { return; } - final PsiSwitchExpression switchExpression = (PsiSwitchExpression)block; expectedType = switchExpression.getType(); } @@ -310,11 +307,10 @@ public final class ExpectedTypeUtils { return; } final PsiType iteratedValueType = iteratedValue.getType(); - if (!(iteratedValueType instanceof PsiClassType)) { + if (!(iteratedValueType instanceof PsiClassType classType)) { expectedType = null; return; } - final PsiClassType classType = (PsiClassType)iteratedValueType; final PsiType[] parameters = classType.getParameters(); final PsiClass iterableClass = ClassUtils.findClass(CommonClassNames.JAVA_LANG_ITERABLE, statement); if (iterableClass == null) { @@ -411,8 +407,7 @@ public final class ExpectedTypeUtils { public void visitDeclarationStatement(@NotNull PsiDeclarationStatement declaration) { final PsiElement[] declaredElements = declaration.getDeclaredElements(); for (PsiElement declaredElement : declaredElements) { - if (declaredElement instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)declaredElement; + if (declaredElement instanceof PsiVariable variable) { final PsiExpression initializer = variable.getInitializer(); if (wrappedExpression.equals(initializer)) { expectedType = variable.getType(); @@ -449,14 +444,12 @@ public final class ExpectedTypeUtils { @NotNull private static JavaResolveResult findCalledMethod(PsiExpressionList expressionList) { final PsiElement parent = expressionList.getParent(); - if (parent instanceof PsiCall) { - final PsiCall call = (PsiCall)parent; + if (parent instanceof PsiCall call) { return call.resolveMethodGenerics(); } else if (parent instanceof PsiAnonymousClass) { final PsiElement grandParent = parent.getParent(); - if (grandParent instanceof PsiCallExpression) { - final PsiCallExpression callExpression = (PsiCallExpression)grandParent; + if (grandParent instanceof PsiCallExpression callExpression) { return callExpression.resolveMethodGenerics(); } } @@ -471,8 +464,7 @@ public final class ExpectedTypeUtils { final PsiElement element = resolveResult.getElement(); PsiSubstitutor substitutor = resolveResult.getSubstitutor(); final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); - if (element instanceof PsiField) { - final PsiField field = (PsiField)element; + if (element instanceof PsiField field) { if (!isAccessibleFrom(field, referenceExpression)) { return; } @@ -483,11 +475,10 @@ public final class ExpectedTypeUtils { final PsiElementFactory factory = psiFacade.getElementFactory(); expectedType = factory.createType(aClass, substitutor); } - else if (element instanceof PsiMethod) { + else if (element instanceof PsiMethod method) { final PsiElement parent = referenceExpression.getParent(); final PsiType returnType; - if (parent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)parent; + if (parent instanceof PsiMethodCallExpression methodCallExpression) { final PsiType type = methodCallExpression.getType(); if (!PsiTypes.voidType().equals(type)) { returnType = findExpectedType(methodCallExpression, true); @@ -499,7 +490,6 @@ public final class ExpectedTypeUtils { else { returnType = null; } - final PsiMethod method = (PsiMethod)element; final PsiClass methodContainingClass = method.getContainingClass(); if (methodContainingClass == null) { return; @@ -681,8 +671,7 @@ public final class ExpectedTypeUtils { public Object visitWildcardType(@NotNull PsiWildcardType wildcardType) { if (wildcardType.isExtends()) { final PsiType extendsBound = wildcardType.getExtendsBound(); - if (extendsBound instanceof PsiClassType) { - final PsiClassType classType = (PsiClassType)extendsBound; + if (extendsBound instanceof PsiClassType classType) { final PsiClass aClass = classType.resolve(); if (aClass != null && aClass.hasModifierProperty(PsiModifier.FINAL)) { modified = true; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/FinalUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/FinalUtils.java index 28e15e3ae4c5..dde45b4a0c84 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/FinalUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/FinalUtils.java @@ -47,8 +47,7 @@ public final class FinalUtils { Map> finalVarProblems = new HashMap<>(); Map> uninitializedVarProblems = new HashMap<>(); PsiElementProcessor elementDoesNotViolateFinality = e -> { - if (!(e instanceof PsiReferenceExpression)) return true; - PsiReferenceExpression ref = (PsiReferenceExpression)e; + if (!(e instanceof PsiReferenceExpression ref)) return true; if (!ref.isReferenceTo(variable)) return true; HighlightInfo.Builder highlightInfo = HighlightControlFlowUtil .checkVariableInitializedBeforeUsage(ref, variable, uninitializedVarProblems, variable.getContainingFile(), true); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/FunctionalExpressionUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/FunctionalExpressionUtils.java index 63493862f1aa..2977e7a84b5d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/FunctionalExpressionUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/FunctionalExpressionUtils.java @@ -28,8 +28,7 @@ public final class FunctionalExpressionUtils { public static boolean isFunctionalReferenceTo(PsiExpression expression, String className, PsiType returnType, String methodName, PsiType... parameterTypes) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (expression instanceof PsiMethodReferenceExpression) { - PsiMethodReferenceExpression methodRef = (PsiMethodReferenceExpression)expression; + if (expression instanceof PsiMethodReferenceExpression methodRef) { if (!methodName.equals(methodRef.getReferenceName())) return false; PsiMethod method = ObjectUtils.tryCast(methodRef.resolve(), PsiMethod.class); PsiReferenceExpression ref = ObjectUtils.tryCast(methodRef.getQualifier(), PsiReferenceExpression.class); @@ -39,8 +38,7 @@ public final class FunctionalExpressionUtils { method.getContainingClass() != null && ref.isReferenceTo(method.getContainingClass()); } - if (expression instanceof PsiLambdaExpression) { - PsiLambdaExpression lambda = (PsiLambdaExpression)expression; + if (expression instanceof PsiLambdaExpression lambda) { PsiExpression body = PsiUtil.skipParenthesizedExprDown(LambdaUtil.extractSingleExpressionFromBody(lambda.getBody())); PsiMethodCallExpression call = ObjectUtils.tryCast(body, PsiMethodCallExpression.class); if (call == null || !MethodCallUtils.isCallToMethod(call, className, returnType, methodName, parameterTypes)) return false; @@ -66,8 +64,7 @@ public final class FunctionalExpressionUtils { @Nullable public static PsiClass getClassOfDefaultConstructorFunction(PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (expression instanceof PsiMethodReferenceExpression) { - PsiMethodReferenceExpression methodRef = (PsiMethodReferenceExpression)expression; + if (expression instanceof PsiMethodReferenceExpression methodRef) { if (!methodRef.isConstructor()) return null; PsiMethod method = LambdaUtil.getFunctionalInterfaceMethod(methodRef.getFunctionalInterfaceType()); if (method == null || !method.getParameterList().isEmpty()) return null; @@ -80,12 +77,10 @@ public final class FunctionalExpressionUtils { } return PsiUtil.resolveClassInClassTypeOnly(type.getType()); } - if (expression instanceof PsiLambdaExpression) { - PsiLambdaExpression lambda = (PsiLambdaExpression)expression; + if (expression instanceof PsiLambdaExpression lambda) { if (!lambda.getParameterList().isEmpty()) return null; PsiExpression body = PsiUtil.skipParenthesizedExprDown(LambdaUtil.extractSingleExpressionFromBody(lambda.getBody())); - if (!(body instanceof PsiNewExpression)) return null; - PsiNewExpression newExpression = (PsiNewExpression)body; + if (!(body instanceof PsiNewExpression newExpression)) return null; PsiExpressionList args = newExpression.getArgumentList(); if (args == null || !args.isEmpty() || newExpression.getAnonymousClass() != null) return null; PsiReference classRef = newExpression.getClassReference(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ImportUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ImportUtils.java index d498fab075a7..aa7f3a05b1b4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ImportUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ImportUtils.java @@ -35,10 +35,9 @@ public final class ImportUtils { public static void addImportIfNeeded(@NotNull PsiClass aClass, @NotNull PsiElement context) { final PsiFile file = context.getContainingFile(); - if (!(file instanceof PsiJavaFile)) { + if (!(file instanceof PsiJavaFile javaFile)) { return; } - final PsiJavaFile javaFile = (PsiJavaFile)file; final PsiClass outerClass = aClass.getContainingClass(); if (outerClass == null) { if (PsiTreeUtil.isAncestor(javaFile, aClass, true)) { @@ -92,7 +91,7 @@ public final class ImportUtils { public static boolean nameCanBeImported(@NotNull String fqName, @NotNull PsiElement context) { final PsiFile containingFile = context.getContainingFile(); - if (!(containingFile instanceof PsiJavaFile)) { + if (!(containingFile instanceof PsiJavaFile file)) { return false; } PsiClass containingClass = PsiTreeUtil.getParentOfType(context, PsiClass.class); @@ -121,7 +120,6 @@ public final class ImportUtils { } containingClass = PsiTreeUtil.getParentOfType(containingClass, PsiClass.class); } - final PsiJavaFile file = (PsiJavaFile) containingFile; if (hasExactImportConflict(fqName, file)) { return false; } @@ -199,10 +197,9 @@ public final class ImportUtils { */ private static boolean hasOnDemandImportConflict(@NotNull String fqName, @NotNull PsiElement context, boolean strict) { final PsiFile containingFile = context.getContainingFile(); - if (!(containingFile instanceof PsiJavaFile)) { + if (!(containingFile instanceof PsiJavaFile javaFile)) { return false; } - final PsiJavaFile javaFile = (PsiJavaFile)containingFile; final PsiImportList imports = javaFile.getImportList(); if (imports == null) { return false; @@ -223,8 +220,7 @@ public final class ImportUtils { continue; } final PsiElement element = importReference.resolve(); - if (element instanceof PsiPackage) { - final PsiPackage aPackage = (PsiPackage)element; + if (element instanceof PsiPackage aPackage) { if (!strict) { if (aPackage.findClassByShortName(shortName, containingFile.getResolveScope()).length > 0) { return true; @@ -330,18 +326,16 @@ public final class ImportUtils { } } final PsiFile contextFile = context.getContainingFile(); - if (!(contextFile instanceof PsiJavaFile)) { + if (!(contextFile instanceof PsiJavaFile javaFile)) { return false; } - final PsiJavaFile javaFile = (PsiJavaFile)contextFile; final PsiImportList importList = javaFile.getImportList(); if (importList == null) { return false; } final PsiImportStatementBase existingImportStatement = importList.findSingleImportStatement(memberName); if (existingImportStatement != null) { - if (existingImportStatement instanceof PsiImportStaticStatement) { - final PsiImportStaticStatement importStaticStatement = (PsiImportStaticStatement)existingImportStatement; + if (existingImportStatement instanceof PsiImportStaticStatement importStaticStatement) { if (!memberName.equals(importStaticStatement.getReferenceName())) { return false; } @@ -425,10 +419,9 @@ public final class ImportUtils { return false; } final PsiFile psiFile = context.getContainingFile(); - if (!(psiFile instanceof PsiJavaFile)) { + if (!(psiFile instanceof PsiJavaFile javaFile)) { return false; } - final PsiJavaFile javaFile = (PsiJavaFile)psiFile; final PsiImportList importList = javaFile.getImportList(); if (importList == null) { return false; @@ -579,10 +572,9 @@ public final class ImportUtils { if (reference.getQualifier() != null) return; final PsiElement element = reference.resolve(); - if (!(element instanceof PsiClass) || element instanceof PsiTypeParameter) { + if (!(element instanceof PsiClass aClass) || element instanceof PsiTypeParameter) { return; } - final PsiClass aClass = (PsiClass)element; final String testClassName = aClass.getName(); final String testClassQualifiedName = aClass.getQualifiedName(); if (testClassQualifiedName == null || testClassName == null || diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/IndexedContainer.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/IndexedContainer.java index 80ee0bf8f242..ab0beb953b4a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/IndexedContainer.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/IndexedContainer.java @@ -92,8 +92,7 @@ public abstract class IndexedContainer { if (arrayExpression != null) { return new ArrayIndexedContainer(arrayExpression); } - if (expression instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression call) { if (ListIndexedContainer.isSizeCall(call)) { PsiExpression qualifier = PsiUtil.skipParenthesizedExprDown(ExpressionUtils.getEffectiveQualifier(call.getMethodExpression())); if (qualifier != null) { @@ -171,8 +170,7 @@ public abstract class IndexedContainer { @Override public PsiExpression extractIndexFromGetExpression(@Nullable PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (expression instanceof PsiArrayAccessExpression) { - PsiArrayAccessExpression arrayAccess = (PsiArrayAccessExpression)expression; + if (expression instanceof PsiArrayAccessExpression arrayAccess) { if (isQualifierEquivalent(arrayAccess.getArrayExpression())) { return arrayAccess.getIndexExpression(); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InitializationUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InitializationUtils.java index 901ac2c60bc0..d2cf3fba017c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InitializationUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InitializationUtils.java @@ -84,16 +84,13 @@ public final class InitializationUtils { statement instanceof PsiSwitchLabelStatement) { return false; } - else if (statement instanceof PsiReturnStatement) { - final PsiReturnStatement returnStatement = (PsiReturnStatement)statement; + else if (statement instanceof PsiReturnStatement returnStatement) { return expressionAssignsVariableOrFails(returnStatement.getReturnValue(), variable, checkedMethods, strict); } - else if (statement instanceof PsiThrowStatement) { - final PsiThrowStatement throwStatement = (PsiThrowStatement)statement; + else if (statement instanceof PsiThrowStatement throwStatement) { return expressionAssignsVariableOrFails(throwStatement.getException(), variable, checkedMethods, strict); } - else if (statement instanceof PsiExpressionListStatement) { - final PsiExpressionListStatement list = (PsiExpressionListStatement)statement; + else if (statement instanceof PsiExpressionListStatement list) { final PsiExpressionList expressionList = list.getExpressionList(); for (final PsiExpression expression : expressionList.getExpressions()) { if (expressionAssignsVariableOrFails(expression, variable, checkedMethods, strict)) { @@ -102,52 +99,40 @@ public final class InitializationUtils { } return false; } - else if (statement instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; + else if (statement instanceof PsiExpressionStatement expressionStatement) { return expressionAssignsVariableOrFails(expressionStatement.getExpression(), variable, checkedMethods, strict); } - else if (statement instanceof PsiDeclarationStatement) { - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)statement; + else if (statement instanceof PsiDeclarationStatement declarationStatement) { return declarationStatementAssignsVariableOrFails(declarationStatement, variable, checkedMethods, strict); } - else if (statement instanceof PsiForStatement) { - final PsiForStatement forStatement = (PsiForStatement)statement; + else if (statement instanceof PsiForStatement forStatement) { return forStatementAssignsVariableOrFails(forStatement, variable, checkedMethods, strict); } - else if (statement instanceof PsiForeachStatement) { - final PsiForeachStatement foreachStatement = (PsiForeachStatement)statement; + else if (statement instanceof PsiForeachStatement foreachStatement) { return foreachStatementAssignsVariableOrFails(foreachStatement, variable, checkedMethods, strict); } - else if (statement instanceof PsiWhileStatement) { - final PsiWhileStatement whileStatement = (PsiWhileStatement)statement; + else if (statement instanceof PsiWhileStatement whileStatement) { return whileStatementAssignsVariableOrFails(whileStatement, variable, checkedMethods, strict); } - else if (statement instanceof PsiDoWhileStatement) { - final PsiDoWhileStatement doWhileStatement = (PsiDoWhileStatement)statement; + else if (statement instanceof PsiDoWhileStatement doWhileStatement) { return doWhileAssignsVariableOrFails(doWhileStatement, variable, checkedMethods, strict); } - else if (statement instanceof PsiSynchronizedStatement) { - final PsiSynchronizedStatement synchronizedStatement = (PsiSynchronizedStatement)statement; + else if (statement instanceof PsiSynchronizedStatement synchronizedStatement) { return blockAssignsVariableOrFails(synchronizedStatement.getBody(), variable, checkedMethods, strict); } - else if (statement instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)statement; + else if (statement instanceof PsiBlockStatement blockStatement) { return blockAssignsVariableOrFails(blockStatement.getCodeBlock(), variable, checkedMethods, strict); } - else if (statement instanceof PsiLabeledStatement) { - final PsiLabeledStatement labeledStatement = (PsiLabeledStatement)statement; + else if (statement instanceof PsiLabeledStatement labeledStatement) { return statementAssignsVariableOrFails(labeledStatement.getStatement(), variable, checkedMethods, strict); } - else if (statement instanceof PsiIfStatement) { - final PsiIfStatement ifStatement = (PsiIfStatement)statement; + else if (statement instanceof PsiIfStatement ifStatement) { return ifStatementAssignsVariableOrFails(ifStatement, variable, checkedMethods, strict); } - else if (statement instanceof PsiTryStatement) { - final PsiTryStatement tryStatement = (PsiTryStatement)statement; + else if (statement instanceof PsiTryStatement tryStatement) { return tryStatementAssignsVariableOrFails(tryStatement, variable, checkedMethods, strict); } - else if (statement instanceof PsiSwitchStatement) { - final PsiSwitchStatement switchStatement = (PsiSwitchStatement)statement; + else if (statement instanceof PsiSwitchStatement switchStatement) { return switchStatementAssignsVariableOrFails(switchStatement, variable, checkedMethods, strict); } else { @@ -176,8 +161,7 @@ public final class InitializationUtils { boolean assigns = false; for (int i = 0; i < statements.length; i++) { final PsiStatement statement = statements[i]; - if (statement instanceof PsiSwitchLabelStatement) { - final PsiSwitchLabelStatement labelStatement = (PsiSwitchLabelStatement)statement; + if (statement instanceof PsiSwitchLabelStatement labelStatement) { if (i == statements.length - 1) { return false; } @@ -186,8 +170,7 @@ public final class InitializationUtils { } assigns = false; } - else if (statement instanceof PsiBreakStatement) { - final PsiBreakStatement breakStatement = (PsiBreakStatement)statement; + else if (statement instanceof PsiBreakStatement breakStatement) { if (breakStatement.getLabelIdentifier() != null) { return false; } @@ -210,8 +193,7 @@ public final class InitializationUtils { Set checkedMethods, boolean strict) { final PsiElement[] elements = declarationStatement.getDeclaredElements(); for (PsiElement element : elements) { - if (element instanceof PsiVariable) { - final PsiVariable declaredVariable = (PsiVariable)element; + if (element instanceof PsiVariable declaredVariable) { if (expressionAssignsVariableOrFails(declaredVariable.getInitializer(), variable, checkedMethods, strict)) { return true; } @@ -322,20 +304,16 @@ public final class InitializationUtils { expression instanceof PsiReferenceExpression) { return false; } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { return expressionAssignsVariableOrFails(parenthesizedExpression.getExpression(), variable, checkedMethods, strict); } - else if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + else if (expression instanceof PsiMethodCallExpression methodCallExpression) { return methodCallAssignsVariableOrFails(methodCallExpression, variable, checkedMethods, strict); } - else if (expression instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)expression; + else if (expression instanceof PsiNewExpression newExpression) { return newExpressionAssignsVariableOrFails(newExpression, variable, checkedMethods, strict); } - else if (expression instanceof PsiArrayInitializerExpression) { - final PsiArrayInitializerExpression array = (PsiArrayInitializerExpression)expression; + else if (expression instanceof PsiArrayInitializerExpression array) { for (final PsiExpression initializer : array.getInitializers()) { if (expressionAssignsVariableOrFails(initializer, variable, checkedMethods, strict)) { return true; @@ -343,21 +321,17 @@ public final class InitializationUtils { } return false; } - else if (expression instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCast = (PsiTypeCastExpression)expression; + else if (expression instanceof PsiTypeCastExpression typeCast) { return expressionAssignsVariableOrFails(typeCast.getOperand(), variable, checkedMethods, strict); } - else if (expression instanceof PsiArrayAccessExpression) { - final PsiArrayAccessExpression accessExpression = (PsiArrayAccessExpression)expression; + else if (expression instanceof PsiArrayAccessExpression accessExpression) { return expressionAssignsVariableOrFails(accessExpression.getArrayExpression(), variable, checkedMethods, strict) || expressionAssignsVariableOrFails(accessExpression.getIndexExpression(), variable, checkedMethods, strict); } - else if (expression instanceof PsiUnaryExpression) { - final PsiUnaryExpression unaryOperation = (PsiUnaryExpression)expression; + else if (expression instanceof PsiUnaryExpression unaryOperation) { return expressionAssignsVariableOrFails(unaryOperation.getOperand(), variable, checkedMethods, strict); } - else if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + else if (expression instanceof PsiPolyadicExpression polyadicExpression) { for (PsiExpression operand : polyadicExpression.getOperands()) { if (expressionAssignsVariableOrFails(operand, variable, checkedMethods, strict)) { return true; @@ -365,16 +339,14 @@ public final class InitializationUtils { } return false; } - else if (expression instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditional = (PsiConditionalExpression)expression; + else if (expression instanceof PsiConditionalExpression conditional) { if (expressionAssignsVariableOrFails(conditional.getCondition(), variable, checkedMethods, strict)) { return true; } return expressionAssignsVariableOrFails(conditional.getThenExpression(), variable, checkedMethods, strict) && expressionAssignsVariableOrFails(conditional.getElseExpression(), variable, checkedMethods, strict); } - else if (expression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignment = (PsiAssignmentExpression)expression; + else if (expression instanceof PsiAssignmentExpression assignment) { final PsiExpression lhs = assignment.getLExpression(); if (expressionAssignsVariableOrFails(lhs, variable, checkedMethods, strict)) { return true; @@ -390,8 +362,7 @@ public final class InitializationUtils { } return false; } - else if (expression instanceof PsiInstanceOfExpression) { - final PsiInstanceOfExpression instanceOfExpression = (PsiInstanceOfExpression)expression; + else if (expression instanceof PsiInstanceOfExpression instanceOfExpression) { return expressionAssignsVariableOrFails(instanceOfExpression.getOperand(), variable, checkedMethods, strict); } else { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java index c95283ce83b3..4e91b5af848a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java @@ -44,10 +44,9 @@ public final class InstanceOfUtils { public static PsiInstanceOfExpression getConflictingInstanceof(@Nullable PsiType castType, @NotNull PsiReferenceExpression operand, @NotNull PsiElement context) { - if (!(castType instanceof PsiClassType)) { + if (!(castType instanceof PsiClassType classType)) { return null; } - final PsiClassType classType = (PsiClassType)castType; if (((PsiClassType)castType).resolve() instanceof PsiTypeParameter) { return null; } @@ -56,8 +55,7 @@ public final class InstanceOfUtils { PsiStatement sibling = PsiTreeUtil.getParentOfType(context, PsiStatement.class); sibling = PsiTreeUtil.getPrevSiblingOfType(sibling, PsiStatement.class); while (sibling != null) { - if (sibling instanceof PsiIfStatement) { - final PsiIfStatement ifStatement = (PsiIfStatement)sibling; + if (sibling instanceof PsiIfStatement ifStatement) { final PsiExpression condition = ifStatement.getCondition(); if (condition != null) { if (!ControlFlowUtils.statementMayCompleteNormally(ifStatement.getThenBranch())) { @@ -76,8 +74,7 @@ public final class InstanceOfUtils { } } } - else if (sibling instanceof PsiAssertStatement) { - final PsiAssertStatement assertStatement = (PsiAssertStatement)sibling; + else if (sibling instanceof PsiAssertStatement assertStatement) { final PsiExpression condition = assertStatement.getAssertCondition(); checker.negate = false; checker.checkExpression(condition); @@ -168,8 +165,7 @@ public final class InstanceOfUtils { public static boolean hasAgreeingInstanceof(@NotNull PsiTypeCastExpression expression) { final PsiType castType = expression.getType(); final PsiExpression operand = expression.getOperand(); - if (!(operand instanceof PsiReferenceExpression)) return false; - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)operand; + if (!(operand instanceof PsiReferenceExpression referenceExpression)) return false; final InstanceofChecker checker = new InstanceofChecker(referenceExpression, castType, false); PsiElement parent = findInterestingParent(expression); while (parent != null) { @@ -244,8 +240,7 @@ public final class InstanceOfUtils { PsiElement parent = context.getParent(); if (parent instanceof PsiCodeBlock) { for (PsiElement stmt = context.getPrevSibling(); stmt != null; stmt = stmt.getPrevSibling()) { - if (stmt instanceof PsiIfStatement) { - PsiIfStatement ifStatement = (PsiIfStatement)stmt; + if (stmt instanceof PsiIfStatement ifStatement) { PsiStatement thenBranch = ifStatement.getThenBranch(); PsiStatement elseBranch = ifStatement.getElseBranch(); boolean thenCompletes = canCompleteNormally(parent, thenBranch); @@ -288,8 +283,7 @@ public final class InstanceOfUtils { private static PsiInstanceOfExpression processParent(@NotNull PsiTypeCastExpression cast, @NotNull PsiElement context, @Nullable PsiElement parent) { - if (parent instanceof PsiIfStatement) { - PsiIfStatement ifStatement = (PsiIfStatement)parent; + if (parent instanceof PsiIfStatement ifStatement) { if (ifStatement.getThenBranch() == context) { return findInstanceOf(ifStatement.getCondition(), cast, true); } @@ -329,8 +323,7 @@ public final class InstanceOfUtils { if (BoolUtils.isNegation(condition)) { return findInstanceOf(BoolUtils.getNegated(condition), cast, !whenTrue); } - if (condition instanceof PsiPolyadicExpression) { - PsiPolyadicExpression polyadic = (PsiPolyadicExpression)condition; + if (condition instanceof PsiPolyadicExpression polyadic) { IElementType tokenType = polyadic.getOperationTokenType(); if (tokenType == JavaTokenType.ANDAND && whenTrue || tokenType == JavaTokenType.OROR && !whenTrue) { @@ -343,8 +336,7 @@ public final class InstanceOfUtils { } } } - if (condition instanceof PsiInstanceOfExpression && whenTrue) { - PsiInstanceOfExpression instanceOf = (PsiInstanceOfExpression)condition; + if (condition instanceof PsiInstanceOfExpression instanceOf && whenTrue) { PsiTypeElement typeElement = findCheckTypeElement(instanceOf); if (typeElement != null) { PsiType type = typeElement.getType(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/IteratorUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/IteratorUtils.java index a46ae0e7dfee..e1a7b5bf66f0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/IteratorUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/IteratorUtils.java @@ -78,7 +78,7 @@ public final class IteratorUtils { expression.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (!(qualifier instanceof PsiReferenceExpression)) { + if (!(qualifier instanceof PsiReferenceExpression referenceExpression)) { if (target != null) { return; } @@ -89,8 +89,6 @@ public final class IteratorUtils { } } else { - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)qualifier; final PsiElement element = referenceExpression.resolve(); if (target == null || !target.equals(element)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/Java8MigrationUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/Java8MigrationUtils.java index d79d4868716b..0769d640e9a5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/Java8MigrationUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/Java8MigrationUtils.java @@ -60,13 +60,11 @@ public final class Java8MigrationUtils { @Nullable @Contract("_, null -> null") private static PsiMethodCallExpression tryExtractMapGetCall(PsiReferenceExpression target, PsiElement element) { - if (element instanceof PsiDeclarationStatement) { - PsiDeclarationStatement declaration = (PsiDeclarationStatement)element; + if (element instanceof PsiDeclarationStatement declaration) { PsiElement[] elements = declaration.getDeclaredElements(); if (elements.length > 0) { PsiElement lastDeclaration = elements[elements.length - 1]; - if (lastDeclaration instanceof PsiLocalVariable && target.isReferenceTo(lastDeclaration)) { - PsiLocalVariable var = (PsiLocalVariable)lastDeclaration; + if (lastDeclaration instanceof PsiLocalVariable var && target.isReferenceTo(lastDeclaration)) { return extractMapMethodCall(var.getInitializer(), "get"); } } @@ -90,8 +88,7 @@ public final class Java8MigrationUtils { @Contract("null, _ -> null") public static PsiMethodCallExpression extractMapMethodCall(PsiExpression expression, @NotNull @NonNls String expectedName) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiMethodCallExpression)) return null; - PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) return null; if (!expectedName.equals(methodCallExpression.getMethodExpression().getReferenceName())) return null; final PsiMethod method = methodCallExpression.resolveMethod(); if (method == null) return null; @@ -262,12 +259,10 @@ public final class Java8MigrationUtils { @Contract("null, _ -> null") public static Java8MigrationUtils.MapCheckCondition fromConditional(PsiElement conditional, boolean treatGetNullAsContainsKey) { - if (conditional instanceof PsiIfStatement) { - PsiIfStatement ifStatement = (PsiIfStatement)conditional; + if (conditional instanceof PsiIfStatement ifStatement) { return tryExtract(ifStatement.getCondition(), ifStatement, treatGetNullAsContainsKey); } - if (conditional instanceof PsiConditionalExpression) { - PsiConditionalExpression ternary = (PsiConditionalExpression)conditional; + if (conditional instanceof PsiConditionalExpression ternary) { PsiElement parent = ternary.getParent().getParent(); return tryExtract(ternary.getCondition(), parent instanceof PsiStatement ? (PsiStatement)parent : null, treatGetNullAsContainsKey); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/JavaPsiMathUtil.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/JavaPsiMathUtil.java index 703329ade3f7..42682f041d14 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/JavaPsiMathUtil.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/JavaPsiMathUtil.java @@ -46,8 +46,7 @@ public final class JavaPsiMathUtil { else if (value instanceof Long) { return String.valueOf(value.longValue() + addend); } - if (stripped instanceof PsiPolyadicExpression) { - PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)stripped; + if (stripped instanceof PsiPolyadicExpression polyadicExpression) { int multiplier = getMultiplier(polyadicExpression); if (multiplier != 0) { value = getNumberFromLiteral(ArrayUtil.getLastElement(polyadicExpression.getOperands())); @@ -85,8 +84,7 @@ public final class JavaPsiMathUtil { @Contract("null, _ -> null") @Nullable public static String simplifyComparison(PsiExpression comparison, @NotNull CommentTracker ct) { - if (!(comparison instanceof PsiBinaryExpression)) return null; - PsiBinaryExpression binOp = (PsiBinaryExpression)comparison; + if (!(comparison instanceof PsiBinaryExpression binOp)) return null; RelationType relationType = DfaPsiUtil.getRelationByToken(binOp.getOperationTokenType()); if (relationType == null) return null; String operator = binOp.getOperationSign().getText(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/LibraryUtil.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/LibraryUtil.java index 54e3d9fa5dc4..2d5b68b0c14a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/LibraryUtil.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/LibraryUtil.java @@ -54,15 +54,13 @@ public final class LibraryUtil { public static boolean isOverrideOfLibraryMethodParameter( @Nullable PsiVariable variable) { - if (!(variable instanceof PsiParameter)) { + if (!(variable instanceof PsiParameter parameter)) { return false; } - final PsiParameter parameter = (PsiParameter)variable; final PsiElement scope = parameter.getDeclarationScope(); - if (!(scope instanceof PsiMethod)) { + if (!(scope instanceof PsiMethod method)) { return false; } - final PsiMethod method = (PsiMethod)scope; return isOverrideOfLibraryMethod(method); } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/LoopDirection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/LoopDirection.java index cf478be850f1..f066ab146287 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/LoopDirection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/LoopDirection.java @@ -25,16 +25,14 @@ public enum LoopDirection { PsiExpressionStatement expressionStatement = tryCast(updateStatement, PsiExpressionStatement.class); if (expressionStatement == null) return null; PsiExpression expression = PsiUtil.skipParenthesizedExprDown(expressionStatement.getExpression()); - if (expression instanceof PsiUnaryExpression) { - PsiUnaryExpression unaryExpression = (PsiUnaryExpression)expression; + if (expression instanceof PsiUnaryExpression unaryExpression) { IElementType tokenType = unaryExpression.getOperationTokenType(); if (tokenType != JavaTokenType.PLUSPLUS && tokenType != JavaTokenType.MINUSMINUS) return null; PsiExpression operand = unaryExpression.getOperand(); if (!ExpressionUtils.isReferenceTo(operand, counter)) return null; return tokenType == JavaTokenType.PLUSPLUS ? ASCENDING : DESCENDING; } - if (expression instanceof PsiAssignmentExpression) { - PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; + if (expression instanceof PsiAssignmentExpression assignmentExpression) { PsiExpression lhs = assignmentExpression.getLExpression(); if (!ExpressionUtils.isReferenceTo(lhs, counter)) return null; PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getRExpression()); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java index 14e6901e5960..6714ed34efd9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java @@ -214,8 +214,7 @@ public final class MethodCallUtils { if (member instanceof PsiClassInitializer || member instanceof PsiField) { return !member.hasModifierProperty(PsiModifier.STATIC); } - if (member instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)member; + if (member instanceof PsiMethod method) { if (method.isConstructor()) { return true; } @@ -240,10 +239,9 @@ public final class MethodCallUtils { return false; } final PsiExpression qualifier = PsiUtil.skipParenthesizedExprDown(methodExpression.getQualifierExpression()); - if (!(qualifier instanceof PsiReferenceExpression)) { + if (!(qualifier instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifier; final PsiElement element = referenceExpression.resolve(); return variable.equals(element); } @@ -294,10 +292,9 @@ public final class MethodCallUtils { return false; } final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiCall)) { + if (!(grandParent instanceof PsiCall call)) { return false; } - final PsiCall call = (PsiCall)grandParent; return call.resolveMethod() != findMethodWithReplacedArgument(call, expression, replacement); } @@ -372,11 +369,9 @@ public final class MethodCallUtils { if (type == null || !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return false; } - if (considerStaticFinalConstant && argument instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)argument; + if (considerStaticFinalConstant && argument instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); - if (target instanceof PsiField) { - final PsiField field = (PsiField)target; + if (target instanceof PsiField field) { if (field.hasModifierProperty(PsiModifier.STATIC) && field.hasModifierProperty(PsiModifier.FINAL)) { return false; } @@ -401,10 +396,9 @@ public final class MethodCallUtils { @Contract(pure = true) public static boolean isUsedAsSuperConstructorCallArgument(@NotNull PsiParameter parameter, boolean superMustBeLibrary) { final PsiElement scope = parameter.getDeclarationScope(); - if (!(scope instanceof PsiMethod) || !((PsiMethod)scope).isConstructor()) { + if (!(scope instanceof PsiMethod method) || !((PsiMethod)scope).isConstructor()) { return false; } - PsiMethod method = (PsiMethod)scope; final Set checked = new HashSet<>(); while (true) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodUtils.java index 68c34bdd7f67..84830c1c1950 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodUtils.java @@ -327,23 +327,20 @@ public final class MethodUtils { if (statement instanceof PsiEmptyStatement || trivialPredicate != null && trivialPredicate.test(statement)) { continue; } - if (statement instanceof PsiReturnStatement) { - final PsiReturnStatement returnStatement = (PsiReturnStatement)statement; + if (statement instanceof PsiReturnStatement returnStatement) { final PsiExpression returnValue = PsiUtil.skipParenthesizedExprDown(returnStatement.getReturnValue()); if (returnValue != null && !(returnValue instanceof PsiLiteralExpression)) { return false; } } - else if (statement instanceof PsiIfStatement) { - final PsiIfStatement ifStatement = (PsiIfStatement)statement; + else if (statement instanceof PsiIfStatement ifStatement) { final PsiExpression condition = ifStatement.getCondition(); final Object result = ExpressionUtils.computeConstantExpression(condition); if (result == null || !result.equals(Boolean.FALSE)) { return false; } } - else if (statement instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; + else if (statement instanceof PsiExpressionStatement expressionStatement) { if (!JavaPsiConstructorUtil.isSuperConstructorCall(expressionStatement.getExpression())) { return false; } @@ -376,15 +373,13 @@ public final class MethodUtils { for (UExpression expression : expressions) { ProgressManager.checkCanceled(); if (expression instanceof UastEmptyExpression || trivialPredicate != null && trivialPredicate.test(expression)) continue; - if (expression instanceof UReturnExpression) { - final UReturnExpression returnExpression = (UReturnExpression)expression; + if (expression instanceof UReturnExpression returnExpression) { final UExpression returnedExpression = returnExpression.getReturnExpression(); if (returnedExpression != null && !(UastUtils.skipParenthesizedExprDown(returnedExpression) instanceof ULiteralExpression)) { return false; } } - else if (expression instanceof UIfExpression) { - final UIfExpression ifExpression = (UIfExpression)expression; + else if (expression instanceof UIfExpression ifExpression) { final UExpression condition = ifExpression.getCondition(); final Object result = condition.evaluate(); if (result == null || !result.equals(Boolean.FALSE)) return false; @@ -407,10 +402,9 @@ public final class MethodUtils { for (PsiJavaCodeReferenceElement reference : references) { ProgressManager.checkCanceled(); final PsiElement target = reference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { continue; } - final PsiClass aClass = (PsiClass)target; final String qualifiedName = aClass.getQualifiedName(); if (ArrayUtil.contains(qualifiedName, exceptions)) return true; } @@ -425,10 +419,9 @@ public final class MethodUtils { return false; } final PsiStatement lastStatement = ControlFlowUtils.getLastStatementInBlock(method.getBody()); - if (!(lastStatement instanceof PsiReturnStatement)) { + if (!(lastStatement instanceof PsiReturnStatement returnStatement)) { return false; } - final PsiReturnStatement returnStatement = (PsiReturnStatement)lastStatement; final PsiExpression returnValue = returnStatement.getReturnValue(); return returnValue instanceof PsiThisExpression; } @@ -512,18 +505,16 @@ public final class MethodUtils { return false; } if (PsiTypes.voidType().equals(returnType)) { - if (!(statement instanceof PsiExpressionStatement)) { + if (!(statement instanceof PsiExpressionStatement expressionStatement)) { return false; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; final PsiExpression expression = expressionStatement.getExpression(); return isCallToOverloadedMethod(expression, method); } else { - if (!(statement instanceof PsiReturnStatement)) { + if (!(statement instanceof PsiReturnStatement returnStatement)) { return false; } - final PsiReturnStatement returnStatement = (PsiReturnStatement)statement; final PsiExpression returnValue = returnStatement.getReturnValue(); return isCallToOverloadedMethod(returnValue, method); } @@ -531,10 +522,9 @@ public final class MethodUtils { private static boolean isCallToOverloadedMethod(PsiExpression expression, PsiMethod method) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final String name = methodCallExpression.getMethodExpression().getReferenceName(); if (!method.getName().equals(name)) { return false; @@ -565,8 +555,7 @@ public final class MethodUtils { if (element == stop) { return null; } - if (element instanceof PsiModifierListOwner) { - final PsiModifierListOwner modifierListOwner = (PsiModifierListOwner)element; + if (element instanceof PsiModifierListOwner modifierListOwner) { final PsiAnnotation annotation = AnnotationUtil.findAnnotationInHierarchy(modifierListOwner, fqAnnotationNames); if (annotation != null) { @@ -574,8 +563,7 @@ public final class MethodUtils { } } - if (element instanceof PsiClassOwner) { - final PsiClassOwner classOwner = (PsiClassOwner)element; + if (element instanceof PsiClassOwner classOwner) { final String packageName = classOwner.getPackageName(); final PsiPackage aPackage = JavaPsiFacade.getInstance(element.getProject()).findPackage(packageName); if (aPackage == null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/RecursionUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/RecursionUtils.java index aeb3bcb4379d..2f8a1afa8f37 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/RecursionUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/RecursionUtils.java @@ -44,9 +44,7 @@ public final class RecursionUtils { statement instanceof PsiDeclarationStatement) { return false; } - else if (statement instanceof PsiReturnStatement) { - final PsiReturnStatement returnStatement = - (PsiReturnStatement)statement; + else if (statement instanceof PsiReturnStatement returnStatement) { final PsiExpression returnValue = returnStatement.getReturnValue(); if (returnValue != null) { if (expressionDefinitelyRecurses(returnValue, method)) { @@ -76,9 +74,7 @@ public final class RecursionUtils { .getBody(); return codeBlockMayReturnBeforeRecursing(body, method, false); } - else if (statement instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = - (PsiBlockStatement)statement; + else if (statement instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); return codeBlockMayReturnBeforeRecursing(codeBlock, method, false); } @@ -459,9 +455,7 @@ public final class RecursionUtils { statement instanceof PsiAssertStatement) { return false; } - else if (statement instanceof PsiExpressionListStatement) { - final PsiExpressionListStatement expressionListStatement = - (PsiExpressionListStatement)statement; + else if (statement instanceof PsiExpressionListStatement expressionListStatement) { final PsiExpressionList expressionList = expressionListStatement.getExpressionList(); if (expressionList == null) { @@ -475,22 +469,16 @@ public final class RecursionUtils { } return false; } - else if (statement instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = - (PsiExpressionStatement)statement; + else if (statement instanceof PsiExpressionStatement expressionStatement) { final PsiExpression expression = expressionStatement.getExpression(); return expressionDefinitelyRecurses(expression, method); } - else if (statement instanceof PsiDeclarationStatement) { - final PsiDeclarationStatement declaration = - (PsiDeclarationStatement)statement; + else if (statement instanceof PsiDeclarationStatement declaration) { final PsiElement[] declaredElements = declaration.getDeclaredElements(); for (final PsiElement declaredElement : declaredElements) { - if (declaredElement instanceof PsiLocalVariable) { - final PsiLocalVariable variable = - (PsiLocalVariable)declaredElement; + if (declaredElement instanceof PsiLocalVariable variable) { final PsiExpression initializer = variable.getInitializer(); if (expressionDefinitelyRecurses(initializer, method)) { return true; @@ -502,9 +490,7 @@ public final class RecursionUtils { else if (statement instanceof PsiYieldStatement) { return expressionDefinitelyRecurses(((PsiYieldStatement)statement).getExpression(), method); } - else if (statement instanceof PsiReturnStatement) { - final PsiReturnStatement returnStatement = - (PsiReturnStatement)statement; + else if (statement instanceof PsiReturnStatement returnStatement) { final PsiExpression returnValue = returnStatement.getReturnValue(); if (returnValue != null) { if (expressionDefinitelyRecurses(returnValue, method)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ReorderingUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ReorderingUtils.java index 8e9614acc807..67f9093d6395 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ReorderingUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ReorderingUtils.java @@ -76,8 +76,7 @@ public final class ReorderingUtils { return canExtract(ancestor, expressionParent); } } - if (expressionParent instanceof PsiConditionalExpression) { - PsiConditionalExpression ternary = (PsiConditionalExpression)expressionParent; + if (expressionParent instanceof PsiConditionalExpression ternary) { PsiExpression condition = ternary.getCondition(); if (condition == expression) { return canExtract(ancestor, expressionParent); @@ -100,8 +99,7 @@ public final class ReorderingUtils { if (PsiUtil.isIncrementDecrementOperation(expressionParent)) return ThreeState.NO; return canExtract(ancestor, expressionParent); } - if (expressionParent instanceof PsiPolyadicExpression) { - PsiPolyadicExpression polyadic = (PsiPolyadicExpression)expressionParent; + if (expressionParent instanceof PsiPolyadicExpression polyadic) { PsiExpression[] operands = polyadic.getOperands(); int index = ArrayUtil.indexOf(operands, expression); if (index == 0) { @@ -162,8 +160,7 @@ public final class ReorderingUtils { EquivalenceChecker.getCanonicalPsiEquivalence().expressionsAreEquivalent(operand, expression)) { return true; } - if (expression instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression call) { PsiExpressionList argumentList = call.getArgumentList(); if (argumentList.isEmpty()) return false; List contracts = JavaMethodContractUtil.getMethodCallContracts(call); @@ -295,8 +292,7 @@ public final class ReorderingUtils { @Override boolean isNecessaryCheck(PsiExpression condition, boolean negated) { - if (condition instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)condition; + if (condition instanceof PsiMethodCallExpression call) { List contracts = JavaMethodContractUtil.getMethodCallContracts(call); if (contracts.isEmpty()) return false; for (MethodContract contract : contracts) { @@ -314,8 +310,7 @@ public final class ReorderingUtils { } return false; } - if (condition instanceof PsiBinaryExpression) { - PsiBinaryExpression binOp = (PsiBinaryExpression)condition; + if (condition instanceof PsiBinaryExpression binOp) { RelationType relationType = DfaPsiUtil.getRelationByToken(binOp.getOperationTokenType()); if (relationType != null) { PsiExpression left = binOp.getLOperand(); @@ -341,8 +336,7 @@ public final class ReorderingUtils { } static ContractFailExceptionProblem from(PsiExpression expression) { - if (expression instanceof PsiCallExpression) { - PsiCallExpression call = (PsiCallExpression)expression; + if (expression instanceof PsiCallExpression call) { PsiMethod method = call.resolveMethod(); List contracts = DfaUtil.addRangeContracts(method, JavaMethodContractUtil.getMethodCallContracts(call)); contracts = ContainerUtil.filter(contracts, c -> c.getReturnValue().isFail() && c.getConditions().size() == 1); @@ -452,8 +446,7 @@ public final class ReorderingUtils { // so let's conservatively assume that the exception is possible return false; } - if (element instanceof PsiReferenceExpression) { - PsiReferenceExpression ref = (PsiReferenceExpression)element; + if (element instanceof PsiReferenceExpression ref) { if (!allowNpe) { PsiExpression qualifier = PsiUtil.skipParenthesizedExprDown(ref.getQualifierExpression()); if (qualifier != null && NullabilityUtil.getExpressionNullability(qualifier) != Nullability.NOT_NULL) { @@ -471,8 +464,7 @@ public final class ReorderingUtils { return false; } } - if (element instanceof PsiPolyadicExpression) { - PsiPolyadicExpression expr = (PsiPolyadicExpression)element; + if (element instanceof PsiPolyadicExpression expr) { IElementType type = expr.getOperationTokenType(); if (type.equals(JavaTokenType.DIV) || type.equals(JavaTokenType.PERC)) { PsiExpression[] operands = expr.getOperands(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SerializationUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SerializationUtils.java index 181c4bd73c8e..73aca2048e93 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SerializationUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SerializationUtils.java @@ -140,16 +140,13 @@ public final class SerializationUtils { if (type instanceof PsiWildcardType || type instanceof PsiPrimitiveType) { return true; } - if (type instanceof PsiArrayType) { - final PsiArrayType arrayType = (PsiArrayType)type; + if (type instanceof PsiArrayType arrayType) { final PsiType componentType = arrayType.getComponentType(); return isProbablySerializable(componentType); } - if (type instanceof PsiClassType) { - final PsiClassType classType = (PsiClassType)type; + if (type instanceof PsiClassType classType) { final PsiClass aClass = classType.resolve(); - if (aClass instanceof PsiTypeParameter) { - final PsiTypeParameter typeParameter = (PsiTypeParameter)aClass; + if (aClass instanceof PsiTypeParameter typeParameter) { final PsiReferenceList extendsList = typeParameter.getExtendsList(); return ContainerUtil.and(extendsList.getReferencedTypes(), SerializationUtils::isProbablySerializable); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SideEffectChecker.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SideEffectChecker.java index 1a25dcf87099..1f17e8c473dc 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SideEffectChecker.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SideEffectChecker.java @@ -98,8 +98,7 @@ public final class SideEffectChecker { if (e instanceof PsiLocalVariable) return true; PsiReferenceExpression ref = null; - if (e instanceof PsiAssignmentExpression) { - PsiAssignmentExpression assignment = (PsiAssignmentExpression)e; + if (e instanceof PsiAssignmentExpression assignment) { ref = tryCast(PsiUtil.skipParenthesizedExprDown(assignment.getLExpression()), PsiReferenceExpression.class); } if (e instanceof PsiUnaryExpression) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/StatementExtractor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/StatementExtractor.java index 5bfa33da19a9..156032ecfd4c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/StatementExtractor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/StatementExtractor.java @@ -96,8 +96,7 @@ public final class StatementExtractor { @NotNull private static Node foldNode(@NotNull Node node, @NotNull PsiExpression expression, @NotNull PsiExpression parent) { - if (parent instanceof PsiPolyadicExpression) { - PsiPolyadicExpression polyadic = (PsiPolyadicExpression)parent; + if (parent instanceof PsiPolyadicExpression polyadic) { IElementType type = polyadic.getOperationTokenType(); boolean and; if (type == JavaTokenType.ANDAND) { @@ -114,8 +113,7 @@ public final class StatementExtractor { if (index == 0) return node; return new Cond(parent, parent, index, and ? node : EMPTY, and ? EMPTY : node); } - if (parent instanceof PsiConditionalExpression) { - PsiConditionalExpression ternary = (PsiConditionalExpression)parent; + if (parent instanceof PsiConditionalExpression ternary) { if (expression == ternary.getThenExpression()) { return new Cond(ternary, ternary.getCondition(), -1, node, EMPTY); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/StreamApiUtil.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/StreamApiUtil.java index d6c2e690f5a0..8ef89949dcdf 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/StreamApiUtil.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/StreamApiUtil.java @@ -48,8 +48,7 @@ public final class StreamApiUtil { if(ExpressionUtils.isNullLiteral(expression)) { return true; } - if (!(expression instanceof PsiMethodCallExpression)) return false; - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (!(expression instanceof PsiMethodCallExpression call)) return false; String name = call.getMethodExpression().getReferenceName(); if ((!"empty".equals(name) && !"of".equals(name)) || !call.getArgumentList().isEmpty()) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SynchronizationUtil.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SynchronizationUtil.java index a768ae648965..334745b944ce 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SynchronizationUtil.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SynchronizationUtil.java @@ -53,10 +53,9 @@ public final class SynchronizationUtil { public static boolean isCallToHoldsLock(PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); @NonNls final String name = methodExpression.getReferenceName(); if (!"holdsLock".equals(name)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TypeUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TypeUtils.java index 4c23f7fa900b..3c4218d2ebc4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TypeUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TypeUtils.java @@ -201,9 +201,7 @@ public final class TypeUtils { final PsiType comparisonTypeErasure = TypeConversionUtil.erasure(type2); if (comparedTypeErasure == null || comparisonTypeErasure == null || TypeConversionUtil.areTypesConvertible(comparedTypeErasure, comparisonTypeErasure)) { - if (type1 instanceof PsiClassType && type2 instanceof PsiClassType) { - final PsiClassType classType1 = (PsiClassType)type1; - final PsiClassType classType2 = (PsiClassType)type2; + if (type1 instanceof PsiClassType classType1 && type2 instanceof PsiClassType classType2) { final PsiType[] parameters1 = classType1.getParameters(); final PsiType[] parameters2 = classType2.getParameters(); if (parameters1.length != parameters2.length) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java index 54c2848d00a8..7150c49ff909 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java @@ -76,18 +76,15 @@ public class UninitializedReadCollector { statement instanceof PsiEmptyStatement) { return false; } - else if (statement instanceof PsiReturnStatement) { - final PsiReturnStatement returnStatement = (PsiReturnStatement)statement; + else if (statement instanceof PsiReturnStatement returnStatement) { final PsiExpression returnValue = returnStatement.getReturnValue(); return expressionAssignsVariable(returnValue, variable, stamp, checkedMethods); } - else if (statement instanceof PsiThrowStatement) { - final PsiThrowStatement throwStatement = (PsiThrowStatement)statement; + else if (statement instanceof PsiThrowStatement throwStatement) { final PsiExpression exception = throwStatement.getException(); return expressionAssignsVariable(exception, variable, stamp, checkedMethods); } - else if (statement instanceof PsiExpressionListStatement) { - final PsiExpressionListStatement list = (PsiExpressionListStatement)statement; + else if (statement instanceof PsiExpressionListStatement list) { final PsiExpressionList expressionList = list.getExpressionList(); final PsiExpression[] expressions = expressionList.getExpressions(); for (final PsiExpression expression : expressions) { @@ -97,68 +94,54 @@ public class UninitializedReadCollector { } return false; } - else if (statement instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; + else if (statement instanceof PsiExpressionStatement expressionStatement) { final PsiExpression expression = expressionStatement.getExpression(); return expressionAssignsVariable(expression, variable, stamp, checkedMethods); } - else if (statement instanceof PsiDeclarationStatement) { - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)statement; + else if (statement instanceof PsiDeclarationStatement declarationStatement) { return declarationStatementAssignsVariable(declarationStatement, variable, stamp, checkedMethods); } - else if (statement instanceof PsiForStatement) { - final PsiForStatement forStatement = (PsiForStatement)statement; + else if (statement instanceof PsiForStatement forStatement) { return forStatementAssignsVariable(forStatement, variable, stamp, checkedMethods); } - else if (statement instanceof PsiForeachStatement) { - final PsiForeachStatement foreachStatement = (PsiForeachStatement)statement; + else if (statement instanceof PsiForeachStatement foreachStatement) { return foreachStatementAssignsVariable(foreachStatement, variable); } - else if (statement instanceof PsiWhileStatement) { - final PsiWhileStatement whileStatement = (PsiWhileStatement)statement; + else if (statement instanceof PsiWhileStatement whileStatement) { return whileStatementAssignsVariable(whileStatement, variable, stamp, checkedMethods); } - else if (statement instanceof PsiDoWhileStatement) { - final PsiDoWhileStatement doWhileStatement = (PsiDoWhileStatement)statement; + else if (statement instanceof PsiDoWhileStatement doWhileStatement) { return doWhileAssignsVariable(doWhileStatement, variable, stamp, checkedMethods); } - else if (statement instanceof PsiSynchronizedStatement) { - final PsiSynchronizedStatement synchronizedStatement = (PsiSynchronizedStatement)statement; + else if (statement instanceof PsiSynchronizedStatement synchronizedStatement) { final PsiCodeBlock body = synchronizedStatement.getBody(); return blockAssignsVariable(body, variable, stamp, checkedMethods); } - else if (statement instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)statement; + else if (statement instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); return blockAssignsVariable(codeBlock, variable, stamp, checkedMethods); } - else if (statement instanceof PsiLabeledStatement) { - final PsiLabeledStatement labeledStatement = (PsiLabeledStatement)statement; + else if (statement instanceof PsiLabeledStatement labeledStatement) { final PsiStatement statementLabeled = labeledStatement.getStatement(); return statementAssignsVariable(statementLabeled, variable, stamp, checkedMethods); } - else if (statement instanceof PsiIfStatement) { - final PsiIfStatement ifStatement = (PsiIfStatement)statement; + else if (statement instanceof PsiIfStatement ifStatement) { return ifStatementAssignsVariable(ifStatement, variable, stamp, checkedMethods); } - else if (statement instanceof PsiTryStatement) { - final PsiTryStatement tryStatement = (PsiTryStatement)statement; + else if (statement instanceof PsiTryStatement tryStatement) { return tryStatementAssignsVariable(tryStatement, variable, stamp, checkedMethods); } - else if (statement instanceof PsiSwitchStatement) { - final PsiSwitchStatement switchStatement = (PsiSwitchStatement)statement; + else if (statement instanceof PsiSwitchStatement switchStatement) { return switchBlockAssignsVariable(switchStatement, variable, stamp, checkedMethods); } else if (statement instanceof PsiSwitchLabelStatement) { return false; } - else if (statement instanceof PsiSwitchLabeledRuleStatement) { - final PsiSwitchLabeledRuleStatement switchLabeledRuleStatement = (PsiSwitchLabeledRuleStatement)statement; + else if (statement instanceof PsiSwitchLabeledRuleStatement switchLabeledRuleStatement) { final PsiStatement body = switchLabeledRuleStatement.getBody(); return statementAssignsVariable(body, variable, stamp, checkedMethods); } - else if (statement instanceof PsiYieldStatement) { - final PsiYieldStatement yieldStatement = (PsiYieldStatement)statement; + else if (statement instanceof PsiYieldStatement yieldStatement) { final PsiExpression expression = yieldStatement.getExpression(); return expressionAssignsVariable(expression, variable, stamp, checkedMethods); } @@ -183,8 +166,7 @@ public class UninitializedReadCollector { boolean assigns = false; for (int i = 0; i < statements.length; i++) { final PsiStatement statement = statements[i]; - if (statement instanceof PsiSwitchLabelStatement) { - final PsiSwitchLabelStatement labelStatement = (PsiSwitchLabelStatement)statement; + if (statement instanceof PsiSwitchLabelStatement labelStatement) { if (i == statements.length - 1) { return false; } @@ -223,8 +205,7 @@ public class UninitializedReadCollector { int stamp, @NotNull Set checkedMethods) { final PsiElement[] elements = declarationStatement.getDeclaredElements(); for (PsiElement element : elements) { - if (element instanceof PsiVariable) { - final PsiVariable variableElement = (PsiVariable)element; + if (element instanceof PsiVariable variableElement) { final PsiExpression initializer = variableElement.getInitializer(); if (expressionAssignsVariable(initializer, variable, stamp, checkedMethods)) { return true; @@ -338,20 +319,16 @@ public class UninitializedReadCollector { expression instanceof PsiLambdaExpression) { return false; } - else if (expression instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; + else if (expression instanceof PsiReferenceExpression referenceExpression) { return referenceExpressionAssignsVariable(referenceExpression, variable, stamp, checkedMethods); } - else if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression callExpression = (PsiMethodCallExpression)expression; + else if (expression instanceof PsiMethodCallExpression callExpression) { return methodCallAssignsVariable(callExpression, variable, stamp, checkedMethods); } - else if (expression instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)expression; + else if (expression instanceof PsiNewExpression newExpression) { return newExpressionAssignsVariable(newExpression, variable, stamp, checkedMethods); } - else if (expression instanceof PsiArrayInitializerExpression) { - final PsiArrayInitializerExpression array = (PsiArrayInitializerExpression)expression; + else if (expression instanceof PsiArrayInitializerExpression array) { final PsiExpression[] initializers = array.getInitializers(); for (final PsiExpression initializer : initializers) { if (expressionAssignsVariable(initializer, variable, stamp, checkedMethods)) { @@ -360,25 +337,21 @@ public class UninitializedReadCollector { } return false; } - else if (expression instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCast = (PsiTypeCastExpression)expression; + else if (expression instanceof PsiTypeCastExpression typeCast) { final PsiExpression operand = typeCast.getOperand(); return expressionAssignsVariable(operand, variable, stamp, checkedMethods); } - else if (expression instanceof PsiArrayAccessExpression) { - final PsiArrayAccessExpression accessExpression = (PsiArrayAccessExpression)expression; + else if (expression instanceof PsiArrayAccessExpression accessExpression) { final PsiExpression arrayExpression = accessExpression.getArrayExpression(); final PsiExpression indexExpression = accessExpression.getIndexExpression(); return expressionAssignsVariable(arrayExpression, variable, stamp, checkedMethods) || expressionAssignsVariable(indexExpression, variable, stamp, checkedMethods); } - else if (expression instanceof PsiUnaryExpression) { - final PsiUnaryExpression unaryExpression = (PsiUnaryExpression)expression; + else if (expression instanceof PsiUnaryExpression unaryExpression) { final PsiExpression operand = unaryExpression.getOperand(); return expressionAssignsVariable(operand, variable, stamp, checkedMethods); } - else if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + else if (expression instanceof PsiPolyadicExpression polyadicExpression) { final PsiExpression[] operands = polyadicExpression.getOperands(); for (PsiExpression operand : operands) { if (expressionAssignsVariable(operand, variable, stamp, checkedMethods)) { @@ -387,8 +360,7 @@ public class UninitializedReadCollector { } return false; } - else if (expression instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditional = (PsiConditionalExpression)expression; + else if (expression instanceof PsiConditionalExpression conditional) { final PsiExpression condition = conditional.getCondition(); if (expressionAssignsVariable(condition, variable, stamp, checkedMethods)) { return true; @@ -398,22 +370,18 @@ public class UninitializedReadCollector { return expressionAssignsVariable(thenExpression, variable, stamp, checkedMethods) && expressionAssignsVariable(elseExpression, variable, stamp, checkedMethods); } - else if (expression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignment = (PsiAssignmentExpression)expression; + else if (expression instanceof PsiAssignmentExpression assignment) { return assignmentExpressionAssignsVariable(assignment, variable, stamp, checkedMethods); } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { final PsiExpression innerExpression = parenthesizedExpression.getExpression(); return expressionAssignsVariable(innerExpression, variable, stamp, checkedMethods); } - else if (expression instanceof PsiInstanceOfExpression) { - final PsiInstanceOfExpression instanceOfExpression = (PsiInstanceOfExpression)expression; + else if (expression instanceof PsiInstanceOfExpression instanceOfExpression) { final PsiExpression operand = instanceOfExpression.getOperand(); return expressionAssignsVariable(operand, variable, stamp, checkedMethods); } - else if (expression instanceof PsiSwitchExpression) { - final PsiSwitchExpression switchExpression = (PsiSwitchExpression)expression; + else if (expression instanceof PsiSwitchExpression switchExpression) { return switchBlockAssignsVariable(switchExpression, variable, stamp, checkedMethods); } else { @@ -448,8 +416,7 @@ public class UninitializedReadCollector { } if (variable.equals(referenceExpression.resolve())) { final PsiElement parent = ParenthesesUtils.getParentSkipParentheses(referenceExpression); - if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + if (parent instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression rhs = assignmentExpression.getRExpression(); if (rhs != null && rhs.equals(referenceExpression)) { checkReferenceExpression(referenceExpression, variable, qualifierExpression); @@ -468,8 +435,7 @@ public class UninitializedReadCollector { uninitializedReads.add(referenceExpression); counter++; } - else if (variable.hasModifierProperty(PsiModifier.STATIC) && qualifierExpression instanceof PsiReferenceExpression) { - final PsiReferenceExpression reference = (PsiReferenceExpression)qualifierExpression; + else if (variable.hasModifierProperty(PsiModifier.STATIC) && qualifierExpression instanceof PsiReferenceExpression reference) { final PsiElement target = reference.resolve(); if (target instanceof PsiClass) { if (target.equals(PsiTreeUtil.getParentOfType(variable, PsiClass.class))) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableAccessUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableAccessUtils.java index 046cd5bba242..bb5df86d8139 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableAccessUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableAccessUtils.java @@ -212,38 +212,33 @@ public final class VariableAccessUtils { if (expression == null) { return false; } - if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { final PsiExpression containedExpression = parenthesizedExpression.getExpression(); return mayEvaluateToVariable(containedExpression, variable, builderPattern); } - if (expression instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression typeCastExpression = (PsiTypeCastExpression)expression; + if (expression instanceof PsiTypeCastExpression typeCastExpression) { final PsiExpression containedExpression = typeCastExpression.getOperand(); return mayEvaluateToVariable(containedExpression, variable, builderPattern); } - if (expression instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditional = (PsiConditionalExpression)expression; + if (expression instanceof PsiConditionalExpression conditional) { final PsiExpression thenExpression = conditional.getThenExpression(); final PsiExpression elseExpression = conditional.getElseExpression(); return mayEvaluateToVariable(thenExpression, variable, builderPattern) || mayEvaluateToVariable(elseExpression, variable, builderPattern); } - if (expression instanceof PsiArrayAccessExpression) { + if (expression instanceof PsiArrayAccessExpression arrayAccessExpression) { final PsiElement parent = expression.getParent(); if (parent instanceof PsiArrayAccessExpression) { return false; } final PsiType type = variable.getType(); - if (!(type instanceof PsiArrayType)) { + if (!(type instanceof PsiArrayType arrayType)) { return false; } - final PsiArrayType arrayType = (PsiArrayType)type; final int dimensions = arrayType.getArrayDimensions(); if (dimensions <= 1) { return false; } - PsiArrayAccessExpression arrayAccessExpression = (PsiArrayAccessExpression)expression; PsiExpression arrayExpression = arrayAccessExpression.getArrayExpression(); int count = 1; while (arrayExpression instanceof PsiArrayAccessExpression) { @@ -253,8 +248,7 @@ public final class VariableAccessUtils { } return count != dimensions && mayEvaluateToVariable(arrayExpression, variable, builderPattern); } - if (builderPattern && expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + if (builderPattern && expression instanceof PsiMethodCallExpression methodCallExpression) { final PsiMethod method = methodCallExpression.resolveMethod(); if (method == null) { return false; @@ -298,16 +292,12 @@ public final class VariableAccessUtils { private static boolean variableIsIncrementedOrDecremented(@NotNull PsiVariable variable, @Nullable PsiStatement statement, boolean incremented) { - if (!(statement instanceof PsiExpressionStatement)) { + if (!(statement instanceof PsiExpressionStatement expressionStatement)) { return false; } - final PsiExpressionStatement expressionStatement = - (PsiExpressionStatement)statement; PsiExpression expression = expressionStatement.getExpression(); expression = PsiUtil.skipParenthesizedExprDown(expression); - if (expression instanceof PsiUnaryExpression) { - final PsiUnaryExpression unaryExpression = - (PsiUnaryExpression)expression; + if (expression instanceof PsiUnaryExpression unaryExpression) { final IElementType tokenType = unaryExpression.getOperationTokenType(); if (!tokenType.equals(incremented ? JavaTokenType.PLUSPLUS : JavaTokenType.MINUSMINUS)) { return false; @@ -315,9 +305,7 @@ public final class VariableAccessUtils { final PsiExpression operand = unaryExpression.getOperand(); return ExpressionUtils.isReferenceTo(operand, variable); } - if (expression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = - (PsiAssignmentExpression)expression; + if (expression instanceof PsiAssignmentExpression assignmentExpression) { final IElementType tokenType = assignmentExpression.getOperationTokenType(); final PsiExpression lhs = assignmentExpression.getLExpression(); @@ -327,11 +315,9 @@ public final class VariableAccessUtils { PsiExpression rhs = assignmentExpression.getRExpression(); rhs = PsiUtil.skipParenthesizedExprDown(rhs); if (tokenType == JavaTokenType.EQ) { - if (!(rhs instanceof PsiBinaryExpression)) { + if (!(rhs instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = - (PsiBinaryExpression)rhs; final IElementType binaryTokenType = binaryExpression.getOperationTokenType(); if (binaryTokenType != (incremented ? JavaTokenType.PLUS : JavaTokenType.MINUS)) { @@ -361,10 +347,9 @@ public final class VariableAccessUtils { return false; } final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)target; return variableIsAssignedAtPoint(variable, context, referenceExpression); } @@ -445,10 +430,9 @@ public final class VariableAccessUtils { expression = operand; } } - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression reference)) { return false; } - final PsiReferenceExpression reference = (PsiReferenceExpression)expression; final PsiVariable initialization = ObjectUtils.tryCast(reference.resolve(), PsiVariable.class); if (initialization == null) { return false; @@ -557,8 +541,7 @@ public final class VariableAccessUtils { variableIsAssigned(variable, containingScope, false)) { return true; } - if (!(qualifier instanceof PsiReferenceExpression)) break; - PsiReferenceExpression qualifierReference = (PsiReferenceExpression)qualifier; + if (!(qualifier instanceof PsiReferenceExpression qualifierReference)) break; qualifier = PsiUtil.skipParenthesizedExprDown(qualifierReference.getQualifierExpression()); variable = ObjectUtils.tryCast(qualifierReference.resolve(), PsiVariable.class); } @@ -588,10 +571,9 @@ public final class VariableAccessUtils { @NotNull PsiReferenceExpression expression) { super.visitReferenceExpression(expression); final PsiElement target = expression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return; } - final PsiVariable variable = (PsiVariable)target; usedVariables.add(variable); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableUsedInInnerClassVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableUsedInInnerClassVisitor.java index d7b5f5cf7b91..ed9b87e34757 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableUsedInInnerClassVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableUsedInInnerClassVisitor.java @@ -38,8 +38,7 @@ class VariableUsedInInnerClassVisitor extends JavaRecursiveElementWalkingVisitor public void visitJavaToken(@NotNull PsiJavaToken token) { super.visitJavaToken(token); final PsiElement parent = token.getParent(); - if (parent instanceof PsiClass) { - final PsiClass aClass = (PsiClass)parent; + if (parent instanceof PsiClass aClass) { // have to be that complex because anonymous class argument list should not be treated as insideInner if (token.getTokenType() == JavaTokenType.LBRACE && aClass.getLBrace() == token) { inInnerClassCount++; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/WeakestTypeFinder.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/WeakestTypeFinder.java index 46af76854d59..ce6b57871756 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/WeakestTypeFinder.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/WeakestTypeFinder.java @@ -40,8 +40,7 @@ public final class WeakestTypeFinder { final PsiVariable variable = (PsiVariable)variableOrMethod; variableOrMethodType = variable.getType(); } - else if (variableOrMethod instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)variableOrMethod; + else if (variableOrMethod instanceof PsiMethod method) { variableOrMethodType = method.getReturnType(); if (PsiTypes.voidType().equals(variableOrMethodType)) { return Collections.emptyList(); @@ -58,13 +57,12 @@ public final class WeakestTypeFinder { final GlobalSearchScope scope = variableOrMethod.getResolveScope(); final JavaPsiFacade facade = JavaPsiFacade.getInstance(variableOrMethod.getProject()); final PsiClass lowerBoundClass; - if (variableOrMethod instanceof PsiResourceVariable) { + if (variableOrMethod instanceof PsiResourceVariable resourceVariable) { lowerBoundClass = facade.findClass(CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE, scope); if (lowerBoundClass == null || variableOrMethodClass.equals(lowerBoundClass)) { return Collections.emptyList(); } weakestTypeClasses.add(lowerBoundClass); - final PsiResourceVariable resourceVariable = (PsiResourceVariable)variableOrMethod; @NonNls final String methodCallText = resourceVariable.getName() + ".close()"; final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)facade.getElementFactory().createExpressionFromText(methodCallText, resourceVariable.getParent()); @@ -95,29 +93,25 @@ public final class WeakestTypeFinder { referenceParent = PsiUtil.skipParenthesizedExprUp(referenceElement.getParent()); } final PsiElement referenceGrandParent = referenceParent.getParent(); - if (referenceElement instanceof PsiMethodReferenceExpression) { - final PsiMethodReferenceExpression methodReferenceExpression = (PsiMethodReferenceExpression)referenceElement; + if (referenceElement instanceof PsiMethodReferenceExpression methodReferenceExpression) { final PsiType type = methodReferenceExpression.getFunctionalInterfaceType(); final PsiType returnType = LambdaUtil.getFunctionalInterfaceReturnType(type); if (!PsiTypes.voidType().equals(returnType) && !checkType(returnType, weakestTypeClasses)) { return Collections.emptyList(); } } else if (referenceParent instanceof PsiExpressionList) { - if (!(referenceGrandParent instanceof PsiMethodCallExpression)) { + if (!(referenceGrandParent instanceof PsiMethodCallExpression methodCallExpression)) { return Collections.emptyList(); } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)referenceGrandParent; if (!findWeakestType(referenceElement, methodCallExpression, useParameterizedTypeForCollectionMethods, weakestTypeClasses)) { return Collections.emptyList(); } } - else if (referenceParent instanceof PsiLambdaExpression) { - final PsiLambdaExpression lambda = (PsiLambdaExpression)referenceParent; + else if (referenceParent instanceof PsiLambdaExpression lambda) { final PsiClassType returnType = ObjectUtils.tryCast(LambdaUtil.getFunctionalInterfaceReturnType(lambda), PsiClassType.class); checkType(returnType, weakestTypeClasses); } - else if (referenceGrandParent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)referenceGrandParent; + else if (referenceGrandParent instanceof PsiMethodCallExpression methodCallExpression) { if (PsiUtil.skipParenthesizedExprUp(methodCallExpression.getParent()) instanceof PsiTypeCastExpression || !findWeakestType(methodCallExpression, weakestTypeClasses)) { return Collections.emptyList(); @@ -127,8 +121,7 @@ public final class WeakestTypeFinder { final PsiClass closeable = facade.findClass(CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE, scope); checkClass(closeable, weakestTypeClasses); } - else if (referenceParent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)referenceParent; + else if (referenceParent instanceof PsiAssignmentExpression assignmentExpression) { if (!findWeakestType(referenceElement, assignmentExpression, useRighthandTypeAsWeakestTypeInAssignments, weakestTypeClasses)) { return Collections.emptyList(); } @@ -139,15 +132,13 @@ public final class WeakestTypeFinder { return Collections.emptyList(); } } - else if (referenceParent instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)referenceParent; + else if (referenceParent instanceof PsiVariable variable) { final PsiType type = variable.getType(); if (!type.isAssignableFrom(variableOrMethodType) || !checkType(type, weakestTypeClasses)) { return Collections.emptyList(); } } - else if (referenceParent instanceof PsiForeachStatement) { - final PsiForeachStatement foreachStatement = (PsiForeachStatement)referenceParent; + else if (referenceParent instanceof PsiForeachStatement foreachStatement) { if (!Comparing.equal(foreachStatement.getIteratedValue(), referenceElement)) { return Collections.emptyList(); } @@ -163,31 +154,26 @@ public final class WeakestTypeFinder { return Collections.emptyList(); } } - else if (referenceParent instanceof PsiReferenceExpression) { + else if (referenceParent instanceof PsiReferenceExpression referenceExpression) { // field access, method call is handled above. - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)referenceParent; final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return Collections.emptyList(); } - final PsiField field = (PsiField)target; final PsiClass containingClass = field.getContainingClass(); checkClass(containingClass, weakestTypeClasses); } - else if (referenceParent instanceof PsiArrayInitializerExpression) { - final PsiArrayInitializerExpression arrayInitializerExpression = (PsiArrayInitializerExpression)referenceParent; + else if (referenceParent instanceof PsiArrayInitializerExpression arrayInitializerExpression) { if (!findWeakestType(arrayInitializerExpression, weakestTypeClasses)) { return Collections.emptyList(); } } - else if (referenceParent instanceof PsiThrowStatement) { - final PsiThrowStatement throwStatement = (PsiThrowStatement)referenceParent; + else if (referenceParent instanceof PsiThrowStatement throwStatement) { if (!findWeakestType(throwStatement, variableOrMethodClass, weakestTypeClasses)) { return Collections.emptyList(); } } - else if (referenceParent instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)referenceParent; + else if (referenceParent instanceof PsiConditionalExpression conditionalExpression) { final PsiExpression condition = conditionalExpression.getCondition(); if (referenceElement.equals(condition)) { return Collections.emptyList(); @@ -197,8 +183,7 @@ public final class WeakestTypeFinder { return Collections.emptyList(); } } - else if (referenceParent instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)referenceParent; + else if (referenceParent instanceof PsiPolyadicExpression polyadicExpression) { final PsiType type = polyadicExpression.getType(); if (TypeUtils.isJavaLangString(type)) { if (ExpressionUtils.hasStringType((PsiExpression)referenceElement)) { @@ -246,8 +231,7 @@ public final class WeakestTypeFinder { // for statement return Collections.emptyList(); } - else if (referenceParent instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)referenceParent; + else if (referenceParent instanceof PsiNewExpression newExpression) { final PsiExpression qualifier = newExpression.getQualifier(); if (qualifier != null) { final PsiClass innerClass = PsiUtil.resolveClassInClassTypeOnly(newExpression.getType()); @@ -325,8 +309,7 @@ public final class WeakestTypeFinder { final PsiExpression qualifier = methodExpression.getQualifierExpression(); if (qualifier != null) { final PsiType qualifierType = qualifier.getType(); - if (qualifierType instanceof PsiClassType) { - final PsiClassType classType = (PsiClassType)qualifierType; + if (qualifierType instanceof PsiClassType classType) { final PsiType[] parameterTypes = classType.getParameters(); if (parameterTypes.length > 0) { final PsiType parameterType = parameterTypes[0]; @@ -373,11 +356,10 @@ public final class WeakestTypeFinder { for (PsiMethod superMethod : superMethods) { ProgressManager.checkCanceled(); final PsiType returnType = superMethod.getReturnType(); - if (expectedType instanceof PsiClassType) { + if (expectedType instanceof PsiClassType expectedClassType) { if (!(returnType instanceof PsiClassType)) { continue; } - final PsiClassType expectedClassType = (PsiClassType)expectedType; if (!expectedClassType.rawType().isAssignableFrom(returnType)) continue; } else if (expectedType != null && returnType != null && !expectedType.isAssignableFrom(returnType)) { @@ -465,10 +447,9 @@ public final class WeakestTypeFinder { private static boolean findWeakestType(PsiArrayInitializerExpression arrayInitializerExpression, Set weakestTypeClasses) { final PsiType type = arrayInitializerExpression.getType(); - if (!(type instanceof PsiArrayType)) { + if (!(type instanceof PsiArrayType arrayType)) { return false; } - final PsiArrayType arrayType = (PsiArrayType)type; final PsiType componentType = arrayType.getComponentType(); return checkType(componentType, weakestTypeClasses); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/redundancy/UnusedLabelInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/redundancy/UnusedLabelInspection.java index d406d8e4edc4..fc8ff377a966 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/redundancy/UnusedLabelInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/redundancy/UnusedLabelInspection.java @@ -64,10 +64,9 @@ public class UnusedLabelInspection extends BaseInspection implements CleanupLoca public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement label = descriptor.getPsiElement(); final PsiElement parent = label.getParent(); - if (!(parent instanceof PsiLabeledStatement)) { + if (!(parent instanceof PsiLabeledStatement labeledStatement)) { return; } - final PsiLabeledStatement labeledStatement = (PsiLabeledStatement)parent; final PsiStatement statement = labeledStatement.getStatement(); if (statement == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/ChannelResourceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/ChannelResourceInspection.java index 70f94e7d2cfd..326eb8897eb2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/ChannelResourceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/ChannelResourceInspection.java @@ -31,10 +31,9 @@ public class ChannelResourceInspection extends ResourceInspection { @Override protected boolean isResourceCreation(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String methodName = methodExpression.getReferenceName(); if (!HardcodedMethodConstants.GET_CHANNEL.equals(methodName)) { @@ -54,21 +53,18 @@ public class ChannelResourceInspection extends ResourceInspection { @Override protected boolean isResourceFactoryClosed(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (!(qualifier instanceof PsiReferenceExpression)) { + if (!(qualifier instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifier; final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)target; PsiTryStatement tryStatement = PsiTreeUtil.getParentOfType(expression, PsiTryStatement.class, true, PsiMember.class); if (tryStatement == null) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/HibernateResourceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/HibernateResourceInspection.java index 75f899cc154c..718321348f48 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/HibernateResourceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/HibernateResourceInspection.java @@ -32,10 +32,9 @@ public class HibernateResourceInspection extends ResourceInspection { @Override protected boolean isResourceCreation(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String methodName = methodExpression.getReferenceName(); if (!HardcodedMethodConstants.OPEN_SESSION.equals(methodName)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/JDBCResourceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/JDBCResourceInspection.java index 8466f4c6a4d2..ca7a9e877be7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/JDBCResourceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/JDBCResourceInspection.java @@ -66,10 +66,9 @@ public class JDBCResourceInspection extends ResourceInspection { @Override protected boolean isResourceCreation(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String name = methodExpression.getReferenceName(); if (name == null || !creationMethodNameSet.contains(name)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/JNDIResourceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/JNDIResourceInspection.java index 38926cf11d81..cd839e07559e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/JNDIResourceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/JNDIResourceInspection.java @@ -33,8 +33,7 @@ public class JNDIResourceInspection extends ResourceInspection { @Override protected boolean isResourceCreation(PsiExpression expression) { - if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); @NonNls final String methodName = methodExpression.getReferenceName(); if ("list".equals(methodName) || "listBindings".equals(methodName)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/ResourceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/ResourceInspection.java index b4539fd5ccaf..994394e391cc 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/ResourceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/ResourceInspection.java @@ -139,13 +139,11 @@ public abstract class ResourceInspection extends BaseInspection { @Nullable public static PsiVariable getVariable(@NotNull PsiExpression expression) { final PsiElement parent = getParent(expression); - if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignment = (PsiAssignmentExpression)parent; + if (parent instanceof PsiAssignmentExpression assignment) { final PsiExpression lhs = assignment.getLExpression(); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return null; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; final PsiElement referent = referenceExpression.resolve(); if (!(referent instanceof PsiVariable)) { return null; @@ -171,8 +169,7 @@ public abstract class ResourceInspection extends BaseInspection { if (type == null) { return null; } - while (parent instanceof PsiReferenceExpression && grandParent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; + while (parent instanceof PsiReferenceExpression && grandParent instanceof PsiMethodCallExpression methodCallExpression) { if (!type.equals(methodCallExpression.getType())) { return null; } @@ -259,29 +256,24 @@ public abstract class ResourceInspection extends BaseInspection { } private boolean isResourceClose(PsiStatement statement, PsiVariable variable) { - if (statement instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; + if (statement instanceof PsiExpressionStatement expressionStatement) { final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; return isResourceClose(methodCallExpression, variable); } - if (statement instanceof PsiTryStatement) { - final PsiTryStatement tryStatement = (PsiTryStatement)statement; + if (statement instanceof PsiTryStatement tryStatement) { final PsiCodeBlock tryBlock = tryStatement.getTryBlock(); if (isResourceClose(ControlFlowUtils.getFirstStatementInBlock(tryBlock), variable)) { return true; } } - else if (statement instanceof PsiIfStatement) { - final PsiIfStatement ifStatement = (PsiIfStatement)statement; + else if (statement instanceof PsiIfStatement ifStatement) { final PsiExpression condition = ifStatement.getCondition(); - if (!(condition instanceof PsiBinaryExpression)) { + if (!(condition instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)condition; final IElementType tokenType = binaryExpression.getOperationTokenType(); if (JavaTokenType.NE != tokenType) { return false; @@ -292,20 +284,18 @@ public abstract class ResourceInspection extends BaseInspection { return false; } if (PsiTypes.nullType().equals(lhs.getType())) { - if (!(rhs instanceof PsiReferenceExpression)) { + if (!(rhs instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)rhs; final PsiElement target = referenceExpression.resolve(); if (!variable.equals(target)) { return false; } } else if (PsiTypes.nullType().equals(rhs.getType())) { - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; final PsiElement target = referenceExpression.resolve(); if (!variable.equals(target)) { return false; @@ -314,8 +304,7 @@ public abstract class ResourceInspection extends BaseInspection { final PsiStatement thenBranch = ifStatement.getThenBranch(); return isResourceClose(thenBranch, variable); } - else if (statement instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)statement; + else if (statement instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); return isResourceClose(ControlFlowUtils.getFirstStatementInBlock(codeBlock), variable); } @@ -333,8 +322,7 @@ public abstract class ResourceInspection extends BaseInspection { } if (resourcePotentiallyCreatedFromOther(resourceCreationExpression)) return true; final PsiElement parent = ExpressionUtils.getPassThroughParent(resourceCreationExpression); - if (parent instanceof PsiLambdaExpression) { - PsiLambdaExpression lambda = (PsiLambdaExpression)parent; + if (parent instanceof PsiLambdaExpression lambda) { PsiType returnType = LambdaUtil.getFunctionalInterfaceReturnType(lambda); if (!PsiTypes.voidType().equals(returnType)) { return true; @@ -343,8 +331,7 @@ public abstract class ResourceInspection extends BaseInspection { if (parent instanceof PsiReturnStatement) { return true; } - if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + if (parent instanceof PsiAssignmentExpression assignmentExpression) { if (PsiUtil.skipParenthesizedExprDown(assignmentExpression.getRExpression()) != resourceCreationExpression) { return true; // non-sensical code } @@ -380,8 +367,7 @@ public abstract class ResourceInspection extends BaseInspection { // resource was created from other, potentially leaking resource return true; } - if (resourceCreationExpression instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)resourceCreationExpression; + if (resourceCreationExpression instanceof PsiMethodCallExpression call) { PsiExpression qualifier = call.getMethodExpression().getQualifierExpression(); if (qualifier != null && isResourceCreation(qualifier)) { return true; @@ -393,26 +379,22 @@ public abstract class ResourceInspection extends BaseInspection { private static boolean assignedToField(PsiAssignmentExpression assignmentExpression) { final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression()); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; final PsiElement target = referenceExpression.resolve(); return target instanceof PsiField; } private static boolean isSystemErrOrOutUse(PsiExpression resourceCreationExpression) { - if (!(resourceCreationExpression instanceof PsiMethodCallExpression)) { + if (!(resourceCreationExpression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)resourceCreationExpression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); - if (qualifierExpression instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifierExpression; + if (qualifierExpression instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); - if (target instanceof PsiField) { - final PsiField field = (PsiField)target; + if (target instanceof PsiField field) { final String fieldName = field.getName(); if ("out".equals(fieldName) || "err".equals(fieldName)) { final PsiClass containingClass = field.getContainingClass(); @@ -467,19 +449,17 @@ public abstract class ResourceInspection extends BaseInspection { return; } final PsiElement parent = referenceExpression.getParent(); - if (!(parent instanceof PsiExpressionList)) { + if (!(parent instanceof PsiExpressionList argumentList)) { return; } - final PsiExpressionList argumentList = (PsiExpressionList)parent; final PsiExpression[] arguments = argumentList.getExpressions(); if (arguments.length != 1) { return; } final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String methodName = methodExpression.getReferenceName(); if (methodName == null || !methodName.contains(HardcodedMethodConstants.CLOSE)) { @@ -528,10 +508,9 @@ public abstract class ResourceInspection extends BaseInspection { public void visitReturnStatement(@NotNull PsiReturnStatement statement) { super.visitReturnStatement(statement); final PsiExpression value = PsiUtil.deparenthesizeExpression(statement.getReturnValue()); - if (!(value instanceof PsiReferenceExpression)) { + if (!(value instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)value; final PsiElement target = referenceExpression.resolve(); if (boundVariable.equals(target)) { escaped = true; @@ -542,19 +521,17 @@ public abstract class ResourceInspection extends BaseInspection { public void visitAssignmentExpression(@NotNull PsiAssignmentExpression expression) { super.visitAssignmentExpression(expression); final PsiExpression rhs = PsiUtil.deparenthesizeExpression(expression.getRExpression()); - if (!(rhs instanceof PsiReferenceExpression)) { + if (!(rhs instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)rhs; final PsiElement target = referenceExpression.resolve(); if (!boundVariable.equals(target)) { return; } final PsiExpression lhs = PsiUtil.deparenthesizeExpression(expression.getLExpression()); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression lReferenceExpression)) { return; } - final PsiReferenceExpression lReferenceExpression = (PsiReferenceExpression)lhs; final PsiElement lTarget = lReferenceExpression.resolve(); if (lTarget instanceof PsiField) { escaped = true; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/SocketResourceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/SocketResourceInspection.java index ae58a979aad3..0ca72602d2de 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/SocketResourceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/resources/SocketResourceInspection.java @@ -33,8 +33,7 @@ public class SocketResourceInspection extends ResourceInspection { @Override protected boolean isResourceCreation(PsiExpression expression) { - if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); @NonNls final String methodName = methodExpression.getReferenceName(); if (!"accept".equals(methodName)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/UnsecureRandomNumberGenerationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/UnsecureRandomNumberGenerationInspection.java index 71b17d536a76..ef090e135179 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/UnsecureRandomNumberGenerationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/UnsecureRandomNumberGenerationInspection.java @@ -62,10 +62,9 @@ public class UnsecureRandomNumberGenerationInspection return; } final PsiElement element = reference.resolve(); - if (!(element instanceof PsiClass)) { + if (!(element instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)element; if (!InheritanceUtil.isInheritor(aClass, "java.util.Random")) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java index ef1f4213f49a..ef05087c1162 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java @@ -63,10 +63,9 @@ public class SerialVersionUIDNotStaticFinalInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiField)) { + if (!(parent instanceof PsiField field)) { return; } - final PsiField field = (PsiField)parent; final PsiModifierList modifierList = field.getModifierList(); if (modifierList == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableStoresNonSerializableInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableStoresNonSerializableInspection.java index 4869b6eb25e1..3e4d755fd2e7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableStoresNonSerializableInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableStoresNonSerializableInspection.java @@ -35,8 +35,7 @@ public class SerializableStoresNonSerializableInspection extends BaseInspection protected String buildErrorString(Object... infos) { final PsiElement classOrLambda = (PsiElement)infos[0]; final PsiType type = (PsiType)infos[1]; - if (classOrLambda instanceof PsiClass) { - final PsiClass aClass = (PsiClass)classOrLambda; + if (classOrLambda instanceof PsiClass aClass) { if (aClass instanceof PsiAnonymousClass) { return InspectionGadgetsBundle.message("serializable.anonymous.class.stores.non.serializable.problem.descriptor", type.getPresentableText()); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java index ee4088e15527..9a0debd67629 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java @@ -115,8 +115,7 @@ public class CStyleArrayDeclarationInspection extends BaseInspection implements PsiJavaToken first = null; PsiJavaToken last = null; while (!(child instanceof PsiCodeBlock)) { - if (child instanceof PsiJavaToken) { - final PsiJavaToken token = (PsiJavaToken)child; + if (child instanceof PsiJavaToken token) { final IElementType tokenType = token.getTokenType(); if (JavaTokenType.LBRACKET.equals(tokenType) || JavaTokenType.RBRACKET.equals(tokenType)) { if (first == null) first = token; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java index 3b03624a9be5..e100677af5dd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java @@ -64,19 +64,17 @@ public class CallToStringConcatCanBeReplacedByOperatorInspection extends BaseIns protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiReferenceExpression)) { + if (!(parent instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)parent; final PsiExpression qualifier = referenceExpression.getQualifierExpression(); if (qualifier == null) { return; } final PsiElement grandParent = referenceExpression.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); if (arguments.length != 1) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantExpressionInspection.java index 85d3be83fb3f..6f3d0b6783e2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantExpressionInspection.java @@ -101,8 +101,7 @@ public class ConstantExpressionInspection extends AbstractBaseJavaLocalInspectio private static String getValueText(Object value) { @NonNls final String newExpression; - if (value instanceof String) { - final String string = (String)value; + if (value instanceof String string) { newExpression = '"' + StringUtil.escapeStringCharacters(string) + '"'; } else if (value instanceof Character) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java index 4176373d1e6d..954848a40f71 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java @@ -62,10 +62,9 @@ public class ConstantOnWrongSideOfComparisonInspection extends BaseInspection im @Override public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent(); - if (!(element instanceof PsiBinaryExpression)) { + if (!(element instanceof PsiBinaryExpression expression)) { return; } - final PsiBinaryExpression expression = (PsiBinaryExpression)element; final PsiExpression rhs = expression.getROperand(); if (rhs == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java index bd636ec0dfaf..9f795cf4d154 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java @@ -84,12 +84,10 @@ public class ControlFlowStatementWithoutBracesInspection extends BaseInspection return; } final PsiStatement statementWithoutBraces; - if (statement instanceof PsiLoopStatement) { - final PsiLoopStatement loopStatement = (PsiLoopStatement)statement; + if (statement instanceof PsiLoopStatement loopStatement) { statementWithoutBraces = loopStatement.getBody(); } - else if (statement instanceof PsiIfStatement) { - final PsiIfStatement ifStatement = (PsiIfStatement)statement; + else if (statement instanceof PsiIfStatement ifStatement) { statementWithoutBraces = (element == ifStatement.getElseElement()) ? ifStatement.getElseBranch() : ifStatement.getThenBranch(); } else { @@ -114,8 +112,7 @@ public class ControlFlowStatementWithoutBracesInspection extends BaseInspection protected boolean isApplicable(PsiStatement body) { if (body instanceof PsiIfStatement && isVisibleHighlight(body)) { final PsiElement parent = body.getParent(); - if (parent instanceof PsiIfStatement) { - final PsiIfStatement ifStatement = (PsiIfStatement)parent; + if (parent instanceof PsiIfStatement ifStatement) { if (ifStatement.getElseBranch() == body) { return false; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java index 73f0a08fb974..3634b2c792b3 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java @@ -67,10 +67,9 @@ public class ImplicitCallToSuperInspection extends BaseInspection { public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement methodName = descriptor.getPsiElement(); final PsiElement parent = methodName.getParent(); - if (!(parent instanceof PsiMethod)) { + if (!(parent instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)parent; final PsiCodeBlock body = method.getBody(); final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project); @@ -129,11 +128,9 @@ public class ImplicitCallToSuperInspection extends BaseInspection { } private boolean isConstructorCall(PsiStatement statement) { - if (!(statement instanceof PsiExpressionStatement)) { + if (!(statement instanceof PsiExpressionStatement expressionStatement)) { return false; } - final PsiExpressionStatement expressionStatement = - (PsiExpressionStatement)statement; final PsiExpression expression = expressionStatement.getExpression(); return JavaPsiConstructorUtil.isConstructorCall(expression); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java index d9b9127014b7..d083bc92c0e4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java @@ -170,10 +170,9 @@ public class ListIndexOfReplaceableByContainsInspection extends BaseInspection i } final Object object = ExpressionUtils.computeConstantExpression(rhs); - if (!(object instanceof Integer)) { + if (!(object instanceof Integer integer)) { return false; } - final Integer integer = (Integer)object; final int constant = integer.intValue(); if (flipped) { if (constant == -1 && (JavaTokenType.NE.equals(tokenType) || diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/MissortedModifiersInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/MissortedModifiersInspection.java index 721212ea1bb1..cf5a48bfc1e3 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/MissortedModifiersInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/MissortedModifiersInspection.java @@ -170,8 +170,7 @@ public class MissortedModifiersInspection extends BaseInspection implements Clea if (child instanceof PsiJavaToken) { modifiers.add(child.getText()); } - else if (child instanceof PsiAnnotation) { - final PsiAnnotation annotation = (PsiAnnotation)child; + else if (child instanceof PsiAnnotation annotation) { if (PsiImplUtil.isTypeAnnotation(child) && !isMethodWithVoidReturnType(modifierList.getParent())) { final PsiAnnotation.TargetType[] targets = AnnotationTargetUtil.getTargetsForLocation(annotation.getOwner()); if (typeUseWithType || !modifiers.isEmpty() || @@ -270,8 +269,7 @@ public class MissortedModifiersInspection extends BaseInspection implements Clea } modifiers.add(child); } - if (child instanceof PsiAnnotation) { - final PsiAnnotation annotation = (PsiAnnotation)child; + if (child instanceof PsiAnnotation annotation) { if (m_requireAnnotationsFirst) { if (AnnotationTargetUtil.isTypeAnnotation(annotation) && !isMethodWithVoidReturnType(modifierList.getParent())) { // type annotations go next to the type diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantEscapeInRegexReplacementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantEscapeInRegexReplacementInspection.java index be1d3c612184..946ddb6b90f6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantEscapeInRegexReplacementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantEscapeInRegexReplacementInspection.java @@ -45,10 +45,9 @@ public class RedundantEscapeInRegexReplacementInspection extends BaseInspection final PsiExpression[] arguments = expression.getArgumentList().getExpressions(); final PsiExpression lastArgument = arguments[arguments.length - 1]; final Object value = ExpressionUtils.computeConstantExpression(lastArgument); - if (!(value instanceof String)) { + if (!(value instanceof String string)) { return; } - final String string = (String)value; boolean escaped = false; for (int i = 0, length = string.length(); i < length; i++) { char c = string.charAt(i); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantImplementsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantImplementsInspection.java index d6b4a4ff9fd5..0facf25b94f4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantImplementsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantImplementsInspection.java @@ -143,10 +143,9 @@ public class RedundantImplementsInspection extends BaseInspection implements Cle PsiJavaCodeReferenceElement extendsElement, PsiJavaCodeReferenceElement[] implementsElements) { final PsiElement target = implementsElement.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass implementedClass)) { return; } - final PsiClass implementedClass = (PsiClass)target; if (!implementedClass.isInterface()) { return; } @@ -163,10 +162,9 @@ public class RedundantImplementsInspection extends BaseInspection implements Cle } if (extendsElement != null) { final PsiElement extendsReferent = extendsElement.resolve(); - if (!(extendsReferent instanceof PsiClass)) { + if (!(extendsReferent instanceof PsiClass extendedClass)) { return; } - final PsiClass extendedClass = (PsiClass)extendsReferent; if (extendedClass.isInheritor(implementedClass, true)) { registerError(implementsElement); return; @@ -178,11 +176,9 @@ public class RedundantImplementsInspection extends BaseInspection implements Cle } final PsiElement implementsReferent = testImplementElement.resolve(); - if (!(implementsReferent instanceof PsiClass)) { + if (!(implementsReferent instanceof PsiClass testImplementedClass)) { continue; } - final PsiClass testImplementedClass = - (PsiClass)implementsReferent; if (testImplementedClass.isInheritor(implementedClass, true)) { registerError(implementsElement); return; @@ -192,10 +188,9 @@ public class RedundantImplementsInspection extends BaseInspection implements Cle private void checkExtendedInterface(PsiJavaCodeReferenceElement extendsElement, PsiJavaCodeReferenceElement[] extendsElements) { final PsiElement target = extendsElement.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass extendedInterface)) { return; } - final PsiClass extendedInterface = (PsiClass)target; if (!extendedInterface.isInterface()) { return; } @@ -205,11 +200,9 @@ public class RedundantImplementsInspection extends BaseInspection implements Cle } final PsiElement implementsReferent = testExtendsElement.resolve(); - if (!(implementsReferent instanceof PsiClass)) { + if (!(implementsReferent instanceof PsiClass testExtendedInterface)) { continue; } - final PsiClass testExtendedInterface = - (PsiClass)implementsReferent; if (testExtendedInterface.isInheritor(extendedInterface, true)) { registerError(extendsElement); return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java index 41791c7a9f4f..1674aa9f47dc 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java @@ -112,8 +112,7 @@ public class SimplifiableAnnotationInspection extends BaseInspection implements private static void buildAttributeValueText(PsiAnnotationMemberValue value, StringBuilder out, CommentTracker tracker) { - if (value instanceof PsiArrayInitializerMemberValue) { - final PsiArrayInitializerMemberValue arrayValue = (PsiArrayInitializerMemberValue)value; + if (value instanceof PsiArrayInitializerMemberValue arrayValue) { final PsiAnnotationMemberValue[] initializers = arrayValue.getInitializers(); if (initializers.length == 1) { out.append(tracker.text(initializers[0])); @@ -164,10 +163,9 @@ public class SimplifiableAnnotationInspection extends BaseInspection implements Boolean.FALSE); } } - if (!(attributeValue instanceof PsiArrayInitializerMemberValue)) { + if (!(attributeValue instanceof PsiArrayInitializerMemberValue arrayValue)) { return; } - final PsiArrayInitializerMemberValue arrayValue = (PsiArrayInitializerMemberValue)attributeValue; final PsiAnnotationMemberValue[] initializers = arrayValue.getInitializers(); if (initializers.length != 1) { return; @@ -180,10 +178,9 @@ public class SimplifiableAnnotationInspection extends BaseInspection implements else { for (PsiNameValuePair attribute : attributes) { final PsiAnnotationMemberValue value = attribute.getValue(); - if (!(value instanceof PsiArrayInitializerMemberValue)) { + if (!(value instanceof PsiArrayInitializerMemberValue arrayValue)) { continue; } - final PsiArrayInitializerMemberValue arrayValue = (PsiArrayInitializerMemberValue)value; final PsiAnnotationMemberValue[] initializers = arrayValue.getInitializers(); if (initializers.length != 1) { continue; @@ -233,10 +230,9 @@ public class SimplifiableAnnotationInspection extends BaseInspection implements } for (PsiMethod method : aClass.getMethods()) { - if (!(method instanceof PsiAnnotationMethod)) { + if (!(method instanceof PsiAnnotationMethod annotationMethod)) { continue; } - final PsiAnnotationMethod annotationMethod = (PsiAnnotationMethod)method; if (annotationMethod.getDefaultValue() == null && !names.contains(annotationMethod.getName())) { return true; // missing a required argument } @@ -274,8 +270,7 @@ public class SimplifiableAnnotationInspection extends BaseInspection implements if (value instanceof PsiArrayInitializerMemberValue) { return expectedType instanceof PsiArrayType; } - if (value instanceof PsiExpression) { - final PsiExpression expression = (PsiExpression)value; + if (value instanceof PsiExpression expression) { return expression.getType() != null && TypeConversionUtil.areTypesAssignmentCompatible(expectedType, expression) || expectedType instanceof PsiArrayType && TypeConversionUtil.areTypesAssignmentCompatible(((PsiArrayType)expectedType).getComponentType(), expression); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SingleStatementInBlockInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SingleStatementInBlockInspection.java index 876e7f6afe7e..8429b1f7a77b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SingleStatementInBlockInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SingleStatementInBlockInspection.java @@ -104,8 +104,7 @@ public class SingleStatementInBlockInspection extends BaseInspection implements private static boolean hasPotentialDanglingElse(@NotNull PsiStatement statement) { final PsiElement parent = statement.getParent(); - if (parent instanceof PsiIfStatement) { - final PsiIfStatement ifStatement = (PsiIfStatement)parent; + if (parent instanceof PsiIfStatement ifStatement) { if (ifStatement.getThenBranch() == statement && ifStatement.getElseBranch() != null) { return true; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java index 0d43dadbd698..327868d70144 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java @@ -86,9 +86,7 @@ public class TypeParameterExtendsObjectInspection extends BaseInspection { public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement identifier = descriptor.getPsiElement(); final PsiElement parent = identifier.getParent(); - if (parent instanceof PsiTypeParameter) { - final PsiTypeParameter typeParameter = - (PsiTypeParameter)parent; + if (parent instanceof PsiTypeParameter typeParameter) { final PsiReferenceList extendsList = typeParameter.getExtendsList(); final PsiJavaCodeReferenceElement[] referenceElements = @@ -102,8 +100,7 @@ public class TypeParameterExtendsObjectInspection extends BaseInspection { final PsiTypeElement typeElement = (PsiTypeElement)parent; PsiElement child = typeElement.getLastChild(); while (child != null) { - if (child instanceof PsiJavaToken) { - final PsiJavaToken javaToken = (PsiJavaToken)child; + if (child instanceof PsiJavaToken javaToken) { final IElementType tokenType = javaToken.getTokenType(); if (tokenType == JavaTokenType.QUEST) { return; @@ -153,10 +150,9 @@ public class TypeParameterExtendsObjectInspection extends BaseInspection { return; } final PsiType type = typeElement.getType(); - if (!(type instanceof PsiWildcardType)) { + if (!(type instanceof PsiWildcardType wildcardType)) { return; } - final PsiWildcardType wildcardType = (PsiWildcardType)type; if (!wildcardType.isExtends()) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnclearBinaryExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnclearBinaryExpressionInspection.java index b60d85287faa..cd327823c388 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnclearBinaryExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnclearBinaryExpressionInspection.java @@ -95,16 +95,14 @@ public class UnclearBinaryExpressionInspection extends BaseInspection implements @Contract("null, _ -> false") public static boolean isUnclearExpression(PsiExpression expression, PsiElement parent) { - if (expression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; + if (expression instanceof PsiAssignmentExpression assignmentExpression) { final IElementType tokenType = assignmentExpression.getOperationTokenType(); if (parent instanceof PsiVariable) { if (!tokenType.equals(JavaTokenType.EQ)) { return true; } } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression nestedAssignment = (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression nestedAssignment) { final IElementType nestedTokenType = nestedAssignment.getOperationTokenType(); if (!tokenType.equals(nestedTokenType)) { return true; @@ -112,8 +110,7 @@ public class UnclearBinaryExpressionInspection extends BaseInspection implements } return isUnclearExpression(assignmentExpression.getRExpression(), assignmentExpression); } - else if (expression instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)expression; + else if (expression instanceof PsiConditionalExpression conditionalExpression) { if (PsiUtilCore.hasErrorElementChild(expression)) { return false; } @@ -122,12 +119,11 @@ public class UnclearBinaryExpressionInspection extends BaseInspection implements isUnclearExpression(conditionalExpression.getThenExpression(), conditionalExpression) || isUnclearExpression(conditionalExpression.getElseExpression(), conditionalExpression); } - else if (expression instanceof PsiPolyadicExpression) { + else if (expression instanceof PsiPolyadicExpression polyadicExpression) { if ((parent instanceof PsiConditionalExpression) || (parent instanceof PsiPolyadicExpression) || (parent instanceof PsiInstanceOfExpression)) { return true; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; for (PsiExpression operand : polyadicExpression.getOperands()) { final PsiType type = operand.getType(); if ((type == null) || type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { @@ -138,15 +134,13 @@ public class UnclearBinaryExpressionInspection extends BaseInspection implements } } } - else if (expression instanceof PsiInstanceOfExpression) { + else if (expression instanceof PsiInstanceOfExpression instanceOfExpression) { if ((parent instanceof PsiPolyadicExpression) || (parent instanceof PsiConditionalExpression)) { return true; } - final PsiInstanceOfExpression instanceOfExpression = (PsiInstanceOfExpression)expression; return isUnclearExpression(instanceOfExpression.getOperand(), instanceOfExpression); } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { final PsiExpression nestedExpression = parenthesizedExpression.getExpression(); return isUnclearExpression(nestedExpression, parenthesizedExpression); } @@ -154,17 +148,15 @@ public class UnclearBinaryExpressionInspection extends BaseInspection implements } public static void replaceElement(PsiElement element) { - if (!(element instanceof PsiExpression)) { + if (!(element instanceof PsiExpression expression)) { return; } - final PsiExpression expression = (PsiExpression)element; final String newExpressionText = createReplacementText(expression, new StringBuilder()).toString(); PsiReplacementUtil.replaceExpression(expression, newExpressionText); } private static StringBuilder createReplacementText(@Nullable PsiExpression expression, StringBuilder out) { - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression polyadicExpression) { final PsiElement parent = expression.getParent(); final boolean parentheses = (parent instanceof PsiConditionalExpression) || (parent instanceof PsiInstanceOfExpression) || @@ -173,8 +165,7 @@ public class UnclearBinaryExpressionInspection extends BaseInspection implements } else if (expression instanceof PsiParenthesizedExpression) { for (PsiElement child = expression.getFirstChild(); child != null; child = child.getNextSibling()) { - if (child instanceof PsiExpression) { - final PsiExpression unwrappedExpression = (PsiExpression)child; + if (child instanceof PsiExpression unwrappedExpression) { createReplacementText(unwrappedExpression, out); } else { @@ -193,8 +184,7 @@ public class UnclearBinaryExpressionInspection extends BaseInspection implements (parent instanceof PsiInstanceOfExpression); appendText(expression, parentheses, out); } - else if (expression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; + else if (expression instanceof PsiAssignmentExpression assignmentExpression) { final PsiElement parent = expression.getParent(); final boolean parentheses = !isSimpleAssignment(assignmentExpression, parent); appendText(assignmentExpression, parentheses, out); @@ -210,8 +200,7 @@ public class UnclearBinaryExpressionInspection extends BaseInspection implements if (parent instanceof PsiExpressionStatement) { return true; } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression parentAssignmentExpression = (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression parentAssignmentExpression) { parentTokenType = parentAssignmentExpression.getOperationTokenType(); } else if (parent instanceof PsiVariable) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java index 272d559b08b0..85f731af059a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java @@ -65,15 +65,13 @@ public class UnnecessarilyQualifiedInnerClassAccessInspection extends BaseInspec protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiJavaCodeReferenceElement)) { + if (!(parent instanceof PsiJavaCodeReferenceElement referenceElement)) { return; } - final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)parent; final PsiElement target = referenceElement.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)target; ImportUtils.addImportIfNeeded(aClass, element); final String shortName = aClass.getName(); if (isReferenceToTarget(shortName, aClass, parent)) { @@ -107,13 +105,12 @@ public class UnnecessarilyQualifiedInnerClassAccessInspection extends BaseInspec public void visitReferenceElement(@NotNull PsiJavaCodeReferenceElement reference) { super.visitReferenceElement(reference); final PsiElement qualifier = reference.getQualifier(); - if (!(qualifier instanceof PsiJavaCodeReferenceElement)) { + if (!(qualifier instanceof PsiJavaCodeReferenceElement referenceElement)) { return; } if (PsiTreeUtil.getParentOfType(reference, PsiImportStatementBase.class, PsiPackageStatement.class) != null) { return; } - final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)qualifier; final PsiReferenceParameterList parameterList = referenceElement.getParameterList(); if (parameterList != null && parameterList.getTypeParameterElements().length > 0) { @@ -137,10 +134,9 @@ public class UnnecessarilyQualifiedInnerClassAccessInspection extends BaseInspec } } final PsiElement target = reference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)target; if (!PsiUtil.isAccessible(aClass, referenceClass, null)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java index 209bb1b3cb3a..8e86efacc4b1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java @@ -130,10 +130,9 @@ public class UnnecessarilyQualifiedStaticUsageInspection extends BaseInspection return false; } final PsiElement qualifierElement = referenceElement.getQualifier(); - if (!(qualifierElement instanceof PsiJavaCodeReferenceElement)) { + if (!(qualifierElement instanceof PsiJavaCodeReferenceElement qualifier)) { return false; } - final PsiJavaCodeReferenceElement qualifier = (PsiJavaCodeReferenceElement)qualifierElement; if (GenericsUtil.isGenericReference(referenceElement, qualifier)) { return false; } @@ -152,11 +151,10 @@ public class UnnecessarilyQualifiedStaticUsageInspection extends BaseInspection return false; } final PsiElement resolvedQualifier = qualifier.resolve(); - if (!(resolvedQualifier instanceof PsiClass)) { + if (!(resolvedQualifier instanceof PsiClass qualifyingClass)) { return false; } final PsiClass containingClass = PsiTreeUtil.getParentOfType(referenceElement, PsiClass.class); - final PsiClass qualifyingClass = (PsiClass)resolvedQualifier; if (containingClass == null || !PsiTreeUtil.isAncestor(qualifyingClass, containingClass, false)) { return false; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java index d59f4a9b2e74..ad97d12bf080 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java @@ -79,10 +79,9 @@ public class UnnecessaryBlockStatementInspection extends BaseInspection implemen public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement leftBrace = descriptor.getPsiElement(); final PsiElement parent = leftBrace.getParent(); - if (!(parent instanceof PsiCodeBlock)) { + if (!(parent instanceof PsiCodeBlock block)) { return; } - final PsiCodeBlock block = (PsiCodeBlock)parent; final PsiElement firstBodyElement = block.getFirstBodyElement(); final PsiElement lastBodyElement = block.getLastBodyElement(); final PsiBlockStatement blockStatement = (PsiBlockStatement)block.getParent(); @@ -106,7 +105,7 @@ public class UnnecessaryBlockStatementInspection extends BaseInspection implemen } } final PsiElement parent = blockStatement.getParent(); - if (!(parent instanceof PsiCodeBlock)) { + if (!(parent instanceof PsiCodeBlock parentBlock)) { return; } final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); @@ -114,7 +113,6 @@ public class UnnecessaryBlockStatementInspection extends BaseInspection implemen if (brace == null) { return; } - final PsiCodeBlock parentBlock = (PsiCodeBlock)parent; if (parentBlock.getStatementCount() > 1 && BlockUtils.containsConflictingDeclarations(codeBlock, parentBlock)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java index ae71be98bbcb..e1be67977e22 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java @@ -54,10 +54,9 @@ public class UnnecessaryConstantArrayCreationExpressionInspection extends BaseIn @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiNewExpression)) { + if (!(element instanceof PsiNewExpression newExpression)) { return; } - final PsiNewExpression newExpression = (PsiNewExpression)element; final PsiArrayInitializerExpression arrayInitializer = newExpression.getArrayInitializer(); if (arrayInitializer == null) { return; @@ -85,10 +84,9 @@ public class UnnecessaryConstantArrayCreationExpressionInspection extends BaseIn return; } final PsiElement grandParent = PsiUtil.skipParenthesizedExprUp(parent.getParent()); - if (!(grandParent instanceof PsiVariable)) { + if (!(grandParent instanceof PsiVariable variable)) { return; } - final PsiVariable variable = (PsiVariable)grandParent; final PsiType expressionType = expression.getType(); if (!variable.getType().equals(expressionType)) { return; @@ -107,10 +105,9 @@ public class UnnecessaryConstantArrayCreationExpressionInspection extends BaseIn private static boolean hasGenericTypeParameters(PsiVariable variable) { final PsiType type = variable.getType(); final PsiType componentType = type.getDeepComponentType(); - if (!(componentType instanceof PsiClassType)) { + if (!(componentType instanceof PsiClassType classType)) { return false; } - final PsiClassType classType = (PsiClassType)componentType; final PsiType[] parameterTypes = classType.getParameters(); for (PsiType parameterType : parameterTypes) { if (parameterType != null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java index 6a40d3d6c627..1ea204676045 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java @@ -127,15 +127,13 @@ public class UnnecessaryConstructorInspection extends BaseInspection { } private boolean isSuperConstructorInvocationWithoutArguments(PsiStatement statement) { - if (!(statement instanceof PsiExpressionStatement)) { + if (!(statement instanceof PsiExpressionStatement expressionStatement)) { return false; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); if (!argumentList.isEmpty()) { return false; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryFinalOnLocalVariableOrParameterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryFinalOnLocalVariableOrParameterInspection.java index 81facbf7f928..283b71a62c90 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryFinalOnLocalVariableOrParameterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryFinalOnLocalVariableOrParameterInspection.java @@ -107,8 +107,7 @@ public class UnnecessaryFinalOnLocalVariableOrParameterInspection extends BaseIn return; } } - final PsiLocalVariable variable = (PsiLocalVariable)firstElement; - registerModifierError(PsiModifier.FINAL, variable, variable); + registerModifierError(PsiModifier.FINAL, firstVariable, firstVariable); } @Override diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java index c96a4aba8544..b8bec2995631 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java @@ -94,13 +94,11 @@ public class UnnecessarySuperQualifierInspection extends BaseInspection implemen return; } final PsiElement parent = expression.getParent(); - if (!(parent instanceof PsiReferenceExpression)) { + if (!(parent instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)parent; final PsiElement grandParent = referenceExpression.getParent(); - if (grandParent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; + if (grandParent instanceof PsiMethodCallExpression methodCallExpression) { if (!hasUnnecessarySuperQualifier(methodCallExpression)) { return; } @@ -149,10 +147,9 @@ public class UnnecessarySuperQualifierInspection extends BaseInspection implemen return false; } final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField superField)) { return false; } - final PsiField superField = (PsiField)target; final PsiReferenceExpression copy = (PsiReferenceExpression)referenceExpression.copy(); final PsiElement qualifier = copy.getQualifier(); if (qualifier == null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryThisInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryThisInspection.java index bb5f9dbae493..2a4314e26d8d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryThisInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryThisInspection.java @@ -116,10 +116,9 @@ public class UnnecessaryThisInspection extends BaseInspection implements Cleanup return; } final PsiExpression qualifierExpression = PsiUtil.skipParenthesizedExprDown(expression.getQualifierExpression()); - if (!(qualifierExpression instanceof PsiThisExpression)) { + if (!(qualifierExpression instanceof PsiThisExpression thisExpression)) { return; } - final PsiThisExpression thisExpression = (PsiThisExpression)qualifierExpression; final PsiJavaCodeReferenceElement qualifier = thisExpression.getQualifier(); final String referenceName = expression.getReferenceName(); if (referenceName == null) { @@ -140,10 +139,9 @@ public class UnnecessaryThisInspection extends BaseInspection implements Cleanup return; } final PsiElement target = expression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return; } - final PsiVariable variable = (PsiVariable)target; if (!DeclarationSearchUtils.variableNameResolvesToTarget(referenceName, variable, expression)) { return; } @@ -157,8 +155,7 @@ public class UnnecessaryThisInspection extends BaseInspection implements Cleanup if (qualifierName == null) { return; } - if (parent instanceof PsiCallExpression) { - final PsiCallExpression callExpression = (PsiCallExpression)parent; + if (parent instanceof PsiCallExpression callExpression) { final PsiMethod calledMethod = callExpression.resolveMethod(); if (calledMethod == null) { return; @@ -187,10 +184,9 @@ public class UnnecessaryThisInspection extends BaseInspection implements Cleanup } else { final PsiElement target = expression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return; } - final PsiVariable variable = (PsiVariable)target; if (!DeclarationSearchUtils.variableNameResolvesToTarget(referenceName, variable, expression)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedFieldAccessInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedFieldAccessInspection.java index 35abfb5b10f9..fc6d43452463 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedFieldAccessInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedFieldAccessInspection.java @@ -58,10 +58,9 @@ public class UnqualifiedFieldAccessInspection extends BaseInspection implements return; } final PsiElement element = expression.resolve(); - if (!(element instanceof PsiField)) { + if (!(element instanceof PsiField field)) { return; } - final PsiField field = (PsiField)element; if (field.hasModifierProperty(PsiModifier.STATIC)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java index c7e7a7825872..95081b7e1e73 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java @@ -156,10 +156,9 @@ public class UnqualifiedStaticUsageInspection extends BaseInspection implements return; } final PsiElement element = expression.resolve(); - if (!(element instanceof PsiField)) { + if (!(element instanceof PsiField field)) { return; } - final PsiField field = (PsiField)element; if (field.hasModifierProperty(PsiModifier.FINAL) && PsiUtil.isOnAssignmentLeftHand(expression)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MaskedAssertionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MaskedAssertionInspection.java index 3ff0eb0dd80d..13c9e03f237f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MaskedAssertionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MaskedAssertionInspection.java @@ -42,9 +42,8 @@ public class MaskedAssertionInspection extends BaseInspection { } else if (lastPsiElement instanceof PsiExpressionStatement) { PsiExpression psiExpr = ((PsiExpressionStatement)lastPsiElement).getExpression(); - if (!(psiExpr instanceof PsiMethodCallExpression)) return; + if (!(psiExpr instanceof PsiMethodCallExpression psiMethodCallExpr)) return; - PsiMethodCallExpression psiMethodCallExpr = (PsiMethodCallExpression)psiExpr; while (true) { PsiMethodCallExpression currQualifierCall = MethodCallUtils.getQualifierMethodCall(psiMethodCallExpr); if (currQualifierCall == null) break; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MisorderedAssertEqualsArgumentsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MisorderedAssertEqualsArgumentsInspection.java index 9da539d5b97e..8c80543b18c5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MisorderedAssertEqualsArgumentsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MisorderedAssertEqualsArgumentsInspection.java @@ -98,14 +98,12 @@ public class MisorderedAssertEqualsArgumentsInspection extends BaseInspection { if (target instanceof PsiEnumConstant || target instanceof PsiClass) { return; } - else if (target instanceof PsiField) { - final PsiField field = (PsiField)target; + else if (target instanceof PsiField field) { if (field.hasModifierProperty(PsiModifier.STATIC) && field.hasModifierProperty(PsiModifier.FINAL)) { return; } } - else if (target instanceof PsiParameter) { - final PsiParameter parameter = (PsiParameter)target; + else if (target instanceof PsiParameter parameter) { if ("expected".equals(parameter.getName())) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/SimplifiableAssertionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/SimplifiableAssertionInspection.java index 203babacd553..376afaf13459 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/SimplifiableAssertionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/SimplifiableAssertionInspection.java @@ -66,8 +66,7 @@ public class SimplifiableAssertionInspection extends BaseInspection implements C } static boolean isEqualityComparison(PsiExpression expression) { - if (expression instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; + if (expression instanceof PsiBinaryExpression binaryExpression) { final IElementType tokenType = binaryExpression.getOperationTokenType(); if (!tokenType.equals(JavaTokenType.EQEQ)) { return false; @@ -89,10 +88,9 @@ public class SimplifiableAssertionInspection extends BaseInspection implements C } static boolean isIdentityComparison(PsiExpression expression) { - if (!(expression instanceof PsiBinaryExpression)) { + if (!(expression instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; if (!ComparisonUtils.isEqualityComparison(binaryExpression)) { return false; } @@ -207,8 +205,7 @@ public class SimplifiableAssertionInspection extends BaseInspection implements C final PsiExpression firstArgument = assertHint.getFirstArgument(); PsiExpression lhs = null; PsiExpression rhs = null; - if (firstArgument instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)firstArgument; + if (firstArgument instanceof PsiBinaryExpression binaryExpression) { lhs = binaryExpression.getLOperand(); rhs = binaryExpression.getROperand(); } @@ -468,10 +465,9 @@ public class SimplifiableAssertionInspection extends BaseInspection implements C } private boolean isEqEqExpression(PsiExpression argument) { - if (!(argument instanceof PsiBinaryExpression)) { + if (!(argument instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)argument; final IElementType tokenType = binaryExpression.getOperationTokenType(); return JavaTokenType.EQEQ.equals(tokenType); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AtomicFieldUpdaterIssuesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AtomicFieldUpdaterIssuesInspection.java index 109ea768c704..24b8151e2bda 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AtomicFieldUpdaterIssuesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AtomicFieldUpdaterIssuesInspection.java @@ -45,20 +45,17 @@ public class AtomicFieldUpdaterIssuesInspection extends BaseInspection { } final PsiExpression lastArgument = arguments[arguments.length - 1]; final Object value = ExpressionUtils.computeConstantExpression(lastArgument); - if (!(value instanceof String)) { + if (!(value instanceof String fieldName)) { return; } - final String fieldName = (String)value; final PsiExpression firstArgument = PsiUtil.skipParenthesizedExprDown(arguments[0]); - if (!(firstArgument instanceof PsiClassObjectAccessExpression)) { + if (!(firstArgument instanceof PsiClassObjectAccessExpression classObjectAccessExpression)) { return; } - final PsiClassObjectAccessExpression classObjectAccessExpression = (PsiClassObjectAccessExpression)firstArgument; final PsiType operandType = classObjectAccessExpression.getOperand().getType(); - if (!(operandType instanceof PsiClassType)) { + if (!(operandType instanceof PsiClassType classType)) { return; } - final PsiClassType classType = (PsiClassType)operandType; final PsiClass target = classType.resolve(); if (target == null) { return; @@ -103,10 +100,9 @@ public class AtomicFieldUpdaterIssuesInspection extends BaseInspection { return; } final PsiExpression argument2 = arguments[1]; - if (!(argument2 instanceof PsiClassObjectAccessExpression)) { + if (!(argument2 instanceof PsiClassObjectAccessExpression objectAccessExpression)) { return; } - final PsiClassObjectAccessExpression objectAccessExpression = (PsiClassObjectAccessExpression)argument2; final PsiType type = objectAccessExpression.getOperand().getType(); final PsiType substFieldType = classType.resolveGenerics().getSubstitutor().substitute(field.getType()); if (substFieldType == null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AwaitWithoutCorrespondingSignalInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AwaitWithoutCorrespondingSignalInspection.java index 7702f14d4b99..186157202eda 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AwaitWithoutCorrespondingSignalInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AwaitWithoutCorrespondingSignalInspection.java @@ -55,10 +55,9 @@ public class AwaitWithoutCorrespondingSignalInspection extends BaseInspection { return; } final PsiElement referent = ((PsiReference)qualifier).resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return; } - final PsiField field = (PsiField)referent; final PsiClass fieldClass = field.getContainingClass(); if (fieldClass == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java index 70f8fea1f595..e452da4e0086 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java @@ -45,10 +45,9 @@ public class MethodMayBeSynchronizedInspection extends BaseInspection { final PsiMethod method = (PsiMethod)descriptor.getPsiElement().getParent(); final PsiCodeBlock methodBody = method.getBody(); final PsiStatement statement = ControlFlowUtils.getOnlyStatementInBlock(methodBody); - if (!(statement instanceof PsiSynchronizedStatement)) { + if (!(statement instanceof PsiSynchronizedStatement synchronizedStatement)) { return; } - final PsiSynchronizedStatement synchronizedStatement = (PsiSynchronizedStatement)statement; final PsiCodeBlock body = synchronizedStatement.getBody(); if (body == null) { return; @@ -77,25 +76,22 @@ public class MethodMayBeSynchronizedInspection extends BaseInspection { return; } final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethod)) { + if (!(grandParent instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)grandParent; if (!ControlFlowUtils.hasStatementCount(method.getBody(), 1)) { return; } final PsiExpression lockExpression = statement.getLockExpression(); if (method.hasModifierProperty(PsiModifier.STATIC)) { - if (!(lockExpression instanceof PsiClassObjectAccessExpression)) { + if (!(lockExpression instanceof PsiClassObjectAccessExpression classExpression)) { return; } - final PsiClassObjectAccessExpression classExpression = (PsiClassObjectAccessExpression)lockExpression; final PsiTypeElement typeElement = classExpression.getOperand(); final PsiType type = typeElement.getType(); - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType classType)) { return; } - final PsiClassType classType = (PsiClassType)type; final PsiClass aClass = classType.resolve(); final PsiClass containingClass = method.getContainingClass(); if (aClass != containingClass) { @@ -103,10 +99,9 @@ public class MethodMayBeSynchronizedInspection extends BaseInspection { } } else { - if (!(lockExpression instanceof PsiThisExpression)) { + if (!(lockExpression instanceof PsiThisExpression thisExpression)) { return; } - final PsiThisExpression thisExpression = (PsiThisExpression)lockExpression; final PsiJavaCodeReferenceElement qualifier = thisExpression.getQualifier(); if (qualifier != null) { final PsiElement target = qualifier.resolve(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NakedNotifyInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NakedNotifyInspection.java index 7c3d3a58021e..6562382939cb 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NakedNotifyInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NakedNotifyInspection.java @@ -65,11 +65,9 @@ public class NakedNotifyInspection extends BaseInspection { } final PsiExpression firstExpression = ((PsiExpressionStatement)firstStatement).getExpression(); - if (!(firstExpression instanceof PsiMethodCallExpression)) { + if (!(firstExpression instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = - (PsiMethodCallExpression)firstExpression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); @NonNls final String methodName = diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NonAtomicOperationOnVolatileFieldInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NonAtomicOperationOnVolatileFieldInspection.java index 86eb60979911..1bfc10290bd2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NonAtomicOperationOnVolatileFieldInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NonAtomicOperationOnVolatileFieldInspection.java @@ -108,15 +108,13 @@ public class NonAtomicOperationOnVolatileFieldInspection extends BaseInspection @Nullable private static PsiReferenceExpression findNonSynchronizedVolatileFieldRef(PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression reference)) { return null; } - final PsiReferenceExpression reference = (PsiReferenceExpression)expression; final PsiElement referent = reference.resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return null; } - final PsiField field = (PsiField)referent; if (!field.hasModifierProperty(PsiModifier.VOLATILE)) { return null; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NotifyWithoutCorrespondingWaitInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NotifyWithoutCorrespondingWaitInspection.java index 9030f0a35ecc..c6daf1c87308 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NotifyWithoutCorrespondingWaitInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/NotifyWithoutCorrespondingWaitInspection.java @@ -55,10 +55,9 @@ public class NotifyWithoutCorrespondingWaitInspection extends BaseInspection { return; } final PsiElement referent = ((PsiReference)qualifier).resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return; } - final PsiField field = (PsiField)referent; final PsiClass fieldClass = field.getContainingClass(); if (fieldClass == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java index d976010b152e..cf0a4e1222fe 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java @@ -50,10 +50,9 @@ public class PublicFieldAccessedInSynchronizedContextInspection extends BaseInsp return; } final PsiElement element = expression.resolve(); - if (!(element instanceof PsiField)) { + if (!(element instanceof PsiField field)) { return; } - final PsiField field = (PsiField)element; if (field.hasModifierProperty(PsiModifier.PRIVATE) || field.hasModifierProperty(PsiModifier.FINAL)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SafeLockInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SafeLockInspection.java index 823b2bd74ed9..2e160919632a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SafeLockInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SafeLockInspection.java @@ -74,9 +74,7 @@ public class SafeLockInspection extends BaseInspection { // todo extend Resource boundVariable = (PsiVariable)target; type = LockType.REGULAR; } - else if (qualifierExpression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = - (PsiMethodCallExpression)qualifierExpression; + else if (qualifierExpression instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression1 = methodCallExpression.getMethodExpression(); @NonNls final String methodName = @@ -115,12 +113,10 @@ public class SafeLockInspection extends BaseInspection { // todo extend Resource while (nextStatement != null && !isSignificant(nextStatement)) { nextStatement = PsiTreeUtil.getNextSiblingOfType(nextStatement, PsiStatement.class); } - if (!(nextStatement instanceof PsiTryStatement)) { + if (!(nextStatement instanceof PsiTryStatement tryStatement)) { registerError(expression, referenceExpression); return; } - final PsiTryStatement tryStatement = - (PsiTryStatement)nextStatement; if (lockIsUnlockedInFinally(tryStatement, boundVariable, type)) { return; } @@ -221,9 +217,7 @@ public class SafeLockInspection extends BaseInspection { // todo extend Resource containsUnlock = true; } } - else if (qualifier instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = - (PsiMethodCallExpression)qualifier; + else if (qualifier instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression1 = methodCallExpression.getMethodExpression(); @NonNls final String methodName1 = @@ -233,11 +227,9 @@ public class SafeLockInspection extends BaseInspection { // todo extend Resource "writeLock".equals(methodName1)) { final PsiExpression qualifierExpression = methodExpression1.getQualifierExpression(); - if (!(qualifierExpression instanceof PsiReferenceExpression)) { + if (!(qualifierExpression instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)qualifierExpression; final PsiElement target = referenceExpression.resolve(); if (variable.equals(target)) { containsUnlock = true; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SignalWithoutCorrespondingAwaitInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SignalWithoutCorrespondingAwaitInspection.java index 90fb690c0773..4bd6e224a0a9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SignalWithoutCorrespondingAwaitInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SignalWithoutCorrespondingAwaitInspection.java @@ -54,10 +54,9 @@ public class SignalWithoutCorrespondingAwaitInspection extends BaseInspection { return; } final PsiElement referent = ((PsiReference)qualifier).resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return; } - final PsiField field = (PsiField)referent; final PsiClass fieldClass = field.getContainingClass(); if (fieldClass == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnGetClassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnGetClassInspection.java index e4b1830ca120..40296ba8f08e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnGetClassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnGetClassInspection.java @@ -53,10 +53,9 @@ public class SynchronizationOnGetClassInspection extends BaseInspection { public void visitSynchronizedStatement(@NotNull PsiSynchronizedStatement statement) { super.visitSynchronizedStatement(statement); final PsiExpression lockExpression = PsiUtil.skipParenthesizedExprDown(statement.getLockExpression()); - if (!(lockExpression instanceof PsiMethodCallExpression)) { + if (!(lockExpression instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)lockExpression; if (!MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_OBJECT, null, "getClass")) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnLocalVariableOrMethodParameterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnLocalVariableOrMethodParameterInspection.java index 314055da820c..b309de05e315 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnLocalVariableOrMethodParameterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnLocalVariableOrMethodParameterInspection.java @@ -64,24 +64,21 @@ public class SynchronizationOnLocalVariableOrMethodParameterInspection extends B return; } final PsiExpression lockExpression = PsiUtil.skipParenthesizedExprDown(statement.getLockExpression()); - if (!(lockExpression instanceof PsiReferenceExpression)) { + if (!(lockExpression instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lockExpression; if (referenceExpression.isQualified()) { return; } boolean localVariable = false; final PsiElement target = referenceExpression.resolve(); - if (target instanceof PsiLocalVariable) { - final PsiLocalVariable variable = (PsiLocalVariable)target; + if (target instanceof PsiLocalVariable variable) { if (!reportLocalVariables || isSynchronizedCollection(variable, referenceExpression) || isReferencedToField(variable, referenceExpression)) { return; } localVariable = true; } - else if (target instanceof PsiParameter) { - final PsiParameter parameter = (PsiParameter)target; + else if (target instanceof PsiParameter parameter) { final PsiElement scope = parameter.getDeclarationScope(); if (scope instanceof PsiMethod) { if (!reportMethodParameters) { @@ -134,10 +131,9 @@ public class SynchronizationOnLocalVariableOrMethodParameterInspection extends B private static boolean isSynchronizedCollection(@NotNull PsiVariable variable, PsiReferenceExpression referenceExpression) { final PsiExpression definition = DeclarationSearchUtils.findDefinition(referenceExpression, variable); - if (!(definition instanceof PsiMethodCallExpression)) { + if (!(definition instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)definition; final PsiMethod method = methodCallExpression.resolveMethod(); if (method == null) { return false; @@ -153,8 +149,7 @@ public class SynchronizationOnLocalVariableOrMethodParameterInspection extends B private static boolean isEscaping(PsiVariable variable) { final PsiElement scope; - if (variable instanceof PsiParameter) { - final PsiParameter parameter = (PsiParameter)variable; + if (variable instanceof PsiParameter parameter) { scope = parameter.getDeclarationScope(); } else if (variable instanceof PsiLocalVariable) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnStaticFieldInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnStaticFieldInspection.java index 2efe521cf0dc..0cc2eee1742a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnStaticFieldInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizationOnStaticFieldInspection.java @@ -43,16 +43,13 @@ public class SynchronizationOnStaticFieldInspection extends BaseInspection { @NotNull PsiSynchronizedStatement statement) { super.visitSynchronizedStatement(statement); final PsiExpression lockExpression = statement.getLockExpression(); - if (!(lockExpression instanceof PsiReferenceExpression)) { + if (!(lockExpression instanceof PsiReferenceExpression expression)) { return; } - final PsiReferenceExpression expression = - (PsiReferenceExpression)lockExpression; final PsiElement target = expression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return; } - final PsiField field = (PsiField)target; if (!field.hasModifierProperty(PsiModifier.STATIC)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnNonFinalFieldInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnNonFinalFieldInspection.java index 2cb904c20bff..18711ee6cfb0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnNonFinalFieldInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnNonFinalFieldInspection.java @@ -63,10 +63,9 @@ public class SynchronizeOnNonFinalFieldInspection extends BaseInspection { return; } final PsiElement element = ((PsiReferenceExpression)lockExpression).resolve(); - if (!(element instanceof PsiField)) { + if (!(element instanceof PsiField field)) { return; } - final PsiField field = (PsiField)element; if (field.hasModifierProperty(PsiModifier.FINAL)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnThisInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnThisInspection.java index 985882fdffca..6a49fc041191 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnThisInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnThisInspection.java @@ -74,10 +74,9 @@ public class SynchronizeOnThisInspection extends BaseInspection { return false; } final PsiType type = expression.getType(); - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType classType)) { return false; } - final PsiClassType classType = (PsiClassType)type; final PsiClassType javaLangClassType = TypeUtils.getType(CommonClassNames.JAVA_LANG_CLASS, expression); if (!javaLangClassType.isAssignableFrom(classType)) { return false; @@ -93,10 +92,9 @@ public class SynchronizeOnThisInspection extends BaseInspection { if (isNonPrivateClassType(parameterType)) { return true; } - if (!(parameterType instanceof PsiCapturedWildcardType)) { + if (!(parameterType instanceof PsiCapturedWildcardType capturedWildcardType)) { return false; } - final PsiCapturedWildcardType capturedWildcardType = (PsiCapturedWildcardType)parameterType; final PsiWildcardType wildcardType = capturedWildcardType.getWildcard(); final PsiType extendsBoundType = wildcardType.getExtendsBound(); return isNonPrivateClassType(extendsBoundType); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizedOnLiteralObjectInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizedOnLiteralObjectInspection.java index 77018155461b..f3724245cd65 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizedOnLiteralObjectInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizedOnLiteralObjectInspection.java @@ -71,7 +71,7 @@ public class SynchronizedOnLiteralObjectInspection extends BaseInspection { if (!LITERAL_TYPES.contains(type.getCanonicalText())) { return; } - if (!(lockExpression instanceof PsiReferenceExpression)) { + if (!(lockExpression instanceof PsiReferenceExpression referenceExpression)) { if (ExpressionUtils.isLiteral(lockExpression)) { registerError(lockExpression, type, Integer.valueOf(2)); } @@ -80,15 +80,13 @@ public class SynchronizedOnLiteralObjectInspection extends BaseInspection { } return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lockExpression; final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { if (warnOnAllPossiblyLiterals) { registerError(lockExpression, type, Integer.valueOf(3)); } return; } - final PsiVariable variable = (PsiVariable)target; final PsiExpression initializer = variable.getInitializer(); if (!ExpressionUtils.isLiteral(initializer)) { if (warnOnAllPossiblyLiterals) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadPriorityInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadPriorityInspection.java index e076caaa746f..26c4a61db22e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadPriorityInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadPriorityInspection.java @@ -88,21 +88,18 @@ public class ThreadPriorityInspection extends BaseInspection { return false; } final PsiExpression expression = expressions[0]; - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)expression; final String referenceName = referenceExpression.getReferenceName(); @NonNls final String normPriority = "NORM_PRIORITY"; if (!normPriority.equals(referenceName)) { return false; } final PsiElement element = referenceExpression.resolve(); - if (!(element instanceof PsiField)) { + if (!(element instanceof PsiField field)) { return false; } - final PsiField field = (PsiField)element; final PsiClass aClass = field.getContainingClass(); final String className = aClass.getQualifiedName(); return "java.lang.Thread".equals(className); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/UnconditionalWaitInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/UnconditionalWaitInspection.java index 6b30e7005b07..31a95b6ab818 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/UnconditionalWaitInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/UnconditionalWaitInspection.java @@ -73,11 +73,9 @@ public class UnconditionalWaitInspection extends BaseInspection { } final PsiExpression firstExpression = ((PsiExpressionStatement)statement).getExpression(); - if (!(firstExpression instanceof PsiMethodCallExpression)) { + if (!(firstExpression instanceof PsiMethodCallExpression methodCallExpression)) { continue; } - final PsiMethodCallExpression methodCallExpression = - (PsiMethodCallExpression)firstExpression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); @NonNls final String methodName = diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/VariableAccessVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/VariableAccessVisitor.java index f322d4720aa9..e579b3c36d21 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/VariableAccessVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/VariableAccessVisitor.java @@ -368,8 +368,7 @@ class VariableAccessVisitor extends JavaRecursiveElementWalkingVisitor { if (element instanceof PsiCodeBlock && element.getParent() instanceof PsiSynchronizedStatement) { m_inSynchronizedContextCount--; } - else if (element instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)element; + else if (element instanceof PsiMethod method) { if (method.hasModifierProperty(PsiModifier.SYNCHRONIZED) || methodIsAlwaysUsedSynchronized(method)) { m_inSynchronizedContextCount--; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitNotifyNotInSynchronizedContextInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitNotifyNotInSynchronizedContextInspection.java index 580ee6e4ae37..9a1d5bd5f8cf 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitNotifyNotInSynchronizedContextInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitNotifyNotInSynchronizedContextInspection.java @@ -91,13 +91,11 @@ public class WaitNotifyNotInSynchronizedContextInspection extends BaseInspection private static boolean isSynchronizedOnThis(@NotNull PsiElement element) { final PsiElement context = PsiTreeUtil.getParentOfType(element, PsiMethod.class, PsiSynchronizedStatement.class); - if (context instanceof PsiSynchronizedStatement) { - final PsiSynchronizedStatement synchronizedStatement = (PsiSynchronizedStatement)context; + if (context instanceof PsiSynchronizedStatement synchronizedStatement) { final PsiExpression lockExpression = PsiUtil.skipParenthesizedExprDown(synchronizedStatement.getLockExpression()); return lockExpression instanceof PsiThisExpression || isSynchronizedOnThis(synchronizedStatement); } - else if (context instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)context; + else if (context instanceof PsiMethod method) { if (method.hasModifierProperty(PsiModifier.SYNCHRONIZED)) { return true; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitWithoutCorrespondingNotifyInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitWithoutCorrespondingNotifyInspection.java index 91f6f2ad3caa..233fc84bbcb5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitWithoutCorrespondingNotifyInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitWithoutCorrespondingNotifyInspection.java @@ -55,10 +55,9 @@ public class WaitWithoutCorrespondingNotifyInspection extends BaseInspection { return; } final PsiElement referent = ((PsiReference)qualifier).resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return; } - final PsiField field = (PsiField)referent; final PsiClass fieldClass = field.getContainingClass(); if (fieldClass == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WhileLoopSpinsOnFieldInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WhileLoopSpinsOnFieldInspection.java index c80e1159b839..723494060c95 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WhileLoopSpinsOnFieldInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WhileLoopSpinsOnFieldInspection.java @@ -124,16 +124,14 @@ public class WhileLoopSpinsOnFieldInspection extends BaseInspection { if (field != null) { return field; } - if (condition instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)condition; + if (condition instanceof PsiPrefixExpression prefixExpression) { IElementType type = prefixExpression.getOperationTokenType(); if(!type.equals(JavaTokenType.PLUSPLUS) && !type.equals(JavaTokenType.MINUSMINUS)) { final PsiExpression operand = prefixExpression.getOperand(); return getFieldIfSimpleFieldComparison(operand); } } - if (condition instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)condition; + if (condition instanceof PsiBinaryExpression binaryExpression) { final PsiExpression lOperand = binaryExpression.getLOperand(); final PsiExpression rOperand = binaryExpression.getROperand(); if (ExpressionUtils.isLiteral(rOperand)) { @@ -155,19 +153,17 @@ public class WhileLoopSpinsOnFieldInspection extends BaseInspection { if (expression == null) { return null; } - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression reference)) { return null; } - final PsiReferenceExpression reference = (PsiReferenceExpression)expression; final PsiExpression qualifierExpression = reference.getQualifierExpression(); if (qualifierExpression != null) { return null; } final PsiElement referent = reference.resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return null; } - final PsiField field = (PsiField)referent; if (field.hasModifierProperty(PsiModifier.VOLATILE) && !PsiUtil.isLanguageLevel9OrHigher(field)) { return null; } @@ -235,8 +231,7 @@ public class WhileLoopSpinsOnFieldInspection extends BaseInspection { private static void addVolatile(PsiElement element) { PsiElement parent = element.getParent(); - if (!(parent instanceof PsiWhileStatement)) return; - PsiWhileStatement whileStatement = (PsiWhileStatement)parent; + if (!(parent instanceof PsiWhileStatement whileStatement)) return; PsiExpression condition = whileStatement.getCondition(); PsiField field = getFieldIfSimpleFieldComparison(condition); if (field == null) return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java index d1c4d63b0ebd..db334170a29d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java @@ -51,10 +51,9 @@ public class AmbiguousFieldAccessInspection extends BaseInspection implements Cl if (target == null) { return; } - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return; } - final PsiField field = (PsiField)target; final PsiClass fieldClass = field.getContainingClass(); if (fieldClass == null) { return; @@ -112,10 +111,9 @@ public class AmbiguousFieldAccessInspection extends BaseInspection implements Cl @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiReferenceExpression)) { + if (!(element instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element; final String newExpressionText = "super." + referenceExpression.getText(); PsiReplacementUtil.replaceExpression(referenceExpression, newExpressionText); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesOuterClassVariableVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesOuterClassVariableVisitor.java index f386511f0551..0cc307f074d7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesOuterClassVariableVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesOuterClassVariableVisitor.java @@ -42,16 +42,14 @@ class AnonymousClassVariableHidesOuterClassVariableVisitor extends BaseInspectio if (statement.getTextOffset() >= offset) { break; } - if (!(statement instanceof PsiDeclarationStatement)) { + if (!(statement instanceof PsiDeclarationStatement declarationStatement)) { continue; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)statement; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); for (PsiElement declaredElement : declaredElements) { - if (!(declaredElement instanceof PsiLocalVariable)) { + if (!(declaredElement instanceof PsiLocalVariable localVariable)) { continue; } - final PsiLocalVariable localVariable = (PsiLocalVariable)declaredElement; final String name = localVariable.getName(); final PsiVariable[] variables = collector.getVariables(name); for (PsiVariable variable : variables) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/ClassEscapesItsScopeInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/ClassEscapesItsScopeInspection.java index c8f2451c3cd5..70f8fe258be1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/ClassEscapesItsScopeInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/ClassEscapesItsScopeInspection.java @@ -69,8 +69,7 @@ public class ClassEscapesItsScopeInspection extends AbstractBaseJavaLocalInspect List checkers = new ArrayList<>(2); if (checkModuleApi) { PsiFile file = holder.getFile(); - if (file instanceof PsiJavaFile) { - PsiJavaFile javaFile = (PsiJavaFile)file; + if (file instanceof PsiJavaFile javaFile) { if (javaFile.getLanguageLevel().isAtLeast(LanguageLevel.JDK_1_9)) { PsiJavaModule psiModule = JavaModuleGraphUtil.findDescriptorByElement(file); if (psiModule != null) { @@ -130,10 +129,9 @@ public class ClassEscapesItsScopeInspection extends AbstractBaseJavaLocalInspect return; } PsiElement resolved = reference.resolve(); - if (!(resolved instanceof PsiClass) || resolved instanceof PsiTypeParameter) { + if (!(resolved instanceof PsiClass psiClass) || resolved instanceof PsiTypeParameter) { return; } - PsiClass psiClass = (PsiClass)resolved; for (VisibilityChecker checker : myCheckers) { if (checker.checkVisibilityIssue(member, psiClass, reference)) { return; diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/ComparatorResultComparisonInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/ComparatorResultComparisonInspection.java index 4607e80d9239..f4ec75774f32 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/ComparatorResultComparisonInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/ComparatorResultComparisonInspection.java @@ -35,8 +35,7 @@ public class ComparatorResultComparisonInspection extends AbstractBaseJavaLocalI if (!COMPARE_METHOD.test(call)) return; checkComparison(call); PsiElement parent = PsiUtil.skipParenthesizedExprUp(call.getParent()); - if (parent instanceof PsiLocalVariable) { - PsiLocalVariable var = (PsiLocalVariable)parent; + if (parent instanceof PsiLocalVariable var) { PsiCodeBlock block = PsiTreeUtil.getParentOfType(var, PsiCodeBlock.class); PsiExpression initializer = var.getInitializer(); if (block != null && initializer != null) { diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodCallInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodCallInspection.java index ad97073edad1..6a5b934ed21c 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodCallInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodCallInspection.java @@ -50,8 +50,7 @@ public class LambdaCanBeMethodCallInspection extends AbstractBaseJavaLocalInspec if (ExpressionUtils.isReferenceTo(expression, parameter)) { handleFunctionIdentity(lambda, (PsiClassType)type); } - if (expression instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression call) { PsiClass aClass = ((PsiClassType)type).resolve(); if (aClass != null && CommonClassNames.JAVA_UTIL_FUNCTION_PREDICATE.equals(aClass.getQualifiedName())) { handlePredicateIsEqual(lambda, parameter, call); diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java index 3797702c8478..8ad1d7074e92 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java @@ -127,8 +127,7 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI if (functionalInterfaceType == null) return null; // Do not suggest for annotated lambda, as annotation will be lost during the conversion if (ContainerUtil.or(parameters, LambdaCanBeMethodReferenceInspection::hasAnnotation)) return null; - if (methodRefCandidate instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)methodRefCandidate; + if (methodRefCandidate instanceof PsiNewExpression newExpression) { if (newExpression.getAnonymousClass() != null || newExpression.getArrayInitializer() != null) { return null; } @@ -137,8 +136,7 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI final String methodReferenceText = createMethodReferenceText(methodRefCandidate, functionalInterfaceType, parameters); if (methodReferenceText != null) { LOG.assertTrue(methodRefCandidate != null); - if (!(methodRefCandidate instanceof PsiCallExpression)) return methodRefCandidate; - PsiCallExpression callExpression = (PsiCallExpression)methodRefCandidate; + if (!(methodRefCandidate instanceof PsiCallExpression callExpression)) return methodRefCandidate; final PsiMethod method = callExpression.resolveMethod(); if (method != null) { if (!isSimpleCall(parameters, callExpression, method)) { @@ -247,8 +245,7 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI if (expression == null) { return null; } - if (expression instanceof PsiNewExpression) { - PsiNewExpression newExpression = (PsiNewExpression)expression; + if (expression instanceof PsiNewExpression newExpression) { if (newExpression.getQualifier() != null || newExpression.getAnonymousClass() != null || newExpression.getArrayInitializer() != null) { @@ -275,8 +272,7 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI if (!isMethodReferenceArgCandidate(((PsiInstanceOfExpression)expression).getOperand())) return null; return new MethodReferenceCandidate(expression, true, javaSettings.REPLACE_INSTANCEOF_AND_CAST); } - else if (expression instanceof PsiBinaryExpression) { - PsiBinaryExpression binOp = (PsiBinaryExpression)expression; + else if (expression instanceof PsiBinaryExpression binOp) { PsiExpression comparedWithNull = PsiUtil.skipParenthesizedExprDown(ExpressionUtils.getValueComparedWithNull(binOp)); if (isMethodReferenceArgCandidate(comparedWithNull)) { return new MethodReferenceCandidate(expression, true, javaSettings.REPLACE_NULL_CHECK); @@ -389,8 +385,7 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI static @Nullable @NonNls String createMethodReferenceText(final PsiElement element, final PsiType functionalInterfaceType, final PsiVariable[] parameters) { - if (element instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)element; + if (element instanceof PsiMethodCallExpression methodCall) { JavaResolveResult result = methodCall.resolveMethodGenerics(); final PsiMethod psiMethod = (PsiMethod)result.getElement(); @@ -422,8 +417,7 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI } } } - else if (element instanceof PsiBinaryExpression) { - PsiBinaryExpression binOp = (PsiBinaryExpression)element; + else if (element instanceof PsiBinaryExpression binOp) { PsiExpression operand = ExpressionUtils.getValueComparedWithNull(binOp); if(operand != null && isSoleParameter(parameters, operand)) { IElementType tokenType = binOp.getOperationTokenType(); @@ -447,8 +441,7 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI } } } - else if (element instanceof PsiTypeCastExpression) { - PsiTypeCastExpression castExpression = (PsiTypeCastExpression)element; + else if (element instanceof PsiTypeCastExpression castExpression) { if(isSoleParameter(parameters, castExpression.getOperand())) { PsiTypeElement type = castExpression.getCastType(); if (type != null && !PsiUtilCore.hasErrorElementChild(type)) { diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/booleanIsAlwaysInverted/BooleanMethodIsAlwaysInvertedInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/booleanIsAlwaysInverted/BooleanMethodIsAlwaysInvertedInspection.java index 2ff9c7b17dec..81de729a16ce 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/booleanIsAlwaysInverted/BooleanMethodIsAlwaysInvertedInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/booleanIsAlwaysInverted/BooleanMethodIsAlwaysInvertedInspection.java @@ -69,8 +69,7 @@ public class BooleanMethodIsAlwaysInvertedInspection extends GlobalJavaBatchInsp @NotNull AnalysisScope scope, @NotNull InspectionManager manager, @NotNull GlobalInspectionContext globalContext) { - if (!(refEntity instanceof RefMethod)) return null; - RefMethod refMethod = (RefMethod)refEntity; + if (!(refEntity instanceof RefMethod refMethod)) return null; if (!refMethod.isReferenced() || refMethod.isConstructor() || hasNonInvertedCalls(refMethod) || @@ -163,8 +162,7 @@ public class BooleanMethodIsAlwaysInvertedInspection extends GlobalJavaBatchInsp if (refWhat.getUserData(ALWAYS_INVERTED) != Boolean.TRUE) return; final RefMethod refMethod = (RefMethod)refWhat; final PsiElement psiElement = refMethod.getPsiElement(); - if (!(psiElement instanceof PsiMethod)) return; - final PsiMethod psiMethod = (PsiMethod)psiElement; + if (!(psiElement instanceof PsiMethod psiMethod)) return; final PsiElement psiFrom = refFrom.getPsiElement(); psiFrom.accept(new JavaRecursiveElementWalkingVisitor() { @Override diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/MagicNumberInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/MagicNumberInspection.java index 24967428d123..7ca8c8110327 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/MagicNumberInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/MagicNumberInspection.java @@ -128,10 +128,9 @@ public class MagicNumberInspection extends BaseInspection { return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiNewExpression)) { + if (!(parent instanceof PsiNewExpression newExpression)) { return false; } - final PsiNewExpression newExpression = (PsiNewExpression)parent; return TypeUtils.expressionHasTypeOrSubtype(newExpression, CommonClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER, CommonClassNames.JAVA_UTIL_MAP, @@ -166,15 +165,13 @@ public class MagicNumberInspection extends BaseInspection { PsiTreeUtil.getParentOfType(expression, PsiVariable.class, PsiAssignmentExpression.class); final PsiVariable variable; if (!(parent instanceof PsiVariable)) { - if (!(parent instanceof PsiAssignmentExpression)) { + if (!(parent instanceof PsiAssignmentExpression assignmentExpression)) { return false; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; final PsiExpression lhs = assignmentExpression.getLExpression(); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; final PsiElement target = referenceExpression.resolve(); if (!(target instanceof PsiVariable)) { return false; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java index c4c73be8adf9..963c2657ca04 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java @@ -307,12 +307,10 @@ public class TypeMayBeWeakenedInspection extends BaseInspection { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); final PsiTypeElement typeElement; - if (parent instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)parent; + if (parent instanceof PsiVariable variable) { typeElement = variable.getTypeElement(); } - else if (parent instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)parent; + else if (parent instanceof PsiMethod method) { typeElement = method.getReturnTypeElement(); } else { @@ -327,17 +325,15 @@ public class TypeMayBeWeakenedInspection extends BaseInspection { return; } final PsiType oldType = typeElement.getType(); - if (!(oldType instanceof PsiClassType)) { + if (!(oldType instanceof PsiClassType oldClassType)) { return; } - final PsiClassType oldClassType = (PsiClassType)oldType; final JavaPsiFacade facade = JavaPsiFacade.getInstance(project); final PsiElementFactory factory = facade.getElementFactory(); final PsiType type = factory.createTypeFromText(fqClassName, element); - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType classType)) { return; } - PsiClassType classType = (PsiClassType)type; final PsiClass aClass = classType.resolve(); if (aClass != null) { final PsiTypeParameter[] typeParameters = aClass.getTypeParameters(); @@ -392,8 +388,7 @@ public class TypeMayBeWeakenedInspection extends BaseInspection { @Override public void visitVariable(@NotNull PsiVariable variable) { super.visitVariable(variable); - if (variable instanceof PsiParameter) { - final PsiParameter parameter = (PsiParameter)variable; + if (variable instanceof PsiParameter parameter) { if (parameter instanceof PsiPatternVariable) return; final PsiElement declarationScope = parameter.getDeclarationScope(); if (declarationScope instanceof PsiCatchSection) { @@ -404,8 +399,7 @@ public class TypeMayBeWeakenedInspection extends BaseInspection { //no need to check inferred lambda params return; } - if (declarationScope instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)declarationScope; + if (declarationScope instanceof PsiMethod method) { final PsiClass containingClass = method.getContainingClass(); if (containingClass == null || containingClass.isInterface()) { return; @@ -442,8 +436,7 @@ public class TypeMayBeWeakenedInspection extends BaseInspection { if (useRighthandTypeAsWeakestTypeInAssignments) { if (variable instanceof PsiParameter) { final PsiElement parent = variable.getParent(); - if (parent instanceof PsiForeachStatement) { - final PsiForeachStatement foreachStatement = (PsiForeachStatement)parent; + if (parent instanceof PsiForeachStatement foreachStatement) { final PsiExpression iteratedValue = foreachStatement.getIteratedValue(); if (!(iteratedValue instanceof PsiNewExpression) && !(iteratedValue instanceof PsiTypeCastExpression)) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/IfCanBeAssertionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/IfCanBeAssertionInspection.java index 33b29242ed50..c74f0effb198 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/IfCanBeAssertionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/IfCanBeAssertionInspection.java @@ -57,8 +57,7 @@ public class IfCanBeAssertionInspection extends BaseInspection { return getThrownNewException(statements[0]); } } - else if (element instanceof PsiThrowStatement) { - final PsiThrowStatement throwStatement = (PsiThrowStatement)element; + else if (element instanceof PsiThrowStatement throwStatement) { final PsiExpression exception = PsiUtil.skipParenthesizedExprDown(throwStatement.getException()); if (exception instanceof PsiNewExpression) { return (PsiNewExpression)exception; @@ -109,8 +108,7 @@ public class IfCanBeAssertionInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { if (myIsIfStatement) { final PsiElement parent = descriptor.getPsiElement().getParent(); - if (!(parent instanceof PsiIfStatement)) return; - final PsiIfStatement ifStatement = (PsiIfStatement)parent; + if (!(parent instanceof PsiIfStatement ifStatement)) return; final PsiExpression condition = PsiUtil.skipParenthesizedExprDown(ifStatement.getCondition()); if (!(condition instanceof PsiBinaryExpression)) return; PsiExpression nullComparedExpression = ExpressionUtils.getValueComparedWithNull((PsiBinaryExpression)condition); @@ -171,10 +169,9 @@ public class IfCanBeAssertionInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement parent = descriptor.getPsiElement().getParent(); - if (!(parent instanceof PsiIfStatement)) { + if (!(parent instanceof PsiIfStatement ifStatement)) { return; } - final PsiIfStatement ifStatement = (PsiIfStatement)parent; @NonNls final StringBuilder newStatementText = new StringBuilder("assert "); CommentTracker tracker = new CommentTracker(); newStatementText.append(BoolUtils.getNegatedExpressionText(ifStatement.getCondition(), tracker)); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToForLoopParameterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToForLoopParameterInspection.java index 54a6ba07cf7a..ce1d90eee6aa 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToForLoopParameterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToForLoopParameterInspection.java @@ -88,15 +88,13 @@ public class AssignmentToForLoopParameterInspection extends BaseInspection { return; } final PsiElement variableParent = variable.getParent(); - if (!(variableParent instanceof PsiDeclarationStatement)) { + if (!(variableParent instanceof PsiDeclarationStatement declarationStatement)) { return; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)variableParent; final PsiElement parent = declarationStatement.getParent(); - if (!(parent instanceof PsiForStatement)) { + if (!(parent instanceof PsiForStatement forStatement)) { return; } - final PsiForStatement forStatement = (PsiForStatement)parent; final PsiStatement initialization = forStatement.getInitialization(); if (initialization == null || !initialization.equals(declarationStatement) || @@ -112,10 +110,9 @@ public class AssignmentToForLoopParameterInspection extends BaseInspection { return; } expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; if (referenceExpression.getQualifierExpression() != null) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CopyConstructorMissesFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CopyConstructorMissesFieldInspection.java index 2afc41df71ef..f109ed06a6e7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CopyConstructorMissesFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CopyConstructorMissesFieldInspection.java @@ -133,9 +133,8 @@ public class CopyConstructorMissesFieldInspection extends BaseInspection { methods.add(method); } } - else if (qualifier instanceof PsiReferenceExpression) { + else if (qualifier instanceof PsiReferenceExpression referenceExpression) { // consider field assigned if method is called on it. - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifier; final PsiElement target = referenceExpression.resolve(); if (target instanceof PsiField) { assignedFields.add((PsiField)target); @@ -146,10 +145,9 @@ public class CopyConstructorMissesFieldInspection extends BaseInspection { } private static PsiVariable resolveVariable(PsiExpression expression, @Nullable PsiParameter requiredQualifier) { - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return null; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; final PsiExpression qualifier = PsiUtil.skipParenthesizedExprDown(referenceExpression.getQualifierExpression()); final PsiElement target = referenceExpression.resolve(); if (requiredQualifier == null) { @@ -164,10 +162,9 @@ public class CopyConstructorMissesFieldInspection extends BaseInspection { } private static PsiField resolveFieldOfGetter(PsiExpression expression, @NotNull PsiParameter requiredQualifier) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return null; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiExpression qualifier = methodCallExpression.getMethodExpression().getQualifierExpression(); if (!ExpressionUtils.isReferenceTo(qualifier, requiredQualifier)) { return null; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspection.java index d042a2f416a0..2d38c84f92df 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspection.java @@ -330,8 +330,7 @@ public class IgnoreResultOfCallInspection extends BaseInspection { } private static boolean isHardcodedException(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) return false; - PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (!(expression instanceof PsiMethodCallExpression call)) return false; if (STREAM_COLLECT.test(call)) { PsiMethodCallExpression collector = ObjectUtils.tryCast(PsiUtil.skipParenthesizedExprDown(call.getArgumentList().getExpressions()[0]), PsiMethodCallExpression.class); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MalformedFormatStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MalformedFormatStringInspection.java index cbd3fa6a1dd4..df4f1097a272 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MalformedFormatStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MalformedFormatStringInspection.java @@ -83,8 +83,7 @@ public class MalformedFormatStringInspection extends BaseInspection { @NotNull public String buildErrorString(Object... infos) { final Object value = infos[0]; - if (value instanceof Exception) { - final Exception exception = (Exception)value; + if (value instanceof Exception exception) { final String message = exception.getMessage(); if (message != null) { return InspectionGadgetsBundle.message("malformed.format.string.problem.descriptor.illegal", message); @@ -173,8 +172,7 @@ public class MalformedFormatStringInspection extends BaseInspection { final PsiType argumentType = argument.getType(); if (argumentType instanceof PsiArrayType) { final PsiArrayInitializerExpression arrayInitializer; - if (argument instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)argument; + if (argument instanceof PsiNewExpression newExpression) { arrayInitializer = newExpression.getArrayInitializer(); } else if (argument instanceof PsiArrayInitializerExpression) { @@ -219,11 +217,9 @@ public class MalformedFormatStringInspection extends BaseInspection { private static PsiExpression resolveIfPossible(PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (expression instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; + if (expression instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); - if (target instanceof PsiVariable && target.getContainingFile() == expression.getContainingFile()) { - final PsiVariable variable = (PsiVariable)target; + if (target instanceof PsiVariable variable && target.getContainingFile() == expression.getContainingFile()) { final PsiExpression initializer = variable.getInitializer(); if (initializer != null) { return initializer; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MismatchedCollectionQueryUpdateInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MismatchedCollectionQueryUpdateInspection.java index 195e81c12929..8a3ec35979da 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MismatchedCollectionQueryUpdateInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MismatchedCollectionQueryUpdateInspection.java @@ -384,10 +384,9 @@ public class MismatchedCollectionQueryUpdateInspection extends BaseInspection { } private static boolean isEmptyCollectionInitializer(PsiExpression initializer) { - if (!(initializer instanceof PsiNewExpression)) { + if (!(initializer instanceof PsiNewExpression newExpression)) { return ConstructionUtils.isEmptyCollectionInitializer(initializer); } - final PsiNewExpression newExpression = (PsiNewExpression)initializer; final PsiExpressionList argumentList = newExpression.getArgumentList(); if (argumentList == null) { return false; @@ -522,8 +521,7 @@ public class MismatchedCollectionQueryUpdateInspection extends BaseInspection { .allMatch(MismatchedCollectionQueryUpdateInspection::isEmptyCollectionInitializer)) { return true; } - if (initializer instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)initializer; + if (initializer instanceof PsiNewExpression newExpression) { final PsiAnonymousClass anonymousClass = newExpression.getAnonymousClass(); if (anonymousClass != null) { if (getCollectionQueryUpdateInfo(null, anonymousClass, queryNames, updateNames).updated) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspection.java index 557e1ab0543d..9ba70d4f798c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspection.java @@ -87,10 +87,9 @@ public class ResultOfObjectAllocationIgnoredInspection extends BaseInspection { return; } final PsiElement target = reference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)target; if (!(expression instanceof PsiAnonymousClass) && ignoredClasses.contains(aClass.getQualifiedName())) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ReturnNullInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ReturnNullInspection.java index 371d00f1af12..7dd65e5057e5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ReturnNullInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ReturnNullInspection.java @@ -124,10 +124,9 @@ public class ReturnNullInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiLiteralExpression)) { + if (!(element instanceof PsiLiteralExpression literalExpression)) { return; } - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)element; PsiReplacementUtil.replaceExpression(literalExpression, getReplacementText()); } @@ -219,8 +218,7 @@ public class ReturnNullInspection extends BaseInspection { private boolean isInNullableContext(PsiElement element) { final PsiElement parent = element instanceof PsiExpression ? ExpressionUtils.getPassThroughParent((PsiExpression)element) : element; - if (parent instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)parent; + if (parent instanceof PsiVariable variable) { final PsiCodeBlock codeBlock = PsiTreeUtil.getParentOfType(variable, PsiCodeBlock.class); if (codeBlock == null) { return false; @@ -230,8 +228,7 @@ public class ReturnNullInspection extends BaseInspection { } else if (parent instanceof PsiExpressionList) { final PsiElement grandParent = parent.getParent(); - if (grandParent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; + if (grandParent instanceof PsiMethodCallExpression methodCallExpression) { return MAP_COMPUTE.test(methodCallExpression); } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/SubtractionInCompareToInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/SubtractionInCompareToInspection.java index 90e3e4989af2..824ec87f0f44 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/SubtractionInCompareToInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/SubtractionInCompareToInspection.java @@ -162,8 +162,7 @@ public class SubtractionInCompareToInspection extends BaseInspection { private boolean isSafeOperand(PsiExpression operand) { operand = PsiUtil.skipParenthesizedExprDown(operand); - if (operand instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)operand; + if (operand instanceof PsiMethodCallExpression methodCallExpression) { return methodMatcher.matches(methodCallExpression); } return ExpressionUtils.getArrayFromLengthExpression(operand) != null; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspection.java index 53bf536751ca..bd512e4bd1d2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspection.java @@ -71,10 +71,9 @@ public class ClassNameDiffersFromFileNameInspection extends BaseInspection { public void visitClass(@NotNull PsiClass aClass) { // no call to super, so that it doesn't drill down to inner classes final PsiElement parent = aClass.getParent(); - if (!(parent instanceof PsiJavaFile)) { + if (!(parent instanceof PsiJavaFile file)) { return; } - final PsiJavaFile file = (PsiJavaFile)parent; final String className = aClass.getName(); if (className == null) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java index 6ed292b75afb..0090200bcb55 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java @@ -136,10 +136,9 @@ public class EmptyClassInspection extends BaseInspection { @Override public void visitFile(@NotNull PsiFile file) { super.visitFile(file); - if (!(file instanceof PsiJavaFile)) { + if (!(file instanceof PsiJavaFile javaFile)) { return; } - final PsiJavaFile javaFile = (PsiJavaFile)file; if (javaFile.getClasses().length != 0) { return; } @@ -211,12 +210,11 @@ public class EmptyClassInspection extends BaseInspection { } private boolean isSuperParametrization(PsiClass aClass) { - if (!(aClass instanceof PsiAnonymousClass)) { + if (!(aClass instanceof PsiAnonymousClass anonymousClass)) { final PsiReferenceList extendsList = aClass.getExtendsList(); final PsiReferenceList implementsList = aClass.getImplementsList(); return hasTypeArguments(extendsList) || hasTypeArguments(implementsList); } - final PsiAnonymousClass anonymousClass = (PsiAnonymousClass)aClass; final PsiJavaCodeReferenceElement reference = anonymousClass.getBaseClassReference(); final PsiReferenceParameterList parameterList = reference.getParameterList(); if (parameterList == null) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MultipleTopLevelClassesInFileInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MultipleTopLevelClassesInFileInspection.java index 61ec734b99c7..39185378e3a0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MultipleTopLevelClassesInFileInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MultipleTopLevelClassesInFileInspection.java @@ -71,10 +71,9 @@ public class MultipleTopLevelClassesInFileInspection extends BaseInspection { public void visitClass(@NotNull PsiClass aClass) { // no call to super, so that it doesn't drill down to inner classes PsiElement parent = aClass.getParent(); - if (!(parent instanceof PsiJavaFile)) { + if (!(parent instanceof PsiJavaFile file)) { return; } - final PsiJavaFile file = (PsiJavaFile)parent; int numClasses = 0; final PsiElement[] children = file.getChildren(); for (final PsiElement child : children) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java index e329df66bbbe..64328c776be7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java @@ -121,8 +121,7 @@ public class ProtectedMemberInFinalClassInspection extends BaseInspection implem private static FixData prepareDataForFix(PsiElement element) { final PsiElement parent = element.getParent(); final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMember)) return null; - final PsiMember member = (PsiMember)grandParent; + if (!(grandParent instanceof PsiMember member)) return null; final PsiModifierList modifierList = member.getModifierList(); if (modifierList == null) return null; final PsiModifierList modifierListCopy = (PsiModifierList)modifierList.copy(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java index ccd7dd0ea20e..b5c7f544bff6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java @@ -132,10 +132,9 @@ public class UtilityClassWithoutPrivateConstructorInspection extends BaseInspect public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement classNameIdentifier = descriptor.getPsiElement(); final PsiElement parent = classNameIdentifier.getParent(); - if (!(parent instanceof PsiClass)) { + if (!(parent instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)parent; if (isOnTheFly() && hasImplicitConstructorUsage(aClass)) { SwingUtilities.invokeLater(() -> Messages.showInfoMessage( aClass.getProject(), @@ -165,10 +164,9 @@ public class UtilityClassWithoutPrivateConstructorInspection extends BaseInspect public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement classNameIdentifier = descriptor.getPsiElement(); final PsiElement parent = classNameIdentifier.getParent(); - if (!(parent instanceof PsiClass)) { + if (!(parent instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)parent; final PsiMethod[] constructors = aClass.getConstructors(); for (final PsiMethod constructor : constructors) { final PsiParameterList parameterList = constructor.getParameterList(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneableImplementsCloneInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneableImplementsCloneInspection.java index 5ac36cecb85e..e8911dce57a9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneableImplementsCloneInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneableImplementsCloneInspection.java @@ -122,10 +122,9 @@ public class CloneableImplementsCloneInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiClass)) { + if (!(parent instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)parent; @NonNls final StringBuilder methodText = new StringBuilder(); final JavaCodeStyleSettings codeStyleSettings = JavaCodeStyleSettings.getInstance(aClass.getContainingFile()); if (PsiUtil.isLanguageLevel5OrHigher(aClass) && codeStyleSettings.INSERT_OVERRIDE_ANNOTATION) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionCoveredByFurtherConditionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionCoveredByFurtherConditionInspection.java index df0c5840eb2c..e49b3ad5cf88 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionCoveredByFurtherConditionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionCoveredByFurtherConditionInspection.java @@ -133,11 +133,10 @@ public class ConditionCoveredByFurtherConditionInspection extends AbstractBaseJa String text = StreamEx.ofReversed(operands) .map(expression -> ParenthesesUtils.getText(expression, PsiPrecedenceUtil.AND_PRECEDENCE)).joining(and ? " && " : " || "); PsiExpression expression = JavaPsiFacade.getElementFactory(context.getProject()).createExpressionFromText(text, context); - if (!(expression instanceof PsiPolyadicExpression)) { + if (!(expression instanceof PsiPolyadicExpression expressionToAnalyze)) { LOG.error("Unexpected expression type: " + expression.getClass().getName(), new Attachment("reversed.txt", text)); return ArrayUtilRt.EMPTY_INT_ARRAY; } - PsiPolyadicExpression expressionToAnalyze = (PsiPolyadicExpression)expression; List reversedOperands = Arrays.asList(expressionToAnalyze.getOperands()); Map values = computeOperandValues(expressionToAnalyze); return StreamEx.ofKeys(values, ThreeState.fromBoolean(and)::equals) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java index c01c692de4d5..56f8effa3965 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java @@ -87,10 +87,9 @@ public class ConditionalExpressionInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiConditionalExpression)) { + if (!(element instanceof PsiConditionalExpression expression)) { return; } - PsiConditionalExpression expression = (PsiConditionalExpression)element; CodeBlockSurrounder surrounder = CodeBlockSurrounder.forExpression(expression); if (surrounder == null) return; CodeBlockSurrounder.SurroundResult result = surrounder.surround(); @@ -154,25 +153,20 @@ public class ConditionalExpressionInspection extends BaseInspection { ifStatement = (PsiIfStatement)tracker.replaceAndRestoreComments(statement, ifStatement); } final PsiStatement elseBranch = ifStatement.getElseBranch(); - if (elseBranch instanceof PsiReturnStatement) { - final PsiReturnStatement returnStatement = (PsiReturnStatement)elseBranch; + if (elseBranch instanceof PsiReturnStatement returnStatement) { final PsiExpression value = returnStatement.getReturnValue(); - if (value instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)value; + if (value instanceof PsiParenthesizedExpression parenthesizedExpression) { if (parenthesizedExpression.getExpression() == null) { elseBranch.delete(); } } } - else if (elseBranch instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)elseBranch; + else if (elseBranch instanceof PsiExpressionStatement expressionStatement) { final PsiExpression statementExpression = expressionStatement.getExpression(); - if (statementExpression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)statementExpression; + if (statementExpression instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression rhs = assignmentExpression.getRExpression(); - if (rhs instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)rhs; + if (rhs instanceof PsiParenthesizedExpression parenthesizedExpression) { if (parenthesizedExpression.getExpression() == null) { rhs.delete(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java index 02d5e31a6134..419397f6d0a6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java @@ -97,8 +97,7 @@ public class ExcessiveRangeCheckInspection extends AbstractBaseJavaLocalInspecti } } } - if (expression instanceof PsiBinaryExpression) { - PsiBinaryExpression binOp = (PsiBinaryExpression)expression; + if (expression instanceof PsiBinaryExpression binOp) { RelationType rel = DfaPsiUtil.getRelationByToken(binOp.getOperationTokenType()); if (rel == null) return null; PsiExpression left = PsiUtil.skipParenthesizedExprDown(binOp.getLOperand()); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/OverlyComplexBooleanExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/OverlyComplexBooleanExpressionInspection.java index c1d69836931a..6d1f3e790805 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/OverlyComplexBooleanExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/OverlyComplexBooleanExpressionInspection.java @@ -119,43 +119,36 @@ public class OverlyComplexBooleanExpressionInspection extends BaseInspection { if (!isBoolean(expression)) { return 1; } - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression polyadicExpression) { final PsiExpression[] operands = polyadicExpression.getOperands(); return Arrays.stream(operands).mapToInt(this::countTerms).sum(); } - else if (expression instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression; + else if (expression instanceof PsiPrefixExpression prefixExpression) { return countTerms(prefixExpression.getOperand()); } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { return countTerms(parenthesizedExpression.getExpression()); } return 1; } private boolean isBoolean(PsiExpression expression) { - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression polyadicExpression) { return s_booleanOperators.contains(polyadicExpression.getOperationTokenType()); } - else if (expression instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression; + else if (expression instanceof PsiPrefixExpression prefixExpression) { return JavaTokenType.EXCL.equals(prefixExpression.getOperationTokenType()); } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { return isBoolean(parenthesizedExpression.getExpression()); } return false; } private boolean isPureConjunctionDisjunction(PsiExpression expression) { - if (!(expression instanceof PsiPolyadicExpression)) { + if (!(expression instanceof PsiPolyadicExpression polyadicExpression)) { return false; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; final IElementType sign = polyadicExpression.getOperationTokenType(); if (!s_booleanOperators.contains(sign)) { return false; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java index 2351644f7e86..a1064c42c479 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java @@ -87,8 +87,7 @@ public class PointlessBooleanExpressionInspection extends BaseInspection impleme else if (expression instanceof PsiPrefixExpression) { buildSimplifiedPrefixExpression((PsiPrefixExpression)expression, out, tracker); } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { final PsiExpression expression1 = parenthesizedExpression.getExpression(); out.append('('); buildSimplifiedExpression(expression1, out, tracker); @@ -316,10 +315,9 @@ public class PointlessBooleanExpressionInspection extends BaseInspection impleme @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiAssignmentExpression)) { + if (!(element instanceof PsiAssignmentExpression assignmentExpression)) { return; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)element; final PsiElement parent = assignmentExpression.getParent(); assert parent instanceof PsiStatement; final List sideEffects = SideEffectChecker.extractSideEffectExpressions(assignmentExpression.getLExpression()); @@ -360,10 +358,9 @@ public class PointlessBooleanExpressionInspection extends BaseInspection impleme @Override public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiExpression)) { + if (!(element instanceof PsiExpression expression)) { return; } - PsiExpression expression = (PsiExpression)element; CommentTracker tracker = new CommentTracker(); String simplifiedExpression = buildSimplifiedExpression(expression, new StringBuilder(), tracker).toString(); boolean isConstant = simplifiedExpression.equals("true") || simplifiedExpression.equals("false"); @@ -392,10 +389,9 @@ public class PointlessBooleanExpressionInspection extends BaseInspection impleme } private List extractSideEffects(PsiExpression expression) { - if (!(expression instanceof PsiPolyadicExpression)) { + if (!(expression instanceof PsiPolyadicExpression polyadicExpression)) { return Collections.emptyList(); } - PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; IElementType sign = polyadicExpression.getOperationTokenType(); Boolean stopper = (sign == JavaTokenType.ANDAND) ? Boolean.FALSE : sign == JavaTokenType.OROR ? Boolean.TRUE : null; PsiExpression[] operands = polyadicExpression.getOperands(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java index c3ad7e9a4777..8fc5e3fa6aad 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java @@ -144,8 +144,7 @@ public class SwitchStatementWithTooFewBranchesInspection extends BaseInspection } else { PsiStatement[] statements = body.getStatements(); - if (statements.length == 1 && statements[0] instanceof PsiSwitchLabeledRuleStatement) { - PsiSwitchLabeledRuleStatement statement = (PsiSwitchLabeledRuleStatement)statements[0]; + if (statements.length == 1 && statements[0] instanceof PsiSwitchLabeledRuleStatement statement) { fixIsAvailable = SwitchUtils.isDefaultLabel(statement) && statement.getBody() instanceof PsiExpressionStatement; } else { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/BooleanVariableAlwaysNegatedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/BooleanVariableAlwaysNegatedInspection.java index 8e1e264ada95..97552249ceff 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/BooleanVariableAlwaysNegatedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/BooleanVariableAlwaysNegatedInspection.java @@ -132,12 +132,10 @@ public class BooleanVariableAlwaysNegatedInspection extends BaseInspection { while (parent instanceof PsiParenthesizedExpression) { parent = parent.getParent(); } - if (!(parent instanceof PsiPrefixExpression)) { + if (!(parent instanceof PsiPrefixExpression prefixExpression)) { alwaysNegated = false; return; } - final PsiPrefixExpression prefixExpression = - (PsiPrefixExpression)parent; final IElementType tokenType = prefixExpression.getOperationTokenType(); if (!JavaTokenType.EXCL.equals(tokenType)) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java index 7f72d8de7daf..f48f78e7c3b9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java @@ -128,10 +128,9 @@ public class ReuseOfLocalVariableInspection extends BaseInspection { return; } final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(assignment.getLExpression()); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression reference)) { return; } - final PsiReferenceExpression reference = (PsiReferenceExpression)lhs; final PsiElement referent = reference.resolve(); if (!(referent instanceof PsiLocalVariable)) { return; @@ -165,8 +164,7 @@ public class ReuseOfLocalVariableInspection extends BaseInspection { registerError(lhs); return; } - if (assignmentBlock instanceof PsiCodeBlock) { - final PsiCodeBlock block = (PsiCodeBlock)assignmentBlock; + if (assignmentBlock instanceof PsiCodeBlock block) { boolean before = true; for (PsiStatement statement : block.getStatements()) { if (statement.equals(assignmentParent)) before = false; @@ -183,13 +181,11 @@ public class ReuseOfLocalVariableInspection extends BaseInspection { outer: while (parent != null) { boolean before = true; - if (child instanceof PsiSwitchLabeledRuleStatement) { - final PsiSwitchLabeledRuleStatement ruleStatement = (PsiSwitchLabeledRuleStatement)child; + if (child instanceof PsiSwitchLabeledRuleStatement ruleStatement) { parent = ruleStatement.getEnclosingSwitchBlock(); } - else if (child instanceof PsiBreakStatement) { + else if (child instanceof PsiBreakStatement breakStatement) { // in switch statement - final PsiBreakStatement breakStatement = (PsiBreakStatement)child; parent = breakStatement.findExitedStatement(); } else if (parent instanceof PsiCodeBlock) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java index 8e8239f4ba29..b3fa60f8d651 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java @@ -84,8 +84,7 @@ public class TooBroadScopeInspection extends BaseInspection { if (PsiUtil.isConstantExpression(expression) || ExpressionUtils.isNullLiteral(expression)) { return true; } - if (expression instanceof PsiArrayInitializerExpression) { - final PsiArrayInitializerExpression arrayInitializerExpression = (PsiArrayInitializerExpression)expression; + if (expression instanceof PsiArrayInitializerExpression arrayInitializerExpression) { for (PsiExpression initializer : arrayInitializerExpression.getInitializers()) { if (!isMovable(initializer)) { return false; @@ -93,8 +92,7 @@ public class TooBroadScopeInspection extends BaseInspection { } return true; } - if (expression instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)expression; + if (expression instanceof PsiNewExpression newExpression) { final PsiExpression[] arrayDimensions = newExpression.getArrayDimensions(); if (arrayDimensions.length > 0) { for (PsiExpression arrayDimension : arrayDimensions) { @@ -135,8 +133,7 @@ public class TooBroadScopeInspection extends BaseInspection { } return true; } - if (expression instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; + if (expression instanceof PsiReferenceExpression referenceExpression) { final PsiExpression qualifier = referenceExpression.getQualifierExpression(); if (!isMovable(qualifier)) { return false; @@ -145,10 +142,9 @@ public class TooBroadScopeInspection extends BaseInspection { if (target instanceof PsiClass) { return true; } - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)target; if (!ClassUtils.isImmutable(variable.getType()) && !CollectionUtils.isEmptyArray(variable)) { return false; } @@ -159,8 +155,7 @@ public class TooBroadScopeInspection extends BaseInspection { return context != null && !(variable instanceof PsiField) && HighlightControlFlowUtil.isEffectivelyFinal(variable, context, referenceExpression); } - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression polyadicExpression) { for (PsiExpression operand : polyadicExpression.getOperands()) { if (!isMovable(operand)) { return false; @@ -168,11 +163,10 @@ public class TooBroadScopeInspection extends BaseInspection { } return true; } - if (expression instanceof PsiMethodCallExpression) { + if (expression instanceof PsiMethodCallExpression methodCallExpression) { if (!isAllowedType(expression.getType())) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiMethod method = methodCallExpression.resolveMethod(); if (!isAllowedMethod(method)) { return false; @@ -344,15 +338,13 @@ public class TooBroadScopeInspection extends BaseInspection { } private boolean isAssignmentToVariable(PsiElement element, PsiLocalVariable variable) { - if (!(element instanceof PsiExpressionStatement)) { + if (!(element instanceof PsiExpressionStatement expressionStatement)) { return false; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)element; final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiAssignmentExpression)) { + if (!(expression instanceof PsiAssignmentExpression assignmentExpression)) { return false; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; final IElementType tokenType = assignmentExpression.getOperationTokenType(); if (tokenType != JavaTokenType.EQ) { return false; @@ -426,19 +418,16 @@ public class TooBroadScopeInspection extends BaseInspection { newDeclaration = resourceReference.getParent().addBefore(resourceVariable, resourceReference); resourceReference.delete(); } - else if (commonParent instanceof PsiForStatement) { - final PsiForStatement forStatement = (PsiForStatement)commonParent; + else if (commonParent instanceof PsiForStatement forStatement) { final PsiStatement initialization = forStatement.getInitialization(); if (initialization == null) { return; } - if (initialization instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)initialization; + if (initialization instanceof PsiExpressionStatement expressionStatement) { final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiAssignmentExpression)) { + if (!(expression instanceof PsiAssignmentExpression assignmentExpression)) { return; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; final PsiExpression rhs = assignmentExpression.getRExpression(); newDeclaration = createNewDeclaration(variable, rhs, tracker); } @@ -523,11 +512,9 @@ public class TooBroadScopeInspection extends BaseInspection { } assert statementParent != null; final PsiExpression initializer = variable.getInitializer(); - if (isMovable(initializer) && statement instanceof PsiExpressionStatement) { - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; + if (isMovable(initializer) && statement instanceof PsiExpressionStatement expressionStatement) { final PsiExpression expression = expressionStatement.getExpression(); - if (expression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; + if (expression instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression rhs = assignmentExpression.getRExpression(); final PsiExpression lhs = assignmentExpression.getLExpression(); final IElementType tokenType = assignmentExpression.getOperationTokenType(); @@ -542,8 +529,7 @@ public class TooBroadScopeInspection extends BaseInspection { } } PsiDeclarationStatement newDeclaration = createNewDeclaration(variable, initializer, tracker); - if (statement instanceof PsiForStatement) { - final PsiForStatement forStatement = (PsiForStatement)statement; + if (statement instanceof PsiForStatement forStatement) { final PsiStatement initialization = forStatement.getInitialization(); newDeclaration = (PsiDeclarationStatement)forStatement.addBefore(newDeclaration, initialization); if (initialization != null) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java index 8534877862e7..76aeb45ba08a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java @@ -126,20 +126,17 @@ public class UnnecessaryLocalVariableInspection extends BaseInspection { return false; } final PsiElement parent = variable.getParent(); - if (!(parent instanceof PsiDeclarationStatement)) { + if (!(parent instanceof PsiDeclarationStatement declarationStatement)) { return false; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)parent; final PsiStatement nextStatement = PsiTreeUtil.getNextSiblingOfType(declarationStatement, PsiStatement.class); - if (!(nextStatement instanceof PsiReturnStatement)) { + if (!(nextStatement instanceof PsiReturnStatement returnStatement)) { return false; } - final PsiReturnStatement returnStatement = (PsiReturnStatement)nextStatement; final PsiExpression returnValue = PsiUtil.skipParenthesizedExprDown(returnStatement.getReturnValue()); - if (!(returnValue instanceof PsiReferenceExpression)) { + if (!(returnValue instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)returnValue; final PsiElement referent = referenceExpression.resolve(); if (referent == null || !referent.equals(variable)) { return false; @@ -167,15 +164,13 @@ public class UnnecessaryLocalVariableInspection extends BaseInspection { return false; } final PsiElement parent = variable.getParent(); - if (!(parent instanceof PsiDeclarationStatement)) { + if (!(parent instanceof PsiDeclarationStatement declarationStatement)) { return false; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)parent; final PsiStatement nextStatement = PsiTreeUtil.getNextSiblingOfType(declarationStatement, PsiStatement.class); - if (!(nextStatement instanceof PsiThrowStatement)) { + if (!(nextStatement instanceof PsiThrowStatement throwStatement)) { return false; } - final PsiThrowStatement throwStatement = (PsiThrowStatement)nextStatement; final PsiExpression returnValue = PsiUtil.skipParenthesizedExprDown(throwStatement.getException()); if (!(returnValue instanceof PsiReferenceExpression)) { return false; @@ -193,32 +188,28 @@ public class UnnecessaryLocalVariableInspection extends BaseInspection { return false; } final PsiElement parent = variable.getParent(); - if (!(parent instanceof PsiDeclarationStatement)) { + if (!(parent instanceof PsiDeclarationStatement declarationStatement)) { return false; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)parent; if (declarationStatement.getParent() instanceof PsiForStatement) { return false; } PsiStatement nextStatement = PsiTreeUtil.getNextSiblingOfType(declarationStatement, PsiStatement.class); - if (!(nextStatement instanceof PsiExpressionStatement)) { + if (!(nextStatement instanceof PsiExpressionStatement expressionStatement)) { return false; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)nextStatement; final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiAssignmentExpression)) { + if (!(expression instanceof PsiAssignmentExpression assignmentExpression)) { return false; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; final IElementType tokenType = assignmentExpression.getOperationTokenType(); if (tokenType != JavaTokenType.EQ) { return false; } final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getRExpression()); - if (!(rhs instanceof PsiReferenceExpression)) { + if (!(rhs instanceof PsiReferenceExpression reference)) { return false; } - final PsiReferenceExpression reference = (PsiReferenceExpression)rhs; if (!reference.isReferenceTo(variable)) { return false; } @@ -245,22 +236,18 @@ public class UnnecessaryLocalVariableInspection extends BaseInspection { return false; } final PsiElement parent = variable.getParent(); - if (!(parent instanceof PsiDeclarationStatement)) { + if (!(parent instanceof PsiDeclarationStatement declarationStatement)) { return false; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)parent; PsiStatement nextStatement = PsiTreeUtil.getNextSiblingOfType(declarationStatement, PsiStatement.class); - if (nextStatement instanceof PsiDeclarationStatement) { + if (nextStatement instanceof PsiDeclarationStatement nextDeclarationStatement) { boolean referenceFound = false; - final PsiDeclarationStatement nextDeclarationStatement = (PsiDeclarationStatement)nextStatement; for (PsiElement declaration : nextDeclarationStatement.getDeclaredElements()) { - if (!(declaration instanceof PsiVariable)) { + if (!(declaration instanceof PsiVariable nextVariable)) { continue; } - final PsiVariable nextVariable = (PsiVariable)declaration; final PsiExpression initializer = PsiUtil.skipParenthesizedExprDown(nextVariable.getInitializer()); - if (!referenceFound && initializer instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)initializer; + if (!referenceFound && initializer instanceof PsiReferenceExpression referenceExpression) { final PsiElement referent = referenceExpression.resolve(); if (variable.equals(referent)) { referenceFound = true; @@ -275,8 +262,7 @@ public class UnnecessaryLocalVariableInspection extends BaseInspection { return false; } } - else if (nextStatement instanceof PsiTryStatement) { - final PsiTryStatement tryStatement = (PsiTryStatement)nextStatement; + else if (nextStatement instanceof PsiTryStatement tryStatement) { final PsiResourceList resourceList = tryStatement.getResourceList(); if (resourceList == null) { return false; @@ -285,8 +271,7 @@ public class UnnecessaryLocalVariableInspection extends BaseInspection { for (PsiResourceListElement resource : resourceList) { if (resource instanceof PsiResourceVariable) { final PsiExpression initializer = ((PsiResourceVariable)resource).getInitializer(); - if (!referenceFound && initializer instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)initializer; + if (!referenceFound && initializer instanceof PsiReferenceExpression referenceExpression) { final PsiElement referent = referenceExpression.resolve(); if (variable.equals(referent)) { referenceFound = true; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/PublicFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/PublicFieldInspection.java index 6cda0ce5abd5..f3f9a064a4e0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/PublicFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/PublicFieldInspection.java @@ -96,8 +96,7 @@ public class PublicFieldInspection extends BaseInspection { return; } if (ignoreEnums) { - if (type instanceof PsiClassType) { - final PsiClassType classType = (PsiClassType)type; + if (type instanceof PsiClassType classType) { final PsiClass aClass = classType.resolve(); if (aClass != null && aClass.isEnum()) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReplaceWithCloneFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReplaceWithCloneFix.java index e2d182542a1b..2fbc39892704 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReplaceWithCloneFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReplaceWithCloneFix.java @@ -39,10 +39,9 @@ class ReplaceWithCloneFix extends InspectionGadgetsFix { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiReferenceExpression)) { + if (!(element instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element; if (referenceExpression.getType() instanceof PsiArrayType) { PsiReplacementUtil.replaceExpression(referenceExpression, referenceExpression.getText() + ".clone()"); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldFix.java index f9f3e72e336e..bc2cd457c91e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldFix.java @@ -69,10 +69,9 @@ final class ReturnOfCollectionFieldFix extends InspectionGadgetsFix { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiReferenceExpression)) { + if (!(element instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element; fixContainingMethodReturnType(referenceExpression); PsiReplacementUtil.replaceExpressionAndShorten(referenceExpression, myReplacementText); } @@ -90,11 +89,10 @@ final class ReturnOfCollectionFieldFix extends InspectionGadgetsFix { if (!InheritanceUtil.isInheritor(type, myQualifiedClassName)) { return; } - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType classType)) { return; } final Project project = referenceExpression.getProject(); - final PsiClassType classType = (PsiClassType)type; final PsiClass aClass = classType.resolve(); if (aClass == null || myQualifiedClassName.equals(aClass.getQualifiedName())) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/UseOfAnotherObjectsPrivateFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/UseOfAnotherObjectsPrivateFieldInspection.java index 66294b29a1c7..c79a3bf1bb8e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/UseOfAnotherObjectsPrivateFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/UseOfAnotherObjectsPrivateFieldInspection.java @@ -96,10 +96,9 @@ public class UseOfAnotherObjectsPrivateFieldInspection } } final PsiElement referent = expression.resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return; } - final PsiField field = (PsiField)referent; if (ignoreSameClass) { final PsiClass parent = PsiTreeUtil.getParentOfType(expression, PsiClass.class); final PsiClass containingClass = field.getContainingClass(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java index dbc6f737c9d1..bf3f83acaf3d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java @@ -107,10 +107,9 @@ public class BadExceptionDeclaredInspection extends BaseInspection { final PsiJavaCodeReferenceElement[] references = throwsList.getReferenceElements(); for (PsiJavaCodeReferenceElement reference : references) { final PsiElement element = reference.resolve(); - if (!(element instanceof PsiClass)) { + if (!(element instanceof PsiClass thrownClass)) { continue; } - final PsiClass thrownClass = (PsiClass)element; final String qualifiedName = thrownClass.getQualifiedName(); if (qualifiedName != null && exceptions.contains(qualifiedName)) { registerError(reference, reference); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java index 8b28264e7210..a61e34b2cfaf 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java @@ -331,8 +331,7 @@ public class CatchMayIgnoreExceptionInspection extends AbstractBaseJavaLocalInsp public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiCatchSection)) return; - final PsiCatchSection catchSection = (PsiCatchSection)parent; + if (!(parent instanceof PsiCatchSection catchSection)) return; final PsiParameter parameter = catchSection.getParameter(); if (parameter == null) return; final PsiIdentifier identifier = parameter.getNameIdentifier(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowsRuntimeExceptionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowsRuntimeExceptionInspection.java index e20845342019..19b61ed8e1ee 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowsRuntimeExceptionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowsRuntimeExceptionInspection.java @@ -82,10 +82,9 @@ public class ThrowsRuntimeExceptionInspection extends BaseInspection { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethod)) { + if (!(grandParent instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)grandParent; final PsiDocComment comment = method.getDocComment(); final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project); if (comment != null) { @@ -100,8 +99,7 @@ public class ThrowsRuntimeExceptionInspection extends BaseInspection { if (documentationProvider instanceof CodeDocumentationProvider) { codeDocumentationProvider = (CodeDocumentationProvider)documentationProvider; } - else if (documentationProvider instanceof CompositeDocumentationProvider) { - final CompositeDocumentationProvider compositeDocumentationProvider = (CompositeDocumentationProvider)documentationProvider; + else if (documentationProvider instanceof CompositeDocumentationProvider compositeDocumentationProvider) { codeDocumentationProvider = compositeDocumentationProvider.getFirstCodeDocumentationProvider(); if (codeDocumentationProvider == null) { return; @@ -120,10 +118,9 @@ public class ThrowsRuntimeExceptionInspection extends BaseInspection { public static boolean isApplicable(@NotNull PsiJavaCodeReferenceElement reference) { final PsiElement parent = reference.getParent(); final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethod)) { + if (!(grandParent instanceof PsiMethod method)) { return false; } - final PsiMethod method = (PsiMethod)grandParent; final PsiDocComment docComment = method.getDocComment(); if (docComment == null) { return true; @@ -143,10 +140,9 @@ public class ThrowsRuntimeExceptionInspection extends BaseInspection { continue; } final PsiElement grandChild = child.getFirstChild(); - if (!(grandChild instanceof PsiJavaCodeReferenceElement)) { + if (!(grandChild instanceof PsiJavaCodeReferenceElement referenceElement)) { continue; } - final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)grandChild; final PsiElement target = referenceElement.resolve(); if (throwsTarget.equals(target)) { return false; @@ -191,10 +187,9 @@ public class ThrowsRuntimeExceptionInspection extends BaseInspection { final PsiJavaCodeReferenceElement[] referenceElements = throwsList.getReferenceElements(); for (PsiJavaCodeReferenceElement referenceElement : referenceElements) { final PsiElement target = referenceElement.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { continue; } - final PsiClass aClass = (PsiClass)target; if (!InheritanceUtil.isInheritor(aClass, "java.lang.RuntimeException")) { continue; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java index 041228659be8..3ad91440f106 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java @@ -121,10 +121,9 @@ public class TooBroadCatchInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiTypeElement)) { + if (!(element instanceof PsiTypeElement typeElement)) { return; } - final PsiTypeElement typeElement = (PsiTypeElement)element; final PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory(); final PsiClassType type = factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION); final PsiTypeElement newTypeElement = factory.createTypeElement(type); @@ -169,10 +168,9 @@ public class TooBroadCatchInspection extends BaseInspection { return; } final PsiElement catchBlock = ((PsiParameter)catchParameter).getDeclarationScope(); - if (!(catchBlock instanceof PsiCatchSection)) { + if (!(catchBlock instanceof PsiCatchSection myBeforeCatchSection)) { return; } - final PsiCatchSection myBeforeCatchSection = (PsiCatchSection)catchBlock; final PsiTryStatement myTryStatement = myBeforeCatchSection.getTryStatement(); final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(project); final String name = codeStyleManager.suggestUniqueVariableName("e", myTryStatement.getTryBlock(), false); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java index 92430a56d549..91cfc80c430d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java @@ -142,10 +142,9 @@ public class TooBroadThrowsInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiReferenceList)) { + if (!(parent instanceof PsiReferenceList referenceList)) { return; } - final PsiReferenceList referenceList = (PsiReferenceList)parent; final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project); if (!originalNeeded) { element.delete(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnnecessaryInitCauseInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnnecessaryInitCauseInspection.java index 9a5e8861f9b9..d9014074d643 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnnecessaryInitCauseInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnnecessaryInitCauseInspection.java @@ -49,8 +49,7 @@ public class UnnecessaryInitCauseInspection extends BaseInspection implements Cl if (expression instanceof PsiNewExpression) { return (PsiNewExpression)expression; } - else if (expression instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; + else if (expression instanceof PsiReferenceExpression referenceExpression) { final PsiExpression definition = DeclarationSearchUtils.findDefinition(referenceExpression, null); if (!(definition instanceof PsiNewExpression)) { return null; @@ -72,10 +71,9 @@ public class UnnecessaryInitCauseInspection extends BaseInspection implements Cl @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent().getParent(); - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression argument = ExpressionUtils.getFirstExpressionInList(argumentList); if (argument == null) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/MultiCatchCanBeSplitInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/MultiCatchCanBeSplitInspection.java index 30000f9c29b1..37b42428f50b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/MultiCatchCanBeSplitInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/MultiCatchCanBeSplitInspection.java @@ -51,10 +51,9 @@ public class MultiCatchCanBeSplitInspection extends BaseInspection { private static void doFixImpl(@NotNull PsiElement element) { final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiCatchSection)) { + if (!(parent instanceof PsiCatchSection catchSection)) { return; } - final PsiCatchSection catchSection = (PsiCatchSection)parent; final PsiElement grandParent = catchSection.getParent(); if (!(grandParent instanceof PsiTryStatement)) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/TryStatementWithMultipleResourcesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/TryStatementWithMultipleResourcesInspection.java index 1afe828bae0c..c9c332eb0112 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/TryStatementWithMultipleResourcesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/TryStatementWithMultipleResourcesInspection.java @@ -76,10 +76,9 @@ public class TryStatementWithMultipleResourcesInspection extends BaseInspection private static boolean isAcceptable(PsiElement element) { final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiTryStatement)) { + if (!(parent instanceof PsiTryStatement tryStatement)) { return false; } - final PsiTryStatement tryStatement = (PsiTryStatement)parent; final PsiResourceList resourceList = tryStatement.getResourceList(); if (resourceList == null) { return false; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java index c4383e5dcf06..3edb23cd42d3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java @@ -37,15 +37,13 @@ public class ExtractParameterAsLocalVariableFix extends InspectionGadgetsFix { return; } final PsiExpression expression = PsiUtil.skipParenthesizedExprDown((PsiExpression)element); - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression parameterReference)) { return; } - final PsiReferenceExpression parameterReference = (PsiReferenceExpression)expression; final PsiElement target = parameterReference.resolve(); - if (!(target instanceof PsiParameter)) { + if (!(target instanceof PsiParameter parameter)) { return; } - final PsiParameter parameter = (PsiParameter)target; final PsiElement declarationScope = parameter.getDeclarationScope(); if (declarationScope instanceof PsiLambdaExpression) { CommonJavaRefactoringUtil.expandExpressionLambdaToCodeBlock((PsiLambdaExpression)declarationScope); @@ -122,10 +120,9 @@ public class ExtractParameterAsLocalVariableFix extends InspectionGadgetsFix { return null; } final PsiElement parent = ParenthesesUtils.getParentSkipParentheses(reference); - if (!(parent instanceof PsiAssignmentExpression)) { + if (!(parent instanceof PsiAssignmentExpression assignmentExpression)) { return null; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; final IElementType tokenType = assignmentExpression.getOperationTokenType(); if (!JavaTokenType.EQ.equals(tokenType)) { return null; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceHolderFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceHolderFix.java index 7c94cba71ec0..5f013be895f1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceHolderFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceHolderFix.java @@ -61,15 +61,13 @@ public class IntroduceHolderFix extends InspectionGadgetsFix { return; } final PsiStatement thenBranch2 = ControlFlowUtils.stripBraces(innerIfStatement.getThenBranch()); - if (!(thenBranch2 instanceof PsiExpressionStatement)) { + if (!(thenBranch2 instanceof PsiExpressionStatement expressionStatement)) { return; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)thenBranch2; final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiAssignmentExpression)) { + if (!(expression instanceof PsiAssignmentExpression assignmentExpression)) { return; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression()); if (!(lhs instanceof PsiReferenceExpression)) { return; @@ -84,10 +82,9 @@ public class IntroduceHolderFix extends InspectionGadgetsFix { public static PsiIfStatement getDoubleCheckedLockingInnerIf(PsiIfStatement ifStatement) { final PsiStatement thenBranch = ControlFlowUtils.stripBraces(ifStatement.getThenBranch()); - if (!(thenBranch instanceof PsiSynchronizedStatement)) { + if (!(thenBranch instanceof PsiSynchronizedStatement synchronizedStatement)) { return null; } - final PsiSynchronizedStatement synchronizedStatement = (PsiSynchronizedStatement)thenBranch; final PsiCodeBlock body = synchronizedStatement.getBody(); final PsiStatement statement = ControlFlowUtils.getOnlyStatementInBlock(body); return (statement instanceof PsiIfStatement) ? (PsiIfStatement)statement : null; @@ -95,19 +92,17 @@ public class IntroduceHolderFix extends InspectionGadgetsFix { private void replaceWithStaticHolder(PsiReferenceExpression referenceExpression, PsiIfStatement ifStatement) { final PsiElement resolved = referenceExpression.resolve(); - if (!(resolved instanceof PsiField)) { + if (!(resolved instanceof PsiField field)) { return; } - final PsiField field = (PsiField)resolved; final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(field.getProject()); final String fieldName = field.getName(); @NonNls final String holderName = StringUtil.capitalize(codeStyleManager.variableNameToPropertyName(fieldName, VariableKind.STATIC_FINAL_FIELD)) + "Holder"; final PsiElement expressionParent = referenceExpression.getParent(); - if (!(expressionParent instanceof PsiAssignmentExpression)) { + if (!(expressionParent instanceof PsiAssignmentExpression assignmentExpression)) { return; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expressionParent; final PsiExpression rhs = assignmentExpression.getRExpression(); if (rhs == null) { return; @@ -217,24 +212,21 @@ public class IntroduceHolderFix extends InspectionGadgetsFix { return false; } final PsiStatement statement = ControlFlowUtils.stripBraces(thenBranch); - if (!(statement instanceof PsiExpressionStatement)) { + if (!(statement instanceof PsiExpressionStatement expressionStatement)) { return false; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; return isSimpleAssignment(expressionStatement, field); } private static boolean isSimpleAssignment(PsiExpressionStatement expressionStatement, PsiField field) { final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiAssignmentExpression)) { + if (!(expression instanceof PsiAssignmentExpression assignmentExpression)) { return false; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression()); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; if (!field.equals(referenceExpression.resolve())) { return false; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveCloneableFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveCloneableFix.java index 9b19e375f7dd..241d5075cfae 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveCloneableFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveCloneableFix.java @@ -39,10 +39,9 @@ public class RemoveCloneableFix extends InspectionGadgetsFix { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent(); - if (!(element instanceof PsiClass)) { + if (!(element instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)element; final PsiReferenceList implementsList = aClass.getImplementsList(); if (implementsList == null) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/StaticImportInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/StaticImportInspection.java index 2873df99b9dc..b0d66c85bf11 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/StaticImportInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/StaticImportInspection.java @@ -128,8 +128,7 @@ public class StaticImportInspection extends BaseInspection { final PsiElement target = reference.resolve(); if (target instanceof PsiEnumConstant && reference instanceof PsiExpression && PsiImplUtil.getSwitchLabel((PsiExpression)reference) != null) continue; - if (target instanceof PsiMember) { - final PsiMember member = (PsiMember)target; + if (target instanceof PsiMember member) { referenceTargetMap.put(reference, member); } } @@ -253,10 +252,9 @@ public class StaticImportInspection extends BaseInspection { return false; } final PsiElement target = reference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return false; } - final PsiClass aClass = (PsiClass)target; final String fqName = aClass.getQualifiedName(); if (fqName == null) { return false; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java index 46c1e8fc1f07..a1536bea745f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java @@ -143,8 +143,7 @@ public class RefusedBequestInspection extends BaseInspection { final PsiElement element2 = JavaCodeStyleManager.getInstance(project).shortenClassReferences(element1); if (isOnTheFly() && element2.isPhysical()) { HighlightUtils.highlightElement(element2); - if (element2 instanceof PsiDeclarationStatement) { - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)element2; + if (element2 instanceof PsiDeclarationStatement declarationStatement) { final PsiLocalVariable variable = (PsiLocalVariable)declarationStatement.getDeclaredElements()[0]; HighlightUtils.showRenameTemplate(body, variable); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java index ccddc9cef86c..cbdf86df4e6b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java @@ -41,19 +41,17 @@ public class NonThreadSafeLazyInitializationInspection extends BaseInspection { public void visitAssignmentExpression(@NotNull PsiAssignmentExpression expression) { super.visitAssignmentExpression(expression); final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(expression.getLExpression()); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression reference)) { return; } final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(expression.getRExpression()); if (rhs == null) { return; } - final PsiReferenceExpression reference = (PsiReferenceExpression)lhs; final PsiElement referent = reference.resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return; } - final PsiField field = (PsiField)referent; if (!field.hasModifierProperty(PsiModifier.STATIC)) { return; } @@ -65,10 +63,9 @@ public class NonThreadSafeLazyInitializationInspection extends BaseInspection { } final PsiStatement statement = PsiTreeUtil.getParentOfType(expression, PsiStatement.class); final PsiElement parent = PsiTreeUtil.skipParentsOfType(statement, PsiCodeBlock.class, PsiBlockStatement.class); - if (!(parent instanceof PsiIfStatement)) { + if (!(parent instanceof PsiIfStatement ifStatement)) { return; } - final PsiIfStatement ifStatement = (PsiIfStatement)parent; final PsiExpression condition = ifStatement.getCondition(); if (!ComparisonUtils.isNullComparison(condition, field, true)) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/StringConcatenationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/StringConcatenationInspection.java index d5ebe1976581..bb9bba3269f2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/StringConcatenationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/StringConcatenationInspection.java @@ -74,33 +74,26 @@ public class StringConcatenationInspection extends BaseInspection { final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)infos[0]; final Collection result = new ArrayList<>(); final PsiElement parent = ParenthesesUtils.getParentSkipParentheses(polyadicExpression); - if (parent instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)parent; + if (parent instanceof PsiVariable variable) { ContainerUtil.addIfNotNull(result, (InspectionGadgetsFix)createAddAnnotationFix(variable)); } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression lhs = assignmentExpression.getLExpression(); - if (lhs instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; + if (lhs instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); - if (target instanceof PsiModifierListOwner) { - final PsiModifierListOwner modifierListOwner = (PsiModifierListOwner)target; + if (target instanceof PsiModifierListOwner modifierListOwner) { ContainerUtil.addIfNotNull(result, (InspectionGadgetsFix)createAddAnnotationFix(modifierListOwner)); } } } else if (parent instanceof PsiExpressionList) { final PsiElement grandParent = parent.getParent(); - if (grandParent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; + if (grandParent instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); - if (qualifierExpression instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifierExpression; + if (qualifierExpression instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); - if (target instanceof PsiModifierListOwner) { - final PsiModifierListOwner modifierListOwner = (PsiModifierListOwner)target; + if (target instanceof PsiModifierListOwner modifierListOwner) { ContainerUtil.addIfNotNull(result, (InspectionGadgetsFix)createAddAnnotationFix(modifierListOwner)); } } @@ -141,10 +134,9 @@ public class StringConcatenationInspection extends BaseInspection { @Nullable public static PsiModifierListOwner getAnnotatableElement(PsiExpression expression) { - if (!(expression instanceof PsiReferenceExpression)) { + if (!(expression instanceof PsiReferenceExpression referenceExpression)) { return null; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; if (!TypeUtils.isJavaLangString(referenceExpression.getType())) return null; final PsiElement element = referenceExpression.resolve(); if (!(element instanceof PsiModifierListOwner) || !element.isPhysical()) { @@ -221,8 +213,7 @@ public class StringConcatenationInspection extends BaseInspection { while (parent instanceof PsiBinaryExpression) { parent = parent.getParent(); } - if (parent instanceof PsiField) { - final PsiField field = (PsiField)parent; + if (parent instanceof PsiField field) { if (field.hasModifierProperty(PsiModifier.STATIC) && field.hasModifierProperty(PsiModifier.FINAL)) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/MissingPackageInfoInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/MissingPackageInfoInspection.java index 73d8843bf9ea..bfb9c4ffa41d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/MissingPackageInfoInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/MissingPackageInfoInspection.java @@ -125,10 +125,9 @@ public class MissingPackageInfoInspection extends PackageGlobalInspection { } final PsiJavaCodeReferenceElement packageReference = packageStatement.getPackageReference(); final PsiElement target = packageReference.resolve(); - if (!(target instanceof PsiPackage)) { + if (!(target instanceof PsiPackage aPackage)) { return; } - final PsiPackage aPackage = (PsiPackage)target; if (MoveAnnotationToPackageInfoFileFix.getPackageInfoFile(aPackage) != null) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java index f05e00032ab8..92903d9d822e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java @@ -94,10 +94,9 @@ public class PackageDotHtmlMayBePackageInfoInspection extends BaseInspection { @Override protected void doFix(final @NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof XmlFile)) { + if (!(element instanceof XmlFile xmlFile)) { return; } - final XmlFile xmlFile = (XmlFile)element; final PsiDirectory directory = xmlFile.getContainingDirectory(); if (directory == null) { return; @@ -148,10 +147,9 @@ public class PackageDotHtmlMayBePackageInfoInspection extends BaseInspection { if (rootTag != null) { final PsiElement[] children = rootTag.getChildren(); for (PsiElement child : children) { - if (!(child instanceof HtmlTag)) { + if (!(child instanceof HtmlTag htmlTag)) { continue; } - final HtmlTag htmlTag = (HtmlTag)child; @NonNls final String name = htmlTag.getName(); if ("body".equalsIgnoreCase(name)) { final XmlTagValue value = htmlTag.getValue(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java index 706f1e63298d..19265bcf804f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java @@ -31,8 +31,7 @@ public class ParameterizedParametersStaticCollectionInspection extends BaseInspe @Override protected InspectionGadgetsFix buildFix(final Object... infos) { if (infos.length == 0) return null; - if (infos[0] instanceof PsiClass) { - final PsiClass aClass = (PsiClass)infos[0]; + if (infos[0] instanceof PsiClass aClass) { final String signature = "@" + PARAMETERS_FQN + " public static java.lang.Iterable parameters()"; return new DelegatingFix(CreateMethodQuickFix.createFix(aClass, signature, "")) { @Override @@ -56,10 +55,9 @@ public class ParameterizedParametersStaticCollectionInspection extends BaseInspe @Override protected void doFix(final @NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent(); - if (!(element instanceof PsiMethod)) { + if (!(element instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)element; WriteAction.run(() -> { final VirtualFile vFile = method.getContainingFile().getVirtualFile(); if (ReadonlyStatusHandler.getInstance(method.getProject()).ensureFilesWritable(List.of(vFile)).hasReadonlyFiles()) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java index b0848498ed7e..a212eff5b0a4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java @@ -178,15 +178,13 @@ public class LogStatementGuardedByLogConditionInspection extends BaseInspection if (statement == null) { return false; } - if (!(statement instanceof PsiExpressionStatement)) { + if (!(statement instanceof PsiExpressionStatement expressionStatement)) { return false; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String referenceName = methodExpression.getReferenceName(); if (!methodName.equals(referenceName)) { @@ -254,8 +252,7 @@ public class LogStatementGuardedByLogConditionInspection extends BaseInspection private boolean isLogGuardCheck(@Nullable PsiExpression expression, String logMethodName) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); if (!TypeUtils.expressionHasTypeOrSubtype(qualifier, loggerClassName)) { @@ -269,8 +266,7 @@ public class LogStatementGuardedByLogConditionInspection extends BaseInspection final String conditionName = logConditionMethodNameList.get(index); return conditionName.startsWith(referenceName); } - else if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + else if (expression instanceof PsiPolyadicExpression polyadicExpression) { final PsiExpression[] operands = polyadicExpression.getOperands(); for (PsiExpression operand : operands) { if (isLogGuardCheck(operand, logMethodName)) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LoggerInitializedWithForeignClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LoggerInitializedWithForeignClassInspection.java index 7a6f20bde5d9..77758dcfa357 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LoggerInitializedWithForeignClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LoggerInitializedWithForeignClassInspection.java @@ -165,10 +165,9 @@ public class LoggerInitializedWithForeignClassInspection extends BaseInspection @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiClassObjectAccessExpression)) { + if (!(element instanceof PsiClassObjectAccessExpression classObjectAccessExpression)) { return; } - final PsiClassObjectAccessExpression classObjectAccessExpression = (PsiClassObjectAccessExpression)element; PsiReplacementUtil.replaceExpression(classObjectAccessExpression, newClassName + ".class", new CommentTracker()); } } @@ -179,8 +178,7 @@ public class LoggerInitializedWithForeignClassInspection extends BaseInspection public void visitClassObjectAccessExpression(@NotNull PsiClassObjectAccessExpression expression) { super.visitClassObjectAccessExpression(expression); PsiElement parent = expression.getParent(); - if (parent instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)parent; + if (parent instanceof PsiReferenceExpression referenceExpression) { if (!expression.equals(referenceExpression.getQualifierExpression())) { return; } @@ -189,10 +187,9 @@ public class LoggerInitializedWithForeignClassInspection extends BaseInspection return; } final PsiElement grandParent = referenceExpression.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; final PsiExpressionList list = methodCallExpression.getArgumentList(); if (!list.isEmpty()) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/StringConcatenationArgumentToLogCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/StringConcatenationArgumentToLogCallInspection.java index f57d1b6b1c5a..b3840ac6570b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/StringConcatenationArgumentToLogCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/StringConcatenationArgumentToLogCallInspection.java @@ -109,10 +109,9 @@ public class StringConcatenationArgumentToLogCallInspection extends BaseInspecti protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement grandParent = element.getParent().getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); if (arguments.length == 0) { @@ -267,10 +266,9 @@ public class StringConcatenationArgumentToLogCallInspection extends BaseInspecti } public static boolean isAvailable(PsiExpression expression) { - if (!(expression instanceof PsiPolyadicExpression)) { + if (!(expression instanceof PsiPolyadicExpression polyadicExpression)) { return false; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; final PsiExpression[] operands = polyadicExpression.getOperands(); for (PsiExpression operand : operands) { if (!ExpressionUtils.isEvaluatedAtCompileTime(operand)) { @@ -329,12 +327,10 @@ public class StringConcatenationArgumentToLogCallInspection extends BaseInspecti } private static boolean containsNonConstantConcatenation(@Nullable PsiExpression expression) { - if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { return containsNonConstantConcatenation(parenthesizedExpression.getExpression()); } - else if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + else if (expression instanceof PsiPolyadicExpression polyadicExpression) { if (!ExpressionUtils.hasStringType(polyadicExpression)) { return false; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java index fd007604c6a4..bfd54ac74ae2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java @@ -69,10 +69,9 @@ public class CommentedOutCodeInspection extends BaseInspection { @Override public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiComment)) { + if (!(element instanceof PsiComment comment)) { return; } - final PsiComment comment = (PsiComment)element; if (comment.getTokenType() == JavaTokenType.END_OF_LINE_COMMENT) { final List toDelete = new ArrayList<>(); toDelete.add(comment); @@ -102,10 +101,9 @@ public class CommentedOutCodeInspection extends BaseInspection { @Override public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiComment)) { + if (!(element instanceof PsiComment comment)) { return; } - final PsiComment comment = (PsiComment)element; if (comment.getTokenType() == JavaTokenType.END_OF_LINE_COMMENT) { final List ranges = new ArrayList<>(); ranges.add(comment.getTextRange()); @@ -193,8 +191,7 @@ public class CommentedOutCodeInspection extends BaseInspection { final JavaCodeFragmentFactory factory = JavaCodeFragmentFactory.getInstance(project); final PsiElement fragment; PsiElement parent = context.getParent(); - if (parent instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)parent; + if (parent instanceof PsiMethod method) { if (!MethodUtils.isInsideMethodBody(context, method)) { parent = method.getParent(); } @@ -202,8 +199,7 @@ public class CommentedOutCodeInspection extends BaseInspection { else if (parent instanceof PsiField) { parent = parent.getParent(); } - else if (parent instanceof PsiClass) { - final PsiClass aClass = (PsiClass)parent; + else if (parent instanceof PsiClass aClass) { if (!ClassUtils.isInsideClassBody(context, aClass)) { parent = aClass.getParent(); } @@ -228,10 +224,9 @@ public class CommentedOutCodeInspection extends BaseInspection { } private static boolean isIfStatementWithoutElse(PsiStatement statement) { - if (!(statement instanceof PsiIfStatement)) { + if (!(statement instanceof PsiIfStatement ifStatement)) { return false; } - final PsiIfStatement ifStatement = (PsiIfStatement)statement; final PsiStatement elseBranch = ifStatement.getElseBranch(); return elseBranch == null || isIfStatementWithoutElse(elseBranch); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java index 1e5c4de7d990..a35c98eb1676 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java @@ -51,8 +51,7 @@ public class SuppressionAnnotationInspection extends BaseInspection { @Override protected InspectionGadgetsFix @NotNull [] buildFixes(Object... infos) { final boolean suppressionIdPresent = ((Boolean)infos[1]).booleanValue(); - if (infos[0] instanceof PsiAnnotation) { - final PsiAnnotation annotation = (PsiAnnotation)infos[0]; + if (infos[0] instanceof PsiAnnotation annotation) { return suppressionIdPresent ? new InspectionGadgetsFix[]{new DelegatingFix(new RemoveAnnotationQuickFix(annotation, null)), new AllowSuppressionsFix()} : new InspectionGadgetsFix[]{new DelegatingFix(new RemoveAnnotationQuickFix(annotation, null))}; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SystemOutErrInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SystemOutErrInspection.java index 9fdbf0d26699..fa6b124239e1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SystemOutErrInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SystemOutErrInspection.java @@ -69,10 +69,9 @@ public class SystemOutErrInspection extends BaseInspection { return; } final PsiElement referent = expression.resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return; } - final PsiField field = (PsiField)referent; final PsiClass containingClass = field.getContainingClass(); if (containingClass == null) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/memory/InnerClassMayBeStaticInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/InnerClassMayBeStaticInspection.java index 947b4b95c12f..75ce4e0b19e6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/memory/InnerClassMayBeStaticInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/InnerClassMayBeStaticInspection.java @@ -177,10 +177,9 @@ public class InnerClassMayBeStaticInspection extends BaseInspection { .sorted((r1, r2) -> PsiUtilCore.compareElementsByPosition(r2, r1)) .forEach(reference -> { final PsiElement parent = reference.getParent(); - if (!(parent instanceof PsiNewExpression)) { + if (!(parent instanceof PsiNewExpression newExpression)) { return; } - final PsiNewExpression newExpression = (PsiNewExpression)parent; final PsiJavaCodeReferenceElement classReference = newExpression.getClassReference(); if (classReference == null) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java index 75f0e2616b01..84883952f493 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java @@ -95,15 +95,11 @@ public class EnumerationCanBeIterationInspection extends BaseInspection implemen if (parent instanceof PsiVariable) { variable = (PsiVariable)parent; } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = - (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression lhs = assignmentExpression.getLExpression(); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)lhs; final PsiElement target = referenceExpression.resolve(); if (!(target instanceof PsiVariable)) { return; @@ -122,10 +118,9 @@ public class EnumerationCanBeIterationInspection extends BaseInspection implemen final int result = replaceMethodCalls(variable, statement.getTextOffset(), variableName); final PsiType variableType = variable.getType(); - if (!(variableType instanceof PsiClassType)) { + if (!(variableType instanceof PsiClassType classType)) { return; } - final PsiClassType classType = (PsiClassType)variableType; final PsiType[] parameterTypes = classType.getParameters(); final PsiType parameterType; if (parameterTypes.length > 0) { @@ -269,7 +264,7 @@ public class EnumerationCanBeIterationInspection extends BaseInspection implemen referenceElements.sort(PsiElementOrderComparator.getInstance()); int result = KEEP_NOTHING; for (PsiElement referenceElement : referenceElements) { - if (!(referenceElement instanceof PsiReferenceExpression)) { + if (!(referenceElement instanceof PsiReferenceExpression referenceExpression)) { result = KEEP_DECLARATION; continue; } @@ -277,8 +272,6 @@ public class EnumerationCanBeIterationInspection extends BaseInspection implemen result = KEEP_DECLARATION; continue; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)referenceElement; final PsiElement referenceParent = referenceExpression.getParent(); if (!(referenceParent instanceof PsiReferenceExpression)) { @@ -291,12 +284,10 @@ public class EnumerationCanBeIterationInspection extends BaseInspection implemen } final PsiElement referenceGrandParent = referenceParent.getParent(); - if (!(referenceGrandParent instanceof PsiMethodCallExpression)) { + if (!(referenceGrandParent instanceof PsiMethodCallExpression callExpression)) { result = KEEP_INITIALIZATION; continue; } - final PsiMethodCallExpression callExpression = - (PsiMethodCallExpression)referenceGrandParent; final PsiReferenceExpression foundReferenceExpression = callExpression.getMethodExpression(); @NonNls final String foundName = @@ -378,15 +369,11 @@ public class EnumerationCanBeIterationInspection extends BaseInspection implemen if (parent instanceof PsiLocalVariable) { variable = (PsiVariable)parent; } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = - (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression assignmentExpression) { final PsiExpression lhs = assignmentExpression.getLExpression(); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)lhs; final PsiElement element = referenceExpression.resolve(); if (!(element instanceof PsiVariable)) { return; @@ -462,16 +449,13 @@ public class EnumerationCanBeIterationInspection extends BaseInspection implemen } final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); - if (!(qualifierExpression instanceof PsiReferenceExpression)) { + if (!(qualifierExpression instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)qualifierExpression; final PsiElement element = referenceExpression.resolve(); - if (!(element instanceof PsiVariable)) { + if (!(element instanceof PsiVariable variable)) { return; } - final PsiVariable variable = (PsiVariable)element; enumerationMethodCalled = this.variable.equals(variable); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java index 698239fff8cf..70f9bf830cd9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java @@ -64,10 +64,9 @@ public class ForCanBeForeachInspection extends BaseInspection { static boolean isIndexedListLoopStatement(PsiForStatement forStatement, boolean ignoreUntypedCollections) { final PsiStatement initialization = forStatement.getInitialization(); - if (!(initialization instanceof PsiDeclarationStatement)) { + if (!(initialization instanceof PsiDeclarationStatement declaration)) { return false; } - final PsiDeclarationStatement declaration = (PsiDeclarationStatement)initialization; final PsiElement[] declaredElements = declaration.getDeclaredElements(); final PsiElement secondDeclaredElement; if (declaredElements.length == 1) { @@ -80,16 +79,14 @@ public class ForCanBeForeachInspection extends BaseInspection { return false; } final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable indexVariable)) { return false; } - final PsiVariable indexVariable = (PsiVariable)declaredElement; final PsiExpression initialValue = indexVariable.getInitializer(); final Object constant = ExpressionUtils.computeConstantExpression(initialValue); - if (!(constant instanceof Number)) { + if (!(constant instanceof Number number)) { return false; } - final Number number = (Number)constant; if (number.intValue() != 0) { return false; } @@ -121,10 +118,9 @@ public class ForCanBeForeachInspection extends BaseInspection { static boolean isArrayLoopStatement(PsiForStatement forStatement) { final PsiStatement initialization = forStatement.getInitialization(); - if (!(initialization instanceof PsiDeclarationStatement)) { + if (!(initialization instanceof PsiDeclarationStatement declaration)) { return false; } - final PsiDeclarationStatement declaration = (PsiDeclarationStatement)initialization; final PsiElement[] declaredElements = declaration.getDeclaredElements(); final PsiElement secondDeclaredElement; if (declaredElements.length == 1) { @@ -137,16 +133,14 @@ public class ForCanBeForeachInspection extends BaseInspection { return false; } final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable indexVariable)) { return false; } - final PsiVariable indexVariable = (PsiVariable)declaredElement; final PsiExpression initialValue = indexVariable.getInitializer(); final Object constant = ExpressionUtils.computeConstantExpression(initialValue); - if (!(constant instanceof Integer)) { + if (!(constant instanceof Integer integer)) { return false; } - final Integer integer = (Integer)constant; if (integer.intValue() != 0) { return false; } @@ -163,10 +157,9 @@ public class ForCanBeForeachInspection extends BaseInspection { return false; } final PsiElement element = arrayReference.resolve(); - if (!(element instanceof PsiVariable)) { + if (!(element instanceof PsiVariable arrayVariable)) { return false; } - final PsiVariable arrayVariable = (PsiVariable)element; final PsiStatement body = forStatement.getBody(); return body == null || isIndexVariableOnlyUsedAsIndex(arrayVariable, indexVariable, body) && @@ -287,27 +280,24 @@ public class ForCanBeForeachInspection extends BaseInspection { } static PsiVariable getIterableVariable(PsiStatement statement, boolean ignoreUntypedCollections) { - if (!(statement instanceof PsiDeclarationStatement)) { + if (!(statement instanceof PsiDeclarationStatement declaration)) { return null; } - final PsiDeclarationStatement declaration = (PsiDeclarationStatement)statement; final PsiElement[] declaredElements = declaration.getDeclaredElements(); if (declaredElements.length != 1) { return null; } final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable variable)) { return null; } - final PsiVariable variable = (PsiVariable)declaredElement; if (!TypeUtils.variableHasTypeOrSubtype(variable, CommonClassNames.JAVA_UTIL_ITERATOR, "java.util.ListIterator")) { return null; } final PsiExpression initialValue = PsiUtil.skipParenthesizedExprDown(variable.getInitializer()); - if (!(initialValue instanceof PsiMethodCallExpression)) { + if (!(initialValue instanceof PsiMethodCallExpression initialCall)) { return null; } - final PsiMethodCallExpression initialCall = (PsiMethodCallExpression)initialValue; if (!initialCall.getArgumentList().isEmpty()) { return null; } @@ -321,10 +311,9 @@ public class ForCanBeForeachInspection extends BaseInspection { return null; } final PsiType qualifierType = qualifier.getType(); - if (!(qualifierType instanceof PsiClassType)) { + if (!(qualifierType instanceof PsiClassType classType)) { return null; } - final PsiClassType classType = (PsiClassType)qualifierType; final PsiClass qualifierClass = classType.resolve(); if (ignoreUntypedCollections) { final PsiClassType type = (PsiClassType)variable.getType(); @@ -349,10 +338,9 @@ public class ForCanBeForeachInspection extends BaseInspection { static boolean isHasNext(PsiExpression condition, PsiVariable iterator) { condition = PsiUtil.skipParenthesizedExprDown(condition); - if (!(condition instanceof PsiMethodCallExpression)) { + if (!(condition instanceof PsiMethodCallExpression call)) { return false; } - final PsiMethodCallExpression call = (PsiMethodCallExpression)condition; if (!call.getArgumentList().isEmpty()) { return false; } @@ -394,8 +382,7 @@ public class ForCanBeForeachInspection extends BaseInspection { if (ExpressionUtils.getArrayFromLengthExpression(referenceExpression) == null) { final PsiElement target = referenceExpression.resolve(); if (secondDeclaredElement != null && !secondDeclaredElement.equals(target)) return null; - if (target instanceof PsiVariable) { - final PsiVariable maxVariable = (PsiVariable)target; + if (target instanceof PsiVariable maxVariable) { final PsiCodeBlock context = PsiTreeUtil.getParentOfType(maxVariable, PsiCodeBlock.class); if (context == null || VariableAccessUtils.variableIsAssigned(maxVariable, context)) return null; final PsiExpression expression = PsiUtil.skipParenthesizedExprDown(maxVariable.getInitializer()); @@ -426,10 +413,9 @@ public class ForCanBeForeachInspection extends BaseInspection { @Nullable private static Holder getCollectionFromSizeComparison(PsiExpression condition, PsiVariable variable, PsiElement secondDeclaredElement) { condition = PsiUtil.skipParenthesizedExprDown(condition); - if (!(condition instanceof PsiBinaryExpression)) { + if (!(condition instanceof PsiBinaryExpression binaryExpression)) { return null; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)condition; final IElementType tokenType = binaryExpression.getOperationTokenType(); final PsiExpression rhs = binaryExpression.getROperand(); final PsiExpression lhs = binaryExpression.getLOperand(); @@ -450,16 +436,14 @@ public class ForCanBeForeachInspection extends BaseInspection { static boolean expressionIsListGetLookup(PsiExpression expression) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression reference)) { return false; } - final PsiMethodCallExpression reference = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = reference.getMethodExpression(); final PsiElement resolved = methodExpression.resolve(); - if (!(resolved instanceof PsiMethod)) { + if (!(resolved instanceof PsiMethod method)) { return false; } - final PsiMethod method = (PsiMethod)resolved; if (!HardcodedMethodConstants.GET.equals(method.getName())) { return false; } @@ -476,10 +460,9 @@ public class ForCanBeForeachInspection extends BaseInspection { if (secondDeclaredElement != null && !secondDeclaredElement.equals(target)) { return null; } - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return null; } - final PsiVariable variable = (PsiVariable)target; final PsiCodeBlock context = PsiTreeUtil.getParentOfType(variable, PsiCodeBlock.class); if (context == null) { return null; @@ -492,10 +475,9 @@ public class ForCanBeForeachInspection extends BaseInspection { else if (secondDeclaredElement != null) { return null; } - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return null; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String referenceName = methodExpression.getReferenceName(); if (!methodName.equals(referenceName)) { @@ -614,10 +596,9 @@ public class ForCanBeForeachInspection extends BaseInspection { } static boolean shouldSkip(PsiVariable iterator, PsiType contentType, PsiElement child) { - if (!(child instanceof PsiExpressionStatement)) { + if (!(child instanceof PsiExpressionStatement expressionStatement)) { return false; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)child; final PsiExpression expression = expressionStatement.getExpression(); return isIteratorNext(expression, iterator, contentType); } @@ -625,21 +606,18 @@ public class ForCanBeForeachInspection extends BaseInspection { static boolean isIteratorNextDeclaration( PsiStatement statement, PsiVariable iterator, PsiType contentType) { - if (!(statement instanceof PsiDeclarationStatement)) { + if (!(statement instanceof PsiDeclarationStatement declarationStatement)) { return false; } - final PsiDeclarationStatement declarationStatement = - (PsiDeclarationStatement)statement; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); if (declaredElements.length != 1) { return false; } final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)declaredElement; final PsiExpression initializer = variable.getInitializer(); return isIteratorNext(initializer, iterator, contentType); } @@ -651,8 +629,7 @@ public class ForCanBeForeachInspection extends BaseInspection { if (element instanceof PsiParenthesizedExpression) { return isIteratorNext(((PsiParenthesizedExpression)element).getExpression(), iterator, contentType); } - if (element instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression castExpression = (PsiTypeCastExpression)element; + if (element instanceof PsiTypeCastExpression castExpression) { final PsiType type = castExpression.getType(); if (!contentType.equals(type)) { return false; @@ -660,10 +637,9 @@ public class ForCanBeForeachInspection extends BaseInspection { final PsiExpression operand = castExpression.getOperand(); return isIteratorNext(operand, iterator, contentType); } - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression callExpression)) { return false; } - final PsiMethodCallExpression callExpression = (PsiMethodCallExpression)element; if (!callExpression.getArgumentList().isEmpty()) { return false; } @@ -684,10 +660,9 @@ public class ForCanBeForeachInspection extends BaseInspection { @Nullable static PsiStatement getFirstStatement(PsiStatement body) { - if (!(body instanceof PsiBlockStatement)) { + if (!(body instanceof PsiBlockStatement block)) { return body; } - final PsiBlockStatement block = (PsiBlockStatement)body; final PsiCodeBlock codeBlock = block.getCodeBlock(); return ControlFlowUtils.getFirstStatementInBlock(codeBlock); } @@ -773,8 +748,7 @@ public class ForCanBeForeachInspection extends BaseInspection { else if (parent instanceof PsiSwitchBlock) { if (element != ((PsiSwitchBlock)parent).getExpression()) return false; } - else if (parent instanceof PsiPolyadicExpression) { - PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; + else if (parent instanceof PsiPolyadicExpression polyadicExpression) { IElementType tokenType = polyadicExpression.getOperationTokenType(); if (polyadicExpression.getOperands()[0] != element && (JavaTokenType.ANDAND == tokenType || JavaTokenType.OROR == tokenType)) return false; @@ -818,17 +792,15 @@ public class ForCanBeForeachInspection extends BaseInspection { return; } final PsiElement parent = getParentSkipParentheses(reference); - if (!(parent instanceof PsiArrayAccessExpression)) { + if (!(parent instanceof PsiArrayAccessExpression arrayAccessExpression)) { indexVariableUsedOnlyAsIndex = false; return; } - final PsiArrayAccessExpression arrayAccessExpression = (PsiArrayAccessExpression)parent; final PsiExpression arrayExpression = PsiUtil.skipParenthesizedExprDown(arrayAccessExpression.getArrayExpression()); - if (!(arrayExpression instanceof PsiReferenceExpression)) { + if (!(arrayExpression instanceof PsiReferenceExpression referenceExpression)) { indexVariableUsedOnlyAsIndex = false; return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)arrayExpression; final PsiExpression qualifier = referenceExpression.getQualifierExpression(); if (qualifier != null && !(qualifier instanceof PsiThisExpression) && !(qualifier instanceof PsiSuperExpression)) { indexVariableUsedOnlyAsIndex = false; @@ -841,8 +813,7 @@ public class ForCanBeForeachInspection extends BaseInspection { } arrayAccessed = true; final PsiElement arrayExpressionContext = getParentSkipParentheses(arrayAccessExpression); - if (arrayExpressionContext instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignment = (PsiAssignmentExpression)arrayExpressionContext; + if (arrayExpressionContext instanceof PsiAssignmentExpression assignment) { final PsiExpression lhs = assignment.getLExpression(); if (lhs.equals(arrayAccessExpression)) { indexVariableUsedOnlyAsIndex = false; @@ -906,11 +877,9 @@ public class ForCanBeForeachInspection extends BaseInspection { private boolean isListNonGetMethodCall(PsiReferenceExpression reference) { final PsiElement parent = reference.getParent(); - if (!(parent instanceof PsiMethodCallExpression)) { + if (!(parent instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = - (PsiMethodCallExpression)parent; final PsiMethod method = methodCallExpression.resolveMethod(); if (method == null) { @@ -928,15 +897,13 @@ public class ForCanBeForeachInspection extends BaseInspection { private boolean isListIndexExpression(PsiReferenceExpression reference) { final PsiElement referenceParent = getParentSkipParentheses(reference); - if (!(referenceParent instanceof PsiExpressionList)) { + if (!(referenceParent instanceof PsiExpressionList expressionList)) { return false; } - final PsiExpressionList expressionList = (PsiExpressionList)referenceParent; final PsiElement parent = expressionList.getParent(); - if (!(parent instanceof PsiMethodCallExpression)) { + if (!(parent instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)parent; return isListGetExpression(methodCallExpression); } @@ -946,10 +913,9 @@ public class ForCanBeForeachInspection extends BaseInspection { return false; } final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; final PsiElement greatGrandParent = methodCallExpression.getParent(); if (greatGrandParent instanceof PsiExpressionStatement) { return false; @@ -963,7 +929,7 @@ public class ForCanBeForeachInspection extends BaseInspection { } final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifierExpression = PsiUtil.skipParenthesizedExprDown(methodExpression.getQualifierExpression()); - if (!(qualifierExpression instanceof PsiReferenceExpression)) { + if (!(qualifierExpression instanceof PsiReferenceExpression reference)) { if (collection.isDummyVariable() && (qualifierExpression == null || qualifierExpression instanceof PsiThisExpression || @@ -972,7 +938,6 @@ public class ForCanBeForeachInspection extends BaseInspection { } return false; } - final PsiReferenceExpression reference = (PsiReferenceExpression)qualifierExpression; final PsiExpression qualifier = PsiUtil.skipParenthesizedExprDown(reference.getQualifierExpression()); if (qualifier != null && !(qualifier instanceof PsiThisExpression) && !(qualifier instanceof PsiSuperExpression)) { return false; @@ -1045,10 +1010,9 @@ public class ForCanBeForeachInspection extends BaseInspection { public void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement forElement = descriptor.getPsiElement(); final PsiElement parent = forElement.getParent(); - if (!(parent instanceof PsiForStatement)) { + if (!(parent instanceof PsiForStatement forStatement)) { return; } - final PsiForStatement forStatement = (PsiForStatement)parent; if (isArrayLoopStatement(forStatement)) { replaceArrayLoopWithForeach(forStatement); } @@ -1066,11 +1030,9 @@ public class ForCanBeForeachInspection extends BaseInspection { return; } PsiExpression collectionSize = getMaximum(forStatement); - if (collectionSize instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)collectionSize; + if (collectionSize instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); - if (target instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)target; + if (target instanceof PsiVariable variable) { collectionSize = PsiUtil.skipParenthesizedExprDown(variable.getInitializer()); } } @@ -1122,10 +1084,9 @@ public class ForCanBeForeachInspection extends BaseInspection { final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)firstStatement; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable variable)) { return; } - final PsiVariable variable = (PsiVariable)declaredElement; contentVariableName = variable.getName(); parameterType = variable.getType(); statementToSkip = declarationStatement; @@ -1167,10 +1128,9 @@ public class ForCanBeForeachInspection extends BaseInspection { private static PsiExpression getMaximum(PsiForStatement statement) { final PsiExpression condition = PsiUtil.skipParenthesizedExprDown(statement.getCondition()); - if (!(condition instanceof PsiBinaryExpression)) { + if (!(condition instanceof PsiBinaryExpression binaryExpression)) { return null; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)condition; final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(binaryExpression.getLOperand()); if (lhs == null) { return null; @@ -1208,15 +1168,13 @@ public class ForCanBeForeachInspection extends BaseInspection { final PsiStatement body = forStatement.getBody(); final PsiStatement firstStatement = getFirstStatement(body); final PsiStatement initialization = forStatement.getInitialization(); - if (!(initialization instanceof PsiDeclarationStatement)) { + if (!(initialization instanceof PsiDeclarationStatement declaration)) { return; } - final PsiDeclarationStatement declaration = (PsiDeclarationStatement)initialization; final PsiElement declaredIterator = declaration.getDeclaredElements()[0]; - if (!(declaredIterator instanceof PsiVariable)) { + if (!(declaredIterator instanceof PsiVariable iterator)) { return; } - final PsiVariable iterator = (PsiVariable)declaredIterator; final PsiMethodCallExpression initializer = (PsiMethodCallExpression)PsiUtil.skipParenthesizedExprDown(iterator.getInitializer()); if (initializer == null) { return; @@ -1250,18 +1208,16 @@ public class ForCanBeForeachInspection extends BaseInspection { final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)firstStatement; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable variable)) { return; } - final PsiVariable variable = (PsiVariable)declaredElement; iteratorContentType = variable.getType(); contentVariableName = variable.getName(); statementToSkip = declarationStatement; finalString = variable.hasModifierProperty(PsiModifier.FINAL) ? "final " : ""; } else { - if (collection instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)collection; + if (collection instanceof PsiReferenceExpression referenceExpression) { final String collectionName = referenceExpression.getReferenceName(); contentVariableName = createNewVariableName(forStatement, contentType, collectionName); } @@ -1291,43 +1247,38 @@ public class ForCanBeForeachInspection extends BaseInspection { private static void replaceArrayLoopWithForeach(@NotNull PsiForStatement forStatement) { final PsiExpression maximum = getMaximum(forStatement); - if (!(maximum instanceof PsiReferenceExpression)) { + if (!(maximum instanceof PsiReferenceExpression arrayLengthExpression)) { return; } final PsiVariable indexVariable = getIndexVariable(forStatement); if (indexVariable == null) { return; } - final PsiReferenceExpression arrayLengthExpression = (PsiReferenceExpression)maximum; PsiReferenceExpression arrayReference = (PsiReferenceExpression)PsiUtil .skipParenthesizedExprDown(arrayLengthExpression.getQualifierExpression()); if (arrayReference == null) { final PsiElement target = arrayLengthExpression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return; } - final PsiVariable variable = (PsiVariable)target; final PsiExpression initializer = PsiUtil.skipParenthesizedExprDown(variable.getInitializer()); - if (!(initializer instanceof PsiReferenceExpression)) { + if (!(initializer instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)initializer; arrayReference = (PsiReferenceExpression)PsiUtil.skipParenthesizedExprDown(referenceExpression.getQualifierExpression()); if (arrayReference == null) { return; } } final PsiType type = arrayReference.getType(); - if (!(type instanceof PsiArrayType)) { + if (!(type instanceof PsiArrayType arrayType)) { return; } - final PsiArrayType arrayType = (PsiArrayType)type; PsiType componentType = arrayType.getComponentType(); final PsiElement target = arrayReference.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable arrayVariable)) { return; } - final PsiVariable arrayVariable = (PsiVariable)target; final PsiStatement body = forStatement.getBody(); final PsiStatement firstStatement = getFirstStatement(body); final boolean isDeclaration = isArrayElementDeclaration(firstStatement, arrayVariable, indexVariable); @@ -1338,10 +1289,9 @@ public class ForCanBeForeachInspection extends BaseInspection { final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)firstStatement; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable variable)) { return; } - final PsiVariable variable = (PsiVariable)declaredElement; componentType = variable.getType(); if (VariableAccessUtils.variableIsAssigned(variable, forStatement)) { final String collectionName = arrayReference.getReferenceName(); @@ -1461,10 +1411,9 @@ public class ForCanBeForeachInspection extends BaseInspection { } private static boolean isListGetLookup(PsiElement element, PsiVariable indexVariable, PsiVariable listVariable) { - if (!(element instanceof PsiExpression)) { + if (!(element instanceof PsiExpression expression)) { return false; } - final PsiExpression expression = (PsiExpression)element; if (!expressionIsListGetLookup(expression)) { return false; } @@ -1488,10 +1437,9 @@ public class ForCanBeForeachInspection extends BaseInspection { qualifierExpression instanceof PsiSuperExpression) { return listVariable == null; } - if (!(qualifierExpression instanceof PsiReferenceExpression)) { + if (!(qualifierExpression instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifierExpression; final PsiExpression qualifier = PsiUtil.skipParenthesizedExprDown(referenceExpression.getQualifierExpression()); if (qualifier != null && !(qualifier instanceof PsiThisExpression) && !(qualifier instanceof PsiSuperExpression)) { return false; @@ -1501,57 +1449,51 @@ public class ForCanBeForeachInspection extends BaseInspection { } private static boolean isArrayElementDeclaration(PsiStatement statement, PsiVariable arrayVariable, PsiVariable indexVariable) { - if (!(statement instanceof PsiDeclarationStatement)) { + if (!(statement instanceof PsiDeclarationStatement declarationStatement)) { return false; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)statement; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); if (declaredElements.length != 1) { return false; } final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)declaredElement; final PsiExpression initializer = variable.getInitializer(); return isArrayLookup(initializer, indexVariable, arrayVariable); } private static boolean isListElementDeclaration(PsiStatement statement, PsiVariable listVariable, PsiVariable indexVariable) { - if (!(statement instanceof PsiDeclarationStatement)) { + if (!(statement instanceof PsiDeclarationStatement declarationStatement)) { return false; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)statement; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); if (declaredElements.length != 1) { return false; } final PsiElement declaredElement = declaredElements[0]; - if (!(declaredElement instanceof PsiVariable)) { + if (!(declaredElement instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)declaredElement; final PsiExpression initializer = variable.getInitializer(); return isListGetLookup(initializer, indexVariable, listVariable); } private static boolean isArrayLookup(PsiExpression expression, PsiVariable indexVariable, PsiVariable arrayVariable) { expression = PsiUtil.skipParenthesizedExprDown(expression); - if (!(expression instanceof PsiArrayAccessExpression)) { + if (!(expression instanceof PsiArrayAccessExpression arrayAccess)) { return false; } - final PsiArrayAccessExpression arrayAccess = (PsiArrayAccessExpression)expression; final PsiExpression indexExpression = arrayAccess.getIndexExpression(); if (!ExpressionUtils.isReferenceTo(indexExpression, indexVariable)) { return false; } final PsiExpression arrayExpression = PsiUtil.skipParenthesizedExprDown(arrayAccess.getArrayExpression()); - if (!(arrayExpression instanceof PsiReferenceExpression)) { + if (!(arrayExpression instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)arrayExpression; final PsiExpression qualifier = PsiUtil.skipParenthesizedExprDown(referenceExpression.getQualifierExpression()); if (qualifier != null && !(qualifier instanceof PsiThisExpression) && !(qualifier instanceof PsiSuperExpression)) { return false; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java index 541a885c75da..62b9ddcacfda 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java @@ -101,10 +101,9 @@ public class IfCanBeSwitchInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent(); - if (!(element instanceof PsiIfStatement)) { + if (!(element instanceof PsiIfStatement ifStatement)) { return; } - final PsiIfStatement ifStatement = (PsiIfStatement)element; if (HighlightingFeature.PATTERNS_IN_SWITCH.isAvailable(ifStatement)) { for (PsiIfStatement ifStatementInChain : getAllConditionalBranches(ifStatement)) { replaceCastsWithPatternVariable(ifStatementInChain); @@ -191,8 +190,7 @@ public class IfCanBeSwitchInspection extends BaseInspection { breakTarget = PsiTreeUtil.getParentOfType(ifStatement, PsiLoopStatement.class, PsiSwitchStatement.class); if (breakTarget != null) { final PsiElement parent = breakTarget.getParent(); - if (parent instanceof PsiLabeledStatement) { - final PsiLabeledStatement labeledStatement = (PsiLabeledStatement)parent; + if (parent instanceof PsiLabeledStatement labeledStatement) { newLabel = labeledStatement.getLabelIdentifier().getText(); breakTarget = labeledStatement; } @@ -333,8 +331,7 @@ public class IfCanBeSwitchInspection extends BaseInspection { } private static void extractCaseExpressions(PsiExpression expression, PsiExpression switchExpression, IfStatementBranch branch) { - if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression methodCallExpression) { final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); final PsiExpression argument = arguments[0]; @@ -351,8 +348,7 @@ public class IfCanBeSwitchInspection extends BaseInspection { else if (expression instanceof PsiInstanceOfExpression) { branch.addCaseExpression(expression); } - else if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + else if (expression instanceof PsiPolyadicExpression polyadicExpression) { final PsiExpression[] operands = polyadicExpression.getOperands(); final IElementType tokenType = polyadicExpression.getOperationTokenType(); if (JavaTokenType.OROR.equals(tokenType)) { @@ -373,8 +369,7 @@ public class IfCanBeSwitchInspection extends BaseInspection { } } } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { final PsiExpression contents = parenthesizedExpression.getExpression(); extractCaseExpressions(contents, switchExpression, branch); } @@ -395,11 +390,9 @@ public class IfCanBeSwitchInspection extends BaseInspection { @NonNls private static String getCaseLabelText(PsiExpression expression, boolean castToInt) { - if (expression instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)expression; + if (expression instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); - if (target instanceof PsiEnumConstant) { - final PsiEnumConstant enumConstant = (PsiEnumConstant)target; + if (target instanceof PsiEnumConstant enumConstant) { return enumConstant.getName(); } } @@ -590,8 +583,7 @@ public class IfCanBeSwitchInspection extends BaseInspection { PsiIfStatement currentIfInChain = ifStatement; while (currentIfInChain != null) { final PsiExpression condition = PsiUtil.skipParenthesizedExprDown(currentIfInChain.getCondition()); - if (condition instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)condition; + if (condition instanceof PsiPolyadicExpression polyadicExpression) { if (JavaTokenType.OROR.equals(polyadicExpression.getOperationTokenType())) { if (ContainerUtil.exists(polyadicExpression.getOperands(), (operand) -> hasUnconditionalPatternCheck(type, operand))) { return true; @@ -637,8 +629,7 @@ public class IfCanBeSwitchInspection extends BaseInspection { private static PsiExpression findNullCheckedOperand(PsiIfStatement ifStatement) { final PsiExpression condition = PsiUtil.skipParenthesizedExprDown(ifStatement.getCondition()); - if (condition instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)condition; + if (condition instanceof PsiPolyadicExpression polyadicExpression) { if (JavaTokenType.OROR.equals(polyadicExpression.getOperationTokenType())) { for (PsiExpression operand : polyadicExpression.getOperands()) { final PsiExpression nullCheckedExpression = SwitchUtils.findNullCheckedOperand(PsiUtil.skipParenthesizedExprDown(operand)); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java index ca7c806d173f..5fe2a47bf5bc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java @@ -108,10 +108,9 @@ public class WhileCanBeForeachInspection extends BaseInspection { return; } final PsiElement declaredElement = declaration.getDeclaredElements()[0]; - if (!(declaredElement instanceof PsiLocalVariable)) { + if (!(declaredElement instanceof PsiLocalVariable iterator)) { return; } - final PsiLocalVariable iterator = (PsiLocalVariable)declaredElement; final PsiMethodCallExpression initializer = (PsiMethodCallExpression)PsiUtil.skipParenthesizedExprDown(iterator.getInitializer()); if (initializer == null) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LocalVariableNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LocalVariableNamingConventionInspection.java index 6464e1f4b43e..b1cc5f111b72 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LocalVariableNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LocalVariableNamingConventionInspection.java @@ -77,8 +77,7 @@ public class LocalVariableNamingConventionInspection extends ConventionInspectio final PsiElement parent = variable.getParent(); if (parent != null) { final PsiElement grandparent = parent.getParent(); - if (grandparent instanceof PsiForStatement) { - final PsiForStatement forLoop = (PsiForStatement)grandparent; + if (grandparent instanceof PsiForStatement forLoop) { final PsiStatement initialization = forLoop.getInitialization(); if (parent.equals(initialization)) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java index 70550b645cb5..fae925cce633 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java @@ -87,10 +87,9 @@ public class NonExceptionNameEndsWithExceptionInspection extends BaseInspection protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiClass)) { + if (!(parent instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)parent; final PsiReferenceList extendsList = aClass.getExtendsList(); if (extendsList == null) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspection.java index 8f68d4e41596..00b958eafc87 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspection.java @@ -116,10 +116,9 @@ public class ParameterNameDiffersFromOverriddenParameterInspection extends BaseI final PsiExpression[] arguments = argumentList.getExpressions(); for (int i = 0, length = Math.min(arguments.length, parameters.length); i < length; i++) { final PsiExpression argument = PsiUtil.skipParenthesizedExprDown(arguments[i]); - if (!(argument instanceof PsiReferenceExpression)) { + if (!(argument instanceof PsiReferenceExpression referenceExpression)) { continue; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)argument; if (referenceExpression.getQualifierExpression() != null) { continue; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/StandardVariableNamesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/StandardVariableNamesInspection.java index c7089e069907..b09bd772a7d9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/StandardVariableNamesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/StandardVariableNamesInspection.java @@ -143,16 +143,14 @@ public class StandardVariableNamesInspection extends BaseInspection { } private boolean isVariableNamedSameAsSuper(PsiVariable variable) { - if (!(variable instanceof PsiParameter)) { + if (!(variable instanceof PsiParameter parameter)) { return false; } - final PsiParameter parameter = (PsiParameter)variable; final PsiElement scope = parameter.getDeclarationScope(); - if (!(scope instanceof PsiMethod)) { + if (!(scope instanceof PsiMethod method)) { return false; } final String variableName = variable.getName(); - final PsiMethod method = (PsiMethod)scope; final int index = method.getParameterList().getParameterIndex(parameter); final PsiMethod[] superMethods = method.findSuperMethods(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/OverlyComplexArithmeticExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/OverlyComplexArithmeticExpressionInspection.java index 39a462a8dc90..ff5ee301a6c1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/OverlyComplexArithmeticExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/OverlyComplexArithmeticExpressionInspection.java @@ -111,21 +111,18 @@ public class OverlyComplexArithmeticExpressionInspection extends BaseInspection if (!isArithmetic(expression)) { return 1; } - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression poly = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression poly) { int count = 0; for (PsiExpression operand : poly.getOperands()) { count += countTerms(operand); } return count; } - else if (expression instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression; + else if (expression instanceof PsiPrefixExpression prefixExpression) { final PsiExpression operand = prefixExpression.getOperand(); return countTerms(operand); } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { final PsiExpression contents = parenthesizedExpression.getExpression(); return countTerms(contents); } @@ -133,20 +130,17 @@ public class OverlyComplexArithmeticExpressionInspection extends BaseInspection } private boolean isArithmetic(PsiExpression expression) { - if (expression instanceof PsiPolyadicExpression) { + if (expression instanceof PsiPolyadicExpression binaryExpression) { final PsiType type = expression.getType(); if (TypeUtils.isJavaLangString(type)) { return false; //ignore string concatenations } - final PsiPolyadicExpression binaryExpression = (PsiPolyadicExpression)expression; return arithmeticTokens.contains(binaryExpression.getOperationTokenType()); } - else if (expression instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression; + else if (expression instanceof PsiPrefixExpression prefixExpression) { return arithmeticTokens.contains(prefixExpression.getOperationTokenType()); } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { final PsiExpression contents = parenthesizedExpression.getExpression(); return isArithmetic(contents); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java index e0b545b899b3..7927ab2e31e2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java @@ -81,15 +81,13 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends BaseInsp return; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiReferenceExpression)) { + if (!(parent instanceof PsiReferenceExpression methodExpression)) { return; } - final PsiReferenceExpression methodExpression = (PsiReferenceExpression)parent; final PsiElement grandParent = methodExpression.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; final PsiExpressionList list = methodCallExpression.getArgumentList(); final PsiExpression[] expressions = list.getExpressions(); CommentTracker commentTracker = new CommentTracker(); @@ -165,8 +163,7 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends BaseInsp private static PsiReferenceExpression getReference(PsiMethodCallExpression newMethodCallExpression) { final PsiReferenceExpression methodExpression = newMethodCallExpression.getMethodExpression(); final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); - if (qualifierExpression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)qualifierExpression; + if (qualifierExpression instanceof PsiMethodCallExpression methodCallExpression) { return getReference(methodCallExpression); } if (!(qualifierExpression instanceof PsiReferenceExpression)) { @@ -199,10 +196,9 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends BaseInsp return false; } final Object value = ExpressionUtils.computeConstantExpression(arguments[0]); - if (!(value instanceof String)) { + if (!(value instanceof String regex)) { return false; } - final String regex = (String)value; if (PsiUtil.isLanguageLevel7OrHigher(expression) && "split".equals(name) && isOptimizedPattern(regex) || PsiUtil.isLanguageLevel9OrHigher(expression) && "replace".equals(name)) { return false; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ObjectInstantiationInEqualsHashCodeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ObjectInstantiationInEqualsHashCodeInspection.java index cfd61019906a..bc7d457b2931 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ObjectInstantiationInEqualsHashCodeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ObjectInstantiationInEqualsHashCodeInspection.java @@ -115,15 +115,13 @@ public class ObjectInstantiationInEqualsHashCodeInspection extends BaseInspectio return true; } final Object value = ExpressionUtils.computeConstantExpression(expression); - if (value instanceof Number) { - final Number number = (Number)value; + if (value instanceof Number number) { final int l = number.intValue(); if (l >= -128 && l <= 127) { return true; } } - else if (value instanceof Character) { - final Character character = (Character)value; + else if (value instanceof Character character) { final char c = character.charValue(); if (c <= 127) { return true; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java index 216dbeed1182..688e01dd4b35 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java @@ -297,8 +297,7 @@ public final class TailRecursionInspection extends BaseInspection implements Cle final String parameterName = parameter.getName(); final PsiExpression argument = PsiUtil.skipParenthesizedExprDown(arguments[index]); assert argument != null; - if (argument instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)argument; + if (argument instanceof PsiReferenceExpression referenceExpression) { if (parameter.equals(referenceExpression.resolve())) { // parameter keeps same value continue; @@ -376,8 +375,7 @@ public final class TailRecursionInspection extends BaseInspection implements Cle } private static void buildText(PsiElement element, Map replacements, StringBuilder out) { - if (element instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element; + if (element instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); final String replacement = replacements.get(target); out.append(replacement != null ? replacement : element.getText()); @@ -427,14 +425,12 @@ public final class TailRecursionInspection extends BaseInspection implements Cle if (containingMethod.hasModifierProperty(PsiModifier.STATIC)) { return false; } - if (element instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; + if (element instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); return qualifierExpression == null; } - else if (element instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element; + else if (element instanceof PsiReferenceExpression referenceExpression) { final PsiElement parent = referenceExpression.getParent(); if (parent instanceof PsiMethodCallExpression) { return false; @@ -482,11 +478,9 @@ public final class TailRecursionInspection extends BaseInspection implements Cle @Nullable private static PsiMethodCallExpression getTailCall(@Nullable PsiElement element, @NotNull PsiMethod method) { PsiMethodCallExpression tailCall = null; - if (element instanceof PsiReturnStatement) { - final PsiReturnStatement returnStatement = (PsiReturnStatement)element; + if (element instanceof PsiReturnStatement returnStatement) { PsiExpression returnValue = PsiUtil.skipParenthesizedExprDown(returnStatement.getReturnValue()); - while (returnValue instanceof PsiPolyadicExpression) { - PsiPolyadicExpression polyadic = (PsiPolyadicExpression)returnValue; + while (returnValue instanceof PsiPolyadicExpression polyadic) { returnValue = null; IElementType tokenType = polyadic.getOperationTokenType(); if (tokenType == JavaTokenType.ANDAND || tokenType == JavaTokenType.OROR) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java index 76bf7fae45e0..93e8ec79ef62 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java @@ -141,8 +141,7 @@ public class ToArrayCallWithZeroLengthArrayArgumentInspection extends BaseInspec final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) return; - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) return; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantCollectionOperationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantCollectionOperationInspection.java index 283706261888..9e2fedcf40e0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantCollectionOperationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantCollectionOperationInspection.java @@ -200,8 +200,7 @@ public class RedundantCollectionOperationInspection extends AbstractBaseJavaLoca PsiElement parent = PsiTreeUtil.getParentOfType(call, PsiIfStatement.class, PsiPolyadicExpression.class); if (parent == null) return; CommentTracker ct = new CommentTracker(); - if (parent instanceof PsiPolyadicExpression) { - PsiPolyadicExpression conjunction = (PsiPolyadicExpression)parent; + if (parent instanceof PsiPolyadicExpression conjunction) { PsiExpression[] conjuncts = conjunction.getOperands(); if (conjuncts.length == 2) { ct.replaceAndRestoreComments(parent, conjuncts[0]); @@ -512,8 +511,7 @@ public class RedundantCollectionOperationInspection extends AbstractBaseJavaLoca return new RedundantAsListForIterationHandler(); } PsiElement parent = PsiUtil.skipParenthesizedExprUp(call.getParent()); - if (parent instanceof PsiLocalVariable) { - PsiLocalVariable localVariable = (PsiLocalVariable)parent; + if (parent instanceof PsiLocalVariable localVariable) { if (!(localVariable.getParent() instanceof PsiDeclarationStatement) || ((PsiDeclarationStatement)localVariable.getParent()).getDeclaredElements().length != 1) { return null; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/UnnecessaryStringEscapeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/UnnecessaryStringEscapeInspection.java index 90ea296289c6..693d4efaefbb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/UnnecessaryStringEscapeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/UnnecessaryStringEscapeInspection.java @@ -70,10 +70,9 @@ public class UnnecessaryStringEscapeInspection extends BaseInspection implements @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiLiteralExpression)) { + if (!(element instanceof PsiLiteralExpression literalExpression)) { return; } - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)element; final PsiType type = literalExpression.getType(); if (type == null) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java index eca16027ad0c..d41ec259f483 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java @@ -76,8 +76,7 @@ public class IOResourceInspection extends ResourceInspection { if (expression instanceof PsiNewExpression) { return TypeUtils.expressionHasTypeOrSubtype(expression, "java.io.Closeable") && !isIgnoredType(expression); } - else if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + else if (expression instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String methodName = methodExpression.getReferenceName(); if (!"getResourceAsStream".equals(methodName)) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java index dce2025e3437..9930438d43e4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java @@ -86,10 +86,9 @@ public class CloneableClassInSecureContextInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement().getParent(); - if (!(element instanceof PsiClass)) { + if (!(element instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)element; @NonNls final StringBuilder methodText = new StringBuilder(); if (PsiUtil.isLanguageLevel5OrHigher(aClass) && JavaCodeStyleSettings.getInstance(aClass.getContainingFile()).INSERT_OVERRIDE_ANNOTATION) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticCollectionFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticCollectionFieldInspection.java index f9f19bbd551e..6a7a529afb06 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticCollectionFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticCollectionFieldInspection.java @@ -96,10 +96,9 @@ public class PublicStaticCollectionFieldInspection extends BaseInspection { if (ExpressionUtils.isNullLiteral(initializer)) { return true; } - if (!(initializer instanceof PsiMethodCallExpression)) { + if (!(initializer instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)initializer; final PsiMethod method = methodCallExpression.resolveMethod(); if (method == null || myMethodMatcher.matches(method)) { return true; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCreationWithoutNewKeywordInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCreationWithoutNewKeywordInspection.java index de0dbed9c9fc..e13089780c29 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCreationWithoutNewKeywordInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCreationWithoutNewKeywordInspection.java @@ -90,8 +90,7 @@ public class ArrayCreationWithoutNewKeywordInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (element instanceof PsiArrayInitializerExpression) { - final PsiArrayInitializerExpression arrayInitializerExpression = (PsiArrayInitializerExpression)element; + if (element instanceof PsiArrayInitializerExpression arrayInitializerExpression) { final PsiType type = arrayInitializerExpression.getType(); if (type != null) { PsiReplacementUtil.replaceExpression(arrayInitializerExpression, "new " + diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java index 9a69fe75b72c..ca1614158f18 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java @@ -112,8 +112,7 @@ public class BoundedWildcardInspection extends AbstractBaseJavaLocalInspectionTo @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiTypeElement) || !element.isValid() || element.getParent() == null || !element.isPhysical()) return; - PsiTypeElement typeElement = (PsiTypeElement)element; + if (!(element instanceof PsiTypeElement typeElement) || !element.isValid() || element.getParent() == null || !element.isPhysical()) return; VarianceCandidate candidate = VarianceCandidate.findVarianceCandidate(typeElement); if (candidate == null) return; @@ -440,14 +439,12 @@ public class BoundedWildcardInspection extends AbstractBaseJavaLocalInspectionTo PsiExpression r = ((PsiAssignmentExpression)parent).getRExpression(); if (!PsiTreeUtil.isAncestor(r, refElement, false)) return null; PsiExpression l = skipParensAndCastsDown(((PsiAssignmentExpression)parent).getLExpression()); - if (!(l instanceof PsiReferenceExpression)) return null; - PsiReferenceExpression lExpression = (PsiReferenceExpression)l; + if (!(l instanceof PsiReferenceExpression lExpression)) return null; PsiExpression lQualifier = skipParensAndCastsDown(lExpression.getQualifierExpression()); if (lQualifier != null && !(lQualifier instanceof PsiThisExpression)) return null; PsiElement resolved = lExpression.resolve(); - if (!(resolved instanceof PsiField)) return null; + if (!(resolved instanceof PsiField field)) return null; // too expensive to search for usages of public field otherwise - PsiField field = (PsiField)resolved; if (!field.hasModifierProperty(PsiModifier.PRIVATE) && !field.hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) return null; PsiType type = r.getType(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ChainedMethodCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ChainedMethodCallInspection.java index b38acdf64a29..d442f3b13d87 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ChainedMethodCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ChainedMethodCallInspection.java @@ -102,8 +102,7 @@ public class ChainedMethodCallInspection extends BaseInspection { } } if (ignoreSelfTypes) { - if (qualifier instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)qualifier; + if (qualifier instanceof PsiMethodCallExpression methodCallExpression) { final PsiMethod qualifierMethod = methodCallExpression.resolveMethod(); if (qualifierMethod == null) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaCanBeReplacedWithAnonymousInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaCanBeReplacedWithAnonymousInspection.java index 087fa61e4d70..ed9b5248dcfd 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaCanBeReplacedWithAnonymousInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaCanBeReplacedWithAnonymousInspection.java @@ -192,8 +192,7 @@ public class LambdaCanBeReplacedWithAnonymousInspection extends BaseInspection { } public static boolean isConvertibleLambdaExpression(PsiElement parent) { - if (parent instanceof PsiLambdaExpression) { - final PsiLambdaExpression lambdaExpression = (PsiLambdaExpression)parent; + if (parent instanceof PsiLambdaExpression lambdaExpression) { final PsiClass thisClass = PsiTreeUtil.getParentOfType(lambdaExpression, PsiClass.class, true); if (thisClass == null || thisClass instanceof PsiAnonymousClass) { final PsiElement body = lambdaExpression.getBody(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java index 9305afacf376..b93c9be7de1e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java @@ -83,10 +83,9 @@ public class SizeReplaceableByIsEmptyInspection extends BaseInspection { if (!(operand instanceof PsiMethodCallExpression)) { operand = PsiUtil.skipParenthesizedExprDown(binaryExpression.getROperand()); } - if (!(operand instanceof PsiMethodCallExpression)) { + if (!(operand instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)operand; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); if (qualifierExpression == null) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java index 5da5234b8c15..d031442f75b6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java @@ -91,10 +91,9 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im } private static boolean isAppendCall(PsiElement element) { - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; if (STRING_JOINER_ADD.test(methodCallExpression)) return true; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); @NonNls final String methodName = methodExpression.getReferenceName(); @@ -111,10 +110,9 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im } private static boolean isToStringCall(PsiElement element) { - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); @NonNls final String methodName = methodExpression.getReferenceName(); if (!"toString".equals(methodName)) { @@ -174,7 +172,7 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiVariable)) { + if (!(parent instanceof PsiVariable variable)) { if (parent instanceof PsiNewExpression) { final PsiExpression stringBuilderExpression = getCompleteExpression((PsiExpression)parent); if (stringBuilderExpression != null) { @@ -188,7 +186,6 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im } return; } - final PsiVariable variable = (PsiVariable)parent; final String variableName = variable.getName(); if (variableName == null) { return; @@ -208,8 +205,7 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im if (builder == null) { return; } - } else if (initializer instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)initializer; + } else if (initializer instanceof PsiNewExpression newExpression) { final PsiExpressionList argumentList = newExpression.getArgumentList(); if (argumentList == null) { return; @@ -297,8 +293,7 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im if (stripped != null) { expression = stripped; } - if (type instanceof PsiPrimitiveType && expression instanceof PsiLiteralExpression) { - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)expression; + if (type instanceof PsiPrimitiveType && expression instanceof PsiLiteralExpression literalExpression) { Object value = literalExpression.getValue(); if (value instanceof Character) { return '"' + StringUtil.escapeStringCharacters(value.toString()) + '"'; @@ -310,10 +305,9 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im private static boolean isVariableInitializer(PsiExpression expression) { final PsiElement parent = expression.getParent(); - if (!(parent instanceof PsiVariable)) { + if (!(parent instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)parent; final PsiExpression initializer = variable.getInitializer(); return initializer == expression; } @@ -323,8 +317,7 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im if (currentLine < 0) { currentLine = getLineNumber(element); } - if (element instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)element; + if (element instanceof PsiNewExpression newExpression) { final PsiExpressionList argumentList = newExpression.getArgumentList(); if (argumentList == null) { return null; @@ -355,8 +348,7 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im } } - if (element instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; + if (element instanceof PsiMethodCallExpression methodCallExpression) { final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String referenceName = methodExpression.getReferenceName(); @@ -528,8 +520,7 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im if (expression instanceof PsiNewExpression) { return isConcatenatorConstruction((PsiNewExpression)expression); } - if (!(expression instanceof PsiMethodCallExpression)) return false; - final PsiMethodCallExpression call = (PsiMethodCallExpression)expression; + if (!(expression instanceof PsiMethodCallExpression call)) return false; if (!isAppendCall(call)) return false; expression = PsiUtil.skipParenthesizedExprDown(call.getMethodExpression().getQualifierExpression()); } @@ -632,16 +623,14 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im return false; } final PsiElement grandParent = parent.getParent(); - if (grandParent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; + if (grandParent instanceof PsiMethodCallExpression methodCallExpression) { return isCallToStringBuilderMethod(methodCallExpression) || isArgumentOfStringBuilderMethod(methodCallExpression); } - if (grandParent instanceof PsiNewExpression) { + if (grandParent instanceof PsiNewExpression newExpression) { final PsiLocalVariable variable = PsiTreeUtil.getParentOfType(grandParent, PsiLocalVariable.class, true, PsiExpressionList.class); if (!myVariable.equals(variable)) { return false; } - final PsiNewExpression newExpression = (PsiNewExpression)grandParent; final PsiMethod constructor = newExpression.resolveMethod(); if (constructor == null) { return false; @@ -660,14 +649,12 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection im private boolean isCallToStringBuilderMethod(PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); PsiExpression qualifier = PsiUtil.skipParenthesizedExprDown(methodExpression.getQualifierExpression()); - while (qualifier instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression call = (PsiMethodCallExpression)qualifier; + while (qualifier instanceof PsiMethodCallExpression call) { qualifier = PsiUtil.skipParenthesizedExprDown(call.getMethodExpression().getQualifierExpression()); } - if (!(qualifier instanceof PsiReferenceExpression)) { + if (!(qualifier instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)qualifier; final PsiElement target = referenceExpression.resolve(); if (!myVariable.equals(target)) { return false; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFullyQualifiedNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFullyQualifiedNameInspection.java index 29b84659c5fd..34b467ab591a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFullyQualifiedNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFullyQualifiedNameInspection.java @@ -110,10 +110,9 @@ public class UnnecessaryFullyQualifiedNameInspection extends BaseInspection impl } final PsiFile file = referenceElement.getContainingFile(); final PsiElement target = referenceElement.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)target; final String qualifiedName = aClass.getQualifiedName(); if (qualifiedName == null || !ImportUtils.nameCanBeImported(qualifiedName, referenceElement)) { return; @@ -205,7 +204,7 @@ public class UnnecessaryFullyQualifiedNameInspection extends BaseInspection impl private void checkReference(PsiJavaCodeReferenceElement reference) { final PsiElement qualifier = reference.getQualifier(); - if (!(qualifier instanceof PsiJavaCodeReferenceElement)) { + if (!(qualifier instanceof PsiJavaCodeReferenceElement qualifierReference)) { return; } final PsiElement parent = reference.getParent(); @@ -237,7 +236,6 @@ public class UnnecessaryFullyQualifiedNameInspection extends BaseInspection impl reportAsInformationInsideJavadoc = !ImportHelper.isAlreadyImported(containingFile, reference.getQualifiedName()); } } - final PsiJavaCodeReferenceElement qualifierReference = (PsiJavaCodeReferenceElement)qualifier; final PsiElement qualifierTarget = qualifierReference.resolve(); if (!(qualifierTarget instanceof PsiPackage)) { return; @@ -251,10 +249,9 @@ public class UnnecessaryFullyQualifiedNameInspection extends BaseInspection impl PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(containingFile.getProject()).getResolveHelper(); for (final PsiJavaCodeReferenceElement aReference : references) { final PsiElement referenceTarget = aReference.resolve(); - if (!(referenceTarget instanceof PsiClass)) { + if (!(referenceTarget instanceof PsiClass aClass)) { continue; } - final PsiClass aClass = (PsiClass)referenceTarget; final String qualifiedName = aClass.getQualifiedName(); if (qualifiedName == null) { continue; @@ -297,8 +294,7 @@ public class UnnecessaryFullyQualifiedNameInspection extends BaseInspection impl private static void collectInnerClassNames(PsiJavaCodeReferenceElement reference, List references) { PsiElement rParent = reference.getParent(); - while (rParent instanceof PsiJavaCodeReferenceElement) { - final PsiJavaCodeReferenceElement parentReference = (PsiJavaCodeReferenceElement)rParent; + while (rParent instanceof PsiJavaCodeReferenceElement parentReference) { if (!reference.equals(parentReference.getQualifier())) { break; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java index d89aa82ac011..c6f9797c26f3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java @@ -65,15 +65,13 @@ public class UnqualifiedInnerClassAccessInspection extends BaseInspection implem @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiJavaCodeReferenceElement)) { + if (!(element instanceof PsiJavaCodeReferenceElement referenceElement)) { return; } - final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)element; final PsiElement target = referenceElement.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass innerClass)) { return; } - final PsiClass innerClass = (PsiClass)target; final PsiClass containingClass = innerClass.getContainingClass(); if (containingClass == null) { return; @@ -83,10 +81,9 @@ public class UnqualifiedInnerClassAccessInspection extends BaseInspection implem return; } final PsiFile containingFile = referenceElement.getContainingFile(); - if (!(containingFile instanceof PsiJavaFile)) { + if (!(containingFile instanceof PsiJavaFile javaFile)) { return; } - final PsiJavaFile javaFile = (PsiJavaFile)containingFile; final String innerClassName = innerClass.getQualifiedName(); if (innerClassName == null) { return; @@ -224,10 +221,9 @@ public class UnqualifiedInnerClassAccessInspection extends BaseInspection implem return; } final PsiElement target = reference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)target; if (!onDemand) { final String qualifiedName = aClass.getQualifiedName(); if (name.equals(qualifiedName)) { @@ -264,10 +260,9 @@ public class UnqualifiedInnerClassAccessInspection extends BaseInspection implem return; } final PsiElement target = reference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)target; if (!aClass.hasModifierProperty(PsiModifier.STATIC) && reference.getParent() instanceof PsiNewExpression) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/VarianceCandidate.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/VarianceCandidate.java index c7f2abab86ee..4a30a0748d3b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/VarianceCandidate.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/VarianceCandidate.java @@ -45,27 +45,23 @@ final class VarianceCandidate { PsiElement parent = innerTypeElement.getParent(); if (!(parent instanceof PsiReferenceParameterList)) return null; PsiElement pp = parent.getParent(); - if (!(pp instanceof PsiJavaCodeReferenceElement)) return null; - PsiJavaCodeReferenceElement refElement = (PsiJavaCodeReferenceElement)pp; + if (!(pp instanceof PsiJavaCodeReferenceElement refElement)) return null; if (!parent.equals(refElement.getParameterList())) return null; JavaResolveResult result = refElement.advancedResolve(false); - if (!(result.getElement() instanceof PsiClass)) return null; - PsiClass resolved = (PsiClass)result.getElement(); + if (!(result.getElement() instanceof PsiClass resolved)) return null; int index = ArrayUtil.indexOf(((PsiReferenceParameterList)parent).getTypeParameterElements(), innerTypeElement); PsiElement p3 = pp.getParent(); if (!(p3 instanceof PsiTypeElement)) return null; PsiElement p4 = p3.getParent(); - if (!(p4 instanceof PsiParameter)) return null; - PsiParameter parameter = (PsiParameter)p4; + if (!(p4 instanceof PsiParameter parameter)) return null; PsiElement scope = parameter.getDeclarationScope(); - if (!(scope instanceof PsiMethod)) return null; + if (!(scope instanceof PsiMethod method)) return null; PsiTypeParameter[] typeParameters = resolved.getTypeParameters(); if (typeParameters.length <= index) return null; PsiTypeParameter typeParameter = typeParameters[index]; - PsiMethod method = (PsiMethod)scope; PsiParameterList parameterList = method.getParameterList(); int parameterIndex = parameterList.getParameterIndex(parameter); if (parameterIndex == -1) return null; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/VarianceUtil.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/VarianceUtil.java index 063b058f5827..4081003bd60f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/VarianceUtil.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/VarianceUtil.java @@ -132,8 +132,7 @@ final class VarianceUtil { // 3) wildcardization of "X" to "X" is useless iff the method returns ("T" or something which doesn't contain "T") and // (the "X" is the only parameter) static boolean wildCardIsUseless(@NotNull VarianceCandidate candidate, boolean isExtends) { - if (!(candidate.type instanceof PsiClassType)) return false; - PsiClassType type = (PsiClassType)candidate.type; + if (!(candidate.type instanceof PsiClassType type)) return false; PsiClassType.ClassResolveResult resolve = type.resolveGenerics(); PsiClass typeParameter = resolve.getElement(); if (!(typeParameter instanceof PsiTypeParameter)) return false; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java index eb83f02221e1..3881bad51b3a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java @@ -71,10 +71,9 @@ public class AccessToNonThreadSafeStaticFieldFromInstanceInspection extends Base return; } final PsiType type = expression.getType(); - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType classType)) { return; } - final PsiClassType classType = (PsiClassType)type; final String className = classType.rawType().getCanonicalText(); boolean deepCheck = false; if (!nonThreadSafeClasses.contains(className)) { @@ -84,10 +83,9 @@ public class AccessToNonThreadSafeStaticFieldFromInstanceInspection extends Base deepCheck = true; } final PsiElement target = expression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField field)) { return; } - final PsiField field = (PsiField)target; if (!field.hasModifierProperty(PsiModifier.STATIC)) { return; } @@ -118,10 +116,9 @@ public class AccessToNonThreadSafeStaticFieldFromInstanceInspection extends Base return; } final PsiType initializerType = initializer.getType(); - if (!(initializerType instanceof PsiClassType)) { + if (!(initializerType instanceof PsiClassType classType2)) { return; } - final PsiClassType classType2 = (PsiClassType)initializerType; final String className2 = classType2.rawType().getCanonicalText(); if (!nonThreadSafeClasses.contains(className2)) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToStaticFieldLockedOnInstanceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToStaticFieldLockedOnInstanceInspection.java index a1d1be981d49..81111bf60c83 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToStaticFieldLockedOnInstanceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToStaticFieldLockedOnInstanceInspection.java @@ -79,10 +79,9 @@ public class AccessToStaticFieldLockedOnInstanceInspection extends BaseInspectio public void visitReferenceExpression(@NotNull PsiReferenceExpression expression) { super.visitReferenceExpression(expression); final PsiElement target = expression.resolve(); - if (!(target instanceof PsiField)) { + if (!(target instanceof PsiField lockedField)) { return; } - final PsiField lockedField = (PsiField)target; if (!lockedField.hasModifierProperty(PsiModifier.STATIC) || ExpressionUtils.isConstant(lockedField)) { return; } @@ -124,11 +123,9 @@ public class AccessToStaticFieldLockedOnInstanceInspection extends BaseInspectio break; } final PsiExpression lockExpression = synchronizedStatement.getLockExpression(); - if (lockExpression instanceof PsiReferenceExpression) { - final PsiReferenceExpression reference = (PsiReferenceExpression)lockExpression; + if (lockExpression instanceof PsiReferenceExpression reference) { final PsiElement lockTarget = reference.resolve(); - if (lockTarget instanceof PsiField) { - final PsiField lockField = (PsiField)lockTarget; + if (lockTarget instanceof PsiField lockField) { if (lockField.hasModifierProperty(PsiModifier.STATIC)) { isLockedOnClass = true; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java index 5485f3388540..a0ee71a784da 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java @@ -85,10 +85,9 @@ public class DoubleCheckedLockingInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiIfStatement)) { + if (!(parent instanceof PsiIfStatement ifStatement)) { return; } - final PsiIfStatement ifStatement = (PsiIfStatement)parent; final PsiExpression condition = ifStatement.getCondition(); if (condition == null) { return; @@ -107,17 +106,14 @@ public class DoubleCheckedLockingInspection extends BaseInspection { @Nullable private static PsiField findCheckedField(PsiExpression expression) { - if (expression instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)expression; + if (expression instanceof PsiReferenceExpression referenceExpression) { final PsiElement target = referenceExpression.resolve(); if (!(target instanceof PsiField)) { return null; } return (PsiField)target; } - else if (expression instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; + else if (expression instanceof PsiBinaryExpression binaryExpression) { final IElementType tokenType = binaryExpression.getOperationTokenType(); if (!ComparisonUtils.isComparisonOperation(tokenType)) { return null; @@ -130,9 +126,7 @@ public class DoubleCheckedLockingInspection extends BaseInspection { } return findCheckedField(rhs); } - else if (expression instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = - (PsiPrefixExpression)expression; + else if (expression instanceof PsiPrefixExpression prefixExpression) { final IElementType tokenType = prefixExpression.getOperationTokenType(); if (!JavaTokenType.EXCL.equals(tokenType)) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SharedThreadLocalRandomInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SharedThreadLocalRandomInspection.java index a9040271fba8..ff5c7558f230 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SharedThreadLocalRandomInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SharedThreadLocalRandomInspection.java @@ -115,10 +115,9 @@ public class SharedThreadLocalRandomInspection extends BaseInspection { return false; } final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; return !myMethodMatcher.matches(methodCallExpression); } @@ -127,19 +126,17 @@ public class SharedThreadLocalRandomInspection extends BaseInspection { if (parent instanceof PsiVariable) { return (PsiVariable)parent; } - if (!(parent instanceof PsiAssignmentExpression)) { + if (!(parent instanceof PsiAssignmentExpression assignmentExpression)) { return null; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; final PsiExpression rhs = assignmentExpression.getRExpression(); if (!PsiTreeUtil.isAncestor(rhs, expression, false)) { return null; } final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression()); - if (!(lhs instanceof PsiReferenceExpression)) { + if (!(lhs instanceof PsiReferenceExpression referenceExpression)) { return null; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs; final PsiElement target = referenceExpression.resolve(); if (!(target instanceof PsiVariable)) { return null; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspection.java index 11732cd36caf..e2697645f0fe 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspection.java @@ -95,10 +95,9 @@ public class ParameterHidingMemberVariableInspection extends BaseInspection { public void visitParameter(@NotNull PsiParameter variable) { super.visitParameter(variable); final PsiElement declarationScope = variable.getDeclarationScope(); - if (!(declarationScope instanceof PsiMethod)) { + if (!(declarationScope instanceof PsiMethod method)) { return; } - final PsiMethod method = (PsiMethod)declarationScope; if (method.isConstructor() && (m_ignoreForConstructors || JavaPsiRecordUtil.isCanonicalConstructor(method))) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/TypeParameterHidesVisibleTypeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/TypeParameterHidesVisibleTypeInspection.java index 4a8e40b89b17..bd8a4057ce0b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/TypeParameterHidesVisibleTypeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/TypeParameterHidesVisibleTypeInspection.java @@ -81,8 +81,7 @@ public class TypeParameterHidesVisibleTypeInspection extends BaseInspection { return; } final PsiClass aClass = resolveHelper.resolveReferencedClass(unqualifiedClassName, context); - if (aClass instanceof PsiTypeParameter) { - final PsiTypeParameter typeParameter = (PsiTypeParameter)aClass; + if (aClass instanceof PsiTypeParameter typeParameter) { final PsiTypeParameterListOwner owner = typeParameter.getOwner(); if (owner == null) { return; diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/MethodParameterInjection.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/MethodParameterInjection.java index e415ee4235ad..9aeaaa85e5e9 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/MethodParameterInjection.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/MethodParameterInjection.java @@ -69,8 +69,7 @@ public final class MethodParameterInjection extends BaseInjection { @Override public MethodParameterInjection copyFrom(@NotNull BaseInjection o) { super.copyFrom(o); - if (o instanceof MethodParameterInjection) { - final MethodParameterInjection other = (MethodParameterInjection)o; + if (o instanceof MethodParameterInjection other) { myClassName = other.getClassName(); myParameterMap.clear(); for (MethodInfo info : other.myParameterMap.values()) { diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.java index fda25bbc570b..96918f21d8ca 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.java @@ -282,9 +282,8 @@ public final class MethodParameterPanel extends AbstractInjectionPanel { PsiElement element = psiReference.getElement(); - if (element instanceof PsiExpression) { - PsiExpression refExpression = (PsiExpression)element; + if (element instanceof PsiExpression refExpression) { places.add(refExpression); if (!myUnparsable) { myUnparsable = checkUnparsableReference(refExpression); @@ -241,8 +240,7 @@ public final class ConcatenationInjector implements ConcatenationAwareInjector { if (myConfiguration.getAdvancedConfiguration().getDfaOption() == Configuration.DfaOption.OFF) return true; PsiElement e = expression.resolve(); if (e instanceof PsiVariable) { - if (e instanceof PsiParameter) { - PsiParameter p = (PsiParameter)e; + if (e instanceof PsiParameter p) { PsiElement declarationScope = p.getDeclarationScope(); PsiMethod method = declarationScope instanceof PsiMethod ? (PsiMethod)declarationScope : null; PsiParameterList parameterList = method == null ? null : method.getParameterList(); @@ -418,10 +416,9 @@ public final class ConcatenationInjector implements ConcatenationAwareInjector { } private static List getTextBlockInjectedArea(PsiLanguageInjectionHost host) { - if (!(host instanceof PsiLiteralExpression)) { + if (!(host instanceof PsiLiteralExpression literalExpression)) { return null; } - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)host; if (!literalExpression.isTextBlock()) { return null; } @@ -470,8 +467,7 @@ public final class ConcatenationInjector implements ConcatenationAwareInjector { private static boolean checkUnparsableReference(PsiExpression refExpression) { PsiElement parent = refExpression.getParent(); - if (parent instanceof PsiAssignmentExpression) { - PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + if (parent instanceof PsiAssignmentExpression assignmentExpression) { IElementType operation = assignmentExpression.getOperationTokenType(); if (assignmentExpression.getLExpression() == refExpression && JavaTokenType.PLUSEQ.equals(operation)) { return true; diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/validation/LanguageMismatch.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/validation/LanguageMismatch.java index 73adee081dee..b2a419b65f2b 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/validation/LanguageMismatch.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/validation/LanguageMismatch.java @@ -103,14 +103,12 @@ public class LanguageMismatch extends LocalInspectionTool { return; } } - else if (var instanceof PsiExpressionList) { - final PsiExpressionList list = (PsiExpressionList)var; + else if (var instanceof PsiExpressionList list) { if (!ArrayUtil.contains(expression, list.getExpressions())) { return; } } - else if (var instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression a = (PsiAssignmentExpression)var; + else if (var instanceof PsiAssignmentExpression a) { if (a.getRExpression() != expression) { return; } diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/validation/UnknownLanguageID.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/validation/UnknownLanguageID.java index aedf34400d55..8caaec4078a4 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/validation/UnknownLanguageID.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/validation/UnknownLanguageID.java @@ -43,8 +43,7 @@ public class UnknownLanguageID extends LocalInspectionTool { final String name = valuePair.getName(); if (name == null || "value".equals(name)) { final PsiAnnotationMemberValue value = valuePair.getValue(); - if (value instanceof PsiExpression) { - final PsiExpression expression = (PsiExpression)value; + if (value instanceof PsiExpression expression) { final Object id = JavaPsiFacade.getInstance(expression.getProject()). getConstantEvaluationHelper().computeConstantExpression(expression); if (id instanceof String) { diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/PatternValidator.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/PatternValidator.java index ff495b0fb72b..6d0c85f13efe 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/PatternValidator.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/PatternValidator.java @@ -75,8 +75,7 @@ public class PatternValidator extends LocalInspectionTool { // this checks method arguments check(expression, holder, false); } - else if (element instanceof PsiNameValuePair) { - final PsiNameValuePair valuePair = (PsiNameValuePair)element; + else if (element instanceof PsiNameValuePair valuePair) { final String name = valuePair.getName(); if (name == null || name.equals(PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME)) { // check whether @Subst complies with pattern @@ -113,8 +112,7 @@ public class PatternValidator extends LocalInspectionTool { } private void check(@NotNull PsiExpression expression, ProblemsHolder holder, boolean isAnnotationValue) { - if (expression instanceof PsiConditionalExpression) { - final PsiConditionalExpression expr = (PsiConditionalExpression)expression; + if (expression instanceof PsiConditionalExpression expr) { PsiExpression e = expr.getThenExpression(); if (e != null) { check(e, holder, isAnnotationValue); diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotationUtilEx.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotationUtilEx.java index 9c3574215705..b763dc804914 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotationUtilEx.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotationUtilEx.java @@ -73,8 +73,7 @@ public final class AnnotationUtilEx { element = ((PsiAssignmentExpression)element).getLExpression(); continue; } - else if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression p = (PsiAssignmentExpression)parent; + else if (parent instanceof PsiAssignmentExpression p) { if (p.getRExpression() == element) { element = p.getLExpression(); continue; @@ -89,8 +88,7 @@ public final class AnnotationUtilEx { else if (parent instanceof PsiModifierListOwner) { return (PsiModifierListOwner)parent; } - else if (parent instanceof PsiArrayInitializerMemberValue) { - final PsiArrayInitializerMemberValue value = (PsiArrayInitializerMemberValue)parent; + else if (parent instanceof PsiArrayInitializerMemberValue value) { final PsiElement pair = value.getParent(); if (pair instanceof PsiNameValuePair) { return AnnotationUtil.getAnnotationMethod((PsiNameValuePair)pair); @@ -145,8 +143,7 @@ public final class AnnotationUtilEx { return visitor.visitAnnotationParameter((PsiNameValuePair)element, (PsiAnnotation)parent.getParent()); } - if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression p = (PsiAssignmentExpression)parent; + if (parent instanceof PsiAssignmentExpression p) { if (p.getRExpression() == element || p.getOperationTokenType() == JavaTokenType.PLUSEQ) { final PsiExpression left = p.getLExpression(); if (left instanceof PsiReferenceExpression) { diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/ContextComputationProcessor.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/ContextComputationProcessor.java index 540c15b21b1a..cc5072f47be3 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/ContextComputationProcessor.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/ContextComputationProcessor.java @@ -78,17 +78,15 @@ public final class ContextComputationProcessor { addStringFragment(" ", result); // do not glue branches together collectOperands(((PsiConditionalExpression)expression).getElseExpression(), result, unparsable); } - else if (expression instanceof PsiPolyadicExpression && + else if (expression instanceof PsiPolyadicExpression binaryExpression && ((PsiPolyadicExpression)expression).getOperationTokenType() == JavaTokenType.PLUS) { - PsiPolyadicExpression binaryExpression = (PsiPolyadicExpression)expression; for (PsiExpression operand : binaryExpression.getOperands()) { collectOperands(operand, result, unparsable); } } - else if (expression instanceof PsiAssignmentExpression && + else if (expression instanceof PsiAssignmentExpression assignmentExpression && ((PsiAssignmentExpression)expression).getOperationTokenType() == JavaTokenType.PLUSEQ) { unparsable.set(Boolean.TRUE); - PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; collectOperands(assignmentExpression.getLExpression(), result, unparsable); collectOperands(assignmentExpression.getRExpression(), result, unparsable); } diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/PsiUtilEx.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/PsiUtilEx.java index d1cfd5d1b31b..b09555a6696a 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/PsiUtilEx.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/PsiUtilEx.java @@ -47,8 +47,7 @@ public final class PsiUtilEx { @Nullable public static PsiParameter getParameterForArgument(PsiElement element) { PsiElement p = element.getParent(); - if (!(p instanceof PsiExpressionList)) return null; - PsiExpressionList list = (PsiExpressionList)p; + if (!(p instanceof PsiExpressionList list)) return null; PsiElement parent = list.getParent(); if (!(parent instanceof PsiCallExpression)) return null; PsiExpression[] arguments = list.getExpressions(); diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/SubstitutedExpressionEvaluationHelper.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/SubstitutedExpressionEvaluationHelper.java index d9906133e786..87da993cac0e 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/SubstitutedExpressionEvaluationHelper.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/SubstitutedExpressionEvaluationHelper.java @@ -63,8 +63,7 @@ public class SubstitutedExpressionEvaluationHelper { @Override public @Nullable Object computeExpression(@NotNull PsiExpression o, @NotNull PsiConstantEvaluationHelper.AuxEvaluator auxEvaluator) { PsiType resolvedType = null; - if (o instanceof PsiMethodCallExpression) { - PsiMethodCallExpression c = (PsiMethodCallExpression)o; + if (o instanceof PsiMethodCallExpression c) { PsiMethod m = (PsiMethod)c.getMethodExpression().resolve(); PsiType returnType = m != null ? m.getReturnType() : null; if (returnType != null && !PsiTypes.voidType().equals(returnType)) { @@ -80,8 +79,7 @@ public class SubstitutedExpressionEvaluationHelper { // find substitution Object substituted = calcSubstituted((PsiModifierListOwner)resolved); if (substituted != null) return substituted; - if (resolved instanceof PsiVariable) { - PsiVariable psiVariable = (PsiVariable)resolved; + if (resolved instanceof PsiVariable psiVariable) { resolvedType = psiVariable.getType(); Collection values; if (dfaOption == Configuration.DfaOption.ASSIGNMENTS) { diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/CommentLanguageInjector.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/CommentLanguageInjector.java index 3d7bcac6140f..664da3d58229 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/CommentLanguageInjector.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/CommentLanguageInjector.java @@ -18,9 +18,8 @@ public class CommentLanguageInjector implements LanguageInjectionContributor { @Nullable @Override public Injection getInjection(@NotNull PsiElement context) { - if (!(context instanceof PsiLanguageInjectionHost) || context instanceof PsiComment) return null; + if (!(context instanceof PsiLanguageInjectionHost host) || context instanceof PsiComment) return null; if (!((PsiLanguageInjectionHost)context).isValidHost()) return null; - PsiLanguageInjectionHost host = (PsiLanguageInjectionHost)context; boolean applicableFound = false; for (LanguageInjectionSupport support : InjectorUtils.getActiveInjectionSupports()) { diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjectionPerformer.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjectionPerformer.java index 3f131ee6e714..740dc8f44e8d 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjectionPerformer.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjectionPerformer.java @@ -21,12 +21,10 @@ final class DefaultLanguageInjectionPerformer implements FallbackInjectionPerfor public boolean performInjection(@NotNull MultiHostRegistrar registrar, @NotNull Injection injection, @NotNull PsiElement context) { - if (!(context instanceof PsiLanguageInjectionHost) || !((PsiLanguageInjectionHost)context).isValidHost()) { + if (!(context instanceof PsiLanguageInjectionHost host) || !((PsiLanguageInjectionHost)context).isValidHost()) { return false; } - PsiLanguageInjectionHost host = (PsiLanguageInjectionHost)context; - PsiFile containingFile = context.getContainingFile(); InjectedLanguage injectedLanguage = InjectedLanguage.create(injection.getInjectedLanguageId(), injection.getPrefix(), diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjector.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjector.java index ca9b22101e8f..e19c1f3c184f 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjector.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/DefaultLanguageInjector.java @@ -14,8 +14,7 @@ public final class DefaultLanguageInjector implements LanguageInjectionContribut @Override public Injection getInjection(@NotNull PsiElement context) { - if (!(context instanceof PsiLanguageInjectionHost) || !((PsiLanguageInjectionHost)context).isValidHost()) return null; - PsiLanguageInjectionHost host = (PsiLanguageInjectionHost)context; + if (!(context instanceof PsiLanguageInjectionHost host) || !((PsiLanguageInjectionHost)context).isValidHost()) return null; for (LanguageInjectionSupport support : InjectorUtils.getActiveInjectionSupports()) { if (!support.isApplicableTo(host)) continue; diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/TemporaryPlacesInjector.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/TemporaryPlacesInjector.java index 0262f9510ade..0bf23619a1a6 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/TemporaryPlacesInjector.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/TemporaryPlacesInjector.java @@ -16,11 +16,10 @@ public final class TemporaryPlacesInjector implements LanguageInjectionContribut @Override public @Nullable Injection getInjection(@NotNull PsiElement context) { - if (!(context instanceof PsiLanguageInjectionHost) || !((PsiLanguageInjectionHost)context).isValidHost()) { + if (!(context instanceof PsiLanguageInjectionHost host) || !((PsiLanguageInjectionHost)context).isValidHost()) { return null; } - PsiLanguageInjectionHost host = (PsiLanguageInjectionHost)context; TemporaryPlacesRegistry registry = TemporaryPlacesRegistry.getInstance(host.getProject()); PsiFile containingFile = context.getContainingFile(); diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java index cd253623ac63..fcacbf983989 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java @@ -64,8 +64,7 @@ public final class UnInjectLanguageAction implements IntentionAction, LowPriorit if (psiFile == null) { PsiReference reference = file.findReferenceAt(offset); if (reference == null) return; - if (reference.getElement() instanceof PsiLanguageInjectionHost) { - PsiLanguageInjectionHost host = (PsiLanguageInjectionHost)reference.getElement(); + if (reference.getElement() instanceof PsiLanguageInjectionHost host) { for (LanguageInjectionSupport support : InjectorUtils.getActiveInjectionSupports()) { if (support.isApplicableTo(host) && support.removeInjectionInPlace(host)) { PsiManager.getInstance(project).dropPsiCaches(); diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/BaseInjection.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/BaseInjection.java index a3aa6cc82594..51b59dbed7a8 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/BaseInjection.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/BaseInjection.java @@ -180,12 +180,10 @@ public class BaseInjection implements Injection, PersistentStateComponent unparsableRef, final PairProcessor> processor) { - if (place instanceof XmlTag) { - final XmlTag xmlTag = (XmlTag)place; + if (place instanceof XmlTag xmlTag) { List injections = getConfiguration().getInjections(XmlLanguageInjectionSupport.XML_SUPPORT_ID); for (int i = 0, injectionsSize = injections.size(); i < injectionsSize; i++) { @@ -150,9 +149,7 @@ final class XmlLanguageInjector implements MultiHostInjector { } } } - else if (place instanceof XmlAttributeValue && place.getParent() instanceof XmlAttribute) { - final XmlAttribute attribute = (XmlAttribute)place.getParent(); - final XmlAttributeValue value = (XmlAttributeValue)place; + else if (place instanceof XmlAttributeValue value && place.getParent() instanceof XmlAttribute attribute) { //if (value == null) return; // Check that we don't inject anything into embedded (e.g. JavaScript) content: // XmlToken: " @@ -207,8 +204,7 @@ final class XmlLanguageInjector implements MultiHostInjector { final XmlIndex index = getXmlAnnotatedElementsValue(); if (xmlElement instanceof XmlAttributeValue) xmlElement = (XmlElement)xmlElement.getParent(); final XmlTag tag; - if (xmlElement instanceof XmlAttribute) { - final XmlAttribute attribute = (XmlAttribute)xmlElement; + if (xmlElement instanceof XmlAttribute attribute) { if (areThereInjectionsWithText(attribute.getLocalName(), index)) return true; if (areThereInjectionsWithText(attribute.getValue(), index)) return true; //if (areThereInjectionsWithText(attribute.getNamespace(), index)) return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/adapter/AdapterToListenerIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/adapter/AdapterToListenerIntention.java index 1159f4d91daf..26d688940be8 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/adapter/AdapterToListenerIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/adapter/AdapterToListenerIntention.java @@ -38,10 +38,9 @@ public class AdapterToListenerIntention extends MutablyNamedIntention { protected void processIntention(@NotNull PsiElement element) { final PsiElement parent = element.getParent(); final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiClass)) { + if (!(grandParent instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)grandParent; final PsiReferenceList extendsList = aClass.getExtendsList(); if (extendsList == null) { return; @@ -54,10 +53,9 @@ public class AdapterToListenerIntention extends MutablyNamedIntention { final PsiJavaCodeReferenceElement extendsReference = extendsReferences[0]; final PsiElement target = extendsReference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass extendsClass)) { return; } - final PsiClass extendsClass = (PsiClass)target; final PsiReferenceList implementsList = extendsClass.getImplementsList(); if (implementsList == null) { @@ -73,10 +71,9 @@ public class AdapterToListenerIntention extends MutablyNamedIntention { continue; } final PsiElement implementsTarget = implementsReference.resolve(); - if (!(implementsTarget instanceof PsiClass)) { + if (!(implementsTarget instanceof PsiClass implementsClass)) { continue; } - final PsiClass implementsClass = (PsiClass)implementsTarget; if (!implementsClass.isInterface()) { continue; } @@ -119,19 +116,14 @@ public class AdapterToListenerIntention extends MutablyNamedIntention { } final PsiStatement[] statements = body.getStatements(); for (PsiStatement statement : statements) { - if (!(statement instanceof PsiExpressionStatement)) { + if (!(statement instanceof PsiExpressionStatement expressionStatement)) { continue; } - final PsiExpressionStatement expressionStatement = - (PsiExpressionStatement)statement; final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { continue; } - final PsiMethodCallExpression - methodCallExpression = - (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifier = diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/adapter/AdapterToListenerPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/adapter/AdapterToListenerPredicate.java index 5edb66b7351f..83f0b4ca162f 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/adapter/AdapterToListenerPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/adapter/AdapterToListenerPredicate.java @@ -27,10 +27,9 @@ class AdapterToListenerPredicate implements PsiElementPredicate { return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiReferenceList)) { + if (!(parent instanceof PsiReferenceList referenceList)) { return false; } - final PsiReferenceList referenceList = (PsiReferenceList)parent; if (PsiReferenceList.Role.EXTENDS_LIST != referenceList.getRole()) { return false; } @@ -46,10 +45,9 @@ class AdapterToListenerPredicate implements PsiElementPredicate { final PsiJavaCodeReferenceElement referenceElement = referenceElements[0]; final PsiElement target = referenceElement.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return false; } - final PsiClass aClass = (PsiClass)target; @NonNls final String className = aClass.getName(); if (!className.endsWith("Adapter")) { return false; @@ -68,10 +66,9 @@ class AdapterToListenerPredicate implements PsiElementPredicate { continue; } final PsiElement implementsTarget = implementsReference.resolve(); - if (!(implementsTarget instanceof PsiClass)) { + if (!(implementsTarget instanceof PsiClass implementsClass)) { continue; } - final PsiClass implementsClass = (PsiClass)implementsTarget; if (!implementsClass.isInterface()) { continue; } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntention.java index 2925e48f8926..b97e2ea36bbf 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntention.java @@ -80,15 +80,13 @@ public class AnnotateOverriddenMethodsIntention extends MutablyNamedIntention { final PsiMethod method; final int parameterIndex; if (!(grandParent instanceof PsiMethod)) { - if (!(grandParent instanceof PsiParameter)) { + if (!(grandParent instanceof PsiParameter parameter)) { return; } - final PsiParameter parameter = (PsiParameter)grandParent; final PsiElement greatGrandParent = grandParent.getParent(); - if (!(greatGrandParent instanceof PsiParameterList)) { + if (!(greatGrandParent instanceof PsiParameterList parameterList)) { return; } - final PsiParameterList parameterList = (PsiParameterList)greatGrandParent; parameterIndex = parameterList.getParameterIndex(parameter); final PsiElement greatGreatGrandParent = greatGrandParent.getParent(); if (!(greatGreatGrandParent instanceof PsiMethod)) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsPredicate.java index 38236a29d845..0856bd52c39c 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsPredicate.java @@ -29,10 +29,9 @@ import java.util.stream.Stream; class AnnotateOverriddenMethodsPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiAnnotation)) { + if (!(element instanceof PsiAnnotation annotation)) { return false; } - final PsiAnnotation annotation = (PsiAnnotation)element; final String annotationName = annotation.getQualifiedName(); if (annotationName == null) { return false; @@ -45,16 +44,13 @@ class AnnotateOverriddenMethodsPredicate implements PsiElementPredicate { final PsiMethod method; final int parameterIndex; if (!(grandParent instanceof PsiMethod)) { - if (!(grandParent instanceof PsiParameter)) { + if (!(grandParent instanceof PsiParameter parameter)) { return false; } - final PsiParameter parameter = (PsiParameter)grandParent; final PsiElement greatGrandParent = grandParent.getParent(); - if (!(greatGrandParent instanceof PsiParameterList)) { + if (!(greatGrandParent instanceof PsiParameterList parameterList)) { return false; } - final PsiParameterList parameterList = - (PsiParameterList)greatGrandParent; parameterIndex = parameterList.getParameterIndex(parameter); final PsiElement greatGreatGrandParent = greatGrandParent.getParent(); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/asserttoif/ObjectsRequireNonNullIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/asserttoif/ObjectsRequireNonNullIntention.java index 70921af2c91f..de2b0b769689 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/asserttoif/ObjectsRequireNonNullIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/asserttoif/ObjectsRequireNonNullIntention.java @@ -39,15 +39,13 @@ public class ObjectsRequireNonNullIntention extends Intention { @Override protected void processIntention(@NotNull PsiElement element) { - if (!(element instanceof PsiReferenceExpression)) { + if (!(element instanceof PsiReferenceExpression referenceExpression)) { return; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element; final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return; } - final PsiVariable variable = (PsiVariable)target; NullableNotNullManager manager = NullableNotNullManager.getInstance(element.getProject()); final NullabilityAnnotationInfo info = manager.findEffectiveNullabilityInfo(variable); final PsiAnnotation annotation = info == null ? null : info.getAnnotation(); @@ -58,10 +56,9 @@ public class ObjectsRequireNonNullIntention extends Intention { return; } final PsiElement parent = referenceStatement.getParent(); - if (!(parent instanceof PsiCodeBlock)) { + if (!(parent instanceof PsiCodeBlock codeBlock)) { return; } - final PsiCodeBlock codeBlock = (PsiCodeBlock)parent; final PsiStatement[] statements = codeBlock.getStatements(); PsiStatement statementToDelete = null; for (PsiStatement statement : statements) { @@ -91,18 +88,16 @@ public class ObjectsRequireNonNullIntention extends Intention { if (!PsiUtil.isLanguageLevel7OrHigher(element)) { return false; } - if (!(element instanceof PsiReferenceExpression)) { + if (!(element instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element; if (PsiUtil.isAccessedForWriting(referenceExpression)) { return false; } final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)target; if (ClassUtils.findClass("java.util.Objects", element) == null) { return false; } @@ -113,10 +108,9 @@ public class ObjectsRequireNonNullIntention extends Intention { } final PsiStatement referenceStatement = PsiTreeUtil.getParentOfType(referenceExpression, PsiStatement.class); final PsiElement parent = referenceStatement != null ? referenceStatement.getParent() : null; - if (!(parent instanceof PsiCodeBlock)) { + if (!(parent instanceof PsiCodeBlock codeBlock)) { return false; } - final PsiCodeBlock codeBlock = (PsiCodeBlock)parent; final PsiStatement[] statements = codeBlock.getStatements(); for (PsiStatement statement : statements) { if (statement == referenceStatement) { @@ -130,10 +124,9 @@ public class ObjectsRequireNonNullIntention extends Intention { } static boolean isIfStatementNullCheck(PsiStatement statement, @NotNull PsiVariable variable) { - if (!(statement instanceof PsiIfStatement)) { + if (!(statement instanceof PsiIfStatement ifStatement)) { return false; } - final PsiIfStatement ifStatement = (PsiIfStatement)statement; final PsiStatement elseBranch = ifStatement.getElseBranch(); if (elseBranch != null) { return false; @@ -147,10 +140,9 @@ public class ObjectsRequireNonNullIntention extends Intention { } static boolean isNotNullAssertion(PsiStatement statement, @NotNull PsiVariable variable) { - if (!(statement instanceof PsiAssertStatement)) { + if (!(statement instanceof PsiAssertStatement assertStatement)) { return false; } - final PsiAssertStatement assertStatement = (PsiAssertStatement)statement; final PsiExpression condition = assertStatement.getAssertCondition(); return ComparisonUtils.isNullComparison(condition, variable, false); } @@ -159,8 +151,7 @@ public class ObjectsRequireNonNullIntention extends Intention { if (element instanceof PsiThrowStatement) { return true; } - else if (element instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)element; + else if (element instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiStatement[] statements = codeBlock.getStatements(); if (statements.length != 1) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ConjunctionPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ConjunctionPredicate.java index 1d5f8c099584..6c5443e23f01 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ConjunctionPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ConjunctionPredicate.java @@ -26,10 +26,9 @@ class ConjunctionPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiPolyadicExpression)) { + if (!(element instanceof PsiPolyadicExpression expression)) { return false; } - final PsiPolyadicExpression expression = (PsiPolyadicExpression)element; final IElementType tokenType = expression.getOperationTokenType(); if (!tokenType.equals(JavaTokenType.ANDAND) && !tokenType.equals(JavaTokenType.OROR)) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipComparisonPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipComparisonPredicate.java index 5dfd3f07fcf9..02561164873b 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipComparisonPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipComparisonPredicate.java @@ -11,10 +11,9 @@ class FlipComparisonPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiBinaryExpression)) { + if (!(element instanceof PsiBinaryExpression expression)) { return false; } - final PsiBinaryExpression expression = (PsiBinaryExpression)element; if (!ComparisonUtils.isComparison(expression)) { return false; } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/NegateConditionalIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/NegateConditionalIntention.java index 40650af970b6..d23a1d6627c4 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/NegateConditionalIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/NegateConditionalIntention.java @@ -48,10 +48,9 @@ public class NegateConditionalIntention extends Intention { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiConditionalExpression)) { + if (!(element instanceof PsiConditionalExpression conditionalExpression)) { return false; } - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)element; final PsiType type = conditionalExpression.getType(); return PsiTypes.booleanType().equals(type); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/CharToStringPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/CharToStringPredicate.java index c809a0c61d70..3f1c35079237 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/CharToStringPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/CharToStringPredicate.java @@ -29,11 +29,9 @@ class CharToStringPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiLiteralExpression)) { + if (!(element instanceof PsiLiteralExpression expression)) { return false; } - final PsiLiteralExpression expression = - (PsiLiteralExpression)element; final PsiType type = expression.getType(); if (!PsiTypes.charType().equals(type)) { return false; @@ -53,9 +51,7 @@ class CharToStringPredicate implements PsiElementPredicate { static boolean isInConcatenationContext(PsiExpression element) { if (ExpressionUtils.isStringConcatenationOperand(element)) return true; final PsiElement parent = PsiUtil.skipParenthesizedExprUp(element.getParent()); - if (parent instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression parentExpression = - (PsiAssignmentExpression)parent; + if (parent instanceof PsiAssignmentExpression parentExpression) { final IElementType tokenType = parentExpression.getOperationTokenType(); if (!JavaTokenType.PLUSEQ.equals(tokenType)) { return false; @@ -69,11 +65,9 @@ class CharToStringPredicate implements PsiElementPredicate { } if (parent instanceof PsiExpressionList) { final PsiElement grandParent = parent.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCall)) { return false; } - final PsiMethodCallExpression methodCall = - (PsiMethodCallExpression)grandParent; final PsiReferenceExpression methodExpression = methodCall.getMethodExpression(); final PsiExpression qualifierExpression = diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ImmutableCollectionModelUtils.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ImmutableCollectionModelUtils.java index ee61757f7dc2..525095337709 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ImmutableCollectionModelUtils.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ImmutableCollectionModelUtils.java @@ -59,8 +59,7 @@ final class ImmutableCollectionModelUtils { private static boolean isNonResolvedTypeParameter(@Nullable PsiClass parameter, @NotNull PsiElement context, @NotNull PsiResolveHelper resolveHelper) { - if (!(parameter instanceof PsiTypeParameter)) return false; - PsiTypeParameter typeParameter = (PsiTypeParameter)parameter; + if (!(parameter instanceof PsiTypeParameter typeParameter)) return false; String name = typeParameter.getName(); return name == null || resolveHelper.resolveReferencedClass(name, context) != parameter; } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ReplaceWithArraysAsListIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ReplaceWithArraysAsListIntention.java index 726c63a0247a..0dfdfa93f6d8 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ReplaceWithArraysAsListIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ReplaceWithArraysAsListIntention.java @@ -38,10 +38,9 @@ public class ReplaceWithArraysAsListIntention extends Intention implements HighP @Override protected PsiElementPredicate getElementPredicate() { return e -> { - if (!(e instanceof PsiMethodCallExpression)) { + if (!(e instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)e; final PsiMethod method = methodCallExpression.resolveMethod(); if (method == null) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CStyleCommentPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CStyleCommentPredicate.java index 1058973ce899..a273012df216 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CStyleCommentPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CStyleCommentPredicate.java @@ -28,13 +28,12 @@ class CStyleCommentPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiComment)) { + if (!(element instanceof PsiComment comment)) { return false; } if (element instanceof PsiDocComment) { return false; } - final PsiComment comment = (PsiComment)element; final IElementType type = comment.getTokenType(); if (!JavaTokenType.C_STYLE_COMMENT.equals(type)) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CommentOnLineWithSourcePredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CommentOnLineWithSourcePredicate.java index ef4df92d1cae..003f00075e9f 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CommentOnLineWithSourcePredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/CommentOnLineWithSourcePredicate.java @@ -26,10 +26,9 @@ class CommentOnLineWithSourcePredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiComment) || element instanceof PsiDocComment || element.getTextOffset() == 0) { + if (!(element instanceof PsiComment comment) || element instanceof PsiDocComment || element.getTextOffset() == 0) { return false; } - final PsiComment comment = (PsiComment)element; if (comment instanceof PsiLanguageInjectionHost && InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)comment)) { return false; } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/EndOfLineCommentPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/EndOfLineCommentPredicate.java index 0f45adf7ca2c..7edebc0a39d6 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/EndOfLineCommentPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/comment/EndOfLineCommentPredicate.java @@ -32,13 +32,12 @@ class EndOfLineCommentPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiComment)) { + if (!(element instanceof PsiComment comment)) { return false; } if (element instanceof PsiDocComment) { return false; } - final PsiComment comment = (PsiComment)element; final IElementType type = comment.getTokenType(); if (!JavaTokenType.END_OF_LINE_COMMENT.equals(type)) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/commutative/FlipCommutativeMethodCallPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/commutative/FlipCommutativeMethodCallPredicate.java index f9dcf5e7d455..c4365cdb2e99 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/commutative/FlipCommutativeMethodCallPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/commutative/FlipCommutativeMethodCallPredicate.java @@ -26,13 +26,12 @@ class FlipCommutativeMethodCallPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression expression)) { return false; } if (ErrorUtil.containsError(element)) { return false; } - final PsiMethodCallExpression expression = (PsiMethodCallExpression)element; // do it only when there is just one argument. final PsiExpression[] arguments = expression.getArgumentList().getExpressions(); if (arguments.length != 1) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CallSequencePredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CallSequencePredicate.java index 45aa7d7557ee..522e9c79879f 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CallSequencePredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CallSequencePredicate.java @@ -46,15 +46,13 @@ class CallSequencePredicate implements PsiElementPredicate { @Nullable private static PsiVariable getVariable(PsiStatement statement) { - if (!(statement instanceof PsiExpressionStatement)) { + if (!(statement instanceof PsiExpressionStatement expressionStatement)) { return null; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression methodCallExpression)) { return null; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; return getVariable(methodCallExpression); } @Nullable @@ -73,8 +71,7 @@ class CallSequencePredicate implements PsiElementPredicate { } final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifierExpression = PsiUtil.skipParenthesizedExprDown(methodExpression.getQualifierExpression()); - if (qualifierExpression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression expression = (PsiMethodCallExpression)qualifierExpression; + if (qualifierExpression instanceof PsiMethodCallExpression expression) { return getVariable(expression); } else if (!(qualifierExpression instanceof PsiReferenceExpression)) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java index d4510e8e9ec7..bc04f2a34e1a 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java @@ -49,8 +49,7 @@ public class CopyConcatenatedStringToClipboardIntention extends MutablyNamedInte @Override protected void processIntention(@NotNull PsiElement element) { final String text; - if (element instanceof PsiLiteralExpression) { - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)element; + if (element instanceof PsiLiteralExpression literalExpression) { final Object value = literalExpression.getValue(); if (!(value instanceof String)) { return; @@ -69,8 +68,7 @@ public class CopyConcatenatedStringToClipboardIntention extends MutablyNamedInte public static String buildConcatenationText(PsiPolyadicExpression polyadicExpression) { final StringBuilder out = new StringBuilder(); for(PsiElement element = polyadicExpression.getFirstChild(); element != null; element = element.getNextSibling()) { - if (element instanceof PsiExpression) { - final PsiExpression expression = (PsiExpression)element; + if (element instanceof PsiExpression expression) { final Object value = ExpressionUtils.computeConstantExpression(expression); out.append((value == null) ? "?" : value.toString()); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntention.java index 5560fa61de80..c9722e43b832 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntention.java @@ -50,11 +50,10 @@ public class JoinConcatenatedStringLiteralsIntention extends Intention { if (element instanceof PsiWhiteSpace) { element = element.getPrevSibling(); } - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return; } CommentTracker tracker = new CommentTracker(); - final PsiJavaToken token = (PsiJavaToken)element; final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)element.getParent(); final StringBuilder newExpression = new StringBuilder(); PsiExpression[] operands = polyadicExpression.getOperands(); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeCallChainIntoCallSequenceIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeCallChainIntoCallSequenceIntention.java index d2e00799dab5..69edd784ac88 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeCallChainIntoCallSequenceIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeCallChainIntoCallSequenceIntention.java @@ -93,15 +93,12 @@ public class MakeCallChainIntoCallSequenceIntention extends Intention { firstStatement = null; introduceVariable = false; } - else if (parent instanceof PsiAssignmentExpression && parent.getParent() instanceof PsiExpressionStatement && + else if (parent instanceof PsiAssignmentExpression assignment && parent.getParent() instanceof PsiExpressionStatement && ((PsiAssignmentExpression)parent).getOperationTokenType().equals(JavaTokenType.EQ)) { - final PsiAssignmentExpression assignment = (PsiAssignmentExpression)parent; final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(assignment.getLExpression()); - if (lhs instanceof PsiReferenceExpression) { - final PsiReferenceExpression expression = (PsiReferenceExpression)lhs; + if (lhs instanceof PsiReferenceExpression expression) { final PsiElement target = expression.resolve(); - if (target instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)target; + if (target instanceof PsiVariable variable) { final PsiType variableType = variable.getType(); if (variableType.equals(rootType)) { targetText = tracker.text(lhs); @@ -181,8 +178,7 @@ public class MakeCallChainIntoCallSequenceIntention extends Intention { @Contract("null -> false") private static boolean isSimpleReference(PsiExpression expression) { - if (!(expression instanceof PsiReferenceExpression)) return false; - PsiReferenceExpression ref = (PsiReferenceExpression)expression; + if (!(expression instanceof PsiReferenceExpression ref)) return false; PsiExpression qualifier = ref.getQualifierExpression(); if (qualifier != null) { if (!(qualifier instanceof PsiQualifiedExpression) || ((PsiQualifiedExpression)qualifier).getQualifier() != null) return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MergeCallSequenceToChainIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MergeCallSequenceToChainIntention.java index b4b6dd39a822..9b41d055c50d 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MergeCallSequenceToChainIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MergeCallSequenceToChainIntention.java @@ -34,10 +34,9 @@ public class MergeCallSequenceToChainIntention extends Intention { @Override protected void processIntention(@NotNull PsiElement element) { - if (!(element instanceof PsiExpressionStatement)) { + if (!(element instanceof PsiExpressionStatement statement)) { return; } - final PsiExpressionStatement statement = (PsiExpressionStatement)element; final PsiExpressionStatement nextSibling = PsiTreeUtil.getNextSiblingOfType(statement, PsiExpressionStatement.class); if (nextSibling == null) { return; @@ -70,8 +69,7 @@ public class MergeCallSequenceToChainIntention extends Intention { private static PsiMethodCallExpression getRootMethodCallExpression(PsiMethodCallExpression expression) { final PsiReferenceExpression methodExpression = expression.getMethodExpression(); final PsiExpression qualifierExpression = PsiUtil.skipParenthesizedExprDown(methodExpression.getQualifierExpression()); - if (qualifierExpression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)qualifierExpression; + if (qualifierExpression instanceof PsiMethodCallExpression methodCallExpression) { return getRootMethodCallExpression(methodCallExpression); } return expression; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MethodCallChainPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MethodCallChainPredicate.java index 2c5e7dc62e9d..80d31b6f01d6 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MethodCallChainPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MethodCallChainPredicate.java @@ -57,8 +57,7 @@ class MethodCallChainPredicate implements PsiElementPredicate { PsiClassType expressionType = getQualifierExpressionType(qualifierExpression); if (!first) { if (expressionType == null) { - if (qualifierExpression instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)qualifierExpression; + if (qualifierExpression instanceof PsiMethodCallExpression call) { if (call.getMethodExpression().getQualifierExpression() == null) { PsiMethod method = call.resolveMethod(); if (method == null || !method.hasModifierProperty(PsiModifier.STATIC)) { @@ -80,11 +79,10 @@ class MethodCallChainPredicate implements PsiElementPredicate { @Nullable private static PsiClassType getQualifierExpressionType(PsiElement element) { - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression methodCallExpression)) { return null; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifierExpression = methodExpression.getQualifierExpression(); final PsiType type = qualifierExpression != null ? qualifierExpression.getType() : null; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java index 5d582c0d74ef..8ac92bc0d68f 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java @@ -80,10 +80,9 @@ public class ReplaceConcatenationWithFormatStringIntention extends MutablyNamedI return false; } final PsiElement grandParent = expressionParent.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { + if (!(grandParent instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String name = methodExpression.getReferenceName(); final boolean insertNewline; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithStringBufferIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithStringBufferIntention.java index 9063e9bf75a0..5a992bfab7bf 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithStringBufferIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithStringBufferIntention.java @@ -88,10 +88,9 @@ public class ReplaceConcatenationWithStringBufferIntention extends MutablyNamedI return false; } parent = parent.getParent(); - if (!(parent instanceof PsiMethodCallExpression)) { + if (!(parent instanceof PsiMethodCallExpression methodCall)) { return false; } - final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)parent; final PsiReferenceExpression methodExpression = methodCall.getMethodExpression(); final PsiType type = methodExpression.getType(); if (type == null) { @@ -108,8 +107,7 @@ public class ReplaceConcatenationWithStringBufferIntention extends MutablyNamedI private static void turnExpressionIntoChainedAppends(PsiExpression expression, @NonNls StringBuilder result, CommentTracker commentTracker) { - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression concatenation = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression concatenation) { final PsiType type = concatenation.getType(); if (type != null && !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { result.append(".append(").append(commentTracker.text(concatenation)).append(')'); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceFormatStringWithConcatenationIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceFormatStringWithConcatenationIntention.java index 9fd0f9b5b75b..cef01b9b2539 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceFormatStringWithConcatenationIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceFormatStringWithConcatenationIntention.java @@ -30,10 +30,9 @@ public class ReplaceFormatStringWithConcatenationIntention extends Intention { @Override protected PsiElementPredicate getElementPredicate() { return element -> { - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression methodCallExpression)) { return false; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; if (!MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_STRING, TypeUtils.getStringType(element), "format", (PsiType[])null)) { return false; @@ -53,10 +52,9 @@ public class ReplaceFormatStringWithConcatenationIntention extends Intention { return -1; } final Object value = ExpressionUtils.computeConstantExpression(expression); - if (!(value instanceof String)) { + if (!(value instanceof String string)) { return -1; } - final String string = (String)value; int index = string.indexOf('%'); final int length = string.length(); int count = 0; @@ -78,10 +76,9 @@ public class ReplaceFormatStringWithConcatenationIntention extends Intention { @Override protected void processIntention(@NotNull PsiElement element) { - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression methodCallExpression)) { return; } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); CommentTracker commentTracker = new CommentTracker(); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/StringConcatPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/StringConcatPredicate.java index 6b6523803fe3..5c3ca95061b7 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/StringConcatPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/StringConcatPredicate.java @@ -26,19 +26,17 @@ class StringConcatPredicate implements PsiElementPredicate { if (element instanceof PsiWhiteSpace) { element = element.getPrevSibling(); } - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final IElementType tokenType = token.getTokenType(); if (!tokenType.equals(JavaTokenType.PLUS)) { return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiPolyadicExpression)) { + if (!(parent instanceof PsiPolyadicExpression polyadicExpression)) { return false; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; final PsiType type = polyadicExpression.getType(); if (type == null || !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalPredicate.java index 095c6be39496..ac28d5bfaca9 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalPredicate.java @@ -26,10 +26,9 @@ class FlipConditionalPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiConditionalExpression)) { + if (!(element instanceof PsiConditionalExpression conditionalExpression)) { return false; } - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)element; final PsiExpression condition = conditionalExpression.getCondition(); return !(PsiTreeUtil.getDeepestLast(condition) instanceof PsiErrorElement) && !(PsiTreeUtil.getDeepestLast(element) instanceof PsiErrorElement) && diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithBooleanExpressionIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithBooleanExpressionIntention.java index 2ae97572fd11..cf6457fbcd58 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithBooleanExpressionIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithBooleanExpressionIntention.java @@ -35,10 +35,9 @@ public class ReplaceConditionalWithBooleanExpressionIntention extends Intention return new PsiElementPredicate() { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiConditionalExpression)) { + if (!(element instanceof PsiConditionalExpression conditionalExpression)) { return false; } - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)element; final PsiType type = conditionalExpression.getType(); return PsiTypes.booleanType().equals(type) || type != null && type.equalsToText(JAVA_LANG_BOOLEAN); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantSubexpressionPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantSubexpressionPredicate.java index ea5352d06f8c..b766de803ccb 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantSubexpressionPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantSubexpressionPredicate.java @@ -43,10 +43,9 @@ class ConstantSubexpressionPredicate implements PsiElementPredicate { } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiPolyadicExpression)) { + if (!(parent instanceof PsiPolyadicExpression polyadicExpression)) { return false; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; final PsiType type = polyadicExpression.getType(); if (type == null || type.equalsToText(JAVA_LANG_STRING)) { // handled by JoinConcatenatedStringLiteralsIntention @@ -95,9 +94,7 @@ class ConstantSubexpressionPredicate implements PsiElementPredicate { return true; } final PsiElement containingElement = PsiUtil.skipParenthesizedExprUp(expression.getParent()); - if (containingElement instanceof PsiExpression) { - final PsiExpression containingExpression = - (PsiExpression)containingElement; + if (containingElement instanceof PsiExpression containingExpression) { if (!PsiUtil.isConstantExpression(containingExpression)) { return false; } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/datetime/ShowDateTimeExampleOutputIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/datetime/ShowDateTimeExampleOutputIntention.java index 850200b9707c..a77c6021e435 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/datetime/ShowDateTimeExampleOutputIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/datetime/ShowDateTimeExampleOutputIntention.java @@ -55,10 +55,9 @@ public class ShowDateTimeExampleOutputIntention extends Intention implements Hig return new PsiElementPredicate() { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiExpression)) { + if (!(element instanceof PsiExpression expression)) { return false; } - final PsiExpression expression = (PsiExpression)element; final PsiType type = expression.getType(); if (!TypeUtils.isJavaLangString(type)) { return false; @@ -77,17 +76,15 @@ public class ShowDateTimeExampleOutputIntention extends Intention implements Hig return false; } } - else if (grandParent instanceof PsiNewExpression) { - final PsiNewExpression newExpression = (PsiNewExpression)grandParent; + else if (grandParent instanceof PsiNewExpression newExpression) { final PsiJavaCodeReferenceElement classReference = newExpression.getClassReference(); if (classReference == null || !"SimpleDateFormat".equals(classReference.getReferenceName())) { return false; } final PsiElement target = classReference.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return false; } - final PsiClass aClass = (PsiClass)target; if (!InheritanceUtil.isInheritor(aClass, "java.text.SimpleDateFormat")) { return false; } @@ -105,10 +102,9 @@ public class ShowDateTimeExampleOutputIntention extends Intention implements Hig @Override protected void processIntention(Editor editor, @NotNull PsiElement element) { - if (!(element instanceof PsiExpression) || dateTimeFormatter == null) { + if (!(element instanceof PsiExpression expression) || dateTimeFormatter == null) { return; } - final PsiExpression expression = (PsiExpression)element; final Object value = ExpressionUtils.computeConstantExpression(expression); if (!(value instanceof String)) { return; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/decls/ChangeVariableTypeToRhsTypeIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/decls/ChangeVariableTypeToRhsTypeIntention.java index 414a0a8f7b98..13690d65e26e 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/decls/ChangeVariableTypeToRhsTypeIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/decls/ChangeVariableTypeToRhsTypeIntention.java @@ -38,10 +38,9 @@ public class ChangeVariableTypeToRhsTypeIntention extends MutablyNamedIntention @Override protected void processIntention(@NotNull PsiElement element) { final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiVariable)) { + if (!(parent instanceof PsiVariable variable)) { return; } - final PsiVariable variable = (PsiVariable)parent; final PsiExpression initializer = variable.getInitializer(); if (initializer == null) { return; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/decls/ChangeVariableTypeToRhsTypePredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/decls/ChangeVariableTypeToRhsTypePredicate.java index 6201636dc1ad..2a31a636ec32 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/decls/ChangeVariableTypeToRhsTypePredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/decls/ChangeVariableTypeToRhsTypePredicate.java @@ -29,23 +29,21 @@ class ChangeVariableTypeToRhsTypePredicate implements PsiElementPredicate { return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiVariable)) { + if (!(parent instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)parent; final PsiExpression initializer = variable.getInitializer(); if (!(initializer instanceof PsiNewExpression)) { return false; } final PsiType type = variable.getType(); - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType classType)) { return false; } final PsiType initializerType = initializer.getType(); - if (!(initializerType instanceof PsiClassType)) { + if (!(initializerType instanceof PsiClassType initializerClassType)) { return false; } - final PsiClassType initializerClassType = (PsiClassType)initializerType; PsiClass initializerClass = initializerClassType.resolve(); if (initializerClass instanceof PsiAnonymousClass) { initializerClass = initializerClass.getSuperClass(); @@ -53,7 +51,6 @@ class ChangeVariableTypeToRhsTypePredicate implements PsiElementPredicate { if (initializerClass == null) { return false; } - final PsiClassType classType = (PsiClassType)type; final PsiClass variableClass = classType.resolve(); if (variableClass == null) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/AutomaticResourceManagementPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/AutomaticResourceManagementPredicate.java index 43478ac49a78..c5a143bee2c9 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/AutomaticResourceManagementPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/AutomaticResourceManagementPredicate.java @@ -24,19 +24,17 @@ class AutomaticResourceManagementPredicate @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken javaToken)) { return false; } - final PsiJavaToken javaToken = (PsiJavaToken)element; final IElementType tokenType = javaToken.getTokenType(); if (!JavaTokenType.TRY_KEYWORD.equals(tokenType)) { return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiTryStatement)) { + if (!(parent instanceof PsiTryStatement tryStatement)) { return false; } - final PsiTryStatement tryStatement = (PsiTryStatement)parent; if (tryStatement.getTryBlock() == null) { return false; } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ConvertCatchToThrowsIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ConvertCatchToThrowsIntention.java index 0f815aaefe51..09c8eb684143 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ConvertCatchToThrowsIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ConvertCatchToThrowsIntention.java @@ -75,8 +75,7 @@ public class ConvertCatchToThrowsIntention extends Intention { } private static void addToThrowsList(PsiReferenceList throwsList, PsiType catchType) { - if (catchType instanceof PsiClassType) { - final PsiClassType classType = (PsiClassType)catchType; + if (catchType instanceof PsiClassType classType) { final PsiClassType[] types = throwsList.getReferencedTypes(); for (PsiClassType type : types) { if (catchType.equals(type)) { @@ -88,8 +87,7 @@ public class ConvertCatchToThrowsIntention extends Intention { final PsiJavaCodeReferenceElement referenceElement = factory.createReferenceElementByType(classType); throwsList.add(referenceElement); } - else if (catchType instanceof PsiDisjunctionType) { - final PsiDisjunctionType disjunctionType = (PsiDisjunctionType)catchType; + else if (catchType instanceof PsiDisjunctionType disjunctionType) { final List disjunctions = disjunctionType.getDisjunctions(); for (PsiType disjunction : disjunctions) { addToThrowsList(throwsList, disjunction); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/NestedTryStatementsPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/NestedTryStatementsPredicate.java index 5f549d4f3cea..74229f70c6b3 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/NestedTryStatementsPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/NestedTryStatementsPredicate.java @@ -26,10 +26,9 @@ class NestedTryStatementsPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken javaToken)) { return false; } - final PsiJavaToken javaToken = (PsiJavaToken)element; final IElementType tokenType = javaToken.getTokenType(); if (!JavaTokenType.TRY_KEYWORD.equals(tokenType)) { return false; @@ -52,10 +51,9 @@ class NestedTryStatementsPredicate implements PsiElementPredicate { } private static boolean isSimpleTry(PsiElement element) { - if (!(element instanceof PsiTryStatement)) { + if (!(element instanceof PsiTryStatement tryStatement)) { return false; } - final PsiTryStatement tryStatement = (PsiTryStatement)element; final PsiCodeBlock finallyBlock = tryStatement.getFinallyBlock(); if (finallyBlock != null) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ObscureThrownExceptionsIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ObscureThrownExceptionsIntention.java index aa64647a8293..1ddc65c7baae 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ObscureThrownExceptionsIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ObscureThrownExceptionsIntention.java @@ -32,10 +32,9 @@ public class ObscureThrownExceptionsIntention extends MutablyNamedIntention { @Override protected void processIntention(@NotNull PsiElement element) { - if (!(element instanceof PsiReferenceList)) { + if (!(element instanceof PsiReferenceList referenceList)) { return; } - final PsiReferenceList referenceList = (PsiReferenceList)element; final PsiClassType[] types = referenceList.getReferencedTypes(); final PsiClass commonSuperClass = findCommonSuperClass(types); if (commonSuperClass == null) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ObscureThrownExceptionsPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ObscureThrownExceptionsPredicate.java index 8f8987dc7a26..fa4865719e0e 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ObscureThrownExceptionsPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/ObscureThrownExceptionsPredicate.java @@ -24,18 +24,16 @@ class ObscureThrownExceptionsPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiReferenceList)) { + if (!(element instanceof PsiReferenceList throwsList)) { return false; } - final PsiReferenceList throwsList = (PsiReferenceList)element; if (throwsList.getReferenceElements().length < 2) { return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiMethod)) { + if (!(parent instanceof PsiMethod method)) { return false; } - final PsiMethod method = (PsiMethod)parent; return method.getThrowsList().equals(element); } } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/ExpressionPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/ExpressionPredicate.java index 4ece17c9a332..a0bcf13ab343 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/ExpressionPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/ExpressionPredicate.java @@ -30,10 +30,9 @@ class ExpressionPredicate implements PsiElementPredicate { return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiPolyadicExpression)) { + if (!(parent instanceof PsiPolyadicExpression expression)) { return false; } - final PsiPolyadicExpression expression = (PsiPolyadicExpression)parent; final PsiExpression[] operands = expression.getOperands(); if (operands.length < 2) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/FlipExpressionIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/FlipExpressionIntention.java index a7147757d69a..1688d9b917f3 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/FlipExpressionIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/FlipExpressionIntention.java @@ -64,10 +64,9 @@ public class FlipExpressionIntention extends MutablyNamedIntention { public void processIntention(@NotNull PsiElement element) { final PsiJavaToken token = (PsiJavaToken)element; final PsiElement parent = token.getParent(); - if (!(parent instanceof PsiPolyadicExpression)) { + if (!(parent instanceof PsiPolyadicExpression polyadicExpression)) { return; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; final PsiExpression[] operands = polyadicExpression.getOperands(); final StringBuilder newExpression = new StringBuilder(); CommentTracker commentTracker = new CommentTracker(); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/FlipSetterCallIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/FlipSetterCallIntention.java index e24c8aae982f..ebcc7bb31d00 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/FlipSetterCallIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/FlipSetterCallIntention.java @@ -64,8 +64,7 @@ public class FlipSetterCallIntention extends Intention { final PsiExpression[] arguments = call.getArgumentList().getExpressions(); if (arguments.length != 1) return; final PsiExpression argument = PsiUtil.skipParenthesizedExprDown(arguments[0]); - if (!(argument instanceof PsiMethodCallExpression)) return; - final PsiMethodCallExpression call2 = (PsiMethodCallExpression)argument; + if (!(argument instanceof PsiMethodCallExpression call2)) return; final PsiExpression qualifierExpression1 = ExpressionUtils.getEffectiveQualifier(call.getMethodExpression()); final PsiExpression qualifierExpression2 = ExpressionUtils.getEffectiveQualifier(call2.getMethodExpression()); @@ -82,19 +81,17 @@ public class FlipSetterCallIntention extends Intention { } private static boolean isSetGetMethodCall(PsiElement element) { - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression call1)) { return false; } - final PsiMethodCallExpression call1 = (PsiMethodCallExpression)element; final PsiExpression[] arguments = call1.getArgumentList().getExpressions(); if (arguments.length != 1) { return false; } final PsiExpression argument = PsiUtil.skipParenthesizedExprDown(arguments[0]); - if (!(argument instanceof PsiMethodCallExpression)) { + if (!(argument instanceof PsiMethodCallExpression call2)) { return false; } - final PsiMethodCallExpression call2 = (PsiMethodCallExpression)argument; final PsiMethod setter = call1.resolveMethod(); final PsiMethod getter = call2.resolveMethod(); final PsiMethod get = PropertyUtil.getReversePropertyMethod(setter); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/eliminate/EliminateUtils.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/eliminate/EliminateUtils.java index 0b5a82357541..7aa06380007c 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/eliminate/EliminateUtils.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/eliminate/EliminateUtils.java @@ -100,8 +100,7 @@ final class EliminateUtils { @Nullable private static PsiExpression skipPrefixedExprUp(@NotNull PsiExpression expression) { - while (expression.getParent() instanceof PsiPrefixExpression) { - PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression.getParent(); + while (expression.getParent() instanceof PsiPrefixExpression prefixExpression) { if (!ArrayUtil.contains(prefixExpression.getOperationTokenType(), PREFIXES)) return null; expression = prefixExpression; } @@ -121,8 +120,7 @@ final class EliminateUtils { static T processPrefixed(@NotNull PsiExpression expression, boolean isNegated, @NotNull BiFunction handler) { - while (expression instanceof PsiPrefixExpression) { - PsiPrefixExpression prefixExpr = (PsiPrefixExpression)expression; + while (expression instanceof PsiPrefixExpression prefixExpr) { IElementType tokenType = prefixExpr.getOperationTokenType(); if (!ArrayUtil.contains(tokenType, PREFIXES)) break; isNegated ^= JavaTokenType.MINUS.equals(tokenType); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/IndexedForEachLoopPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/IndexedForEachLoopPredicate.java index 7624bfa4cfdb..0a04f582d40a 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/IndexedForEachLoopPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/IndexedForEachLoopPredicate.java @@ -28,19 +28,17 @@ class IndexedForEachLoopPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final IElementType tokenType = token.getTokenType(); if (!JavaTokenType.FOR_KEYWORD.equals(tokenType)) { return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiForeachStatement)) { + if (!(parent instanceof PsiForeachStatement foreachStatement)) { return false; } - final PsiForeachStatement foreachStatement = (PsiForeachStatement)parent; final PsiExpression iteratedValue = foreachStatement.getIteratedValue(); if (iteratedValue == null) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/IterableForEachLoopPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/IterableForEachLoopPredicate.java index 8f2ce632a245..6331bb1fc2aa 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/IterableForEachLoopPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/IterableForEachLoopPredicate.java @@ -25,19 +25,17 @@ class IterableForEachLoopPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final IElementType tokenType = token.getTokenType(); if (!JavaTokenType.FOR_KEYWORD.equals(tokenType)) { return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiForeachStatement)) { + if (!(parent instanceof PsiForeachStatement foreachStatement)) { return false; } - final PsiForeachStatement foreachStatement = (PsiForeachStatement)parent; final PsiExpression iteratedValue = foreachStatement.getIteratedValue(); if (iteratedValue == null) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReplaceForEachLoopWithIndexedForLoopIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReplaceForEachLoopWithIndexedForLoopIntention.java index 2969c8d6988e..005f89c70020 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReplaceForEachLoopWithIndexedForLoopIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReplaceForEachLoopWithIndexedForLoopIntention.java @@ -141,9 +141,7 @@ public class ReplaceForEachLoopWithIndexedForLoopIntention extends Intention { @Nullable private static String getVariableName(PsiExpression expression) { - if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = - (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression methodCallExpression) { final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final String name = methodExpression.getReferenceName(); @@ -160,30 +158,22 @@ public class ReplaceForEachLoopWithIndexedForLoopIntention extends Intention { return name; } } - else if (expression instanceof PsiTypeCastExpression) { - final PsiTypeCastExpression castExpression = - (PsiTypeCastExpression)expression; + else if (expression instanceof PsiTypeCastExpression castExpression) { final PsiExpression operand = castExpression.getOperand(); return getVariableName(operand); } - else if (expression instanceof PsiArrayAccessExpression) { - final PsiArrayAccessExpression arrayAccessExpression = - (PsiArrayAccessExpression)expression; + else if (expression instanceof PsiArrayAccessExpression arrayAccessExpression) { final PsiExpression arrayExpression = arrayAccessExpression.getArrayExpression(); final String name = getVariableName(arrayExpression); return (name == null) ? null : StringUtil.unpluralize(name); } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = - (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { final PsiExpression innerExpression = parenthesizedExpression.getExpression(); return getVariableName(innerExpression); } - else if (expression instanceof PsiJavaCodeReferenceElement) { - final PsiJavaCodeReferenceElement referenceElement = - (PsiJavaCodeReferenceElement)expression; + else if (expression instanceof PsiJavaCodeReferenceElement referenceElement) { final String referenceName = referenceElement.getReferenceName(); if (referenceName == null) { return expression.getText(); @@ -201,16 +191,12 @@ public class ReplaceForEachLoopWithIndexedForLoopIntention extends Intention { final String variableName = getVariableName(expression); return createVariable(variableName, expression, context); } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = - (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { final PsiExpression innerExpression = parenthesizedExpression.getExpression(); return getReferenceToIterate(innerExpression, context); } - else if (expression instanceof PsiJavaCodeReferenceElement) { - final PsiJavaCodeReferenceElement referenceElement = - (PsiJavaCodeReferenceElement)expression; + else if (expression instanceof PsiJavaCodeReferenceElement referenceElement) { final String variableName = getVariableName(expression); if (referenceElement.isQualified()) { return createVariable(variableName, expression, context); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReverseForLoopDirectionIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReverseForLoopDirectionIntention.java index 732165d904a5..841686eef9f9 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReverseForLoopDirectionIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReverseForLoopDirectionIntention.java @@ -66,8 +66,7 @@ public class ReverseForLoopDirectionIntention extends Intention { final PsiExpression updateExpression = update.getExpression(); final String variableName = variable.getName(); final StringBuilder newUpdateText = new StringBuilder(); - if (updateExpression instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)updateExpression; + if (updateExpression instanceof PsiPrefixExpression prefixExpression) { final IElementType tokenType = prefixExpression.getOperationTokenType(); if (PLUSPLUS == tokenType) { newUpdateText.append("--"); @@ -80,9 +79,8 @@ public class ReverseForLoopDirectionIntention extends Intention { } newUpdateText.append(variableName); } - else if (updateExpression instanceof PsiPostfixExpression) { + else if (updateExpression instanceof PsiPostfixExpression postfixExpression) { newUpdateText.append(variableName); - final PsiPostfixExpression postfixExpression = (PsiPostfixExpression)updateExpression; final IElementType tokenType = postfixExpression.getOperationTokenType(); if (PLUSPLUS == tokenType) { newUpdateText.append("--"); @@ -94,9 +92,8 @@ public class ReverseForLoopDirectionIntention extends Intention { return; } } - else if (updateExpression instanceof PsiAssignmentExpression) { + else if (updateExpression instanceof PsiAssignmentExpression assignmentExpression) { newUpdateText.append(variableName); - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)updateExpression; final PsiExpression expression = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getRExpression()); if (expression == null) { return; @@ -108,8 +105,7 @@ public class ReverseForLoopDirectionIntention extends Intention { else if (MINUSEQ == tokenType) { newUpdateText.append("+=").append(ct.text(expression)); } - else if (EQ == tokenType && expression instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; + else if (EQ == tokenType && expression instanceof PsiBinaryExpression binaryExpression) { final PsiExpression lOperand = PsiUtil.skipParenthesizedExprDown(binaryExpression.getLOperand()); if (lOperand == null) { return; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReverseForLoopDirectionPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReverseForLoopDirectionPredicate.java index 9322266e5d80..c04b47a4bb5b 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReverseForLoopDirectionPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReverseForLoopDirectionPredicate.java @@ -14,25 +14,21 @@ class ReverseForLoopDirectionPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken keyword)) { return false; } - final PsiJavaToken keyword = (PsiJavaToken)element; final IElementType tokenType = keyword.getTokenType(); if (!JavaTokenType.FOR_KEYWORD.equals(tokenType)) { return false; } final PsiElement parent = keyword.getParent(); - if (!(parent instanceof PsiForStatement)) { + if (!(parent instanceof PsiForStatement forStatement)) { return false; } - final PsiForStatement forStatement = (PsiForStatement)parent; final PsiStatement initialization = forStatement.getInitialization(); - if (!(initialization instanceof PsiDeclarationStatement)) { + if (!(initialization instanceof PsiDeclarationStatement declarationStatement)) { return false; } - final PsiDeclarationStatement declarationStatement = - (PsiDeclarationStatement)initialization; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); if (declaredElements.length != 1) { @@ -59,10 +55,9 @@ class ReverseForLoopDirectionPredicate implements PsiElementPredicate { } public static boolean isVariableCompared(@NotNull PsiVariable variable, @Nullable PsiExpression expression) { - if (!(expression instanceof PsiBinaryExpression)) { + if (!(expression instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; final IElementType tokenType = binaryExpression.getOperationTokenType(); if (!ComparisonUtils.isComparisonOperation(tokenType)) { return false; @@ -82,13 +77,11 @@ class ReverseForLoopDirectionPredicate implements PsiElementPredicate { } public static boolean isVariableIncrementOrDecremented(@NotNull PsiVariable variable, @Nullable PsiStatement statement) { - if (!(statement instanceof PsiExpressionStatement)) { + if (!(statement instanceof PsiExpressionStatement expressionStatement)) { return false; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; final PsiExpression expression = PsiUtil.skipParenthesizedExprDown(expressionStatement.getExpression()); - if (expression instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)expression; + if (expression instanceof PsiPrefixExpression prefixExpression) { final IElementType tokenType = prefixExpression.getOperationTokenType(); if (!tokenType.equals(JavaTokenType.PLUSPLUS) && !tokenType.equals(JavaTokenType.MINUSMINUS)) { @@ -97,8 +90,7 @@ class ReverseForLoopDirectionPredicate implements PsiElementPredicate { final PsiExpression operand = prefixExpression.getOperand(); return ExpressionUtils.isReferenceTo(operand, variable); } - else if (expression instanceof PsiPostfixExpression) { - final PsiPostfixExpression postfixExpression = (PsiPostfixExpression)expression; + else if (expression instanceof PsiPostfixExpression postfixExpression) { final IElementType tokenType = postfixExpression.getOperationTokenType(); if (!tokenType.equals(JavaTokenType.PLUSPLUS) && !tokenType.equals(JavaTokenType.MINUSMINUS)) { @@ -107,8 +99,7 @@ class ReverseForLoopDirectionPredicate implements PsiElementPredicate { final PsiExpression operand = postfixExpression.getOperand(); return ExpressionUtils.isReferenceTo(operand, variable); } - else if (expression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression; + else if (expression instanceof PsiAssignmentExpression assignmentExpression) { final IElementType tokenType = assignmentExpression.getOperationTokenType(); final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getLExpression()); if (!ExpressionUtils.isReferenceTo(lhs, variable)) { @@ -119,10 +110,9 @@ class ReverseForLoopDirectionPredicate implements PsiElementPredicate { return false; } if (tokenType == JavaTokenType.EQ) { - if (!(rhs instanceof PsiBinaryExpression)) { + if (!(rhs instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)rhs; final IElementType token = binaryExpression.getOperationTokenType(); if (!token.equals(JavaTokenType.PLUS) && !token.equals(JavaTokenType.MINUS)) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/FullyQualifiedNamePredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/FullyQualifiedNamePredicate.java index 9675ebe5f0b3..637b81adf8ac 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/FullyQualifiedNamePredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/FullyQualifiedNamePredicate.java @@ -30,10 +30,9 @@ class FullyQualifiedNamePredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaCodeReferenceElement)) { + if (!(element instanceof PsiJavaCodeReferenceElement referenceElement)) { return false; } - final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)element; if (!referenceElement.isQualified()) { return false; } @@ -53,10 +52,9 @@ class FullyQualifiedNamePredicate implements PsiElementPredicate { return false; } final PsiElement qualifier = referenceElement.getQualifier(); - if (!(qualifier instanceof PsiJavaCodeReferenceElement)) { + if (!(qualifier instanceof PsiJavaCodeReferenceElement qualifierReferenceElement)) { return false; } - final PsiJavaCodeReferenceElement qualifierReferenceElement = (PsiJavaCodeReferenceElement)qualifier; final PsiElement resolved = qualifierReferenceElement.resolve(); if (!(resolved instanceof PsiPackage)) { if (!(resolved instanceof PsiClass)) { @@ -67,10 +65,9 @@ class FullyQualifiedNamePredicate implements PsiElementPredicate { } } final PsiElement target = referenceElement.resolve(); - if (!(target instanceof PsiClass)) { + if (!(target instanceof PsiClass aClass)) { return false; } - final PsiClass aClass = (PsiClass)target; final String fqName = aClass.getQualifiedName(); return fqName != null && ImportUtils.nameCanBeImported(fqName, element); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/OnDemandImportPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/OnDemandImportPredicate.java index 1bc5f2ba4b05..8dddb010a743 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/OnDemandImportPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/OnDemandImportPredicate.java @@ -27,10 +27,9 @@ class OnDemandImportPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof PsiImportStatementBase)) { + if (!(element instanceof PsiImportStatementBase importStatement)) { return false; } - PsiImportStatementBase importStatement = (PsiImportStatementBase)element; if (!importStatement.isOnDemand() || ErrorUtil.containsError(element)) { return false; } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/ReplaceOnDemandImportIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/ReplaceOnDemandImportIntention.java index 391cade8554d..393791452767 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/ReplaceOnDemandImportIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/ReplaceOnDemandImportIntention.java @@ -40,8 +40,7 @@ public class ReplaceOnDemandImportIntention extends Intention { final PsiJavaFile javaFile = (PsiJavaFile)importStatementBase.getContainingFile(); final PsiManager manager = importStatementBase.getManager(); final PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory(); - if (importStatementBase instanceof PsiImportStatement) { - final PsiImportStatement importStatement = (PsiImportStatement)importStatementBase; + if (importStatementBase instanceof PsiImportStatement importStatement) { final PsiClass[] classes = javaFile.getClasses(); final String qualifiedName = importStatement.getQualifiedName(); final ClassCollector visitor = new ClassCollector(qualifiedName); @@ -100,10 +99,9 @@ public class ReplaceOnDemandImportIntention extends Intention { return; } final PsiElement element = reference.resolve(); - if (!(element instanceof PsiClass)) { + if (!(element instanceof PsiClass aClass)) { return; } - final PsiClass aClass = (PsiClass)element; final String qualifiedName = aClass.getQualifiedName(); final String packageName = ClassUtil.extractPackageName(qualifiedName); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/increment/IncrementUtil.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/increment/IncrementUtil.java index c772444b2bed..da818ec11249 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/increment/IncrementUtil.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/increment/IncrementUtil.java @@ -20,8 +20,7 @@ final class IncrementUtil { @Nullable @Contract("null -> null") static PsiReferenceExpression getIncrementOrDecrementOperand(@Nullable PsiElement element) { - if (element instanceof PsiUnaryExpression) { - final PsiUnaryExpression expression = (PsiUnaryExpression)element; + if (element instanceof PsiUnaryExpression expression) { return getIncrementOrDecrementOperand(expression.getOperationTokenType(), expression.getOperand()); } return null; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationPredicate.java index 06e2f46a7a79..accdc4fc2462 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationPredicate.java @@ -26,14 +26,13 @@ class SplitDeclarationAndInitializationPredicate @Override public boolean satisfiedBy(@NotNull PsiElement element) { final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiField)) { + if (!(parent instanceof PsiField field)) { return false; } if (element instanceof PsiComment && element == parent.getFirstChild()) { return false; } - final PsiField field = (PsiField)parent; final PsiExpression initializer = field.getInitializer(); if (initializer == null) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsWithLiteralPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsWithLiteralPredicate.java index 40fdd30ef6f2..fb2383304c92 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsWithLiteralPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsWithLiteralPredicate.java @@ -24,11 +24,9 @@ class AssertEqualsWithLiteralPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression expression)) { return false; } - final PsiMethodCallExpression expression = - (PsiMethodCallExpression)element; final PsiExpressionList argumentList = expression.getArgumentList(); final PsiExpression[] arguments = argumentList.getExpressions(); final int argumentCount = arguments.length; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertLiteralPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertLiteralPredicate.java index eb207b638cc7..e6fec7079489 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertLiteralPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertLiteralPredicate.java @@ -24,10 +24,9 @@ class AssertLiteralPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression expression)) { return false; } - final PsiMethodCallExpression expression = (PsiMethodCallExpression)element; final PsiExpressionList args = expression.getArgumentList(); final int numExpressions = args.getExpressionCount(); if (numExpressions < 1 || numExpressions > 2) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueOrFalsePredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueOrFalsePredicate.java index 4f4bc07f9dcf..090969ca7e19 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueOrFalsePredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueOrFalsePredicate.java @@ -24,10 +24,9 @@ class AssertTrueOrFalsePredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiMethodCallExpression)) { + if (!(element instanceof PsiMethodCallExpression expression)) { return false; } - final PsiMethodCallExpression expression = (PsiMethodCallExpression)element; final PsiExpressionList argumentList = expression.getArgumentList(); final int numExpressions = argumentList.getExpressionCount(); if (numExpressions < 1 || numExpressions > 2) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/CreateAssertIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/CreateAssertIntention.java index 7e2ab9695b14..20b7536d5a02 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/CreateAssertIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/CreateAssertIntention.java @@ -172,19 +172,17 @@ public class CreateAssertIntention extends Intention { private static boolean hasStaticImports(PsiElement element) { final PsiFile file = element.getContainingFile(); - if (!(file instanceof PsiJavaFile)) { + if (!(file instanceof PsiJavaFile javaFile)) { return false; } - final PsiJavaFile javaFile = (PsiJavaFile)file; final PsiImportList importList = javaFile.getImportList(); return importList != null && importList.getImportStaticStatements().length > 0; } private static boolean isEqualsExpression(PsiExpression expression) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression call)) { return false; } - final PsiMethodCallExpression call = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = call.getMethodExpression(); @NonNls final String methodName = methodExpression.getReferenceName(); if (!"equals".equals(methodName)) { @@ -200,10 +198,9 @@ public class CreateAssertIntention extends Intention { } private static boolean isEqualityComparison(PsiExpression expression) { - if (!(expression instanceof PsiBinaryExpression)) { + if (!(expression instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)expression; final IElementType tokenType = binaryExpression.getOperationTokenType(); return JavaTokenType.EQEQ.equals(tokenType); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/CreateAssertPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/CreateAssertPredicate.java index 03703bb7c4e3..6d8c2c74b529 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/CreateAssertPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/CreateAssertPredicate.java @@ -24,11 +24,9 @@ class CreateAssertPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiExpressionStatement)) { + if (!(element instanceof PsiExpressionStatement statement)) { return false; } - final PsiExpressionStatement statement = - (PsiExpressionStatement)element; final PsiExpression expression = statement.getExpression(); final PsiElement parent = expression.getParent(); if (!(parent instanceof PsiExpressionStatement)) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java index 93d7479f9867..7b9fdb0a36a8 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java @@ -110,10 +110,9 @@ public class DataPointHolderConversionIntention extends PsiElementBaseIntentionA } private static boolean isConvertible(@NotNull final PsiMember member) { - if (!(member instanceof PsiMethod)) { + if (!(member instanceof PsiMethod method)) { return ((PsiField)member).getInitializer() != null; } - final PsiMethod method = (PsiMethod)member; final PsiType returnType = method.getReturnType(); if (returnType == null || returnType.equals(PsiTypes.voidType()) || !method.getParameterList().isEmpty()) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertLiteralWithAssertEqualsIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertLiteralWithAssertEqualsIntention.java index ac6ea8da33be..1cbaa6f3e740 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertLiteralWithAssertEqualsIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertLiteralWithAssertEqualsIntention.java @@ -46,8 +46,7 @@ public class ReplaceAssertLiteralWithAssertEqualsIntention extends MutablyNamedI assert methodName != null; final String postfix = methodName.substring("assert".length()); final PsiExpression lastArgument = arguments[arguments.length - 1]; - if (lastArgument instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)lastArgument; + if (lastArgument instanceof PsiBinaryExpression binaryExpression) { final IElementType tokenType = binaryExpression.getOperationTokenType(); if (("assertTrue".equals(methodName) && JavaTokenType.EQEQ.equals(tokenType)) || ("assertFalse".equals(methodName) && JavaTokenType.NE.equals(tokenType))) { @@ -105,8 +104,7 @@ public class ReplaceAssertLiteralWithAssertEqualsIntention extends MutablyNamedI newExpression.append(commentTracker.text(arguments[0])).append(", "); } final PsiExpression lastArgument = arguments[arguments.length - 1]; - if (lastArgument instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)lastArgument; + if (lastArgument instanceof PsiBinaryExpression binaryExpression) { final IElementType tokenType = binaryExpression.getOperationTokenType(); if (("assertTrue".equals(methodName) && JavaTokenType.EQEQ.equals(tokenType)) || ("assertFalse".equals(methodName) && JavaTokenType.NE.equals(tokenType))) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/modifiers/ChangeModifierIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/modifiers/ChangeModifierIntention.java index cd0b6947d529..219e7ead1e77 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/modifiers/ChangeModifierIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/modifiers/ChangeModifierIntention.java @@ -351,8 +351,7 @@ public class ChangeModifierIntention extends BaseElementAtCaretIntentionAction { private static void changeModifier(PsiModifierList modifierList, AccessModifier modifier, boolean hasConflicts) { Project project = modifierList.getProject(); PsiElement parent = modifierList.getParent(); - if (parent instanceof PsiMethod && hasConflicts) { - PsiMethod method = (PsiMethod)parent; + if (parent instanceof PsiMethod method && hasConflicts) { //no myPrepareSuccessfulSwingThreadCallback means that the conflicts when any, won't be shown again var csp = JavaRefactoringFactory.getInstance(project).createChangeSignatureProcessor( method, @@ -385,13 +384,11 @@ public class ChangeModifierIntention extends BaseElementAtCaretIntentionAction { @Nullable private static MultiMap checkForConflicts(@NotNull PsiMember member, AccessModifier modifier) { - if (member instanceof PsiClass && modifier == AccessModifier.PUBLIC) { - final PsiClass aClass = (PsiClass)member; + if (member instanceof PsiClass aClass && modifier == AccessModifier.PUBLIC) { final PsiElement parent = aClass.getParent(); - if (!(parent instanceof PsiJavaFile)) { + if (!(parent instanceof PsiJavaFile javaFile)) { return MultiMap.empty(); } - final PsiJavaFile javaFile = (PsiJavaFile)parent; final String name = FileUtilRt.getNameWithoutExtension(javaFile.getName()); final String className = aClass.getName(); if (name.equals(className)) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/OperatorAssignmentPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/OperatorAssignmentPredicate.java index 5a77c5062279..5b4c3366e63a 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/OperatorAssignmentPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/OperatorAssignmentPredicate.java @@ -41,8 +41,7 @@ class OperatorAssignmentPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiAssignmentExpression)) return false; - PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)element; + if (!(element instanceof PsiAssignmentExpression assignmentExpression)) return false; IElementType tokenType = assignmentExpression.getOperationTokenType(); return Lazy.OPERATOR_ASSIGNMENT_TOKENS.contains(tokenType); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/PostfixPrefixIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/PostfixPrefixIntention.java index 2aadbb320bd1..66373d527623 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/PostfixPrefixIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/PostfixPrefixIntention.java @@ -28,15 +28,13 @@ public class PostfixPrefixIntention extends MutablyNamedIntention { @Override public boolean satisfiedBy(PsiElement element) { final IElementType tokenType; - if (element instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)element; + if (element instanceof PsiPrefixExpression prefixExpression) { tokenType = prefixExpression.getOperationTokenType(); if (prefixExpression.getOperand() == null) { return false; } } - else if (element instanceof PsiPostfixExpression) { - final PsiPostfixExpression postfixExpression = (PsiPostfixExpression)element; + else if (element instanceof PsiPostfixExpression postfixExpression) { tokenType = postfixExpression.getOperationTokenType(); } else { @@ -54,8 +52,7 @@ public class PostfixPrefixIntention extends MutablyNamedIntention { @NotNull private static String getReplacementText(PsiElement element) { - if (element instanceof PsiPrefixExpression) { - final PsiPrefixExpression prefixExpression = (PsiPrefixExpression)element; + if (element instanceof PsiPrefixExpression prefixExpression) { final PsiExpression operand = prefixExpression.getOperand(); assert operand != null; final PsiJavaToken sign = prefixExpression.getOperationSign(); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceAssignmentWithPostfixExpressionIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceAssignmentWithPostfixExpressionIntention.java index e74aa20d40e8..fcb0387fe424 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceAssignmentWithPostfixExpressionIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceAssignmentWithPostfixExpressionIntention.java @@ -43,10 +43,9 @@ public class ReplaceAssignmentWithPostfixExpressionIntention extends MutablyName CommentTracker commentTracker = new CommentTracker(); final String lhsText = commentTracker.text(lhs); final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getRExpression()); - if (!(rhs instanceof PsiBinaryExpression)) { + if (!(rhs instanceof PsiBinaryExpression binaryExpression)) { return; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)rhs; final IElementType tokenType = binaryExpression.getOperationTokenType(); if (JavaTokenType.PLUS.equals(tokenType)) { PsiReplacementUtil.replaceExpression(assignmentExpression, lhsText + "++", commentTracker); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceAssignmentWithPostfixExpressionPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceAssignmentWithPostfixExpressionPredicate.java index c0213443c665..1b2781901c5c 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceAssignmentWithPostfixExpressionPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceAssignmentWithPostfixExpressionPredicate.java @@ -25,29 +25,23 @@ class ReplaceAssignmentWithPostfixExpressionPredicate implements PsiElementPredi @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiAssignmentExpression)) { + if (!(element instanceof PsiAssignmentExpression assignmentExpression)) { return false; } - final PsiAssignmentExpression assignmentExpression = - (PsiAssignmentExpression)element; final PsiExpression lhs = assignmentExpression.getLExpression(); final PsiExpression strippedLhs = PsiUtil.skipParenthesizedExprDown(lhs); - if (!(strippedLhs instanceof PsiReferenceExpression)) { + if (!(strippedLhs instanceof PsiReferenceExpression referenceExpression)) { return false; } - final PsiReferenceExpression referenceExpression = - (PsiReferenceExpression)strippedLhs; final PsiElement target = referenceExpression.resolve(); - if (!(target instanceof PsiVariable)) { + if (!(target instanceof PsiVariable variable)) { return false; } - final PsiVariable variable = (PsiVariable)target; final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(assignmentExpression.getRExpression()); - if (!(rhs instanceof PsiBinaryExpression)) { + if (!(rhs instanceof PsiBinaryExpression binaryExpression)) { return false; } - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)rhs; final PsiExpression lOperand = PsiUtil.skipParenthesizedExprDown(binaryExpression.getLOperand()); final PsiExpression rOperand = PsiUtil.skipParenthesizedExprDown(binaryExpression.getROperand()); final IElementType tokenType = binaryExpression.getOperationTokenType(); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceOperatorAssignmentWithPostfixExpressionPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceOperatorAssignmentWithPostfixExpressionPredicate.java index e63cd850a366..7283ecfae03b 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceOperatorAssignmentWithPostfixExpressionPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplaceOperatorAssignmentWithPostfixExpressionPredicate.java @@ -15,10 +15,9 @@ class ReplaceOperatorAssignmentWithPostfixExpressionPredicate implements PsiElem @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiAssignmentExpression)) { + if (!(element instanceof PsiAssignmentExpression assignmentExpression)) { return false; } - final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)element; final IElementType tokenType = assignmentExpression.getOperationTokenType(); if (!JavaTokenType.PLUSEQ.equals(tokenType) && !JavaTokenType.MINUSEQ.equals(tokenType)) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplacePostfixExpressionWithOperatorAssignmentPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplacePostfixExpressionWithOperatorAssignmentPredicate.java index 10c083e4d000..4e0037c3bf6f 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplacePostfixExpressionWithOperatorAssignmentPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/opassign/ReplacePostfixExpressionWithOperatorAssignmentPredicate.java @@ -25,10 +25,9 @@ class ReplacePostfixExpressionWithOperatorAssignmentPredicate implements PsiElem @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiPostfixExpression)) { + if (!(element instanceof PsiPostfixExpression postfixExpression)) { return false; } - final PsiPostfixExpression postfixExpression = (PsiPostfixExpression)element; final IElementType tokenType = postfixExpression.getOperationTokenType(); return !(!JavaTokenType.PLUSPLUS.equals(tokenType) && !JavaTokenType.MINUSMINUS.equals(tokenType)); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/shift/ShiftUtils.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/shift/ShiftUtils.java index 2e7dcba8f4c4..28bfb5c897dc 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/shift/ShiftUtils.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/shift/ShiftUtils.java @@ -27,10 +27,9 @@ final class ShiftUtils { } public static boolean isPowerOfTwo(PsiExpression rhs) { - if (!(rhs instanceof PsiLiteralExpression)) { + if (!(rhs instanceof PsiLiteralExpression literal)) { return false; } - final PsiLiteralExpression literal = (PsiLiteralExpression)rhs; final Object value = literal.getValue(); if (!(value instanceof Number)) { return false; @@ -83,10 +82,9 @@ final class ShiftUtils { } public static boolean isIntLiteral(PsiExpression rhs) { - if (!(rhs instanceof PsiLiteralExpression)) { + if (!(rhs instanceof PsiLiteralExpression literal)) { return false; } - final PsiLiteralExpression literal = (PsiLiteralExpression)rhs; final Object value = literal.getValue(); if (!(value instanceof Number)) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/SwitchPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/SwitchPredicate.java index 2d782e116ce4..54dc87271a89 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/SwitchPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/SwitchPredicate.java @@ -27,10 +27,9 @@ class SwitchPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final IElementType tokenType = token.getTokenType(); if (!JavaTokenType.SWITCH_KEYWORD.equals(tokenType)) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ConvertToNestedIfIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ConvertToNestedIfIntention.java index a6def7a36711..20554432798d 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ConvertToNestedIfIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ConvertToNestedIfIntention.java @@ -38,15 +38,13 @@ public class ConvertToNestedIfIntention extends Intention { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiReturnStatement)) { + if (!(element instanceof PsiReturnStatement returnStatement)) { return false; } - final PsiReturnStatement returnStatement = (PsiReturnStatement)element; final PsiExpression returnValue = PsiUtil.skipParenthesizedExprDown(returnStatement.getReturnValue()); - if (!(returnValue instanceof PsiPolyadicExpression)) { + if (!(returnValue instanceof PsiPolyadicExpression polyadicExpression)) { return false; } - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)returnValue; final IElementType tokenType = polyadicExpression.getOperationTokenType(); return tokenType == JavaTokenType.ANDAND || tokenType == JavaTokenType.OROR; } @@ -82,8 +80,7 @@ public class ConvertToNestedIfIntention extends Intention { boolean top, CommentTracker tracker, StringBuilder out) { - if (expression instanceof PsiPolyadicExpression) { - final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression; + if (expression instanceof PsiPolyadicExpression polyadicExpression) { final PsiExpression[] operands = polyadicExpression.getOperands(); final IElementType tokenType = polyadicExpression.getOperationTokenType(); if (JavaTokenType.ANDAND.equals(tokenType)) { @@ -105,8 +102,7 @@ public class ConvertToNestedIfIntention extends Intention { return out; } } - else if (expression instanceof PsiParenthesizedExpression) { - final PsiParenthesizedExpression parenthesizedExpression = (PsiParenthesizedExpression)expression; + else if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) { buildIf(parenthesizedExpression.getExpression(), top, tracker, out); return out; } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanIntention.java index 6bd1ae353343..cbc147223176 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanIntention.java @@ -52,10 +52,9 @@ public class ExpandBooleanIntention extends MutablyNamedIntention { @Override public void processIntention(@NotNull PsiElement element) { - if (!(element instanceof PsiStatement)) { + if (!(element instanceof PsiStatement statement)) { return; } - final PsiStatement statement = (PsiStatement)element; final Project project = element.getProject(); if (ExpandBooleanPredicate.isBooleanAssignment(statement)) { final PsiExpressionStatement assignmentStatement = (PsiExpressionStatement)statement; @@ -74,8 +73,7 @@ public class ExpandBooleanIntention extends MutablyNamedIntention { (PsiIfStatement)JavaPsiFacade.getElementFactory(project).createStatementFromText(newStatementText, element); final PsiExpression condition = newIfStatement.getCondition(); assert condition != null; - if (condition instanceof PsiBinaryExpression) { - final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)condition; + if (condition instanceof PsiBinaryExpression binaryExpression) { final PsiExpression operand = binaryExpression.getROperand(); if (operand != null) { operand.replace(rhs); @@ -107,10 +105,9 @@ public class ExpandBooleanIntention extends MutablyNamedIntention { else if (ExpandBooleanPredicate.isBooleanDeclaration(statement)) { final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)statement; final PsiElement declaredElement = declarationStatement.getDeclaredElements()[0]; - if (!(declaredElement instanceof PsiLocalVariable)) { + if (!(declaredElement instanceof PsiLocalVariable variable)) { return; } - final PsiLocalVariable variable = (PsiLocalVariable)declaredElement; final PsiExpression initializer = variable.getInitializer(); if (initializer == null) { return; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanPredicate.java index 49abe70b7b04..4e85c4347560 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanPredicate.java @@ -24,10 +24,9 @@ class ExpandBooleanPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiStatement)) { + if (!(element instanceof PsiStatement statement)) { return false; } - final PsiStatement statement = (PsiStatement)element; final PsiElement lastLeaf = PsiTreeUtil.getDeepestLast(statement); if (PsiUtil.isJavaToken(lastLeaf, JavaTokenType.SEMICOLON) && PsiTreeUtil.prevLeaf(lastLeaf) instanceof PsiErrorElement) { return false; @@ -36,10 +35,9 @@ class ExpandBooleanPredicate implements PsiElementPredicate { } public static boolean isBooleanReturn(PsiStatement statement) { - if (!(statement instanceof PsiReturnStatement)) { + if (!(statement instanceof PsiReturnStatement returnStatement)) { return false; } - final PsiReturnStatement returnStatement = (PsiReturnStatement)statement; final PsiExpression returnValue = PsiUtil.skipParenthesizedExprDown(returnStatement.getReturnValue()); if (returnValue == null || returnValue instanceof PsiLiteralExpression) { return false; @@ -49,18 +47,16 @@ class ExpandBooleanPredicate implements PsiElementPredicate { } public static boolean isBooleanAssignment(PsiStatement statement) { - if (!(statement instanceof PsiExpressionStatement)) { + if (!(statement instanceof PsiExpressionStatement expressionStatement)) { return false; } - final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement; if (expressionStatement.getParent() instanceof PsiSwitchLabeledRuleStatement) { return false; } final PsiExpression expression = expressionStatement.getExpression(); - if (!(expression instanceof PsiAssignmentExpression)) { + if (!(expression instanceof PsiAssignmentExpression assignment)) { return false; } - final PsiAssignmentExpression assignment = (PsiAssignmentExpression)expression; final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(assignment.getRExpression()); if (rhs == null || rhs instanceof PsiLiteralExpression) { return false; @@ -70,19 +66,17 @@ class ExpandBooleanPredicate implements PsiElementPredicate { } public static boolean isBooleanDeclaration(PsiStatement statement) { - if (!(statement instanceof PsiDeclarationStatement)) { + if (!(statement instanceof PsiDeclarationStatement declarationStatement)) { return false; } - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)statement; final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); if (declaredElements.length != 1) { return false; } final PsiElement element = declaredElements[0]; - if (!(element instanceof PsiLocalVariable)) { + if (!(element instanceof PsiLocalVariable variable)) { return false; } - final PsiLocalVariable variable = (PsiLocalVariable)element; final PsiExpression initializer = PsiUtil.skipParenthesizedExprDown(variable.getInitializer()); if (initializer == null || initializer instanceof PsiLiteralExpression) { return false; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeElseIfPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeElseIfPredicate.java index 2538cfb3610e..a947cf227e7c 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeElseIfPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeElseIfPredicate.java @@ -24,19 +24,17 @@ class MergeElseIfPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } @NonNls final String text = element.getText(); if (!PsiKeyword.ELSE.equals(text)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final PsiElement parent = token.getParent(); - if (!(parent instanceof PsiIfStatement)) { + if (!(parent instanceof PsiIfStatement ifStatement)) { return false; } - final PsiIfStatement ifStatement = (PsiIfStatement)parent; if (ErrorUtil.containsError(ifStatement)) { return false; } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndIntention.java index d7e89f9ee732..ee1e0aae315c 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndIntention.java @@ -49,8 +49,7 @@ public class MergeIfAndIntention extends Intention { final PsiIfStatement parentStatement = (PsiIfStatement)token.getParent(); if (parentStatement == null) return; final PsiStatement parentThenBranch = ControlFlowUtils.stripBraces(parentStatement.getThenBranch()); - if (!(parentThenBranch instanceof PsiIfStatement)) return; - final PsiIfStatement childStatement = (PsiIfStatement)parentThenBranch; + if (!(parentThenBranch instanceof PsiIfStatement childStatement)) return; final PsiExpression childCondition = childStatement.getCondition(); if (childCondition == null) return; final PsiStatement childThenBranch = childStatement.getThenBranch(); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndPredicate.java index 6e48319d0ddf..6d18c4a53c8f 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndPredicate.java @@ -27,16 +27,14 @@ class MergeIfAndPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final PsiElement parent = token.getParent(); - if (!(parent instanceof PsiIfStatement)) { + if (!(parent instanceof PsiIfStatement ifStatement)) { return false; } - final PsiIfStatement ifStatement = (PsiIfStatement)parent; if (ErrorUtil.containsError(ifStatement)) { return false; } @@ -50,10 +48,9 @@ class MergeIfAndPredicate implements PsiElementPredicate { if (elseBranch != null) { return false; } - if (!(thenBranch instanceof PsiIfStatement)) { + if (!(thenBranch instanceof PsiIfStatement childIfStatement)) { return false; } - final PsiIfStatement childIfStatement = (PsiIfStatement)thenBranch; return childIfStatement.getElseBranch() == null; } } \ No newline at end of file diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfOrPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfOrPredicate.java index 0c8449ae4510..c7c2702c72ca 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfOrPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfOrPredicate.java @@ -33,15 +33,13 @@ class MergeIfOrPredicate implements PsiElementPredicate { } public static boolean isMergableExplicitIf(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final PsiElement parent = token.getParent(); - if (!(parent instanceof PsiIfStatement)) { + if (!(parent instanceof PsiIfStatement ifStatement)) { return false; } - final PsiIfStatement ifStatement = (PsiIfStatement)parent; final PsiStatement thenBranch = ifStatement.getThenBranch(); final PsiStatement elseBranch = ifStatement.getElseBranch(); if (thenBranch == null) { @@ -50,28 +48,25 @@ class MergeIfOrPredicate implements PsiElementPredicate { if (elseBranch == null) { return false; } - if (!(elseBranch instanceof PsiIfStatement)) { + if (!(elseBranch instanceof PsiIfStatement childIfStatement)) { return false; } if (ErrorUtil.containsError(ifStatement)) { return false; } - final PsiIfStatement childIfStatement = (PsiIfStatement)elseBranch; final PsiStatement childThenBranch = childIfStatement.getThenBranch(); return EquivalenceChecker.getCanonicalPsiEquivalence().statementsAreEquivalent(thenBranch, childThenBranch); } private static boolean isMergableImplicitIf(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final PsiElement parent = token.getParent(); - if (!(parent instanceof PsiIfStatement)) { + if (!(parent instanceof PsiIfStatement ifStatement)) { return false; } - final PsiIfStatement ifStatement = (PsiIfStatement)parent; final PsiStatement thenBranch = ifStatement.getThenBranch(); if (thenBranch == null) { return false; @@ -84,10 +79,9 @@ class MergeIfOrPredicate implements PsiElementPredicate { return false; } final PsiElement nextStatement = PsiTreeUtil.skipWhitespacesForward(ifStatement); - if (!(nextStatement instanceof PsiIfStatement)) { + if (!(nextStatement instanceof PsiIfStatement nextIfStatement)) { return false; } - final PsiIfStatement nextIfStatement = (PsiIfStatement)nextStatement; final PsiStatement nextThenBranch = nextIfStatement.getThenBranch(); return EquivalenceChecker.getCanonicalPsiEquivalence().statementsAreEquivalent(thenBranch, nextThenBranch); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeParallelIfsPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeParallelIfsPredicate.java index 8107b1b531c7..6740066ca5d8 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeParallelIfsPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeParallelIfsPredicate.java @@ -32,21 +32,18 @@ class MergeParallelIfsPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final PsiElement parent = token.getParent(); - if (!(parent instanceof PsiIfStatement)) { + if (!(parent instanceof PsiIfStatement ifStatement)) { return false; } - final PsiIfStatement ifStatement = (PsiIfStatement)parent; final PsiElement nextStatement = PsiTreeUtil.skipWhitespacesForward(ifStatement); - if (!(nextStatement instanceof PsiIfStatement)) { + if (!(nextStatement instanceof PsiIfStatement nextIfStatement)) { return false; } - final PsiIfStatement nextIfStatement = (PsiIfStatement)nextStatement; if (ErrorUtil.containsError(ifStatement)) { return false; } @@ -119,9 +116,7 @@ class MergeParallelIfsPredicate implements PsiElementPredicate { if (statement instanceof PsiDeclarationStatement) { addDeclarations((PsiDeclarationStatement)statement, out); } - else if (statement instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = - (PsiBlockStatement)statement; + else if (statement instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock block = blockStatement.getCodeBlock(); final PsiStatement[] statements = block.getStatements(); for (PsiStatement statement1 : statements) { @@ -137,8 +132,7 @@ class MergeParallelIfsPredicate implements PsiElementPredicate { Collection declaredVariables) { final PsiElement[] elements = statement.getDeclaredElements(); for (final PsiElement element : elements) { - if (element instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)element; + if (element instanceof PsiVariable variable) { final String name = variable.getName(); declaredVariables.add(name); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/SplitElseIfPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/SplitElseIfPredicate.java index f5bf8d548abd..587059ae61ef 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/SplitElseIfPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/SplitElseIfPredicate.java @@ -24,19 +24,17 @@ class SplitElseIfPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } @NonNls final String text = element.getText(); if (!PsiKeyword.ELSE.equals(text)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final PsiElement parent = token.getParent(); - if (!(parent instanceof PsiIfStatement)) { + if (!(parent instanceof PsiIfStatement ifStatement)) { return false; } - final PsiIfStatement ifStatement = (PsiIfStatement)parent; final PsiStatement thenBranch = ifStatement.getThenBranch(); final PsiStatement elseBranch = ifStatement.getElseBranch(); if (thenBranch == null) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/unicode/ReplaceOctalEscapeWithUnicodeEscapeIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/unicode/ReplaceOctalEscapeWithUnicodeEscapeIntention.java index eda902eb7332..35a1fdf7c002 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/unicode/ReplaceOctalEscapeWithUnicodeEscapeIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/unicode/ReplaceOctalEscapeWithUnicodeEscapeIntention.java @@ -58,8 +58,7 @@ public class ReplaceOctalEscapeWithUnicodeEscapeIntention extends Intention { replacement.append(text, anchor, textLength); document.replaceString(start, end, replacement); } - else if (element instanceof PsiLiteralExpression) { - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)element; + else if (element instanceof PsiLiteralExpression literalExpression) { final String text = literalExpression.getText(); final CaretModel model = editor.getCaretModel(); final int offset = model.getOffset() - literalExpression.getTextOffset(); @@ -157,8 +156,7 @@ public class ReplaceOctalEscapeWithUnicodeEscapeIntention extends Intention { final String text = editor.getDocument().getCharsSequence().subSequence(start, end).toString(); return indexOfOctalEscape(text, 1) >= 0; } - else if (element instanceof PsiLiteralExpression) { - final PsiLiteralExpression literalExpression = (PsiLiteralExpression)element; + else if (element instanceof PsiLiteralExpression literalExpression) { final String text = literalExpression.getText(); final CaretModel model = editor.getCaretModel(); final int offset = model.getOffset() - literalExpression.getTextOffset(); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/varargs/VarargArgumentsPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/varargs/VarargArgumentsPredicate.java index d83c8b4b0233..a0d6add35ec8 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/varargs/VarargArgumentsPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/varargs/VarargArgumentsPredicate.java @@ -26,15 +26,13 @@ class VarargArgumentsPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof PsiExpressionList)) { + if (!(element instanceof PsiExpressionList argumentList)) { return false; } - final PsiExpressionList argumentList = (PsiExpressionList)element; final PsiElement parent = argumentList.getParent(); - if (!(parent instanceof PsiCall)) { + if (!(parent instanceof PsiCall call)) { return false; } - final PsiCall call = (PsiCall)parent; final JavaResolveResult resolveResult = call.resolveMethodGenerics(); if (!resolveResult.isValidResult() || !(resolveResult instanceof MethodCandidateInfo candidateInfo) || candidateInfo.getApplicabilityLevel() != MethodCandidateInfo.ApplicabilityLevel.VARARGS) { @@ -50,8 +48,7 @@ class VarargArgumentsPredicate implements PsiElementPredicate { final PsiSubstitutor substitutor = resolveResult.getSubstitutor(); final PsiType lastParameterType = PsiTypesUtil.getParameterType(parameters, parameters.length - 1, true); final PsiType substitutedType = substitutor.substitute(lastParameterType); - if (substitutedType instanceof PsiCapturedWildcardType) { - final PsiCapturedWildcardType capturedWildcardType = (PsiCapturedWildcardType)substitutedType; + if (substitutedType instanceof PsiCapturedWildcardType capturedWildcardType) { if (!capturedWildcardType.getWildcard().isSuper()) { // red code return false; @@ -68,10 +65,9 @@ class VarargArgumentsPredicate implements PsiElementPredicate { return false; } final PsiType lastArgumentType = lastExpression.getType(); - if (!(lastArgumentType instanceof PsiArrayType)) { + if (!(lastArgumentType instanceof PsiArrayType arrayType)) { return true; } - final PsiArrayType arrayType = (PsiArrayType)lastArgumentType; final PsiType type = arrayType.getComponentType(); return !substitutedType.isAssignableFrom(type); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/DoWhileLoopPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/DoWhileLoopPredicate.java index d6cafe515823..55daeb1eb3ff 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/DoWhileLoopPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/DoWhileLoopPredicate.java @@ -26,20 +26,17 @@ class DoWhileLoopPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final IElementType tokenType = token.getTokenType(); if (!JavaTokenType.DO_KEYWORD.equals(tokenType)) { return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiDoWhileStatement)) { + if (!(parent instanceof PsiDoWhileStatement doWhileStatement)) { return false; } - final PsiDoWhileStatement doWhileStatement = - (PsiDoWhileStatement)parent; return !(doWhileStatement.getCondition() == null || doWhileStatement.getBody() == null); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ExtractWhileLoopConditionToIfStatementIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ExtractWhileLoopConditionToIfStatementIntention.java index f24ddbf846cb..d1c1871ca9ff 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ExtractWhileLoopConditionToIfStatementIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ExtractWhileLoopConditionToIfStatementIntention.java @@ -54,8 +54,7 @@ public class ExtractWhileLoopConditionToIfStatementIntention extends Intention { final PsiStatement body = whileStatement.getBody(); final PsiStatement ifStatement = factory.createStatementFromText("if (" + conditionText + ") break;", whileStatement); final PsiElement newElement; - if (body instanceof PsiBlockStatement) { - final PsiBlockStatement blockStatement = (PsiBlockStatement)body; + if (body instanceof PsiBlockStatement blockStatement) { final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); newElement = codeBlock.addBefore(ifStatement, codeBlock.getFirstBodyElement()); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ReplaceDoWhileLoopWithWhileLoopIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ReplaceDoWhileLoopWithWhileLoopIntention.java index df0df5625887..1d5e4156d8ad 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ReplaceDoWhileLoopWithWhileLoopIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ReplaceDoWhileLoopWithWhileLoopIntention.java @@ -70,12 +70,10 @@ public class ReplaceDoWhileLoopWithWhileLoopIntention extends Intention { if (children.length > 2) { for (int i = 1, length = children.length - 1; i < length; i++) { final PsiElement child = children[i]; - if (child instanceof PsiDeclarationStatement) { - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)child; + if (child instanceof PsiDeclarationStatement declarationStatement) { final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); for (PsiElement declaredElement : declaredElements) { - if (declaredElement instanceof PsiVariable) { - final PsiVariable variable = (PsiVariable)declaredElement; + if (declaredElement instanceof PsiVariable variable) { final PsiModifierList modifierList = variable.getModifierList(); if (modifierList != null) { modifierList.setModifierProperty(PsiModifier.FINAL, false); @@ -113,13 +111,11 @@ public class ReplaceDoWhileLoopWithWhileLoopIntention extends Intention { if (children.length > 2) { for (int i = 1; i < children.length - 1; i++) { final PsiElement child = children[i]; - if (child instanceof PsiDeclarationStatement) { - final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)child; + if (child instanceof PsiDeclarationStatement declarationStatement) { final PsiElement[] declaredElements = declarationStatement.getDeclaredElements(); for (PsiElement declaredElement : declaredElements) { - if (declaredElement instanceof PsiVariable) { + if (declaredElement instanceof PsiVariable variable) { // prevent duplicate variable declarations. - final PsiVariable variable = (PsiVariable)declaredElement; final PsiExpression initializer = variable.getInitializer(); if (initializer != null) { replacementText.append(variable.getName()).append(" = ").append(commentTracker.text(initializer)).append(';'); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ReplaceWhileLoopWithDoWhileLoopIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ReplaceWhileLoopWithDoWhileLoopIntention.java index 72f5f1f6b240..a43cabd595fa 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ReplaceWhileLoopWithDoWhileLoopIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/ReplaceWhileLoopWithDoWhileLoopIntention.java @@ -50,9 +50,8 @@ public class ReplaceWhileLoopWithDoWhileLoopIntention extends Intention { } doWhileStatementText.append(") {\n"); } - if (body instanceof PsiBlockStatement) { + if (body instanceof PsiBlockStatement blockStatement) { doWhileStatementText.append("do {"); - final PsiBlockStatement blockStatement = (PsiBlockStatement)body; final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); final PsiElement[] children = codeBlock.getChildren(); if (children.length > 2) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/WhileLoopPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/WhileLoopPredicate.java index 75d141b85a0b..808dc620f8ec 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/WhileLoopPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/whileloop/WhileLoopPredicate.java @@ -26,19 +26,17 @@ class WhileLoopPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof PsiJavaToken)) { + if (!(element instanceof PsiJavaToken token)) { return false; } - final PsiJavaToken token = (PsiJavaToken)element; final IElementType tokenType = token.getTokenType(); if (!JavaTokenType.WHILE_KEYWORD.equals(tokenType)) { return false; } final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiWhileStatement)) { + if (!(parent instanceof PsiWhileStatement whileStatement)) { return false; } - final PsiWhileStatement whileStatement = (PsiWhileStatement)parent; return !(whileStatement.getCondition() == null || whileStatement.getBody() == null); } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java index 110ab48a4b30..ecb1d1bed17c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java @@ -88,10 +88,9 @@ public final class AddAntBuildFile extends AnAction { if (files != null) { for (VirtualFile file : files) { final PsiFile psiFile = PsiManager.getInstance(project).findFile(file); - if (!(psiFile instanceof XmlFile)) { + if (!(psiFile instanceof XmlFile xmlFile)) { continue; } - final XmlFile xmlFile = (XmlFile)psiFile; final XmlDocument document = xmlFile.getDocument(); if (document == null) { continue; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java index 973f72931dcd..6e5db8ec9e2f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java @@ -81,10 +81,9 @@ public class RunTargetAction extends AnAction { } final PsiFile psiFile = PsiManager.getInstance(project).findFile(file); - if (!(psiFile instanceof XmlFile)) { + if (!(psiFile instanceof XmlFile xmlFile)) { return null; } - final XmlFile xmlFile = (XmlFile)psiFile; final AntBuildFileBase antFile = AntConfigurationBase.getInstance(project).getAntBuildFile(xmlFile); if (antFile == null) { diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntBuildMessageView.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntBuildMessageView.java index 240f1c39e24c..51efc89c4818 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntBuildMessageView.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntBuildMessageView.java @@ -943,8 +943,7 @@ public final class AntBuildMessageView extends JPanel implements DataProvider, O return; } // proceed messages in a special way - if (command instanceof AddMessageCommand) { - AddMessageCommand addMessageCommand = (AddMessageCommand)command; + if (command instanceof AddMessageCommand addMessageCommand) { myDelayedMessages.add(addMessageCommand.getMessage()); } else { diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunProfileState.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunProfileState.java index 0df45e97b244..64b47035b493 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunProfileState.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunProfileState.java @@ -29,8 +29,7 @@ final class AntRunProfileState implements RunProfileState { @Override public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) { final RunProfile profile = myEnvironment.getRunProfile(); - if (profile instanceof AntRunConfiguration) { - final AntRunConfiguration runConfig = (AntRunConfiguration)profile; + if (profile instanceof AntRunConfiguration runConfig) { if (runConfig.getTarget() == null) { return null; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java index 976d80f8c15f..365594afdd9d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java @@ -31,8 +31,7 @@ final class MessageTreeRenderer extends MultilineTreeCellRenderer { @Override protected void initComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { - if(value instanceof MessageNode) { - MessageNode messageNode = (MessageNode)value; + if(value instanceof MessageNode messageNode) { setText(messageNode.getText(), messageNode.getTypeString() + messageNode.getPositionString()); } else { @@ -48,8 +47,7 @@ final class MessageTreeRenderer extends MultilineTreeCellRenderer { if (foreground == null) { myDefaultForeground = foreground = getForeground(); } - if (value instanceof MessageNode) { - MessageNode node = (MessageNode)value; + if (value instanceof MessageNode node) { AntBuildMessageView.MessageType type = node.getType(); if (type == AntBuildMessageView.MessageType.BUILD) { icon = AntIcons.Build; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java index 75a09681a815..5c81dd9ffbcf 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java @@ -102,10 +102,9 @@ public final class TreeView implements AntOutputView, OccurenceNavigator { myOccurenceNavigatorSupport = new OccurenceNavigatorSupport(myTree) { @Override protected Navigatable createDescriptorForNode(@NotNull DefaultMutableTreeNode node) { - if (!(node instanceof MessageNode)) { + if (!(node instanceof MessageNode messageNode)) { return null; } - MessageNode messageNode = (MessageNode)node; AntBuildMessageView.MessageType type = messageNode.getType(); if (type != AntBuildMessageView.MessageType.MESSAGE && type != AntBuildMessageView.MessageType.ERROR) { @@ -418,8 +417,7 @@ public final class TreeView implements AntOutputView, OccurenceNavigator { if (text == null || text.length == 0) return null; final String taskName = text[0]; final TreeNode parentNode = node.getParent(); - if (!(parentNode instanceof MessageNode)) return null; - final MessageNode messageNode = (MessageNode)parentNode; + if (!(parentNode instanceof MessageNode messageNode)) return null; if (messageNode.getType() != AntBuildMessageView.MessageType.TARGET) return null; final BuildTask task = ((AntBuildModelBase)myBuildFile.getModel()).findTask(messageNode.getText()[0], taskName); return (task == null) ? null : task.getOpenFileDescriptor(); @@ -508,8 +506,7 @@ public final class TreeView implements AntOutputView, OccurenceNavigator { Object[] paths = path.getPath(); for (Object o : paths) { - if (o instanceof MessageNode) { - MessageNode messageNode = (MessageNode)o; + if (o instanceof MessageNode messageNode) { AntBuildMessageView.MessageType type = messageNode.getType(); if (type == AntBuildMessageView.MessageType.TARGET) { selection.mySelectedTarget = messageNode.getText()[0]; @@ -529,8 +526,7 @@ public final class TreeView implements AntOutputView, OccurenceNavigator { DefaultMutableTreeNode root = (DefaultMutableTreeNode)myTreeModel.getRoot(); for (int i = 0; i < root.getChildCount(); i++) { TreeNode node = root.getChildAt(i); - if (node instanceof MessageNode) { - MessageNode messageNode = (MessageNode)node; + if (node instanceof MessageNode messageNode) { String[] text = messageNode.getText(); if (text.length == 0) continue; if (Objects.equals(treeSelection.mySelectedTarget, text[0])) { @@ -622,8 +618,7 @@ public final class TreeView implements AntOutputView, OccurenceNavigator { public Collection getTextLinesToCopy() { TreePath selection = getSelectionPath(); Object value = selection == null ? null : selection.getLastPathComponent(); - if (value instanceof MessageNode) { - MessageNode messageNode = ((MessageNode)value); + if (value instanceof MessageNode messageNode) { return Arrays.asList(messageNode.getText()); } return value == null ? null : Collections.singleton(value.toString()); diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java index 6a7271f91d3a..9c7aa3d780a2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java @@ -538,8 +538,7 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider, if (leadPath != null) { final DefaultMutableTreeNode node = (DefaultMutableTreeNode)leadPath.getLastPathComponent(); if (node != null) { - if (node.getUserObject() instanceof AntTargetNodeDescriptor) { - final AntTargetNodeDescriptor targetNodeDescriptor = (AntTargetNodeDescriptor)node.getUserObject(); + if (node.getUserObject() instanceof AntTargetNodeDescriptor targetNodeDescriptor) { final Navigatable navigatable = targetNodeDescriptor.getTarget().getOpenFileDescriptor(); if (navigatable != null && navigatable.canNavigate()) { return navigatable; @@ -605,8 +604,7 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider, int row, boolean hasFocus) { final Object userObject = ((DefaultMutableTreeNode)value).getUserObject(); - if (userObject instanceof AntNodeDescriptor) { - final AntNodeDescriptor descriptor = (AntNodeDescriptor)userObject; + if (userObject instanceof AntNodeDescriptor descriptor) { descriptor.customize(this); } else { @@ -720,8 +718,7 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider, final DefaultMutableTreeNode node = (DefaultMutableTreeNode) selectionPath.getLastPathComponent(); final Object userObject = node.getUserObject(); AntBuildTarget target = null; - if (userObject instanceof AntTargetNodeDescriptor) { - AntTargetNodeDescriptor targetNodeDescriptor = (AntTargetNodeDescriptor)userObject; + if (userObject instanceof AntTargetNodeDescriptor targetNodeDescriptor) { target = targetNodeDescriptor.getTarget(); } else if (userObject instanceof AntBuildFileNodeDescriptor){ @@ -911,8 +908,7 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider, // try to remove build file if (paths.length == 1) { final DefaultMutableTreeNode node = (DefaultMutableTreeNode)paths[0].getLastPathComponent(); - if (node.getUserObject() instanceof AntBuildFileNodeDescriptor) { - final AntBuildFileNodeDescriptor descriptor = (AntBuildFileNodeDescriptor)node.getUserObject(); + if (node.getUserObject() instanceof AntBuildFileNodeDescriptor descriptor) { if (descriptor.getBuildFile().equals(getCurrentBuildFile())) { removeBuildFile(); return; @@ -950,16 +946,14 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider, String text = AntBundle.message("remove.meta.target.action.name"); boolean enabled = false; final DefaultMutableTreeNode node = (DefaultMutableTreeNode)paths[0].getLastPathComponent(); - if (node.getUserObject() instanceof AntBuildFileNodeDescriptor) { - final AntBuildFileNodeDescriptor descriptor = (AntBuildFileNodeDescriptor)node.getUserObject(); + if (node.getUserObject() instanceof AntBuildFileNodeDescriptor descriptor) { if (descriptor.getBuildFile().equals(getCurrentBuildFile())) { text = AntBundle.message("remove.selected.build.file.action.name"); enabled = true; } } else { - if (node.getUserObject() instanceof AntTargetNodeDescriptor) { - final AntTargetNodeDescriptor descr = (AntTargetNodeDescriptor)node.getUserObject(); + if (node.getUserObject() instanceof AntTargetNodeDescriptor descr) { final AntBuildTargetBase target = descr.getTarget(); if (target instanceof MetaTarget) { enabled = true; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java index e8d40315c279..3acf1fb951c4 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java @@ -81,8 +81,7 @@ final class AntExplorerTreeStructure extends AbstractTreeStructure { return configuration.getBuildFiles(); } - if (element instanceof AntBuildFile) { - final AntBuildFile buildFile = (AntBuildFile)element; + if (element instanceof AntBuildFile buildFile) { final AntBuildModel model = buildFile.getModel(); final List targets = diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java index 92d850ef21ad..066777a4fda8 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java @@ -243,10 +243,9 @@ public final class AntBuildFileImpl implements AntBuildFileBase { @Nullable public XmlFile getAntFile() { final PsiFile psiFile = myVFile.isValid() ? PsiManager.getInstance(getProject()).findFile(myVFile) : null; - if (!(psiFile instanceof XmlFile)) { + if (!(psiFile instanceof XmlFile xmlFile)) { return null; } - final XmlFile xmlFile = (XmlFile)psiFile; return AntDomFileDescription.isAntFile(xmlFile) ? xmlFile : null; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildTargetImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildTargetImpl.java index 8ef23b94d365..d915ed388066 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildTargetImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildTargetImpl.java @@ -69,10 +69,9 @@ public class AntBuildTargetImpl implements AntBuildTargetBase { } public boolean equals(Object obj) { - if (!(obj instanceof AntBuildTargetImpl)) { + if (!(obj instanceof AntBuildTargetImpl that)) { return false; } - final AntBuildTargetImpl that = (AntBuildTargetImpl)obj; return Objects.equals(myName, that.myName) && Comparing.equal(myFile, that.myFile); } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java index 664f8ac0f124..71a176f64e80 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java @@ -845,10 +845,9 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis return null; } final PsiFile psiFile = PsiManager.getInstance(getProject()).findFile(context); - if (!(psiFile instanceof XmlFile)) { + if (!(psiFile instanceof XmlFile xmlFile)) { return null; } - final XmlFile xmlFile = (XmlFile)psiFile; return AntDomFileDescription.isAntFile(xmlFile)? xmlFile : null; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java index 4eda25039446..def787ead145 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java @@ -78,8 +78,7 @@ public class TargetChooserDialog extends DialogWrapper { if (selectionPath != null) { final DefaultMutableTreeNode node = (DefaultMutableTreeNode)selectionPath.getLastPathComponent(); final Object userObject = node.getUserObject(); - if (userObject instanceof AntTargetNodeDescriptor) { - final AntTargetNodeDescriptor antBuildTarget = (AntTargetNodeDescriptor)userObject; + if (userObject instanceof AntTargetNodeDescriptor antBuildTarget) { mySelectedTarget = antBuildTarget.getAntTarget(); } else { @@ -177,14 +176,12 @@ public class TargetChooserDialog extends DialogWrapper { boolean leaf, int row, boolean hasFocus) { - if (value instanceof DefaultMutableTreeNode) { - final DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode)value; + if (value instanceof DefaultMutableTreeNode treeNode) { final Object userObject = treeNode.getUserObject(); if (userObject instanceof AntBuildFile) { append(((AntBuildFile)userObject).getPresentableName(), SimpleTextAttributes.REGULAR_ATTRIBUTES); } - else if (userObject instanceof AntTargetNodeDescriptor) { - final AntTargetNodeDescriptor descriptor = (AntTargetNodeDescriptor)userObject; + else if (userObject instanceof AntTargetNodeDescriptor descriptor) { final AntBuildTarget antTarget = descriptor.getAntTarget(); final String antTargetName = antTarget.getName(); append(antTargetName, SimpleTextAttributes.REGULAR_ATTRIBUTES); diff --git a/plugins/ant/src/com/intellij/lang/ant/doc/AntDomDocumentationProvider.java b/plugins/ant/src/com/intellij/lang/ant/doc/AntDomDocumentationProvider.java index d902757e034e..5633c3767f08 100644 --- a/plugins/ant/src/com/intellij/lang/ant/doc/AntDomDocumentationProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/doc/AntDomDocumentationProvider.java @@ -178,8 +178,7 @@ final class AntDomDocumentationProvider implements DocumentationProvider { final PomTarget pomTarget = ((PomTargetPsiElement)element).getTarget(); if (pomTarget instanceof DomTarget) { final DomElement domElement = ((DomTarget)pomTarget).getDomElement(); - if (domElement instanceof AntDomTarget) { - final AntDomTarget antTarget = (AntDomTarget)domElement; + if (domElement instanceof AntDomTarget antTarget) { final String description = antTarget.getDescription().getRawText(); if (description != null && description.length() > 0) { final String targetName = antTarget.getName().getRawText(); diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomExtender.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomExtender.java index 6a356eecc8ca..dc4acb59a94d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomExtender.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomExtender.java @@ -72,8 +72,7 @@ public final class AntDomExtender extends DomExtender{ @Override public void registerExtensions(@NotNull final AntDomElement antDomElement, @NotNull DomExtensionsRegistrar registrar) { final XmlElement xmlElement = antDomElement.getXmlElement(); - if (xmlElement instanceof XmlTag) { - final XmlTag xmlTag = (XmlTag)xmlElement; + if (xmlElement instanceof XmlTag xmlTag) { final String tagName = xmlTag.getName(); final AntDomProject antProject = antDomElement.getAntProject(); @@ -332,10 +331,9 @@ public final class AntDomExtender extends DomExtender{ @Override public Set getCompletionVariants(@NotNull DomElement parent) { - if (!(parent instanceof AntDomElement)) { + if (!(parent instanceof AntDomElement element)) { return Collections.emptySet(); } - final AntDomElement element = (AntDomElement)parent; final AntDomProject antDomProject = element.getAntProject(); if (antDomProject == null) { return Collections.emptySet(); @@ -365,10 +363,9 @@ public final class AntDomExtender extends DomExtender{ @Nullable private static PomTarget doFindDeclaration(DomElement parent, XmlName xmlName) { - if (!(parent instanceof AntDomElement)) { + if (!(parent instanceof AntDomElement parentElement)) { return null; } - final AntDomElement parentElement = (AntDomElement)parent; final AntDomProject antDomProject = parentElement.getAntProject(); if (antDomProject == null) { return null; @@ -379,8 +376,7 @@ public final class AntDomExtender extends DomExtender{ return null; } DomTarget target = DomTarget.getTarget(declaringElement); - if (target == null && declaringElement instanceof AntDomTypeDef) { - final AntDomTypeDef typedef = (AntDomTypeDef)declaringElement; + if (target == null && declaringElement instanceof AntDomTypeDef typedef) { final GenericAttributeValue resource = typedef.getResource(); if (resource != null) { target = DomTarget.getTarget(declaringElement, resource); diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyReference.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyReference.java index ad3d1f516027..10f75eaabe8c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyReference.java @@ -121,8 +121,7 @@ public class AntDomPropertyReference extends PsiPolyVariantReferenceBase implements Cu @Override public PsiReference @NotNull [] createReferences(GenericDomValue genericDomValue, PsiElement element, ConvertContext context) { - if (genericDomValue instanceof GenericAttributeValue) { - final GenericAttributeValue attrib = (GenericAttributeValue)genericDomValue; + if (genericDomValue instanceof GenericAttributeValue attrib) { if (attrib.getRawText() != null) { final AntDomFileReferenceSet refSet = new AntDomFileReferenceSet(attrib, myShouldValidateRefs); return refSet.getAllReferences(); diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntReferenceInjector.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntReferenceInjector.java index 60527143c97e..5851ad18b452 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntReferenceInjector.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntReferenceInjector.java @@ -51,8 +51,7 @@ class AntReferenceInjector implements DomReferenceInjector { @Override public PsiReference @NotNull [] inject(@Nullable String unresolvedText, @NotNull PsiElement element, @NotNull ConvertContext context) { - if (element instanceof XmlAttributeValue) { - final XmlAttributeValue xmlAttributeValue = (XmlAttributeValue)element; + if (element instanceof XmlAttributeValue xmlAttributeValue) { final List refs = new ArrayList<>(); addPropertyReferences(context, xmlAttributeValue, refs); addMacrodefParameterRefs(xmlAttributeValue, refs); diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java index 556676c7fb15..013900af7bac 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java @@ -60,8 +60,7 @@ public class AntResolveInspection extends AntInspection { checkReferences(valueElement, holder, element); } } - else if (element instanceof AntDomTypeDef) { - final AntDomTypeDef typeDef = (AntDomTypeDef)element; + else if (element instanceof AntDomTypeDef typeDef) { final List errors = typeDef.getErrorDescriptions(); if (!errors.isEmpty()) { @Nls final StringBuilder builder = new StringBuilder(); @@ -72,8 +71,7 @@ public class AntResolveInspection extends AntInspection { holder.createProblem(typeDef, builder.toString()); } } - else if (element instanceof AntDomCustomElement) { - final AntDomCustomElement custom = (AntDomCustomElement)element; + else if (element instanceof AntDomCustomElement custom) { if (custom.getDefinitionClass() == null) { final AntDomNamedElement declaringElement = custom.getDeclaringElement(); if (declaringElement instanceof AntDomTypeDef) { @@ -95,10 +93,9 @@ public class AntResolveInspection extends AntInspection { Set processed = null; Collection propertyFiles = null; // to be initialized lazily for (final PsiReference ref : xmlElement.getReferences()) { - if (!(ref instanceof AntDomReference)) { + if (!(ref instanceof AntDomReference antDomRef)) { continue; } - final AntDomReference antDomRef = (AntDomReference)ref; if (antDomRef.shouldBeSkippedByAnnotator()) { continue; } @@ -169,8 +166,7 @@ public class AntResolveInspection extends AntInspection { if (xmlElement != null && xmlElement.getTextOffset() >= stopOffset) { break; // no need to offer to add properties to files that are imported after the property reference } - if (child instanceof AntDomProperty) { - final AntDomProperty property = (AntDomProperty)child; + if (child instanceof AntDomProperty property) { final PropertiesFile file = property.getPropertiesFile(); if (file != null) { files.add(file); diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java b/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java index 71940d5fa202..d948fa99bcdb 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java @@ -121,8 +121,7 @@ public final class CustomAntElementsRegistry { if (declaringElement instanceof AntDomMacroDef || declaringElement instanceof AntDomScriptDef || declaringElement instanceof AntDomTaskdef) { continue; } - if (declaringElement instanceof AntDomTypeDef) { - AntDomTypeDef typedef = (AntDomTypeDef)declaringElement; + if (declaringElement instanceof AntDomTypeDef typedef) { Class clazz = lookupClass(xmlName); if (clazz != null && typedef.isTask(clazz)) { continue; diff --git a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePropertyFix.java b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePropertyFix.java index ce405b541dac..e12ed6c2736d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePropertyFix.java +++ b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePropertyFix.java @@ -106,8 +106,7 @@ public class AntCreatePropertyFix implements LocalQuickFix { }); } else { - if (containingFile instanceof XmlFile) { - final XmlFile xmlFile = (XmlFile)containingFile; + if (containingFile instanceof XmlFile xmlFile) { final XmlTag rootTag = xmlFile.getRootTag(); if (!modificationService.prepareFileForWrite(xmlFile)) { return; diff --git a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateTargetFix.java b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateTargetFix.java index 086860beeb4a..286e9bf09cb6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateTargetFix.java +++ b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateTargetFix.java @@ -59,8 +59,7 @@ public class AntCreateTargetFix implements LocalQuickFix { final PsiFile containingFile = psiElement.getContainingFile(); Navigatable result = null; - if (containingFile instanceof XmlFile) { - final XmlFile xmlFile = (XmlFile)containingFile; + if (containingFile instanceof XmlFile xmlFile) { final XmlTag rootTag = xmlFile.getRootTag(); if (rootTag != null) { final XmlTag propTag = rootTag.createChildTag(TAG_NAME, rootTag.getNamespace(), "", false); diff --git a/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateTargetsInspection.java b/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateTargetsInspection.java index a24775b37464..1b4900147431 100644 --- a/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateTargetsInspection.java +++ b/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateTargetsInspection.java @@ -39,8 +39,7 @@ public class AntDuplicateTargetsInspection extends AntInspection { @Override protected void checkDomElement(DomElement element, final DomElementAnnotationHolder holder, DomHighlightingHelper helper) { - if (element instanceof AntDomProject) { - final AntDomProject project = (AntDomProject)element; + if (element instanceof AntDomProject project) { TargetResolver.validateDuplicateTargets(project.getContextAntProject(), new TargetResolver.TargetSink() { @Override public void duplicateTargetDetected(AntDomTarget existingTarget, AntDomTarget duplicatingTarget, String targetEffectiveName) { diff --git a/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorConfigurable.java b/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorConfigurable.java index 3ed9282a55fd..7cf36d057743 100644 --- a/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorConfigurable.java +++ b/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorConfigurable.java @@ -79,10 +79,9 @@ public class AntHectorConfigurable extends HectorComponentPanel { for (VirtualFile file : antFiles) { final PsiFile psiFile = psiManager.findFile(file); - if (!(psiFile instanceof XmlFile)) { + if (!(psiFile instanceof XmlFile xmlFile)) { continue; } - final XmlFile xmlFile = (XmlFile)psiFile; if (!xmlFile.equals(myFile) && AntDomFileDescription.isAntFile(xmlFile)) { final String path = PathUtil.getLocalPath(file); final XmlFile previous = myPathToFileMap.put(path, xmlFile); diff --git a/plugins/ant/src/com/intellij/lang/ant/validation/AntMissingPropertiesFileInspection.java b/plugins/ant/src/com/intellij/lang/ant/validation/AntMissingPropertiesFileInspection.java index 7a1e8c5f747a..fc9db8e72edf 100644 --- a/plugins/ant/src/com/intellij/lang/ant/validation/AntMissingPropertiesFileInspection.java +++ b/plugins/ant/src/com/intellij/lang/ant/validation/AntMissingPropertiesFileInspection.java @@ -42,8 +42,7 @@ public class AntMissingPropertiesFileInspection extends AntInspection { @Override protected void checkDomElement(DomElement element, DomElementAnnotationHolder holder, DomHighlightingHelper helper) { - if (element instanceof AntDomProperty) { - final AntDomProperty property = (AntDomProperty)element; + if (element instanceof AntDomProperty property) { final GenericAttributeValue fileValue = property.getFile(); final String fileName = fileValue.getStringValue(); if (fileName != null) { diff --git a/plugins/commander/src/com/intellij/ide/commander/AbstractListBuilder.java b/plugins/commander/src/com/intellij/ide/commander/AbstractListBuilder.java index 6187c0e714ea..5022d4875229 100644 --- a/plugins/commander/src/com/intellij/ide/commander/AbstractListBuilder.java +++ b/plugins/commander/src/com/intellij/ide/commander/AbstractListBuilder.java @@ -88,8 +88,7 @@ public abstract class AbstractListBuilder implements Disposable { public final void drillDown() { final Object value = getSelectedValue(); - if (value instanceof AbstractTreeNode) { - final AbstractTreeNode node = (AbstractTreeNode)value; + if (value instanceof AbstractTreeNode node) { drillDown(node, getChildren(node)); } else { // an element that denotes parent @@ -122,8 +121,7 @@ public abstract class AbstractListBuilder implements Disposable { buildList(element); for (int i = 0; i < myModel.getSize(); i++) { - if (myModel.getElementAt(i) instanceof NodeDescriptor) { - final NodeDescriptor desc = (NodeDescriptor)myModel.getElementAt(i); + if (myModel.getElementAt(i) instanceof NodeDescriptor desc) { final Object elem = desc.getElement(); if (oldParent.equals(elem)) { selectItem(i); @@ -165,8 +163,7 @@ public abstract class AbstractListBuilder implements Disposable { for (int i = 0; i < myModel.getSize(); i++) { if (myModel.getElementAt(i) instanceof AbstractTreeNode) { final AbstractTreeNode desc = (AbstractTreeNode)myModel.getElementAt(i); - if (desc.getValue() instanceof StructureViewTreeElement) { - StructureViewTreeElement treeelement = (StructureViewTreeElement)desc.getValue(); + if (desc.getValue() instanceof StructureViewTreeElement treeelement) { if (element.equals(treeelement.getValue())) { selectItem(i); break; @@ -340,10 +337,9 @@ public abstract class AbstractListBuilder implements Disposable { List> resultDescriptors = new ArrayList<>(); Object[] listChildren = myModel.toArray(); for (final Object child : listChildren) { - if (!(child instanceof NodeDescriptor)) { + if (!(child instanceof NodeDescriptor descriptor)) { continue; } - final NodeDescriptor descriptor = (NodeDescriptor)child; descriptor.update(); final Object newElement = descriptor.getElement(); final Integer index = newElement != null ? elementToIndexMap.get(newElement) : null; diff --git a/plugins/commander/src/com/intellij/ide/commander/ColoredCommanderRenderer.java b/plugins/commander/src/com/intellij/ide/commander/ColoredCommanderRenderer.java index 05c34d41d9bf..e97a4f19966e 100644 --- a/plugins/commander/src/com/intellij/ide/commander/ColoredCommanderRenderer.java +++ b/plugins/commander/src/com/intellij/ide/commander/ColoredCommanderRenderer.java @@ -44,8 +44,7 @@ final class ColoredCommanderRenderer extends ColoredListCellRenderer { setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0)); // for separator, see below - if (value instanceof NodeDescriptor) { - final NodeDescriptor descriptor = (NodeDescriptor)value; + if (value instanceof NodeDescriptor descriptor) { setIcon(descriptor.getIcon()); final Color elementColor = descriptor.getColor(); @@ -53,8 +52,7 @@ final class ColoredCommanderRenderer extends ColoredListCellRenderer { color = elementColor; } - if (descriptor instanceof AbstractTreeNode) { - final AbstractTreeNode treeNode = (AbstractTreeNode)descriptor; + if (descriptor instanceof AbstractTreeNode treeNode) { final TextAttributesKey attributesKey = treeNode.getPresentation().getTextAttributesKey(); if (attributesKey != null) { diff --git a/plugins/commander/src/com/intellij/ide/commander/Commander.java b/plugins/commander/src/com/intellij/ide/commander/Commander.java index d2c029015fef..1f8d2560feb4 100644 --- a/plugins/commander/src/com/intellij/ide/commander/Commander.java +++ b/plugins/commander/src/com/intellij/ide/commander/Commander.java @@ -506,8 +506,7 @@ public class Commander extends JPanel implements PersistentStateComponent 0) { res = prolog.getLastChild(); } @@ -116,8 +115,7 @@ public final class UpdateXmlCopyrightsProvider extends UpdateCopyrightsProvider PsiElement res = element instanceof XmlProlog ? element : element.getNextSibling(); if (res != null) { - if (res instanceof XmlProlog) { - XmlProlog prolog = (XmlProlog)res; + if (res instanceof XmlProlog prolog) { if (prolog.getChildren().length > 0) { res = prolog.getFirstChild(); } diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageLineMarkerRenderer.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageLineMarkerRenderer.java index 476bbc28aa26..cf65141f4edf 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageLineMarkerRenderer.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageLineMarkerRenderer.java @@ -132,8 +132,7 @@ public class CoverageLineMarkerRenderer implements ActiveGutterRenderer, LineMar @Override public boolean canDoAction(@NotNull final MouseEvent e) { Component component = e.getComponent(); - if (component instanceof EditorGutterComponentEx) { - EditorGutterComponentEx gutter = (EditorGutterComponentEx)component; + if (component instanceof EditorGutterComponentEx gutter) { return e.getX() > gutter.getLineMarkerAreaOffset() && e.getX() < gutter.getIconAreaOffset(); } return false; diff --git a/plugins/coverage-common/src/com/intellij/coverage/actions/CoverageSuiteChooserDialog.java b/plugins/coverage-common/src/com/intellij/coverage/actions/CoverageSuiteChooserDialog.java index ec1ed79a0b78..112075d05d75 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/actions/CoverageSuiteChooserDialog.java +++ b/plugins/coverage-common/src/com/intellij/coverage/actions/CoverageSuiteChooserDialog.java @@ -242,8 +242,7 @@ public class CoverageSuiteChooserDialog extends DialogWrapper { public void customizeRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { if (value instanceof CheckedTreeNode) { final Object userObject = ((CheckedTreeNode)value).getUserObject(); - if (userObject instanceof CoverageSuite) { - CoverageSuite suite = (CoverageSuite)userObject; + if (userObject instanceof CoverageSuite suite) { getTextRenderer().append(suite.getPresentableName(), SimpleTextAttributes.REGULAR_ATTRIBUTES); final String date = " (" + DateFormatUtil.formatPrettyDateTime(suite.getLastCoverageTimeStamp()) + ")"; getTextRenderer().append(date, SimpleTextAttributes.GRAY_ATTRIBUTES); @@ -352,8 +351,7 @@ public class CoverageSuiteChooserDialog extends DialogWrapper { final CheckedTreeNode[] selectedNodes = mySuitesTree.getSelectedNodes(CheckedTreeNode.class, null); for (CheckedTreeNode selectedNode : selectedNodes) { final Object userObject = selectedNode.getUserObject(); - if (userObject instanceof CoverageSuite) { - final CoverageSuite selectedSuite = (CoverageSuite)userObject; + if (userObject instanceof CoverageSuite selectedSuite) { if (selectedSuite.canRemove()) { myCoverageManager.removeCoverageSuite(selectedSuite); TreeUtil.removeLastPathComponent(mySuitesTree, new TreePath(selectedNode.getPath())); @@ -369,8 +367,7 @@ public class CoverageSuiteChooserDialog extends DialogWrapper { presentation.setEnabled(false); for (CheckedTreeNode node : selectedSuites) { final Object userObject = node.getUserObject(); - if (userObject instanceof CoverageSuite) { - final CoverageSuite selectedSuite = (CoverageSuite)userObject; + if (userObject instanceof CoverageSuite selectedSuite) { if (selectedSuite.canRemove()) { presentation.setEnabled(true); } diff --git a/plugins/coverage-common/src/com/intellij/coverage/view/CoverageListNode.java b/plugins/coverage-common/src/com/intellij/coverage/view/CoverageListNode.java index ff1c0665153a..8142bcad3fc5 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/view/CoverageListNode.java +++ b/plugins/coverage-common/src/com/intellij/coverage/view/CoverageListNode.java @@ -140,8 +140,7 @@ public class CoverageListNode extends AbstractTreeNode { protected void update(@NotNull final PresentationData presentation) { ApplicationManager.getApplication().runReadAction(() -> { final Object object = getValue(); - if (object instanceof PsiNamedElement) { - final PsiNamedElement value = (PsiNamedElement)object; + if (object instanceof PsiNamedElement value) { if (value instanceof PsiQualifiedNamedElement && (myStateBean.myFlattenPackages && value.getContainingFile() == null || getParent() instanceof CoverageListRootNode)) { presentation.setPresentableText(((PsiQualifiedNamedElement)value).getQualifiedName()); diff --git a/plugins/coverage/src/com/intellij/coverage/CoverageProjectViewClassNodeDecorator.java b/plugins/coverage/src/com/intellij/coverage/CoverageProjectViewClassNodeDecorator.java index daf50ecf2a36..e5382938e86b 100644 --- a/plugins/coverage/src/com/intellij/coverage/CoverageProjectViewClassNodeDecorator.java +++ b/plugins/coverage/src/com/intellij/coverage/CoverageProjectViewClassNodeDecorator.java @@ -35,8 +35,7 @@ final class CoverageProjectViewClassNodeDecorator extends AbstractCoverageProjec else if (value instanceof SmartPsiElementPointer) { element = ((SmartPsiElementPointer)value).getElement(); } - else if (value instanceof PackageElement) { - PackageElement packageElement = (PackageElement)value; + else if (value instanceof PackageElement packageElement) { final String coverageString = javaCovAnnotator.getPackageCoverageInformationString(packageElement.getPackage(), packageElement.getModule(), coverageDataManager); diff --git a/plugins/coverage/src/com/intellij/coverage/JavaCoverageEngine.java b/plugins/coverage/src/com/intellij/coverage/JavaCoverageEngine.java index 944d1df7da70..7623fd946cea 100644 --- a/plugins/coverage/src/com/intellij/coverage/JavaCoverageEngine.java +++ b/plugins/coverage/src/com/intellij/coverage/JavaCoverageEngine.java @@ -267,8 +267,7 @@ public class JavaCoverageEngine extends CoverageEngine { @NotNull final String name, @NotNull final CoverageFileProvider coverageDataFileProvider, @NotNull final CoverageEnabledConfiguration config) { - if (config instanceof JavaCoverageEnabledConfiguration) { - final JavaCoverageEnabledConfiguration javaConfig = (JavaCoverageEnabledConfiguration)config; + if (config instanceof JavaCoverageEnabledConfiguration javaConfig) { return createSuite(covRunner, name, coverageDataFileProvider, javaConfig.getPatterns(), javaConfig.getExcludePatterns(), @@ -627,8 +626,7 @@ public class JavaCoverageEngine extends CoverageEngine { @Nullable public String getTestMethodName(@NotNull final PsiElement element, @NotNull final AbstractTestProxy testProxy) { - if (element instanceof PsiMethod) { - PsiMethod method = (PsiMethod)element; + if (element instanceof PsiMethod method) { PsiClass aClass = method.getContainingClass(); if (aClass != null) { String qualifiedName = ClassUtil.getJVMClassName(aClass); diff --git a/plugins/coverage/src/com/intellij/coverage/PackageAnnotator.java b/plugins/coverage/src/com/intellij/coverage/PackageAnnotator.java index e9784ec4b04c..fc542a54f695 100644 --- a/plugins/coverage/src/com/intellij/coverage/PackageAnnotator.java +++ b/plugins/coverage/src/com/intellij/coverage/PackageAnnotator.java @@ -302,8 +302,7 @@ public final class PackageAnnotator { final Object[] lines = classData.getLines(); for (Object l : lines) { - if (l instanceof LineData) { - final LineData lineData = (LineData)l; + if (l instanceof LineData lineData) { if (lineData.getStatus() == LineCoverage.FULL) { info.fullyCoveredLineCount++; } diff --git a/plugins/coverage/src/com/intellij/coverage/view/JavaCoverageViewExtension.java b/plugins/coverage/src/com/intellij/coverage/view/JavaCoverageViewExtension.java index e5632b8499a0..4b64e42ef051 100644 --- a/plugins/coverage/src/com/intellij/coverage/view/JavaCoverageViewExtension.java +++ b/plugins/coverage/src/com/intellij/coverage/view/JavaCoverageViewExtension.java @@ -255,8 +255,7 @@ public class JavaCoverageViewExtension extends CoverageViewExtension { if (val instanceof PsiClass) return Collections.emptyList(); //append package classes - if (val instanceof PsiPackage) { - final PsiPackage psiPackage = (PsiPackage)val; + if (val instanceof PsiPackage psiPackage) { final GlobalSearchScope searchScope = mySuitesBundle.getSearchScope(myProject); if (ReadAction.compute(() -> isInCoverageScope(psiPackage))) { if (!myStateBean.myFlattenPackages) { @@ -354,8 +353,7 @@ public class JavaCoverageViewExtension extends CoverageViewExtension { } private boolean isInCoverageScope(PsiElement element) { - if (element instanceof PsiPackage) { - final PsiPackage psiPackage = (PsiPackage)element; + if (element instanceof PsiPackage psiPackage) { final String qualifiedName = psiPackage.getQualifiedName(); for (CoverageSuite suite : mySuitesBundle.getSuites()) { if (((JavaCoverageSuite)suite).isPackageFiltered(qualifiedName)) return true; diff --git a/plugins/coverage/src/com/intellij/execution/configurations/coverage/CoverageConfigurable.java b/plugins/coverage/src/com/intellij/execution/configurations/coverage/CoverageConfigurable.java index 1ed423fa073f..c361f2681a09 100644 --- a/plugins/coverage/src/com/intellij/execution/configurations/coverage/CoverageConfigurable.java +++ b/plugins/coverage/src/com/intellij/execution/configurations/coverage/CoverageConfigurable.java @@ -107,8 +107,7 @@ public final class CoverageConfigurable extends SettingsEditor getAttr(), ... final PsiClass returnResolved = returnClassType.resolve(); if (isDomElementInheritor(returnResolved)) { diff --git a/plugins/devkit/devkit-core/src/inspections/InspectionDescriptionInfo.java b/plugins/devkit/devkit-core/src/inspections/InspectionDescriptionInfo.java index c45e0461df3d..0667c2777ac1 100644 --- a/plugins/devkit/devkit-core/src/inspections/InspectionDescriptionInfo.java +++ b/plugins/devkit/devkit-core/src/inspections/InspectionDescriptionInfo.java @@ -120,8 +120,7 @@ public final class InspectionDescriptionInfo { PsiElement parent = element.getParent(); if (parent instanceof XmlAttribute && "implementationClass".equals(((XmlAttribute)parent).getName())) { DomElement domElement = DomUtil.getDomElement(parent.getParent()); - if (domElement instanceof Extension) { - Extension extension = (Extension)domElement; + if (domElement instanceof Extension extension) { ExtensionPoint extensionPoint = extension.getExtensionPoint(); if (extensionPoint != null && InheritanceUtil.isInheritor(extensionPoint.getBeanClass().getValue(), InspectionEP.class.getName())) { diff --git a/plugins/devkit/devkit-core/src/inspections/MissingAccessibleContextInspection.java b/plugins/devkit/devkit-core/src/inspections/MissingAccessibleContextInspection.java index 226abb288ef3..1ff26527abfa 100644 --- a/plugins/devkit/devkit-core/src/inspections/MissingAccessibleContextInspection.java +++ b/plugins/devkit/devkit-core/src/inspections/MissingAccessibleContextInspection.java @@ -205,8 +205,7 @@ public class MissingAccessibleContextInspection extends DevKitUastInspectionBase if (result instanceof UObjectLiteralExpression) { panelClass = ((UObjectLiteralExpression)result).getDeclaration().getJavaPsi(); } - else if (result instanceof UCallExpression) { - UCallExpression call = (UCallExpression)result; + else if (result instanceof UCallExpression call) { if (call.getKind() == UastCallKind.CONSTRUCTOR_CALL) { UReferenceExpression ref = call.getClassReference(); if (ref != null) { diff --git a/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java b/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java index 7aad5a5f0793..fb7fba6b5951 100644 --- a/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java +++ b/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java @@ -220,8 +220,7 @@ public final class PluginXmlDomInspection extends DevKitPluginXmlInspectionBase annotateListener((Listener)element, holder); } - if (element instanceof GenericDomValue) { - final GenericDomValue domValue = (GenericDomValue)element; + if (element instanceof GenericDomValue domValue) { if (domValue.getConverter() instanceof PluginPsiClassConverter) { @SuppressWarnings("unchecked") GenericDomValue psiClassDomValue = (GenericDomValue)element; annotatePsiClassValue(psiClassDomValue, holder); @@ -875,8 +874,7 @@ public final class PluginXmlDomInspection extends DevKitPluginXmlInspectionBase } final PsiElement declaration = attributeDescription.getDeclaration(extension.getManager().getProject()); - if (declaration instanceof PsiField) { - PsiField psiField = (PsiField)declaration; + if (declaration instanceof PsiField psiField) { if (psiField.isDeprecated()) { highlightDeprecated( attributeValue, DevKitBundle.message("inspections.plugin.xml.deprecated.attribute", attributeDescription.getName()), diff --git a/plugins/devkit/devkit-core/src/inspections/PluginXmlExtensionRegistrationInspection.java b/plugins/devkit/devkit-core/src/inspections/PluginXmlExtensionRegistrationInspection.java index 612af6d3376b..a851bcf0c434 100644 --- a/plugins/devkit/devkit-core/src/inspections/PluginXmlExtensionRegistrationInspection.java +++ b/plugins/devkit/devkit-core/src/inspections/PluginXmlExtensionRegistrationInspection.java @@ -41,11 +41,10 @@ public class PluginXmlExtensionRegistrationInspection extends DevKitPluginXmlIns @Override protected void checkDomElement(DomElement element, DomElementAnnotationHolder holder, DomHighlightingHelper helper) { - if (!(element instanceof Extension)) { + if (!(element instanceof Extension extension)) { return; } - Extension extension = (Extension)element; ExtensionPoint extensionPoint = extension.getExtensionPoint(); if (extensionPoint == null || !DomUtil.hasXml(extensionPoint.getBeanClass())) { diff --git a/plugins/devkit/devkit-core/src/inspections/PsiElementConcatenationInspection.java b/plugins/devkit/devkit-core/src/inspections/PsiElementConcatenationInspection.java index 4e3e88555399..cde306dd522e 100644 --- a/plugins/devkit/devkit-core/src/inspections/PsiElementConcatenationInspection.java +++ b/plugins/devkit/devkit-core/src/inspections/PsiElementConcatenationInspection.java @@ -66,8 +66,7 @@ public class PsiElementConcatenationInspection extends AbstractBaseJavaLocalInsp } } } - if(operand instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)operand; + if(operand instanceof PsiMethodCallExpression call) { PsiMethod method = call.resolveMethod(); if(MethodUtils.isToString(method)) { checkOperand(call.getMethodExpression().getQualifierExpression(), visited); @@ -82,8 +81,7 @@ public class PsiElementConcatenationInspection extends AbstractBaseJavaLocalInsp holder.registerProblem(operand, DevKitBundle.message("inspections.psi.element.concat.psi.type"), new AddGetTextFix("getCanonicalText")); } - if(operand instanceof PsiPolyadicExpression) { - PsiPolyadicExpression polyadic = (PsiPolyadicExpression)operand; + if(operand instanceof PsiPolyadicExpression polyadic) { if(JavaTokenType.PLUS.equals(polyadic.getOperationTokenType())) { for (PsiExpression op : polyadic.getOperands()) { checkOperand(op, visited); @@ -118,8 +116,7 @@ public class PsiElementConcatenationInspection extends AbstractBaseJavaLocalInsp @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { PsiElement element = descriptor.getStartElement(); - if(!(element instanceof PsiExpression)) return; - PsiExpression expression = (PsiExpression)element; + if(!(element instanceof PsiExpression expression)) return; PsiElementFactory factory = JavaPsiFacade.getElementFactory(project); PsiExpression replacement = factory.createExpressionFromText(ParenthesesUtils.getText(expression, ParenthesesUtils.POSTFIX_PRECEDENCE) + "." + myMethodName + "()", expression); diff --git a/plugins/devkit/devkit-core/src/inspections/RegistrationProblemsInspection.java b/plugins/devkit/devkit-core/src/inspections/RegistrationProblemsInspection.java index d046cea7341f..b44ad860fbf2 100644 --- a/plugins/devkit/devkit-core/src/inspections/RegistrationProblemsInspection.java +++ b/plugins/devkit/devkit-core/src/inspections/RegistrationProblemsInspection.java @@ -132,8 +132,7 @@ public class RegistrationProblemsInspection extends DevKitUastInspectionBase { } try { - if (!(element instanceof PsiClass)) return; - PsiClass clazz = (PsiClass)element; + if (!(element instanceof PsiClass clazz)) return; PsiMethod ctor = JavaPsiFacade.getInstance(clazz.getProject()).getElementFactory().createConstructor(); PsiUtil.setModifierProperty(ctor, PsiModifier.PUBLIC, true); diff --git a/plugins/devkit/devkit-core/src/inspections/internal/UseCoupleInspection.java b/plugins/devkit/devkit-core/src/inspections/internal/UseCoupleInspection.java index fab782f45532..13ad62d73c3f 100644 --- a/plugins/devkit/devkit-core/src/inspections/internal/UseCoupleInspection.java +++ b/plugins/devkit/devkit-core/src/inspections/internal/UseCoupleInspection.java @@ -179,8 +179,7 @@ public class UseCoupleInspection extends DevKitUastInspectionBase implements Cle public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { PsiElement element = descriptor.getPsiElement(); PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory(); - if (element instanceof PsiTypeElement) { - PsiTypeElement typeElement = (PsiTypeElement)element; + if (element instanceof PsiTypeElement typeElement) { PsiClassType type1 = (PsiClassType)typeElement.getType(); PsiType[] parameters = type1.getParameters(); if (parameters.length != 2) { diff --git a/plugins/devkit/devkit-core/src/inspections/internal/UseEqualsInspectionBase.java b/plugins/devkit/devkit-core/src/inspections/internal/UseEqualsInspectionBase.java index e5cfa0cf0b5b..4698a49cc150 100644 --- a/plugins/devkit/devkit-core/src/inspections/internal/UseEqualsInspectionBase.java +++ b/plugins/devkit/devkit-core/src/inspections/internal/UseEqualsInspectionBase.java @@ -113,8 +113,7 @@ abstract class UseEqualsInspectionBase extends DevKitUastInspectionBase implemen @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PsiBinaryExpression)) return; - PsiBinaryExpression binaryExpression = (PsiBinaryExpression)element; + if (!(element instanceof PsiBinaryExpression binaryExpression)) return; PsiExpression lOperand = binaryExpression.getLOperand(); PsiExpression rOperand = binaryExpression.getROperand(); if (rOperand == null) return; diff --git a/plugins/devkit/devkit-core/src/inspections/quickfix/AddWithTagFix.java b/plugins/devkit/devkit-core/src/inspections/quickfix/AddWithTagFix.java index 4a4e8c33a385..611a79aabb79 100644 --- a/plugins/devkit/devkit-core/src/inspections/quickfix/AddWithTagFix.java +++ b/plugins/devkit/devkit-core/src/inspections/quickfix/AddWithTagFix.java @@ -35,10 +35,9 @@ public class AddWithTagFix implements LocalQuickFix { @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { DomElement element = DomUtil.getDomElement(descriptor.getPsiElement()); - if (!(element instanceof ExtensionPoint)) { + if (!(element instanceof ExtensionPoint extensionPoint)) { return; } - ExtensionPoint extensionPoint = (ExtensionPoint)element; List fields = extensionPoint.collectMissingWithTags(); PsiElement navTarget = null; for (PsiField field : fields) { diff --git a/plugins/devkit/devkit-core/src/inspections/quickfix/RegisterExtensionFixProvider.java b/plugins/devkit/devkit-core/src/inspections/quickfix/RegisterExtensionFixProvider.java index 72924613fe74..8c0314e1b04a 100644 --- a/plugins/devkit/devkit-core/src/inspections/quickfix/RegisterExtensionFixProvider.java +++ b/plugins/devkit/devkit-core/src/inspections/quickfix/RegisterExtensionFixProvider.java @@ -24,11 +24,10 @@ public class RegisterExtensionFixProvider implements UnusedDeclarationFixProvide public IntentionAction @NotNull [] getQuickFixes(@NotNull PsiElement element) { if (!(element instanceof PsiIdentifier)) return IntentionAction.EMPTY_ARRAY; PsiElement parent = element.getParent(); - if (!(parent instanceof PsiClass)) return IntentionAction.EMPTY_ARRAY; + if (!(parent instanceof PsiClass psiClass)) return IntentionAction.EMPTY_ARRAY; if (!PsiUtil.isPluginProject(element.getProject())) return IntentionAction.EMPTY_ARRAY; - PsiClass psiClass = (PsiClass)parent; if (InheritanceUtil.isInheritor(psiClass, LocalInspectionTool.class.getName())) { return new IntentionAction[]{new RegisterInspectionFix(psiClass, LocalInspectionEP.LOCAL_INSPECTION)}; } diff --git a/plugins/devkit/devkit-core/src/navigation/DevkitRelatedClassLineMarkerProviderBase.java b/plugins/devkit/devkit-core/src/navigation/DevkitRelatedClassLineMarkerProviderBase.java index 83e7da1ed1c3..3ea1c61aebf4 100644 --- a/plugins/devkit/devkit-core/src/navigation/DevkitRelatedClassLineMarkerProviderBase.java +++ b/plugins/devkit/devkit-core/src/navigation/DevkitRelatedClassLineMarkerProviderBase.java @@ -16,10 +16,9 @@ abstract class DevkitRelatedClassLineMarkerProviderBase extends DevkitRelatedLin @NotNull Collection> result) { // UAST is used for getting the class identifier to work for all UAST languages (not possible in plain PSI) UElement uElement = UastUtils.getUParentForIdentifier(element); - if (!(uElement instanceof UClass)) { + if (!(uElement instanceof UClass uClass)) { return; } - UClass uClass = (UClass)uElement; if (uElement instanceof UAnonymousClass) { return; } diff --git a/plugins/devkit/devkit-core/src/navigation/structure/PluginDescriptorStructureUtil.java b/plugins/devkit/devkit-core/src/navigation/structure/PluginDescriptorStructureUtil.java index 3b781ae9f668..5e0ebb1217d1 100644 --- a/plugins/devkit/devkit-core/src/navigation/structure/PluginDescriptorStructureUtil.java +++ b/plugins/devkit/devkit-core/src/navigation/structure/PluginDescriptorStructureUtil.java @@ -73,8 +73,7 @@ public final class PluginDescriptorStructureUtil { return actionId; } } - else if (element instanceof ExtensionPoint) { - ExtensionPoint epElement = (ExtensionPoint)element; + else if (element instanceof ExtensionPoint epElement) { String epName = epElement.getName().getStringValue(); if (StringUtil.isNotEmpty(epName)) { return epName; @@ -251,8 +250,7 @@ public final class PluginDescriptorStructureUtil { } private static @Nullable String getTopLevelNodeLocation(GenericDomValue element) { - if (element instanceof Dependency) { - Dependency dependency = (Dependency)element; + if (element instanceof Dependency dependency) { @NonNls String result = dependency.getRawText(); Boolean optional = dependency.getOptional().getValue(); diff --git a/plugins/devkit/devkit-core/src/navigation/structure/PluginDescriptorXmlStructureViewModel.java b/plugins/devkit/devkit-core/src/navigation/structure/PluginDescriptorXmlStructureViewModel.java index 9b28e2ad31b1..06dfad757b79 100644 --- a/plugins/devkit/devkit-core/src/navigation/structure/PluginDescriptorXmlStructureViewModel.java +++ b/plugins/devkit/devkit-core/src/navigation/structure/PluginDescriptorXmlStructureViewModel.java @@ -59,9 +59,7 @@ public class PluginDescriptorXmlStructureViewModel extends XmlStructureViewTreeM @Override public Comparator getComparator() { return (o1, o2) -> { - if (o1 instanceof PluginDescriptorTreeElement && o2 instanceof PluginDescriptorTreeElement) { - PluginDescriptorTreeElement e1 = (PluginDescriptorTreeElement)o1; - PluginDescriptorTreeElement e2 = (PluginDescriptorTreeElement)o2; + if (o1 instanceof PluginDescriptorTreeElement e1 && o2 instanceof PluginDescriptorTreeElement e2) { if (e1.isTopLevelNode() && e2.isTopLevelNode()) { return 0; } diff --git a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdkConfigurable.java b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdkConfigurable.java index cdaf44f972b2..fb1ebb6c6290 100644 --- a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdkConfigurable.java +++ b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdkConfigurable.java @@ -193,8 +193,7 @@ public class IdeaJdkConfigurable implements AdditionalDataConfigurable { updateJdkList(); myFreeze = false; mySandboxHome.reset(); - if (myIdeaJdk != null && myIdeaJdk.getSdkAdditionalData() instanceof Sandbox) { - final Sandbox sandbox = (Sandbox)myIdeaJdk.getSdkAdditionalData(); + if (myIdeaJdk != null && myIdeaJdk.getSdkAdditionalData() instanceof Sandbox sandbox) { final String sandboxHome = sandbox.getSandboxHome(); mySandboxHome.setText(sandboxHome); mySandboxHome.setSelectedItem(sandboxHome); diff --git a/plugins/devkit/devkit-core/src/refactoring/InspectionAutomaticRenamerFactory.java b/plugins/devkit/devkit-core/src/refactoring/InspectionAutomaticRenamerFactory.java index 3f2dc20c2e9d..dca963ffe2f6 100644 --- a/plugins/devkit/devkit-core/src/refactoring/InspectionAutomaticRenamerFactory.java +++ b/plugins/devkit/devkit-core/src/refactoring/InspectionAutomaticRenamerFactory.java @@ -40,13 +40,12 @@ public class InspectionAutomaticRenamerFactory implements AutomaticRenamerFactor @Override public boolean isApplicable(@NotNull PsiElement element) { - if (!(element instanceof PsiClass)) { + if (!(element instanceof PsiClass inspectionClass)) { return false; } if (!PsiUtil.isPluginProject(element.getProject())) { return false; } - PsiClass inspectionClass = (PsiClass)element; String inspectionClassName = inspectionClass.getName(); return inspectionClassName != null && inspectionClassName.endsWith(INSPECTION_CLASS_SUFFIX) && @@ -185,7 +184,7 @@ public class InspectionAutomaticRenamerFactory implements AutomaticRenamerFactor for (Map.Entry entry : allRenames.entrySet()) { PsiElement element = entry.getKey(); - if (!(element instanceof PsiClass)) { + if (!(element instanceof PsiClass inspectionClass)) { continue; } @@ -193,7 +192,6 @@ public class InspectionAutomaticRenamerFactory implements AutomaticRenamerFactor if (module == null) { continue; } - PsiClass inspectionClass = (PsiClass)element; InspectionDescriptionInfo descriptionInfo = InspectionDescriptionInfo.create(module, inspectionClass); PsiFile descriptionFile = descriptionInfo.getDescriptionFile(); if (descriptionFile == null) { diff --git a/plugins/devkit/devkit-core/src/references/DevKitRelatedPropertiesProvider.java b/plugins/devkit/devkit-core/src/references/DevKitRelatedPropertiesProvider.java index f3bc00efbea0..602680d86d60 100644 --- a/plugins/devkit/devkit-core/src/references/DevKitRelatedPropertiesProvider.java +++ b/plugins/devkit/devkit-core/src/references/DevKitRelatedPropertiesProvider.java @@ -71,12 +71,10 @@ final class DevKitRelatedPropertiesProvider extends DevkitRelatedLineMarkerProvi } DomElement domElement = DomUtil.getDomElement(leaf); - if (domElement instanceof ActionOrGroup) { - ActionOrGroup actionOrGroup = (ActionOrGroup)domElement; + if (domElement instanceof ActionOrGroup actionOrGroup) { createLineMarker(leaf, result, domElement, actionOrGroup.getId()); } - else if (domElement instanceof OverrideText) { - OverrideText overrideText = (OverrideText)domElement; + else if (domElement instanceof OverrideText overrideText) { createLineMarker(leaf, result, domElement, overrideText.getPlace()); } else if (domElement instanceof GenericDomValue) { diff --git a/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java b/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java index 1c837c0d584d..33eaab694480 100644 --- a/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java +++ b/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java @@ -68,11 +68,10 @@ final class TestDataFilesReferencesContributor extends PsiReferenceContributor { private static String getTestDataDirectory(@NotNull UExpression expression, @NotNull UCallExpression methodCallExpression) { Object value = expression.evaluate(); - if (!(value instanceof String)) { + if (!(value instanceof String relativePath)) { return null; } - String relativePath = (String)value; PsiMethod testMethod = UElementKt.getAsJavaPsiElement(UastUtils.getParentOfType(methodCallExpression, UMethod.class), PsiMethod.class); if (testMethod == null) { return null; diff --git a/plugins/devkit/devkit-core/src/testAssistant/NavigateToTestDataAction.java b/plugins/devkit/devkit-core/src/testAssistant/NavigateToTestDataAction.java index 0ea3d07f298a..9a49ee9abe0d 100644 --- a/plugins/devkit/devkit-core/src/testAssistant/NavigateToTestDataAction.java +++ b/plugins/devkit/devkit-core/src/testAssistant/NavigateToTestDataAction.java @@ -116,8 +116,7 @@ public class NavigateToTestDataAction extends AnAction implements TestTreeViewAc final UAnnotation annotation = UastContextKt.toUElement(AnnotationUtil.findAnnotationInHierarchy(uClass.getJavaPsi(), Collections.singleton(JUnitUtil.RUN_WITH)), UAnnotation.class); if (annotation == null) return null; UExpression value = annotation.findAttributeValue("value"); - if (!(value instanceof UClassLiteralExpression)) return null; - UClassLiteralExpression classLiteralExpression = (UClassLiteralExpression)value; + if (!(value instanceof UClassLiteralExpression classLiteralExpression)) return null; PsiType type = classLiteralExpression.getType(); return type != null && type.equalsToText(TestFrameworkConstants.PARAMETERIZED_ANNOTATION_QUALIFIED_NAME) ? uClass.getJavaPsi() : null; } diff --git a/plugins/devkit/devkit-core/src/testAssistant/TestDataGuessByExistingFilesUtil.java b/plugins/devkit/devkit-core/src/testAssistant/TestDataGuessByExistingFilesUtil.java index edcd72fd62a7..d2236fb56007 100644 --- a/plugins/devkit/devkit-core/src/testAssistant/TestDataGuessByExistingFilesUtil.java +++ b/plugins/devkit/devkit-core/src/testAssistant/TestDataGuessByExistingFilesUtil.java @@ -168,11 +168,10 @@ public final class TestDataGuessByExistingFilesUtil { ProgressManager.checkCanceled(); Object[] elements = gotoModel.getElementsByName(name, false, name); for (Object element : elements) { - if (!(element instanceof PsiFileSystemItem)) { + if (!(element instanceof PsiFileSystemItem psiFile)) { continue; } - PsiFileSystemItem psiFile = (PsiFileSystemItem)element; if (normalizedTestDataPath != null) { PsiFileSystemItem containingDirectory = psiFile.getParent(); if (containingDirectory != null) { diff --git a/plugins/devkit/devkit-core/src/testAssistant/TestDataLineMarkerProvider.java b/plugins/devkit/devkit-core/src/testAssistant/TestDataLineMarkerProvider.java index e82909fea674..7985da628b71 100644 --- a/plugins/devkit/devkit-core/src/testAssistant/TestDataLineMarkerProvider.java +++ b/plugins/devkit/devkit-core/src/testAssistant/TestDataLineMarkerProvider.java @@ -149,8 +149,7 @@ public final class TestDataLineMarkerProvider extends LineMarkerProviderDescript if (value != null) { final Project project = owner.getProject(); final Object constantValue = value.evaluate(); - if (constantValue instanceof String) { - String path = (String)constantValue; + if (constantValue instanceof String path) { if (path.contains(TestFrameworkConstants.CONTENT_ROOT_VARIABLE)) { final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex(); final VirtualFile file = owner.getContainingFile().getVirtualFile(); diff --git a/plugins/devkit/devkit-core/src/util/PsiUtil.java b/plugins/devkit/devkit-core/src/util/PsiUtil.java index 282aaf061d7d..ed76537ba314 100644 --- a/plugins/devkit/devkit-core/src/util/PsiUtil.java +++ b/plugins/devkit/devkit-core/src/util/PsiUtil.java @@ -125,13 +125,11 @@ public final class PsiUtil { final UExpression singleExpression = ContainerUtil.getOnlyItem(expressions); if (singleExpression == null) return null; - if (!(singleExpression instanceof UReturnExpression)) return null; - UReturnExpression uReturnExpression = (UReturnExpression)singleExpression; + if (!(singleExpression instanceof UReturnExpression uReturnExpression)) return null; final UExpression returnValue = uReturnExpression.getReturnExpression(); if (returnValue == null) return null; - if (returnValue instanceof UReferenceExpression) { - UReferenceExpression referenceExpression = (UReferenceExpression)returnValue; + if (returnValue instanceof UReferenceExpression referenceExpression) { final UElement uElement = UResolvableKt.resolveToUElement(referenceExpression); final UField uField = ObjectUtils.tryCast(uElement, UField.class); if (uField != null && uField.isFinal()) { @@ -140,8 +138,7 @@ public final class PsiUtil { return ObjectUtils.tryCast(uElement, UExpression.class); } - else if (returnValue instanceof UCallExpression) { - UCallExpression uCallExpression = (UCallExpression)returnValue; + else if (returnValue instanceof UCallExpression uCallExpression) { final PsiMethod psiMethod = uCallExpression.resolve(); if (psiMethod == null) return null; return getReturnedExpression(psiMethod); diff --git a/plugins/devkit/intellij.devkit.i18n/src/PluginXmlCapitalizationInspection.java b/plugins/devkit/intellij.devkit.i18n/src/PluginXmlCapitalizationInspection.java index b198c5a6eaa6..42ed2f21f6dc 100644 --- a/plugins/devkit/intellij.devkit.i18n/src/PluginXmlCapitalizationInspection.java +++ b/plugins/devkit/intellij.devkit.i18n/src/PluginXmlCapitalizationInspection.java @@ -129,9 +129,8 @@ public class PluginXmlCapitalizationInspection extends DevKitPluginXmlInspection private static void checkExtension(Extension extension, DomElementAnnotationHolder holder) { for (DomChildrenDescription child : extension.getGenericInfo().getFixedChildrenDescriptions()) { for (DomElement value : child.getValues(extension)) { - if (!value.exists() || !(value instanceof GenericDomValue)) continue; + if (!value.exists() || !(value instanceof GenericDomValue genericDomValue)) continue; - GenericDomValue genericDomValue = (GenericDomValue)value; checkDomValue(extension, holder, child, genericDomValue); } } @@ -185,8 +184,7 @@ public class PluginXmlCapitalizationInspection extends DevKitPluginXmlInspection ResolveResult[] resolveResults = ((PropertyReference)reference).multiResolve(false); if (resolveResults.length == 1 && resolveResults[0].isValidResult()) { PsiElement element = resolveResults[0].getElement(); - if (element instanceof Property) { - final Property property = (Property)element; + if (element instanceof Property property) { String value = property.getValue(); highlightCapitalization(holder, genericDomValue, value, capitalization, property); return; diff --git a/plugins/devkit/intellij.devkit.i18n/src/PluginXmlI18nInspection.java b/plugins/devkit/intellij.devkit.i18n/src/PluginXmlI18nInspection.java index c3bcbcb5e672..303d73d2ccf9 100644 --- a/plugins/devkit/intellij.devkit.i18n/src/PluginXmlI18nInspection.java +++ b/plugins/devkit/intellij.devkit.i18n/src/PluginXmlI18nInspection.java @@ -291,8 +291,7 @@ public class PluginXmlI18nInspection extends DevKitPluginXmlInspectionBase { @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { PsiElement psiElement = descriptor.getPsiElement(); - if (!(psiElement instanceof XmlTag)) return; - XmlTag xmlTag = (XmlTag)psiElement; + if (!(psiElement instanceof XmlTag xmlTag)) return; choosePropertiesFileAndExtract(project, Collections.singletonList(xmlTag), selection -> { @@ -455,8 +454,7 @@ public class PluginXmlI18nInspection extends DevKitPluginXmlInspectionBase { @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof XmlTag)) return; - XmlTag tag = (XmlTag)element; + if (!(element instanceof XmlTag tag)) return; doFix(project, myPropertiesFile, Collections.singletonList(tag)); } diff --git a/plugins/devkit/intellij.devkit.themes/src/ThemeAnnotator.java b/plugins/devkit/intellij.devkit.themes/src/ThemeAnnotator.java index dfb8ea49a241..e6db900799a6 100644 --- a/plugins/devkit/intellij.devkit.themes/src/ThemeAnnotator.java +++ b/plugins/devkit/intellij.devkit.themes/src/ThemeAnnotator.java @@ -16,10 +16,9 @@ public class ThemeAnnotator implements Annotator { @Override public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { - if (!(element instanceof JsonProperty)) return; + if (!(element instanceof JsonProperty property)) return; if (!ThemeJsonUtil.isThemeFilename(holder.getCurrentAnnotationSession().getFile().getName())) return; - JsonProperty property = (JsonProperty)element; if (property.getValue() instanceof JsonObject) return; // do not check intermediary keys if (!ThemeJsonUtil.isInsideUiProperty(property)) return; diff --git a/plugins/devkit/intellij.devkit.themes/src/ThemeJsonNamedColorPsiReferenceProvider.java b/plugins/devkit/intellij.devkit.themes/src/ThemeJsonNamedColorPsiReferenceProvider.java index 77bfb9169e39..0a770dd05080 100644 --- a/plugins/devkit/intellij.devkit.themes/src/ThemeJsonNamedColorPsiReferenceProvider.java +++ b/plugins/devkit/intellij.devkit.themes/src/ThemeJsonNamedColorPsiReferenceProvider.java @@ -15,13 +15,11 @@ import org.jetbrains.annotations.NotNull; class ThemeJsonNamedColorPsiReferenceProvider extends PsiReferenceProvider { @Override public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) { - if (!(element instanceof JsonLiteral)) return PsiReference.EMPTY_ARRAY; + if (!(element instanceof JsonLiteral literal)) return PsiReference.EMPTY_ARRAY; - JsonLiteral literal = (JsonLiteral)element; PsiElement parent = literal.getParent(); - if (!(parent instanceof JsonProperty)) return PsiReference.EMPTY_ARRAY; + if (!(parent instanceof JsonProperty property)) return PsiReference.EMPTY_ARRAY; - JsonProperty property = (JsonProperty)parent; if (property.getValue() != literal) return PsiReference.EMPTY_ARRAY; return new PsiReference[]{new ThemeJsonNamedColorPsiReference(literal)}; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java index 004eb541c6b5..26384b412cff 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java @@ -55,8 +55,7 @@ public final class EclipseClasspathStorageProvider implements ClasspathStoragePr public void assertCompatible(@NotNull final ModuleRootModel model) throws ConfigurationException { final String moduleName = model.getModule().getName(); for (OrderEntry entry : model.getOrderEntries()) { - if (entry instanceof LibraryOrderEntry) { - final LibraryOrderEntry libraryEntry = (LibraryOrderEntry)entry; + if (entry instanceof LibraryOrderEntry libraryEntry) { if (libraryEntry.isModuleLevel()) { final Library library = libraryEntry.getLibrary(); if (library == null || diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java index a80f625913fa..5cba5b69ff03 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java @@ -89,8 +89,7 @@ public class EclipseClasspathWriter { } setExported(orderEntry, ((ExportableOrderEntry)entry)); } - else if (entry instanceof LibraryOrderEntry) { - final LibraryOrderEntry libraryOrderEntry = (LibraryOrderEntry)entry; + else if (entry instanceof LibraryOrderEntry libraryOrderEntry) { final String libraryName = libraryOrderEntry.getLibraryName(); if (libraryOrderEntry.isModuleLevel()) { final String[] files = libraryOrderEntry.getRootUrls(OrderRootType.CLASSES); diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/IdeaSpecificSettings.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/IdeaSpecificSettings.java index 285ff6099654..3d0d98d366c5 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/IdeaSpecificSettings.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/IdeaSpecificSettings.java @@ -134,10 +134,9 @@ public final class IdeaSpecificSettings { isModified = true; } } - if (!(entry instanceof LibraryOrderEntry)) continue; + if (!(entry instanceof LibraryOrderEntry libraryEntry)) continue; Element element = new Element("lib"); - LibraryOrderEntry libraryEntry = (LibraryOrderEntry)entry; String libraryName = ((LibraryOrderEntry)entry).getLibraryName(); if (libraryName == null) { diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseCodeStyleImportStep.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseCodeStyleImportStep.java index ca9e0feede2b..67f8217f036b 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseCodeStyleImportStep.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseCodeStyleImportStep.java @@ -137,8 +137,7 @@ public class EclipseCodeStyleImportStep extends ProjectImportWizardStep { private List getCodeStylesList() { List codeStyleDataList = new ArrayList<>(); ProjectBuilder builder = getWizardContext().getProjectBuilder(); - if (builder instanceof EclipseImportBuilder) { - EclipseImportBuilder eclipseImportBuilder = (EclipseImportBuilder)builder; + if (builder instanceof EclipseImportBuilder eclipseImportBuilder) { for (String projectPath : eclipseImportBuilder.getParameters().projectsToConvert) { String projectName = EclipseProjectFinder.findProjectName(projectPath); if (projectName != null) { diff --git a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/action/OpenEmojiPickerAction.java b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/action/OpenEmojiPickerAction.java index 206c14d61a55..a5b63de1cbfe 100644 --- a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/action/OpenEmojiPickerAction.java +++ b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/action/OpenEmojiPickerAction.java @@ -65,9 +65,8 @@ public class OpenEmojiPickerAction extends DumbAwareAction { ); } - if (component instanceof JTextComponent) { + if (component instanceof JTextComponent field) { if (findOnly) return Context.FOUND; - JTextComponent field = (JTextComponent)component; Document doc = field.getDocument(); return new Context( s -> { diff --git a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiListPanel.java b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiListPanel.java index c5da839af441..b0e6cbd67561 100644 --- a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiListPanel.java +++ b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiListPanel.java @@ -305,10 +305,9 @@ class EmojiListPanel extends JBScrollPane { } private void paintNoEmojiFound(Graphics g) { - if (g instanceof Graphics2D) { + if (g instanceof Graphics2D g2) { int x = (getWidth() - myNoEmojiFoundImage.getWidth(this)) / 2; int y = (getHeight() - myNoEmojiFoundImage.getHeight(this)) / 2; - Graphics2D g2 = (Graphics2D)g; final Composite saveComposite = g2.getComposite(); g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, 0.5F)); StartupUiUtil.drawImage(g, myNoEmojiFoundImage, x, y, null); diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerateToStringWorker.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerateToStringWorker.java index ba7cfce05532..d2747816898d 100644 --- a/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerateToStringWorker.java +++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerateToStringWorker.java @@ -203,8 +203,7 @@ public class GenerateToStringWorker { */ private void afterCreateToStringMethod(PsiMethod method, Map params, TemplateResource template) { PsiFile containingFile = clazz.getContainingFile(); - if (containingFile instanceof PsiJavaFile) { - final PsiJavaFile javaFile = (PsiJavaFile)containingFile; + if (containingFile instanceof PsiJavaFile javaFile) { if (params.get("autoImportPackages") != null) { // keep this for old user templates autoImportPackages(javaFile, params.get("autoImportPackages")); diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/element/ElementUtils.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/element/ElementUtils.java index 61fdd128df46..cdec93d434dc 100644 --- a/plugins/generate-tostring/src/org/jetbrains/java/generate/element/ElementUtils.java +++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/element/ElementUtils.java @@ -42,9 +42,8 @@ public final class ElementUtils { List fieldElementList = new ArrayList<>(); for (PsiMember member : members) { - if (member instanceof PsiField) { - PsiField field = (PsiField) member; - FieldElement fe = ElementFactory.newFieldElement(field, useAccessors); + if (member instanceof PsiField field) { + FieldElement fe = ElementFactory.newFieldElement(field, useAccessors); if (selectedNotNullMembers.contains(member)) { fe.setNotNull(true); } @@ -65,9 +64,8 @@ public final class ElementUtils { List methodElementList = new ArrayList<>(); for (PsiMember member : members) { - if (member instanceof PsiMethod) { - PsiMethod method = (PsiMethod) member; - MethodElement me = ElementFactory.newMethodElement(method); + if (member instanceof PsiMethod method) { + MethodElement me = ElementFactory.newMethodElement(method); methodElementList.add(me); } } diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java index 1b6b4c7ddcea..3b960cd58ddd 100644 --- a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java +++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java @@ -244,9 +244,7 @@ public final class TemplateResource implements Serializable { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof TemplateResource)) return false; - - TemplateResource that = (TemplateResource)o; + if (!(o instanceof TemplateResource that)) return false; return fileName.equals(that.fileName) && template.equals(that.template); } diff --git a/plugins/git4idea/src/git4idea/GitRevisionNumber.java b/plugins/git4idea/src/git4idea/GitRevisionNumber.java index fb8854ee7396..3170d39e17e4 100644 --- a/plugins/git4idea/src/git4idea/GitRevisionNumber.java +++ b/plugins/git4idea/src/git4idea/GitRevisionNumber.java @@ -80,8 +80,7 @@ public class GitRevisionNumber implements ShortVcsRevisionNumber { public int compareTo(VcsRevisionNumber crev) { if (this == crev) return 0; - if (crev instanceof GitRevisionNumber) { - GitRevisionNumber other = (GitRevisionNumber)crev; + if (crev instanceof GitRevisionNumber other) { if (myRevisionHash.equals(other.myRevisionHash)) { return 0; } diff --git a/plugins/git4idea/src/git4idea/config/GitVersion.java b/plugins/git4idea/src/git4idea/config/GitVersion.java index f6ea4b7f86a5..00c26664a18c 100644 --- a/plugins/git4idea/src/git4idea/config/GitVersion.java +++ b/plugins/git4idea/src/git4idea/config/GitVersion.java @@ -215,10 +215,9 @@ public final class GitVersion implements Comparable { */ @Override public boolean equals(Object obj) { - if (!(obj instanceof GitVersion)) { + if (!(obj instanceof GitVersion other)) { return false; } - GitVersion other = (GitVersion) obj; if (compareTo(other) != 0) { return false; } diff --git a/plugins/git4idea/src/git4idea/push/GitPushTarget.java b/plugins/git4idea/src/git4idea/push/GitPushTarget.java index 990b6ad8f1f9..415a39b719ae 100644 --- a/plugins/git4idea/src/git4idea/push/GitPushTarget.java +++ b/plugins/git4idea/src/git4idea/push/GitPushTarget.java @@ -148,9 +148,7 @@ public class GitPushTarget implements PushTarget { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof GitPushTarget)) return false; - - GitPushTarget target = (GitPushTarget)o; + if (!(o instanceof GitPushTarget target)) return false; if (myIsNewBranchCreated != target.myIsNewBranchCreated) return false; if (!myRemoteBranch.equals(target.myRemoteBranch)) return false; diff --git a/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java b/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java index 0e0554e510f9..0c25c9b5fdd4 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java +++ b/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java @@ -163,8 +163,7 @@ public class GitInteractiveRebaseEditorHandler implements GitRebaseEditorHandler ) { List messages = new ArrayList<>(); for (GitRebaseTodoModel.Element element : rebaseTodoModel.getElements()) { - if (element.getType() instanceof GitRebaseTodoModel.Type.NonUnite.KeepCommit.Reword) { - GitRebaseTodoModel.Type.NonUnite.KeepCommit.Reword type = (GitRebaseTodoModel.Type.NonUnite.KeepCommit.Reword)element.getType(); + if (element.getType() instanceof GitRebaseTodoModel.Type.NonUnite.KeepCommit.Reword type) { messages.add(RewordedCommitMessageMapping.fromMapping( fullMessageGetter.apply(element.getEntry()), type.getNewMessage() diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java index 5d3111d868dd..1fab724e9127 100644 --- a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java +++ b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java @@ -174,8 +174,7 @@ public class GitBranchPopupActions { @Nullable private static AnAction createRepositoryRebaseAction(@NotNull AnAction rebaseAction, @NotNull GitRepository repository) { - if (!(rebaseAction instanceof GitOngoingOperationAction)) return null; - GitOngoingOperationAction ongoingAction = (GitOngoingOperationAction)rebaseAction; + if (!(rebaseAction instanceof GitOngoingOperationAction ongoingAction)) return null; DumbAwareAction repositoryAction = new MyOngoindOperationAnAction(ongoingAction, repository); repositoryAction.getTemplatePresentation().copyFrom(rebaseAction.getTemplatePresentation()); return repositoryAction; diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java index 69b9d6c54c89..bd6d0bae2a5c 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java +++ b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java @@ -281,9 +281,8 @@ public final class GitUpdateProcess { GitUpdater updater = updaters.get(repository); Collection changes = changesUnderRoots.get(repository.getRoot()); LOG.debug("Changes under root '" + getShortRepositoryName(repository) + "': " + changes); - if (updater instanceof GitRebaseUpdater && changes != null && !changes.isEmpty()) { + if (updater instanceof GitRebaseUpdater rebaseUpdater && changes != null && !changes.isEmpty()) { // check only if there are local changes, otherwise stash won't happen anyway and there would be no optimization - GitRebaseUpdater rebaseUpdater = (GitRebaseUpdater) updater; if (rebaseUpdater.fastForwardMerge()) { continue; } diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/GithubServerPath.java b/plugins/github/src/org/jetbrains/plugins/github/api/GithubServerPath.java index adf688b102cf..5bc785c03cc7 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/GithubServerPath.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/GithubServerPath.java @@ -196,8 +196,7 @@ public final class GithubServerPath implements ServerPath { public boolean equals(Object o, boolean ignoreProtocol) { if (this == o) return true; - if (!(o instanceof GithubServerPath)) return false; - GithubServerPath path = (GithubServerPath)o; + if (!(o instanceof GithubServerPath path)) return false; return (ignoreProtocol || Objects.equals(myUseHttp, path.myUseHttp)) && Objects.equals(myHost, path.myHost) && Objects.equals(myPort, path.myPort) && diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueBase.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueBase.java index 7fc204872a72..61d8d6410426 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueBase.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueBase.java @@ -187,8 +187,7 @@ public abstract class GithubIssueBase { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof GithubIssueBase)) return false; - GithubIssueBase base = (GithubIssueBase)o; + if (!(o instanceof GithubIssueBase base)) return false; return number.equals(base.number); } diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueLabel.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueLabel.java index 2fcb8f8b6343..6447a8b598e4 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueLabel.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubIssueLabel.java @@ -46,9 +46,7 @@ public class GithubIssueLabel { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof GithubIssueLabel)) return false; - - GithubIssueLabel label = (GithubIssueLabel)o; + if (!(o instanceof GithubIssueLabel label)) return false; if (!id.equals(label.id)) return false; diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoBasic.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoBasic.java index a433651cbaf2..a96029a0e5f2 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoBasic.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubRepoBasic.java @@ -85,8 +85,7 @@ public class GithubRepoBasic { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof GithubRepoBasic)) return false; - GithubRepoBasic basic = (GithubRepoBasic)o; + if (!(o instanceof GithubRepoBasic basic)) return false; return id.equals(basic.id); } diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUser.java b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUser.java index b576c4258d1c..984701119cf5 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUser.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GithubUser.java @@ -65,8 +65,7 @@ public class GithubUser { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof GithubUser)) return false; - GithubUser user = (GithubUser)o; + if (!(o instanceof GithubUser user)) return false; return id.equals(user.id); } diff --git a/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepository.java b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepository.java index 9fc40c7fd6e5..b2ecba05e696 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepository.java +++ b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepository.java @@ -355,9 +355,8 @@ final class GithubRepository extends BaseRepository { @Override public boolean equals(Object o) { if (!super.equals(o)) return false; - if (!(o instanceof GithubRepository)) return false; + if (!(o instanceof GithubRepository that)) return false; - GithubRepository that = (GithubRepository)o; if (!Objects.equals(getRepoAuthor(), that.getRepoAuthor())) return false; if (!Objects.equals(getRepoName(), that.getRepoName())) return false; if (!Comparing.equal(isAssignedIssuesOnly(), that.isAssignedIssuesOnly())) return false; diff --git a/plugins/gradle/java/src/documentation/GradleDocumentationProvider.java b/plugins/gradle/java/src/documentation/GradleDocumentationProvider.java index d6b3437f0ad9..3699cf150432 100644 --- a/plugins/gradle/java/src/documentation/GradleDocumentationProvider.java +++ b/plugins/gradle/java/src/documentation/GradleDocumentationProvider.java @@ -65,16 +65,13 @@ public class GradleDocumentationProvider implements DocumentationProvider { @Nullable private static @NlsSafe String findDoc(@Nullable PsiElement element, Object argValue) { String result = null; - if (element instanceof GrLiteral) { - GrLiteral grLiteral = (GrLiteral)element; + if (element instanceof GrLiteral grLiteral) { PsiElement stmt = PsiTreeUtil.findFirstParent(grLiteral, psiElement -> psiElement instanceof GrCall); - if (stmt instanceof GrCall) { - GrCall grCall = (GrCall)stmt; + if (stmt instanceof GrCall grCall) { PsiMethod psiMethod = grCall.resolveMethod(); if (psiMethod != null && psiMethod.getContainingClass() != null) { String qualifiedName = psiMethod.getContainingClass().getQualifiedName(); - if (grLiteral.getParent() instanceof GrNamedArgument) { - GrNamedArgument namedArgument = (GrNamedArgument)grLiteral.getParent(); + if (grLiteral.getParent() instanceof GrNamedArgument namedArgument) { String key = StringUtil.join(new String[]{ "gradle.documentation", qualifiedName, diff --git a/plugins/gradle/java/src/execution/build/GradleProjectTaskRunner.java b/plugins/gradle/java/src/execution/build/GradleProjectTaskRunner.java index 394cbf002dd7..1aa0999806bf 100644 --- a/plugins/gradle/java/src/execution/build/GradleProjectTaskRunner.java +++ b/plugins/gradle/java/src/execution/build/GradleProjectTaskRunner.java @@ -274,8 +274,7 @@ public class GradleProjectTaskRunner extends ProjectTaskRunner { if (!GradleProjectSettings.isDelegatedBuildEnabled(module)) return false; return isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, module); } - if (projectTask instanceof BuildTask) { - BuildTask buildTask = (BuildTask)projectTask; + if (projectTask instanceof BuildTask buildTask) { for (GradleBuildTasksProvider buildTasksProvider : GradleBuildTasksProvider.EP_NAME.getExtensions()) { if (buildTasksProvider.isApplicable(buildTask)) return true; } diff --git a/plugins/gradle/java/src/execution/build/TasksExecutionSettingsBuilder.java b/plugins/gradle/java/src/execution/build/TasksExecutionSettingsBuilder.java index 3c64870d6fb9..f82f878e4a43 100644 --- a/plugins/gradle/java/src/execution/build/TasksExecutionSettingsBuilder.java +++ b/plugins/gradle/java/src/execution/build/TasksExecutionSettingsBuilder.java @@ -126,9 +126,8 @@ public class TasksExecutionSettingsBuilder { List affectedModules = new SmartList<>(); Map rootPathsMap = FactoryMap.create(module -> notNullize(resolveProjectPath(module))); for (ProjectTask projectTask : projectTasks) { - if (!(projectTask instanceof ModuleBuildTask)) continue; + if (!(projectTask instanceof ModuleBuildTask moduleBuildTask)) continue; - ModuleBuildTask moduleBuildTask = (ModuleBuildTask)projectTask; collectAffectedModules(affectedModules, moduleBuildTask); Module module = moduleBuildTask.getModule(); @@ -220,9 +219,8 @@ public class TasksExecutionSettingsBuilder { if (ContainerUtil.isEmpty(tasks)) return; for (ProjectTask projectTask : tasks) { - if (!(projectTask instanceof ProjectModelBuildTask)) continue; + if (!(projectTask instanceof ProjectModelBuildTask projectModelBuildTask)) continue; - ProjectModelBuildTask projectModelBuildTask = (ProjectModelBuildTask)projectTask; for (GradleBuildTasksProvider buildTasksProvider : GradleBuildTasksProvider.EP_NAME.getExtensions()) { if (buildTasksProvider.isApplicable(projectModelBuildTask)) { buildTasksProvider.addBuildTasks( diff --git a/plugins/gradle/java/src/execution/test/runner/GradleTestRunConfigurationProducer.java b/plugins/gradle/java/src/execution/test/runner/GradleTestRunConfigurationProducer.java index cd2f0500cb75..6b97c08f9a31 100644 --- a/plugins/gradle/java/src/execution/test/runner/GradleTestRunConfigurationProducer.java +++ b/plugins/gradle/java/src/execution/test/runner/GradleTestRunConfigurationProducer.java @@ -121,10 +121,8 @@ public abstract class GradleTestRunConfigurationProducer extends RunConfiguratio ) { RunnerAndConfigurationSettings template = context.getRunManager().getConfigurationTemplate(getConfigurationFactory()); final RunConfiguration original = template.getConfiguration(); - if (original instanceof ExternalSystemRunConfiguration - && configuration instanceof ExternalSystemRunConfiguration) { - ExternalSystemRunConfiguration originalRC = (ExternalSystemRunConfiguration)original; - ExternalSystemRunConfiguration configurationRC = (ExternalSystemRunConfiguration)configuration; + if (original instanceof ExternalSystemRunConfiguration originalRC + && configuration instanceof ExternalSystemRunConfiguration configurationRC) { String currentParams = configurationRC.getSettings().getScriptParameters(); String defaultParams = originalRC.getSettings().getScriptParameters(); diff --git a/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleManager.java b/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleManager.java index 383b3e538f0d..30020bd0d294 100644 --- a/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleManager.java +++ b/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleManager.java @@ -110,8 +110,7 @@ public class GradleTestsExecutionConsoleManager else { configuration = settings.getConfiguration(); } - if (!(configuration instanceof ExternalSystemRunConfiguration)) return null; - ExternalSystemRunConfiguration externalSystemRunConfiguration = (ExternalSystemRunConfiguration)configuration; + if (!(configuration instanceof ExternalSystemRunConfiguration externalSystemRunConfiguration)) return null; if (consoleProperties == null) { consoleProperties = new GradleConsoleProperties(externalSystemRunConfiguration, env.getExecutor()); @@ -263,8 +262,7 @@ public class GradleTestsExecutionConsoleManager @Override public boolean isApplicableFor(@NotNull ExternalSystemTask task) { - if (task instanceof ExternalSystemExecuteTaskTask) { - var taskTask = (ExternalSystemExecuteTaskTask)task; + if (task instanceof ExternalSystemExecuteTaskTask taskTask) { if (StringUtil.equals(taskTask.getExternalSystemId().getId(), GradleConstants.SYSTEM_ID.getId())) { if (hasTestOption(taskTask) || hasTestTasks(taskTask)) { taskTask.putUserData(RUN_TASK_AS_TEST, true); diff --git a/plugins/gradle/java/src/execution/test/runner/OpenGradleTestResultActionProvider.java b/plugins/gradle/java/src/execution/test/runner/OpenGradleTestResultActionProvider.java index 130e914df18d..5d65c0481ed5 100644 --- a/plugins/gradle/java/src/execution/test/runner/OpenGradleTestResultActionProvider.java +++ b/plugins/gradle/java/src/execution/test/runner/OpenGradleTestResultActionProvider.java @@ -72,8 +72,7 @@ public class OpenGradleTestResultActionProvider implements ToggleModelActionProv @Nullable private String getReportFilePath() { final AbstractProperty.AbstractPropertyContainer properties = getProperties(); - if (properties instanceof GradleConsoleProperties) { - GradleConsoleProperties gradleConsoleProperties = (GradleConsoleProperties)properties; + if (properties instanceof GradleConsoleProperties gradleConsoleProperties) { final File testReport = gradleConsoleProperties.getGradleTestReport(); if (testReport != null && testReport.isFile()) return testReport.getPath(); } diff --git a/plugins/gradle/java/src/findUsages/GradlePropertyReferencesSearcher.java b/plugins/gradle/java/src/findUsages/GradlePropertyReferencesSearcher.java index 9d0a75b67507..2442505adb83 100644 --- a/plugins/gradle/java/src/findUsages/GradlePropertyReferencesSearcher.java +++ b/plugins/gradle/java/src/findUsages/GradlePropertyReferencesSearcher.java @@ -27,13 +27,11 @@ public class GradlePropertyReferencesSearcher extends QueryExecutorBase consumer) { final PsiElement element = queryParameters.getElementToSearch(); - if (element instanceof Property + if (element instanceof Property property && isContainingFileGradlePropertyFile(element.getContainingFile()) && queryParameters.getEffectiveSearchScope() instanceof GlobalSearchScope ) { - final Property property = (Property)element; - if (property.getName() == null) { return; } diff --git a/plugins/gradle/java/src/projectView/GradleTreeStructureProvider.java b/plugins/gradle/java/src/projectView/GradleTreeStructureProvider.java index b267ca63cb0d..411560e78614 100644 --- a/plugins/gradle/java/src/projectView/GradleTreeStructureProvider.java +++ b/plugins/gradle/java/src/projectView/GradleTreeStructureProvider.java @@ -123,12 +123,10 @@ public class GradleTreeStructureProvider implements TreeStructureProvider, DumbA ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex(); for (AbstractTreeNode child : children) { Pair parentNodePair = null; - if (child instanceof ProjectViewModuleGroupNode) { - final ProjectViewModuleGroupNode groupNode = (ProjectViewModuleGroupNode)child; + if (child instanceof ProjectViewModuleGroupNode groupNode) { final Collection> groupNodeChildren = groupNode.getChildren(); for (final AbstractTreeNode node : groupNodeChildren) { - if (node instanceof PsiDirectoryNode) { - final PsiDirectoryNode psiDirectoryNode = (PsiDirectoryNode)node; + if (node instanceof PsiDirectoryNode psiDirectoryNode) { final PsiDirectory psiDirectory = psiDirectoryNode.getValue(); if (psiDirectory == null) { parentNodePair = null; diff --git a/plugins/gradle/java/src/service/project/wizard/AbstractGradleModuleBuilder.java b/plugins/gradle/java/src/service/project/wizard/AbstractGradleModuleBuilder.java index 72580bd68d1b..40426f58f436 100644 --- a/plugins/gradle/java/src/service/project/wizard/AbstractGradleModuleBuilder.java +++ b/plugins/gradle/java/src/service/project/wizard/AbstractGradleModuleBuilder.java @@ -526,8 +526,7 @@ public abstract class AbstractGradleModuleBuilder extends AbstractExternalModule @Nullable @Override public ModuleWizardStep modifySettingsStep(@NotNull SettingsStep settingsStep) { - if (settingsStep instanceof ProjectSettingsStep) { - final ProjectSettingsStep projectSettingsStep = (ProjectSettingsStep)settingsStep; + if (settingsStep instanceof ProjectSettingsStep projectSettingsStep) { if (myProjectId != null) { final ModuleNameLocationSettings nameLocationSettings = settingsStep.getModuleNameLocationSettings(); String artifactId = myProjectId.getArtifactId(); diff --git a/plugins/gradle/java/src/service/resolve/GradleClosureSamParameterEnhancer.java b/plugins/gradle/java/src/service/resolve/GradleClosureSamParameterEnhancer.java index 64cdd61bd0e2..2f69eb18385c 100644 --- a/plugins/gradle/java/src/service/resolve/GradleClosureSamParameterEnhancer.java +++ b/plugins/gradle/java/src/service/resolve/GradleClosureSamParameterEnhancer.java @@ -23,8 +23,7 @@ public class GradleClosureSamParameterEnhancer extends ClosureSamParameterEnhanc if (file == null || !FileUtilRt.extensionEquals(file.getName(), GradleConstants.EXTENSION)) return null; PsiType psiType = super.getClosureParameterType(expression, index); - if (psiType instanceof PsiWildcardType) { - PsiWildcardType wildcardType = (PsiWildcardType)psiType; + if (psiType instanceof PsiWildcardType wildcardType) { if (wildcardType.isSuper() && wildcardType.getBound() != null && wildcardType.getBound().equalsToText(GradleCommonClassNames.GRADLE_API_SOURCE_SET)) { return wildcardType.getBound(); diff --git a/plugins/gradle/java/src/service/resolve/dsl/GradleDslAnnotator.java b/plugins/gradle/java/src/service/resolve/dsl/GradleDslAnnotator.java index ce3a9521dd4f..04985b03399c 100644 --- a/plugins/gradle/java/src/service/resolve/dsl/GradleDslAnnotator.java +++ b/plugins/gradle/java/src/service/resolve/dsl/GradleDslAnnotator.java @@ -25,8 +25,7 @@ import static org.jetbrains.plugins.groovy.highlighter.GroovySyntaxHighlighter.M public class GradleDslAnnotator implements Annotator { @Override public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { - if (element instanceof GrReferenceExpression) { - GrReferenceExpression referenceExpression = (GrReferenceExpression)element; + if (element instanceof GrReferenceExpression referenceExpression) { PsiElement resolved = referenceExpression.resolve(); if (resolved instanceof OriginInfoAwareElement && diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/BuildScriptClasspathData.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/BuildScriptClasspathData.java index 720d083ac182..08e9749d9aeb 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/BuildScriptClasspathData.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/BuildScriptClasspathData.java @@ -115,9 +115,7 @@ public final class BuildScriptClasspathData extends AbstractExternalEntityData { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ClasspathEntry)) return false; - - ClasspathEntry entry = (ClasspathEntry)o; + if (!(o instanceof ClasspathEntry entry)) return false; if (!classesFile.equals(entry.classesFile)) return false; if (!javadocFile.equals(entry.javadocFile)) return false; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/Ear.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/Ear.java index 69df6a6a6a18..77e91da84a4e 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/Ear.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/Ear.java @@ -58,10 +58,9 @@ public class Ear extends Jar { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof Ear)) return false; + if (!(o instanceof Ear that)) return false; if (!super.equals(o)) return false; - Ear that = (Ear)o; if (!appDirName.equals(that.appDirName)) return false; if (!libDirName.equals(that.libDirName)) return false; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/EarConfigurationModelData.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/EarConfigurationModelData.java index 6b2964cdd215..7ed456e1abc2 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/EarConfigurationModelData.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/EarConfigurationModelData.java @@ -64,11 +64,9 @@ public final class EarConfigurationModelData extends AbstractExternalEntityData @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof EarConfigurationModelData)) return false; + if (!(o instanceof EarConfigurationModelData data)) return false; if (!super.equals(o)) return false; - EarConfigurationModelData data = (EarConfigurationModelData)o; - if (!ears.equals(data.ears)) return false; return true; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/EarResource.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/EarResource.java index 0d3196b82233..d3b62c332d62 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/EarResource.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/EarResource.java @@ -49,9 +49,8 @@ public class EarResource implements Serializable { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof EarResource)) return false; + if (!(o instanceof EarResource resource)) return false; - EarResource resource = (EarResource)o; if (!file.getPath().equals(resource.file.getPath())) return false; if (!earDirectory.equals(resource.earDirectory)) return false; if (!relativePath.equals(resource.relativePath)) return false; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/ScalaModelData.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/ScalaModelData.java index 1453e6f9dd4d..4e70507e1436 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/ScalaModelData.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/ScalaModelData.java @@ -70,11 +70,9 @@ public final class ScalaModelData extends AbstractExternalEntityData { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ScalaModelData)) return false; + if (!(o instanceof ScalaModelData data)) return false; if (!super.equals(o)) return false; - ScalaModelData data = (ScalaModelData)o; - if (scalaClasspath != null ? !scalaClasspath.equals(data.scalaClasspath) : data.scalaClasspath != null) return false; if (scalaCompileOptions != null ? !scalaCompileOptions.equals(data.scalaCompileOptions) : data.scalaCompileOptions != null) { return false; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/War.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/War.java index 8ceff0350df2..00a8d3cc2f60 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/War.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/War.java @@ -76,11 +76,9 @@ public class War extends Jar { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof War)) return false; + if (!(o instanceof War war)) return false; if (!super.equals(o)) return false; - War war = (War)o; - if (!webAppDirName.equals(war.webAppDirName)) return false; if (!webResources.equals(war.webResources)) return false; if (!classpath.equals(war.classpath)) return false; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/WebConfigurationModelData.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/WebConfigurationModelData.java index 731f490c6ac1..82c2d82d28c4 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/WebConfigurationModelData.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/WebConfigurationModelData.java @@ -32,11 +32,9 @@ public final class WebConfigurationModelData extends AbstractExternalEntityData @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof WebConfigurationModelData)) return false; + if (!(o instanceof WebConfigurationModelData data)) return false; if (!super.equals(o)) return false; - WebConfigurationModelData data = (WebConfigurationModelData)o; - if (!artifacts.equals(data.artifacts)) return false; return true; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/WebResource.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/WebResource.java index c78e0b3db86f..9bf2b55f0b74 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/WebResource.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/WebResource.java @@ -49,9 +49,8 @@ public class WebResource implements Serializable { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof WebResource)) return false; + if (!(o instanceof WebResource resource)) return false; - WebResource resource = (WebResource)o; if (!file.getPath().equals(resource.file.getPath())) return false; if (warDirectory != resource.warDirectory) return false; if (!warRelativePath.equals(resource.warRelativePath)) return false; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.java index 7d42a7497c27..83c1333f6f49 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.java @@ -110,8 +110,7 @@ public class GradleInstallationManager implements Disposable { public BuildLayoutParameters guessBuildLayoutParameters(@NotNull Project project, @Nullable String projectPath) { return myBuildLayoutParametersCache.computeIfAbsent(ObjectUtils.notNull(projectPath, getDefaultProjectKey(project)), p -> { for (ExternalSystemExecutionAware executionAware : ExternalSystemExecutionAware.getExtensions(GradleConstants.SYSTEM_ID)) { - if (!(executionAware instanceof GradleExecutionAware)) continue; - GradleExecutionAware gradleExecutionAware = (GradleExecutionAware)executionAware; + if (!(executionAware instanceof GradleExecutionAware gradleExecutionAware)) continue; BuildLayoutParameters buildLayoutParameters = projectPath == null ? gradleExecutionAware.getDefaultBuildLayoutParameters(project) : gradleExecutionAware.getBuildLayoutParameters(project, projectPath); @@ -351,8 +350,7 @@ public class GradleInstallationManager implements Disposable { project = openProjects.length > 0 ? openProjects[0] : projectManager.getDefaultProject(); } for (ExternalSystemExecutionAware executionAware : ExternalSystemExecutionAware.getExtensions(GradleConstants.SYSTEM_ID)) { - if (!(executionAware instanceof GradleExecutionAware)) continue; - GradleExecutionAware gradleExecutionAware = (GradleExecutionAware)executionAware; + if (!(executionAware instanceof GradleExecutionAware gradleExecutionAware)) continue; if (gradleExecutionAware.isGradleInstallationHomeDir(project, file.getPath())) { return true; } diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleProgressEventConverter.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleProgressEventConverter.java index 86e2334e3564..032a210289f1 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleProgressEventConverter.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleProgressEventConverter.java @@ -45,8 +45,7 @@ public final class GradleProgressEventConverter { return new ExternalSystemBuildEvent( id, new StartEventImpl(eventId.id, eventId.parentId, event.getEventTime(), description)); } - else if (event instanceof StatusEvent) { - StatusEvent statusEvent = (StatusEvent)event; + else if (event instanceof StatusEvent statusEvent) { return new ExternalSystemBuildEvent(id, new ProgressBuildEventImpl( eventId.id, eventId.parentId, event.getEventTime(), description, statusEvent.getTotal(), statusEvent.getProgress(), statusEvent.getUnit())); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleProgressListener.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleProgressListener.java index 8366710aea29..a6aa0e69c668 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleProgressListener.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleProgressListener.java @@ -143,8 +143,7 @@ public class GradleProgressListener implements ProgressListener, org.gradle.tool com.intellij.openapi.externalSystem.model.task.event.OperationResult operationResult = null; if (gradleResult instanceof TestSuccessResult) { operationResult = new SuccessResultImpl(gradleResult.getStartTime(), gradleResult.getEndTime(), true); - } else if (gradleResult instanceof TestFailureResult) { - TestFailureResult gradleFailure = (TestFailureResult)gradleResult; + } else if (gradleResult instanceof TestFailureResult gradleFailure) { operationResult = new FailureResultImpl(gradleFailure.getStartTime(), gradleFailure.getEndTime(), ContainerUtil.map(gradleFailure.getFailures(), this::convert)); } else if (gradleResult instanceof TestSkippedResult) { operationResult = new SkippedResultImpl(gradleResult.getStartTime(), gradleResult.getEndTime()); @@ -251,8 +250,7 @@ public class GradleProgressListener implements ProgressListener, org.gradle.tool } } } - else if (progressEvent instanceof FinishEvent) { - FinishEvent finishEvent = (FinishEvent)progressEvent; + else if (progressEvent instanceof FinishEvent finishEvent) { StatusEvent statusEvent = myDownloadStatusEventIds.remove(operationName); if (statusEvent != null) { OperationResult operationResult = finishEvent.getResult(); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleRunConfiguration.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleRunConfiguration.java index 3de972a2b609..00cb155711fa 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleRunConfiguration.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleRunConfiguration.java @@ -139,8 +139,7 @@ public class GradleRunConfiguration extends ExternalSystemRunConfiguration imple } final SettingsEditor editor = super.getConfigurationEditor(); - if (editor instanceof SettingsEditorGroup) { - final SettingsEditorGroup group = (SettingsEditorGroup)editor; + if (editor instanceof SettingsEditorGroup group) { //noinspection unchecked group.addEditor(GradleBundle.message("gradle.settings.title"), new GradleDebugSettingsEditor()); } diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleBuildSrcProjectsResolver.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleBuildSrcProjectsResolver.java index 91a2537a1fe1..4f3c3565278f 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleBuildSrcProjectsResolver.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleBuildSrcProjectsResolver.java @@ -314,8 +314,7 @@ public final class GradleBuildSrcProjectsResolver { addSourcePaths(buildSrcRuntimeSourcesPaths, depModuleNode); } } - else if (childData instanceof LibraryDependencyData) { - LibraryDependencyData dependencyData = (LibraryDependencyData)childData; + else if (childData instanceof LibraryDependencyData dependencyData) { // exclude generated gradle-api jar the gradle api classes/sources handled separately by BuildClasspathModuleGradleDataService if (dependencyData.getExternalName().startsWith("gradle-api-")) { continue; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java index 26bda503c3e3..cde5a5c6a094 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java @@ -638,9 +638,7 @@ public final class GradleProjectResolverUtil { assert ownerModule != null; DataNode depOwnerDataNode = null; - if (mergedDependency instanceof ExternalProjectDependency) { - - final ExternalProjectDependency projectDependency = (ExternalProjectDependency)mergedDependency; + if (mergedDependency instanceof ExternalProjectDependency projectDependency) { Collection projectDependencyInfos = new ArrayList<>(); if (resolverCtx.getSettings() != null) { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectCompositeSelectorDialog.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectCompositeSelectorDialog.java index 5d530a18c0a0..83ce063f2374 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectCompositeSelectorDialog.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectCompositeSelectorDialog.java @@ -131,11 +131,9 @@ public class GradleProjectCompositeSelectorDialog extends DialogWrapper { @Override public void customizeRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { - if (!(value instanceof CheckedTreeNode)) return; - CheckedTreeNode node = (CheckedTreeNode)value; + if (!(value instanceof CheckedTreeNode node)) return; - if (!(node.getUserObject() instanceof Pair)) return; - Pair pair = (Pair)node.getUserObject(); + if (!(node.getUserObject() instanceof Pair pair)) return; ColoredTreeCellRenderer renderer = getTextRenderer(); renderer.setIcon(myExternalSystemUiAware.getProjectIcon()); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java index da6a7ded7f89..7e566c525a12 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java @@ -322,8 +322,7 @@ public final class GradleUtil { public static @NotNull GradleVersion getGradleVersion(Project project, String filePath) { ExternalSystemManager manager = ExternalSystemApiUtil.getManager(GradleConstants.SYSTEM_ID); - if (manager instanceof GradleManager) { - GradleManager gradleManager = (GradleManager)manager; + if (manager instanceof GradleManager gradleManager) { String externalProjectPath = gradleManager.getAffectedExternalProjectPath(filePath, project); if (externalProjectPath != null) { GradleSettings settings = GradleSettings.getInstance(project); diff --git a/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/TextContentImpl.java b/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/TextContentImpl.java index bdfa73de7e31..ca1bbfbf3ea1 100644 --- a/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/TextContentImpl.java +++ b/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/TextContentImpl.java @@ -87,8 +87,7 @@ class TextContentImpl extends UserDataHolderBase implements TextContent { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof TextContentImpl)) return false; - TextContentImpl that = (TextContentImpl) o; + if (!(o instanceof TextContentImpl that)) return false; return domain == that.domain && tokens.equals(that.tokens); } @@ -471,8 +470,7 @@ class TextContentImpl extends UserDataHolderBase implements TextContent { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PsiToken)) return false; - PsiToken psiToken = (PsiToken) o; + if (!(o instanceof PsiToken psiToken)) return false; return kind == psiToken.kind && psi.equals(psiToken.psi) && (kind != TokenKind.text || rangeInPsi.equals(psiToken.rangeInPsi)); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyFileIconProvider.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyFileIconProvider.java index 5bf0735dab84..74b49456d58a 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyFileIconProvider.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyFileIconProvider.java @@ -26,8 +26,7 @@ final class GroovyFileIconProvider implements FileIconProvider { public Icon getIcon(@NotNull VirtualFile virtualFile, @Iconable.IconFlags int flags, @Nullable Project project) { if (project == null || !FileTypeRegistry.getInstance().isFileOfType(virtualFile, GroovyFileType.GROOVY_FILE_TYPE)) return null; final PsiFile psiFile = PsiManager.getInstance(project).findFile(virtualFile); - if (!(psiFile instanceof GroovyFile)) return null; - final GroovyFile file = (GroovyFile)psiFile; + if (!(psiFile instanceof GroovyFile file)) return null; final Icon icon; if (file.isScript()) { icon = GroovyScriptTypeDetector.getIcon(file); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GrHighlightUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GrHighlightUtil.java index 4ff296810f17..624802ac64fe 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GrHighlightUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GrHighlightUtil.java @@ -45,11 +45,10 @@ public final class GrHighlightUtil { PsiTreeUtil.processElements(scope, new PsiElementProcessor() { @Override public boolean execute(@NotNull PsiElement element) { - if (!(element instanceof GrReferenceExpression) || ((GrReferenceExpression)element).isQualified()) { + if (!(element instanceof GrReferenceExpression ref) || ((GrReferenceExpression)element).isQualified()) { return true; } - GrReferenceExpression ref = (GrReferenceExpression)element; if (isWriteAccess(ref)) { PsiElement target = ref.resolve(); if (target instanceof GrVariable && ((GrVariable)target).getInitializerGroovy() != null || @@ -96,9 +95,8 @@ public final class GrHighlightUtil { } final PsiType type = qualifier.getType(); - if (type instanceof PsiClassType && + if (type instanceof PsiClassType classType && !(qualifier instanceof GrReferenceExpression && ((GrReferenceExpression)qualifier).resolve() instanceof GroovyScriptClass)) { - final PsiClassType classType = (PsiClassType)type; final PsiClass psiClass = classType.resolve(); if (psiClass instanceof GroovyScriptClass) { return true; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java index d0c2495cc031..444ee0056b38 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java @@ -323,8 +323,7 @@ public final class GroovyAnnotator extends GroovyElementVisitor { private void checkFinalParameterAccess(GrReferenceExpression ref) { final PsiElement resolved = ref.resolve(); - if (resolved instanceof GrParameter) { - final GrParameter parameter = (GrParameter)resolved; + if (resolved instanceof GrParameter parameter) { if (parameter.isPhysical() && parameter.hasModifierProperty(PsiModifier.FINAL) && PsiUtil.isLValue(ref)) { if (parameter.getDeclarationScope() instanceof PsiMethod) { myHolder.newAnnotation(HighlightSeverity.ERROR, GroovyBundle.message("cannot.assign.a.value.to.final.parameter.0", parameter.getName())).create(); @@ -336,8 +335,7 @@ public final class GroovyAnnotator extends GroovyElementVisitor { private void checkFinalFieldAccess(@NotNull GrReferenceExpression ref) { final PsiElement resolved = ref.resolve(); - if (resolved instanceof GrField && resolved.isPhysical() && ((GrField)resolved).hasModifierProperty(PsiModifier.FINAL) && PsiUtil.isLValue(ref)) { - final GrField field = (GrField)resolved; + if (resolved instanceof GrField field && resolved.isPhysical() && ((GrField)resolved).hasModifierProperty(PsiModifier.FINAL) && PsiUtil.isLValue(ref)) { final PsiClass containingClass = field.getContainingClass(); if (containingClass != null && PsiTreeUtil.isAncestor(containingClass, ref, true)) { @@ -600,8 +598,7 @@ public final class GroovyAnnotator extends GroovyElementVisitor { @Override public void visitOpenBlock(@NotNull GrOpenBlock block) { PsiElement blockParent = block.getParent(); - if (blockParent instanceof GrMethod) { - final GrMethod method = (GrMethod)blockParent; + if (blockParent instanceof GrMethod method) { if (GrTraitUtil.isMethodAbstract(method)) { String message = GroovyBundle.message("abstract.methods.must.not.have.body"); AnnotationBuilder builder = @@ -880,8 +877,7 @@ public final class GroovyAnnotator extends GroovyElementVisitor { final PsiType type = value.getType(); if (type != null) { final GrParameterListOwner owner = PsiTreeUtil.getParentOfType(returnStatement, GrParameterListOwner.class); - if (owner instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)owner; + if (owner instanceof PsiMethod method) { if (method.isConstructor()) { myHolder.newAnnotation(HighlightSeverity.ERROR, GroovyBundle.message("cannot.return.from.constructor")).range(value).create(); } @@ -991,8 +987,7 @@ public final class GroovyAnnotator extends GroovyElementVisitor { if (parent instanceof GrMethod) { checkMethodDefinitionModifiers(myHolder, (GrMethod)parent); } - else if (parent instanceof GrVariableDeclaration) { - GrVariableDeclaration declaration = (GrVariableDeclaration)parent; + else if (parent instanceof GrVariableDeclaration declaration) { if (isFieldDeclaration(declaration)) { checkFieldModifiers(myHolder, declaration); } @@ -1243,8 +1238,7 @@ public final class GroovyAnnotator extends GroovyElementVisitor { if (refElement == null) return; final PsiElement element = refElement.resolve(); - if (element instanceof PsiClass) { - PsiClass clazz = (PsiClass)element; + if (element instanceof PsiClass clazz) { if (clazz.hasModifierProperty(PsiModifier.ABSTRACT)) { if (newExpression.getAnonymousClassDefinition() == null) { String message = clazz.isInterface() @@ -1823,8 +1817,7 @@ public final class GroovyAnnotator extends GroovyElementVisitor { checkModifierIsNotAllowed(modifiersList, PsiModifier.NATIVE, GroovyBundle.message("script.cannot.have.modifier.native"), holder); } //type definition methods - else if (method.getParent() != null && method.getParent().getParent() instanceof GrTypeDefinition) { - GrTypeDefinition containingTypeDef = ((GrTypeDefinition)method.getParent().getParent()); + else if (method.getParent() != null && method.getParent().getParent() instanceof GrTypeDefinition containingTypeDef) { if (containingTypeDef.isTrait()) { checkModifierIsNotAllowed(modifiersList, PsiModifier.PROTECTED, GroovyBundle.message("trait.method.cannot.be.protected"), holder); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/checkers/FieldAnnotationChecker.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/checkers/FieldAnnotationChecker.java index 96d82e665e2a..1c17cbb7e599 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/checkers/FieldAnnotationChecker.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/checkers/FieldAnnotationChecker.java @@ -49,11 +49,10 @@ public class FieldAnnotationChecker extends CustomAnnotationChecker { PsiElement annoParent = annotation.getParent(); PsiElement ownerToUse = annoParent instanceof PsiModifierList ? annoParent.getParent() : annoParent; - if (!(ownerToUse instanceof GrVariableDeclaration)) { + if (!(ownerToUse instanceof GrVariableDeclaration declaration)) { return false; } else { - GrVariableDeclaration declaration = (GrVariableDeclaration)ownerToUse; if (declaration.getVariables().length != 1 || !PsiUtil.isLocalVariable(declaration.getVariables()[0])) { return false; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/QuickfixUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/QuickfixUtil.java index 8b46a1dcec1d..3156ec9ed914 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/QuickfixUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/QuickfixUtil.java @@ -56,9 +56,8 @@ public final class QuickfixUtil { //todo: look more carefully GrExpression qualifierExpression = refExpr.getQualifierExpression(); - if (!(qualifierExpression instanceof GrReferenceExpression)) return false; + if (!(qualifierExpression instanceof GrReferenceExpression referenceExpression)) return false; - GrReferenceExpression referenceExpression = (GrReferenceExpression)qualifierExpression; GroovyPsiElement resolvedElement = ResolveUtil.resolveProperty(referenceExpression, referenceExpression.getReferenceName()); if (resolvedElement == null) return false; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/elements/DItemElement.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/elements/DItemElement.java index 0c975ef587f9..a21bdcd75cc1 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/elements/DItemElement.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/elements/DItemElement.java @@ -78,8 +78,7 @@ public abstract class DItemElement implements DNamedElement, DTypedElement, Comp @Override public int compareTo(Object o) { - if (!(o instanceof DItemElement)) return 0; - final DItemElement otherProperty = (DItemElement)o; + if (!(o instanceof DItemElement otherProperty)) return 0; return getName().compareTo(otherProperty.getName()) + getType().compareTo(otherProperty.getType()); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovyFix.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovyFix.java index a1c3a3f66158..1bf78d096cbf 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovyFix.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovyFix.java @@ -82,8 +82,7 @@ public abstract class GroovyFix implements LocalQuickFix { * unwraps surrounding blocks from newStatement. */ protected static void replaceStatement(GrStatement oldStatement, GrStatement newStatement) throws IncorrectOperationException { - if (newStatement instanceof GrBlockStatement) { - GrBlockStatement blockStatement = (GrBlockStatement)newStatement; + if (newStatement instanceof GrBlockStatement blockStatement) { final GrOpenBlock openBlock = blockStatement.getBlock(); final GrStatement[] statements = openBlock.getStatements(); if (statements.length == 0) { @@ -91,8 +90,7 @@ public abstract class GroovyFix implements LocalQuickFix { } else { final PsiElement parent = oldStatement.getParent(); - if (parent instanceof GrStatementOwner) { - GrStatementOwner statementOwner = (GrStatementOwner)parent; + if (parent instanceof GrStatementOwner statementOwner) { for (GrStatement statement : statements) { statementOwner.addStatementBefore(statement, oldStatement); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java index 8539815334ca..c69e922298cd 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java @@ -142,11 +142,9 @@ public class GroovyAssignmentCanBeOperatorAssignmentInspection @NotNull ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof GrAssignmentExpression)) { + if (!(element instanceof GrAssignmentExpression expression)) { return; } - final GrAssignmentExpression expression = - (GrAssignmentExpression) element; final String newExpression = calculateReplacementExpression(expression); replaceExpression(expression, newExpression); @@ -164,10 +162,9 @@ public class GroovyAssignmentCanBeOperatorAssignmentInspection } final GrExpression lhs = assignment.getLValue(); final GrExpression rhs = (GrExpression)PsiUtil.skipParentheses(assignment.getRValue(), false); - if (!(rhs instanceof GrBinaryExpression)) { + if (!(rhs instanceof GrBinaryExpression binaryRhs)) { return; } - final GrBinaryExpression binaryRhs = (GrBinaryExpression) rhs; if (binaryRhs.getRightOperand() == null) { return; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovySillyAssignmentInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovySillyAssignmentInspection.java index 35208a9b4a53..485da66a5752 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovySillyAssignmentInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovySillyAssignmentInspection.java @@ -54,11 +54,9 @@ public class GroovySillyAssignmentInspection extends BaseInspection { if (rhs == null) { return; } - if (!(rhs instanceof GrReferenceExpression) || !(lhs instanceof GrReferenceExpression)) { + if (!(rhs instanceof GrReferenceExpression rhsReference) || !(lhs instanceof GrReferenceExpression lhsReference)) { return; } - final GrReferenceExpression rhsReference = (GrReferenceExpression) rhs; - final GrReferenceExpression lhsReference = (GrReferenceExpression) lhs; final GrExpression rhsQualifier = rhsReference.getQualifierExpression(); final GrExpression lhsQualifier = lhsReference.getQualifierExpression(); if (rhsQualifier != null || lhsQualifier != null) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyUncheckedAssignmentOfMemberOfRawTypeInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyUncheckedAssignmentOfMemberOfRawTypeInspection.java index 52c285be0b4f..f5f09d990285 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyUncheckedAssignmentOfMemberOfRawTypeInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyUncheckedAssignmentOfMemberOfRawTypeInspection.java @@ -47,8 +47,7 @@ public class GroovyUncheckedAssignmentOfMemberOfRawTypeInspection extends BaseIn final PsiType type = value.getType(); if (type != null) { final GrParameterListOwner owner = PsiTreeUtil.getParentOfType(returnStatement, GrParameterListOwner.class); - if (owner instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)owner; + if (owner instanceof PsiMethod method) { if (!method.isConstructor()) { final PsiType methodType = method.getReturnType(); final PsiType returnType = value.getType(); @@ -116,8 +115,7 @@ public class GroovyUncheckedAssignmentOfMemberOfRawTypeInspection extends BaseIn PsiType rType = rValue.getType(); // For assignments with spread dot - if (PsiImplUtil.isSpreadAssignment(lValue) && lType instanceof PsiClassType) { - final PsiClassType pct = (PsiClassType)lType; + if (PsiImplUtil.isSpreadAssignment(lValue) && lType instanceof PsiClassType pct) { final PsiClass clazz = pct.resolve(); if (clazz != null && CommonClassNames.JAVA_UTIL_LIST.equals(clazz.getQualifiedName())) { final PsiType[] types = pct.getParameters(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GrAccessibilityChecker.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GrAccessibilityChecker.java index b4700838f55f..39b3b16b2d8f 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GrAccessibilityChecker.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GrAccessibilityChecker.java @@ -54,8 +54,7 @@ public class GrAccessibilityChecker { @SuppressWarnings("MagicConstant") static GroovyFix[] buildFixes(PsiElement location, GroovyResolveResult resolveResult) { final PsiElement element = resolveResult.getElement(); - if (!(element instanceof PsiMember)) return GroovyFix.EMPTY_ARRAY; - final PsiMember refElement = (PsiMember)element; + if (!(element instanceof PsiMember refElement)) return GroovyFix.EMPTY_ARRAY; if (refElement instanceof PsiCompiledElement) return GroovyFix.EMPTY_ARRAY; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/NewInstanceOfSingletonInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/NewInstanceOfSingletonInspection.java index 4569bfb329d0..37cf62bb7ccc 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/NewInstanceOfSingletonInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/NewInstanceOfSingletonInspection.java @@ -64,17 +64,13 @@ public class NewInstanceOfSingletonInspection extends BaseInspection { @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) throws IncorrectOperationException { PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof GrNewExpression)) return; - - GrNewExpression newExpression = (GrNewExpression)element; + if (!(element instanceof GrNewExpression newExpression)) return; GrCodeReferenceElement refElement = newExpression.getReferenceElement(); if (refElement == null) return; PsiElement resolved = refElement.resolve(); - if (!(resolved instanceof GrTypeDefinition)) return; - - GrTypeDefinition singleton = (GrTypeDefinition)resolved; + if (!(resolved instanceof GrTypeDefinition singleton)) return; PsiAnnotation annotation = AnnotationUtil.findAnnotation(singleton, GROOVY_LANG_SINGLETON); if (annotation == null) return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/RecursionUtils.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/RecursionUtils.java index 6b7f885665c0..54e526a9e3c1 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/RecursionUtils.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/RecursionUtils.java @@ -58,9 +58,7 @@ class RecursionUtils { statement instanceof GrAssertStatement || statement instanceof GrVariableDeclaration) { return false; - } else if (statement instanceof GrReturnStatement) { - final GrReturnStatement returnStatement = - (GrReturnStatement) statement; + } else if (statement instanceof GrReturnStatement returnStatement) { final GrExpression returnValue = returnStatement.getReturnValue(); if (returnValue != null) { if (expressionDefinitelyRecurses(returnValue, method)) { @@ -78,9 +76,7 @@ class RecursionUtils { final GrCodeBlock body = ((GrSynchronizedStatement) statement) .getBody(); return codeBlockMayReturnBeforeRecursing(body, method, false); - } else if (statement instanceof GrBlockStatement) { - final GrBlockStatement blockStatement = - (GrBlockStatement) statement; + } else if (statement instanceof GrBlockStatement blockStatement) { final GrCodeBlock codeBlock = blockStatement.getBlock(); return codeBlockMayReturnBeforeRecursing(codeBlock, method, false); } else if (statement instanceof GrIfStatement) { @@ -385,8 +381,7 @@ class RecursionUtils { private static boolean methodCallExpressionDefinitelyRecurses( GrMethodCallExpression exp, GrMethod method) { final GrExpression invoked = exp.getInvokedExpression(); - if (invoked instanceof GrReferenceExpression) { - final GrReferenceExpression methodExpression = (GrReferenceExpression) invoked; + if (invoked instanceof GrReferenceExpression methodExpression) { final PsiMethod referencedMethod = exp.resolveMethod(); if (referencedMethod == null) { return false; @@ -419,13 +414,9 @@ class RecursionUtils { statement instanceof GrThrowStatement || statement instanceof GrAssertStatement) { return false; - } else if (statement instanceof GrExpression) { - final GrExpression expression = - (GrExpression) statement; + } else if (statement instanceof GrExpression expression) { return expressionDefinitelyRecurses(expression, method); - } else if (statement instanceof GrVariableDeclaration) { - final GrVariableDeclaration declaration = - (GrVariableDeclaration) statement; + } else if (statement instanceof GrVariableDeclaration declaration) { final GrVariable[] declaredElements = declaration.getVariables(); for (final GrVariable variable : declaredElements) { @@ -435,9 +426,7 @@ class RecursionUtils { } } return false; - } else if (statement instanceof GrReturnStatement) { - final GrReturnStatement returnStatement = - (GrReturnStatement) statement; + } else if (statement instanceof GrReturnStatement returnStatement) { final GrExpression returnValue = returnStatement.getReturnValue(); if (returnValue != null) { if (expressionDefinitelyRecurses(returnValue, method)) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/RecursionVisitor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/RecursionVisitor.java index 2ade2a5fba05..778a33b89377 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/RecursionVisitor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/RecursionVisitor.java @@ -54,10 +54,9 @@ class RecursionVisitor extends GroovyRecursiveElementVisitor { super.visitMethodCallExpression(call); final GrExpression methodExpression = call.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression referenceExpression)) { return; } - final GrReferenceExpression referenceExpression = (GrReferenceExpression) methodExpression; final String calledMethodName = referenceExpression.getReferenceName(); if (calledMethodName == null) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/changeToOperator/ChangeToOperatorInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/changeToOperator/ChangeToOperatorInspection.java index ff0ecd2e76ac..3c1995020340 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/changeToOperator/ChangeToOperatorInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/changeToOperator/ChangeToOperatorInspection.java @@ -40,9 +40,8 @@ public class ChangeToOperatorInspection extends BaseInspection { @Override public void visitMethodCallExpression(@NotNull GrMethodCallExpression methodCall) { final GrExpression invokedExpression = methodCall.getInvokedExpression(); - if (!(invokedExpression instanceof GrReferenceExpression)) return; + if (!(invokedExpression instanceof GrReferenceExpression referenceExpression)) return; - final GrReferenceExpression referenceExpression = (GrReferenceExpression)invokedExpression; if (referenceExpression.getDotTokenType() != GroovyTokenTypes.mDOT) return; final PsiElement highlightElement = referenceExpression.getReferenceNameElement(); @@ -105,8 +104,7 @@ public class ChangeToOperatorInspection extends BaseInspection { PsiElement call = descriptor.getPsiElement().getParent(); if (call == null) return; call = call.getParent(); - if (!(call instanceof GrMethodCall)) return; - GrMethodCall methodCall = (GrMethodCall) call; + if (!(call instanceof GrMethodCall methodCall)) return; GrExpression invokedExpression = methodCall.getInvokedExpression(); if (!(invokedExpression instanceof GrReferenceExpression)) return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyDoubleNegationInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyDoubleNegationInspection.java index 85d586e48fcf..b80bf618e8fb 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyDoubleNegationInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyDoubleNegationInspection.java @@ -61,16 +61,14 @@ public class GroovyDoubleNegationInspection extends BaseInspection { protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) throws IncorrectOperationException { final GrUnaryExpression expression = (GrUnaryExpression)descriptor.getPsiElement(); GrExpression operand = (GrExpression)PsiUtil.skipParentheses(expression.getOperand(), false); - if (operand instanceof GrUnaryExpression) { - final GrUnaryExpression prefixExpression = (GrUnaryExpression)operand; + if (operand instanceof GrUnaryExpression prefixExpression) { final GrExpression innerOperand = prefixExpression.getOperand(); if (innerOperand == null) { return; } replaceExpression(expression, innerOperand.getText()); } - else if (operand instanceof GrBinaryExpression) { - final GrBinaryExpression binaryExpression = (GrBinaryExpression)operand; + else if (operand instanceof GrBinaryExpression binaryExpression) { final GrExpression lhs = binaryExpression.getLeftOperand(); final String lhsText = lhs.getText(); final StringBuilder builder = new StringBuilder(lhsText); @@ -116,10 +114,9 @@ public class GroovyDoubleNegationInspection extends BaseInspection { while (parent instanceof GrParenthesizedExpression) { parent = parent.getParent(); } - if (!(parent instanceof GrUnaryExpression)) { + if (!(parent instanceof GrUnaryExpression prefixExpression)) { return; } - final GrUnaryExpression prefixExpression = (GrUnaryExpression)parent; final IElementType parentTokenType = prefixExpression.getOperationTokenType(); if (!T_NOT.equals(parentTokenType)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyEmptyStatementBodyInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyEmptyStatementBodyInspection.java index d4f3b5fd5639..bd4a67c622ac 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyEmptyStatementBodyInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyEmptyStatementBodyInspection.java @@ -92,10 +92,9 @@ public class GroovyEmptyStatementBodyInspection extends BaseInspection { } private static boolean isEmpty(GroovyPsiElement body) { - if (!(body instanceof GrBlockStatement)) { + if (!(body instanceof GrBlockStatement block)) { return false; } - final GrBlockStatement block = (GrBlockStatement)body; final GrOpenBlock openBlock = block.getBlock(); final PsiElement brace = openBlock.getLBrace(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexArithmeticExpressionInspectionBase.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexArithmeticExpressionInspectionBase.java index 6f31015e6061..f147a38f6a49 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexArithmeticExpressionInspectionBase.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexArithmeticExpressionInspectionBase.java @@ -94,17 +94,14 @@ public class GroovyOverlyComplexArithmeticExpressionInspectionBase extends BaseI if (!isArithmetic(expression)) { return 1; } - if (expression instanceof GrBinaryExpression) { - final GrBinaryExpression binaryExpression = (GrBinaryExpression) expression; + if (expression instanceof GrBinaryExpression binaryExpression) { final GrExpression lhs = binaryExpression.getLeftOperand(); final GrExpression rhs = binaryExpression.getRightOperand(); return countTerms(lhs) + countTerms(rhs); - } else if (expression instanceof GrUnaryExpression) { - final GrUnaryExpression unaryExpression = (GrUnaryExpression) expression; + } else if (expression instanceof GrUnaryExpression unaryExpression) { final GrExpression operand = unaryExpression.getOperand(); return countTerms(operand); - } else if (expression instanceof GrParenthesizedExpression) { - final GrParenthesizedExpression parenthesizedExpression = (GrParenthesizedExpression) expression; + } else if (expression instanceof GrParenthesizedExpression parenthesizedExpression) { final GrExpression contents = parenthesizedExpression.getOperand(); return countTerms(contents); } @@ -120,17 +117,14 @@ public class GroovyOverlyComplexArithmeticExpressionInspectionBase extends BaseI } private boolean isArithmetic(GrExpression expression) { - if (expression instanceof GrBinaryExpression) { + if (expression instanceof GrBinaryExpression binaryExpression) { - final GrBinaryExpression binaryExpression = (GrBinaryExpression) expression; final IElementType sign = binaryExpression.getOperationTokenType(); return arithmeticTokens.contains(sign); - } else if (expression instanceof GrUnaryExpression) { - final GrUnaryExpression unaryExpression = (GrUnaryExpression) expression; + } else if (expression instanceof GrUnaryExpression unaryExpression) { final IElementType sign = unaryExpression.getOperationTokenType(); return arithmeticTokens.contains(sign); - } else if (expression instanceof GrParenthesizedExpression) { - final GrParenthesizedExpression parenthesizedExpression = (GrParenthesizedExpression) expression; + } else if (expression instanceof GrParenthesizedExpression parenthesizedExpression) { final GrExpression contents = parenthesizedExpression.getOperand(); return isArithmetic(contents); } @@ -141,9 +135,8 @@ public class GroovyOverlyComplexArithmeticExpressionInspectionBase extends BaseI if (isString(expression)) { return true; } - if (expression instanceof GrBinaryExpression) { + if (expression instanceof GrBinaryExpression binaryExpression) { - final GrBinaryExpression binaryExpression = (GrBinaryExpression) expression; final GrExpression lhs = binaryExpression.getLeftOperand(); if (containsStringConcatenation(lhs)) { @@ -151,12 +144,10 @@ public class GroovyOverlyComplexArithmeticExpressionInspectionBase extends BaseI } final GrExpression rhs = binaryExpression.getRightOperand(); return containsStringConcatenation(rhs); - } else if (expression instanceof GrUnaryExpression) { - final GrUnaryExpression unaryExpression = (GrUnaryExpression) expression; + } else if (expression instanceof GrUnaryExpression unaryExpression) { final GrExpression operand = unaryExpression.getOperand(); return containsStringConcatenation(operand); - } else if (expression instanceof GrParenthesizedExpression) { - final GrParenthesizedExpression parenthesizedExpression = (GrParenthesizedExpression) expression; + } else if (expression instanceof GrParenthesizedExpression parenthesizedExpression) { final GrExpression contents = parenthesizedExpression.getOperand(); return containsStringConcatenation(contents); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexBooleanExpressionInspectionBase.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexBooleanExpressionInspectionBase.java index dff8c57c9592..9e89e6751455 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexBooleanExpressionInspectionBase.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexBooleanExpressionInspectionBase.java @@ -76,17 +76,14 @@ public class GroovyOverlyComplexBooleanExpressionInspectionBase extends BaseInsp if (!isBoolean(expression)) { return 1; } - if (expression instanceof GrBinaryExpression) { - final GrBinaryExpression binaryExpression = (GrBinaryExpression) expression; + if (expression instanceof GrBinaryExpression binaryExpression) { final GrExpression lhs = binaryExpression.getLeftOperand(); final GrExpression rhs = binaryExpression.getRightOperand(); return countTerms(lhs) + countTerms(rhs); - } else if (expression instanceof GrUnaryExpression) { - final GrUnaryExpression prefixExpression = (GrUnaryExpression) expression; + } else if (expression instanceof GrUnaryExpression prefixExpression) { final GrExpression operand = prefixExpression.getOperand(); return countTerms(operand); - } else if (expression instanceof GrParenthesizedExpression) { - final GrParenthesizedExpression parenthesizedExpression = (GrParenthesizedExpression) expression; + } else if (expression instanceof GrParenthesizedExpression parenthesizedExpression) { final GrExpression contents = parenthesizedExpression.getOperand(); return countTerms(contents); } @@ -102,17 +99,14 @@ public class GroovyOverlyComplexBooleanExpressionInspectionBase extends BaseInsp } private boolean isBoolean(GrExpression expression) { - if (expression instanceof GrBinaryExpression) { - final GrBinaryExpression binaryExpression = (GrBinaryExpression) expression; + if (expression instanceof GrBinaryExpression binaryExpression) { final IElementType sign = binaryExpression.getOperationTokenType(); return GroovyTokenTypes.mLAND.equals(sign) || GroovyTokenTypes.mLOR.equals(sign); - } else if (expression instanceof GrUnaryExpression) { - final GrUnaryExpression prefixExpression = (GrUnaryExpression) expression; + } else if (expression instanceof GrUnaryExpression prefixExpression) { final IElementType sign = prefixExpression.getOperationTokenType(); return GroovyTokenTypes.mLNOT.equals(sign); - } else if (expression instanceof GrParenthesizedExpression) { - final GrParenthesizedExpression parenthesizedExpression = (GrParenthesizedExpression) expression; + } else if (expression instanceof GrParenthesizedExpression parenthesizedExpression) { final GrExpression contents = parenthesizedExpression.getOperand(); return isBoolean(contents); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/ConditionalUtils.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/ConditionalUtils.java index 6704a0407106..afffb102af1b 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/ConditionalUtils.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/ConditionalUtils.java @@ -31,8 +31,7 @@ class ConditionalUtils { } public static GrStatement stripBraces(GrStatement branch) { - if (branch instanceof GrBlockStatement) { - final GrBlockStatement block = (GrBlockStatement) branch; + if (branch instanceof GrBlockStatement block) { final GrStatement[] statements = block.getBlock().getStatements(); if (statements.length == 1) { return statements[0]; @@ -48,11 +47,9 @@ class ConditionalUtils { if (statement == null) { return false; } - if (!(statement instanceof GrReturnStatement)) { + if (!(statement instanceof GrReturnStatement returnStatement)) { return false; } - final GrReturnStatement returnStatement = - (GrReturnStatement) statement; final GrExpression returnValue = returnStatement.getReturnValue(); if (returnValue == null) { return false; @@ -65,11 +62,9 @@ class ConditionalUtils { if (statement == null) { return false; } - if (!(statement instanceof GrAssignmentExpression)) { + if (!(statement instanceof GrAssignmentExpression assignment)) { return false; } - final GrAssignmentExpression assignment = - (GrAssignmentExpression) statement; final GrExpression rhs = assignment.getRValue(); if (rhs == null) { return false; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeConditionalCallInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeConditionalCallInspection.java index c682fe7403c1..210fcfbae446 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeConditionalCallInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeConditionalCallInspection.java @@ -68,10 +68,9 @@ public class GroovyConditionalCanBeConditionalCallInspection extends BaseInspect } else { branch = expression.getElseBranch(); } - if (!(branch instanceof GrMethodCallExpression)) { + if (!(branch instanceof GrMethodCallExpression call)) { return; } - final GrMethodCallExpression call = (GrMethodCallExpression)branch; final GrReferenceExpression methodExpression = (GrReferenceExpression) call.getInvokedExpression(); final GrExpression qualifier = methodExpression.getQualifierExpression(); if (qualifier == null) { @@ -104,10 +103,9 @@ public class GroovyConditionalCanBeConditionalCallInspection extends BaseInspect return; } condition = (GrExpression)PsiUtil.skipParentheses(condition, false); - if (!(condition instanceof GrBinaryExpression)) { + if (!(condition instanceof GrBinaryExpression binaryCondition)) { return; } - final GrBinaryExpression binaryCondition = (GrBinaryExpression) condition; final GrExpression lhs = binaryCondition.getLeftOperand(); final GrExpression rhs = binaryCondition.getRightOperand(); if (rhs == null) { @@ -129,15 +127,13 @@ public class GroovyConditionalCanBeConditionalCallInspection extends BaseInspect } private static boolean isCallTargeting(GrExpression call, GrExpression expression) { - if (!(call instanceof GrMethodCallExpression)) { + if (!(call instanceof GrMethodCallExpression callExpression)) { return false; } - final GrMethodCallExpression callExpression = (GrMethodCallExpression) call; final GrExpression methodExpression = callExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression referenceExpression)) { return false; } - final GrReferenceExpression referenceExpression = (GrReferenceExpression) methodExpression; if (!GroovyTokenTypes.mDOT.equals(referenceExpression.getDotTokenType())) { return false; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java index 8c519124646f..4df0cb2e95a0 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java @@ -165,9 +165,8 @@ public class GroovyConditionalCanBeElvisInspection extends BaseInspection { } private static boolean checkForNull(GrExpression condition, GrExpression then) { - if (!(condition instanceof GrBinaryExpression)) return false; + if (!(condition instanceof GrBinaryExpression binaryExpression)) return false; - GrBinaryExpression binaryExpression = (GrBinaryExpression)condition; if (GroovyTokenTypes.mNOT_EQUAL != binaryExpression.getOperationTokenType()) return false; GrExpression left = binaryExpression.getLeftOperand(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalWithIdenticalBranchesInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalWithIdenticalBranchesInspection.java index ec16f6c7f9b7..08e4d4a92f07 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalWithIdenticalBranchesInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalWithIdenticalBranchesInspection.java @@ -52,8 +52,7 @@ public class GroovyConditionalWithIdenticalBranchesInspection extends BaseInspec PsiElement element = descriptor.getPsiElement(); if (element == null) return; final PsiElement parent = element.getParent(); - if (!(parent instanceof GrConditionalExpression)) return; - final GrConditionalExpression expression = (GrConditionalExpression)parent; + if (!(parent instanceof GrConditionalExpression expression)) return; final GrExpression thenBranch = expression.getThenBranch(); replaceExpression(expression, thenBranch.getText()); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithTooManyBranchesInspectionBase.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithTooManyBranchesInspectionBase.java index 12f5f818dc3a..3842eb7fc849 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithTooManyBranchesInspectionBase.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithTooManyBranchesInspectionBase.java @@ -50,8 +50,7 @@ public class GroovyIfStatementWithTooManyBranchesInspectionBase extends BaseInsp public void visitIfStatement(@NotNull GrIfStatement statement) { super.visitIfStatement(statement); final PsiElement parent = statement.getParent(); - if (parent instanceof GrIfStatement) { - final GrIfStatement parentStatement = (GrIfStatement) parent; + if (parent instanceof GrIfStatement parentStatement) { final GrStatement elseBranch = parentStatement.getElseBranch(); if (statement.equals(elseBranch)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialIfInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialIfInspection.java index 8cab7e26e69b..26a3443707e7 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialIfInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialIfInspection.java @@ -281,11 +281,10 @@ public class GroovyTrivialIfInspection extends BaseInspection { thenBranch = ConditionalUtils.stripBraces(thenBranch); final PsiElement nextStatement = PsiTreeUtil.skipWhitespacesForward(ifStatement); - if (!(nextStatement instanceof GrStatement)) { + if (!(nextStatement instanceof GrStatement elseBranch)) { return false; } - final GrStatement elseBranch = (GrStatement) nextStatement; return ConditionalUtils.isReturn(thenBranch, "true") && ConditionalUtils.isReturn(elseBranch, "false"); } @@ -299,10 +298,9 @@ public class GroovyTrivialIfInspection extends BaseInspection { final PsiElement nextStatement = PsiTreeUtil.skipWhitespacesForward(ifStatement); - if (!(nextStatement instanceof GrStatement)) { + if (!(nextStatement instanceof GrStatement elseBranch)) { return false; } - final GrStatement elseBranch = (GrStatement) nextStatement; return ConditionalUtils.isReturn(thenBranch, "false") && ConditionalUtils.isReturn(elseBranch, "true"); } @@ -383,10 +381,9 @@ public class GroovyTrivialIfInspection extends BaseInspection { thenBranch = ConditionalUtils.stripBraces(thenBranch); final PsiElement nextStatement = PsiTreeUtil.skipWhitespacesBackward(ifStatement); - if (!(nextStatement instanceof GrStatement)) { + if (!(nextStatement instanceof GrStatement elseBranch)) { return false; } - GrStatement elseBranch = (GrStatement) nextStatement; elseBranch = ConditionalUtils.stripBraces(elseBranch); if (ConditionalUtils.isAssignment(thenBranch, "true") && @@ -417,10 +414,9 @@ public class GroovyTrivialIfInspection extends BaseInspection { thenBranch = ConditionalUtils.stripBraces(thenBranch); final PsiElement nextStatement = PsiTreeUtil.skipWhitespacesBackward(ifStatement); - if (!(nextStatement instanceof GrStatement)) { + if (!(nextStatement instanceof GrStatement elseBranch)) { return false; } - GrStatement elseBranch = (GrStatement) nextStatement; elseBranch = ConditionalUtils.stripBraces(elseBranch); if (ConditionalUtils.isAssignment(thenBranch, "false") && diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/finalVar/GrFinalVariableAccessInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/finalVar/GrFinalVariableAccessInspection.java index 277e202733e2..50097ced911d 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/finalVar/GrFinalVariableAccessInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/finalVar/GrFinalVariableAccessInspection.java @@ -96,8 +96,7 @@ public class GrFinalVariableAccessInspection extends BaseInspection { super.visitReferenceExpression(ref); final PsiElement resolved = ref.resolve(); - if (resolved instanceof GrField && ((GrField)resolved).hasModifierProperty(PsiModifier.FINAL)) { - final GrField field = (GrField)resolved; + if (resolved instanceof GrField field && ((GrField)resolved).hasModifierProperty(PsiModifier.FINAL)) { final PsiClass containingClass = field.getContainingClass(); if (PsiUtil.isLValue(ref)) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/dataflow/GroovyVariableCanBeFinalInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/dataflow/GroovyVariableCanBeFinalInspection.java index ecfa51dace9e..758544d1aec8 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/dataflow/GroovyVariableCanBeFinalInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/dataflow/GroovyVariableCanBeFinalInspection.java @@ -62,8 +62,7 @@ public final class GroovyVariableCanBeFinalInspection extends GroovyLocalInspect final Collection references = ReferencesSearch.search(variable, variable.getUseScope()).findAll(); for (final PsiReference reference : references) { final PsiElement element = reference.getElement(); - if (!(element instanceof GroovyPsiElement)) continue; - final GroovyPsiElement groovyElement = (GroovyPsiElement)element; + if (!(element instanceof GroovyPsiElement groovyElement)) continue; final GroovyPsiElement closure = PsiTreeUtil.getParentOfType(groovyElement, GrClosableBlock.class, GrAnonymousClassDefinition.class); if (closure == null || !PsiTreeUtil.isAncestor(owner, closure, false)) continue; if (PsiUtil.isLValue(groovyElement)) return true; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/dataflow/WritesCounterDFAInstance.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/dataflow/WritesCounterDFAInstance.java index 8a30c110d093..3cdfe5f0e0c6 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/dataflow/WritesCounterDFAInstance.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/dataflow/WritesCounterDFAInstance.java @@ -35,9 +35,8 @@ public final class WritesCounterDFAInstance implements DfaInstance fun(@NotNull Object2IntMap map, @NotNull Instruction instruction) { - if (!(instruction instanceof ReadWriteVariableInstruction)) return map; + if (!(instruction instanceof ReadWriteVariableInstruction rwInstruction)) return map; - final ReadWriteVariableInstruction rwInstruction = (ReadWriteVariableInstruction)instruction; if (!rwInstruction.isWrite()) return map; final GrVariable variable = getVariable(instruction.getElement()); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/declaration/GrMethodMayBeStaticInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/declaration/GrMethodMayBeStaticInspection.java index 817ee388b285..2bc8cc1c1fd8 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/declaration/GrMethodMayBeStaticInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/declaration/GrMethodMayBeStaticInspection.java @@ -176,9 +176,8 @@ public class GrMethodMayBeStaticInspection extends BaseInspection { if (myHaveInstanceRefs) return; final PsiElement resolvedElement = refElement.resolve(); - if (!(resolvedElement instanceof PsiClass)) return; + if (!(resolvedElement instanceof PsiClass aClass)) return; - final PsiClass aClass = (PsiClass)resolvedElement; final PsiElement scope = aClass.getScope(); if (!(scope instanceof PsiClass)) return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListGetCanBeKeyedAccessInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListGetCanBeKeyedAccessInspection.java index 584229245e2b..7d13d33010b6 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListGetCanBeKeyedAccessInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListGetCanBeKeyedAccessInspection.java @@ -87,10 +87,9 @@ public class GroovyListGetCanBeKeyedAccessInspection extends BaseInspection { return; } final GrExpression methodExpression = grMethodCallExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression referenceExpression)) { return; } - final GrReferenceExpression referenceExpression = (GrReferenceExpression) methodExpression; final String name = referenceExpression.getReferenceName(); if (!"get".equals(name)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListSetCanBeKeyedAccessInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListSetCanBeKeyedAccessInspection.java index 162eb3d42ad5..82ab043b5132 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListSetCanBeKeyedAccessInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListSetCanBeKeyedAccessInspection.java @@ -88,10 +88,9 @@ public class GroovyListSetCanBeKeyedAccessInspection extends BaseInspection { return; } final GrExpression methodExpression = grMethodCallExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression referenceExpression)) { return; } - final GrReferenceExpression referenceExpression = (GrReferenceExpression) methodExpression; final String name = referenceExpression.getReferenceName(); if (!"set".equals(name)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java index 3134adb400a8..76cb99579656 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java @@ -87,10 +87,9 @@ public class GroovyMapGetCanBeKeyedAccessInspection extends BaseInspection { return; } final GrExpression methodExpression = grMethodCallExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression referenceExpression)) { return; } - final GrReferenceExpression referenceExpression = (GrReferenceExpression) methodExpression; final String name = referenceExpression.getReferenceName(); if (!"get".equals(name)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java index add998a5d624..ca2cb77b3bfc 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java @@ -89,10 +89,9 @@ public class GroovyMapPutCanBeKeyedAccessInspection extends BaseInspection { return; } final GrExpression methodExpression = grMethodCallExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression referenceExpression)) { return; } - final GrReferenceExpression referenceExpression = (GrReferenceExpression) methodExpression; final String name = referenceExpression.getReferenceName(); if (!"put".equals(name)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/local/GroovyPostHighlightingPass.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/local/GroovyPostHighlightingPass.java index 3f2220cacf26..cb07e741ba13 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/local/GroovyPostHighlightingPass.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/local/GroovyPostHighlightingPass.java @@ -110,8 +110,7 @@ public class GroovyPostHighlightingPass extends TextEditorHighlightingPass { builder.registerFix(action, null, HighlightDisplayKey.getDisplayNameByKey(unusedDefKey), null, unusedDefKey); ContainerUtil.addIfNotNull(unusedDeclarations, builder.create()); } - else if (element instanceof GrMethod) { - GrMethod method = (GrMethod)element; + else if (element instanceof GrMethod method) { if (SpockUtils.isUnusedInSpock(method, usageHelper)) { usageHelper.shouldCheckContributors = false; } @@ -157,8 +156,7 @@ public class GroovyPostHighlightingPass extends TextEditorHighlightingPass { if (usedParams.get(parameter)) continue; PsiElement scope = parameter.getDeclarationScope(); - if (scope instanceof GrMethod) { - GrMethod method = (GrMethod)scope; + if (scope instanceof GrMethod method) { if (methodMayHaveUnusedParameters(method)) { PsiElement identifier = parameter.getNameIdentifierGroovy(); HighlightInfo.Builder builder = UnusedSymbolUtil diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/metrics/NestingDepthVisitor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/metrics/NestingDepthVisitor.java index 7885799bc976..0f62261a07df 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/metrics/NestingDepthVisitor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/metrics/NestingDepthVisitor.java @@ -52,8 +52,7 @@ class NestingDepthVisitor extends GroovyRecursiveElementVisitor { @Override public void visitIfStatement(@NotNull GrIfStatement statement) { boolean isAlreadyCounted = false; - if (statement.getParent() instanceof GrIfStatement) { - final GrIfStatement parent = (GrIfStatement) statement.getParent(); + if (statement.getParent() instanceof GrIfStatement parent) { assert parent != null; final GrStatement elseBranch = parent.getElseBranch(); if (statement.equals(elseBranch)) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyAccessToStaticFieldLockedOnInstanceInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyAccessToStaticFieldLockedOnInstanceInspection.java index 461e35450731..f464328e01cc 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyAccessToStaticFieldLockedOnInstanceInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyAccessToStaticFieldLockedOnInstanceInspection.java @@ -76,11 +76,9 @@ public class GroovyAccessToStaticFieldLockedOnInstanceInspection if (lockExpression instanceof GrReferenceExpression && PsiUtil.isThisReference(lockExpression)) { isLockedOnInstance = true; } - else if (lockExpression instanceof GrReferenceExpression) { - final GrReferenceExpression reference = (GrReferenceExpression) lockExpression; + else if (lockExpression instanceof GrReferenceExpression reference) { final PsiElement referent = reference.resolve(); - if (referent instanceof PsiField) { - final PsiField referentField = (PsiField) referent; + if (referent instanceof PsiField referentField) { if (referentField.hasModifierProperty(PsiModifier.STATIC)) { isLockedOnClass = true; } else { @@ -94,10 +92,9 @@ public class GroovyAccessToStaticFieldLockedOnInstanceInspection return; } final PsiElement referent = expression.resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField referredField)) { return; } - final PsiField referredField = (PsiField) referent; if (!referredField.hasModifierProperty(PsiModifier.STATIC) || isConstant(referredField)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyBusyWaitInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyBusyWaitInspection.java index 8a07532a3c5c..2c7b35ce2f08 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyBusyWaitInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyBusyWaitInspection.java @@ -47,10 +47,9 @@ public class GroovyBusyWaitInspection extends BaseInspection { super.visitMethodCallExpression(grMethodCallExpression); final GrExpression methodExpression = grMethodCallExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression reference)) { return; } - final GrReferenceExpression reference = (GrReferenceExpression) methodExpression; final String name = reference.getReferenceName(); if (!"sleep".equals(name)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyDoubleCheckedLockingInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyDoubleCheckedLockingInspection.java index 2338d9cd816c..68af47b66dcc 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyDoubleCheckedLockingInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyDoubleCheckedLockingInspection.java @@ -80,11 +80,9 @@ public class GroovyDoubleCheckedLockingInspection extends BaseInspection { return; } thenBranch = ControlFlowUtils.stripBraces(thenBranch); - if (!(thenBranch instanceof GrSynchronizedStatement)) { + if (!(thenBranch instanceof GrSynchronizedStatement syncStatement)) { return; } - final GrSynchronizedStatement syncStatement = - (GrSynchronizedStatement) thenBranch; final GrCodeBlock body = syncStatement.getBody(); if (body == null) { return; @@ -93,10 +91,9 @@ public class GroovyDoubleCheckedLockingInspection extends BaseInspection { if (statements.length != 1) { return; } - if (!(statements[0] instanceof GrIfStatement)) { + if (!(statements[0] instanceof GrIfStatement innerIf)) { return; } - final GrIfStatement innerIf = (GrIfStatement) statements[0]; final GrExpression innerCondition = innerIf.getCondition(); if (innerCondition == null) { return; @@ -115,24 +112,19 @@ public class GroovyDoubleCheckedLockingInspection extends BaseInspection { GrIfStatement statement) { GrStatement innerThen = statement.getThenBranch(); innerThen = ControlFlowUtils.stripBraces(innerThen); - if (!(innerThen instanceof GrAssignmentExpression)) { + if (!(innerThen instanceof GrAssignmentExpression assignmentExpression)) { return false; } - final GrAssignmentExpression assignmentExpression = - (GrAssignmentExpression) innerThen; final GrExpression lhs = assignmentExpression.getLValue(); - if (!(lhs instanceof GrReferenceExpression)) { + if (!(lhs instanceof GrReferenceExpression referenceExpression)) { return false; } - final GrReferenceExpression referenceExpression = - (GrReferenceExpression) lhs; final PsiElement element = referenceExpression.resolve(); - if (!(element instanceof PsiField)) { + if (!(element instanceof PsiField field)) { return false; } - final PsiField field = (PsiField) element; return field.hasModifierProperty(PsiModifier.VOLATILE); } } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyNotifyWhileNotSynchronizedInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyNotifyWhileNotSynchronizedInspection.java index 2d1aa9a1f732..795382ca3b57 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyNotifyWhileNotSynchronizedInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyNotifyWhileNotSynchronizedInspection.java @@ -53,10 +53,9 @@ public class GroovyNotifyWhileNotSynchronizedInspection extends BaseInspection { public void visitMethodCallExpression(@NotNull GrMethodCallExpression grMethodCallExpression) { super.visitMethodCallExpression(grMethodCallExpression); final GrExpression methodExpression = grMethodCallExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression reference)) { return; } - final GrReferenceExpression reference = (GrReferenceExpression) methodExpression; final String name = reference.getReferenceName(); if (!"notify".equals(name) && !"notifyAll".equals(name)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyPublicFieldAccessedInSynchronizedContextInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyPublicFieldAccessedInSynchronizedContextInspection.java index 6505df8cae66..53b9defab880 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyPublicFieldAccessedInSynchronizedContextInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyPublicFieldAccessedInSynchronizedContextInspection.java @@ -45,10 +45,9 @@ public class GroovyPublicFieldAccessedInSynchronizedContextInspection extends Ba @Override public void visitReferenceExpression(@NotNull GrReferenceExpression expression) { final PsiElement element = expression.resolve(); - if (!(element instanceof PsiField)) { + if (!(element instanceof PsiField field)) { return; } - final PsiField field = (PsiField) element; if (field.hasModifierProperty(PsiModifier.PRIVATE) || field.hasModifierProperty(PsiModifier.FINAL)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovySynchronizationOnNonFinalFieldInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovySynchronizationOnNonFinalFieldInspection.java index 3103ae896855..7cd247e0de5d 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovySynchronizationOnNonFinalFieldInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovySynchronizationOnNonFinalFieldInspection.java @@ -52,10 +52,9 @@ public class GroovySynchronizationOnNonFinalFieldInspection extends BaseInspecti return; } final PsiElement referent = ((PsiReference) lock).resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return; } - final PsiField field = (PsiField) referent; if (field.hasModifierProperty(PsiModifier.FINAL)) { return; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovySystemRunFinalizersOnExitInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovySystemRunFinalizersOnExitInspection.java index 2c85f0f080d0..cd93f1d53c47 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovySystemRunFinalizersOnExitInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovySystemRunFinalizersOnExitInspection.java @@ -46,10 +46,9 @@ public class GroovySystemRunFinalizersOnExitInspection extends BaseInspection { public void visitMethodCallExpression(@NotNull GrMethodCallExpression grMethodCallExpression) { super.visitMethodCallExpression(grMethodCallExpression); final GrExpression methodExpression = grMethodCallExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression reference)) { return; } - final GrReferenceExpression reference = (GrReferenceExpression) methodExpression; final String name = reference.getReferenceName(); if (!"runFinalizersOnExit".equals(name)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyThreadStopSuspendResumeInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyThreadStopSuspendResumeInspection.java index 7a1429024365..803bbb801d36 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyThreadStopSuspendResumeInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyThreadStopSuspendResumeInspection.java @@ -58,10 +58,9 @@ public class GroovyThreadStopSuspendResumeInspection extends BaseInspection { public void visitMethodCallExpression(@NotNull GrMethodCallExpression grMethodCallExpression) { super.visitMethodCallExpression(grMethodCallExpression); final GrExpression methodExpression = grMethodCallExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression reference)) { return; } - final GrReferenceExpression reference = (GrReferenceExpression) methodExpression; final String name = reference.getReferenceName(); if (!METHOD_NAMES.contains(name)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyUnconditionalWaitInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyUnconditionalWaitInspection.java index 9a2e0c72900e..b622350449e2 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyUnconditionalWaitInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyUnconditionalWaitInspection.java @@ -77,16 +77,13 @@ public class GroovyUnconditionalWaitInspection extends BaseInspection { return; } - if (!(statement instanceof GrMethodCallExpression)) { + if (!(statement instanceof GrMethodCallExpression methodCallExpression)) { continue; } - final GrMethodCallExpression methodCallExpression = - (GrMethodCallExpression) statement; final GrExpression methodExpression = methodCallExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression reference)) { return; } - final GrReferenceExpression reference = (GrReferenceExpression) methodExpression; final String name = reference.getReferenceName(); if (!"wait".equals(name)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWaitCallNotInLoopInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWaitCallNotInLoopInspection.java index 83cc76969278..eef467d78213 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWaitCallNotInLoopInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWaitCallNotInLoopInspection.java @@ -48,10 +48,9 @@ public class GroovyWaitCallNotInLoopInspection extends BaseInspection { public void visitMethodCallExpression(@NotNull GrMethodCallExpression grMethodCallExpression) { super.visitMethodCallExpression(grMethodCallExpression); final GrExpression methodExpression = grMethodCallExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression reference)) { return; } - final GrReferenceExpression reference = (GrReferenceExpression) methodExpression; final String name = reference.getReferenceName(); if (!"wait".equals(name)) { return; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWaitWhileNotSynchronizedInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWaitWhileNotSynchronizedInspection.java index e2950c5d861c..5bd8ad90bb38 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWaitWhileNotSynchronizedInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWaitWhileNotSynchronizedInspection.java @@ -53,11 +53,10 @@ public class GroovyWaitWhileNotSynchronizedInspection extends BaseInspection { public void visitMethodCallExpression(@NotNull GrMethodCallExpression grMethodCallExpression) { super.visitMethodCallExpression(grMethodCallExpression); final GrExpression methodExpression = grMethodCallExpression.getInvokedExpression(); - if (!(methodExpression instanceof GrReferenceExpression)) { + if (!(methodExpression instanceof GrReferenceExpression reference)) { return; } - final GrReferenceExpression reference = (GrReferenceExpression) methodExpression; - final String name = reference.getReferenceName(); + final String name = reference.getReferenceName(); if (!"wait".equals(name)) { return; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWhileLoopSpinsOnFieldInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWhileLoopSpinsOnFieldInspection.java index 79843b086f09..32a2a7268b7b 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWhileLoopSpinsOnFieldInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWhileLoopSpinsOnFieldInspection.java @@ -86,22 +86,17 @@ public class GroovyWhileLoopSpinsOnFieldInspection extends BaseInspection { return true; } - if (condition instanceof GrUnaryExpression && ((GrUnaryExpression)condition).isPostfix()) { - final GrUnaryExpression postfixExpression = (GrUnaryExpression) condition; + if (condition instanceof GrUnaryExpression postfixExpression && ((GrUnaryExpression)condition).isPostfix()) { final GrExpression operand = postfixExpression.getOperand(); return isSimpleFieldComparison(operand); } - if (condition instanceof GrUnaryExpression) { - final GrUnaryExpression unaryExpression = - (GrUnaryExpression) condition; + if (condition instanceof GrUnaryExpression unaryExpression) { final GrExpression operand = unaryExpression.getOperand(); return isSimpleFieldComparison(operand); } - if (condition instanceof GrBinaryExpression) { - final GrBinaryExpression binaryExpression = - (GrBinaryExpression) condition; + if (condition instanceof GrBinaryExpression binaryExpression) { final GrExpression lOperand = binaryExpression.getLeftOperand(); final GrExpression rOperand = binaryExpression.getRightOperand(); if (isLiteral(rOperand)) { @@ -128,21 +123,18 @@ public class GroovyWhileLoopSpinsOnFieldInspection extends BaseInspection { if (expression == null) { return false; } - if (!(expression instanceof GrReferenceExpression)) { + if (!(expression instanceof GrReferenceExpression reference)) { return false; } - final GrReferenceExpression reference = - (GrReferenceExpression) expression; final GrExpression qualifierExpression = reference.getQualifierExpression(); if (qualifierExpression != null) { return false; } final PsiElement referent = reference.resolve(); - if (!(referent instanceof PsiField)) { + if (!(referent instanceof PsiField field)) { return false; } - final PsiField field = (PsiField) referent; return !field.hasModifierProperty(PsiModifier.VOLATILE); } @@ -150,9 +142,7 @@ public class GroovyWhileLoopSpinsOnFieldInspection extends BaseInspection { if (statement == null) { return false; } - if (statement instanceof GrBlockStatement) { - final GrBlockStatement blockStatement = - (GrBlockStatement) statement; + if (statement instanceof GrBlockStatement blockStatement) { final GrOpenBlock codeBlock = blockStatement.getBlock(); final GrStatement[] codeBlockStatements = codeBlock.getStatements(); for (GrStatement codeBlockStatement : codeBlockStatements) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unused/defaultParameter/GrUnusedDefaultParameterInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unused/defaultParameter/GrUnusedDefaultParameterInspection.java index e82c257d655c..67413c948e5d 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unused/defaultParameter/GrUnusedDefaultParameterInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unused/defaultParameter/GrUnusedDefaultParameterInspection.java @@ -26,18 +26,16 @@ public class GrUnusedDefaultParameterInspection extends GroovyLocalInspectionToo @Override public void visitExpression(@NotNull GrExpression expression) { PsiElement expressionParent = expression.getParent(); - if (!(expressionParent instanceof GrParameter)) return; + if (!(expressionParent instanceof GrParameter parameter)) return; - GrParameter parameter = (GrParameter)expressionParent; if (parameter.getInitializerGroovy() != expression) return; PsiElement parameterParent = parameter.getParent(); if (!(parameterParent instanceof GrParameterList)) return; PsiElement parameterListParent = parameterParent.getParent(); - if (!(parameterListParent instanceof GrMethod)) return; + if (!(parameterListParent instanceof GrMethod method)) return; - GrMethod method = (GrMethod)parameterListParent; if (PsiUtil.OPERATOR_METHOD_NAMES.contains(method.getName())) return; if (isInitializerUnused(parameter, method)) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java index b6d8ff108c69..d3b2b43567a9 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java @@ -70,8 +70,7 @@ public final class UnusedDefInspection extends GroovyLocalInspectionBase { for (int i = 0; i < dfaResult.size(); i++) { final Instruction instruction = flow[i]; - if (instruction instanceof ReadWriteVariableInstruction) { - final ReadWriteVariableInstruction varInst = (ReadWriteVariableInstruction) instruction; + if (instruction instanceof ReadWriteVariableInstruction varInst) { if (!varInst.isWrite()) { final int descriptor = varInst.getDescriptor(); DefinitionMap e = dfaResult.get(i); @@ -104,8 +103,7 @@ public final class UnusedDefInspection extends GroovyLocalInspectionBase { if (element instanceof GrControlFlowOwner) { // don't go deeper } - else if (element instanceof GrVariable && !(element instanceof GrField)) { - GrVariable variable = (GrVariable)element; + else if (element instanceof GrVariable variable && !(element instanceof GrField)) { if (checked.contains(variable) || variable.getInitializerGroovy() != null) return; if (ReferencesSearch.search(variable, variable.getUseScope()).findFirst() == null) { process(variable, checked, problemsHolder, GroovyBundle.message("unused.variable")); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/BoolUtils.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/BoolUtils.java index 286c26eaf00a..75979e0b51ec 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/BoolUtils.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/BoolUtils.java @@ -31,10 +31,9 @@ import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; public final class BoolUtils { public static boolean isNegation(@NotNull GrExpression exp) { - if (!(exp instanceof GrUnaryExpression)) { + if (!(exp instanceof GrUnaryExpression prefixExp)) { return false; } - final GrUnaryExpression prefixExp = (GrUnaryExpression) exp; final IElementType sign = prefixExp.getOperationTokenType(); return GroovyTokenTypes.mBNOT.equals(sign); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/ControlFlowUtils.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/ControlFlowUtils.java index 79296e550ae8..3d8b4502ee2c 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/ControlFlowUtils.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/ControlFlowUtils.java @@ -85,8 +85,7 @@ public final class ControlFlowUtils { else if (statement instanceof GrBlockStatement) { return blockMayCompleteNormally((GrBlockStatement)statement); } - else if (statement instanceof GrSynchronizedStatement) { - final GrSynchronizedStatement syncStatement = (GrSynchronizedStatement)statement; + else if (statement instanceof GrSynchronizedStatement syncStatement) { return openBlockMayCompleteNormally(syncStatement.getBody()); } else if (statement instanceof GrLabeledStatement) { @@ -248,8 +247,7 @@ public final class ControlFlowUtils { public static GrStatement stripBraces(@NotNull GrStatement branch) { - if (branch instanceof GrBlockStatement) { - final GrBlockStatement block = (GrBlockStatement)branch; + if (branch instanceof GrBlockStatement block) { final GrStatement[] statements = block.getBlock().getStatements(); if (statements.length == 1) { return statements[0]; @@ -300,8 +298,7 @@ public final class ControlFlowUtils { if (container instanceof GrLoopStatement) { return false; } - else if (container instanceof GrCaseSection) { - final GrCaseSection caseSection = (GrCaseSection)container; + else if (container instanceof GrCaseSection caseSection) { if (!statementIsLastInBlock(caseSection, statementToCheck)) return false; @@ -314,13 +311,11 @@ public final class ControlFlowUtils { return false; } } - else if (container instanceof GrOpenBlock) { - final GrOpenBlock block = (GrOpenBlock)container; + else if (container instanceof GrOpenBlock block) { if (!statementIsLastInBlock(block, statementToCheck)) return false; final PsiElement parent = block.getParent(); - if (parent instanceof GrBlockStatement) { - final GrBlockStatement blockStatement = (GrBlockStatement)parent; + if (parent instanceof GrBlockStatement blockStatement) { if (blockStatement == body) return true; } } @@ -788,8 +783,7 @@ public final class ControlFlowUtils { Instruction instruction = queue.poll(); if (instruction == null) break; - if (instruction instanceof ReadWriteVariableInstruction) { - ReadWriteVariableInstruction rw = (ReadWriteVariableInstruction)instruction; + if (instruction instanceof ReadWriteVariableInstruction rw) { if (variableIndex == rw.getDescriptor()) { if (rw.isWrite()) { result.add(rw); @@ -868,8 +862,7 @@ public final class ControlFlowUtils { final PsiElement element = instruction.getElement(); if (element instanceof GrVariable && element != var) return bitSet; - if (element instanceof GrReferenceExpression) { - final GrReferenceExpression ref = (GrReferenceExpression)element; + if (element instanceof GrReferenceExpression ref) { if (ref.isQualified() || ref.resolve() != var) { return bitSet; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/JavaStylePropertiesUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/JavaStylePropertiesUtil.java index a82399a93cda..76a7f775bdee 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/JavaStylePropertiesUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/JavaStylePropertiesUtil.java @@ -80,8 +80,7 @@ public final class JavaStylePropertiesUtil { private static boolean isSetterInvocation(GrMethodCall call) { GrExpression expr = call.getInvokedExpression(); - if (!(expr instanceof GrReferenceExpression)) return false; - GrReferenceExpression refExpr = (GrReferenceExpression)expr; + if (!(expr instanceof GrReferenceExpression refExpr)) return false; PsiMethod method; if (call instanceof GrApplicationStatement) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/LibraryUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/LibraryUtil.java index 1db17c6be191..38ddcd2c147b 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/LibraryUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/utils/LibraryUtil.java @@ -53,11 +53,9 @@ public final class LibraryUtil { public static boolean isOverrideOfLibraryMethodParameter( PsiVariable variable) { - if (variable instanceof PsiParameter) { - final PsiParameter parameter = (PsiParameter) variable; + if (variable instanceof PsiParameter parameter) { final PsiElement scope = parameter.getDeclarationScope(); - if (scope instanceof PsiMethod) { - final PsiMethod method = (PsiMethod) scope; + if (scope instanceof PsiMethod method) { if (isOverrideOfLibraryMethod(method)) { return true; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/configSlurper/ConfigSlurperMapContentProvider.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/configSlurper/ConfigSlurperMapContentProvider.java index b9f4cc9a73e5..c3e052af2e9f 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/configSlurper/ConfigSlurperMapContentProvider.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/configSlurper/ConfigSlurperMapContentProvider.java @@ -32,9 +32,8 @@ public class ConfigSlurperMapContentProvider extends GroovyMapContentProvider { List path = new ArrayList<>(); while (resolveResult instanceof GroovyMapProperty) { - if (!(resolvedQualifier instanceof GrReferenceExpression)) return null; + if (!(resolvedQualifier instanceof GrReferenceExpression expr)) return null; - GrReferenceExpression expr = (GrReferenceExpression)resolvedQualifier; path.add(expr.getReferenceName()); resolvedQualifier = expr.getQualifierExpression(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java index 8ca1cd857149..a762c4616517 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java @@ -26,9 +26,8 @@ public class GroovyDslAnnotator implements Annotator { @Override public void annotate(@NotNull PsiElement psiElement, @NotNull AnnotationHolder holder) { - if (!(psiElement instanceof GroovyFile)) return; + if (!(psiElement instanceof GroovyFile groovyFile)) return; - final GroovyFile groovyFile = (GroovyFile)psiElement; if (!GrFileIndexUtil.isGroovySourceFile(groovyFile)) return; final VirtualFile vfile = groovyFile.getVirtualFile(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java index 26f6576c7e54..225c09c667e9 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java @@ -135,15 +135,12 @@ public final class GroovyDslFileIndex { final Collection infos = staticInfo.get("scriptSuperClass"); for (Object info : infos) { - if (info instanceof Map) { - @NonNls final Map map = (Map)info; + if (info instanceof @NonNls Map map) { final Object _pattern = map.get("pattern"); final Object _superClass = map.get("superClass"); - if (_pattern instanceof String && _superClass instanceof String) { - final String pattern = (String)_pattern; - final String superClass = (String)_superClass; + if (_pattern instanceof String pattern && _superClass instanceof String superClass) { try { if (Pattern.matches(".*" + pattern, filePath)) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/dsltop/GroovyDslDefaultMembers.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/dsltop/GroovyDslDefaultMembers.java index f44128795270..bc0db9450852 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/dsltop/GroovyDslDefaultMembers.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/dsltop/GroovyDslDefaultMembers.java @@ -55,8 +55,7 @@ public class GroovyDslDefaultMembers implements GdslMembersProvider { */ public void delegatesTo(@Nullable PsiElement elem, GdslMembersHolderConsumer consumer) { - if (elem instanceof PsiClass) { - final PsiClass clazz = (PsiClass)elem; + if (elem instanceof PsiClass clazz) { final NonCodeMembersHolder holder = new NonCodeMembersHolder(); if (clazz instanceof GrTypeDefinition) { @@ -81,11 +80,9 @@ public class GroovyDslDefaultMembers implements GdslMembersProvider { } consumer.addMemberHolder(holder); } - else if (elem instanceof GrExpression) { - GrExpression expr = (GrExpression)elem; + else if (elem instanceof GrExpression expr) { final PsiType type = expr.getType(); - if (type instanceof PsiClassType) { - PsiClassType ctype = (PsiClassType)type; + if (type instanceof PsiClassType ctype) { delegatesTo(ctype.resolve(), consumer); } } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/GrExpressionCategory.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/GrExpressionCategory.java index 06e0aeba40c5..c5099cd5ec0c 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/GrExpressionCategory.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/GrExpressionCategory.java @@ -38,8 +38,7 @@ public class GrExpressionCategory implements PsiEnhancerCategory{ @Nullable public static PsiClass getClassType(GrExpression expr) { final PsiType type = expr.getType(); - if (type instanceof PsiClassType) { - PsiClassType classType = (PsiClassType)type; + if (type instanceof PsiClassType classType) { return classType.resolve(); } else { final String text = type.getPresentableText(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiCategoryUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiCategoryUtil.java index 9234650abcd3..6a0d3578cc7f 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiCategoryUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiCategoryUtil.java @@ -9,8 +9,7 @@ public final class PsiCategoryUtil { @Nullable public static PsiClass getClassType(PsiType type, PsiElement place) { - if (type instanceof PsiClassType) { - PsiClassType classType = (PsiClassType)type; + if (type instanceof PsiClassType classType) { return classType.resolve(); } else if (type instanceof PsiPrimitiveType) { final PsiClassType boxed = ((PsiPrimitiveType)type).getBoxedType(place); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiElementCategory.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiElementCategory.java index d0f577335143..cd14ddb5c8ae 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiElementCategory.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiElementCategory.java @@ -61,8 +61,7 @@ public class PsiElementCategory implements PsiEnhancerCategory { } public static Object eval(PsiElement elem) { - if (elem instanceof GrLiteral) { - GrLiteral literal = (GrLiteral)elem; + if (elem instanceof GrLiteral literal) { return literal.getValue(); } return elem; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUnrollReferenceProvider.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUnrollReferenceProvider.java index bfdced4ce4d4..a896180f1eb4 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUnrollReferenceProvider.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUnrollReferenceProvider.java @@ -36,9 +36,7 @@ public class SpockUnrollReferenceProvider extends PsiReferenceProvider { if (!(argumentList instanceof GrAnnotationArgumentList)) return PsiReference.EMPTY_ARRAY; PsiElement eAnnotation = argumentList.getParent(); - if (!(eAnnotation instanceof GrAnnotation)) return PsiReference.EMPTY_ARRAY; - - GrAnnotation annotation = (GrAnnotation)eAnnotation; + if (!(eAnnotation instanceof GrAnnotation annotation)) return PsiReference.EMPTY_ARRAY; String shortName = annotation.getShortName(); if (!shortName.equals(UNROLL) && !shortName.equals(SPOCK_LANG_UNROLL)) return PsiReference.EMPTY_ARRAY; @@ -47,9 +45,7 @@ public class SpockUnrollReferenceProvider extends PsiReferenceProvider { if (!(modifierList instanceof GrModifierList)) return PsiReference.EMPTY_ARRAY; PsiElement eMethod = modifierList.getParent(); - if (!(eMethod instanceof GrMethod)) return PsiReference.EMPTY_ARRAY; - - final GrMethod method = (GrMethod)eMethod; + if (!(eMethod instanceof GrMethod method)) return PsiReference.EMPTY_ARRAY; TextRange rangeInElement = ElementManipulators.getValueTextRange(element); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUtils.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUtils.java index dd5f8d072a69..3cd06d1f5aea 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUtils.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUtils.java @@ -50,20 +50,18 @@ public final class SpockUtils { @Nullable public static String getNameByReference(@Nullable PsiElement expression) { - if (!(expression instanceof GrReferenceExpression)) return null; + if (!(expression instanceof GrReferenceExpression ref)) return null; PsiElement firstChild = expression.getFirstChild(); if (firstChild != expression.getLastChild() || !PsiImplUtil.isLeafElementOfType(firstChild, GroovyTokenTypes.mIDENT)) return null; - GrReferenceExpression ref = (GrReferenceExpression)expression; if (ref.isQualified()) return null; return ref.getReferenceName(); } public static boolean isTestMethod(PsiElement element) { - if (!(element instanceof GrMethod)) return false; - GrMethod method = ((GrMethod)element); + if (!(element instanceof GrMethod method)) return false; PsiClass clazz = method.getContainingClass(); if (!isSpecification(clazz)) return false; if (isFixtureMethod(method)) return false; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/GroovyNamedArgumentProvider.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/GroovyNamedArgumentProvider.java index 6920e7319875..28ba3ef39757 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/GroovyNamedArgumentProvider.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/GroovyNamedArgumentProvider.java @@ -83,8 +83,7 @@ public abstract class GroovyNamedArgumentProvider { PsiElement element = result.getElement(); if (element instanceof GrAccessorMethod) continue; - if (element instanceof PsiMethod) { - PsiMethod method = (PsiMethod)element; + if (element instanceof PsiMethod method) { PsiParameter[] parameters = method.getParameterList().getParameters(); if (!method.isConstructor() && !(parameters.length > 0 && canBeMap(parameters[0]))) continue; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/NamedArgumentReference.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/NamedArgumentReference.java index 9d03916df6ee..99ea47bf1e90 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/NamedArgumentReference.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/NamedArgumentReference.java @@ -54,8 +54,7 @@ public class NamedArgumentReference extends PsiPolyVariantReferenceBase consumer) { final PsiElement element = queryParameters.getElementToSearch(); - if (element instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)element; + if (element instanceof PsiMethod method) { if (method.isConstructor()) { GroovyConstructorUsagesSearcher.processConstructorUsages(method, queryParameters.getEffectiveSearchScope(), consumer, queryParameters.getOptimizer(), false); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrImplicitUsageProvider.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrImplicitUsageProvider.java index e980d754ad69..5f46b24626d5 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrImplicitUsageProvider.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrImplicitUsageProvider.java @@ -32,8 +32,7 @@ import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; public class GrImplicitUsageProvider implements ImplicitUsageProvider { @Override public boolean isImplicitUsage(@NotNull PsiElement element) { - if (element instanceof GrMethod) { - final GrMethod method = (GrMethod)element; + if (element instanceof GrMethod method) { if (PsiUtil.OPERATOR_METHOD_NAMES.contains(method.getName())) return true; @@ -41,8 +40,7 @@ public class GrImplicitUsageProvider implements ImplicitUsageProvider { if (MissingMethodAndPropertyUtil.isMethodMissing(method)) return true; if (isDelegateAnnotated(method)) return true; } - else if (element instanceof GrParameter) { - final GrParameter parameter = (GrParameter)element; + else if (element instanceof GrParameter parameter) { final PsiElement scope = parameter.getDeclarationScope(); if (scope instanceof GrMethod && (MissingMethodAndPropertyUtil.isMethodMissing((GrMethod)scope) || MissingMethodAndPropertyUtil diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyConstructorUsagesSearcher.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyConstructorUsagesSearcher.java index ef2c40196fd2..3b1a4a2415a6 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyConstructorUsagesSearcher.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyConstructorUsagesSearcher.java @@ -145,8 +145,7 @@ public class GroovyConstructorUsagesSearcher extends QueryExecutorBase 0 && statements[0] instanceof GrConstructorInvocation) { - final GrConstructorInvocation invocation = (GrConstructorInvocation)statements[0]; + if (statements.length > 0 && statements[0] instanceof GrConstructorInvocation invocation) { if (invocation.isThisCall() == processThisRefs && invocation.getManager().areElementsEquivalent(invocation.resolveMethod(), searchedConstructor) && !consumer.process(invocation.getInvokedExpression())) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java index aa42fbd5d246..5eed9a6e6222 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java @@ -67,11 +67,10 @@ public class MethodLateBoundReferencesSearcher extends QueryExecutorBase consumer) { - if (!(element instanceof GrReferenceExpression)) { + if (!(element instanceof GrReferenceExpression ref)) { return true; } - final GrReferenceExpression ref = (GrReferenceExpression)element; if (!name.equals(ref.getReferenceName()) || PsiUtil.isLValue(ref)) { return true; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebContentDeclarationSearcher.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebContentDeclarationSearcher.java index a5aa25b425b7..3c0f6c2b0d1f 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebContentDeclarationSearcher.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebContentDeclarationSearcher.java @@ -26,9 +26,8 @@ public class GebContentDeclarationSearcher extends PomDeclarationSearcher { if (!(grClosure instanceof GrClosableBlock)) return; PsiElement contentField = grClosure.getParent(); - if (!(contentField instanceof GrField)) return; + if (!(contentField instanceof GrField field)) return; - GrField field = (GrField)contentField; if (!"content".equals(field.getName()) || !field.hasModifierProperty(PsiModifier.STATIC)) return; PsiClass containingClass = field.getContainingClass(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebPageMemberContributor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebPageMemberContributor.java index c64789ca954f..2da9c511fad0 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebPageMemberContributor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebPageMemberContributor.java @@ -38,8 +38,7 @@ public class GebPageMemberContributor extends NonCodeMembersContributor { PsiElement grClosure = grCall.getParent(); if (grClosure instanceof GrClosableBlock) { PsiElement contentField = grClosure.getParent(); - if (contentField instanceof GrField) { - GrField f = (GrField)contentField; + if (contentField instanceof GrField f) { if ("content".equals(f.getName()) && f.hasModifierProperty(PsiModifier.STATIC) && f.getContainingClass() == aClass) { Map elements = GebUtil.getContentElements(aClass); for (PsiMember element : elements.values()) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebUtil.java index d613bbf11dd3..fcfc379ee348 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebUtil.java @@ -61,8 +61,7 @@ public final class GebUtil { PsiType objectType = PsiType.getJavaLangObject(pageOrModuleClass.getManager(), pageOrModuleClass.getResolveScope()); for (PsiElement e = initializer.getFirstChild(); e != null; e = e.getNextSibling()) { - if (e instanceof GrMethodCall) { - GrMethodCall methodCall = (GrMethodCall)e; + if (e instanceof GrMethodCall methodCall) { GrExpression invokedExpression = methodCall.getInvokedExpression(); if (!(invokedExpression instanceof GrReferenceExpression)) continue; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/gpp/GppExpectedTypesContributor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/gpp/GppExpectedTypesContributor.java index 8d8e8fcb19b9..0392778d4e07 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/gpp/GppExpectedTypesContributor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/gpp/GppExpectedTypesContributor.java @@ -27,8 +27,7 @@ final class GppExpectedTypesContributor extends GroovyExpectedTypesContributor { @Override public List calculateTypeConstraints(@NotNull GrExpression expression) { final PsiElement parent = expression.getParent(); - if (parent instanceof GrListOrMap) { - final GrListOrMap list = (GrListOrMap)parent; + if (parent instanceof GrListOrMap list) { if (!list.isMap()) { final PsiType listType = list.getType(); if (!(listType instanceof GrTupleType)) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/GroovyConstructorNamedArgumentProvider.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/GroovyConstructorNamedArgumentProvider.java index 8adc80d1114c..b9253eeca435 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/GroovyConstructorNamedArgumentProvider.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/GroovyConstructorNamedArgumentProvider.java @@ -149,10 +149,9 @@ public abstract class GroovyConstructorNamedArgumentProvider extends GroovyNamed String propertyName; PsiType type; - if (element instanceof PsiMethod) { + if (element instanceof PsiMethod method) { if (!myResolveTargetKinds.contains(DeclarationKind.METHOD)) return true; - PsiMethod method = (PsiMethod)element; if (!GroovyPropertyUtils.isSimplePropertySetter(method)) return true; propertyName = GroovyPropertyUtils.getPropertyNameBySetter(method); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java index 726812f62d86..982ec9006277 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java @@ -168,9 +168,8 @@ public class GroovyFoldingBuilder extends CustomFoldingBuilder implements DumbAw if (!(element instanceof GrTypeDefinitionBody)) return false; final PsiElement parent = element.getParent(); - if (!(parent instanceof GrTypeDefinition)) return false; + if (!(parent instanceof GrTypeDefinition clazz)) return false; - final GrTypeDefinition clazz = (GrTypeDefinition)parent; if (clazz.isAnonymous() || clazz.getContainingClass() != null) return false; final PsiFile file = element.getContainingFile(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/GroovyDocPsiCreator.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/GroovyDocPsiCreator.java index cdfb12a54c23..33355cda00ec 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/GroovyDocPsiCreator.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/GroovyDocPsiCreator.java @@ -15,8 +15,7 @@ public final class GroovyDocPsiCreator { public static PsiElement createElement(ASTNode node) { IElementType type = node.getElementType(); - if (type instanceof GroovyDocTagValueTokenType) { - GroovyDocTagValueTokenType value = (GroovyDocTagValueTokenType) type; + if (type instanceof GroovyDocTagValueTokenType value) { GroovyDocTagValueTokenType.TagValueTokenType valueType = GroovyDocTagValueTokenType.getValueType(node); if (valueType == GroovyDocTagValueTokenType.TagValueTokenType.REFERENCE_ELEMENT) return new GrDocReferenceElementImpl(node); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocFieldReferenceImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocFieldReferenceImpl.java index 190bfc7476a8..e171e12c7919 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocFieldReferenceImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocFieldReferenceImpl.java @@ -38,8 +38,7 @@ public class GrDocFieldReferenceImpl extends GrDocMemberReferenceImpl implements @Override public PsiElement handleElementRename(@NotNull String newElementName) throws IncorrectOperationException { final PsiElement resolved = resolve(); - if (resolved instanceof PsiMethod) { - final PsiMethod method = (PsiMethod) resolved; + if (resolved instanceof PsiMethod method) { final String oldName = getReferenceName(); if (!method.getName().equals(oldName)) { //was property reference to accessor if (PropertyUtilBase.isSimplePropertyAccessor(method)) { @@ -49,8 +48,7 @@ public class GrDocFieldReferenceImpl extends GrDocMemberReferenceImpl implements } } } - } else if (resolved instanceof GrField && ((GrField) resolved).isProperty()) { - final GrField field = (GrField) resolved; + } else if (resolved instanceof GrField field && ((GrField) resolved).isProperty()) { final String oldName = getReferenceName(); if (oldName != null && oldName.equals(field.getName())) { if (oldName.startsWith("get")) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMethodReferenceImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMethodReferenceImpl.java index 51c13b5f0adb..9a562478a737 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMethodReferenceImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMethodReferenceImpl.java @@ -117,8 +117,7 @@ public class GrDocMethodReferenceImpl extends GrDocMemberReferenceImpl implement @Override public PsiElement handleElementRename(@NotNull String newElementName) throws IncorrectOperationException { final PsiElement resolved = resolve(); - if (resolved instanceof PsiMethod) { - final PsiMethod method = (PsiMethod) resolved; + if (resolved instanceof PsiMethod method) { final String oldName = getReferenceName(); if (!method.getName().equals(oldName)) { //was property reference to accessor if (PropertyUtilBase.isSimplePropertyAccessor(method)) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocParameterReferenceImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocParameterReferenceImpl.java index cae128fa0be8..bcc9d76517de 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocParameterReferenceImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocParameterReferenceImpl.java @@ -44,8 +44,7 @@ public class GrDocParameterReferenceImpl extends GroovyDocPsiElementImpl impleme ArrayList candidates = new ArrayList<>(); final PsiElement owner = GrDocCommentUtil.findDocOwner(this); - if (owner instanceof GrMethod && !name.startsWith("<")) { - final GrMethod method = (GrMethod)owner; + if (owner instanceof GrMethod method && !name.startsWith("<")) { final GrParameter[] parameters = method.getParameters(); for (GrParameter parameter : parameters) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrNamedArgumentSearchVisitor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrNamedArgumentSearchVisitor.java index 8988c1fcd901..7a86ccadc0b8 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrNamedArgumentSearchVisitor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrNamedArgumentSearchVisitor.java @@ -41,8 +41,7 @@ public class GrNamedArgumentSearchVisitor extends GroovyRecursiveElementVisitor if (expr.length == 1 && expr[0] instanceof GrLiteral) { Object value = ((GrLiteral)expr[0]).getValue(); - if (value instanceof String) { - String s = (String)value; + if (value instanceof String s) { if (StringUtil.isJavaIdentifier(s)) { add((String)value); } @@ -59,8 +58,7 @@ public class GrNamedArgumentSearchVisitor extends GroovyRecursiveElementVisitor if (myFirstArgumentName.equals(referenceExpression.getReferenceName()) && !referenceExpression.isQualified()) { PsiElement parent = referenceExpression.getParent(); - if (parent instanceof GrReferenceExpression) { - GrReferenceExpression parentRef = (GrReferenceExpression)parent; + if (parent instanceof GrReferenceExpression parentRef) { PsiElement parentParent = parentRef.getParent(); @@ -73,8 +71,7 @@ public class GrNamedArgumentSearchVisitor extends GroovyRecursiveElementVisitor add(parentRef.getReferenceName()); } } - else if (parent instanceof GrIndexProperty) { - GrIndexProperty indexProperty = (GrIndexProperty)parent; + else if (parent instanceof GrIndexProperty indexProperty) { extractArguments(indexProperty.getArgumentList()); } } @@ -85,11 +82,10 @@ public class GrNamedArgumentSearchVisitor extends GroovyRecursiveElementVisitor public static Map find(GrVariable variable) { final GrExpression initializerGroovy = variable.getInitializerGroovy(); - if (!(initializerGroovy instanceof GrFunctionalExpression)) { + if (!(initializerGroovy instanceof GrFunctionalExpression expression)) { return Collections.emptyMap(); } - final GrFunctionalExpression expression = (GrFunctionalExpression)initializerGroovy; final GrParameter[] parameters = expression.getAllParameters(); if (parameters.length == 0) return Collections.emptyMap(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/InstanceOfInstruction.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/InstanceOfInstruction.java index 4933d6c030cb..8d8349b03fdc 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/InstanceOfInstruction.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/InstanceOfInstruction.java @@ -90,9 +90,9 @@ public class InstanceOfInstruction extends InstructionImpl implements MixinTypeI else if (right != null && isNullLiteral(left)) { return Pair.create(right, PsiTypes.nullType()); } - } else if (element instanceof GrExpressionList && element.getParent() instanceof GrCaseSection && element.getParent().getParent() instanceof GrSwitchElement) { + } else if (element instanceof GrExpressionList && element.getParent() instanceof GrCaseSection && + element.getParent().getParent() instanceof GrSwitchElement switchElement) { // this branch corresponds to an arm of switch expression that is of a kind 'case Integer, String, Foo -> ...' - var switchElement = (GrSwitchElement)element.getParent().getParent(); GrCondition condition = switchElement.getCondition(); if (condition instanceof GrReferenceExpression) { List expressions = PsiUtil.getAllPatternsForCaseSection((GrCaseSection)element.getParent()); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java index 93b8231b121d..addc403812a6 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java @@ -870,8 +870,7 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor { if (clause instanceof GrTraditionalForClause) { acceptNullable(((GrTraditionalForClause)clause).getInitialization()); } - else if (clause instanceof GrForInClause) { - GrForInClause forInClause = (GrForInClause)clause; + else if (clause instanceof GrForInClause forInClause) { acceptNullable(forInClause.getIteratedExpression()); addNodeAndCheckPending(new ReadWriteVariableInstruction( getDescriptorId(new LoopIteratorVariableDescriptor(forInClause)), diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java index 37d6a0647ae6..2cdc13c4ccff 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java @@ -93,9 +93,7 @@ public final class DFAType { @Override public boolean equals(Object obj) { if (obj == this) return true; - if (!(obj instanceof DFAType)) return false; - - final DFAType other = (DFAType)obj; + if (!(obj instanceof DFAType other)) return false; if (!eq(primary, other.primary)) return false; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsCollector.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsCollector.java index 6c86e666ca0f..59fa237c78eb 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsCollector.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsCollector.java @@ -434,10 +434,9 @@ public final class ReachingDefinitionsCollector { Int2ObjectMap result = new Int2ObjectOpenHashMap<>(); for (int i = 0; i < flow.length; i++) { Instruction insn = flow[i]; - if (!(insn instanceof ReadWriteVariableInstruction)) { + if (!(insn instanceof ReadWriteVariableInstruction rwInsn)) { continue; } - ReadWriteVariableInstruction rwInsn = (ReadWriteVariableInstruction)insn; if (rwInsn.isWrite()) { continue; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java index 9d0f13df02b7..018c81d4e42b 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java @@ -13,8 +13,7 @@ public class ReachingDefinitionsDfaInstance implements DfaInstance extends Groov } return qualifiedRef; } - else if (element instanceof PsiMember) { - PsiMember member = (PsiMember)element; + else if (element instanceof PsiMember member) { final PsiClass psiClass = member.getContainingClass(); if (psiClass == null) throw new IncorrectOperationException(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyImportHelper.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyImportHelper.java index aada6d8558f7..c08eab4d83c6 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyImportHelper.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyImportHelper.java @@ -19,9 +19,8 @@ import java.util.LinkedHashSet; public final class GroovyImportHelper { public static boolean isImplicitlyImported(PsiElement element, String expectedName, GroovyFile file) { - if (!(element instanceof PsiClass)) return false; + if (!(element instanceof PsiClass psiClass)) return false; - final PsiClass psiClass = (PsiClass)element; if (!expectedName.equals(psiClass.getName())) return false; final String qname = psiClass.getQualifiedName(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java index f012095e01c5..e6926761325d 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java @@ -272,11 +272,10 @@ public class GroovyPsiElementFactoryImpl extends GroovyPsiElementFactory { if (topStatements.length == 0 || !(topStatements[0] instanceof GrVariableDeclaration)) { topStatements = createGroovyFileChecked("def " + text).getTopStatements(); } - if (topStatements.length == 0 || !(topStatements[0] instanceof GrVariableDeclaration)) { + if (topStatements.length == 0 || !(topStatements[0] instanceof GrVariableDeclaration statement)) { throw new RuntimeException("Invalid arguments, text = " + text); } - final GrVariableDeclaration statement = (GrVariableDeclaration)topStatements[0]; //todo switch-case formatting should work without this hack CodeEditUtil.markToReformatBefore(statement.getNode().findLeafElementAt(0), true); return statement; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyTargetElementEvaluator.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyTargetElementEvaluator.java index 7b966f4436dd..07bfe2db6035 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyTargetElementEvaluator.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyTargetElementEvaluator.java @@ -106,8 +106,7 @@ public class GroovyTargetElementEvaluator extends JavaTargetElementEvaluator { @Nullable @Override public Collection getTargetCandidates(@NotNull PsiReference reference) { - if (reference instanceof GrReferenceExpression) { - GrReferenceExpression referenceExpression = (GrReferenceExpression)reference; + if (reference instanceof GrReferenceExpression referenceExpression) { if (referenceExpression.hasMemberPointer()) { GroovyResolveResult[] results = referenceExpression.multiResolve(false); if (results.length > 0) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java index cda5d5b6debf..9d5eed0c9765 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java @@ -207,8 +207,7 @@ public final class PsiImplUtil { parentCount++; } - if (element instanceof GrCommandArgumentList) { - final GrCommandArgumentList commandArgList = (GrCommandArgumentList)element; + if (element instanceof GrCommandArgumentList commandArgList) { final PsiElement parent = commandArgList.getParent(); LOG.assertTrue(parent instanceof GrApplicationStatement); @@ -598,8 +597,7 @@ public final class PsiImplUtil { return doNormalizeWildcardByPosition(((PsiCapturedWildcardType)type).getUpperBound(), expression, topLevel); } - if (type instanceof PsiWildcardType) { - final PsiWildcardType wildcardType = (PsiWildcardType)type; + if (type instanceof PsiWildcardType wildcardType) { if (PsiUtil.isAccessedForWriting(topLevel)) { return wildcardType.getBound(); @@ -669,8 +667,7 @@ public final class PsiImplUtil { if (flowOwner == null) return null; final PsiElement parent = flowOwner.getContext(); - if (flowOwner instanceof GrOpenBlock && parent instanceof GrMethod) { - final GrMethod method = (GrMethod)parent; + if (flowOwner instanceof GrOpenBlock && parent instanceof GrMethod method) { if (method.isConstructor()) return null; return method.getReturnType(); } @@ -805,8 +802,7 @@ public final class PsiImplUtil { } public static boolean isSpreadAssignment(@Nullable GrExpression lValue) { - if (lValue instanceof GrReferenceExpression) { - GrReferenceExpression expression = (GrReferenceExpression)lValue; + if (lValue instanceof GrReferenceExpression expression) { final PsiElement dot = expression.getDotToken(); if (dot != null && dot.getNode().getElementType() == GroovyTokenTypes.mSPREAD_DOT) { return true; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java index e528c3f3c5b7..9c8c24047d7a 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java @@ -154,8 +154,7 @@ public class GrAnnotationImpl extends GrStubElementBase implem } public static TargetType @NotNull [] getApplicableElementTypeFields(PsiElement owner) { - if (owner instanceof PsiClass) { - PsiClass aClass = (PsiClass)owner; + if (owner instanceof PsiClass aClass) { if (aClass.isAnnotationType()) { return new TargetType[]{TargetType.ANNOTATION_TYPE, TargetType.TYPE}; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableImpl.java index 9b493c1d9745..4d52295466fa 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableImpl.java @@ -67,8 +67,7 @@ public class GrVariableImpl extends GrVariableBaseImpl implement @Override public @Nullable GrExpression getInitializerGroovy() { final PsiElement parent = getParent(); - if (parent instanceof GrVariableDeclaration) { - GrVariableDeclaration declaration = (GrVariableDeclaration)parent; + if (parent instanceof GrVariableDeclaration declaration) { if (declaration.isTuple()) { GrExpression rValue = declaration.getTupleInitializer(); if (!(rValue instanceof GrListOrMap)) { @@ -91,8 +90,7 @@ public class GrVariableImpl extends GrVariableBaseImpl implement @Override public @Nullable PsiType getInitializerType() { PsiElement parent = getParent(); - if (parent instanceof GrVariableDeclaration) { - GrVariableDeclaration declaration = (GrVariableDeclaration)parent; + if (parent instanceof GrVariableDeclaration declaration) { if (declaration.isTuple()) { GrExpression rValue = declaration.getTupleInitializer(); if (rValue == null) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/blocks/GrBlockImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/blocks/GrBlockImpl.java index 76174911a6f7..beda573d5cb5 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/blocks/GrBlockImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/blocks/GrBlockImpl.java @@ -132,8 +132,7 @@ public abstract class GrBlockImpl extends LazyParseablePsiElement implements GrC private boolean mayUseNewLinesAsSeparators() { PsiElement parent = this; while (parent != null) { - if (parent instanceof GrString) { - GrString grString = (GrString) parent; + if (parent instanceof GrString grString) { return !grString.isPlainString(); } parent = parent.getParent(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrCaseSectionImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrCaseSectionImpl.java index 5534bf04a4ca..4ab71a7510c9 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrCaseSectionImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrCaseSectionImpl.java @@ -111,8 +111,7 @@ public class GrCaseSectionImpl extends GroovyPsiElementImpl implements GrCaseSec private boolean mayUseNewLinesAsSeparators() { PsiElement parent = this; while (parent != null) { - if (parent instanceof GrString) { - GrString grString = (GrString) parent; + if (parent instanceof GrString grString) { return !grString.isPlainString(); } parent = parent.getParent(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java index e1ef513036ec..de0cd59345b8 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java @@ -218,8 +218,7 @@ public class GrReferenceExpressionImpl extends GrReferenceElementImpl components1 = tuple1.getComponentTypes(); List components2 = tuple2.getComponentTypes(); @@ -385,9 +382,7 @@ public final class TypesUtil implements TypeConstants { else if (checkEmptyMapAndMap(type2, type1)) { return genNewMapBy(type1, manager); } - else if (type1 instanceof GrClosureType && type2 instanceof GrClosureType) { - GrClosureType clType1 = (GrClosureType)type1; - GrClosureType clType2 = (GrClosureType)type2; + else if (type1 instanceof GrClosureType clType1 && type2 instanceof GrClosureType clType2) { List signatures1 = clType1.getSignatures(); List signatures2 = clType2.getSignatures(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java index 08331762b187..2424c525dc12 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java @@ -109,13 +109,11 @@ public class GrParameterImpl extends GrVariableBaseImpl impleme private boolean isMainMethodFirstUntypedParameter() { if (getTypeElementGroovy() != null) return false; - if (!(getParent() instanceof GrParameterList)) return false; + if (!(getParent() instanceof GrParameterList parameterList)) return false; if (isOptional()) return false; - GrParameterList parameterList = (GrParameterList)getParent(); - if (!(parameterList.getParent() instanceof GrMethod)) return false; + if (!(parameterList.getParent() instanceof GrMethod method)) return false; - GrMethod method = (GrMethod)parameterList.getParent(); return PsiImplUtil.isMainMethod(method); } @@ -174,8 +172,7 @@ public class GrParameterImpl extends GrVariableBaseImpl impleme } final PsiElement scope = getDeclarationScope(); - if (scope instanceof GrDocCommentOwner) { - GrDocCommentOwner owner = (GrDocCommentOwner)scope; + if (scope instanceof GrDocCommentOwner owner) { final GrDocComment comment = owner.getDocComment(); if (comment != null) { return new LocalSearchScope(new PsiElement[]{scope, comment}); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java index 7341fbdb8663..e45a52ba2943 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java @@ -156,8 +156,7 @@ public abstract class GrTypeDefinitionImpl extends GrStubElementBase getTypeToMixIn(GrMethodCall methodCall) { GrExpression invoked = methodCall.getInvokedExpression(); - if (!(invoked instanceof GrReferenceExpression)) return null; - GrReferenceExpression referenceExpression = (GrReferenceExpression)invoked; + if (!(invoked instanceof GrReferenceExpression referenceExpression)) return null; if (GrImportUtil.acceptName(referenceExpression, "mixin")) { PsiElement resolved = referenceExpression.resolve(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrTraitUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrTraitUtil.java index 45eb26a3ff4b..0e47f8e16db8 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrTraitUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrTraitUtil.java @@ -107,8 +107,7 @@ public final class GrTraitUtil { } public static GrMethod[] getDefaultMethods(@Nullable PsiClass aClass) { - if (!(aClass instanceof GrTypeDefinition) || !aClass.isInterface()) return GrMethod.EMPTY_ARRAY; - GrTypeDefinition grTypeDefinition = (GrTypeDefinition)aClass; + if (!(aClass instanceof GrTypeDefinition grTypeDefinition) || !aClass.isInterface()) return GrMethod.EMPTY_ARRAY; return Arrays.stream(grTypeDefinition.getCodeMethods()) .filter(m -> m.getModifierList().hasExplicitModifier(PsiModifier.DEFAULT)) .toArray(GrMethod[]::new); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyImportUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyImportUtil.java index d7fe4f52b99a..3d3b615931db 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyImportUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyImportUtil.java @@ -63,8 +63,7 @@ public final class GroovyImportUtil { final PsiElement resolved = resolveResult.getElement(); if (resolved == null) return; - if (context instanceof GrImportStatement) { - final GrImportStatement importStatement = (GrImportStatement)context; + if (context instanceof GrImportStatement importStatement) { usedImports.add(importStatement); if (GroovyImportHelper.isImplicitlyImported(resolved, refName, file)) { @@ -76,8 +75,7 @@ public final class GroovyImportUtil { if (importStatement.isOnDemand()) { if (importStatement.isStatic()) { - if (resolved instanceof PsiMember) { - final PsiMember member = (PsiMember)resolved; + if (resolved instanceof PsiMember member) { final PsiClass clazz = member.getContainingClass(); if (clazz != null) { final String classQName = clazz.getQualifiedName(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java index f3754b0788e5..a0c64a8593d1 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java @@ -187,8 +187,7 @@ public final class PsiUtil { @Nullable GrExpression stopAt) { PsiElement parent = place instanceof GrEnumConstant ? place : place != null ? place.getParent() : null; - if (parent instanceof GrIndexProperty) { - GrIndexProperty index = (GrIndexProperty)parent; + if (parent instanceof GrIndexProperty index) { GrArgumentList list = index.getArgumentList(); PsiType[] argTypes = getArgumentTypes(list.getNamedArguments(), list.getExpressionArguments(), GrClosableBlock.EMPTY_ARRAY, nullAsBottom, stopAt); if (isLValue(index) && argTypes != null) { @@ -201,8 +200,7 @@ public final class PsiUtil { return argTypes; } } - if (parent instanceof GrCall) { - GrCall call = (GrCall)parent; + if (parent instanceof GrCall call) { GrNamedArgument[] namedArgs = call.getNamedArguments(); GrExpression[] expressions = call.getExpressionArguments(); GrClosableBlock[] closures = call.getClosureArguments(); @@ -321,8 +319,7 @@ public final class PsiUtil { PsiFile file = element.getContainingFile(); FileViewProvider viewProvider = file.getViewProvider(); - if (viewProvider instanceof MultiplePsiFilesPerDocumentFileViewProvider) { - MultiplePsiFilesPerDocumentFileViewProvider multiProvider = (MultiplePsiFilesPerDocumentFileViewProvider)viewProvider; + if (viewProvider instanceof MultiplePsiFilesPerDocumentFileViewProvider multiProvider) { file = multiProvider.getPsi(multiProvider.getBaseLanguage()); LOG.assertTrue(file != null, element + " " + multiProvider.getBaseLanguage()); } @@ -543,7 +540,7 @@ public final class PsiUtil { private static boolean isRawIndexPropertyAccess(GrIndexProperty expr) { final GrExpression qualifier = expr.getInvokedExpression(); final PsiType qualifierType = qualifier.getType(); - if (qualifierType instanceof PsiClassType) { + if (qualifierType instanceof PsiClassType classType) { if (InheritanceUtil.isInheritor(qualifierType, JAVA_UTIL_LIST)) { return com.intellij.psi.util.PsiUtil.extractIterableTypeParameter(qualifierType, false) == null; @@ -552,7 +549,6 @@ public final class PsiUtil { if (InheritanceUtil.isInheritor(qualifierType, JAVA_UTIL_MAP)) { return com.intellij.psi.util.PsiUtil.substituteTypeParameter(qualifierType, JAVA_UTIL_MAP, 1, false) == null; } - PsiClassType classType = (PsiClassType)qualifierType; final PsiClassType.ClassResolveResult resolveResult = classType.resolveGenerics(); GrExpression[] arguments = expr.getArgumentList().getExpressionArguments(); PsiType[] argTypes = PsiType.createArray(arguments.length); @@ -602,8 +598,7 @@ public final class PsiUtil { public static boolean isRawType(@Nullable PsiType type, @NotNull PsiSubstitutor substitutor) { if (type instanceof PsiClassType) { final PsiClass returnClass = ((PsiClassType)type).resolve(); - if (returnClass instanceof PsiTypeParameter) { - final PsiTypeParameter typeParameter = (PsiTypeParameter)returnClass; + if (returnClass instanceof PsiTypeParameter typeParameter) { return substitutor.substitute(typeParameter) == null; } } @@ -1032,9 +1027,7 @@ public final class PsiUtil { if (!(parent instanceof GrListOrMap)) return null; PsiElement eArgumentList = parent.getParent(); - if (!(eArgumentList instanceof GrArgumentList)) return null; - - GrArgumentList argumentList = (GrArgumentList)eArgumentList; + if (!(eArgumentList instanceof GrArgumentList argumentList)) return null; if (argumentList.getNamedArguments().length > 0) return null; if (argumentList.getExpressionArgumentIndex((GrListOrMap)parent) != 0) return null; @@ -1104,8 +1097,7 @@ public final class PsiUtil { return true; } - if (parent instanceof GrTraditionalForClause) { - GrTraditionalForClause forClause = (GrTraditionalForClause)parent; + if (parent instanceof GrTraditionalForClause forClause) { return expr == forClause.getCondition(); } @@ -1155,9 +1147,7 @@ public final class PsiUtil { } public static boolean isReferenceWithoutQualifier(@Nullable PsiElement element, @NotNull String name) { - if (!(element instanceof GrReferenceExpression)) return false; - - GrReferenceExpression ref = (GrReferenceExpression)element; + if (!(element instanceof GrReferenceExpression ref)) return false; return !ref.isQualified() && name.equals(ref.getReferenceName()); } @@ -1199,13 +1189,12 @@ public final class PsiUtil { } public static boolean isNewified(@Nullable PsiElement expr) { - if (!(expr instanceof GrReferenceExpression)) { + if (!(expr instanceof GrReferenceExpression refExpr)) { return false; } if (!expr.isValid()) { return false; } - GrReferenceExpression refExpr = (GrReferenceExpression)expr; if (refExpr.isQualified()) { return false; } @@ -1281,8 +1270,7 @@ public final class PsiUtil { } private static boolean isThisOrSuperRef(PsiElement expression, IElementType token, boolean superClassAccepted) { - if (!(expression instanceof GrReferenceExpression)) return false; - GrReferenceExpression ref = (GrReferenceExpression)expression; + if (!(expression instanceof GrReferenceExpression ref)) return false; PsiElement nameElement = ref.getReferenceNameElement(); if (nameElement == null) return false; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyMethodArgumentReferenceContributor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyMethodArgumentReferenceContributor.java index 313dab156b4b..725113860448 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyMethodArgumentReferenceContributor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyMethodArgumentReferenceContributor.java @@ -64,8 +64,7 @@ public final class GroovyMethodArgumentReferenceContributor extends PsiReference return createReferencesForNamedArgument(element, (GrNamedArgument)parent, context); } - if (parent instanceof GrArgumentList) { - GrArgumentList argumentList = (GrArgumentList)parent; + if (parent instanceof GrArgumentList argumentList) { int index = argumentList.getExpressionArgumentIndex(argument); PsiElement call = argumentList.getParent(); @@ -97,9 +96,7 @@ public final class GroovyMethodArgumentReferenceContributor extends PsiReference for (GroovyResolveResult result : ((GrReferenceExpression)invokedExpression).multiResolve(false)) { PsiElement eMethod = result.getElement(); - if (!(eMethod instanceof PsiMethod)) continue; - - PsiMethod method = (PsiMethod)eMethod; + if (!(eMethod instanceof PsiMethod method)) continue; for (GroovyMethodInfo info : GroovyMethodInfo.getInfos(method)) { Object referenceProvider = info.getNamedArgReferenceProvider(labelName); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java index 00667eaa734a..b2718faaefe0 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java @@ -452,8 +452,7 @@ public final class ResolveUtil { final PsiMethod currentMethod; final PsiSubstitutor currentSubstitutor; - if (currentResult instanceof GroovyMethodResult) { - final GroovyMethodResult currentMethodResult = (GroovyMethodResult)currentResult; + if (currentResult instanceof GroovyMethodResult currentMethodResult) { currentMethod = currentMethodResult.getElement(); currentSubstitutor = currentMethodResult.getContextSubstitutor(); } @@ -473,8 +472,7 @@ public final class ResolveUtil { GroovyResolveResult candidateResult = iterator.next(); final PsiMethod otherMethod; final PsiSubstitutor otherSubstitutor; - if (candidateResult instanceof GroovyMethodResult) { - final GroovyMethodResult otherMethodResult = (GroovyMethodResult)candidateResult; + if (candidateResult instanceof GroovyMethodResult otherMethodResult) { otherMethod = otherMethodResult.getElement(); otherSubstitutor = otherMethodResult.getContextSubstitutor(); } @@ -898,8 +896,7 @@ public final class ResolveUtil { } public static boolean isClassReference(@NotNull PsiElement expression) { - if (!(expression instanceof GrReferenceExpression)) return false; - GrReferenceExpression ref = (GrReferenceExpression)expression; + if (!(expression instanceof GrReferenceExpression ref)) return false; GrExpression qualifier = ref.getQualifier(); if (!"class".equals(ref.getReferenceName())) return false; return qualifier != null && getClassReferenceFromExpression(qualifier) != null; @@ -942,8 +939,7 @@ public final class ResolveUtil { } public static boolean isAccessible(@NotNull PsiElement place, @NotNull PsiNamedElement namedElement) { - if (namedElement instanceof GrField) { - final GrField field = (GrField)namedElement; + if (namedElement instanceof GrField field) { if (org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil.isAccessible(place, field)) { return true; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/MixinMemberContributor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/MixinMemberContributor.java index eae91242c3ff..d3fdd924c3e4 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/MixinMemberContributor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/MixinMemberContributor.java @@ -137,8 +137,7 @@ public final class MixinMemberContributor { @Override public boolean execute(@NotNull PsiElement element, @NotNull ResolveState state) { - if (element instanceof PsiMethod && GdkMethodUtil.isCategoryMethod((PsiMethod)element, myType, myPlace, state.get(PsiSubstitutor.KEY))) { - PsiMethod method = (PsiMethod)element; + if (element instanceof PsiMethod method && GdkMethodUtil.isCategoryMethod((PsiMethod)element, myType, myPlace, state.get(PsiSubstitutor.KEY))) { String originInfo = getOriginInfoForCategory(method); return super.execute(GrGdkMethodImpl.createGdkMethod(method, false, originInfo), state); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java index bd2ac656d35f..a0c7ddcf74f7 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java @@ -69,8 +69,7 @@ public class MethodResolverProcessor extends ResolverProcessor extends G } protected boolean isAccessible(@NotNull PsiNamedElement namedElement) { - if (namedElement instanceof GrField) { - final GrField field = (GrField)namedElement; + if (namedElement instanceof GrField field) { if (PsiUtil.isAccessible(myPlace, field)) { return true; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessorImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessorImpl.java index 41f78157d64b..746c3ee88ef5 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessorImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessorImpl.java @@ -51,8 +51,7 @@ public class ResolverProcessorImpl extends ResolverProcessor(); if (!myProcessedClasses.add(aClass.getQualifiedName())) { return true; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/providers/PropertiesReferenceProvider.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/providers/PropertiesReferenceProvider.java index e7830f978c1c..8c733579b848 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/providers/PropertiesReferenceProvider.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/providers/PropertiesReferenceProvider.java @@ -37,8 +37,7 @@ public class PropertiesReferenceProvider extends PsiReferenceProvider { public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) { Object value = null; - if (element instanceof GrLiteral) { - GrLiteral literalExpression = (GrLiteral) element; + if (element instanceof GrLiteral literalExpression) { value = literalExpression.getValue(); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/BaseScriptTransformationSupport.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/BaseScriptTransformationSupport.java index 76ae4f65b302..6d3c56d69c53 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/BaseScriptTransformationSupport.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/BaseScriptTransformationSupport.java @@ -35,8 +35,7 @@ public class BaseScriptTransformationSupport implements AstTransformationSupport @Override public void applyTransformation(@NotNull TransformationContext context) { - if (!(context.getCodeClass() instanceof GroovyScriptClass)) return; - GroovyScriptClass scriptClass = (GroovyScriptClass)context.getCodeClass(); + if (!(context.getCodeClass() instanceof GroovyScriptClass scriptClass)) return; LightMethodBuilder mainMethod = new LightMethodBuilder(scriptClass.getManager(), GroovyLanguage.INSTANCE, "main") .setMethodReturnType(PsiTypes.voidType()) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/DelegateTransformationSupport.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/DelegateTransformationSupport.java index 0b1d02ab317a..dc343e3bb12d 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/DelegateTransformationSupport.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/DelegateTransformationSupport.java @@ -110,9 +110,8 @@ public class DelegateTransformationSupport implements AstTransformationSupport { @Override public boolean execute(@NotNull PsiElement element, @NotNull ResolveState state) { - if (!(element instanceof PsiMethod)) return true; + if (!(element instanceof PsiMethod method)) return true; - PsiMethod method = (PsiMethod)element; if (!myIgnoreCondition.value(method)) return true; PsiSubstitutor substitutor = state.get(PsiSubstitutor.KEY); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/FieldScriptTransformationSupport.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/FieldScriptTransformationSupport.java index 80721b785363..3c074d1be1d9 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/FieldScriptTransformationSupport.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/FieldScriptTransformationSupport.java @@ -21,8 +21,7 @@ public class FieldScriptTransformationSupport implements AstTransformationSuppor @Override public void applyTransformation(@NotNull TransformationContext context) { - if (!(context.getCodeClass() instanceof GroovyScriptClass)) return; - final GroovyScriptClass scriptClass = (GroovyScriptClass)context.getCodeClass(); + if (!(context.getCodeClass() instanceof GroovyScriptClass scriptClass)) return; final GroovyFile containingFile = scriptClass.getContainingFile(); Project project = containingFile.getProject(); if (isGroovySourceFile(containingFile) && !PsiSearchHelper.getInstance(project).hasIdentifierInFile(containingFile, FIELD)) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyChangeContextUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyChangeContextUtil.java index 208817ff5cec..96dfa195463d 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyChangeContextUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyChangeContextUtil.java @@ -39,8 +39,7 @@ public final class GroovyChangeContextUtil { element.putCopyableUserData(KEY_ENCODED, KEY_ENCODED); thisExpr.putCopyableUserData(QUALIFIER_CLASS_KEY, containingClass); } - else if (element instanceof GrReferenceExpression) { - GrReferenceExpression refExpr = (GrReferenceExpression)element; + else if (element instanceof GrReferenceExpression refExpr) { final GrExpression qualifier = refExpr.getQualifierExpression(); if (qualifier == null) { PsiElement refElement = refExpr.resolve(); @@ -87,9 +86,8 @@ public final class GroovyChangeContextUtil { } } - else if (element instanceof GrReferenceExpression) { + else if (element instanceof GrReferenceExpression refExpr) { final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(element.getProject()); - final GrReferenceExpression refExpr = (GrReferenceExpression)element; final PsiElement resolvedElement = refExpr.resolve(); final PsiMember memberRef = refExpr.getCopyableUserData(REF_TO_MEMBER); refExpr.putCopyableUserData(REF_TO_MEMBER, null); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyOverrideImplementUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyOverrideImplementUtil.java index b7d84432d816..09c76a5f3668 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyOverrideImplementUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyOverrideImplementUtil.java @@ -224,8 +224,7 @@ public final class GroovyOverrideImplementUtil { for (Iterator iterator = candidates.iterator(); iterator.hasNext(); ) { CandidateInfo candidate = iterator.next(); PsiElement element = candidate.getElement(); - if (element instanceof GrMethod) { - GrMethod method = (GrMethod)element; + if (element instanceof GrMethod method) { if (GrTraitUtil.isTrait(method.getContainingClass()) && !GrTraitUtil.isMethodAbstract(method)) { iterator.remove(); secondary.add(candidate); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/LibrariesUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/LibrariesUtil.java index 0fe02cace6ab..8455cc0de751 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/LibrariesUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/LibrariesUtil.java @@ -53,8 +53,7 @@ public final class LibrariesUtil { } for (OrderEntry entry : ModuleRootManager.getInstance(module).getOrderEntries()) { - if (entry instanceof LibraryOrderEntry) { - LibraryOrderEntry libEntry = (LibraryOrderEntry)entry; + if (entry instanceof LibraryOrderEntry libEntry) { if (exportedOnly && !libEntry.isExported()) { continue; } diff --git a/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrConcatenationAwareInjector.java b/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrConcatenationAwareInjector.java index cf5455cd6087..e5731042e74f 100644 --- a/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrConcatenationAwareInjector.java +++ b/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrConcatenationAwareInjector.java @@ -135,8 +135,7 @@ public final class GrConcatenationAwareInjector implements ConcatenationAwareInj if (methodName != null && areThereInjectionsWithName(methodName, false)) { final GroovyResolveResult result = methodCall.advancedResolve(); PsiElement element = result.getElement(); - if (element instanceof PsiMethod) { - PsiMethod method = (PsiMethod)element; + if (element instanceof PsiMethod method) { final PsiParameter[] parameters = method.getParameterList().getParameters(); int index = GrInjectionUtil.findParameterIndex(expression, methodCall); if (index >= 0) { @@ -160,8 +159,7 @@ public final class GrConcatenationAwareInjector implements ConcatenationAwareInj if (myConfiguration.getAdvancedConfiguration().getDfaOption() != Configuration.DfaOption.OFF && visitedVars.add(variable)) { ReferencesSearch.search(variable, searchScope).forEach(psiReference -> { final PsiElement element = psiReference.getElement(); - if (element instanceof GrExpression) { - final GrExpression refExpression = (GrExpression)element; + if (element instanceof GrExpression refExpression) { places.add(refExpression); if (!myUnparsable) { myUnparsable = checkUnparsableReference(refExpression); @@ -254,8 +252,7 @@ public final class GrConcatenationAwareInjector implements ConcatenationAwareInj private static boolean checkUnparsableReference(GrExpression expression) { final PsiElement parent = expression.getParent(); - if (parent instanceof GrAssignmentExpression) { - final GrAssignmentExpression assignmentExpression = (GrAssignmentExpression)parent; + if (parent instanceof GrAssignmentExpression assignmentExpression) { final IElementType operation = assignmentExpression.getOperationTokenType(); if (assignmentExpression.getLValue() == expression && operation == GroovyTokenTypes.mPLUS_ASSIGN ) { return true; diff --git a/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrConcatenationInjector.java b/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrConcatenationInjector.java index 2076cd7076c5..927a3bf36dda 100644 --- a/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrConcatenationInjector.java +++ b/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrConcatenationInjector.java @@ -82,8 +82,7 @@ public final class GrConcatenationInjector implements MultiHostInjector { else if (parent instanceof GrArgumentList) { final PsiElement pparent = parent.getParent(); - if (pparent instanceof GrCall) { - final GrCall call = (GrCall)pparent; + if (pparent instanceof GrCall call) { final GroovyResolveResult result = call.advancedResolve(); if (result.getElement() != null) { final Map> map = diff --git a/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrInjectionUtil.java b/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrInjectionUtil.java index 35bf505842a3..21d216e64ba7 100644 --- a/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrInjectionUtil.java +++ b/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrInjectionUtil.java @@ -22,13 +22,12 @@ import java.util.Map; public final class GrInjectionUtil { static int findParameterIndex(PsiElement arg, GrCall call) { final GroovyResolveResult result = call.advancedResolve(); - if (!(result.getElement() instanceof PsiMethod)) return -1; + if (!(result.getElement() instanceof PsiMethod method)) return -1; final Map> map = GrClosureSignatureUtil .mapArgumentsToParameters(result, call, false, false, call.getNamedArguments(), call.getExpressionArguments(), call.getClosureArguments()); if (map == null) return -1; - final PsiMethod method = (PsiMethod)result.getElement(); final PsiParameter parameter = map.get(arg).first; if (parameter == null) return -1; @@ -60,8 +59,7 @@ public final class GrInjectionUtil { return visitor.visitAnnotationParameter((GrAnnotationNameValuePair)element, (PsiAnnotation)parent.getParent()); } - if (parent instanceof GrAssignmentExpression) { - final GrAssignmentExpression p = (GrAssignmentExpression)parent; + if (parent instanceof GrAssignmentExpression p) { if (p.getRValue() == element || p.getOperationTokenType() == GroovyTokenTypes.mPLUS_ASSIGN) { final GrExpression left = p.getLValue(); if (left instanceof GrReferenceExpression) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassFix.java index 04b857a7d0f2..72c4b427921b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassFix.java @@ -48,8 +48,7 @@ public abstract class CreateClassFix { @Override protected void processIntention(@NotNull PsiElement element, @NotNull Project project, Editor editor) throws IncorrectOperationException { final PsiFile file = element.getContainingFile(); - if (!(file instanceof GroovyFileBase)) return; - GroovyFileBase groovyFile = (GroovyFileBase)file; + if (!(file instanceof GroovyFileBase groovyFile)) return; final PsiManager manager = myRefElement.getManager(); final String qualifier = ReadAction.compute(() -> groovyFile instanceof GroovyFile ? groovyFile.getPackageName() : ""); @@ -113,8 +112,7 @@ public abstract class CreateClassFix { @Override protected void processIntention(@NotNull PsiElement element, @NotNull Project project, Editor editor) throws IncorrectOperationException { final PsiFile file = element.getContainingFile(); - if (!(file instanceof GroovyFileBase)) return; - GroovyFileBase groovyFile = (GroovyFileBase)file; + if (!(file instanceof GroovyFileBase groovyFile)) return; PsiElement qualifier = myRefElement.getQualifier(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java index a81ca257e37d..992419581467 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java @@ -89,8 +89,7 @@ public class DynamicManagerImpl extends DynamicManager { window.activate(() -> { final Object rootObject = myTreeTableModel.getRoot(); - if (!(rootObject instanceof DefaultMutableTreeNode)) return; - final DefaultMutableTreeNode rootNode = (DefaultMutableTreeNode) rootObject; + if (!(rootObject instanceof DefaultMutableTreeNode rootNode)) return; DefaultMutableTreeNode node = new DefaultMutableTreeNode(itemElement); if (rootNode.getChildCount() > 0) { @@ -99,9 +98,8 @@ public class DynamicManagerImpl extends DynamicManager { classNode = (DefaultMutableTreeNode) rootNode.getChildAfter(classNode)) { final Object classRow = classNode.getUserObject(); - if (!(classRow instanceof DClassElement)) return; + if (!(classRow instanceof DClassElement otherClassName)) return; - DClassElement otherClassName = (DClassElement) classRow; if (otherClassName.equals(classElement)) { int index = getIndexToInsert(classNode, itemElement); classNode.insert(node, index); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java index 0f8f9cd3f857..e7ebc35f2fee 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java @@ -286,12 +286,11 @@ public final class DynamicToolWindowWrapper { final Object editingPropertyObject = myTreeTable.getValueAt(tree.getRowForPath(editingTypePath), CLASS_OR_ELEMENT_NAME_COLUMN); final Object editingClassObject = myTreeTable.getValueAt(tree.getRowForPath(editingClassPath), CLASS_OR_ELEMENT_NAME_COLUMN); - if (!(editingPropertyObject instanceof DItemElement) || !(editingClassObject instanceof DClassElement)) { + if (!(editingPropertyObject instanceof DItemElement dynamicElement) || !(editingClassObject instanceof DClassElement)) { myTreeTable.editingStopped(e); return; } - final DItemElement dynamicElement = (DItemElement)editingPropertyObject; final String name = dynamicElement.getName(); final String className = ((DClassElement)editingClassObject).getName(); @@ -407,11 +406,8 @@ public final class DynamicToolWindowWrapper { final Object classRow = parent.getLastPathComponent(); final Object dynamicRow = selectionPath.getLastPathComponent(); - if (!(classRow instanceof DefaultMutableTreeNode)) return; - if (!(dynamicRow instanceof DefaultMutableTreeNode)) return; - - final DefaultMutableTreeNode dynamicItemNode = (DefaultMutableTreeNode)dynamicRow; - final DefaultMutableTreeNode classNode = (DefaultMutableTreeNode)classRow; + if (!(classRow instanceof DefaultMutableTreeNode classNode)) return; + if (!(dynamicRow instanceof DefaultMutableTreeNode dynamicItemNode)) return; final boolean removeClass = classNode.getChildCount() == 1; if (!removeDynamicElement(dynamicItemNode, isShowDialog, rowsCount)) return; @@ -563,8 +559,7 @@ public final class DynamicToolWindowWrapper { append(classShortName, SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES); } - if (value instanceof DItemElement) { - final DItemElement itemElement = ((DItemElement)value); + if (value instanceof DItemElement itemElement) { final String name = itemElement.getName(); appendName(name); @@ -673,14 +668,12 @@ public final class DynamicToolWindowWrapper { if (path == null) return null; final Object selectedObject = path.getLastPathComponent(); - if (!(selectedObject instanceof DefaultMutableTreeNode)) return null; + if (!(selectedObject instanceof DefaultMutableTreeNode selectedNode)) return null; - final DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode)selectedObject; final Object userObject = selectedNode.getUserObject(); if (!(userObject instanceof DNamedElement)) return null; - if (userObject instanceof DClassElement) { - final DClassElement classElement = (DClassElement)userObject; + if (userObject instanceof DClassElement classElement) { try { PsiType type = JavaPsiFacade.getElementFactory(myProject).createTypeFromText(classElement.getName(), null); @@ -696,8 +689,7 @@ public final class DynamicToolWindowWrapper { catch (IncorrectOperationException e) { return null; } - } else if (userObject instanceof DItemElement) { - final DItemElement itemElement = (DItemElement)userObject; + } else if (userObject instanceof DItemElement itemElement) { final TreeNode parentNode = selectedNode.getParent(); if (!(parentNode instanceof DefaultMutableTreeNode)) return null; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitMethod.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitMethod.java index 35ff9be427a5..32e9225f4521 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitMethod.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitMethod.java @@ -137,9 +137,8 @@ public class GrDynamicImplicitMethod extends GrLightMethodBuilder implements GrD Object root = model.getRoot(); - if (!(root instanceof DefaultMutableTreeNode)) return; + if (!(root instanceof DefaultMutableTreeNode treeRoot)) return; - DefaultMutableTreeNode treeRoot = ((DefaultMutableTreeNode) root); DefaultMutableTreeNode desiredNode; JavaPsiFacade facade = JavaPsiFacade.getInstance(getProject()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitProperty.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitProperty.java index fb381d2fee9c..629a306ff55d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitProperty.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitProperty.java @@ -91,9 +91,8 @@ public class GrDynamicImplicitProperty extends GrImplicitVariableImpl implements Object root = model.getRoot(); - if (!(root instanceof DefaultMutableTreeNode)) return; + if (!(root instanceof DefaultMutableTreeNode treeRoot)) return; - DefaultMutableTreeNode treeRoot = ((DefaultMutableTreeNode) root); final PsiClass psiClass = getContainingClassElement(); if (psiClass == null) return; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GroovyMarkerTypes.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GroovyMarkerTypes.java index 092d0c5ea021..4d9b89ef62f1 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GroovyMarkerTypes.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GroovyMarkerTypes.java @@ -50,8 +50,7 @@ import java.util.*; public final class GroovyMarkerTypes { static final MarkerType OVERRIDING_PROPERTY_TYPE = new MarkerType("OVERRIDING_PROPERTY_TYPE", psiElement -> { final PsiElement parent = psiElement.getParent(); - if (!(parent instanceof GrField)) return null; - final GrField field = (GrField)parent; + if (!(parent instanceof GrField field)) return null; final List accessors = GroovyPropertyUtils.getFieldAccessors(field); StringBuilder builder = new StringBuilder(); @@ -85,8 +84,7 @@ public final class GroovyMarkerTypes { @Override public void browse(MouseEvent e, PsiElement element) { PsiElement parent = element.getParent(); - if (!(parent instanceof GrField)) return; - final GrField field = (GrField)parent; + if (!(parent instanceof GrField field)) return; final List accessors = GroovyPropertyUtils.getFieldAccessors(field); final ArrayList superMethods = new ArrayList<>(); for (GrAccessorMethod method : accessors) { @@ -128,7 +126,7 @@ public final class GroovyMarkerTypes { @Override public void browse(MouseEvent e, PsiElement element) { PsiElement parent = element.getParent(); - if (!(parent instanceof GrField)) return; + if (!(parent instanceof GrField field)) return; if (DumbService.isDumb(element.getProject())) { DumbService.getInstance(element.getProject()).showDumbModeNotification( GroovyBundle.message("popup.content.navigation.to.overriding.classes.unavailable") @@ -136,8 +134,6 @@ public final class GroovyMarkerTypes { return; } - final GrField field = (GrField)parent; - Set result = new HashSet<>(); Processor collectProcessor = Processors.cancelableCollectProcessor(result); @@ -162,8 +158,7 @@ public final class GroovyMarkerTypes { public static final MarkerType GR_OVERRIDING_METHOD = new MarkerType("GR_OVERRIDING_METHOD", (NullableFunction)element -> { PsiElement parent = element.getParent(); - if (!(parent instanceof GrMethod)) return null; - GrMethod method = (GrMethod)parent; + if (!(parent instanceof GrMethod method)) return null; Set superMethods = collectSuperMethods(method); if (superMethods.isEmpty()) return null; @@ -186,8 +181,7 @@ public final class GroovyMarkerTypes { @Override public void browse(MouseEvent e, PsiElement element) { PsiElement parent = element.getParent(); - if (!(parent instanceof GrMethod)) return; - GrMethod method = (GrMethod)parent; + if (!(parent instanceof GrMethod method)) return; Set superMethods = collectSuperMethods(method); if (superMethods.isEmpty()) return; @@ -201,8 +195,7 @@ public final class GroovyMarkerTypes { public static final MarkerType GR_OVERRIDDEN_METHOD = new MarkerType("GR_OVERRIDEN_METHOD", (NullableFunction)element -> { PsiElement parent = element.getParent(); - if (!(parent instanceof GrMethod)) return null; - GrMethod method = (GrMethod)parent; + if (!(parent instanceof GrMethod method)) return null; final PsiElementProcessor.CollectElementsWithLimit processor = new PsiElementProcessor.CollectElementsWithLimit<>(5); @@ -239,7 +232,7 @@ public final class GroovyMarkerTypes { @Override public void browse(MouseEvent e, PsiElement element) { PsiElement parent = element.getParent(); - if (!(parent instanceof GrMethod)) return; + if (!(parent instanceof GrMethod method)) return; if (DumbService.isDumb(element.getProject())) { DumbService.getInstance(element.getProject()).showDumbModeNotification( GroovyBundle.message("popup.content.navigation.to.overriding.classes.unavailable")); @@ -248,7 +241,6 @@ public final class GroovyMarkerTypes { //collect all overrings (including fields with implicit accessors and method with default parameters) - final GrMethod method = (GrMethod)parent; final PsiElementProcessor.CollectElementsWithLimit collectProcessor = new PsiElementProcessor.CollectElementsWithLimit<>(2, new HashSet<>()); if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> ApplicationManager.getApplication().runReadAction(() -> { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/navigation/actions/GroovyGotoSuperHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/navigation/actions/GroovyGotoSuperHandler.java index c116c9ca9eb6..1764fde1c5a5 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/navigation/actions/GroovyGotoSuperHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/navigation/actions/GroovyGotoSuperHandler.java @@ -90,8 +90,7 @@ public class GroovyGotoSuperHandler extends GotoTargetHandler implements Languag } private static PsiElement @NotNull [] findTargets(@NotNull PsiMember e) { - if (e instanceof PsiClass) { - PsiClass aClass = (PsiClass)e; + if (e instanceof PsiClass aClass) { List allSupers = new ArrayList<>(Arrays.asList(aClass.getSupers())); for (Iterator iterator = allSupers.iterator(); iterator.hasNext(); ) { PsiClass superClass = iterator.next(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ClashingTraitMethodsInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ClashingTraitMethodsInspection.java index 76ba3147a9a5..9c7d25b6c646 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ClashingTraitMethodsInspection.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ClashingTraitMethodsInspection.java @@ -34,8 +34,7 @@ public class ClashingTraitMethodsInspection extends ClashingTraitMethodsInspecti public void applyFix(@NotNull Project project, @NotNull final ProblemDescriptor descriptor) { PsiElement element = descriptor.getPsiElement(); PsiElement parent = element.getParent(); - if (parent instanceof GrTypeDefinition && ((GrTypeDefinition)parent).getNameIdentifierGroovy() == element) { - final GrTypeDefinition aClass = (GrTypeDefinition)parent; + if (parent instanceof GrTypeDefinition aClass && ((GrTypeDefinition)parent).getNameIdentifierGroovy() == element) { final List clashingMethods = collectClassingMethods(aClass); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/spellchecker/GrDocCommentTokenizer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/spellchecker/GrDocCommentTokenizer.java index 06efa3486f7c..7282a4418856 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/spellchecker/GrDocCommentTokenizer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/spellchecker/GrDocCommentTokenizer.java @@ -37,8 +37,7 @@ public class GrDocCommentTokenizer extends Tokenizer { final CommentSplitter splitter = CommentSplitter.getInstance(); for (PsiElement el : comment.getChildren()) { - if (el instanceof PsiDocTag) { - PsiDocTag tag = (PsiDocTag)el; + if (el instanceof PsiDocTag tag) { if (!excludedTags.contains(tag.getName())) { for (PsiElement data : tag.getDataElements()) { consumer.consumeToken(data, splitter); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrReferenceAdjuster.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrReferenceAdjuster.java index 3e59ddc9c345..152d5782c91e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrReferenceAdjuster.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrReferenceAdjuster.java @@ -144,8 +144,7 @@ public class GrReferenceAdjuster implements ReferenceAdjuster { return false; } - if (resolved instanceof PsiClass) { - final PsiClass clazz = (PsiClass)resolved; + if (resolved instanceof PsiClass clazz) { final String qName = clazz.getQualifiedName(); if (qName != null && addImports && checkIsInnerClass(clazz, ref) && mayInsertImport(ref)) { final GroovyFileBase file = (GroovyFileBase)ref.getContainingFile(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyEditorTextProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyEditorTextProvider.java index 20baa596a5ab..990012303bb3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyEditorTextProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyEditorTextProvider.java @@ -40,12 +40,10 @@ public class GroovyEditorTextProvider implements EditorTextProvider { String result = ""; PsiElement element = findExpressionInner(elementAtCaret, true); if (element != null) { - if (element instanceof GrReferenceExpression) { - final GrReferenceExpression reference = (GrReferenceExpression)element; + if (element instanceof GrReferenceExpression reference) { if (reference.getQualifier() == null) { final PsiElement resolved = reference.resolve(); - if (resolved instanceof PsiEnumConstant) { - final PsiEnumConstant enumConstant = (PsiEnumConstant)resolved; + if (resolved instanceof PsiEnumConstant enumConstant) { final PsiClass enumClass = enumConstant.getContainingClass(); if (enumClass != null) { result = enumClass.getName() + "." + enumConstant.getName(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java index 4544cf9ccb02..c2b627e8f3ce 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java @@ -113,8 +113,7 @@ public class GroovyPositionManager extends PositionManagerEx { if (fileType == UnknownFileType.INSTANCE) { return ThreeState.UNSURE; } - if (fileType instanceof LanguageFileType) { - LanguageFileType languageFileType = (LanguageFileType)fileType; + if (fileType instanceof LanguageFileType languageFileType) { if (languageFileType.getLanguage() == GroovyLanguage.INSTANCE) { return ThreeState.YES; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyReferenceCopyPasteProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyReferenceCopyPasteProcessor.java index b881245cfb80..f8f73e4959ef 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyReferenceCopyPasteProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyReferenceCopyPasteProcessor.java @@ -87,8 +87,7 @@ public class GroovyReferenceCopyPasteProcessor extends CopyPasteReferenceProcess int endOffset = data.endOffset + bounds.getStartOffset(); PsiElement element = file.findElementAt(startOffset); - if (element != null && element.getParent() instanceof GrReferenceElement && !PsiUtil.isThisOrSuperRef(element.getParent())) { - GrReferenceElement reference = (GrReferenceElement)element.getParent(); + if (element != null && element.getParent() instanceof GrReferenceElement reference && !PsiUtil.isThisOrSuperRef(element.getParent())) { TextRange range = reference.getTextRange(); if (range.getStartOffset() == startOffset && range.getEndOffset() == endOffset) { if (data.staticMemberName == null) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyArgListSelectioner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyArgListSelectioner.java index 6d0b6b9ad3f5..0d7776c4ac90 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyArgListSelectioner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyArgListSelectioner.java @@ -37,8 +37,7 @@ public class GroovyArgListSelectioner extends ExtendWordSelectionHandlerBase { public List select(@NotNull PsiElement element, @NotNull CharSequence editorText, int cursorOffset, @NotNull Editor editor) { List result = super.select(element, editorText, cursorOffset, editor); - if (element instanceof GrArgumentList) { - GrArgumentList args = ((GrArgumentList) element); + if (element instanceof GrArgumentList args) { TextRange range = args.getTextRange(); if (range.contains(cursorOffset)) { PsiElement leftParen = args.getLeftParen(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyBlockStatementsSelectioner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyBlockStatementsSelectioner.java index d8f984800135..7c7c77cf7127 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyBlockStatementsSelectioner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyBlockStatementsSelectioner.java @@ -37,8 +37,7 @@ public class GroovyBlockStatementsSelectioner extends ExtendWordSelectionHandler public List select(@NotNull PsiElement e, @NotNull CharSequence editorText, int cursorOffset, @NotNull Editor editor) { List result = super.select(e, editorText, cursorOffset, editor); - if (e instanceof GrCodeBlock) { - GrCodeBlock block = ((GrCodeBlock)e); + if (e instanceof GrCodeBlock block) { int startOffset = findOpeningBrace(block); int endOffset = findClosingBrace(block, startOffset); TextRange range = new TextRange(startOffset, endOffset); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyDocParamsSelectioner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyDocParamsSelectioner.java index 72e2501b7d04..ed6047562f81 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyDocParamsSelectioner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyDocParamsSelectioner.java @@ -35,8 +35,7 @@ public class GroovyDocParamsSelectioner extends ExtendWordSelectionHandlerBase { public List select(@NotNull PsiElement element, @NotNull CharSequence editorText, int cursorOffset, @NotNull Editor editor) { List result = super.select(element, editorText, cursorOffset, editor); - if (element instanceof GrDocMethodParams) { - GrDocMethodParams params = ((GrDocMethodParams) element); + if (element instanceof GrDocMethodParams params) { TextRange range = params.getTextRange(); if (range.contains(cursorOffset)) { PsiElement leftParen = params.getLeftParen(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyElseSelectioner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyElseSelectioner.java index a1cdf7111afe..5f3646501083 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyElseSelectioner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyElseSelectioner.java @@ -38,9 +38,8 @@ public class GroovyElseSelectioner extends ExtendWordSelectionHandlerBase { @Nullable @Override public List select(@NotNull PsiElement e, @NotNull CharSequence editorText, int cursorOffset, @NotNull Editor editor) { - if (!(e instanceof GrIfStatement)) return null; + if (!(e instanceof GrIfStatement ifSt)) return null; - GrIfStatement ifSt = (GrIfStatement)e; GrStatement branch = ifSt.getElseBranch(); PsiElement elseKeyword = ifSt.getElseKeyword(); if (branch == null || elseKeyword == null) return null; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeCastSelectioner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeCastSelectioner.java index 7e43f1e8f475..4009b030485d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeCastSelectioner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeCastSelectioner.java @@ -36,8 +36,7 @@ public class GroovyTypeCastSelectioner extends ExtendWordSelectionHandlerBase { public List select(@NotNull PsiElement e, @NotNull CharSequence editorText, int cursorOffset, @NotNull Editor editor) { List result = super.select(e, editorText, cursorOffset, editor); - if (e instanceof GrTypeCastExpression) { - GrTypeCastExpression castExpression = ((GrTypeCastExpression) e); + if (e instanceof GrTypeCastExpression castExpression) { GrTypeElement type = castExpression.getCastTypeElement(); TextRange range = type.getTextRange(); if (range.contains(cursorOffset)) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeDefinitionBodySelectioner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeDefinitionBodySelectioner.java index 49098d64a0a0..1e52aee991cb 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeDefinitionBodySelectioner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeDefinitionBodySelectioner.java @@ -35,8 +35,7 @@ public class GroovyTypeDefinitionBodySelectioner extends ExtendWordSelectionHand public List select(@NotNull PsiElement e, @NotNull CharSequence editorText, int cursorOffset, @NotNull Editor editor) { List result = super.select(e, editorText, cursorOffset, editor); - if (e instanceof GrTypeDefinitionBody) { - GrTypeDefinitionBody block = ((GrTypeDefinitionBody)e); + if (e instanceof GrTypeDefinitionBody block) { int startOffset = findOpeningBrace(block); int endOffset = findClosingBrace(block, startOffset); TextRange range = new TextRange(startOffset, endOffset); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GeeseUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GeeseUtil.java index 595c27031146..8d8c90af83f4 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GeeseUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GeeseUtil.java @@ -82,8 +82,7 @@ public final class GeeseUtil { //search for start of the line cur = parent; - if (cur.getParent() instanceof GrMethodCall) { - GrMethodCall call = (GrMethodCall)cur.getParent(); + if (cur.getParent() instanceof GrMethodCall call) { GrExpression invoked = call.getInvokedExpression(); if (invoked instanceof GrReferenceExpression && ((GrReferenceExpression)invoked).getReferenceNameElement() != null) { cur = ((GrReferenceExpression)invoked).getReferenceNameElement(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlockGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlockGenerator.java index 0439dcd96b7d..15304f1d029f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlockGenerator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlockGenerator.java @@ -235,11 +235,10 @@ public class GroovyBlockGenerator { } boolean classLevel = blockPsi instanceof GrTypeDefinitionBody; - if (blockPsi instanceof GrClosableBlock && + if (blockPsi instanceof GrClosableBlock closableBlock && ((GrClosableBlock)blockPsi).getArrow() != null && ((GrClosableBlock)blockPsi).getParameters().length > 0 && !getClosureBodyVisibleChildren(myNode).isEmpty()) { - GrClosableBlock closableBlock = (GrClosableBlock)blockPsi; ArrayList blocks = new ArrayList<>(); @@ -745,8 +744,7 @@ public class GroovyBlockGenerator { private void addBinaryChildrenRecursively(PsiElement elem, List list, Indent indent, @Nullable AlignmentProvider.Aligner aligner) { if (elem == null) return; // For binary expressions - if ((elem instanceof GrBinaryExpression)) { - GrBinaryExpression myExpr = ((GrBinaryExpression) elem); + if ((elem instanceof GrBinaryExpression myExpr)) { if (myExpr.getLeftOperand() instanceof GrBinaryExpression) { addBinaryChildrenRecursively(myExpr.getLeftOperand(), list, getContinuationWithoutFirstIndent(), aligner); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantUtils.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantUtils.java index 75a5344ba4ad..2f19dc345c6a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantUtils.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantUtils.java @@ -34,8 +34,7 @@ public final class GantUtils { public static GrArgumentLabel[] getScriptTargets(GroovyFile file) { ArrayList labels = new ArrayList<>(); for (PsiElement child : file.getChildren()) { - if (child instanceof GrMethodCallExpression) { - GrMethodCallExpression call = (GrMethodCallExpression)child; + if (child instanceof GrMethodCallExpression call) { GrNamedArgument[] arguments = call.getNamedArguments(); if (arguments.length == 1) { GrArgumentLabel label = arguments[0].getLabel(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java index 9106d6a181ad..4a8a48d380f8 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java @@ -222,8 +222,7 @@ public class GrabDependencies implements IntentionAction { file.acceptChildren(new PsiRecursiveElementWalkingVisitor() { @Override public void visitElement(@NotNull PsiElement element) { - if (element instanceof GrAnnotation) { - GrAnnotation anno = (GrAnnotation)element; + if (element instanceof GrAnnotation anno) { String qname = anno.getQualifiedName(); if (GrabAnnos.GRAB_ANNO.equals(qname)) grabs.add(anno); else if (GrabAnnos.GRAB_EXCLUDE_ANNO.equals(qname)) excludes.add(anno); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/aliasImport/GrAliasImportIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/aliasImport/GrAliasImportIntention.java index 84b93cc50728..eff3fd38b75a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/aliasImport/GrAliasImportIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/aliasImport/GrAliasImportIntention.java @@ -51,8 +51,7 @@ public class GrAliasImportIntention extends Intention { protected void processIntention(@NotNull PsiElement element, @NotNull Project project, Editor editor) throws IncorrectOperationException { final GrImportStatement context; final PsiMember resolved; - if (element instanceof GrReferenceExpression) { - GrReferenceExpression ref = (GrReferenceExpression)element; + if (element instanceof GrReferenceExpression ref) { GroovyResolveResult result = ref.advancedResolve(); context = (GrImportStatement)result.getCurrentFileResolveContext(); assert context != null; @@ -180,8 +179,7 @@ public class GrAliasImportIntention extends Intention { if (usageElement.getParent() instanceof GrImportStatement) return; - if (usageElement instanceof GrReferenceElement) { - final GrReferenceElement ref = (GrReferenceElement)usageElement; + if (usageElement instanceof GrReferenceElement ref) { final PsiElement qualifier = ref.getQualifier(); if (qualifier == null) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/EachToForIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/EachToForIntention.java index e4de2abe06f2..23526b017ba0 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/EachToForIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/EachToForIntention.java @@ -212,17 +212,15 @@ public class EachToForIntention extends Intention { private static class EachToForPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (element instanceof GrMethodCallExpression) { - final GrMethodCallExpression expression = (GrMethodCallExpression)element; -// final PsiElement parent = expression.getParent(); + if (element instanceof GrMethodCallExpression expression) { + // final PsiElement parent = expression.getParent(); // if (parent instanceof GrAssignmentExpression) return false; // if (parent instanceof GrArgumentList) return false; // if (parent instanceof GrReturnStatement) return false; // if (!(parent instanceof GrCodeBlock || parent instanceof GrIfStatement|| parent instanceof GrCaseSection)) return false; final GrExpression invokedExpression = expression.getInvokedExpression(); - if (invokedExpression instanceof GrReferenceExpression) { - GrReferenceExpression referenceExpression = (GrReferenceExpression)invokedExpression; + if (invokedExpression instanceof GrReferenceExpression referenceExpression) { if ("each".equals(referenceExpression.getReferenceName())) { final GrArgumentList argumentList = expression.getArgumentList(); if (PsiImplUtil.hasExpressionArguments(argumentList)) return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ForToEachPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ForToEachPredicate.java index a0dd25f90509..97374af40fd9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ForToEachPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ForToEachPredicate.java @@ -27,10 +27,9 @@ class ForToEachPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrForStatement)) { + if (!(element instanceof GrForStatement statement)) { return false; } - final GrForStatement statement = (GrForStatement) element; final GrForClause clause = statement.getClause(); if (!(clause instanceof GrForInClause) || ((GrForInClause) clause).getIteratedExpression() == null) { return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToCStyleCommentIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToCStyleCommentIntention.java index b3e1e729792a..25057ba15530 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToCStyleCommentIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToCStyleCommentIntention.java @@ -110,10 +110,9 @@ public class ChangeToCStyleCommentIntention extends Intention { } private boolean isEndOfLineComment(PsiElement element) { - if (!(element instanceof PsiComment)) { + if (!(element instanceof PsiComment comment)) { return false; } - final PsiComment comment = (PsiComment) element; final IElementType tokenType = comment.getTokenType(); return GroovyTokenTypes.mSL_COMMENT.equals(tokenType); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/EndOfLineCommentPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/EndOfLineCommentPredicate.java index c5b9d10655a1..a23ad413d86e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/EndOfLineCommentPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/EndOfLineCommentPredicate.java @@ -27,13 +27,12 @@ class EndOfLineCommentPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof PsiComment)) { + if (!(element instanceof PsiComment comment)) { return false; } if (element instanceof PsiDocComment) { return false; } - final PsiComment comment = (PsiComment) element; final IElementType type = comment.getTokenType(); return GroovyTokenTypes.mSL_COMMENT.equals(type); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ComparisonPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ComparisonPredicate.java index 06e63697f3d2..77a48756243c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ComparisonPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ComparisonPredicate.java @@ -26,10 +26,9 @@ class ComparisonPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrBinaryExpression)) { + if (!(element instanceof GrBinaryExpression expression)) { return false; } - final GrBinaryExpression expression = (GrBinaryExpression) element; if (!ComparisonUtils.isComparison(expression)) { return false; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java index 7b1df16ac649..ebeffc4f4a19 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java @@ -107,8 +107,7 @@ public class DemorgansLawIntention extends MutablyNamedIntention { } private static boolean isConjunctionExpression(PsiElement exp, IElementType conjunctionType) { - if (!(exp instanceof GrBinaryExpression)) return false; - final GrBinaryExpression binExp = (GrBinaryExpression)exp; + if (!(exp instanceof GrBinaryExpression binExp)) return false; final IElementType tokenType = binExp.getOperationTokenType(); return conjunctionType.equals(tokenType); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ExpandBooleanPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ExpandBooleanPredicate.java index e299029cd188..9c14edf6d636 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ExpandBooleanPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ExpandBooleanPredicate.java @@ -16,19 +16,16 @@ class ExpandBooleanPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrStatement)) { + if (!(element instanceof GrStatement statement)) { return false; } - final GrStatement statement = (GrStatement) element; return isBooleanReturn(statement) || isBooleanAssignment(statement); } public static boolean isBooleanReturn(GrStatement statement) { - if (!(statement instanceof GrReturnStatement)) { + if (!(statement instanceof GrReturnStatement returnStatement)) { return false; } - final GrReturnStatement returnStatement = - (GrReturnStatement) statement; final GrExpression returnValue = returnStatement.getReturnValue(); if (returnValue == null) { return false; @@ -45,11 +42,9 @@ class ExpandBooleanPredicate implements PsiElementPredicate { public static boolean isBooleanAssignment(GrStatement expression) { - if (!(expression instanceof GrAssignmentExpression)) { + if (!(expression instanceof GrAssignmentExpression assignment)) { return false; } - final GrAssignmentExpression assignment = - (GrAssignmentExpression) expression; final GrExpression rhs = assignment.getRValue(); if (rhs == null) { return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipIfIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipIfIntention.java index 4fba8b7eaccb..704c8b49130c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipIfIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipIfIntention.java @@ -38,8 +38,7 @@ public class FlipIfIntention extends Intention { if (!element.getNode().getElementType().equals(GroovyTokenTypes.kIF)) return false; final PsiElement parent = element.getParent(); - if (!(parent instanceof GrIfStatement)) return false; - final GrIfStatement ifStatement = (GrIfStatement)parent; + if (!(parent instanceof GrIfStatement ifStatement)) return false; final GrIfStatement elseIf = getElseIf(ifStatement); return elseIf != null && checkIf(ifStatement) && checkIf(elseIf); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/GrRedundantElseIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/GrRedundantElseIntention.java index 61855cf275bf..a133d1504183 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/GrRedundantElseIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/GrRedundantElseIntention.java @@ -76,9 +76,7 @@ public class GrRedundantElseIntention extends Intention { if (!(element.getNode().getElementType() == GroovyTokenTypes.kELSE)) return false; final PsiElement parent = element.getParent(); - if (!(parent instanceof GrIfStatement)) return false; - - final GrIfStatement ifStatement = (GrIfStatement)parent; + if (!(parent instanceof GrIfStatement ifStatement)) return false; final GrStatement branch = ifStatement.getThenBranch(); final GrControlFlowOwner flowOwner = ControlFlowUtils.findControlFlowOwner(ifStatement); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/InvertIfIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/InvertIfIntention.java index e1d1c4b506e6..bc17c173ed59 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/InvertIfIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/InvertIfIntention.java @@ -51,10 +51,9 @@ public class InvertIfIntention extends Intention { protected void processIntention(@NotNull PsiElement element, @NotNull Project project, Editor editor) throws IncorrectOperationException { PsiElement parent = element.getParent(); - if (!"if".equals(element.getText()) || !(parent instanceof GrIfStatement)) { + if (!"if".equals(element.getText()) || !(parent instanceof GrIfStatement parentIf)) { throw new IncorrectOperationException("Not invoked on an if"); } - GrIfStatement parentIf = (GrIfStatement)parent; GroovyPsiElementFactory groovyPsiElementFactory = GroovyPsiElementFactory.getInstance(project); @@ -64,8 +63,7 @@ public class InvertIfIntention extends Intention { } GrExpression negatedCondition = null; - if (condition instanceof GrUnaryExpression) { - GrUnaryExpression unaryCondition = (GrUnaryExpression)condition; + if (condition instanceof GrUnaryExpression unaryCondition) { if ("!".equals(unaryCondition.getOperationToken().getText())) { negatedCondition = stripParenthesis(unaryCondition.getOperand()); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeElseIfPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeElseIfPredicate.java index e7f556275f8a..4ac8c2af3580 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeElseIfPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeElseIfPredicate.java @@ -27,10 +27,9 @@ class MergeElseIfPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrIfStatement)) { + if (!(element instanceof GrIfStatement ifStatement)) { return false; } - final GrIfStatement ifStatement = (GrIfStatement) element; final GrStatement thenBranch = ifStatement.getThenBranch(); if (thenBranch == null) { return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeIfAndPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeIfAndPredicate.java index ef4eb53ccee6..21d1816f282f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeIfAndPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeIfAndPredicate.java @@ -27,10 +27,9 @@ import org.jetbrains.plugins.groovy.lang.psi.util.ErrorUtil; class MergeIfAndPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrIfStatement)) { + if (!(element instanceof GrIfStatement ifStatement)) { return false; } - final GrIfStatement ifStatement = (GrIfStatement) element; if (ErrorUtil.containsError(ifStatement)) { return false; } @@ -39,7 +38,7 @@ class MergeIfAndPredicate implements PsiElementPredicate { return false; } thenBranch = ConditionalUtils.stripBraces(thenBranch); - if (!(thenBranch instanceof GrIfStatement)) { + if (!(thenBranch instanceof GrIfStatement childIfStatement)) { return false; } GrStatement elseBranch = ifStatement.getElseBranch(); @@ -50,8 +49,6 @@ class MergeIfAndPredicate implements PsiElementPredicate { } } - final GrIfStatement childIfStatement = (GrIfStatement) thenBranch; - return childIfStatement.getElseBranch() == null; } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ReplaceIfWithTernaryIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ReplaceIfWithTernaryIntention.java index 550d8b215f5a..e556d8311344 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ReplaceIfWithTernaryIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ReplaceIfWithTernaryIntention.java @@ -80,9 +80,8 @@ public class ReplaceIfWithTernaryIntention extends Intention { @Override public boolean satisfiedBy(@NotNull PsiElement e) { if (!e.getNode().getElementType().equals(GroovyTokenTypes.kIF)) return false; - if (!(e.getParent() instanceof GrIfStatement)) return false; + if (!(e.getParent() instanceof GrIfStatement ifStatement)) return false; - final GrIfStatement ifStatement = (GrIfStatement)e.getParent(); final PsiElement thenBranch = skipBlock(ifStatement.getThenBranch()); final PsiElement elseBranch = skipBlock(ifStatement.getElseBranch()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SimplifyTernaryOperatorIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SimplifyTernaryOperatorIntention.java index e9e0dd2f8fe2..1eab3e8dacec 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SimplifyTernaryOperatorIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SimplifyTernaryOperatorIntention.java @@ -38,10 +38,9 @@ public class SimplifyTernaryOperatorIntention extends Intention { @Override protected void processIntention(@NotNull PsiElement element, @NotNull Project project, Editor editor) throws IncorrectOperationException { - if (!(element instanceof GrConditionalExpression)) { + if (!(element instanceof GrConditionalExpression condExp)) { throw new IncorrectOperationException("Not invoked on a conditional"); } - GrConditionalExpression condExp = (GrConditionalExpression)element; GrExpression thenBranch = condExp.getThenBranch(); GrExpression elseBranch = condExp.getElseBranch(); @@ -113,11 +112,10 @@ public class SimplifyTernaryOperatorIntention extends Intention { return new PsiElementPredicate() { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrConditionalExpression)) { + if (!(element instanceof GrConditionalExpression condExp)) { return false; } - GrConditionalExpression condExp = (GrConditionalExpression)element; PsiType condType = condExp.getType(); if (condType == null || !PsiTypes.booleanType().isConvertibleFrom(condType)) { return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitElseIfPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitElseIfPredicate.java index 3081214d4b87..a24ea271c1f9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitElseIfPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitElseIfPredicate.java @@ -25,10 +25,9 @@ class SplitElseIfPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrIfStatement)) { + if (!(element instanceof GrIfStatement ifStatement)) { return false; } - final GrIfStatement ifStatement = (GrIfStatement) element; final GrStatement thenBranch = ifStatement.getThenBranch(); if (thenBranch == null) { return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java index eacc48663c43..2ee850eb73a3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java @@ -55,9 +55,8 @@ public class ConvertClosureToMethodIntention extends Intention { @Override protected void processIntention(@NotNull PsiElement element, @NotNull Project project, Editor editor) throws IncorrectOperationException { final PsiElement parent = element.getParent(); - if (!(parent instanceof GrField)) return; + if (!(parent instanceof GrField field)) return; - final GrField field = (GrField)parent; final HashSet usages = new HashSet<>(); usages.addAll(ReferencesSearch.search(field).findAll()); final GrAccessorMethod[] getters = field.getGetters(); @@ -190,9 +189,8 @@ public class ConvertClosureToMethodIntention extends Intention { if (element.getLanguage() != GroovyLanguage.INSTANCE) return false; final PsiElement parent = element.getParent(); - if (!(parent instanceof GrField)) return false; + if (!(parent instanceof GrField field)) return false; - final GrField field = (GrField)parent; if (field.getNameIdentifierGroovy() != element) return false; final PsiElement varDeclaration = field.getParent(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToBinaryPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToBinaryPredicate.java index 0e48aa11cf0c..423357e9ed5b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToBinaryPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToBinaryPredicate.java @@ -29,9 +29,8 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals public class ConvertIntegerToBinaryPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrLiteral)) return false; + if (!(element instanceof GrLiteral expression)) return false; - final GrLiteral expression = (GrLiteral)element; final PsiType type = expression.getType(); if (type == null) return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToDecimalPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToDecimalPredicate.java index d2b164880407..ab7cb53d8b5c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToDecimalPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToDecimalPredicate.java @@ -28,10 +28,9 @@ class ConvertIntegerToDecimalPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrLiteral)) { + if (!(element instanceof GrLiteral expression)) { return false; } - final GrLiteral expression = (GrLiteral) element; final PsiType type = expression.getType(); if (type == null) { return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToHexPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToHexPredicate.java index bbfdf151d3c0..74200038a62f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToHexPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToHexPredicate.java @@ -26,10 +26,9 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals class ConvertIntegerToHexPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrLiteral)) { + if (!(element instanceof GrLiteral expression)) { return false; } - final GrLiteral expression = (GrLiteral) element; final PsiType type = expression.getType(); if (type == null) { return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToOctalPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToOctalPredicate.java index ff09a2b0b05d..f58002878fff 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToOctalPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToOctalPredicate.java @@ -26,9 +26,8 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals class ConvertIntegerToOctalPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrLiteral)) return false; + if (!(element instanceof GrLiteral expression)) return false; - final GrLiteral expression = (GrLiteral)element; final PsiType type = expression.getType(); if (type == null) return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertJunitAssertionToAssertStatementIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertJunitAssertionToAssertStatementIntention.java index 7d0d68139f53..2c9650c73d97 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertJunitAssertionToAssertStatementIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertJunitAssertionToAssertStatementIntention.java @@ -132,9 +132,7 @@ public class ConvertJunitAssertionToAssertStatementIntention extends Intention i @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrMethodCall)) return false; - - GrMethodCall methodCall = (GrMethodCall)element; + if (!(element instanceof GrMethodCall methodCall)) return false; PsiMethod method = methodCall.resolveMethod(); if (method == null) return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMapToClassIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMapToClassIntention.java index 387d14054dfb..68d73d1d26e0 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMapToClassIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMapToClassIntention.java @@ -201,8 +201,7 @@ public class ConvertMapToClassIntention extends Intention { final GrParameter parameter = getParameterByArgument(map); if (parameter == null) return null; final PsiElement parent = parameter.getParent().getParent(); - if (!(parent instanceof PsiMethod)) return null; - final PsiMethod method = (PsiMethod)parent; + if (!(parent instanceof PsiMethod method)) return null; if (ApplicationManager.getApplication().isUnitTestMode() || Messages.showYesNoDialog( map.getProject(), GroovyBundle.message("do.you.want.to.change.type.of.parameter.in.method", parameter.getName(), method.getName()), @@ -248,8 +247,7 @@ public class ConvertMapToClassIntention extends Intention { class MyPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrListOrMap)) return false; - final GrListOrMap map = (GrListOrMap)element; + if (!(element instanceof GrListOrMap map)) return false; final GrNamedArgument[] namedArguments = map.getNamedArguments(); final GrExpression[] initializers = map.getInitializers(); if (initializers.length != 0) return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertSimpleGetterToPropertyIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertSimpleGetterToPropertyIntention.java index 5bb2a58a9dad..4504c0a626f4 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertSimpleGetterToPropertyIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertSimpleGetterToPropertyIntention.java @@ -78,9 +78,7 @@ public class ConvertSimpleGetterToPropertyIntention extends Intention { @Override public boolean satisfiedBy(@NotNull PsiElement element) { PsiElement parent = element.getParent(); - if (!(parent instanceof GrMethod) || ((GrMethod)parent).getNameIdentifierGroovy() != element) return false; - - GrMethod method = (GrMethod)parent; + if (!(parent instanceof GrMethod method) || ((GrMethod)parent).getNameIdentifierGroovy() != element) return false; GrOpenBlock block = method.getBlock(); if (block == null) return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/GrSplitDeclarationIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/GrSplitDeclarationIntention.java index 33fd3d3f241f..7e3ea6513fef 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/GrSplitDeclarationIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/GrSplitDeclarationIntention.java @@ -29,9 +29,7 @@ public class GrSplitDeclarationIntention extends Intention { @Override protected void processIntention(@NotNull PsiElement element, @NotNull Project project, Editor editor) throws IncorrectOperationException { - if (!(element instanceof GrVariableDeclaration)) return; - - GrVariableDeclaration declaration = (GrVariableDeclaration)element; + if (!(element instanceof GrVariableDeclaration declaration)) return; GrVariable[] variables = declaration.getVariables(); if (variables.length == 1) { @@ -133,8 +131,7 @@ public class GrSplitDeclarationIntention extends Intention { return new PsiElementPredicate() { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (element instanceof GrVariableDeclaration) { - GrVariableDeclaration decl = (GrVariableDeclaration)element; + if (element instanceof GrVariableDeclaration decl) { GrVariable[] variables = decl.getVariables(); if (variables.length > 1 && PsiUtil.isLocalVariable(variables[0])) { if (!decl.isTuple() || decl.getTupleInitializer() instanceof GrListOrMap) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionIntention.java index 7620ef16c2f9..a5cd52f57030 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionIntention.java @@ -49,12 +49,11 @@ public class IndexedExpressionConversionIntention extends Intention { final PsiElement parent = element.getParent(); final GrExpression arrayExpression = arrayIndexExpression.getInvokedExpression(); - if (!(parent instanceof GrAssignmentExpression)) { + if (!(parent instanceof GrAssignmentExpression assignmentExpression)) { rewriteAsGetAt(arrayIndexExpression, arrayExpression, arguments[0]); return; } - final GrAssignmentExpression assignmentExpression = (GrAssignmentExpression) parent; - final GrExpression rhs = assignmentExpression.getRValue(); + final GrExpression rhs = assignmentExpression.getRValue(); if (rhs.equals(element)) { rewriteAsGetAt(arrayIndexExpression, arrayExpression, arguments[0]); } else { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionPredicate.java index fe1d72e3442c..381892b8f1f7 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionPredicate.java @@ -16,25 +16,21 @@ import org.jetbrains.plugins.groovy.lang.psi.util.ErrorUtil; class IndexedExpressionConversionPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrIndexProperty)) return false; + if (!(element instanceof GrIndexProperty arrayIndexExpression)) return false; if (ErrorUtil.containsError(element)) return false; - final GrIndexProperty arrayIndexExpression = (GrIndexProperty) element; - final PsiElement lastChild = arrayIndexExpression.getLastChild(); - if (!(lastChild instanceof GrArgumentList)) return false; + final PsiElement lastChild = arrayIndexExpression.getLastChild(); + if (!(lastChild instanceof GrArgumentList argList)) return false; - final GrArgumentList argList = (GrArgumentList) lastChild; - - final GrExpression[] arguments = argList.getExpressionArguments(); + final GrExpression[] arguments = argList.getExpressionArguments(); if (arguments.length != 1) return false; final PsiElement parent = element.getParent(); - if (!(parent instanceof GrAssignmentExpression)) { + if (!(parent instanceof GrAssignmentExpression assignmentExpression)) { return true; } - final GrAssignmentExpression assignmentExpression = (GrAssignmentExpression) parent; - final GrExpression rvalue = assignmentExpression.getRValue(); + final GrExpression rvalue = assignmentExpression.getRValue(); if (rvalue == null) return false; if (rvalue.equals(element)) return true; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexingMethodConversionPredicate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexingMethodConversionPredicate.java index 7dc94beb205e..25ae158c1524 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexingMethodConversionPredicate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexingMethodConversionPredicate.java @@ -33,22 +33,20 @@ import org.jetbrains.plugins.groovy.lang.psi.util.ErrorUtil; class IndexingMethodConversionPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrMethodCallExpression)) { + if (!(element instanceof GrMethodCallExpression callExpression)) { return false; } if (ErrorUtil.containsError(element)) { return false; } - final GrMethodCallExpression callExpression = (GrMethodCallExpression) element; final GrArgumentList argList = callExpression.getArgumentList(); final GrExpression[] arguments = argList.getExpressionArguments(); final GrExpression invokedExpression = callExpression.getInvokedExpression(); - if (!(invokedExpression instanceof GrReferenceExpression)) { + if (!(invokedExpression instanceof GrReferenceExpression referenceExpression)) { return false; } - final GrReferenceExpression referenceExpression = (GrReferenceExpression) invokedExpression; final GrExpression qualifier = referenceExpression.getQualifierExpression(); if (qualifier == null) { return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertConcatenationToGstringIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertConcatenationToGstringIntention.java index 852ca57cfa03..6cfae09aa663 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertConcatenationToGstringIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertConcatenationToGstringIntention.java @@ -199,9 +199,8 @@ public class ConvertConcatenationToGstringIntention extends Intention { } } } - else if (operand instanceof GrLiteral) { + else if (operand instanceof GrLiteral literal) { String text = GrStringUtil.removeQuotes(operand.getText()); - GrLiteral literal = (GrLiteral)operand; if (GrStringUtil.isSingleQuoteString(literal)) { processSinglelineString(builder, text); @@ -269,9 +268,8 @@ public class ConvertConcatenationToGstringIntention extends Intention { if (!(operand instanceof GrMethodCallExpression)) return false; final GrExpression expression = ((GrMethodCallExpression)operand).getInvokedExpression(); - if (!(expression instanceof GrReferenceExpression)) return false; + if (!(expression instanceof GrReferenceExpression refExpr)) return false; - final GrReferenceExpression refExpr = (GrReferenceExpression)expression; final GrExpression qualifier = refExpr.getQualifierExpression(); if (qualifier == null) return false; @@ -279,9 +277,8 @@ public class ConvertConcatenationToGstringIntention extends Intention { if (results.length != 1) return false; final PsiElement element = results[0].getElement(); - if (!(element instanceof PsiMethod)) return false; + if (!(element instanceof PsiMethod method)) return false; - final PsiMethod method = (PsiMethod)element; final PsiClass objectClass = JavaPsiFacade.getInstance(operand.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT, operand.getResolveScope()); if (objectClass == null) return false; @@ -305,9 +302,8 @@ public class ConvertConcatenationToGstringIntention extends Intention { return true; } - if (!(element instanceof GrBinaryExpression)) return false; + if (!(element instanceof GrBinaryExpression binaryExpression)) return false; - GrBinaryExpression binaryExpression = (GrBinaryExpression)element; if (!GroovyTokenTypes.mPLUS.equals(binaryExpression.getOperationTokenType())) return false; if (ErrorUtil.containsError(element)) return false; @@ -323,8 +319,7 @@ public class ConvertConcatenationToGstringIntention extends Intention { } private static boolean isApplicableLiteral(PsiElement element) { - if (!(element instanceof GrLiteral)) return false; - GrLiteral literal = (GrLiteral)element; + if (!(element instanceof GrLiteral literal)) return false; if (!(literal.getValue() instanceof String)) return false; IElementType literalType = GrLiteralImpl.getLiteralType(literal); return literalType != STRING_DQ && literalType != STRING_TDQ; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertStringToMultilineIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertStringToMultilineIntention.java index 3742b707c78b..31973c721473 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertStringToMultilineIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertStringToMultilineIntention.java @@ -75,8 +75,7 @@ public class ConvertStringToMultilineIntention extends Intention { assert element instanceof GrExpression; List result = new ArrayList<>(); result.add((GrExpression)element); - while (element.getParent() instanceof GrBinaryExpression) { - final GrBinaryExpression binary = (GrBinaryExpression)element.getParent(); + while (element.getParent() instanceof GrBinaryExpression binary) { if (!isAppropriateBinary(binary, element)) break; result.add(binary); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/declaration/GrCreateFieldForParameterIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/declaration/GrCreateFieldForParameterIntention.java index 9d33dfc61042..271f7446a57a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/declaration/GrCreateFieldForParameterIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/declaration/GrCreateFieldForParameterIntention.java @@ -50,9 +50,8 @@ public class GrCreateFieldForParameterIntention extends CreateFieldFromParameter for (PsiReference reference : ReferencesSearch.search(parameter).findAll()) { PsiElement element = reference.getElement(); if (element instanceof GrReferenceExpression && - element.getParent() instanceof GrAssignmentExpression && + element.getParent() instanceof GrAssignmentExpression parent && ((GrAssignmentExpression)element.getParent()).getRValue() == element) { - GrAssignmentExpression parent = ((GrAssignmentExpression)element.getParent()); GrExpression value = parent.getLValue(); if (value instanceof GrReferenceExpression && ((GrReferenceExpression)value).resolve() instanceof PsiField) return true; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/declaration/GrSetStrongTypeIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/declaration/GrSetStrongTypeIntention.java index 0582868e390c..98d038ea343f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/declaration/GrSetStrongTypeIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/declaration/GrSetStrongTypeIntention.java @@ -193,8 +193,7 @@ public class GrSetStrongTypeIntention extends Intention { int nameElementOffset; final PsiClassType typeToUse = TypesUtil.createType("Abc", parent); - if (elementToBuildTemplateOn instanceof GrVariableDeclaration) { - GrVariableDeclaration decl = (GrVariableDeclaration)elementToBuildTemplateOn; + if (elementToBuildTemplateOn instanceof GrVariableDeclaration decl) { decl.setType(typeToUse); nameElementOffset = decl.getModifierList().getTextRange().getEndOffset() - elementToBuildTemplateOn.getTextRange().getStartOffset(); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/other/GrSortMapKeysIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/other/GrSortMapKeysIntention.java index b8d35548811f..5eda4ac9bb1e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/other/GrSortMapKeysIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/other/GrSortMapKeysIntention.java @@ -25,8 +25,7 @@ public class GrSortMapKeysIntention extends Intention { if (parent instanceof GrArgumentLabel) { PsiElement pparent = parent.getParent().getParent(); - if (pparent instanceof GrListOrMap && !ErrorUtil.containsError(pparent)) { - GrListOrMap map = (GrListOrMap)pparent; + if (pparent instanceof GrListOrMap map && !ErrorUtil.containsError(pparent)) { if (map.getInitializers().length == 0) { GrNamedArgument[] namedArgs = map.getNamedArguments(); if (isLiteralKeys(namedArgs)) { @@ -76,9 +75,8 @@ public class GrSortMapKeysIntention extends Intention { if (grandParent == null) return false; final PsiElement grandGrandParent = grandParent.getParent(); - if (!(grandGrandParent instanceof GrListOrMap)) return false; + if (!(grandGrandParent instanceof GrListOrMap map)) return false; - final GrListOrMap map = (GrListOrMap)grandGrandParent; return !ErrorUtil.containsError(map) && map.getInitializers().length == 0 && isLiteralKeys(map.getNamedArguments()); } }; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/AddReturnTypeFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/AddReturnTypeFix.java index 87a6ea7bf6dd..3e46ba4ef244 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/AddReturnTypeFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/AddReturnTypeFix.java @@ -55,8 +55,7 @@ public class AddReturnTypeFix implements IntentionAction { final PsiElement at = file.findElementAt(offset); if (at == null) return null; - if (at.getParent() instanceof GrReturnStatement) { - final GrReturnStatement returnStatement = ((GrReturnStatement)at.getParent()); + if (at.getParent() instanceof GrReturnStatement returnStatement) { final PsiElement word = returnStatement.getReturnWord(); if (!word.getTextRange().contains(offset)) return null; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportOnDemandIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportOnDemandIntention.java index a7a6ffdcd114..511d6d2cb144 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportOnDemandIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportOnDemandIntention.java @@ -41,8 +41,7 @@ public class ImportOnDemandIntention extends Intention { @Override protected void processIntention(@NotNull PsiElement element, @NotNull Project project, Editor editor) throws IncorrectOperationException { - if (!(element instanceof GrReferenceElement)) return; - final GrReferenceElement ref = (GrReferenceElement)element; + if (!(element instanceof GrReferenceElement ref)) return; final PsiElement resolved = ref.resolve(); if (!(resolved instanceof PsiClass)) return; @@ -70,8 +69,7 @@ public class ImportOnDemandIntention extends Intention { return new PsiElementPredicate() { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (!(element instanceof GrReferenceElement)) return false; - final GrReferenceElement ref = (GrReferenceElement)element; + if (!(element instanceof GrReferenceElement ref)) return false; final PsiElement parent = ref.getParent(); if (!(parent instanceof GrReferenceElement)) return false; final PsiElement resolved = ref.resolve(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportStaticIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportStaticIntention.java index 91ec3a81ad52..1140d4507740 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportStaticIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportStaticIntention.java @@ -60,8 +60,7 @@ public class ImportStaticIntention extends Intention { if (name == null) return; final PsiFile containingFile = element.getContainingFile(); - if (!(containingFile instanceof GroovyFile)) return; - final GroovyFile file = (GroovyFile)containingFile; + if (!(containingFile instanceof GroovyFile file)) return; file.accept(new GroovyRecursiveElementVisitor() { @Override public void visitReferenceExpression(@NotNull GrReferenceExpression expression) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java index 6ab2f447879c..323f452aa07a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java @@ -160,8 +160,7 @@ public class ReplaceAbstractClassInstanceByMapIntention extends Intention { static class MyPredicate implements PsiElementPredicate { @Override public boolean satisfiedBy(@NotNull PsiElement element) { - if (element instanceof GrCodeReferenceElement && element.getParent() instanceof GrAnonymousClassDefinition) { - final GrAnonymousClassDefinition anonymous = ((GrAnonymousClassDefinition)element.getParent()); + if (element instanceof GrCodeReferenceElement && element.getParent() instanceof GrAnonymousClassDefinition anonymous) { if (anonymous.getFields().length == 0) { return true; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java index c36f05351371..935c156d6f24 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java @@ -275,8 +275,7 @@ public class ConvertParameterToMapEntryIntention extends Intention { final Collection references = ReferencesSearch.search(param).findAll(); for (PsiReference ref : references) { final PsiElement elt = ref.getElement(); - if (elt instanceof GrReferenceExpression) { - GrReferenceExpression expr = (GrReferenceExpression)elt; + if (elt instanceof GrReferenceExpression expr) { final GrExpression newExpr = factory.createExpressionFromText(mapName + "." + paramName); expr.replaceWithExpression(newExpr, true); } @@ -307,8 +306,7 @@ public class ConvertParameterToMapEntryIntention extends Intention { if (element instanceof GrParameter) { return (GrParameter)element; } - if (element instanceof GrReferenceExpression) { - final GrReferenceExpression expr = (GrReferenceExpression)element; + if (element instanceof GrReferenceExpression expr) { final PsiElement resolved = expr.resolve(); LOG.assertTrue(resolved instanceof GrParameter); return ((GrParameter)resolved); @@ -337,8 +335,7 @@ public class ConvertParameterToMapEntryIntention extends Intention { private static FIRST_PARAMETER_KIND analyzeForNamedArguments(final GrParameterListOwner owner, final Collection occurrences) { boolean thereAreNamedArguments = false; for (PsiElement occurrence : occurrences) { - if (occurrence instanceof GrReferenceExpression && occurrence.getParent() instanceof GrCall) { - final GrCall call = (GrCall)occurrence.getParent(); + if (occurrence instanceof GrReferenceExpression && occurrence.getParent() instanceof GrCall call) { final GrArgumentList args = call.getArgumentList(); if (args != null && args.getNamedArguments().length > 0) { thereAreNamedArguments = true; @@ -475,8 +472,7 @@ public class ConvertParameterToMapEntryIntention extends Intention { if (element instanceof GrParameter) { parameter = (GrParameter)element; } - else if (element instanceof GrReferenceExpression) { - GrReferenceExpression expr = (GrReferenceExpression)element; + else if (element instanceof GrReferenceExpression expr) { if (expr.getQualifierExpression() != null) return false; final PsiElement resolved = expr.resolve(); if (resolved instanceof GrParameter) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferenceExpression.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferenceExpression.java index 42e0f88c1934..d413fc0cad82 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferenceExpression.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferenceExpression.java @@ -433,9 +433,7 @@ public final class CompleteReferenceExpression { if (element instanceof PsiMethod && ((PsiMethod)element).isConstructor() && !(element instanceof NewifiedConstructor)) { return true; } - if (element instanceof PsiNamedElement) { - - PsiNamedElement namedElement = (PsiNamedElement)element; + if (element instanceof PsiNamedElement namedElement) { boolean isAccessible = isAccessible(namedElement); final PsiElement resolveContext = state.get(RESOLVE_CONTEXT); @@ -457,12 +455,11 @@ public final class CompleteReferenceExpression { @Override public void consume(Object o) { - if (!(o instanceof GroovyResolveResult)) { + if (!(o instanceof GroovyResolveResult result)) { LOG.error(o); return; } - GroovyResolveResult result = (GroovyResolveResult)o; if (!result.isStaticsOK()) { if (myInapplicable == null) myInapplicable = new ArrayList<>(); myInapplicable.add(result); @@ -536,9 +533,8 @@ public final class CompleteReferenceExpression { final PsiParameter parameter = method.getParameterList().getParameters()[0]; final PsiType type = parameter.getType(); - if (!(type instanceof PsiClassType)) return; + if (!(type instanceof PsiClassType classType)) return; - final PsiClassType classType = (PsiClassType)type; final PsiClass listenerClass = classType.resolve(); if (listenerClass == null) return; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferencesWithSameQualifier.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferencesWithSameQualifier.java index b4ca926a690a..48418972e4c5 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferencesWithSameQualifier.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferencesWithSameQualifier.java @@ -50,8 +50,7 @@ public final class CompleteReferencesWithSameQualifier { } private void addVariantsWithSameQualifier(@NotNull PsiElement element, @NotNull Set result) { - if (element instanceof GrReferenceExpression && element != myRefExpr && !PsiUtil.isLValue((GroovyPsiElement)element)) { - final GrReferenceExpression refExpr = (GrReferenceExpression)element; + if (element instanceof GrReferenceExpression refExpr && element != myRefExpr && !PsiUtil.isLValue((GroovyPsiElement)element)) { final String refName = refExpr.getReferenceName(); if (refName != null && !result.contains(refName) && myMatcher.prefixMatches(refName)) { final GrExpression hisQualifier = refExpr.getQualifierExpression(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMainCompletionProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMainCompletionProvider.java index 3af4375cee50..a45b7ae6a881 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMainCompletionProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMainCompletionProvider.java @@ -74,8 +74,7 @@ public class GrMainCompletionProvider extends CompletionProvider allMethods = new ArrayList<>(); for (LookupElement item : items) { Object o = item.getPsiElement(); - if (item.getUserData(JavaCompletionUtil.FORCE_SHOW_SIGNATURE_ATTR) != null || !(o instanceof PsiMethod)) { + if (item.getUserData(JavaCompletionUtil.FORCE_SHOW_SIGNATURE_ATTR) != null || !(o instanceof PsiMethod method)) { return AutoCompletionDecision.SHOW_LOOKUP; } - PsiMethod method = (PsiMethod)o; String name = JavaMethodMergingContributor.joinLookupStrings(item); if (commonName != null && !commonName.equals(name)) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrThisSuperCompletionProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrThisSuperCompletionProvider.java index 7abacd24ba45..860ccc87ba06 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrThisSuperCompletionProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrThisSuperCompletionProvider.java @@ -35,9 +35,8 @@ class GrThisSuperCompletionProvider extends CompletionProvider 0) { tailText = "<" + StringUtil.join(psiClass.getTypeParameters(), psiTypeParameter -> psiTypeParameter.getName(), "," + (showSpaceAfterComma(psiClass) ? " " : "")) + ">" + tailText; } @@ -432,8 +430,7 @@ public final class GroovyCompletionUtil { PsiDocumentManager.getInstance(file.getProject()).commitAllDocuments(); Object o = item.getObject(); - if (o instanceof PsiClass) { - PsiClass aClass = (PsiClass)o; + if (o instanceof PsiClass aClass) { if (aClass.getQualifiedName() == null) return; final String lookupString = item.getLookupString(); int length = lookupString.length(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyConfigSlurperCompletionProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyConfigSlurperCompletionProvider.java index f1bae23bf88c..23f83406105d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyConfigSlurperCompletionProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyConfigSlurperCompletionProvider.java @@ -62,9 +62,7 @@ class GroovyConfigSlurperCompletionProvider extends CompletionProvider { obj = ((GroovyResolveResult)obj).getElement(); } - if (obj instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)obj; + if (obj instanceof PsiMethod method) { PsiParameter[] parameters = method.getParameterList().getParameters(); Editor editor = context.getEditor(); Document document = editor.getDocument(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java index 75613b95e080..ba77d44add8b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java @@ -125,8 +125,7 @@ public class GroovyNoVariantsDelegator extends CompletionContributor { else if (o instanceof PsiMethod) { return ((PsiMethod)o).getReturnType(); } - else if (o instanceof PsiClass) { - final PsiClass psiClass = (PsiClass)o; + else if (o instanceof PsiClass psiClass) { return JavaPsiFacade.getElementFactory(psiClass.getProject()).createType(psiClass); } return null; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java index 2f9d067785d2..be215a05c842 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java @@ -325,8 +325,7 @@ public final class GroovySmartCompletionContributor extends CompletionContributo } else if (pparent instanceof GrApplicationStatement) { PsiElement ppparent = pparent.getParent(); - if (ppparent instanceof GrAssignmentExpression) { - GrAssignmentExpression assignment = (GrAssignmentExpression)ppparent; + if (ppparent instanceof GrAssignmentExpression assignment) { GrExpression lvalue = assignment.getLValue(); GrExpression rvalue = assignment.getRValue(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/GroovyMethodSignatureInsertHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/GroovyMethodSignatureInsertHandler.java index 07fe6e94828a..f8f6ca4edfd6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/GroovyMethodSignatureInsertHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/GroovyMethodSignatureInsertHandler.java @@ -33,12 +33,11 @@ public class GroovyMethodSignatureInsertHandler implements InsertHandler 0 && block.getStatements()[0] == atCaret) { atCaret = block; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrIfConditionFixer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrIfConditionFixer.java index 6c57458bc6ac..8ded4bb3f394 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrIfConditionFixer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrIfConditionFixer.java @@ -28,9 +28,8 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpres public class GrIfConditionFixer extends SmartEnterProcessorWithFixers.Fixer { @Override public void apply(@NotNull Editor editor, @NotNull GroovySmartEnterProcessor processor, @NotNull PsiElement psiElement) { - if (psiElement instanceof GrIfStatement) { + if (psiElement instanceof GrIfStatement ifStatement) { final Document doc = editor.getDocument(); - final GrIfStatement ifStatement = (GrIfStatement) psiElement; final PsiElement rParen = ifStatement.getRParenth(); final PsiElement lParen = ifStatement.getLParenth(); final GrExpression condition = ifStatement.getCondition(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrMethodBodyFixer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrMethodBodyFixer.java index 8787037bf584..ed73126b1d92 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrMethodBodyFixer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrMethodBodyFixer.java @@ -31,8 +31,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMe public class GrMethodBodyFixer extends SmartEnterProcessorWithFixers.Fixer { @Override public void apply(@NotNull Editor editor, @NotNull GroovySmartEnterProcessor processor, @NotNull PsiElement psiElement) { - if (!(psiElement instanceof GrMethod)) return; - GrMethod method = (GrMethod) psiElement; + if (!(psiElement instanceof GrMethod method)) return; final PsiClass aClass = method.getContainingClass(); if (aClass != null && aClass.isInterface() || method.hasModifierProperty(PsiModifier.ABSTRACT)) return; final GrCodeBlock body = method.getBlock(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrMethodCallFixer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrMethodCallFixer.java index e5adad450ecf..d525ea59637d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrMethodCallFixer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrMethodCallFixer.java @@ -29,9 +29,8 @@ public class GrMethodCallFixer extends SmartEnterProcessorWithFixers.Fixer { @Override public void apply(@NotNull Editor editor, @NotNull GroovySmartEnterProcessor processor, @NotNull PsiElement psiElement) { - if (!(psiElement instanceof GrIfStatement)) return; + if (!(psiElement instanceof GrIfStatement ifStatement)) return; - GrIfStatement ifStatement = (GrIfStatement) psiElement; final Document document = editor.getDocument(); final GrStatement elseBranch = ifStatement.getElseBranch(); final PsiElement elseElement = ifStatement.getElseKeyword(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrWhileBodyFixer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrWhileBodyFixer.java index cee54bc922c0..95bfa2ab05d8 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrWhileBodyFixer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrWhileBodyFixer.java @@ -27,8 +27,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrWhileStatement; public class GrWhileBodyFixer extends SmartEnterProcessorWithFixers.Fixer { @Override public void apply(@NotNull Editor editor, @NotNull GroovySmartEnterProcessor processor, @NotNull PsiElement psiElement) { - if (!(psiElement instanceof GrWhileStatement)) return; - GrWhileStatement whileStatement = (GrWhileStatement) psiElement; + if (!(psiElement instanceof GrWhileStatement whileStatement)) return; final Document doc = editor.getDocument(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrWhileConditionFixer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrWhileConditionFixer.java index 48dceda9eb34..9684f8d3de08 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrWhileConditionFixer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrWhileConditionFixer.java @@ -28,9 +28,8 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrWhileStatement; public class GrWhileConditionFixer extends SmartEnterProcessorWithFixers.Fixer { @Override public void apply(@NotNull Editor editor, @NotNull GroovySmartEnterProcessor processor, @NotNull PsiElement psiElement) { - if (psiElement instanceof GrWhileStatement) { + if (psiElement instanceof GrWhileStatement whileStatement) { final Document doc = editor.getDocument(); - final GrWhileStatement whileStatement = (GrWhileStatement) psiElement; final PsiElement rParenth = whileStatement.getRParenth(); final PsiElement lParenth = whileStatement.getLParenth(); final GrCondition condition = whileStatement.getCondition(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrReferenceListWeigher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrReferenceListWeigher.java index 4d3c0351eef2..1cc5b9830492 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrReferenceListWeigher.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrReferenceListWeigher.java @@ -34,8 +34,7 @@ public class GrReferenceListWeigher extends ReferenceListWeigher { if (INSIDE_REFERENCE_LIST.accepts(position)) { GrReferenceList list = (GrReferenceList)position.getParent().getParent(); PsiElement parent = list.getParent(); - if (parent instanceof GrTypeDefinition) { - GrTypeDefinition cls = (GrTypeDefinition)parent; + if (parent instanceof GrTypeDefinition cls) { if (cls.isInterface() && list == cls.getExtendsClause() || list == cls.getImplementsClause()) { return Preference.Interfaces; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyDocumentationProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyDocumentationProvider.java index 96d045f058f9..4b7dd8e621da 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyDocumentationProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyDocumentationProvider.java @@ -121,9 +121,8 @@ public class GroovyDocumentationProvider implements CodeDocumentationProvider, E } return buffer.toString(); } - else if (element instanceof PsiMethod) { + else if (element instanceof PsiMethod method) { @Nls StringBuilder buffer = new StringBuilder(); - PsiMethod method = (PsiMethod)element; if (method instanceof GrGdkMethod) { appendStyledSpan(buffer, "[" + GroovyBundle.message("documentation.gdk.label") + "]", "color: #909090"); } @@ -179,9 +178,8 @@ public class GroovyDocumentationProvider implements CodeDocumentationProvider, E else if (element instanceof GrTypeDefinition) { return generateClassInfo((GrTypeDefinition)element); } - else if (element instanceof GroovyMapProperty) { + else if (element instanceof GroovyMapProperty mapProperty) { @Nls StringBuilder buffer = new StringBuilder(); - GroovyMapProperty mapProperty = (GroovyMapProperty)element; appendStyledSpan(buffer, "Map property\n"); PsiType inferredType = mapProperty.getPropertyType(); String typeLabel = inferredType != null @@ -575,8 +573,7 @@ public class GroovyDocumentationProvider implements CodeDocumentationProvider, E StringBuilder builder = new StringBuilder(); - if (owner instanceof GrMethod) { - final GrMethod method = (GrMethod)owner; + if (owner instanceof GrMethod method) { JavaDocumentationProvider.generateParametersTakingDocFromSuperMethods(builder, commenter, method); final PsiType returnType = method.getInferredReturnType(); @@ -604,10 +601,9 @@ public class GroovyDocumentationProvider implements CodeDocumentationProvider, E @Override public void collectDocComments(@NotNull PsiFile file, @NotNull Consumer sink) { - if (!(file instanceof GroovyFile)) { + if (!(file instanceof GroovyFile groovyFile)) { return; } - var groovyFile = (GroovyFile)file; List owners = PsiTreeUtil.getChildrenOfTypeAsList(groovyFile, GrDocCommentOwner.class); List comments = PsiTreeUtil.getChildrenOfTypeAsList(groovyFile, GrDocComment.class); processDocComments(owners, comments, sink); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/completion/handlers/GroovyDocMethodHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/completion/handlers/GroovyDocMethodHandler.java index 391945a80af7..0eb9c9f47fad 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/completion/handlers/GroovyDocMethodHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/completion/handlers/GroovyDocMethodHandler.java @@ -94,8 +94,7 @@ public class GroovyDocMethodHandler implements ContextSpecificInsertHandler { final Project project = context.getProject(); PsiDocumentManager.getInstance(project).commitDocument(document); PsiReference ref = context.getFile().findReferenceAt(startOffset); - if (ref instanceof GrDocMethodReference) { - GrDocMethodReference methodReference = (GrDocMethodReference) ref; + if (ref instanceof GrDocMethodReference methodReference) { GrDocMethodParams list = methodReference.getParameterList(); for (GrDocMethodParameter parameter : list.getParameters()) { JavaCodeStyleManager.getInstance(project).shortenClassReferences(parameter); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyParameterInfoHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyParameterInfoHandler.java index 64e2a79eb10f..76ccea1e3772 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyParameterInfoHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyParameterInfoHandler.java @@ -182,8 +182,7 @@ public class GroovyParameterInfoHandler implements ParameterInfoHandlerWithTabAc PsiType[] parameterTypes = null; PsiType[] argTypes = null; PsiSubstitutor substitutor = null; - if (objects[i] instanceof GroovyResolveResult) { - final GroovyResolveResult resolveResult = (GroovyResolveResult)objects[i]; + if (objects[i] instanceof GroovyResolveResult resolveResult) { PsiNamedElement namedElement = (PsiNamedElement)resolveResult.getElement(); if (namedElement instanceof GrReflectedMethod) namedElement = ((GrReflectedMethod)namedElement).getBaseMethod(); @@ -193,8 +192,7 @@ public class GroovyParameterInfoHandler implements ParameterInfoHandlerWithTabAc context.setUIComponentEnabled(i, false); continue Outer; } - if (namedElement instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)namedElement; + if (namedElement instanceof PsiMethod method) { PsiParameter[] parameters = method.getParameterList().getParameters(); parameters = updateConstructorParams(method, parameters, context.getParameterOwner()); parameterTypes = PsiType.createArray(parameters.length); @@ -205,8 +203,7 @@ public class GroovyParameterInfoHandler implements ParameterInfoHandlerWithTabAc } if (argTypes == null) continue; } - else if (objects[i] instanceof GrSignature) { - final GrSignature signature = (GrSignature)objects[i]; + else if (objects[i] instanceof GrSignature signature) { argTypes = PsiUtil.getArgumentTypes(place, false); parameterTypes = PsiType.createArray(signature.getParameterCount()); int j = 0; @@ -241,8 +238,7 @@ public class GroovyParameterInfoHandler implements ParameterInfoHandlerWithTabAc } private static int getCurrentParameterIndex(GroovyPsiElement place, int offset) { - if (place instanceof GrArgumentList) { - GrArgumentList list = (GrArgumentList)place; + if (place instanceof GrArgumentList list) { int idx = (list.getNamedArguments().length > 0) ? 1 : 0; for (PsiElement child = list.getFirstChild(); child != null; child = child.getNextSibling()) { @@ -297,8 +293,7 @@ public class GroovyParameterInfoHandler implements ParameterInfoHandlerWithTabAc StringBuilder buffer = new StringBuilder(); - if (element instanceof PsiMethod) { - PsiMethod method = (PsiMethod) element; + if (element instanceof PsiMethod method) { if (method instanceof GrReflectedMethod) method = ((GrReflectedMethod)method).getBaseMethod(); if (settings.SHOW_FULL_SIGNATURES_IN_PARAMETER_INFO) { @@ -409,8 +404,7 @@ public class GroovyParameterInfoHandler implements ParameterInfoHandlerWithTabAc } private static void appendParameterText(PsiParameter param, PsiSubstitutor substitutor, StringBuilder buffer) { - if (param instanceof GrParameter) { - GrParameter grParam = (GrParameter)param; + if (param instanceof GrParameter grParam) { GroovyPresentationUtil.appendParameterPresentation(grParam, substitutor, TypePresentation.PRESENTABLE, buffer, false); final GrExpression initializer = grParam.getInitializerGroovy(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyTypeParameterInfoHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyTypeParameterInfoHandler.java index 29afc48dc3c7..bba022861173 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyTypeParameterInfoHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyTypeParameterInfoHandler.java @@ -68,8 +68,7 @@ public class GroovyTypeParameterInfoHandler implements ParameterInfoHandlerWithT final GrTypeArgumentList parameterList = ParameterInfoUtils.findParentOfType(context.getFile(), context.getOffset(), GrTypeArgumentList.class); if (parameterList != null) { - if (!(parameterList.getParent() instanceof GrCodeReferenceElement)) return null; - final GrCodeReferenceElement ref = ((GrCodeReferenceElement)parameterList.getParent()); + if (!(parameterList.getParent() instanceof GrCodeReferenceElement ref)) return null; final PsiElement resolved = ref.resolve(); if (!(resolved instanceof PsiTypeParameterListOwner)) return null; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/navbar/GrNavBarModelExtension.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/navbar/GrNavBarModelExtension.java index f4c21eb22d84..e3a6b03cc540 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/navbar/GrNavBarModelExtension.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/navbar/GrNavBarModelExtension.java @@ -30,8 +30,7 @@ public class GrNavBarModelExtension extends AbstractNavBarModelExtension { if (containingFile instanceof GroovyFileBase) { final VirtualFile file = containingFile.getVirtualFile(); if (file != null && (index.isUnderSourceRootOfType(file, JavaModuleSourceRootTypes.SOURCES) || index.isInLibrary(file))) { - if (psiElement instanceof GroovyFileBase) { - final GroovyFileBase grFile = (GroovyFileBase)psiElement; + if (psiElement instanceof GroovyFileBase grFile) { if (grFile.getViewProvider().getBaseLanguage().equals(GroovyLanguage.INSTANCE)) { final PsiClass[] psiClasses = grFile.getClasses(); if (psiClasses.length == 1 && !grFile.isScript()) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyImplementMethodsHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyImplementMethodsHandler.java index ec07056ad4bd..0f783c4e5371 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyImplementMethodsHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyImplementMethodsHandler.java @@ -26,8 +26,7 @@ public class GroovyImplementMethodsHandler implements LanguageCodeInsightActionH public void invoke(@NotNull final Project project, @NotNull Editor editor, @NotNull PsiFile file) { if (!EditorModificationUtil.checkModificationAllowed(editor)) return; PsiClass aClass = OverrideImplementUtil.getContextClass(project, editor, file, true); - if (aClass instanceof GrTypeDefinition) { - GrTypeDefinition typeDefinition = (GrTypeDefinition)aClass; + if (aClass instanceof GrTypeDefinition typeDefinition) { if (GroovyOverrideImplementExploreUtil.getMethodSignaturesToImplement(typeDefinition).isEmpty()) { HintManager.getInstance().showErrorHint(editor, JavaBundle.message("implement.method.no.methods.to.implement")); return; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyOverrideMethodsHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyOverrideMethodsHandler.java index e01f5a738e24..e554290f3041 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyOverrideMethodsHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyOverrideMethodsHandler.java @@ -26,8 +26,7 @@ public class GroovyOverrideMethodsHandler implements LanguageCodeInsightActionHa public void invoke(@NotNull final Project project, @NotNull Editor editor, @NotNull PsiFile file) { if (!EditorModificationUtil.checkModificationAllowed(editor)) return; PsiClass aClass = OverrideImplementUtil.getContextClass(project, editor, file, true); - if (aClass instanceof GrTypeDefinition) { - GrTypeDefinition typeDefinition = (GrTypeDefinition)aClass; + if (aClass instanceof GrTypeDefinition typeDefinition) { if (GroovyOverrideImplementExploreUtil.getMethodSignaturesToOverride(typeDefinition).isEmpty()) { HintManager.getInstance().showErrorHint(editor, JavaBundle.message("override.methods.error.no.methods")); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GrRefactoringConflictsUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GrRefactoringConflictsUtil.java index d992231e0b3a..a7b00458a0c3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GrRefactoringConflictsUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GrRefactoringConflictsUtil.java @@ -92,8 +92,7 @@ public final class GrRefactoringConflictsUtil { } } } - else if (scope instanceof GrNewExpression) { - final GrNewExpression newExpression = (GrNewExpression)scope; + else if (scope instanceof GrNewExpression newExpression) { final GrAnonymousClassDefinition anonymousClass = newExpression.getAnonymousClassDefinition(); if (anonymousClass != null) { if (!RefactoringHierarchyUtil.willBeInTargetClass(anonymousClass, moving, targetClass, false)) { @@ -109,8 +108,7 @@ public final class GrRefactoringConflictsUtil { } } } - else if (scope instanceof GrCodeReferenceElement) { - GrCodeReferenceElement refExpr = (GrCodeReferenceElement)scope; + else if (scope instanceof GrCodeReferenceElement refExpr) { PsiElement refElement = refExpr.resolve(); if (refElement instanceof PsiMember) { if (!RefactoringHierarchyUtil.willBeInTargetClass(refElement, moving, targetClass, false)) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java index 17f4f99928f4..8027f376ecee 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java @@ -74,14 +74,13 @@ public final class GroovyNameSuggestionUtil { } private static void generateNameByExpr(GrExpression expr, Set possibleNames, NameValidator validator, boolean forStaticVariable) { - if (expr instanceof GrReferenceExpression && ((GrReferenceExpression) expr).getReferenceName() != null) { + if (expr instanceof GrReferenceExpression refExpr && ((GrReferenceExpression) expr).getReferenceName() != null) { if (PsiUtil.isThisReference(expr)) { possibleNames.add(validator.validateName("thisInstance", true)); } if (PsiUtil.isSuperReference(expr)) { possibleNames.add(validator.validateName("superInstance", true)); } - GrReferenceExpression refExpr = (GrReferenceExpression) expr; String name = refExpr.getReferenceName(); if (name != null && StringUtil.toUpperCase(name).equals(name)) { possibleNames.add(validator.validateName(StringUtil.toLowerCase(name), true)); @@ -193,8 +192,7 @@ public final class GroovyNameSuggestionUtil { assert collectionName != null; String componentName = cleanTypeName(componentType.getPresentableText()); - if (componentType instanceof PsiClassType) { - PsiClassType classType = (PsiClassType) componentType; + if (componentType instanceof PsiClassType classType) { PsiClass psiClass = classType.resolve(); if (psiClass == null) return; componentName = psiClass.getName(); @@ -252,8 +250,7 @@ public final class GroovyNameSuggestionUtil { @Nullable private static PsiType getCollectionComponentType(PsiType type, Project project) { - if (!(type instanceof PsiClassType)) return null; - PsiClassType classType = (PsiClassType) type; + if (!(type instanceof PsiClassType classType)) return null; PsiClassType.ClassResolveResult result = classType.resolveGenerics(); PsiClass clazz = result.getElement(); if (clazz == null) return null; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java index 0fe7a9827a0f..89ef22b1220c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java @@ -232,8 +232,7 @@ public abstract class GroovyRefactoringUtil { } public static boolean isSuperOrThisCall(GrStatement statement, boolean testForSuper, boolean testForThis) { - if (!(statement instanceof GrConstructorInvocation)) return false; - GrConstructorInvocation expr = (GrConstructorInvocation) statement; + if (!(statement instanceof GrConstructorInvocation expr)) return false; return (testForSuper && expr.isSuperCall()) || (testForThis && expr.isThisCall()); } @@ -602,8 +601,7 @@ public abstract class GroovyRefactoringUtil { super.visitCodeReferenceElement(reference); if (reference.getQualifier() == null) { final PsiElement resolved = reference.resolve(); - if (resolved instanceof PsiTypeParameter) { - final PsiTypeParameter typeParameter = (PsiTypeParameter)resolved; + if (resolved instanceof PsiTypeParameter typeParameter) { if (PsiTreeUtil.isAncestor(typeParameter.getOwner(), element, false)) { used.add(typeParameter); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyValidationUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyValidationUtil.java index 032ad6a21e00..e60332d1ca81 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyValidationUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyValidationUtil.java @@ -54,15 +54,13 @@ public final class GroovyValidationUtil { } child = child.getNextSibling(); } - if (parent instanceof GrParameterListOwner) { //method or closure parameters - GrParameterListOwner owner = (GrParameterListOwner)parent; + if (parent instanceof GrParameterListOwner owner) { //method or closure parameters for (GrParameter parameter : owner.getParameters()) { if (varName.equals(parameter.getName())) { addConflict(varName, parameter, conflicts); } } - } else if (parent instanceof GrForStatement) { // For statement binding - GrForStatement statement = (GrForStatement)parent; + } else if (parent instanceof GrForStatement statement) { // For statement binding GrForClause clause = statement.getClause(); if (clause != null) { for (GrVariable variable : clause.getDeclaredVariables()) { @@ -89,8 +87,7 @@ public final class GroovyValidationUtil { } private static void validateVariableOccurrencesDownImpl(final PsiElement child, final MultiMap conflicts, final String varName) { - if (child instanceof PsiNamedElement) { - PsiNamedElement element = (PsiNamedElement)child; + if (child instanceof PsiNamedElement element) { if (varName.equals(element.getName())) { addConflict(varName, element, conflicts); } else { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChageSignatureUsageSearcher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChageSignatureUsageSearcher.java index 8f18c80631c7..e892a448002f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChageSignatureUsageSearcher.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChageSignatureUsageSearcher.java @@ -212,9 +212,8 @@ class GrChageSignatureUsageSearcher { new DefaultConstructorImplicitUsageInfo((GrMethod)element, ((GrMethod)element).getContainingClass(), method); result.add(implicitUsageInfo); } - else if (element instanceof PsiClass) { + else if (element instanceof PsiClass psiClass) { LOG.assertTrue(method.isConstructor()); - final PsiClass psiClass = (PsiClass)element; if (psiClass instanceof GrAnonymousClassDefinition) { result.add(new GrMethodCallUsageInfo(element, isToModifyArgs, isToCatchExceptions, method)); continue; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java index c47f49502e71..6424953d5532 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java @@ -96,9 +96,8 @@ public class GrChangeSignatureUsageProcessor implements ChangeSignatureUsageProc @Override public boolean processPrimaryMethod(ChangeInfo changeInfo) { - if (!(changeInfo instanceof JavaChangeInfo)) return false; + if (!(changeInfo instanceof JavaChangeInfo info)) return false; - JavaChangeInfo info = (JavaChangeInfo)changeInfo; PsiMethod method = info.getMethod(); if (!(method instanceof GrMethod)) return false; @@ -125,8 +124,7 @@ public class GrChangeSignatureUsageProcessor implements ChangeSignatureUsageProc public boolean setupDefaultValues(ChangeInfo changeInfo, Ref refUsages, Project project) { if (!(changeInfo instanceof JavaChangeInfo)) return true; for (UsageInfo usageInfo : refUsages.get()) { - if (usageInfo instanceof GrMethodCallUsageInfo) { - GrMethodCallUsageInfo methodCallUsageInfo = (GrMethodCallUsageInfo)usageInfo; + if (usageInfo instanceof GrMethodCallUsageInfo methodCallUsageInfo) { if (methodCallUsageInfo.isToChangeArguments()){ final PsiElement element = methodCallUsageInfo.getElement(); if (element == null) continue; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrMethodCallUsageInfo.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrMethodCallUsageInfo.java index 7a9fb5679729..f50acc070729 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrMethodCallUsageInfo.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrMethodCallUsageInfo.java @@ -43,8 +43,7 @@ public class GrMethodCallUsageInfo extends UsageInfo implements PossiblyIncorrec if (resolveResult == null || resolveResult.getElement() == null) { mySubstitutor = PsiSubstitutor.EMPTY; } - else if (resolveResult.getElement() instanceof PsiMethod) { - PsiMethod resolved = (PsiMethod)resolveResult.getElement(); + else if (resolveResult.getElement() instanceof PsiMethod resolved) { mySubstitutor = resolveResult.getSubstitutor(); if (!element.getManager().areElementsEquivalent(method, resolved)) { final PsiClass baseClass = method.getContainingClass(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrClassMemberReferenceVisitor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrClassMemberReferenceVisitor.java index 72d7822ba61b..0847662143ae 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrClassMemberReferenceVisitor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrClassMemberReferenceVisitor.java @@ -52,8 +52,7 @@ public abstract class GrClassMemberReferenceVisitor extends GroovyRecursiveEleme public void visitCodeReferenceElement(@NotNull GrCodeReferenceElement reference) { GroovyResolveResult resolveResult = reference.advancedResolve(); PsiElement referencedElement = resolveResult.getElement(); - if (referencedElement instanceof GrTypeDefinition) { - final GrTypeDefinition referencedClass = (GrTypeDefinition)referencedElement; + if (referencedElement instanceof GrTypeDefinition referencedClass) { if (PsiTreeUtil.isAncestor(myClass, referencedElement, true) || isPartOf(myClass, referencedClass.getContainingClass())) { visitClassMemberReferenceElement(reference, (GrMember)referencedElement, resolveResult); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrDependantMembersCollector.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrDependantMembersCollector.java index 1159e2e809f2..ac0fb6c40c8f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrDependantMembersCollector.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrDependantMembersCollector.java @@ -44,8 +44,7 @@ public class GrDependantMembersCollector extends DependentMembersCollectorBase { super(member); LOG.assertTrue(member.isValid()); mySourceReferenceList = sourceReferenceList; - if (member instanceof GrMethod) { - GrMethod method = (GrMethod)member; + if (member instanceof GrMethod method) { displayName = PsiFormatUtil.formatMethod(method, PsiSubstitutor.EMPTY, PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_TYPE | PsiFormatUtilBase.TYPE_AFTER | @@ -46,15 +45,13 @@ public class GrMemberInfo extends MemberInfoBase { isStatic = method.hasModifierProperty(PsiModifier.STATIC); } - else if (member instanceof GrField) { - GrField field = (GrField)member; + else if (member instanceof GrField field) { displayName = PsiFormatUtil .formatVariable(field, PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_TYPE | PsiFormatUtilBase.TYPE_AFTER, PsiSubstitutor.EMPTY); isStatic = field.hasModifierProperty(PsiModifier.STATIC); overrides = null; } - else if (member instanceof GrTypeDefinition) { - GrTypeDefinition aClass = (GrTypeDefinition)member; + else if (member instanceof GrTypeDefinition aClass) { if (isSuperClass) { if (aClass.isInterface()) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberInfoStorage.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberInfoStorage.java index 1c1dfa4f8bd5..48d178fb151b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberInfoStorage.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberInfoStorage.java @@ -78,8 +78,7 @@ public class GrMemberInfoStorage extends AbstractMemberInfoStorage actual = new ArrayList<>(Arrays.asList(allParameters)); final PsiType clReturnType = context.typeProvider.getReturnType(closure); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java index 3e9727a31ce4..eb413b70dfaf 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java @@ -114,8 +114,7 @@ public class CodeBlockGenerator extends Generator { @Override public void visitOpenBlock(@NotNull GrOpenBlock block) { GrParameter[] parameters; - if (block.getParent() instanceof GrMethod) { - GrMethod method = (GrMethod)block.getParent(); + if (block.getParent() instanceof GrMethod method) { parameters = method.getParameters(); } else { @@ -406,8 +405,7 @@ public class CodeBlockGenerator extends Generator { writeExpression(expression, builder, context); } } - else if (clause instanceof GrTraditionalForClause) { - final GrTraditionalForClause cl = (GrTraditionalForClause)clause; + else if (clause instanceof GrTraditionalForClause cl) { final GrCondition initialization = cl.getInitialization(); final GrExpression condition = cl.getCondition(); final GrExpressionList update = cl.getUpdate(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java index 5d1a7fb41f0e..a72c52756560 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java @@ -756,8 +756,7 @@ public class ExpressionGenerator extends Generator { final GroovyResolveResult resolveResult = rValueReference == null ? EmptyGroovyResolveResult.INSTANCE : rValueReference.advancedResolve(); final PsiElement resolved = resolveResult.getElement(); - if (resolved instanceof PsiMethod && GroovyPropertyUtils.isSimplePropertyGetter((PsiMethod)resolved)) { - final PsiMethod getter = (PsiMethod)resolved; + if (resolved instanceof PsiMethod getter && GroovyPropertyUtils.isSimplePropertyGetter((PsiMethod)resolved)) { final String propertyName = GroovyPropertyUtils.getPropertyNameByGetter(getter); final PsiType type; if (qualifier == null) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java index ea35196268ae..43586e54a379 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java @@ -412,8 +412,7 @@ public final class GenerationUtil { return !PsiTypes.charType().equals(PsiPrimitiveType.getOptionallyUnboxedType(target)); } } - else if (initializer instanceof GrListOrMap && target instanceof PsiArrayType) { - GrListOrMap listOrMap = (GrListOrMap)initializer; + else if (initializer instanceof GrListOrMap listOrMap && target instanceof PsiArrayType) { return listOrMap.isMap(); } return true; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToStatic/ConvertToStaticHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToStatic/ConvertToStaticHandler.java index 1e5d6f4894c2..64b5bcfe49f7 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToStatic/ConvertToStaticHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToStatic/ConvertToStaticHandler.java @@ -45,8 +45,7 @@ public class ConvertToStaticHandler implements RefactoringActionHandler { if (containingFile instanceof GroovyFile) { files.add((GroovyFile)containingFile); } - if (element instanceof PsiDirectory) { - PsiDirectory directory = (PsiDirectory)element; + if (element instanceof PsiDirectory directory) { Module module = ModuleUtilCore.findModuleForFile((directory).getVirtualFile(), element.getProject()); if (module != null) { ModuleFileIndex index = ModuleRootManager.getInstance(module).getFileIndex(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/encapsulateFields/GroovyEncapsulateFieldHelper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/encapsulateFields/GroovyEncapsulateFieldHelper.java index 709c3d7ff849..eab40d4d9d13 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/encapsulateFields/GroovyEncapsulateFieldHelper.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/encapsulateFields/GroovyEncapsulateFieldHelper.java @@ -77,11 +77,10 @@ public class GroovyEncapsulateFieldHelper extends EncapsulateFieldHelper { public EncapsulateFieldUsageInfo createUsage(@NotNull EncapsulateFieldsDescriptor descriptor, @NotNull FieldDescriptor fieldDescriptor, @NotNull PsiReference reference) { - if (!(reference instanceof GrReferenceExpression)) return null; + if (!(reference instanceof GrReferenceExpression ref)) return null; boolean findSet = descriptor.isToEncapsulateSet(); boolean findGet = descriptor.isToEncapsulateGet(); - GrReferenceExpression ref = (GrReferenceExpression)reference; if (findGet && JavaEncapsulateFieldHelper.isUsedInExistingAccessor(descriptor.getTargetClass(), fieldDescriptor.getGetterPrototype(), ref)) { return null; @@ -122,7 +121,7 @@ public class GroovyEncapsulateFieldHelper extends EncapsulateFieldHelper { PsiMethod setter, PsiMethod getter) { final PsiElement element = usage.getElement(); - if (!(element instanceof GrReferenceExpression)) return false; + if (!(element instanceof GrReferenceExpression expr)) return false; final FieldDescriptor fieldDescriptor = usage.getFieldDescriptor(); PsiField field = fieldDescriptor.getField(); @@ -130,8 +129,6 @@ public class GroovyEncapsulateFieldHelper extends EncapsulateFieldHelper { boolean processSet = descriptor.isToEncapsulateSet() && !field.hasModifierProperty(PsiModifier.FINAL); if (!processGet && !processSet) return true; - final GrReferenceExpression expr = (GrReferenceExpression)element; - final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(descriptor.getTargetClass().getProject()); try { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java index 9106a4a5a9e8..fd84c0c624de 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java @@ -218,8 +218,7 @@ public final class ExtractUtil { List result = new ArrayList<>(); for (GrStatement statement : statements) { - if (statement instanceof GrVariableDeclaration) { - GrVariableDeclaration declaration = (GrVariableDeclaration)statement; + if (statement instanceof GrVariableDeclaration declaration) { for (GrVariable variable : declaration.getVariables()) { final VariableInfo removed = names.remove(variable.getName()); if (removed != null) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/method/GroovyExtractMethodHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/method/GroovyExtractMethodHandler.java index 1f809117021a..41b826e01841 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/method/GroovyExtractMethodHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/method/GroovyExtractMethodHandler.java @@ -227,8 +227,7 @@ public class GroovyExtractMethodHandler implements RefactoringActionHandler { } private static boolean isEnclosingDefinition(PsiClass owner, PsiElement startElement) { - if (owner instanceof GrTypeDefinition) { - GrTypeDefinition definition = (GrTypeDefinition) owner; + if (owner instanceof GrTypeDefinition definition) { return startElement.getParent() == definition.getBody(); } return false; @@ -250,8 +249,7 @@ public class GroovyExtractMethodHandler implements RefactoringActionHandler { @Override public void visitElement(@NotNull final PsiElement element) { super.visitElement(element); - if (element instanceof GrReferenceExpression) { - GrReferenceExpression expr = (GrReferenceExpression) element; + if (element instanceof GrReferenceExpression expr) { if (!expr.isQualified() && oldName.equals(expr.getReferenceName())) { result.add(expr); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalProcessor.java index ecd230bff75e..346a3e938abf 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalProcessor.java @@ -121,9 +121,8 @@ public class GroovyInlineLocalProcessor extends BaseRefactoringProcessor { if (((ReadWriteVariableInstruction)instruction).isWrite()) continue; if (element instanceof GrVariable && element != variable) continue; - if (!(element instanceof GrReferenceExpression)) continue; + if (!(element instanceof GrReferenceExpression ref)) continue; - final GrReferenceExpression ref = (GrReferenceExpression)element; if (ref.isQualified() || ref.resolve() != variable) continue; final BitSet prev = writes.get(instruction.num()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java index a7f79bdf1d0b..5dc78f45965e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java @@ -68,14 +68,12 @@ public final class GroovyInlineMethodUtil { PsiElement element = reference.getElement(); - if (!(element instanceof GrExpression && element.getParent() instanceof GrCallExpression)) { + if (!(element instanceof GrExpression && element.getParent() instanceof GrCallExpression call)) { String message = GroovyRefactoringBundle.message("refactoring.is.available.only.for.method.calls", getRefactoringName()); showErrorMessage(message, project, editor); return InlineHandler.Settings.CANNOT_INLINE_SETTINGS; } - GrCallExpression call = (GrCallExpression)element.getParent(); - if (PsiTreeUtil.getParentOfType(element, GrParameter.class) != null) { String message = GroovyRefactoringBundle.message("refactoring.is.not.supported.in.parameter.initializers", getRefactoringName()); showErrorMessage(message, project, editor); @@ -239,14 +237,12 @@ public final class GroovyInlineMethodUtil { } private static void collectReferenceInfoImpl(Collection infos, PsiElement elem, GrMethod method) { - if (elem instanceof GrReferenceExpression) { - GrReferenceExpression expr = (GrReferenceExpression) elem; + if (elem instanceof GrReferenceExpression expr) { PsiReference ref = expr.getReference(); if (ref != null) { PsiElement declaration = ref.resolve(); - if (declaration instanceof GrMember) { + if (declaration instanceof GrMember member) { int offsetInMethod = expr.getTextRange().getStartOffset() - method.getTextRange().getStartOffset(); - GrMember member = (GrMember) declaration; infos.add(new ReferenceExpressionInfo(expr, offsetInMethod, member, member.getContainingClass())); } } @@ -292,8 +288,7 @@ public final class GroovyInlineMethodUtil { Set exprs = new HashSet<>(); for (ReferenceExpressionInfo info : infos) { PsiReference ref = method.findReferenceAt(info.offsetInMethod); - if (ref != null && ref.getElement() instanceof GrReferenceExpression) { - GrReferenceExpression refExpr = (GrReferenceExpression) ref.getElement(); + if (ref != null && ref.getElement() instanceof GrReferenceExpression refExpr) { if (refExpr.getQualifierExpression() == null) { exprs.add(refExpr); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java index 59246615b061..36d193cb5b03 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java @@ -65,12 +65,11 @@ public class GroovyMethodInliner implements InlineHandler.Inliner { @Nullable public MultiMap getConflicts(@NotNull PsiReference reference, @NotNull PsiElement referenced) { PsiElement element = reference.getElement(); - if (!(element instanceof GrExpression && element.getParent() instanceof GrCallExpression)) { + if (!(element instanceof GrExpression && element.getParent() instanceof GrCallExpression call)) { final MultiMap map = new MultiMap<>(); map.putValue(element, GroovyRefactoringBundle.message("cannot.inline.reference.0", element.getText())); return map; } - GrCallExpression call = (GrCallExpression) element.getParent(); Collection infos = GroovyInlineMethodUtil.collectReferenceInfo(myMethod); return collectConflicts(call, infos); } @@ -109,11 +108,10 @@ public class GroovyMethodInliner implements InlineHandler.Inliner { public void inlineUsage(@NotNull UsageInfo usage, @NotNull PsiElement referenced) { PsiElement element=usage.getElement(); - if (!(element instanceof GrExpression && element.getParent() instanceof GrCallExpression)) return; + if (!(element instanceof GrExpression && element.getParent() instanceof GrCallExpression call)) return; final Editor editor = getCurrentEditorIfApplicable(element); - GrCallExpression call = (GrCallExpression) element.getParent(); RangeMarker marker = inlineReferenceImpl(call, myMethod, isOnExpressionOrReturnPlace(call), GroovyInlineMethodUtil.isTailMethodCall(call), editor); // highlight replaced result @@ -421,12 +419,11 @@ public class GroovyMethodInliner implements InlineHandler.Inliner { */ private static boolean isOnExpressionOrReturnPlace(@NotNull GrCallExpression call) { PsiElement parent = call.getParent(); - if (!(parent instanceof GrVariableDeclarationOwner)) { + if (!(parent instanceof GrVariableDeclarationOwner owner)) { return true; } // tail calls in methods and closures - GrVariableDeclarationOwner owner = (GrVariableDeclarationOwner) parent; if (owner instanceof GrClosableBlock || owner instanceof GrOpenBlock && owner.getParent() instanceof GrMethod) { GrStatement[] statements = ((GrCodeBlock) owner).getStatements(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodConflictSolver.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodConflictSolver.java index 7766a2f1b357..d31acf3534b3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodConflictSolver.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodConflictSolver.java @@ -90,8 +90,7 @@ public final class InlineMethodConflictSolver { } if (child instanceof GrAssignmentExpression) { GrExpression lValue = ((GrAssignmentExpression) child).getLValue(); - if (lValue instanceof GrReferenceExpression) { - GrReferenceExpression expr = (GrReferenceExpression) lValue; + if (lValue instanceof GrReferenceExpression expr) { if (expr.getQualifierExpression() == null && name.equals(expr.getReferenceName())) { return false; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceHandlerBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceHandlerBase.java index 213274095ece..edac6a59ee54 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceHandlerBase.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceHandlerBase.java @@ -549,8 +549,7 @@ public abstract class GrIntroduceHandlerBase(); for (PsiReference reference : ReferencesSearch.search(myField, new LocalSearchScope(myScope), false)) { final PsiElement element = reference.getElement(); - if (element instanceof GrReferenceExpression) { - final GrReferenceExpression referenceExpression = (GrReferenceExpression)element; + if (element instanceof GrReferenceExpression referenceExpression) { if (referenceExpression.getQualifier() == null) { myReferenceExpressions.add(referenceExpression); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrInplaceParameterIntroducer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrInplaceParameterIntroducer.java index 3ee5580d447d..4920ca2f4ed8 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrInplaceParameterIntroducer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrInplaceParameterIntroducer.java @@ -99,8 +99,7 @@ public final class GrInplaceParameterIntroducer extends GrAbstractInplaceIntrodu protected void updateTitle(@Nullable GrVariable variable, String value) { if (getPreviewEditor() == null || variable == null) return; final PsiElement declarationScope = ((PsiParameter)variable).getDeclarationScope(); - if (declarationScope instanceof PsiMethod) { - final PsiMethod psiMethod = (PsiMethod)declarationScope; + if (declarationScope instanceof PsiMethod psiMethod) { final StringBuilder buf = new StringBuilder(); buf.append(psiMethod.getName()).append(" ("); boolean frst = true; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceClosureParameterProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceClosureParameterProcessor.java index 47e22b878513..19753533b9dc 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceClosureParameterProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceClosureParameterProcessor.java @@ -235,9 +235,8 @@ public class GrIntroduceClosureParameterProcessor extends BaseRefactoringProcess final PsiElement element = instruction.getElement(); if (element instanceof GrVariable && element != var) continue; - if (!(element instanceof GrReferenceExpression)) continue; + if (!(element instanceof GrReferenceExpression ref)) continue; - final GrReferenceExpression ref = (GrReferenceExpression)element; if (ref.isQualified() || ref.resolve() != var) continue; final BitSet prev = writes.get(instruction.num()); @@ -539,8 +538,7 @@ public class GrIntroduceClosureParameterProcessor extends BaseRefactoringProcess } private static void processChangedMethodCall(PsiElement element, GrIntroduceParameterSettings settings) { - if (element.getParent() instanceof GrMethodCallExpression) { - GrMethodCallExpression methodCall = (GrMethodCallExpression)element.getParent(); + if (element.getParent() instanceof GrMethodCallExpression methodCall) { final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(settings.getProject()); GrExpression expression = factory.createExpressionFromText(settings.getName(), null); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GroovyIntroduceParameterUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GroovyIntroduceParameterUtil.java index 7563c54e97c4..d07047ef9aec 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GroovyIntroduceParameterUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GroovyIntroduceParameterUtil.java @@ -185,13 +185,11 @@ public final class GroovyIntroduceParameterUtil { } public static void processChangedMethodCall(PsiElement element, GrIntroduceParameterSettings settings, Project project) { - if (!(element.getParent() instanceof GrMethodCallExpression)) { + if (!(element.getParent() instanceof GrMethodCallExpression methodCall)) { LOG.error(element.getParent()); return; } - GrMethodCallExpression methodCall = (GrMethodCallExpression)element.getParent(); - GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(project); final String name = settings.getName(); LOG.assertTrue(name != null); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/FieldConflictsResolver.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/FieldConflictsResolver.java index 01af1828ef0d..fa99fab6f361 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/FieldConflictsResolver.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/FieldConflictsResolver.java @@ -58,8 +58,7 @@ public class FieldConflictsResolver { myReferenceExpressions = new ArrayList<>(); for (PsiReference reference : ReferencesSearch.search(myField, new LocalSearchScope(myScope), false)) { final PsiElement element = reference.getElement(); - if (element instanceof GrReferenceExpression) { - final GrReferenceExpression referenceExpression = (GrReferenceExpression)element; + if (element instanceof GrReferenceExpression referenceExpression) { if (referenceExpression.getQualifierExpression() == null) { myReferenceExpressions.add(referenceExpression); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java index 0007ff5f5558..1603aded6979 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java @@ -214,8 +214,7 @@ public final class GroovyIntroduceParameterMethodUsagesProcessor implements Intr @Override public boolean processChangeMethodSignature(IntroduceParameterData data, UsageInfo usage, UsageInfo[] usages) throws IncorrectOperationException { - if (!(usage.getElement() instanceof GrMethod) || !isGroovyUsage(usage)) return true; - GrMethod method = (GrMethod)usage.getElement(); + if (!(usage.getElement() instanceof GrMethod method) || !isGroovyUsage(usage)) return true; final FieldConflictsResolver fieldConflictsResolver = new FieldConflictsResolver(data.getParameterName(), method.getBlock()); final MethodJavaDocHelper javaDocHelper = new MethodJavaDocHelper(method); @@ -291,8 +290,7 @@ public final class GroovyIntroduceParameterMethodUsagesProcessor implements Intr @Override public boolean processAddDefaultConstructor(IntroduceParameterData data, UsageInfo usage, UsageInfo[] usages) { - if (!(usage.getElement() instanceof PsiClass) || !isGroovyUsage(usage)) return true; - PsiClass aClass = (PsiClass)usage.getElement(); + if (!(usage.getElement() instanceof PsiClass aClass) || !isGroovyUsage(usage)) return true; final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(data.getProject()); GrMethod constructor = factory.createConstructorFromText(aClass.getName(), ArrayUtilRt.EMPTY_STRING_ARRAY, ArrayUtilRt.EMPTY_STRING_ARRAY, "{}"); @@ -304,8 +302,7 @@ public final class GroovyIntroduceParameterMethodUsagesProcessor implements Intr @Override public boolean processAddSuperCall(IntroduceParameterData data, UsageInfo usage, UsageInfo[] usages) throws IncorrectOperationException { - if (!(usage.getElement() instanceof GrMethod) || !isGroovyUsage(usage)) return true; - GrMethod constructor = (GrMethod)usage.getElement(); + if (!(usage.getElement() instanceof GrMethod constructor) || !isGroovyUsage(usage)) return true; if (!constructor.isConstructor()) return true; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java index 0e4be8bc8d1c..f7d70122847b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java @@ -81,8 +81,7 @@ public class OldReferencesResolver { myProject = myContext.getProject(); myManager = myContext.getManager(); - if (myContext instanceof GrMethodCallExpression) { - final GrMethodCallExpression methodCall = (GrMethodCallExpression)myContext; + if (myContext instanceof GrMethodCallExpression methodCall) { final GrExpression methodExpression = methodCall.getInvokedExpression(); if (methodExpression instanceof GrReferenceExpression) { myInstanceRef = ((GrReferenceExpression)methodExpression).getQualifierExpression(); @@ -133,7 +132,7 @@ public class OldReferencesResolver { GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(myProject); PsiElement newExpr = expr; // references continue being resolved in the children of newExpr - if (oldExpr instanceof GrReferenceExpression) { + if (oldExpr instanceof GrReferenceExpression oldRef) { if (isThisReferenceToContainingClass(oldExpr) || isSimpleSuperReference(oldExpr)) { if (myInstanceRef != null) { newExpr.replace(getInstanceRef(factory)); @@ -141,7 +140,6 @@ public class OldReferencesResolver { return; } - final GrReferenceExpression oldRef = (GrReferenceExpression)oldExpr; newExpr = newExpr.replace(decodeReferenceExpression((GrReferenceExpression)newExpr, oldRef)); //newExpr = ((GrReferenceExpression)newExpr).getReferenceNameElement(); final GroovyResolveResult adv = oldRef.advancedResolve(); @@ -290,8 +288,7 @@ public class OldReferencesResolver { } private static boolean isSimpleSuperReference(PsiElement oldExpr) { - if (oldExpr instanceof GrReferenceExpression) { - GrReferenceExpression ref = (GrReferenceExpression)oldExpr; + if (oldExpr instanceof GrReferenceExpression ref) { if (ref.getQualifier() == null) { PsiElement nameElement = ref.getReferenceNameElement(); if (nameElement != null) { @@ -474,8 +471,7 @@ public class OldReferencesResolver { final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(refExpr.getProject()); - if (refExpr.getParent() instanceof GrMethodCallExpression) { - GrMethodCallExpression methodCall = (GrMethodCallExpression)refExpr.getParent(); + if (refExpr.getParent() instanceof GrMethodCallExpression methodCall) { GrMethodCallExpression newMethodCall = (GrMethodCallExpression)factory.createExpressionFromText(refExpr.getReferenceName() + "()", refExpr); newMethodCall.getArgumentList().replace(methodCall.getArgumentList()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GroovyVariableValidator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GroovyVariableValidator.java index 569634a741f1..359bb770bd33 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GroovyVariableValidator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GroovyVariableValidator.java @@ -32,8 +32,7 @@ public class GroovyVariableValidator extends GrIntroduceValidatorEngine implemen super(context, new ConflictReporter() { @Override public void check(PsiElement element, MultiMap conflicts, String varName) { - if (!(element instanceof GrVariable)) return; - final GrVariable var = (GrVariable)element; + if (!(element instanceof GrVariable var)) return; if (var instanceof GrField) return; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpConflictsUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpConflictsUtil.java index a0c0018723aa..71c575ea69f5 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpConflictsUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpConflictsUtil.java @@ -225,8 +225,7 @@ public final class GrPullUpConflictsUtil { conflictsList.putValue(superClass, message); } - if (member instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)member; + if (member instanceof PsiMethod method) { final PsiModifierList modifierList = method.getModifierList(); if (!modifierList.hasModifierProperty(PsiModifier.PRIVATE)) { for (PsiClass subClass : ClassInheritorsSearch.search(superClass)) { @@ -349,8 +348,7 @@ public final class GrPullUpConflictsUtil { } private boolean existsInSuperClass(PsiElement classMember) { - if (!(classMember instanceof PsiMethod)) return false; - final PsiMethod method = ((PsiMethod)classMember); + if (!(classMember instanceof PsiMethod method)) return false; if (myInterfaceContainmentVerifier.checkedInterfacesContain(method)) return true; if (mySuperClass == null) return false; final PsiMethod methodBySignature = mySuperClass.findMethodBySignature(method, true); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpHelper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpHelper.java index e62c4ef7b442..25c34a67a143 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpHelper.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpHelper.java @@ -427,8 +427,7 @@ public class GrPullUpHelper implements PullUpHelper { private boolean shouldFixSuper(PsiMethod method) { for (PsiMember element : myMembersAfterMove) { - if (element instanceof PsiMethod) { - PsiMethod member = (PsiMethod)element; + if (element instanceof PsiMethod member) { // if there is such member among moved members, super qualifier // should not be removed final PsiManager manager = method.getManager(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassToInnerHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassToInnerHandler.java index dde618995634..770939c61f9f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassToInnerHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassToInnerHandler.java @@ -182,8 +182,7 @@ public class GroovyMoveClassToInnerHandler implements MoveClassToInnerHandler { @Override public void removeRedundantImports(PsiFile targetClassFile) { - if (!(targetClassFile instanceof GroovyFile)) return; - final GroovyFile file = (GroovyFile)targetClassFile; + if (!(targetClassFile instanceof GroovyFile file)) return; for (GrImportStatement unusedImport : unusedImports(file)) { file.removeImport(unusedImport); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyFileHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyFileHandler.java index 49a9e45588e7..48a09d68e4ab 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyFileHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyFileHandler.java @@ -67,8 +67,7 @@ public class MoveGroovyFileHandler extends MoveFileHandler { @Override public void retargetUsages(List usageInfos, Map oldToNewMap) { for (UsageInfo usage : usageInfos) { - if (usage instanceof MoveRenameUsageInfo) { - final MoveRenameUsageInfo moveRenameUsage = (MoveRenameUsageInfo)usage; + if (usage instanceof MoveRenameUsageInfo moveRenameUsage) { final PsiElement oldElement = moveRenameUsage.getReferencedElement(); final PsiElement newElement = oldToNewMap.get(oldElement); final PsiReference reference = moveRenameUsage.getReference(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyMemberHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyMemberHandler.java index 5d988ff3d27c..ea049faccee0 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyMemberHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyMemberHandler.java @@ -54,8 +54,7 @@ public class MoveGroovyMemberHandler implements MoveMemberHandler { final PsiElement element = usage.getElement(); if (element == null || !element.isValid()) return true; - if (usage.reference instanceof GrReferenceExpression) { - GrReferenceExpression refExpr = (GrReferenceExpression)usage.reference; + if (usage.reference instanceof GrReferenceExpression refExpr) { GrExpression qualifier = refExpr.getQualifierExpression(); if (qualifier != null) { if (usage.qualifierClass != null) { @@ -224,8 +223,7 @@ public class MoveGroovyMemberHandler implements MoveMemberHandler { public void visitReferenceExpression(@NotNull final GrReferenceExpression expression) { super.visitReferenceExpression(expression); final PsiElement psiElement = expression.resolve(); - if (psiElement instanceof GrField) { - final GrField grField = (GrField)psiElement; + if (psiElement instanceof GrField grField) { if (grField.getContainingClass() == targetClass && !referencedFields.contains(grField)) { referencedFields.add(grField); } @@ -249,8 +247,7 @@ public class MoveGroovyMemberHandler implements MoveMemberHandler { } private static PsiElement addEnumConstant(PsiClass targetClass, GrEnumConstant constant, @Nullable PsiElement anchor) { - if (targetClass instanceof GrEnumTypeDefinition) { - final GrEnumTypeDefinition enumeration = (GrEnumTypeDefinition)targetClass; + if (targetClass instanceof GrEnumTypeDefinition enumeration) { final GrEnumConstantList constantList = enumeration.getEnumConstantList(); if (constantList != null) { ASTNode node = constantList.getNode(); @@ -273,8 +270,7 @@ public class MoveGroovyMemberHandler implements MoveMemberHandler { @NotNull Set membersToMove, @NotNull PsiClass targetClass) { PsiElement ref = psiReference.getElement(); - if (ref instanceof GrReferenceExpression) { - GrReferenceExpression refExpr = (GrReferenceExpression)ref; + if (ref instanceof GrReferenceExpression refExpr) { GrExpression qualifier = refExpr.getQualifier(); if (RefactoringHierarchyUtil.willBeInTargetClass(refExpr, membersToMove, targetClass, true)) { // both member and the reference to it will be in target class diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedMethodProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedMethodProcessor.java index 22f5b0295576..1c3cf4627667 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedMethodProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedMethodProcessor.java @@ -131,8 +131,7 @@ public class RenameAliasImportedMethodProcessor extends RenameJavaMethodProcesso @NotNull final String newName, @NotNull final Map allRenames, @NotNull final List result) { - if (element instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)element; + if (element instanceof PsiMethod method) { OverridingMethodsSearch.search(method).forEach(overrider -> { PsiElement original = overrider; if (overrider instanceof PsiMirrorElement) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GrMethodInplaceRenamer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GrMethodInplaceRenamer.java index 5ae2474b4d6d..b37cb569c818 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GrMethodInplaceRenamer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GrMethodInplaceRenamer.java @@ -62,8 +62,7 @@ public class GrMethodInplaceRenamer extends MemberInplaceRenamer { @Nullable private static TextRange getReferenceNameRange(PsiElement element) { - if (element instanceof GrReferenceExpression) { - GrReferenceExpression referenceExpression = (GrReferenceExpression)element; + if (element instanceof GrReferenceExpression referenceExpression) { PsiElement nameElement = referenceExpression.getReferenceNameElement(); TextRange stringContentRange = GrStringUtil.getStringContentRange(nameElement); if (stringContentRange != null) return stringContentRange.shiftRight(nameElement.getStartOffsetInParent()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GroovyResolveSnapshot.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GroovyResolveSnapshot.java index d2f558146871..c700f70f2e22 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GroovyResolveSnapshot.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GroovyResolveSnapshot.java @@ -78,8 +78,7 @@ public class GroovyResolveSnapshot extends ResolveSnapshotProvider.ResolveSnapsh } private static void qualify(PsiElement referent, PsiElement referee, String hidingLocalName) { - if (referent instanceof GrReferenceExpression && referee instanceof GrMember) { - GrReferenceExpression ref = ((GrReferenceExpression)referent); + if (referent instanceof GrReferenceExpression ref && referee instanceof GrMember) { if (!ref.isQualified() && hidingLocalName.equals(ref.getReferenceName())) { PsiUtil.qualifyMemberReference(ref, (GrMember)referee, hidingLocalName); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java index 45b33602c4c5..a0932d27157a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java @@ -79,8 +79,7 @@ public final class MethodOrClosureScopeChooser { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); final String text; - if (value instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)value; + if (value instanceof PsiMethod method) { text = PsiFormatUtil.formatMethod(method, PsiSubstitutor.EMPTY, PsiFormatUtilBase.SHOW_CONTAINING_CLASS | PsiFormatUtilBase.SHOW_NAME | @@ -128,8 +127,7 @@ public final class MethodOrClosureScopeChooser { final PsiElement toSearchFor; - if (ToSearchIn instanceof GrMethod) { - final GrMethod method = (GrMethod)ToSearchIn; + if (ToSearchIn instanceof GrMethod method) { toSearchFor = superMethod.isEnabled() && superMethod.isSelected() ? method.findDeepestSuperMethod() : method; } else { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java index debb14e7626a..9d67d32ea6be 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java @@ -119,9 +119,8 @@ public final class GroovyScriptRunConfiguration extends ModuleBasedConfiguration if (scriptFile == null) return null; final PsiFile psiFile = PsiManager.getInstance(getProject()).findFile(scriptFile); - if (!(psiFile instanceof GroovyFile)) return null; + if (!(psiFile instanceof GroovyFile groovyFile)) return null; - final GroovyFile groovyFile = (GroovyFile)psiFile; if (groovyFile.isScript()) { return GroovyScriptUtil.getScriptType(groovyFile).getRunner(); } @@ -236,8 +235,7 @@ public final class GroovyScriptRunConfiguration extends ModuleBasedConfiguration return new RefactoringElementAdapter() { @Override protected void elementRenamedOrMoved(@NotNull PsiElement newElement) { - if (newElement instanceof GroovyFile) { - GroovyFile file = (GroovyFile)newElement; + if (newElement instanceof GroovyFile file) { setScriptPath(ScriptFileUtil.getScriptFilePath(file.getVirtualFile())); } } diff --git a/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/groovy/GroovyEquivalenceDescriptorProvider.java b/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/groovy/GroovyEquivalenceDescriptorProvider.java index ed83ecdd8854..480f1aba596d 100644 --- a/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/groovy/GroovyEquivalenceDescriptorProvider.java +++ b/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/groovy/GroovyEquivalenceDescriptorProvider.java @@ -35,45 +35,39 @@ public class GroovyEquivalenceDescriptorProvider extends EquivalenceDescriptorPr if (e instanceof GrVariableDeclaration) { return builder.elements(((GrVariableDeclaration)e).getVariables()); } - else if (e instanceof GrParameter) { - final GrParameter p = (GrParameter)e; + else if (e instanceof GrParameter p) { return builder .element(p.getNameIdentifierGroovy()) .optionally(p.getTypeElementGroovy()) .optionallyInPattern(p.getInitializerGroovy()); } - else if (e instanceof GrVariable) { - final GrVariable v = (GrVariable)e; + else if (e instanceof GrVariable v) { return builder .element(v.getNameIdentifierGroovy()) .optionally(v.getTypeElementGroovy()) .optionallyInPattern(v.getInitializerGroovy()); } - else if (e instanceof GrMethod) { - final GrMethod m = (GrMethod)e; + else if (e instanceof GrMethod m) { return builder .element(m.getNameIdentifierGroovy()) .elements(m.getParameters()) .optionally(m.getReturnTypeElementGroovy()) .optionallyInPattern(m.getBlock()); } - else if (e instanceof GrTypeDefinitionBody) { - final GrTypeDefinitionBody b = (GrTypeDefinitionBody)e; + else if (e instanceof GrTypeDefinitionBody b) { return builder .inAnyOrder(b.getFields()) .inAnyOrder(b.getMethods()) .inAnyOrder(b.getInitializers()) .inAnyOrder(b.getInnerClasses()); } - else if (e instanceof GrTypeDefinition) { - GrTypeDefinition d = (GrTypeDefinition)e; + else if (e instanceof GrTypeDefinition d) { return builder.element(d.getNameIdentifierGroovy()) .optionallyInPattern(d.getExtendsClause()) .optionallyInPattern(d.getImplementsClause()) .optionallyInPattern(d.getBody()); } - else if (e instanceof GrForInClause) { - final GrForInClause f = (GrForInClause)e; + else if (e instanceof GrForInClause f) { return builder .element(f.getDeclaredVariable()) .element(f.getIteratedExpression()); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/util/TestUtils.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/util/TestUtils.java index 2230f8d0b6b2..93aa43ecbaea 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/util/TestUtils.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/util/TestUtils.java @@ -189,8 +189,7 @@ public abstract class TestUtils { file.acceptChildren(new PsiRecursiveElementVisitor() { @Override public void visitElement(@NotNull PsiElement element) { - if (element instanceof GrReferenceExpression) { - GrReferenceExpression psiReference = (GrReferenceExpression)element; + if (element instanceof GrReferenceExpression psiReference) { GrExpression qualifier = psiReference.getQualifierExpression(); if (qualifier instanceof GrReferenceExpression) { diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgRevisionNumber.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgRevisionNumber.java index bde64cd4dcd5..90d737387e39 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgRevisionNumber.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgRevisionNumber.java @@ -155,10 +155,9 @@ public class HgRevisionNumber implements VcsRevisionNumber { if (this == o) { return 0; } - if (!(o instanceof HgRevisionNumber)) { + if (!(o instanceof HgRevisionNumber other)) { return -1; } - final HgRevisionNumber other = (HgRevisionNumber) o; if (changeset.equals(other.changeset)) { return 0; } @@ -213,10 +212,9 @@ public class HgRevisionNumber implements VcsRevisionNumber { if (object == this) { return true; } - if (!(object instanceof HgRevisionNumber)) { + if (!(object instanceof HgRevisionNumber that)) { return false; } - HgRevisionNumber that = (HgRevisionNumber) object; return compareTo(that) == 0; } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotationLine.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotationLine.java index 27bb38a4cce8..35e1d3fad01d 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotationLine.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotationLine.java @@ -43,10 +43,9 @@ public class HgAnnotationLine { if (this == obj) { return true; } - if (!(obj instanceof HgAnnotationLine)) { + if (!(obj instanceof HgAnnotationLine other)) { return false; } - HgAnnotationLine other = (HgAnnotationLine) obj; return fields.equals(other.fields); } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java b/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java index c737980e0cfe..5da1b8b8d431 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java @@ -44,9 +44,7 @@ public class HgTarget implements PushTarget { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof HgTarget)) return false; - - HgTarget hgTarget = (HgTarget)o; + if (!(o instanceof HgTarget hgTarget)) return false; if (!myBranchName.equals(hgTarget.myBranchName)) return false; if (!myTarget.equals(hgTarget.myTarget)) return false; diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMqUnAppliedPatchesPanel.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMqUnAppliedPatchesPanel.java index 25e8df43bd12..3d531e6ddfc8 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMqUnAppliedPatchesPanel.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMqUnAppliedPatchesPanel.java @@ -173,9 +173,7 @@ public class HgMqUnAppliedPatchesPanel extends JPanel implements DataProvider, H @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof HgMqUnAppliedPatchesPanel)) return false; - - HgMqUnAppliedPatchesPanel panel = (HgMqUnAppliedPatchesPanel)o; + if (!(o instanceof HgMqUnAppliedPatchesPanel panel)) return false; if (!myRepository.equals(panel.myRepository)) return false; diff --git a/plugins/htmltools/src/com/intellij/htmltools/codeInsight/daemon/impl/analysis/encoding/HtmlHttpEquivEncodingReferenceProvider.java b/plugins/htmltools/src/com/intellij/htmltools/codeInsight/daemon/impl/analysis/encoding/HtmlHttpEquivEncodingReferenceProvider.java index 840e8fd8f0b0..061b9494e4a0 100644 --- a/plugins/htmltools/src/com/intellij/htmltools/codeInsight/daemon/impl/analysis/encoding/HtmlHttpEquivEncodingReferenceProvider.java +++ b/plugins/htmltools/src/com/intellij/htmltools/codeInsight/daemon/impl/analysis/encoding/HtmlHttpEquivEncodingReferenceProvider.java @@ -19,8 +19,7 @@ public class HtmlHttpEquivEncodingReferenceProvider extends XmlEncodingReference LOG.assertTrue(element instanceof XmlAttributeValue); XmlAttributeValue value = (XmlAttributeValue)element; PsiElement parent = value.getParent(); - if (parent instanceof XmlAttribute) { - XmlAttribute attribute = (XmlAttribute)parent; + if (parent instanceof XmlAttribute attribute) { XmlTag tag = attribute.getParent(); @NonNls String name = attribute.getLocalName(); if (tag != null && "meta".equals(tag.getLocalName()) && tag.getAttribute("http-equiv") != null && name.equals("content")) { diff --git a/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceAppletTagAction.java b/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceAppletTagAction.java index 373b87947a21..51dc9985d453 100644 --- a/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceAppletTagAction.java +++ b/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceAppletTagAction.java @@ -60,8 +60,7 @@ public class ReplaceAppletTagAction implements LocalQuickFix { PsiElement[] replacePsiElements = generateContainingElements(project, name); int cnt = 0; for (PsiElement element : tag.getChildren()) { - if (element instanceof XmlToken) { - XmlToken token = (XmlToken)element; + if (element instanceof XmlToken token) { IElementType type = token.getTokenType(); if (type == XmlTokenType.XML_NAME) { token.replace(replacePsiElements[cnt++]); diff --git a/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceFontTagAction.java b/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceFontTagAction.java index 869278cd1480..4f436a27d655 100644 --- a/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceFontTagAction.java +++ b/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceFontTagAction.java @@ -73,8 +73,7 @@ public class ReplaceFontTagAction implements LocalQuickFix { PsiElement[] replacePsiElements = generateContainingElements(project, name); int cnt = 0; for (PsiElement element : tag.getChildren()) { - if (element instanceof XmlToken) { - XmlToken token = (XmlToken)element; + if (element instanceof XmlToken token) { IElementType type = token.getTokenType(); if (type == XmlTokenType.XML_NAME) { token.replace(replacePsiElements[cnt++]); diff --git a/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceHtmlTagWithAnotherAction.java b/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceHtmlTagWithAnotherAction.java index 1e5d0d8bd6fa..02df58f93676 100644 --- a/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceHtmlTagWithAnotherAction.java +++ b/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceHtmlTagWithAnotherAction.java @@ -74,8 +74,7 @@ public class ReplaceHtmlTagWithAnotherAction implements LocalQuickFix { PsiElement[] replacePsiElements = generateContainingElements(project, name); int cnt = 0; for (PsiElement element : tag.getChildren()) { - if (element instanceof XmlToken) { - XmlToken token = (XmlToken)element; + if (element instanceof XmlToken token) { IElementType type = token.getTokenType(); if (type == XmlTokenType.XML_NAME) { token.replace(replacePsiElements[cnt++]); diff --git a/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceHtmlTagWithCssAction.java b/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceHtmlTagWithCssAction.java index acfc130c70a2..497f20b47292 100644 --- a/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceHtmlTagWithCssAction.java +++ b/plugins/htmltools/src/com/intellij/htmltools/codeInspection/htmlInspections/htmltagreplace/ReplaceHtmlTagWithCssAction.java @@ -128,8 +128,7 @@ public class ReplaceHtmlTagWithCssAction implements LocalQuickFix { PsiElement[] elements = tag.getChildren(); boolean started = false; for (PsiElement psiElement : elements) { - if (psiElement instanceof XmlToken) { - final XmlToken xmlToken = (XmlToken)psiElement; + if (psiElement instanceof XmlToken xmlToken) { IElementType type = xmlToken.getTokenType(); if (type == XmlTokenType.XML_TAG_END) { started = true; diff --git a/plugins/htmltools/src/com/intellij/htmltools/html/actions/TableUtil.java b/plugins/htmltools/src/com/intellij/htmltools/html/actions/TableUtil.java index db68e17c42ec..bbc69d4178d9 100644 --- a/plugins/htmltools/src/com/intellij/htmltools/html/actions/TableUtil.java +++ b/plugins/htmltools/src/com/intellij/htmltools/html/actions/TableUtil.java @@ -88,8 +88,7 @@ public final class TableUtil { static void generateTableList(PsiElement element, boolean isInsideHeader, List>> list, List tags) { - if (element instanceof XmlTag) { - XmlTag tag = (XmlTag)element; + if (element instanceof XmlTag tag) { final String name = StringUtil.toLowerCase(tag.getLocalName()); if (THEAD.equals(name)) { isInsideHeader = true; @@ -217,8 +216,7 @@ public final class TableUtil { PsiElement[] children = tag.getChildren(); for (int i = 0; i < children.length; i++) { PsiElement element = children[i]; - if (element instanceof XmlToken) { - XmlToken token = (XmlToken)element; + if (element instanceof XmlToken token) { IElementType type = token.getTokenType(); if (type.equals(XmlTokenType.XML_TAG_END)) { return children[i + 1]; diff --git a/plugins/htmltools/src/com/intellij/htmltools/ide/HtmlFileDropHandler.java b/plugins/htmltools/src/com/intellij/htmltools/ide/HtmlFileDropHandler.java index 1d21c3b9a5cc..4c8108c37186 100644 --- a/plugins/htmltools/src/com/intellij/htmltools/ide/HtmlFileDropHandler.java +++ b/plugins/htmltools/src/com/intellij/htmltools/ide/HtmlFileDropHandler.java @@ -128,8 +128,7 @@ public class HtmlFileDropHandler extends CustomFileDropHandler { private static boolean checkIfPresent(Editor editor, String tagTemplate, String relativePath, PsiElement parent) { for (PsiElement element : parent.getChildren()) { - if (element instanceof XmlTag) { - final XmlTag tag = (XmlTag)element; + if (element instanceof XmlTag tag) { if (tagTemplate.startsWith("<" + tag.getName() + " ")) { final String attrName = HtmlUtil.SCRIPT_TAG_NAME.equals(tag.getName()) ? "src" : "href"; String path = tag.getAttributeValue(attrName); diff --git a/plugins/htmltools/src/com/intellij/htmltools/xml/util/CheckImageSizeInspection.java b/plugins/htmltools/src/com/intellij/htmltools/xml/util/CheckImageSizeInspection.java index 2b4dc25b91dc..564a865324a8 100644 --- a/plugins/htmltools/src/com/intellij/htmltools/xml/util/CheckImageSizeInspection.java +++ b/plugins/htmltools/src/com/intellij/htmltools/xml/util/CheckImageSizeInspection.java @@ -91,10 +91,9 @@ public class CheckImageSizeInspection extends XmlSuppressableInspectionTool { final boolean isHeight = HtmlReferenceProvider.SizeReference.HEIGHT_ATTR_NAME.equalsIgnoreCase(name); if (refs.length == 1 && - refs[0] instanceof HtmlReferenceProvider.SizeReference && + refs[0] instanceof HtmlReferenceProvider.SizeReference sizeReference && refs[0].getRangeInElement().getLength() >= 2 // avoid errors on concatenations ) { - HtmlReferenceProvider.SizeReference sizeReference = (HtmlReferenceProvider.SizeReference)refs[0]; PsiElement element = sizeReference.resolve(); if (element == null) { diff --git a/plugins/htmltools/src/com/intellij/htmltools/xml/util/HtmlReferenceProvider.java b/plugins/htmltools/src/com/intellij/htmltools/xml/util/HtmlReferenceProvider.java index 6b9cfa4c6c2b..7d8d0a1752c3 100644 --- a/plugins/htmltools/src/com/intellij/htmltools/xml/util/HtmlReferenceProvider.java +++ b/plugins/htmltools/src/com/intellij/htmltools/xml/util/HtmlReferenceProvider.java @@ -76,8 +76,7 @@ public class HtmlReferenceProvider extends PsiReferenceProvider { protected static boolean isAcceptableAttributeValue(PsiElement element) { final PsiElement parent = element.getParent(); - if (parent instanceof XmlAttribute) { - XmlAttribute xmlAttribute = (XmlAttribute) parent; + if (parent instanceof XmlAttribute xmlAttribute) { @NonNls final String attrName = xmlAttribute.getName(); XmlTag tag = xmlAttribute.getParent(); if (tag == null) return false; @@ -169,8 +168,7 @@ public class HtmlReferenceProvider extends PsiReferenceProvider { @Override public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, @NotNull final ProcessingContext context) { final PsiElement parent = element.getParent(); - if (!(parent instanceof XmlAttribute)) return PsiReference.EMPTY_ARRAY; - final XmlAttribute attribute = (XmlAttribute)parent; + if (!(parent instanceof XmlAttribute attribute)) return PsiReference.EMPTY_ARRAY; final String localName = attribute.getLocalName(); if (element instanceof PsiLanguageInjectionHost && InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)element)) { diff --git a/plugins/intellij.dev.psiViewer/src/PsiViewerDialog.java b/plugins/intellij.dev.psiViewer/src/PsiViewerDialog.java index 9d3dad8bfed7..e8f894d0eaf0 100644 --- a/plugins/intellij.dev.psiViewer/src/PsiViewerDialog.java +++ b/plugins/intellij.dev.psiViewer/src/PsiViewerDialog.java @@ -502,8 +502,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider { @Nullable private static PsiElement getPsiElement(DefaultMutableTreeNode node) { - if (node.getUserObject() instanceof ViewerNodeDescriptor) { - ViewerNodeDescriptor descriptor = (ViewerNodeDescriptor)node.getUserObject(); + if (node.getUserObject() instanceof ViewerNodeDescriptor descriptor) { Object elementObject = descriptor.getElement(); return elementObject instanceof PsiElement ? (PsiElement)elementObject @@ -649,8 +648,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider { if (source instanceof PsiViewerExtension) { return ((PsiViewerExtension)source).createElement(myProject, text); } - if (source instanceof FileType) { - FileType type = (FileType)source; + if (source instanceof FileType type) { String ext = type.getDefaultExtension(); if (myExtensionComboBox.isVisible() && myExtensionComboBox.getSelectedItem() != null) { ext = StringUtil.toLowerCase(myExtensionComboBox.getSelectedItem().toString()); @@ -699,8 +697,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider { TreePath path = myPsiTree.getSelectionPath(); if (path != null) { DefaultMutableTreeNode node = (DefaultMutableTreeNode)path.getLastPathComponent(); - if (!(node.getUserObject() instanceof ViewerNodeDescriptor)) return null; - ViewerNodeDescriptor descriptor = (ViewerNodeDescriptor)node.getUserObject(); + if (!(node.getUserObject() instanceof ViewerNodeDescriptor descriptor)) return null; Object elementObject = descriptor.getElement(); PsiElement element = elementObject instanceof PsiElement ? (PsiElement)elementObject @@ -736,8 +733,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider { clearSelection(); if (path != null) { DefaultMutableTreeNode node = (DefaultMutableTreeNode)path.getLastPathComponent(); - if (!(node.getUserObject() instanceof ViewerNodeDescriptor)) return; - ViewerNodeDescriptor descriptor = (ViewerNodeDescriptor)node.getUserObject(); + if (!(node.getUserObject() instanceof ViewerNodeDescriptor descriptor)) return; Object elementObject = descriptor.getElement(); PsiElement element = elementObject instanceof PsiElement ? (PsiElement)elementObject diff --git a/plugins/intellij.dev.psiViewer/src/formatter/BlockViewerPsiBasedTree.java b/plugins/intellij.dev.psiViewer/src/formatter/BlockViewerPsiBasedTree.java index 0f951669fec8..b61cb78c0ed9 100644 --- a/plugins/intellij.dev.psiViewer/src/formatter/BlockViewerPsiBasedTree.java +++ b/plugins/intellij.dev.psiViewer/src/formatter/BlockViewerPsiBasedTree.java @@ -227,8 +227,7 @@ public class BlockViewerPsiBasedTree implements ViewerPsiBasedTree { if (component == null) return; Object item = component.getUserObject(); - if (!(item instanceof BlockTreeNode)) return; - BlockTreeNode descriptor = (BlockTreeNode)item; + if (!(item instanceof BlockTreeNode descriptor)) return; int blockStart = descriptor.getBlock().getTextRange().getStartOffset(); PsiFile file = myRootElement.getContainingFile(); diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/ClassWriter.java index c012edd94f3f..31f14c60939f 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/ClassWriter.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/ClassWriter.java @@ -766,8 +766,7 @@ public class ClassWriter { String typeName; boolean isVarArg = i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS); List typeParamAnnotations = TargetInfo.FormalParameterTarget.extract(typeAnnotations, i); - if (paramType instanceof GenericType) { - GenericType genParamType = (GenericType) paramType; + if (paramType instanceof GenericType genParamType) { isVarArg &= genParamType.getArrayDim() > 0; if (isVarArg) { genParamType = genParamType.decreaseArrayDim(); diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java index 7fca17c41c49..da1fc15420fa 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java @@ -801,8 +801,7 @@ public class NestedClassProcessor { int counter = 0; for (Object obj : stat.getSequentialObjects()) { - if (obj instanceof Statement) { - Statement st = (Statement)obj; + if (obj instanceof Statement st) { Statement stTemp = getDefStatement(st, classType, setStats); @@ -899,9 +898,8 @@ public class NestedClassProcessor { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof VarFieldPair)) return false; + if (!(o instanceof VarFieldPair pair)) return false; - VarFieldPair pair = (VarFieldPair)o; return fieldKey.equals(pair.fieldKey) && varPair.equals(pair.varPair); } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java index c78b5ea78197..f4cb77bea603 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java @@ -173,8 +173,7 @@ public final class ConcatenationHelper { if (c == TAG_ARG) { Exprent exprent = parameters.get(parameterId++); - if ((exprent instanceof VarExprent) && res.isEmpty()) { - VarExprent varExprent = (VarExprent) exprent; + if ((exprent instanceof VarExprent varExprent) && res.isEmpty()) { if (!VarType.VARTYPE_STRING.equals(varExprent.getVarType())) { // First item of concatenation is a variable and variable's type is not a String. diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/PatternHelper.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/PatternHelper.java index 5fbb8a125404..51bb36e20963 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/PatternHelper.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/PatternHelper.java @@ -31,8 +31,7 @@ public final class PatternHelper { private static void replaceAssignmentsWithPatternVariables(@NotNull Statement statement, @NotNull Map tempVarAssignments) { - if (statement instanceof IfStatement) { - IfStatement ifStatement = (IfStatement)statement; + if (statement instanceof IfStatement ifStatement) { FunctionExprent instanceOfExprent = findInstanceofExprent(ifStatement); if (instanceOfExprent == null) return; diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java index 49a305a923ba..e480d374e96f 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java @@ -58,8 +58,7 @@ public final class SwitchHelper { private static void collectSwitchesOnString(@NotNull Statement statement, @NotNull List recognizers, @NotNull List candidates) { - if (statement instanceof SwitchStatement) { - SwitchStatement switchStatement = (SwitchStatement)statement; + if (statement instanceof SwitchStatement switchStatement) { SwitchExprent switchExprent = (SwitchExprent)switchStatement.getHeadExprent(); Exprent switchSelector = Objects.requireNonNull(switchExprent).getValue(); if (switchSelector instanceof InvocationExprent) { @@ -93,8 +92,7 @@ public final class SwitchHelper { MethodWrapper wrapper = classNode.getWrapper().getMethodWrapper(CodeConstants.CLINIT_NAME, "()V"); if (wrapper != null && wrapper.root != null) { wrapper.getOrBuildGraph().iterateExprents(exprent -> { - if (exprent instanceof AssignmentExprent) { - AssignmentExprent assignment = (AssignmentExprent)exprent; + if (exprent instanceof AssignmentExprent assignment) { Exprent left = assignment.getLeft(); if (left.type == Exprent.EXPRENT_ARRAY && ((ArrayExprent)left).getArray().equals(arrayField)) { mapping.put(assignment.getRight(), ((InvocationExprent)((ArrayExprent)left).getIndex()).getInstance()); @@ -111,8 +109,7 @@ public final class SwitchHelper { MethodWrapper wrapper = classNode.getWrapper().getMethodWrapper(invocationExprent.getName(), "()[I"); if (wrapper != null && wrapper.root != null) { wrapper.getOrBuildGraph().iterateExprents(exprent -> { - if (exprent instanceof AssignmentExprent) { - AssignmentExprent assignment = (AssignmentExprent)exprent; + if (exprent instanceof AssignmentExprent assignment) { Exprent left = assignment.getLeft(); if (left.type == Exprent.EXPRENT_ARRAY) { Exprent indexExprent = ((ArrayExprent)left).getIndex(); diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java index 84de9258ddf9..05849823262a 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java @@ -91,9 +91,8 @@ public class AnnotationExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof AnnotationExprent)) return false; + if (!(o instanceof AnnotationExprent ann)) return false; - AnnotationExprent ann = (AnnotationExprent)o; return className.equals(ann.className) && parNames.equals(ann.parNames) && parValues.equals(ann.parValues); diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java index c5bce7deb9b3..e2b79d56e9f7 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java @@ -92,9 +92,8 @@ public class ArrayExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof ArrayExprent)) return false; + if (!(o instanceof ArrayExprent arr)) return false; - ArrayExprent arr = (ArrayExprent)o; return Objects.equals(array, arr.getArray()) && Objects.equals(index, arr.getIndex()); } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java index 13faa7fd1630..b8678cdc0f0e 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java @@ -158,9 +158,8 @@ public class AssignmentExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof AssignmentExprent)) return false; + if (!(o instanceof AssignmentExprent as)) return false; - AssignmentExprent as = (AssignmentExprent)o; return Objects.equals(left, as.getLeft()) && Objects.equals(right, as.getRight()) && condType == as.getCondType(); diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java index caa160fdc4ff..743074d1b43f 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java @@ -322,9 +322,8 @@ public class ConstExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof ConstExprent)) return false; + if (!(o instanceof ConstExprent cn)) return false; - ConstExprent cn = (ConstExprent)o; return Objects.equals(constType, cn.getConstType()) && Objects.equals(value, cn.getValue()); } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java index 8dfa6cb4ad9f..655e56241cf1 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java @@ -122,9 +122,8 @@ public class ExitExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof ExitExprent)) return false; + if (!(o instanceof ExitExprent et)) return false; - ExitExprent et = (ExitExprent)o; return exitType == et.getExitType() && Objects.equals(value, et.getValue()); } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java index ec3a8668a94c..4cd97c42682b 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java @@ -153,9 +153,8 @@ public class FieldExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof FieldExprent)) return false; + if (!(o instanceof FieldExprent ft)) return false; - FieldExprent ft = (FieldExprent)o; return Objects.equals(name, ft.getName()) && Objects.equals(classname, ft.getClassname()) && isStatic == ft.isStatic() && diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java index a4ee85ba5dea..4290039f0724 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java @@ -390,9 +390,8 @@ public class FunctionExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof FunctionExprent)) return false; + if (!(o instanceof FunctionExprent fe)) return false; - FunctionExprent fe = (FunctionExprent)o; return funcType == fe.funcType && Objects.equals(lstOperands, fe.lstOperands); // TODO: order of operands insignificant } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java index d5a743fd1a4e..fda309fdc9d9 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java @@ -117,9 +117,8 @@ public class IfExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof IfExprent)) return false; + if (!(o instanceof IfExprent ie)) return false; - IfExprent ie = (IfExprent)o; return Objects.equals(condition, ie.getCondition()); } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java index d4ce3d808e98..dc9c2a593185 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java @@ -515,9 +515,8 @@ public class InvocationExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof InvocationExprent)) return false; + if (!(o instanceof InvocationExprent it)) return false; - InvocationExprent it = (InvocationExprent)o; return Objects.equals(name, it.name) && Objects.equals(className, it.className) && isStatic == it.isStatic && diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java index 5c4b2f37b57e..7259ce4ee915 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java @@ -61,9 +61,8 @@ public class MonitorExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof MonitorExprent)) return false; + if (!(o instanceof MonitorExprent me)) return false; - MonitorExprent me = (MonitorExprent)o; return monType == me.getMonType() && Objects.equals(value, me.getValue()); } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java index 6257de67e8ac..2f8da49a36ee 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java @@ -426,9 +426,8 @@ public class NewExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof NewExprent)) return false; + if (!(o instanceof NewExprent ne)) return false; - NewExprent ne = (NewExprent)o; return Objects.equals(newType, ne.newType) && Objects.equals(lstDims, ne.lstDims) && Objects.equals(constructor, ne.constructor) && diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java index 3b77fa20c3bf..f475db7b7441 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java @@ -92,11 +92,10 @@ public class SwitchExprent extends Exprent { return true; } - if (!(o instanceof SwitchExprent)) { + if (!(o instanceof SwitchExprent sw)) { return false; } - SwitchExprent sw = (SwitchExprent)o; return Objects.equals(value, sw.getValue()); } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java index eb0ef2bf829f..e488a34ea11a 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java @@ -173,9 +173,8 @@ public class VarExprent extends Exprent { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof VarExprent)) return false; + if (!(o instanceof VarExprent ve)) return false; - VarExprent ve = (VarExprent)o; return index == ve.getIndex() && version == ve.getVersion() && Objects.equals(getVarType(), ve.getVarType()); // FIXME: varType comparison redundant? diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java index 592860d16b74..552ae9594a64 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java @@ -479,9 +479,8 @@ public class FlattenStatementsHelper { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof FinallyPathWrapper)) return false; + if (!(o instanceof FinallyPathWrapper fpw)) return false; - FinallyPathWrapper fpw = (FinallyPathWrapper)o; return (source + ":" + destination + ":" + entry).equals(fpw.source + ":" + fpw.destination + ":" + fpw.entry); } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java index 49729c1d27c1..0113b76b89a8 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java @@ -243,8 +243,7 @@ public class VarDefinitionHelper { List currVars = new ArrayList<>(); for (Object obj : stat.getSequentialObjects()) { - if (obj instanceof Statement) { - Statement st = (Statement)obj; + if (obj instanceof Statement st) { childVars.addAll(initStatement(st)); if (st.type == StatementType.DO) { diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java index 2e67a881b4b5..b0e1b72aa975 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java @@ -24,9 +24,8 @@ public class VarVersionEdge { // FIXME: can be removed? @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof VarVersionEdge)) return false; + if (!(o instanceof VarVersionEdge edge)) return false; - VarVersionEdge edge = (VarVersionEdge)o; return type == edge.type && source == edge.source && dest == edge.dest; } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java index 8554988aa2b9..2c4c6afe860d 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java @@ -28,9 +28,8 @@ public class VarVersionPair { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof VarVersionPair)) return false; + if (!(o instanceof VarVersionPair paar)) return false; - VarVersionPair paar = (VarVersionPair)o; return var == paar.var && version == paar.version; } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java index 27a0fa14f9eb..93f2e0df50a2 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java @@ -64,9 +64,8 @@ public class LinkConstant extends PooledConstant { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof LinkConstant)) return false; + if (!(o instanceof LinkConstant cn)) return false; - LinkConstant cn = (LinkConstant)o; return this.type == cn.type && this.elementname.equals(cn.elementname) && this.descriptor.equals(cn.descriptor) && diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java index 408622a592d4..31e5e5cf9e61 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java @@ -40,9 +40,8 @@ public class PrimitiveConstant extends PooledConstant { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof PrimitiveConstant)) return false; + if (!(o instanceof PrimitiveConstant cn)) return false; - PrimitiveConstant cn = (PrimitiveConstant)o; return this.type == cn.type && this.isArray == cn.isArray && this.value.equals(cn.value); diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java index bfc44b2e29c8..de2f580a65aa 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java @@ -36,9 +36,8 @@ public final class FieldDescriptor { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof FieldDescriptor)) return false; + if (!(o instanceof FieldDescriptor fd)) return false; - FieldDescriptor fd = (FieldDescriptor)o; return type.equals(fd.type); } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java index 7007b680a005..267eb5067594 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java @@ -114,9 +114,8 @@ public final class MethodDescriptor { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof MethodDescriptor)) return false; + if (!(o instanceof MethodDescriptor md)) return false; - MethodDescriptor md = (MethodDescriptor)o; return ret.equals(md.ret) && Arrays.equals(params, md.params); } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/VarType.java index 30b31f5604f0..2d18843b4863 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/VarType.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/gen/VarType.java @@ -254,11 +254,10 @@ public class VarType implements Type { // TODO: optimize switch return true; } - if (!(o instanceof VarType)) { + if (!(o instanceof VarType vt)) { return false; } - VarType vt = (VarType)o; return getType() == vt.getType() && getArrayDim() == vt.getArrayDim() && Objects.equals(getValue(), vt.getValue()); } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java index 2e53827ff535..1d56c71109de 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java @@ -120,8 +120,7 @@ public final class DuplicateStringLiteralInspection extends AbstractBaseJavaLoca List foundExpr = new SmartList<>(); LowLevelSearchUtil.processTexts(text, 0, text.length(), searcher, offset -> { PsiElement element = file.findElementAt(offset); - if (element == null || !(element.getParent() instanceof PsiLiteralExpression)) return true; - PsiLiteralExpression expression = (PsiLiteralExpression)element.getParent(); + if (element == null || !(element.getParent() instanceof PsiLiteralExpression expression)) return true; if (Comparing.equal(stringToFind, expression.getValue()) && shouldCheck(expression, ignorePropertyKeys)) { foundExpr.add(expression); } @@ -182,9 +181,8 @@ public final class DuplicateStringLiteralInspection extends AbstractBaseJavaLoca private PsiExpression @NotNull [] getDuplicateLiterals(@NotNull Project project, @NotNull PsiLiteralExpression place, boolean isOnTheFly) { Object value = place.getValue(); - if (!(value instanceof String)) return PsiExpression.EMPTY_ARRAY; + if (!(value instanceof String stringToFind)) return PsiExpression.EMPTY_ARRAY; if (!shouldCheck(place, IGNORE_PROPERTY_KEYS)) return PsiExpression.EMPTY_ARRAY; - String stringToFind = (String)value; if (stringToFind.isEmpty()) return PsiExpression.EMPTY_ARRAY; Map map = CachedValuesManager.getManager(project).getCachedValue(project, () -> { Map duplicates = ConcurrentFactoryMap.createMap( @@ -206,8 +204,7 @@ public final class DuplicateStringLiteralInspection extends AbstractBaseJavaLoca for (PsiExpression expr : foundExpr) { if (expr == originalExpression) continue; PsiElement parent = expr.getParent(); - if (parent instanceof PsiField) { - final PsiField field = (PsiField)parent; + if (parent instanceof PsiField field) { if (field.getInitializer() == expr && field.hasModifierProperty(PsiModifier.STATIC)) { final PsiClass containingClass = field.getContainingClass(); if (containingClass == null) continue; diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/ConvertToBasicLatinInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/ConvertToBasicLatinInspection.java index fdea757f9443..13b0075d3305 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/ConvertToBasicLatinInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/ConvertToBasicLatinInspection.java @@ -168,8 +168,7 @@ public class ConvertToBasicLatinInspection extends AbstractBaseJavaLocalInspecti Int2ObjectMap entities = new Int2ObjectOpenHashMap<>(); Pattern pattern = Pattern.compile("&#(\\d+);"); XmlUtil.processXmlElements(file, element -> { - if (element instanceof XmlEntityDecl) { - XmlEntityDecl entity = (XmlEntityDecl)element; + if (element instanceof XmlEntityDecl entity) { Matcher m = pattern.matcher(entity.getValueElement().getValue()); if (m.matches()) { char i = (char)Integer.parseInt(m.group(1)); diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java index c3222c8199cf..d97a23f71b58 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java @@ -475,9 +475,8 @@ public final class I18nInspection extends AbstractBaseUastLocalInspectionTool im PsiElement psiVar = uVar.getSourcePsi(); PsiElement psi = passThrough.getSourcePsi(); if (psi != null && psiVar != null) { - if (psiVar instanceof PsiLocalVariable) { + if (psiVar instanceof PsiLocalVariable local) { // Java - PsiLocalVariable local = (PsiLocalVariable)psiVar; PsiElement codeBlock = PsiUtil.getVariableCodeBlock(local, null); if (codeBlock instanceof PsiCodeBlock) { List refs = VariableAccessUtils.getVariableReferences(local, codeBlock); @@ -524,8 +523,7 @@ public final class I18nInspection extends AbstractBaseUastLocalInspectionTool im return true; } } - if (ref.getUastParent() instanceof UQualifiedReferenceExpression) { - UQualifiedReferenceExpression parent = (UQualifiedReferenceExpression)ref.getUastParent(); + if (ref.getUastParent() instanceof UQualifiedReferenceExpression parent) { if (STRING_BUILDER_TO_STRING.methodMatches(target)) { UExpression receiver = parent.getReceiver(); if (receiver instanceof UResolvable) { @@ -888,8 +886,7 @@ public final class I18nInspection extends AbstractBaseUastLocalInspectionTool im private static boolean isSafeStringMethod(UExpression expression, final Set nonNlsTargets) { UElement parent = UastUtils.skipParenthesizedExprUp(expression.getUastParent()); - if (parent instanceof UBinaryExpression) { - UBinaryExpression binOp = (UBinaryExpression)parent; + if (parent instanceof UBinaryExpression binOp) { if (STRING_COMPARISON_OPS.contains(binOp.getOperator())) { UResolvable left = ObjectUtils.tryCast(UastUtils.skipParenthesizedExprDown(binOp.getLeftOperand()), UResolvable.class); UResolvable right = ObjectUtils.tryCast(UastUtils.skipParenthesizedExprDown(binOp.getRightOperand()), UResolvable.class); @@ -899,8 +896,7 @@ public final class I18nInspection extends AbstractBaseUastLocalInspectionTool im } if (!(parent instanceof UQualifiedReferenceExpression)) return false; UExpression selector = ((UQualifiedReferenceExpression)parent).getSelector(); - if (!(selector instanceof UCallExpression)) return false; - UCallExpression call = (UCallExpression)selector; + if (!(selector instanceof UCallExpression call)) return false; if (STRING_EQUALS.uCallMatches(call)) { final List expressions = call.getValueArguments(); if (expressions.size() != 1) return false; @@ -930,8 +926,7 @@ public final class I18nInspection extends AbstractBaseUastLocalInspectionTool im } if (parent instanceof UCallExpression) { UElement parentOfNew = UastUtils.skipParenthesizedExprUp(parent.getUastParent()); - if (parentOfNew instanceof ULocalVariable) { - final ULocalVariable newVariable = (ULocalVariable)parentOfNew; + if (parentOfNew instanceof ULocalVariable newVariable) { if (annotatedAsNonNls(newVariable.getPsi())) { return true; } @@ -948,8 +943,7 @@ public final class I18nInspection extends AbstractBaseUastLocalInspectionTool im private static boolean isNonNlsCall(UResolvable qualifier, Set nonNlsTargets) { final PsiElement resolved = qualifier.resolve(); - if (resolved instanceof PsiModifierListOwner) { - final PsiModifierListOwner modifierListOwner = (PsiModifierListOwner)resolved; + if (resolved instanceof PsiModifierListOwner modifierListOwner) { if (annotatedAsNonNls(modifierListOwner)) { return true; } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspection.java index 7f4df945a49a..20c5454c0f38 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspection.java @@ -117,8 +117,7 @@ public class InvalidPropertyKeyInspection extends AbstractBaseJavaLocalInspectio return; } final PsiElement resolvedExpression = expression.resolve(); - if (resolvedExpression instanceof PsiField) { - final PsiField field = (PsiField)resolvedExpression; + if (resolvedExpression instanceof PsiField field) { if (!field.hasModifierProperty(PsiModifier.FINAL)) { return; } @@ -151,8 +150,7 @@ public class InvalidPropertyKeyInspection extends AbstractBaseJavaLocalInspectio final PsiAssignmentExpression assignment = ExpressionUtils.getAssignment(def.getParent()); if (assignment != null && assignment.getLExpression() == def) { final PsiExpression rhs = PsiUtil.deparenthesizeExpression(assignment.getRExpression()); - if (rhs instanceof PsiConditionalExpression) { - final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression)rhs; + if (rhs instanceof PsiConditionalExpression conditionalExpression) { final PsiExpression thenExpression = conditionalExpression.getThenExpression(); final PsiExpression elseExpression = conditionalExpression.getElseExpression(); visitPropertyKeyAnnotationParameter(expression, computeStringValue(thenExpression), thenExpression); @@ -185,8 +183,7 @@ public class InvalidPropertyKeyInspection extends AbstractBaseJavaLocalInspectio appendPropertyKeyNotFoundProblem(bundleName, key, highlightedExpression, myManager, myProblems, onTheFly); } } - else if (expression.getParent() instanceof PsiNameValuePair) { - PsiNameValuePair nvp = (PsiNameValuePair)expression.getParent(); + else if (expression.getParent() instanceof PsiNameValuePair nvp) { if (Objects.equals(nvp.getName(), AnnotationUtil.PROPERTY_KEY_RESOURCE_BUNDLE_PARAMETER)) { PropertiesReferenceManager manager = PropertiesReferenceManager.getInstance(expression.getProject()); Module module = ModuleUtilCore.findModuleForPsiElement(expression); @@ -203,7 +200,7 @@ public class InvalidPropertyKeyInspection extends AbstractBaseJavaLocalInspectio } } } - else if (expression.getParent() instanceof PsiExpressionList && expression.getParent().getParent() instanceof PsiMethodCallExpression) { + else if (expression.getParent() instanceof PsiExpressionList expressions && expression.getParent().getParent() instanceof PsiMethodCallExpression) { if (!JavaI18nUtil.mustBePropertyKey(expression, null)) return; final SortedSet paramsCount = JavaI18nUtil.getPropertyValueParamsCount(highlightedExpression, resourceBundleName.get()); @@ -213,7 +210,6 @@ public class InvalidPropertyKeyInspection extends AbstractBaseJavaLocalInspectio final int maxParamCount = paramsCount.last(); - final PsiExpressionList expressions = (PsiExpressionList)expression.getParent(); final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)expressions.getParent(); final PsiMethod method = methodCall.resolveMethod(); final PsiExpression[] args = expressions.getExpressions(); diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java index dbcec0f31909..75fe2f5241d8 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java @@ -86,8 +86,7 @@ public final class JavaI18nUtil { @NotNull static UExpression getTopLevelExpression(@NotNull UExpression expression, boolean stopAtCall) { - while (expression.getUastParent() instanceof UExpression) { - final UExpression parent = (UExpression)expression.getUastParent(); + while (expression.getUastParent() instanceof UExpression parent) { if (parent instanceof UBlockExpression || parent instanceof UReturnExpression) { break; } @@ -117,10 +116,9 @@ public final class JavaI18nUtil { Ref resourceBundleRef = Ref.create(); if (mustBePropertyKey(expression, resourceBundleRef)) { final Object resourceBundleName = resourceBundleRef.get(); - if (!(resourceBundleName instanceof PsiExpression)) { + if (!(resourceBundleName instanceof PsiExpression expr)) { return false; } - PsiExpression expr = (PsiExpression)resourceBundleName; final PsiConstantEvaluationHelper constantEvaluationHelper = JavaPsiFacade.getInstance(project).getConstantEvaluationHelper(); Object value = constantEvaluationHelper.computeConstantExpression(expr); if (value == null) { @@ -207,8 +205,7 @@ public final class JavaI18nUtil { @NotNull PsiElement context, @NotNull Collection result) { PsiScopesUtil.treeWalkUp((element, state) -> { - if (element instanceof PsiMethod) { - PsiMethod method = (PsiMethod)element; + if (element instanceof PsiMethod method) { PsiType returnType = method.getReturnType(); if (returnType != null && TypeConversionUtil.isAssignable(type, returnType) && method.getParameterList().isEmpty()) { diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/NlsInfo.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/NlsInfo.java index 7dd02f0ab33a..8a218b6bd73a 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/NlsInfo.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/NlsInfo.java @@ -174,8 +174,7 @@ public abstract class NlsInfo implements RestrictionInfo { if (owner == null) return NlsUnspecified.UNKNOWN; info = fromAnnotationOwner(owner.getModifierList()); if (info != NlsUnspecified.UNKNOWN) return info; - if (owner instanceof PsiParameter) { - PsiParameter parameter = (PsiParameter)owner; + if (owner instanceof PsiParameter parameter) { if (parameter.isVarArgs() && context.getType() instanceof PsiEllipsisType) { info = fromType(((PsiEllipsisType)context.getType()).getComponentType()); } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/TitleCapitalizationInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/TitleCapitalizationInspection.java index 7669919c33dd..99086f03b816 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/TitleCapitalizationInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/TitleCapitalizationInspection.java @@ -117,8 +117,7 @@ public class TitleCapitalizationInspection extends AbstractBaseJavaLocalInspecti if (arg instanceof UInjectionHost) { return Value.of((UInjectionHost)arg); } - if (arg instanceof UCallExpression) { - UCallExpression call = (UCallExpression)arg; + if (arg instanceof UCallExpression call) { UExpression returnValue = StringFlowUtil.getReturnValue(call); if (arg.equals(returnValue)) { return null; @@ -187,16 +186,14 @@ public class TitleCapitalizationInspection extends AbstractBaseJavaLocalInspecti if (element instanceof PsiLiteralExpression) { return (PsiLiteralExpression)element; } - if (element instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression call = (PsiMethodCallExpression)element; + if (element instanceof PsiMethodCallExpression call) { final PsiMethod method = call.resolveMethod(); final PsiExpression returnValue = PropertyUtilBase.getGetterReturnExpression(method); if (returnValue != null) { return ObjectUtils.tryCast(returnValue, PsiLiteralExpression.class); } } - if (element instanceof PsiReferenceExpression) { - final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element; + if (element instanceof PsiReferenceExpression referenceExpression) { final PsiVariable variable = ObjectUtils.tryCast(referenceExpression.resolve(), PsiVariable.class); if (variable == null) return null; if (variable.hasModifierProperty(PsiModifier.FINAL)) { @@ -217,8 +214,7 @@ public class TitleCapitalizationInspection extends AbstractBaseJavaLocalInspecti element); literal.replace(newExpression); } - if (element instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)element; + if (element instanceof PsiMethodCallExpression call) { final Property property = getPropertyArgument(call); Value value = Value.of(property, call.getArgumentList().getExpressionCount() > 1); if (value == null) return; @@ -246,8 +242,7 @@ public class TitleCapitalizationInspection extends AbstractBaseJavaLocalInspecti copyLiteral.replace(JavaPsiFacade.getElementFactory(project).createExpressionFromText(newLiteral, null)); return new IntentionPreviewInfo.CustomDiff(JavaFileType.INSTANCE, file.getName(), parent.getText(), copyParent.getText()); } - if (element instanceof PsiMethodCallExpression) { - PsiMethodCallExpression call = (PsiMethodCallExpression)element; + if (element instanceof PsiMethodCallExpression call) { final Property property = getPropertyArgument(call); Value value = Value.of(property, call.getArgumentList().getExpressionCount() > 1); if (value == null) return IntentionPreviewInfo.EMPTY; diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/I18nMessageGotoDeclarationHandler.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/I18nMessageGotoDeclarationHandler.java index 29e7aff5807f..f0874fcc32b8 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/I18nMessageGotoDeclarationHandler.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/I18nMessageGotoDeclarationHandler.java @@ -34,8 +34,7 @@ public class I18nMessageGotoDeclarationHandler extends GotoDeclarationHandlerBas } //case: MyBundle.message("literalAnnotatedWithPropertyKey", param1, param2) - if (uElement instanceof UCallExpression) { - final UCallExpression call = (UCallExpression)uElement; + if (uElement instanceof UCallExpression call) { for (UExpression expression : call.getValueArguments()) { if (expression instanceof ULiteralExpression && PropertyFoldingBuilder.isI18nProperty((ULiteralExpression)expression)) { Property property = JavaI18nUtil.resolveProperty(expression); diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/PropertyFoldingBuilder.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/PropertyFoldingBuilder.java index 03de8e16581d..493e396c36ad 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/PropertyFoldingBuilder.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/PropertyFoldingBuilder.java @@ -39,10 +39,9 @@ public class PropertyFoldingBuilder extends FoldingBuilderEx { @Override public FoldingDescriptor @NotNull [] buildFoldRegions(@NotNull PsiElement element, @NotNull Document document, boolean quick) { - if (!(element instanceof PsiFile) || quick || !isFoldingsOn()) { + if (!(element instanceof PsiFile file) || quick || !isFoldingsOn()) { return FoldingDescriptor.EMPTY_ARRAY; } - final PsiFile file = (PsiFile)element; final List result = new ArrayList<>(); boolean hasJsp = ContainerUtil.exists(file.getViewProvider().getLanguages(), (l) -> l instanceof JspLanguage || l instanceof JspxLanguage); //hack here because JspFile PSI elements are not threaded correctly via nextSibling/prevSibling @@ -88,9 +87,8 @@ public class PropertyFoldingBuilder extends FoldingBuilderEx { final UElement parent = expression.getUastParent(); if (!msg.equals(UastLiteralUtils.getValueIfStringLiteral(expression)) && - parent instanceof UCallExpression && + parent instanceof UCallExpression expressions && ((UCallExpression)parent).getValueArguments().get(0).getSourcePsi() == expression.getSourcePsi()) { - final UCallExpression expressions = (UCallExpression)parent; PsiElement callSourcePsi = expressions.getSourcePsi(); if (callSourcePsi == null) return; final int count = JavaI18nUtil.getPropertyValueParamsMaxCount(expression); @@ -237,8 +235,7 @@ public class PropertyFoldingBuilder extends FoldingBuilderEx { final ResolveResult[] results = ((PsiPolyVariantReference)reference).multiResolve(false); for (ResolveResult result : results) { final PsiElement element = result.getElement(); - if (element instanceof IProperty) { - IProperty p = (IProperty)element; + if (element instanceof IProperty p) { sourcePsi.putUserData(CACHE, p); return p; } @@ -246,8 +243,7 @@ public class PropertyFoldingBuilder extends FoldingBuilderEx { } else { final PsiElement element = reference.resolve(); - if (element instanceof IProperty) { - IProperty p = (IProperty)element; + if (element instanceof IProperty p) { sourcePsi.putUserData(CACHE, p); return p; } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/inconsistentResourceBundle/InconsistentResourceBundleInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/inconsistentResourceBundle/InconsistentResourceBundleInspection.java index 605bd5a0defd..2f5d017161b5 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/inconsistentResourceBundle/InconsistentResourceBundleInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/inconsistentResourceBundle/InconsistentResourceBundleInspection.java @@ -90,8 +90,7 @@ public final class InconsistentResourceBundleInspection extends GlobalSimpleInsp @NotNull GlobalInspectionContext globalContext, @NotNull ProblemDescriptionsProcessor problemDescriptionsProcessor) { Set visitedBundles = globalContext.getUserData(VISITED_BUNDLES_KEY); - if (!(file instanceof PropertiesFile)) return; - final PropertiesFile propertiesFile = (PropertiesFile)file; + if (!(file instanceof PropertiesFile propertiesFile)) return; ResourceBundle resourceBundle = propertiesFile.getResourceBundle(); assert visitedBundles != null; if (!visitedBundles.add(resourceBundle)) return; diff --git a/plugins/java-i18n/src/com/intellij/lang/properties/PrefixBasedPropertyReference.java b/plugins/java-i18n/src/com/intellij/lang/properties/PrefixBasedPropertyReference.java index 686ca01ad25e..e0412fcad6aa 100644 --- a/plugins/java-i18n/src/com/intellij/lang/properties/PrefixBasedPropertyReference.java +++ b/plugins/java-i18n/src/com/intellij/lang/properties/PrefixBasedPropertyReference.java @@ -84,9 +84,8 @@ public class PrefixBasedPropertyReference extends PropertyReference { private String getKeyPrefix() { if (!myPrefixEvaluated) { for(PsiElement curParent = PsiTreeUtil.getParentOfType(getElement().getParent().getParent(),XmlTag.class); - curParent instanceof XmlTag; + curParent instanceof XmlTag curParentTag; curParent = curParent.getParent()) { - final XmlTag curParentTag = (XmlTag) curParent; if ("bundle".equals(curParentTag.getLocalName()) && Arrays.binarySearch(XmlUtil.JSTL_FORMAT_URIS,curParentTag.getNamespace()) >= 0) { diff --git a/plugins/java-i18n/src/com/intellij/lang/properties/PropertiesUastReferenceContributor.java b/plugins/java-i18n/src/com/intellij/lang/properties/PropertiesUastReferenceContributor.java index 39204065b920..e32e0f359b09 100644 --- a/plugins/java-i18n/src/com/intellij/lang/properties/PropertiesUastReferenceContributor.java +++ b/plugins/java-i18n/src/com/intellij/lang/properties/PropertiesUastReferenceContributor.java @@ -46,12 +46,11 @@ public class PropertiesUastReferenceContributor extends PsiReferenceContributor @NotNull PsiLanguageInjectionHost host, @NotNull ProcessingContext context) { final UElement parent = uExpression.getUastParent(); - if (!(parent instanceof UField)) { + if (!(parent instanceof UField field)) { return PsiReference.EMPTY_ARRAY; } PsiElement elementSource = uExpression.getSourcePsi(); if (elementSource == null) return PsiReference.EMPTY_ARRAY; - final UField field = (UField)parent; UExpression initializer = field.getUastInitializer(); if (initializer == null) return PsiReference.EMPTY_ARRAY; if (!field.isFinal() || diff --git a/plugins/java-i18n/src/com/intellij/lang/properties/UastPropertiesReferenceProvider.java b/plugins/java-i18n/src/com/intellij/lang/properties/UastPropertiesReferenceProvider.java index 1ef321d4f129..cb668573eeb2 100644 --- a/plugins/java-i18n/src/com/intellij/lang/properties/UastPropertiesReferenceProvider.java +++ b/plugins/java-i18n/src/com/intellij/lang/properties/UastPropertiesReferenceProvider.java @@ -41,10 +41,9 @@ class UastPropertiesReferenceProvider extends UastInjectionHostReferenceProvider return PsiReference.EMPTY_ARRAY; } Object value = element.evaluate(); - if (!(value instanceof String)) { + if (!(value instanceof String text)) { return PsiReference.EMPTY_ARRAY; } - String text = (String)value; if (text.indexOf('\n') != -1) { return PsiReference.EMPTY_ARRAY; } diff --git a/plugins/java-i18n/src/com/intellij/lang/properties/UnusedMessageFormatParameterInspection.java b/plugins/java-i18n/src/com/intellij/lang/properties/UnusedMessageFormatParameterInspection.java index cb1c18fc14d2..685610e5bd2c 100644 --- a/plugins/java-i18n/src/com/intellij/lang/properties/UnusedMessageFormatParameterInspection.java +++ b/plugins/java-i18n/src/com/intellij/lang/properties/UnusedMessageFormatParameterInspection.java @@ -40,8 +40,7 @@ public class UnusedMessageFormatParameterInspection extends PropertiesInspection @Override public ProblemDescriptor @Nullable [] checkFile(@NotNull PsiFile file, @NotNull InspectionManager manager, boolean isOnTheFly) { - if (!(file instanceof PropertiesFile)) return null; - PropertiesFile propertiesFile = (PropertiesFile)file; + if (!(file instanceof PropertiesFile propertiesFile)) return null; final List properties = propertiesFile.getProperties(); List problemDescriptors = new ArrayList<>(); for (IProperty property : properties) { diff --git a/plugins/java-i18n/src/com/intellij/refactoring/inline/InlinePropertyHandler.java b/plugins/java-i18n/src/com/intellij/refactoring/inline/InlinePropertyHandler.java index e1bf0f5cb86d..3d4f24ca41ba 100644 --- a/plugins/java-i18n/src/com/intellij/refactoring/inline/InlinePropertyHandler.java +++ b/plugins/java-i18n/src/com/intellij/refactoring/inline/InlinePropertyHandler.java @@ -41,9 +41,8 @@ public class InlinePropertyHandler extends JavaInlineActionHandler { @Override public void inlineElement(final Project project, Editor editor, PsiElement psiElement) { - if (!(psiElement instanceof IProperty)) return; + if (!(psiElement instanceof IProperty property)) return; - IProperty property = (IProperty)psiElement; final String propertyValue = property.getValue(); if (propertyValue == null) return; diff --git a/plugins/javaFX/sceneBuilder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java b/plugins/javaFX/sceneBuilder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java index 3067a96626e1..8f0e9bb6753c 100644 --- a/plugins/javaFX/sceneBuilder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java +++ b/plugins/javaFX/sceneBuilder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java @@ -479,9 +479,8 @@ public class SceneBuilderImpl implements SceneBuilder { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof SelectionNode)) return false; + if (!(o instanceof SelectionNode node)) return false; - SelectionNode node = (SelectionNode)o; return indexInParent == node.indexInParent && Objects.equals(qualifiedName, node.qualifiedName); } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxEntryPoint.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxEntryPoint.java index cc8f4692d69c..d2571d308348 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxEntryPoint.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxEntryPoint.java @@ -32,8 +32,7 @@ public final class JavaFxEntryPoint extends EntryPoint { @Override public boolean isEntryPoint(@NotNull PsiElement psiElement) { - if (psiElement instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)psiElement; + if (psiElement instanceof PsiMethod method) { final int paramsCount = method.getParameterList().getParametersCount(); final String methodName = method.getName(); final PsiClass containingClass = method.getContainingClass(); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java index 2c9b7bb704b1..e3c5eea5378d 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java @@ -131,8 +131,7 @@ public class JavaFxFieldToPropertyIntention extends PsiElementBaseIntentionActio for (PsiReference reference : myReferences) { final PsiElement refElement = reference.getElement(); - if (refElement instanceof PsiExpression) { - final PsiExpression expression = (PsiExpression)refElement; + if (refElement instanceof PsiExpression expression) { final TypeConversionDescriptor conversion = myProperty.myObservableType.findDirectConversion(expression, toType, fromType); if (conversion != null) { @@ -426,14 +425,11 @@ public class JavaFxFieldToPropertyIntention extends PsiElementBaseIntentionActio final PsiExpression replaced = super.replace(expression, evaluator); // Replace the getter's return type: List -> ObservableList final PsiElement parent = replaced.getParent(); - if (parent instanceof PsiReturnStatement) { - final PsiReturnStatement returnStatement = (PsiReturnStatement)parent; + if (parent instanceof PsiReturnStatement returnStatement) { final PsiElement statementParent = returnStatement.getParent(); - if (statementParent instanceof PsiCodeBlock) { - final PsiCodeBlock codeBlock = (PsiCodeBlock)statementParent; + if (statementParent instanceof PsiCodeBlock codeBlock) { final PsiElement blockParent = codeBlock.getParent(); - if (blockParent instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)blockParent; + if (blockParent instanceof PsiMethod method) { final PsiTypeElement returnTypeElement = method.getReturnTypeElement(); if (returnTypeElement != null && myOriginalType.equals(method.getReturnType())) { final String text = JavaFxCommonNames.JAVAFX_COLLECTIONS_OBSERVABLE_LIST + "<" + myItemType.getCanonicalText() + ">"; diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlPresenceListener.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlPresenceListener.java index a1e6e0f49a94..a36bace93c6f 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlPresenceListener.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlPresenceListener.java @@ -39,8 +39,7 @@ public final class FxmlPresenceListener implements BulkFileListener { private void checkEvent(@NotNull VFileEvent event) { if (event instanceof VFileContentChangeEvent) return; - if (event instanceof VFilePropertyChangeEvent) { - VFilePropertyChangeEvent propertyChangeEvent = (VFilePropertyChangeEvent)event; + if (event instanceof VFilePropertyChangeEvent propertyChangeEvent) { if (VirtualFile.PROP_NAME.equals(propertyChangeEvent.getPropertyName())) { final String oldName = (String)propertyChangeEvent.getOldValue(); final String newName = (String)propertyChangeEvent.getNewValue(); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java index ab38a88eca88..d4feb03ac463 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java @@ -536,8 +536,7 @@ public final class JavaFxPsiUtil { } else if (tagDescriptor instanceof JavaFxClassTagDescriptorBase) { final PsiElement tagDeclaration = tagDescriptor.getDeclaration(); - if (tagDeclaration instanceof PsiClass) { - PsiClass defaultPropertyOwnerClass = (PsiClass)tagDeclaration; + if (tagDeclaration instanceof PsiClass defaultPropertyOwnerClass) { final XmlAttribute factoryAttr = targetTag.getAttribute(FxmlConstants.FX_FACTORY); if (factoryAttr != null) { defaultPropertyOwnerClass = getFactoryProducedClass((PsiClass)tagDeclaration, factoryAttr.getValue()); @@ -688,8 +687,7 @@ public final class JavaFxPsiUtil { if (declaration instanceof PsiField) { return getWrappedPropertyType((PsiField)declaration, declaration.getProject(), JavaFxCommonNames.ourWritableMap); } - if (declaration instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)declaration; + if (declaration instanceof PsiMethod method) { if (!method.getParameterList().isEmpty()) { return getSetterArgumentType(method); } @@ -733,8 +731,7 @@ public final class JavaFxPsiUtil { if (declaration instanceof PsiField) { return getWrappedPropertyType((PsiField)declaration, declaration.getProject(), JavaFxCommonNames.ourReadOnlyMap); } - if (declaration instanceof PsiMethod) { - PsiMethod psiMethod = (PsiMethod)declaration; + if (declaration instanceof PsiMethod psiMethod) { if (psiMethod.getParameterList().isEmpty() && !psiMethod.hasModifierProperty(PsiModifier.STATIC)) { return getGetterReturnType(psiMethod); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxColorProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxColorProvider.java index 65ff2bc6db7c..3c4068cd75c1 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxColorProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxColorProvider.java @@ -37,8 +37,7 @@ public class JavaFxColorProvider implements ElementColorProvider { if (!(element instanceof PsiIdentifier)) return null; PsiElement parent = element.getParent(); PsiElement gp = parent == null ? null : parent.getParent(); - if (gp instanceof PsiNewExpression && ((PsiNewExpression)gp).getClassReference() == parent) { - PsiNewExpression newExpression = (PsiNewExpression)gp; + if (gp instanceof PsiNewExpression newExpression && ((PsiNewExpression)gp).getClassReference() == parent) { if (isColorClass(PsiTypesUtil.getPsiClass(newExpression.getType()))) { PsiExpressionList argumentList = newExpression.getArgumentList(); if (argumentList != null) { @@ -54,14 +53,12 @@ public class JavaFxColorProvider implements ElementColorProvider { parent = parent.getParent(); gp = parent.getParent(); } - if (gp instanceof PsiMethodCallExpression && ((PsiMethodCallExpression)gp).getMethodExpression().getReferenceNameElement() == element) { - PsiMethodCallExpression methodCall = (PsiMethodCallExpression)gp; + if (gp instanceof PsiMethodCallExpression methodCall && ((PsiMethodCallExpression)gp).getMethodExpression().getReferenceNameElement() == element) { PsiReferenceExpression methodExpression = methodCall.getMethodExpression(); String methodName = methodExpression.getReferenceName(); if (FACTORY_METHODS.contains(methodName)) { PsiElement resolved = methodExpression.resolve(); - if (resolved instanceof PsiMethod) { - PsiMethod method = (PsiMethod)resolved; + if (resolved instanceof PsiMethod method) { if (method.hasModifierProperty(PsiModifier.STATIC)) { if (isColorClass(method.getContainingClass())) { return getColor(methodName, methodCall.getArgumentList()); @@ -183,14 +180,12 @@ public class JavaFxColorProvider implements ElementColorProvider { @Override public void setColorTo(@NotNull PsiElement element, @NotNull Color color) { Runnable command = null; - if (element instanceof PsiNewExpression) { - final PsiNewExpression expr = (PsiNewExpression)element; + if (element instanceof PsiNewExpression expr) { PsiExpressionList argumentList = expr.getArgumentList(); assert argumentList != null; command = () -> replaceConstructorArgs(color, argumentList); } - if (element instanceof PsiMethodCallExpression) { - PsiMethodCallExpression methodCall = (PsiMethodCallExpression)element; + if (element instanceof PsiMethodCallExpression methodCall) { PsiReferenceExpression methodExpression = methodCall.getMethodExpression(); String methodName = methodExpression.getReferenceName(); if (COLOR.equals(methodName) || GRAY.equals(methodName)) { diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxImportsOptimizer.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxImportsOptimizer.java index 67adff2ab64d..108d065a7da2 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxImportsOptimizer.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxImportsOptimizer.java @@ -149,8 +149,7 @@ public class JavaFxImportsOptimizer implements ImportOptimizer { } private void appendClassName(PsiElement declaration) { - if (declaration instanceof PsiClass) { - final PsiClass psiClass = (PsiClass)declaration; + if (declaration instanceof PsiClass psiClass) { final String ownerClassQN = getTopmostOwnerClassQualifiedName(psiClass); if (ownerClassQN != null) { appendClassName(ownerClassQN); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxEventHandlerInspection.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxEventHandlerInspection.java index 6dfd2d76492f..b5f14bcd2743 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxEventHandlerInspection.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxEventHandlerInspection.java @@ -49,8 +49,7 @@ public class JavaFxEventHandlerInspection extends XmlSuppressableInspectionTool public void visitXmlAttributeValue(@NotNull XmlAttributeValue xmlAttributeValue) { super.visitXmlAttributeValue(xmlAttributeValue); final PsiElement valueParent = xmlAttributeValue.getParent(); - if (!(valueParent instanceof XmlAttribute)) return; - final XmlAttribute attribute = (XmlAttribute)valueParent; + if (!(valueParent instanceof XmlAttribute attribute)) return; final List eventHandlerMethods = getEventHandlerMethods(attribute); if (eventHandlerMethods.size() == 0) return; @@ -140,8 +139,7 @@ public class JavaFxEventHandlerInspection extends XmlSuppressableInspectionTool final PsiReference reference = idValue.getReference(); if (reference == null) return; final PsiElement element = reference.resolve(); - if (!(element instanceof PsiField)) return; - final PsiField tagField = (PsiField)element; + if (!(element instanceof PsiField tagField)) return; if (tagField.hasModifierProperty(PsiModifier.STATIC) || !JavaFxPsiUtil.isVisibleInFxml(tagField)) return; final PsiType tagFieldType = tagField.getType(); @@ -206,8 +204,7 @@ public class JavaFxEventHandlerInspection extends XmlSuppressableInspectionTool @Override public void invoke(@NotNull Project project, @NotNull PsiFile file, @NotNull PsiElement startElement, @NotNull PsiElement endElement) { if (!FileModificationService.getInstance().prepareFileForWrite(file)) return; - if (!(startElement instanceof XmlAttribute)) return; - final XmlAttribute attribute = (XmlAttribute)startElement; + if (!(startElement instanceof XmlAttribute attribute)) return; final List eventHandlerMethods = getEventHandlerMethods(attribute); if (eventHandlerMethods.size() != 1) return; diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java index c3a9e35f0736..0a986404d271 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java @@ -64,8 +64,7 @@ public class JavaFxImplicitUsageProvider implements ImplicitUsageProvider { @Override public boolean isImplicitWrite(@NotNull PsiElement element) { - if (element instanceof PsiField) { - final PsiField field = (PsiField)element; + if (element instanceof PsiField field) { if (!isImplicitFxmlAccess(field)) return false; final String fieldName = field.getName(); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxCollapseSubTagToAttributeIntention.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxCollapseSubTagToAttributeIntention.java index 86a73430049b..1ff0c619f7a1 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxCollapseSubTagToAttributeIntention.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxCollapseSubTagToAttributeIntention.java @@ -59,8 +59,8 @@ public class JavaFxCollapseSubTagToAttributeIntention extends PsiElementBaseInte @Override public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) { - if (element instanceof XmlToken && ((XmlToken)element).getTokenType() == XmlTokenType.XML_NAME && element.getParent() instanceof XmlTag) { - final XmlTag tag = (XmlTag)element.getParent(); + if (element instanceof XmlToken && ((XmlToken)element).getTokenType() == XmlTokenType.XML_NAME && + element.getParent() instanceof XmlTag tag) { for (XmlTag xmlTag : tag.getSubTags()) { if (xmlTag.getAttribute(FxmlConstants.FX_VALUE) == null) return false; } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInTagDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInTagDescriptor.java index 8a1f455af06a..7bdc990b9ea5 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInTagDescriptor.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInTagDescriptor.java @@ -234,8 +234,7 @@ public class JavaFxBuiltInTagDescriptor implements XmlElementDescriptor, Validat final XmlElementDescriptor descriptor = referencedTag.getDescriptor(); if (descriptor != null) { final PsiElement declaration = descriptor.getDeclaration(); - if (declaration instanceof PsiClass) { - final PsiClass psiClass = (PsiClass)declaration; + if (declaration instanceof PsiClass psiClass) { JavaFxPsiUtil.isClassAcceptable(context.getParentTag(), psiClass, (@InspectionMessage String errorMessage, ValidationHost.ErrorType errorType) -> host.addMessage(context.getNavigationElement(), errorMessage, errorType)); final String contextName = context.getName(); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java index 69dd9a336fe0..0289bf12e376 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java @@ -71,8 +71,7 @@ public class JavaFxAnnotator implements Annotator { } } } - } else if (element instanceof XmlAttribute) { - final XmlAttribute attribute = (XmlAttribute)element; + } else if (element instanceof XmlAttribute attribute) { final String attributeName = attribute.getName(); if (!FxmlConstants.FX_BUILT_IN_ATTRIBUTES.contains(attributeName) && !attribute.isNamespaceDeclaration() && diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxControllerFieldSearcher.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxControllerFieldSearcher.java index 98375c5bb186..c7fb355bd291 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxControllerFieldSearcher.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxControllerFieldSearcher.java @@ -23,8 +23,7 @@ public class JavaFxControllerFieldSearcher implements QueryExecutor consumer) { final PsiElement elementToSearch = queryParameters.getElementToSearch(); - if (elementToSearch instanceof PsiField) { - final PsiField field = (PsiField)elementToSearch; + if (elementToSearch instanceof PsiField field) { final PsiClass containingClass = ReadAction.compute(() -> field.getContainingClass()); if (containingClass != null) { final String qualifiedName = ReadAction.compute(() -> containingClass.getQualifiedName()); @@ -46,8 +45,7 @@ public class JavaFxControllerFieldSearcher implements QueryExecutor= 0) return PsiReference.EMPTY_ARRAY; diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java index d3a277925ce0..9fbaf4570386 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java @@ -62,8 +62,7 @@ public class JavaFxPropertyRenameHandler implements RenameHandler { JavaFXBundle.message("javafx.property.rename.handler.error.title"), null); return; } - if (reference instanceof JavaFxPropertyReference && reference.resolve() != null) { - final JavaFxPropertyReference propertyReference = (JavaFxPropertyReference)reference; + if (reference instanceof JavaFxPropertyReference propertyReference && reference.resolve() != null) { final Map elementsToRename = getElementsToRename(propertyReference, "a"); if (!canRename(project, editor, elementsToRename.keySet())) { return; diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxRenameFxIdFieldProcessor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxRenameFxIdFieldProcessor.java index c2764c1fe973..d5ea743da326 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxRenameFxIdFieldProcessor.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxRenameFxIdFieldProcessor.java @@ -60,8 +60,7 @@ public class JavaFxRenameFxIdFieldProcessor extends RenamePsiElementProcessor { @Nullable private static NestedControllerCandidate findNestedControllerCandidate(@NotNull PsiElement element) { - if (element instanceof PsiField) { - final PsiField field = (PsiField)element; + if (element instanceof PsiField field) { final String fxId = field.getName(); if (!StringUtil.isEmpty(fxId)) { final PsiClass containingClass = field.getContainingClass(); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderInfo.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderInfo.java index 534180868ebe..85e92910e5d7 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderInfo.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderInfo.java @@ -36,8 +36,7 @@ public final class SceneBuilderInfo { @Override public boolean equals(Object object) { - if (object instanceof SceneBuilderInfo) { - SceneBuilderInfo info = (SceneBuilderInfo)object; + if (object instanceof SceneBuilderInfo info) { return Objects.equals(path, info.path) && Objects.equals(libPath, info.libPath); } return false; diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java index 164ee072487f..9c2f911adc90 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java @@ -686,8 +686,7 @@ public class JUnitConfiguration extends JavaTestConfigurationWithDiscoverySuppor @Override public boolean equals(final Object object) { - if (!(object instanceof Data)) return false; - final Data second = (Data)object; + if (!(object instanceof Data second)) return false; return Objects.equals(TEST_OBJECT, second.TEST_OBJECT) && Objects.equals(getMainClassName(), second.getMainClassName()) && Objects.equals(getPackageName(), second.getPackageName()) && diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitRunDashboardCustomizer.java b/plugins/junit/src/com/intellij/execution/junit/JUnitRunDashboardCustomizer.java index e18ac4b0876e..5465d9238d60 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnitRunDashboardCustomizer.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnitRunDashboardCustomizer.java @@ -22,9 +22,7 @@ public class JUnitRunDashboardCustomizer extends RunDashboardCustomizer { @Nullable public PsiElement getPsiElement(@NotNull RunDashboardRunConfigurationNode node) { RunConfiguration runConfiguration = node.getConfigurationSettings().getConfiguration(); - if (!(runConfiguration instanceof JUnitConfiguration)) return null; - - JUnitConfiguration jUnitConfiguration = (JUnitConfiguration)runConfiguration; + if (!(runConfiguration instanceof JUnitConfiguration jUnitConfiguration)) return null; String runClassName = jUnitConfiguration.getRunClass(); if (runClassName == null) return null; diff --git a/plugins/junit/src/com/intellij/execution/junit/TestMethod.java b/plugins/junit/src/com/intellij/execution/junit/TestMethod.java index cb314141c02d..a417a94b4948 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestMethod.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestMethod.java @@ -60,8 +60,7 @@ public class TestMethod extends TestObject { public RefactoringElementListener getListener(final PsiElement element) { UElement uElement = UastContextKt.toUElement(element); JUnitConfiguration configuration = getConfiguration(); - if (uElement instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)uElement; + if (uElement instanceof PsiMethod method) { if (!method.getName().equals(configuration.getPersistentData().getMethodName())) return null; //noinspection ConstantConditions if (!method.getContainingClass().equals(configuration.myClass.getPsiElement())) return null; diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java index 1dce3a1d032f..e3aa943b0514 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java @@ -617,10 +617,9 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState 0 ? qName.substring(0, idx) : qName; return DumbService.getInstance(project).computeWithAlternativeResolveEnabled(() -> JavaPsiFacade.getInstance(project).findClass(className, scope != null ? scope.getGlobalSearchScope() : GlobalSearchScope.projectScope(project))); diff --git a/plugins/junit/src/com/intellij/execution/junit/UniqueIdConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/UniqueIdConfigurationProducer.java index 3de3051dc557..fd0a4043279e 100644 --- a/plugins/junit/src/com/intellij/execution/junit/UniqueIdConfigurationProducer.java +++ b/plugins/junit/src/com/intellij/execution/junit/UniqueIdConfigurationProducer.java @@ -47,9 +47,8 @@ public class UniqueIdConfigurationProducer extends JUnitConfigurationProducer { GlobalSearchScope searchScope = configuration.getSearchScope(); if (searchScope != null) { Location location = selectedProxy.getLocation(configuration.getProject(), searchScope); - if (location instanceof MethodLocation) { + if (location instanceof MethodLocation methodLocation) { StringJoiner stringJoiner = new StringJoiner("."); - MethodLocation methodLocation = (MethodLocation)location; stringJoiner.add(methodLocation.getContainingClass().getName()); String methodName = methodLocation.getPsiElement().getName(); String proxyName = selectedProxy.getName(); diff --git a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitCantBeStaticExtension.java b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitCantBeStaticExtension.java index af4f6c1e7340..114d0659e923 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitCantBeStaticExtension.java +++ b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitCantBeStaticExtension.java @@ -24,8 +24,7 @@ import com.intellij.psi.PsiMethod; public class JUnitCantBeStaticExtension implements Condition { @Override public boolean value(PsiElement member) { - if (member instanceof PsiMethod) { - PsiMethod method = (PsiMethod)member; + if (member instanceof PsiMethod method) { if (JUnitUtil.isTestMethodOrConfig(method)){ return true; } diff --git a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java index 9fcfd0cfdf9a..40bc79d869ad 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java +++ b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java @@ -61,8 +61,7 @@ public final class JUnitEntryPoint extends EntryPointWithVisibilityLevel { return true; } } - else if (psiElement instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)psiElement; + else if (psiElement instanceof PsiMethod method) { if (method.isConstructor() && method.getParameterList().isEmpty()) { final PsiClass aClass = method.getContainingClass(); return aClass != null && JUnitUtil.isTestClass(aClass); diff --git a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitImplicitUsageProvider.java b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitImplicitUsageProvider.java index ff234f59754d..8280d478a653 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitImplicitUsageProvider.java +++ b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitImplicitUsageProvider.java @@ -49,8 +49,7 @@ public class JUnitImplicitUsageProvider implements ImplicitUsageProvider { private static boolean isParameterUsedInParameterizedPresentation(PsiParameter parameter) { PsiElement declarationScope = parameter.getDeclarationScope(); - if (declarationScope instanceof PsiMethod) { - PsiMethod method = (PsiMethod)declarationScope; + if (declarationScope instanceof PsiMethod method) { PsiAnnotation annotation = method.getModifierList().findAnnotation(ORG_JUNIT_JUPITER_PARAMS_PARAMETERIZED_TEST); if (annotation != null) { PsiAnnotationMemberValue attributeValue = annotation.findDeclaredAttributeValue("name"); @@ -76,8 +75,7 @@ public class JUnitImplicitUsageProvider implements ImplicitUsageProvider { } private static boolean isReferencedInsideMethodSourceAnnotation(@NotNull PsiElement element) { - if (element instanceof PsiMethod) { - PsiMethod psiMethod = (PsiMethod) element; + if (element instanceof PsiMethod psiMethod) { return CachedValuesManager.getCachedValue(psiMethod, () -> CachedValueProvider.Result.create(isReferencedInsideMethodSourceAnnotation(psiMethod), PsiModificationTracker.MODIFICATION_COUNT)); diff --git a/plugins/kotlin/base/fe10/code-insight/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java b/plugins/kotlin/base/fe10/code-insight/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java index 92d13328cd2b..29cdf3552420 100644 --- a/plugins/kotlin/base/fe10/code-insight/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java +++ b/plugins/kotlin/base/fe10/code-insight/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java @@ -41,9 +41,8 @@ public final class KotlinDescriptorIconProvider { } private static Icon getVisibilityIcon(@NotNull DeclarationDescriptor descriptor) { - if (descriptor instanceof DeclarationDescriptorWithVisibility) { - DeclarationDescriptorWithVisibility descriptorWithVisibility = (DeclarationDescriptorWithVisibility) descriptor; - DescriptorVisibility visibility = descriptorWithVisibility.getVisibility().normalize(); + if (descriptor instanceof DeclarationDescriptorWithVisibility descriptorWithVisibility) { + DescriptorVisibility visibility = descriptorWithVisibility.getVisibility().normalize(); if (visibility == DescriptorVisibilities.PUBLIC) { return PlatformIcons.PUBLIC_ICON; } @@ -77,9 +76,8 @@ public final class KotlinDescriptorIconProvider { if (descriptor instanceof PackageFragmentDescriptor || descriptor instanceof PackageViewDescriptor) { return AllIcons.Nodes.Package; } - if (descriptor instanceof FunctionDescriptor) { - FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor; - if (functionDescriptor.getExtensionReceiverParameter() != null) { + if (descriptor instanceof FunctionDescriptor functionDescriptor) { + if (functionDescriptor.getExtensionReceiverParameter() != null) { return Modality.ABSTRACT == getModalitySafe(functionDescriptor) ? KotlinIcons.ABSTRACT_EXTENSION_FUNCTION : KotlinIcons.EXTENSION_FUNCTION; @@ -94,9 +92,8 @@ public final class KotlinDescriptorIconProvider { return KotlinIcons.FUNCTION; } } - if (descriptor instanceof ClassDescriptor) { - ClassDescriptor classDescriptor = (ClassDescriptor) descriptor; - return switch (classDescriptor.getKind()) { + if (descriptor instanceof ClassDescriptor classDescriptor) { + return switch (classDescriptor.getKind()) { case INTERFACE -> KotlinIcons.INTERFACE; case ENUM_CLASS, ENUM_ENTRY -> KotlinIcons.ENUM; case ANNOTATION_CLASS -> KotlinIcons.ANNOTATION; diff --git a/plugins/kotlin/base/fe10/highlighting/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java b/plugins/kotlin/base/fe10/highlighting/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java index 5bcf647ecb85..eb98dff2a42d 100644 --- a/plugins/kotlin/base/fe10/highlighting/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java +++ b/plugins/kotlin/base/fe10/highlighting/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java @@ -97,9 +97,8 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { tdSpace(result); tdRightBoldColspan(result, 2, DESCRIPTOR_IN_TABLE.render(((DescriptorRow) row).descriptor, context)); } - if (row instanceof FunctionArgumentsRow) { - FunctionArgumentsRow functionArgumentsRow = (FunctionArgumentsRow) row; - renderFunctionArguments(functionArgumentsRow.receiverType, functionArgumentsRow.argumentTypes, functionArgumentsRow.isErrorPosition, result, context); + if (row instanceof FunctionArgumentsRow functionArgumentsRow) { + renderFunctionArguments(functionArgumentsRow.receiverType, functionArgumentsRow.argumentTypes, functionArgumentsRow.isErrorPosition, result, context); } result.append(""); } diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structureView/KotlinFirStructureViewFactory.java b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structureView/KotlinFirStructureViewFactory.java index 7a82b07acbcb..4d69f6b24db7 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structureView/KotlinFirStructureViewFactory.java +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structureView/KotlinFirStructureViewFactory.java @@ -24,12 +24,11 @@ final class KotlinFirStructureViewFactory implements PsiStructureViewFactory { Collections.singletonList(new KotlinFirInheritedMembersNodeProvider()); @Override public StructureViewBuilder getStructureViewBuilder(@NotNull PsiFile psiFile) { - if (!(psiFile instanceof KtFile)) { + if (!(psiFile instanceof KtFile file)) { return null; } - KtFile file = (KtFile) psiFile; - return new TreeBasedStructureViewBuilder() { + return new TreeBasedStructureViewBuilder() { @Override public @NotNull StructureViewModel createStructureViewModel(@Nullable Editor editor) { return new KotlinStructureViewModel(file, editor, new KotlinFirStructureViewElement(file, file, false)) { diff --git a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinExpressionSurrounder.java b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinExpressionSurrounder.java index 5be5de80d170..dcd087d6ae2a 100644 --- a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinExpressionSurrounder.java +++ b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinExpressionSurrounder.java @@ -24,12 +24,11 @@ public abstract class KotlinExpressionSurrounder implements Surrounder { @Override public boolean isApplicable(@NotNull PsiElement[] elements) { - if (elements.length != 1 || !(elements[0] instanceof KtExpression)) { + if (elements.length != 1 || !(elements[0] instanceof KtExpression expression)) { return false; } - KtExpression expression = (KtExpression) elements[0]; - if (expression instanceof KtCallExpression && expression.getParent() instanceof KtQualifiedExpression) { + if (expression instanceof KtCallExpression && expression.getParent() instanceof KtQualifiedExpression) { return false; } diff --git a/plugins/kotlin/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java b/plugins/kotlin/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java index 3468d4547af7..646b7b2aecb9 100644 --- a/plugins/kotlin/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java +++ b/plugins/kotlin/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java @@ -104,11 +104,9 @@ public class KotlinCodeStyleSettings extends CustomCodeStyleSettings { @Override public boolean equals(Object obj) { - if (!(obj instanceof KotlinCodeStyleSettings)) return false; + if (!(obj instanceof KotlinCodeStyleSettings that)) return false; - KotlinCodeStyleSettings that = (KotlinCodeStyleSettings)obj; - - if (!Comparing.equal(PACKAGES_TO_USE_STAR_IMPORTS, that.PACKAGES_TO_USE_STAR_IMPORTS)) return false; + if (!Comparing.equal(PACKAGES_TO_USE_STAR_IMPORTS, that.PACKAGES_TO_USE_STAR_IMPORTS)) return false; if (!Comparing.equal(PACKAGES_IMPORT_LAYOUT, that.PACKAGES_IMPORT_LAYOUT)) return false; if (!ReflectionUtil.comparePublicNonFinalFieldsWithSkip(this, that)) return false; return true; diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KtFunctionPsiElementCellRenderer.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KtFunctionPsiElementCellRenderer.java index b85a0095b068..e3fc67c0b276 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KtFunctionPsiElementCellRenderer.java +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KtFunctionPsiElementCellRenderer.java @@ -13,9 +13,8 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; public class KtFunctionPsiElementCellRenderer extends DefaultPsiElementCellRenderer { @Override public String getElementText(PsiElement element) { - if (element instanceof KtNamedFunction) { - KtNamedFunction function = (KtNamedFunction) element; - DeclarationDescriptor descriptor = ResolutionUtils.unsafeResolveToDescriptor(function, BodyResolveMode.PARTIAL); + if (element instanceof KtNamedFunction function) { + DeclarationDescriptor descriptor = ResolutionUtils.unsafeResolveToDescriptor(function, BodyResolveMode.PARTIAL); return DescriptorRenderer.SHORT_NAMES_IN_TYPES.render(descriptor); } return super.getElementText(element); diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinLambdaUnwrapper.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinLambdaUnwrapper.java index ef0900f6505f..e91c100d6215 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinLambdaUnwrapper.java +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinLambdaUnwrapper.java @@ -42,10 +42,9 @@ public class KotlinLambdaUnwrapper extends KotlinUnwrapRemoveBase { @Override public boolean isApplicableTo(PsiElement e) { - if (!(e instanceof KtLambdaExpression)) return false; + if (!(e instanceof KtLambdaExpression lambda)) return false; - KtLambdaExpression lambda = (KtLambdaExpression) e; - KtBlockExpression body = lambda.getBodyExpression(); + KtBlockExpression body = lambda.getBodyExpression(); KtElement enclosingElement = getLambdaEnclosingElement(lambda); if (body == null || enclosingElement == null) return false; diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java index 43c04524d9ce..c3242380039d 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java @@ -34,10 +34,9 @@ public abstract class KotlinUnwrapRemoveBase extends AbstractUnwrapper memberInfos = CollectionsKt.mapNotNull( originalClass.getDeclarations(), declaration -> { - if (!(declaration instanceof KtClassOrObject)) return null; - KtClassOrObject classOrObject = (KtClassOrObject) declaration; + if (!(declaration instanceof KtClassOrObject classOrObject)) return null; - if (classOrObject instanceof KtClass && ((KtClass) classOrObject).isInner()) return null; + if (classOrObject instanceof KtClass && ((KtClass) classOrObject).isInner()) return null; if (classOrObject instanceof KtObjectDeclaration && ((KtObjectDeclaration) classOrObject).isCompanion()) { return null; } diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodDialog.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodDialog.java index 341988c6eabb..dba02b2ba9f6 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodDialog.java +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodDialog.java @@ -159,9 +159,8 @@ public class MoveKotlinMethodDialog extends RefactoringDialog { boolean cellHasFocus ) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - if (value instanceof KtNamedDeclaration) { - KtNamedDeclaration variable = (KtNamedDeclaration) value; - setIcon(KotlinIconProvider.Companion.getBaseIcon(variable)); + if (value instanceof KtNamedDeclaration variable) { + setIcon(KotlinIconProvider.Companion.getBaseIcon(variable)); setText(variable.getName()); KotlinType type = MoveKotlinMethodProcessorKt.type(variable); if (type != null) { diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewFactory.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewFactory.java index e90163227d2d..369dbca5d71e 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewFactory.java +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewFactory.java @@ -22,12 +22,11 @@ public final class KotlinStructureViewFactory implements PsiStructureViewFactory private static final List> NODE_PROVIDERS = Collections.singletonList(new KotlinInheritedMembersNodeProvider()); @Override public StructureViewBuilder getStructureViewBuilder(@NotNull PsiFile psiFile) { - if (!(psiFile instanceof KtFile)) { + if (!(psiFile instanceof KtFile file)) { return null; } - KtFile file = (KtFile) psiFile; - return new TreeBasedStructureViewBuilder() { + return new TreeBasedStructureViewBuilder() { @Override public @NotNull StructureViewModel createStructureViewModel(@Nullable Editor editor) { return new KotlinStructureViewModel(file, editor, new KotlinStructureViewElement(file, false)) { diff --git a/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/core/breakpoints/dialog/AddFieldBreakpointDialog.java b/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/core/breakpoints/dialog/AddFieldBreakpointDialog.java index ee8f32a6a7ff..f675a5e016eb 100644 --- a/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/core/breakpoints/dialog/AddFieldBreakpointDialog.java +++ b/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/core/breakpoints/dialog/AddFieldBreakpointDialog.java @@ -105,9 +105,8 @@ public abstract class AddFieldBreakpointDialog extends DialogWrapper { private static KotlinPsiElementMemberChooserObject[] collectPropertyMembers(PsiClass container) { var result = new ArrayList(); - if (container instanceof KtLightClassForFacade) { - var facadeClass = (KtLightClassForFacade) container; - for (var file : facadeClass.getFiles()) { + if (container instanceof KtLightClassForFacade facadeClass) { + for (var file : facadeClass.getFiles()) { for (var declaration : file.getDeclarations()) { ProgressManager.checkCanceled(); if (declaration instanceof KtProperty) { diff --git a/plugins/kotlin/kotlin.searching/base/src/org/jetbrains/kotlin/idea/base/searching/usages/dialogs/KotlinFindClassUsagesDialog.java b/plugins/kotlin/kotlin.searching/base/src/org/jetbrains/kotlin/idea/base/searching/usages/dialogs/KotlinFindClassUsagesDialog.java index 58598094c430..110671bcdffc 100644 --- a/plugins/kotlin/kotlin.searching/base/src/org/jetbrains/kotlin/idea/base/searching/usages/dialogs/KotlinFindClassUsagesDialog.java +++ b/plugins/kotlin/kotlin.searching/base/src/org/jetbrains/kotlin/idea/base/searching/usages/dialogs/KotlinFindClassUsagesDialog.java @@ -63,9 +63,8 @@ public class KotlinFindClassUsagesDialog extends FindClassUsagesDialog { } PsiClass javaClass; - if (classOrObject instanceof KtClass) { - KtClass klass = (KtClass) classOrObject; - javaClass = !klass.isInterface() + if (classOrObject instanceof KtClass klass) { + javaClass = !klass.isInterface() ? factory.createClass(name) : klass.isAnnotation() ? factory.createAnnotationType(name) diff --git a/plugins/kotlin/kotlin.searching/base/src/org/jetbrains/kotlin/idea/base/searching/usages/dialogs/Utils.java b/plugins/kotlin/kotlin.searching/base/src/org/jetbrains/kotlin/idea/base/searching/usages/dialogs/Utils.java index b26f2ef11ce9..e3873427c86e 100644 --- a/plugins/kotlin/kotlin.searching/base/src/org/jetbrains/kotlin/idea/base/searching/usages/dialogs/Utils.java +++ b/plugins/kotlin/kotlin.searching/base/src/org/jetbrains/kotlin/idea/base/searching/usages/dialogs/Utils.java @@ -28,9 +28,8 @@ final class Utils { static boolean renameCheckbox(@NotNull JPanel panel, @NotNull String srcText, @Nls @NotNull String destText) { for (Component component : panel.getComponents()) { - if (component instanceof JCheckBox) { - JCheckBox checkBox = (JCheckBox) component; - if (checkBox.getText().equals(srcText)) { + if (component instanceof JCheckBox checkBox) { + if (checkBox.getText().equals(srcText)) { checkBox.setText(destText); return true; } @@ -42,9 +41,8 @@ final class Utils { static void removeCheckbox(@NotNull JPanel panel, @NotNull String srcText) { for (Component component : panel.getComponents()) { - if (component instanceof JCheckBox) { - JCheckBox checkBox = (JCheckBox) component; - if (checkBox.getText().equals(srcText)) { + if (component instanceof JCheckBox checkBox) { + if (checkBox.getText().equals(srcText)) { panel.remove(checkBox); return; } diff --git a/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationEditor.java b/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationEditor.java index e5ead2c3d92a..47d4056320e5 100644 --- a/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationEditor.java +++ b/plugins/kotlin/run-configurations/jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationEditor.java @@ -112,9 +112,8 @@ public final class KotlinRunConfigurationEditor extends SettingsEditor(); mainClass.setComponent(new EditorTextFieldWithBrowseButton(project, true, (declaration, place) -> { - if (declaration instanceof KtLightClass) { - KtLightClass aClass = (KtLightClass)declaration; - if (ConfigurationUtil.MAIN_CLASS.value(aClass) + if (declaration instanceof KtLightClass aClass) { + if (ConfigurationUtil.MAIN_CLASS.value(aClass) && (PsiMethodUtil.findMainMethod(aClass) != null || place.getParent() != null) && moduleSelector.findClass(((PsiClass)declaration).getQualifiedName()) != null) { return JavaCodeFragment.VisibilityChecker.Visibility.VISIBLE; diff --git a/plugins/kotlin/run-configurations/testng/src/org/jetbrains/kotlin/idea/testng/KotlinTestNgConfigurationProducer.java b/plugins/kotlin/run-configurations/testng/src/org/jetbrains/kotlin/idea/testng/KotlinTestNgConfigurationProducer.java index 065e167d18bf..e30426b0d362 100644 --- a/plugins/kotlin/run-configurations/testng/src/org/jetbrains/kotlin/idea/testng/KotlinTestNgConfigurationProducer.java +++ b/plugins/kotlin/run-configurations/testng/src/org/jetbrains/kotlin/idea/testng/KotlinTestNgConfigurationProducer.java @@ -67,13 +67,11 @@ public class KotlinTestNgConfigurationProducer extends TestNGConfigurationProduc return false; } - if (!(leaf.getContainingFile() instanceof KtFile)) { + if (!(leaf.getContainingFile() instanceof KtFile ktFile)) { return false; } - KtFile ktFile = (KtFile) leaf.getContainingFile(); - - if (!JvmPlatformKt.isJvm(TargetPlatformDetectorUtils.getPlatform(ktFile))) { + if (!JvmPlatformKt.isJvm(TargetPlatformDetectorUtils.getPlatform(ktFile))) { return false; } diff --git a/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/idea/test/util/RecursiveDescriptorComparator.java b/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/idea/test/util/RecursiveDescriptorComparator.java index a1a5d3edf2bd..1b81a1c120de 100644 --- a/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/idea/test/util/RecursiveDescriptorComparator.java +++ b/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/idea/test/util/RecursiveDescriptorComparator.java @@ -97,9 +97,8 @@ public class RecursiveDescriptorComparator { child.pushIndent(); } - if (descriptor instanceof ClassDescriptor) { - ClassDescriptor klass = (ClassDescriptor) descriptor; - appendSubDescriptors(descriptor, module, klass.getDefaultType().getMemberScope(), klass.getConstructors(), child); + if (descriptor instanceof ClassDescriptor klass) { + appendSubDescriptors(descriptor, module, klass.getDefaultType().getMemberScope(), klass.getConstructors(), child); MemberScope staticScope = klass.getStaticScope(); if (!DescriptorUtils.getAllDescriptors(staticScope).isEmpty()) { child.println(); @@ -143,11 +142,10 @@ public class RecursiveDescriptorComparator { printer.printWithNoIndent(StringsKt.trimStart(content, Printer.LINE_SEPARATOR.toCharArray())); } } - else if (conf.checkPropertyAccessors && descriptor instanceof PropertyDescriptor) { + else if (conf.checkPropertyAccessors && descriptor instanceof PropertyDescriptor propertyDescriptor) { printer.printlnWithNoIndent(); printer.pushIndent(); - PropertyDescriptor propertyDescriptor = (PropertyDescriptor) descriptor; - PropertyGetterDescriptor getter = propertyDescriptor.getGetter(); + PropertyGetterDescriptor getter = propertyDescriptor.getGetter(); if (getter != null) { printer.println(conf.renderer.render(getter)); } diff --git a/plugins/laf/macos/src/com/intellij/laf/macos/MacIntelliJComboBoxBorder.java b/plugins/laf/macos/src/com/intellij/laf/macos/MacIntelliJComboBoxBorder.java index f362e51d3d8a..c9390fbbb59b 100644 --- a/plugins/laf/macos/src/com/intellij/laf/macos/MacIntelliJComboBoxBorder.java +++ b/plugins/laf/macos/src/com/intellij/laf/macos/MacIntelliJComboBoxBorder.java @@ -77,8 +77,7 @@ public class MacIntelliJComboBoxBorder extends MacIntelliJTextBorder { @Override protected boolean isFocused(Component c) { - if (c instanceof JComboBox) { - JComboBox comboBox = (JComboBox)c; + if (c instanceof JComboBox comboBox) { if (!comboBox.isEnabled()) { return false; @@ -100,8 +99,7 @@ public class MacIntelliJComboBoxBorder extends MacIntelliJTextBorder { Area getButtonBounds(Component c) { Rectangle bounds = null; - if (c instanceof JComboBox && ((JComboBox)c).getUI() instanceof MacIntelliJComboBoxUI) { - MacIntelliJComboBoxUI ui = (MacIntelliJComboBoxUI)((JComboBox)c).getUI(); + if (c instanceof JComboBox && ((JComboBox)c).getUI() instanceof MacIntelliJComboBoxUI ui) { bounds = ui.getArrowButtonBounds(); } return bounds != null ? new Area(bounds) : new Area(); diff --git a/plugins/laf/macos/src/com/intellij/laf/macos/MacIntelliJSpinnerBorder.java b/plugins/laf/macos/src/com/intellij/laf/macos/MacIntelliJSpinnerBorder.java index fb4b726ae388..18f6e9826448 100644 --- a/plugins/laf/macos/src/com/intellij/laf/macos/MacIntelliJSpinnerBorder.java +++ b/plugins/laf/macos/src/com/intellij/laf/macos/MacIntelliJSpinnerBorder.java @@ -33,8 +33,7 @@ public final class MacIntelliJSpinnerBorder extends MacIntelliJComboBoxBorder { @Override Area getButtonBounds(Component c) { Rectangle bounds = null; - if (c instanceof JSpinner && ((JSpinner)c).getUI() instanceof MacIntelliJSpinnerUI) { - MacIntelliJSpinnerUI ui = (MacIntelliJSpinnerUI)((JSpinner)c).getUI(); + if (c instanceof JSpinner && ((JSpinner)c).getUI() instanceof MacIntelliJSpinnerUI ui) { bounds = ui.getArrowButtonBounds(); } return bounds != null ? new Area(bounds) : new Area(); diff --git a/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJButtonBorder.java b/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJButtonBorder.java index e7790fc53d62..f38bad291d30 100644 --- a/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJButtonBorder.java +++ b/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJButtonBorder.java @@ -21,10 +21,9 @@ import static com.intellij.laf.win10.WinIntelliJButtonUI.DISABLED_ALPHA_LEVEL; public class WinIntelliJButtonBorder implements Border, UIResource { @Override public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { - if (!(c instanceof AbstractButton) || UIUtil.isHelpButton(c)) return; + if (!(c instanceof AbstractButton b) || UIUtil.isHelpButton(c)) return; Graphics2D g2 = (Graphics2D)g.create(); - AbstractButton b = (AbstractButton)c; Rectangle outerRect = new Rectangle(x, y, width, height); try { JBInsets.removeFrom(outerRect, b.getInsets()); diff --git a/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJButtonUI.java b/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJButtonUI.java index 1f42286d4830..ce112bc62bf8 100644 --- a/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJButtonUI.java +++ b/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJButtonUI.java @@ -57,8 +57,7 @@ public final class WinIntelliJButtonUI extends DarculaButtonUI { Insets i = c.getInsets(); help.paintIcon(c, g, i.left, i.top + (c.getHeight() - help.getIconHeight()) / 2); } - else if (c instanceof AbstractButton) { - AbstractButton b = (AbstractButton)c; + else if (c instanceof AbstractButton b) { Graphics2D g2 = (Graphics2D)g.create(); try { Rectangle r = new Rectangle(c.getSize()); diff --git a/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJComboBoxUI.java b/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJComboBoxUI.java index 393452172002..de8926f4c320 100644 --- a/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJComboBoxUI.java +++ b/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJComboBoxUI.java @@ -359,8 +359,7 @@ public final class WinIntelliJComboBoxUI extends DarculaComboBoxUI { super.configureEditor(); installEditorKeyListener(comboBox.getEditor()); - if (editor instanceof JComponent) { - JComponent jEditor = (JComponent)editor; + if (editor instanceof JComponent jEditor) { jEditor.setBorder(DEFAULT_EDITOR_BORDER); editorHoverListener = new MouseHoverPropertyTrigger(comboBox, HOVER_PROPERTY); diff --git a/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJSpinnerBorder.java b/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJSpinnerBorder.java index c173efca7e28..87f396f164cf 100644 --- a/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJSpinnerBorder.java +++ b/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJSpinnerBorder.java @@ -27,9 +27,8 @@ import java.awt.geom.Path2D; public final class WinIntelliJSpinnerBorder extends DarculaSpinnerBorder { @Override public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { - if (!(c instanceof JSpinner)) return; + if (!(c instanceof JSpinner spinner)) return; - JSpinner spinner = (JSpinner)c; Graphics2D g2 = (Graphics2D)g.create(); try { g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); diff --git a/plugins/laf/win10/src/com/intellij/laf/win10/WinOnOffButtonUI.java b/plugins/laf/win10/src/com/intellij/laf/win10/WinOnOffButtonUI.java index 21f9f7de4ca9..6e36a5e428e5 100644 --- a/plugins/laf/win10/src/com/intellij/laf/win10/WinOnOffButtonUI.java +++ b/plugins/laf/win10/src/com/intellij/laf/win10/WinOnOffButtonUI.java @@ -47,9 +47,8 @@ public final class WinOnOffButtonUI extends BasicToggleButtonUI { @SuppressWarnings("UseJBColor") @Override public void paint(Graphics g, JComponent c) { - if (!(c instanceof OnOffButton)) return; + if (!(c instanceof OnOffButton b)) return; - OnOffButton b = (OnOffButton)c; Graphics2D g2 = (Graphics2D)g.create(); try { diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/preview/MarkdownEditorWithPreview.java b/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/preview/MarkdownEditorWithPreview.java index fd2f4f8fc2a9..8a8a97967065 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/preview/MarkdownEditorWithPreview.java +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/preview/MarkdownEditorWithPreview.java @@ -99,8 +99,7 @@ public final class MarkdownEditorWithPreview extends TextEditorWithPreview { @Override public void setState(@NotNull FileEditorState state) { - if (state instanceof MarkdownEditorWithPreviewState) { - final var actualState = ((MarkdownEditorWithPreviewState)state); + if (state instanceof MarkdownEditorWithPreviewState actualState) { super.setState(actualState.getUnderlyingState()); setVerticalSplit(actualState.isVerticalSplit()); } diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/split/SplitTextEditorProvider.java b/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/split/SplitTextEditorProvider.java index fcbcb0090845..44c68efb210a 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/split/SplitTextEditorProvider.java +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/split/SplitTextEditorProvider.java @@ -134,10 +134,9 @@ public abstract class SplitTextEditorProvider implements AsyncFileEditorProvider @Override public void writeState(@NotNull FileEditorState state, @NotNull Project project, @NotNull Element targetElement) { - if (!(state instanceof SplitFileEditor.MyFileEditorState)) { + if (!(state instanceof SplitFileEditor.MyFileEditorState compositeState)) { return; } - final var compositeState = (SplitFileEditor.MyFileEditorState)state; writeFirstProviderState(compositeState.getFirstState(), project, targetElement); writeSecondProviderState(compositeState.getSecondState(), project, targetElement); writeSplitLayoutState(compositeState.getSplitLayout(), project, targetElement); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/DependencyConflictId.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/DependencyConflictId.java index eb148183b46a..641287183254 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/DependencyConflictId.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/DependencyConflictId.java @@ -69,9 +69,7 @@ public class DependencyConflictId { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof DependencyConflictId)) return false; - - DependencyConflictId id = (DependencyConflictId)o; + if (!(o instanceof DependencyConflictId id)) return false; if (!artifactId.equals(id.artifactId)) return false; if (classifier != null ? !classifier.equals(id.classifier) : id.classifier != null) return false; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java index c47e909c71dc..8b8ea4a582e3 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java @@ -75,10 +75,9 @@ public class MavenDomGutterAnnotator implements Annotator { public void annotate(@NotNull PsiElement psiElement, @NotNull AnnotationHolder holder) { if (psiElement instanceof XmlTag) { final DomElement element = DomManager.getDomManager(psiElement.getProject()).getDomElement((XmlTag)psiElement); - if (element instanceof MavenDomDependency) { + if (element instanceof MavenDomDependency dependency) { if (element.getParentOfType(MavenDomPlugin.class, true) != null) return; - MavenDomDependency dependency = (MavenDomDependency)element; if (isDependencyManagementSection(dependency)) { annotateDependencyUsages(dependency, holder); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenCoordinateCompletionContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenCoordinateCompletionContributor.java index 48d6b1f309ec..8f0f29e42c29 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenCoordinateCompletionContributor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenCoordinateCompletionContributor.java @@ -163,13 +163,11 @@ public abstract class MavenCoordinateCompletionContributor extends CompletionCon PsiElement tagElement = xmlText.getParent(); - if (!(tagElement instanceof XmlTag)) { + if (!(tagElement instanceof XmlTag tag)) { badPlace = true; return this; } - XmlTag tag = (XmlTag)tagElement; - if (!myTagId.equals(tag.getName())) { badPlace = true; return this; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenSmartCompletionContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenSmartCompletionContributor.java index 4d507f03525b..07c53b2d150d 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenSmartCompletionContributor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenSmartCompletionContributor.java @@ -56,8 +56,7 @@ public class MavenSmartCompletionContributor extends CompletionContributor { for (PsiReference each : getReferences(parameters)) { if (each instanceof TagNameReference) continue; - if (each instanceof GenericDomValueReference) { - GenericDomValueReference reference = (GenericDomValueReference)each; + if (each instanceof GenericDomValueReference reference) { Converter converter = reference.getConverter(); @@ -70,8 +69,7 @@ public class MavenSmartCompletionContributor extends CompletionContributor { result.addAll(variants); } } - else if (converter instanceof ResolvingConverter) { - ResolvingConverter resolvingConverter = (ResolvingConverter)converter; + else if (converter instanceof ResolvingConverter resolvingConverter) { Collection variants = resolvingConverter.getVariants(reference.getConvertContext()); addVariants(resolvingConverter, variants, result); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenVersionCompletionContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenVersionCompletionContributor.java index ffd6edfd36d2..9bfd930dd245 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenVersionCompletionContributor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenVersionCompletionContributor.java @@ -110,8 +110,7 @@ public class MavenVersionCompletionContributor extends MavenCoordinateCompletion @Override public void accept(RepositoryArtifactData rad) { - if (rad instanceof MavenRepositoryArtifactInfo) { - MavenRepositoryArtifactInfo mrai = (MavenRepositoryArtifactInfo)rad; + if (rad instanceof MavenRepositoryArtifactInfo mrai) { if (StringUtil.equals(mrai.getArtifactId(), myArtifactId) && (StringUtil.isEmpty(myGroupId) || StringUtil.equals(mrai.getGroupId(), myGroupId))) { myConsumer.accept(mrai); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/insert/MavenDependencyInsertionHandler.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/insert/MavenDependencyInsertionHandler.java index b0220f5f34b8..e9b7ebbb1d1c 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/insert/MavenDependencyInsertionHandler.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/insert/MavenDependencyInsertionHandler.java @@ -34,13 +34,11 @@ public class MavenDependencyInsertionHandler implements InsertHandler T processSchema(String schema, SchemaProcessor processor) { VirtualFile file = MavenSchemaProvider.getSchemaFile(schema); PsiFile psiFile = PsiManager.getInstance(myProject).findFile(file); - if (!(psiFile instanceof XmlFile)) return null; + if (!(psiFile instanceof XmlFile xmlFile)) return null; - XmlFile xmlFile = (XmlFile)psiFile; XmlDocument document = xmlFile.getDocument(); XmlNSDescriptor desc = (XmlNSDescriptor)document.getMetaData(); XmlElementDescriptor[] descriptors = desc.getRootElementsDescriptors(document); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/build/MavenProjectTaskRunner.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/build/MavenProjectTaskRunner.java index df2a7019aae3..44691e394039 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/build/MavenProjectTaskRunner.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/build/MavenProjectTaskRunner.java @@ -68,10 +68,8 @@ public class MavenProjectTaskRunner extends ProjectTaskRunner { return isMavenModule(module); } - if (projectTask instanceof ProjectModelBuildTask) { - ProjectModelBuildTask buildTask = (ProjectModelBuildTask)projectTask; - if (buildTask.getBuildableElement() instanceof Artifact) { - Artifact artifact = (Artifact)buildTask.getBuildableElement(); + if (projectTask instanceof ProjectModelBuildTask buildTask) { + if (buildTask.getBuildableElement() instanceof Artifact artifact) { MavenArtifactProperties properties = null; for (ArtifactPropertiesProvider provider : artifact.getPropertiesProviders()) { if (provider instanceof MavenArtifactPropertiesProvider) { @@ -99,8 +97,7 @@ public class MavenProjectTaskRunner extends ProjectTaskRunner { } } - if (projectTask instanceof ExecuteRunConfigurationTask) { - ExecuteRunConfigurationTask task = (ExecuteRunConfigurationTask)projectTask; + if (projectTask instanceof ExecuteRunConfigurationTask task) { RunProfile runProfile = task.getRunProfile(); if (runProfile instanceof ModuleBasedConfiguration) { RunConfigurationModule module = ((ModuleBasedConfiguration)runProfile).getConfigurationModule(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerExtension.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerExtension.java index 1d0834cb5f78..f89956a37e84 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerExtension.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerExtension.java @@ -58,8 +58,7 @@ public interface MavenCompilerExtension { Module module, MavenProject mavenProject, List compilerArgs) { - if (compilerOptions instanceof JpsJavaCompilerOptions) { - JpsJavaCompilerOptions javaCompilerOptions = (JpsJavaCompilerOptions)compilerOptions; + if (compilerOptions instanceof JpsJavaCompilerOptions javaCompilerOptions) { CompilerConfigurationImpl compilerConfiguration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(module.getProject()); compilerConfiguration.setAdditionalOptions(javaCompilerOptions, module, compilerArgs); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenLegacyModuleImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenLegacyModuleImporter.java index 9bc6fcd5f387..f06108287f5a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenLegacyModuleImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenLegacyModuleImporter.java @@ -368,8 +368,7 @@ public final class MavenLegacyModuleImporter { myRootModelAdapter.addLibraryDependency(((LibraryDependency)dependency).getArtifact(), dependency.getScope(), myModifiableModelsProvider, myMavenProject); } - else if (dependency instanceof ModuleDependency) { - ModuleDependency moduleDependency = (ModuleDependency)dependency; + else if (dependency instanceof ModuleDependency moduleDependency) { myRootModelAdapter.addModuleDependency(moduleDependency.getArtifact(), dependency.getScope(), moduleDependency.isTestJar()); } else if (dependency instanceof BaseDependency) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java index 8f3154a5157d..f87937b989a8 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java @@ -353,8 +353,7 @@ public class MavenArtifactSearchPanel extends JPanel { else if (value instanceof MavenArtifactSearchResult) { formatSearchResult(tree, (MavenArtifactSearchResult)value, selected); } - else if (value instanceof MavenDependencyCompletionItem) { - MavenDependencyCompletionItem info = (MavenDependencyCompletionItem)value; + else if (value instanceof MavenDependencyCompletionItem info) { String version = info.getVersion(); Icon icon = MavenDependencyCompletionUtil.getIcon(info.getType()); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/javadoc/MojoClassAnnotationTagProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/javadoc/MojoClassAnnotationTagProvider.java index e0d4dfd26a54..21f2e6a11630 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/javadoc/MojoClassAnnotationTagProvider.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/javadoc/MojoClassAnnotationTagProvider.java @@ -68,8 +68,7 @@ class MojoAnnotationInfo implements JavadocTagInfo { @Override public boolean isValidInContext(PsiElement element) { - if (element instanceof PsiClass) { - PsiClass psiClass = (PsiClass)element; + if (element instanceof PsiClass psiClass) { return InheritanceUtil.isInheritor(psiClass, BASE_CLASS); } return false; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginConfigurationLanguageInjector.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginConfigurationLanguageInjector.java index ac3b6288037a..3197458767f4 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginConfigurationLanguageInjector.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginConfigurationLanguageInjector.java @@ -28,9 +28,7 @@ public final class MavenPluginConfigurationLanguageInjector implements LanguageI @Override public void getLanguagesToInject(@NotNull final PsiLanguageInjectionHost host, @NotNull final InjectedLanguagePlaces injectionPlacesRegistrar) { - if (!(host instanceof XmlText)) return; - - final XmlText xmlText = (XmlText)host; + if (!(host instanceof XmlText xmlText)) return; if (!MavenPluginParamInfo.isSimpleText(xmlText)) return; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java index 8e81f7dce9ff..2a07dca8d005 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java @@ -204,8 +204,7 @@ public final class MavenProjectReader { mavenBuildBase.setTestResources(collectResources(MavenJDOMUtil.findChildrenByPath(xmlBuild, "testResources", "testResource"))); mavenBuildBase.setFilters(MavenJDOMUtil.findChildrenValuesByPath(xmlBuild, "filters", "filter")); - if (mavenBuildBase instanceof MavenBuild) { - MavenBuild mavenBuild = (MavenBuild)mavenBuildBase; + if (mavenBuildBase instanceof MavenBuild mavenBuild) { String source = MavenJDOMUtil.findChildValueByPath(xmlBuild, "sourceDirectory"); if (!isEmptyOrSpaces(source)) mavenBuild.addSource(source); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenTestRunningSettings.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenTestRunningSettings.java index 36e9e014515d..6a30beee7b04 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenTestRunningSettings.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenTestRunningSettings.java @@ -48,9 +48,7 @@ public class MavenTestRunningSettings { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof MavenTestRunningSettings)) return false; - - MavenTestRunningSettings settings = (MavenTestRunningSettings)o; + if (!(o instanceof MavenTestRunningSettings settings)) return false; if (myPassArgLine != settings.myPassArgLine) return false; if (myPassEnvironmentVariables != settings.myPassEnvironmentVariables) return false; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenKeymapExtension.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenKeymapExtension.java index f5a00c96be0d..86a7c9d8bd5c 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenKeymapExtension.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenKeymapExtension.java @@ -59,10 +59,9 @@ public final class MavenKeymapExtension implements ExternalSystemKeymapExtension for (String eachId : getActionIdList(project, null)) { AnAction eachAction = actionManager.getAction(eachId); - if (!(eachAction instanceof MavenGoalAction)) continue; + if (!(eachAction instanceof MavenGoalAction mavenAction)) continue; if (condition != null && !condition.value(actionManager.getActionOrStub(eachId))) continue; - MavenGoalAction mavenAction = (MavenGoalAction)eachAction; MavenProject mavenProject = mavenAction.getMavenProject(); Set> actions = projectToActionsMapping.get(mavenProject); if (actions == null) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java index b26fb3e107ac..ffadd046ff55 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java @@ -441,8 +441,7 @@ public class MavenUtil { else { //set language level only for root pom Sdk sdk = ProjectRootManager.getInstance(project).getProjectSdk(); - if (sdk != null && sdk.getSdkType() instanceof JavaSdk) { - JavaSdk javaSdk = (JavaSdk)sdk.getSdkType(); + if (sdk != null && sdk.getSdkType() instanceof JavaSdk javaSdk) { JavaSdkVersion version = javaSdk.getVersion(sdk); String description = version == null ? null : version.getDescription(); boolean shouldSetLangLevel = version != null && version.isAtLeast(JavaSdkVersion.JDK_1_6); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/vfs/MavenPropertiesVirtualFileSystem.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/vfs/MavenPropertiesVirtualFileSystem.java index 103ca56dcf3c..9037d574fa2d 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/vfs/MavenPropertiesVirtualFileSystem.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/vfs/MavenPropertiesVirtualFileSystem.java @@ -42,8 +42,7 @@ public class MavenPropertiesVirtualFileSystem extends DummyFileSystem { Properties systemProperties = new Properties(); for (Map.Entry entry : System.getProperties().entrySet()) { - if (entry.getKey() instanceof String && entry.getValue() instanceof String) { - String key = (String)entry.getKey(); + if (entry.getKey() instanceof String key && entry.getValue() instanceof String) { if (!key.startsWith("idea.")) { systemProperties.setProperty(key, (String)entry.getValue()); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenArchetypesStep.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenArchetypesStep.java index 9bfa8f52f471..bceca787c6d3 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenArchetypesStep.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenArchetypesStep.java @@ -314,9 +314,7 @@ public class MavenArchetypesStep extends ModuleWizardStep implements Disposable int row, boolean hasFocus) { Object userObject = ((DefaultMutableTreeNode)value).getUserObject(); - if (!(userObject instanceof MavenArchetype)) return; - - MavenArchetype info = (MavenArchetype)userObject; + if (!(userObject instanceof MavenArchetype info)) return; if (leaf) { append(info.artifactId, SimpleTextAttributes.GRAY_ATTRIBUTES); diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FindUsagesCommand.java b/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FindUsagesCommand.java index 6889c94b379c..abae3bfcc2d4 100644 --- a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FindUsagesCommand.java +++ b/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FindUsagesCommand.java @@ -157,8 +157,7 @@ public class FindUsagesCommand extends AbstractCommand { public static FoundUsage convertToFoundUsage(@NotNull Project project, @NotNull Usage usage) { PortableFilePath portableFilePath = null; Integer line = null; - if (usage instanceof UsageInfo2UsageAdapter) { - UsageInfo2UsageAdapter adapter = (UsageInfo2UsageAdapter)usage; + if (usage instanceof UsageInfo2UsageAdapter adapter) { VirtualFile file = ReadAction.compute(() -> adapter.getFile()); if (file != null) { portableFilePath = PortableFilePaths.INSTANCE.getPortableFilePath(file, project); @@ -227,8 +226,7 @@ public class FindUsagesCommand extends AbstractCommand { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof FoundUsage)) return false; - FoundUsage usage = (FoundUsage)o; + if (!(o instanceof FoundUsage usage)) return false; return text.equals(usage.text) && Objects.equals(portableFilePath, usage.portableFilePath) && Objects.equals(line, usage.line); diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/PropertiesAnnotator.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/PropertiesAnnotator.java index 8be42e33da56..b202aaee3c9e 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/PropertiesAnnotator.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/PropertiesAnnotator.java @@ -48,8 +48,7 @@ public class PropertiesAnnotator implements Annotator { @Override public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { - if (!(element instanceof Property)) return; - final Property property = (Property)element; + if (!(element instanceof Property property)) return; PropertiesFile propertiesFile = property.getPropertiesFile(); final String key = property.getUnescapedKey(); if (key == null) return; diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/PropertiesWebReferenceContributor.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/PropertiesWebReferenceContributor.java index dfa142553bb8..d5c5936494cc 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/PropertiesWebReferenceContributor.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/PropertiesWebReferenceContributor.java @@ -21,10 +21,9 @@ final class PropertiesWebReferenceContributor extends PsiReferenceContributor { @Override public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) { - if (!(element instanceof PropertyValueImpl)) return PsiReference.EMPTY_ARRAY; + if (!(element instanceof PropertyValueImpl propertyValue)) return PsiReference.EMPTY_ARRAY; if (!element.textContains(':')) return PsiReference.EMPTY_ARRAY; - PropertyValueImpl propertyValue = (PropertyValueImpl)element; String textValue = propertyValue.getText(); if (GlobalPathReferenceProvider.isWebReferenceUrl(textValue)) { diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleManager.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleManager.java index e4573e58bd8d..7ce054077991 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleManager.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleManager.java @@ -122,7 +122,7 @@ public final class ResourceBundleManager implements PersistentStateComponent(myState.getDissociatedFiles())) { @@ -143,7 +143,6 @@ public final class ResourceBundleManager implements PersistentStateComponent properties = propertiesFile.getProperties(); Module module = ModuleUtilCore.findModuleForPsiElement(file); if (module == null) return; @@ -189,8 +188,7 @@ public final class DuplicatePropertyInspection extends GlobalSimpleInspectionToo CharSequence text = file.getViewProvider().getContents(); LowLevelSearchUtil.processTexts(text, 0, text.length(), searcher, offset -> { PsiElement element = file.findElementAt(offset); - if (element != null && element.getParent() instanceof Property) { - final Property property = (Property)element.getParent(); + if (element != null && element.getParent() instanceof Property property) { if (Objects.equals(property.getValue(), value) && element.getStartOffsetInParent() != 0) { if (duplicatesCount[0] == 0){ message.append(PropertiesBundle.message("duplicate.property.value.problem.descriptor", property.getValue())); @@ -230,8 +228,7 @@ public final class DuplicatePropertyInspection extends GlobalSimpleInspectionToo PsiElement propertyInCurrentFile = null; Set psiFilesWithDuplicates = keyToFiles.get(key); for (PsiFile file : psiFilesWithDuplicates) { - if (!(file instanceof PropertiesFile)) continue; - PropertiesFile propertiesFile = (PropertiesFile)file; + if (!(file instanceof PropertiesFile propertiesFile)) continue; final List propertiesByKey = propertiesFile.findPropertiesByKey(key); for (IProperty property : propertiesByKey) { if (duplicatesCount == 0){ @@ -278,8 +275,7 @@ public final class DuplicatePropertyInspection extends GlobalSimpleInspectionToo final Set psiFiles = keyToFiles.get(key); boolean firstUsage = true; for (PsiFile file : psiFiles) { - if (!(file instanceof PropertiesFile)) continue; - PropertiesFile propertiesFile = (PropertiesFile)file; + if (!(file instanceof PropertiesFile propertiesFile)) continue; final List propertiesByKey = propertiesFile.findPropertiesByKey(key); for (IProperty property : propertiesByKey) { if (firstUsage){ diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/codeInspection/unused/UnusedPropertyInspection.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/codeInspection/unused/UnusedPropertyInspection.java index 3d7e28673c09..d4605a5fbfae 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/codeInspection/unused/UnusedPropertyInspection.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/codeInspection/unused/UnusedPropertyInspection.java @@ -118,8 +118,7 @@ public final class UnusedPropertyInspection extends PropertiesInspectionBase { return new PsiElementVisitor() { @Override public void visitElement(@NotNull PsiElement element) { - if (!(element instanceof Property)) return; - Property property = (Property)element; + if (!(element instanceof Property property)) return; if (propertiesBeingCommitted != null && !propertiesBeingCommitted.contains(property)) return; if (isPropertyUsed(property, helper, isOnTheFly)) return; diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/PropertiesSeparatorManager.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/PropertiesSeparatorManager.java index cfeda64a3552..e764bbc60606 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/PropertiesSeparatorManager.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/PropertiesSeparatorManager.java @@ -44,10 +44,9 @@ public final class PropertiesSeparatorManager implements PersistentStateComponen @NotNull public String getSeparator(final ResourceBundle resourceBundle) { - if (!(resourceBundle instanceof ResourceBundleImpl)) { + if (!(resourceBundle instanceof ResourceBundleImpl resourceBundleImpl)) { return "."; } - final ResourceBundleImpl resourceBundleImpl = (ResourceBundleImpl)resourceBundle; String separator = myUserDefinedSeparators.getSeparators().get(resourceBundleImpl.getUrl()); return separator == null ? Objects.requireNonNull(myGuessedSeparators.get(resourceBundleImpl)) : separator; } diff --git a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/GotoPropertyDeclarationsProvider.java b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/GotoPropertyDeclarationsProvider.java index 037d922fb0dd..7e71364ed393 100644 --- a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/GotoPropertyDeclarationsProvider.java +++ b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/GotoPropertyDeclarationsProvider.java @@ -41,10 +41,9 @@ public class GotoPropertyDeclarationsProvider extends GotoRelatedProvider { @Override public List getItems(@NotNull DataContext context) { final FileEditor editor = PlatformCoreDataKeys.FILE_EDITOR.getData(context); - if (!(editor instanceof ResourceBundleEditor)) { + if (!(editor instanceof ResourceBundleEditor resourceBundleEditor)) { return Collections.emptyList(); } - final ResourceBundleEditor resourceBundleEditor = (ResourceBundleEditor)editor; final Collection elements = resourceBundleEditor.getSelectedElements(); if (elements.size() != 1) { return Collections.emptyList(); diff --git a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/NewPropertyAction.java b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/NewPropertyAction.java index af8eced1fbe9..5726248e3cf8 100644 --- a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/NewPropertyAction.java +++ b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/NewPropertyAction.java @@ -93,8 +93,7 @@ class NewPropertyAction extends AnAction { if (selectedElement == null) { return; } - if (selectedElement instanceof PropertiesPrefixGroup) { - final PropertiesPrefixGroup group = (PropertiesPrefixGroup)selectedElement; + if (selectedElement instanceof PropertiesPrefixGroup group) { prefix = group.getPrefix(); separator = group.getSeparator(); } @@ -183,8 +182,7 @@ class NewPropertyAction extends AnAction { @Nullable private static String getSelectedPrefixText(@NotNull ResourceBundleEditor resourceBundleEditor) { Object item = resourceBundleEditor.getSelectedElementIfOnlyOne(); - if (item instanceof PropertiesPrefixGroup) { - PropertiesPrefixGroup prefixGroup = (PropertiesPrefixGroup)item; + if (item instanceof PropertiesPrefixGroup prefixGroup) { return prefixGroup.getPrefix() + prefixGroup.getSeparator(); } return null; diff --git a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/PropertiesCopyHandlerEx.java b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/PropertiesCopyHandlerEx.java index d1acaf6c7239..366a6ea8bf29 100644 --- a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/PropertiesCopyHandlerEx.java +++ b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/PropertiesCopyHandlerEx.java @@ -19,8 +19,7 @@ public class PropertiesCopyHandlerEx extends PropertiesCopyHandler { .getDataContextFromFocusAsync() .onSuccess(context -> { final FileEditor fileEditor = PlatformCoreDataKeys.FILE_EDITOR.getData(context); - if (fileEditor instanceof ResourceBundleEditor) { - final ResourceBundleEditor resourceBundleEditor = (ResourceBundleEditor)fileEditor; + if (fileEditor instanceof ResourceBundleEditor resourceBundleEditor) { resourceBundleEditor.updateTreeRoot(); resourceBundleEditor.selectProperty(newName); } diff --git a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/inspections/ResourceBundleEditorRenderer.java b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/inspections/ResourceBundleEditorRenderer.java index 744a36cfc6f7..39dc2cb598a4 100644 --- a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/inspections/ResourceBundleEditorRenderer.java +++ b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/inspections/ResourceBundleEditorRenderer.java @@ -36,8 +36,7 @@ public class ResourceBundleEditorRenderer extends NodeRenderer { return false; } final ItemPresentation presentation = treeElement.getPresentation(); - if (presentation instanceof TextAttributesPresentation) { - final TextAttributesPresentation textAttributesPresentation = (TextAttributesPresentation)presentation; + if (presentation instanceof TextAttributesPresentation textAttributesPresentation) { final String text = textAttributesPresentation.getPresentableText(); if (text != null) { SimpleTextAttributes attr = SimpleTextAttributes.fromTextAttributes( diff --git a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/refactoring/rename/ResourceBundleFromEditorRenameHandler.java b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/refactoring/rename/ResourceBundleFromEditorRenameHandler.java index e05b35efdbce..d2e76b5f6d81 100644 --- a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/refactoring/rename/ResourceBundleFromEditorRenameHandler.java +++ b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/refactoring/rename/ResourceBundleFromEditorRenameHandler.java @@ -50,8 +50,7 @@ public class ResourceBundleFromEditorRenameHandler implements RenameHandler { final Object selectedElement = resourceBundleEditor.getSelectedElementIfOnlyOne(); if (selectedElement != null) { CommandProcessor.getInstance().runUndoTransparentAction(() -> { - if (selectedElement instanceof PropertiesPrefixGroup) { - final PropertiesPrefixGroup group = (PropertiesPrefixGroup)selectedElement; + if (selectedElement instanceof PropertiesPrefixGroup group) { ResourceBundleRenameUtil.renameResourceBundleKeySection(getPsiElementsFromGroup(group), group.getPresentableName(), group.getPrefix().length() - group.getPresentableName().length()); diff --git a/plugins/properties/src/com/intellij/lang/properties/PropertiesDocumentationProvider.java b/plugins/properties/src/com/intellij/lang/properties/PropertiesDocumentationProvider.java index c8b1f955f821..e672b32687c8 100644 --- a/plugins/properties/src/com/intellij/lang/properties/PropertiesDocumentationProvider.java +++ b/plugins/properties/src/com/intellij/lang/properties/PropertiesDocumentationProvider.java @@ -48,8 +48,7 @@ public class PropertiesDocumentationProvider extends AbstractDocumentationProvid @Override public @Nls String generateDoc(final PsiElement element, @Nullable final PsiElement originalElement) { - if (element instanceof IProperty) { - IProperty property = (IProperty)element; + if (element instanceof IProperty property) { String text = property.getDocCommentText(); @NonNls String info = ""; diff --git a/plugins/properties/src/com/intellij/lang/properties/create/CreateResourceBundleDialogComponent.java b/plugins/properties/src/com/intellij/lang/properties/create/CreateResourceBundleDialogComponent.java index 0d42483e4025..1f33ede927b0 100644 --- a/plugins/properties/src/com/intellij/lang/properties/create/CreateResourceBundleDialogComponent.java +++ b/plugins/properties/src/com/intellij/lang/properties/create/CreateResourceBundleDialogComponent.java @@ -238,8 +238,7 @@ public final class CreateResourceBundleDialogComponent { } for (PsiElement element : myDirectory.getChildren()) { if (element instanceof PsiFile) { - if (element instanceof PropertiesFile) { - PropertiesFile propertiesFile = (PropertiesFile)element; + if (element instanceof PropertiesFile propertiesFile) { final String propertiesFileName = propertiesFile.getName(); if (files.contains(propertiesFileName)) { return PropertiesBundle.message("create.resource.bundle.some.of.files.already.exist.error"); diff --git a/plugins/properties/src/com/intellij/lang/properties/ide/favoritesTreeView/ResourcesFavoriteNodeProvider.java b/plugins/properties/src/com/intellij/lang/properties/ide/favoritesTreeView/ResourcesFavoriteNodeProvider.java index fa6bdbad2788..03b1c67da897 100644 --- a/plugins/properties/src/com/intellij/lang/properties/ide/favoritesTreeView/ResourcesFavoriteNodeProvider.java +++ b/plugins/properties/src/com/intellij/lang/properties/ide/favoritesTreeView/ResourcesFavoriteNodeProvider.java @@ -42,8 +42,7 @@ final class ResourcesFavoriteNodeProvider extends FavoriteNodeProvider { @Override public boolean elementContainsFile(final Object element, final VirtualFile vFile) { - if (element instanceof ResourceBundle) { - ResourceBundle bundle = (ResourceBundle)element; + if (element instanceof ResourceBundle bundle) { final List propertiesFiles = bundle.getPropertiesFiles(); for (PropertiesFile file : propertiesFiles) { final VirtualFile virtualFile = file.getVirtualFile(); @@ -68,8 +67,7 @@ final class ResourcesFavoriteNodeProvider extends FavoriteNodeProvider { @Override public boolean isInvalidElement(final Object element) { - if (element instanceof ResourceBundle) { - ResourceBundle resourceBundle = (ResourceBundle)element; + if (element instanceof ResourceBundle resourceBundle) { List propertiesFiles = resourceBundle.getPropertiesFiles(); if (propertiesFiles.size() == 1) { //todo result.add(new PsiFileNode(myProject, propertiesFiles.iterator().next(), this)); @@ -90,8 +88,7 @@ final class ResourcesFavoriteNodeProvider extends FavoriteNodeProvider { if (element instanceof ResourceBundleImpl) { return ((ResourceBundleImpl)element).getUrl(); } - else if (element instanceof PsiFile[]) { - PsiFile[] files = (PsiFile[])element; + else if (element instanceof PsiFile[] files) { ResourceBundle bundle = null; for (PsiFile file : files) { diff --git a/plugins/properties/src/com/intellij/lang/properties/structuralsearch/PropertiesStructuralSearchProfile.java b/plugins/properties/src/com/intellij/lang/properties/structuralsearch/PropertiesStructuralSearchProfile.java index 03c3fb46c9d5..0c802e532cd8 100644 --- a/plugins/properties/src/com/intellij/lang/properties/structuralsearch/PropertiesStructuralSearchProfile.java +++ b/plugins/properties/src/com/intellij/lang/properties/structuralsearch/PropertiesStructuralSearchProfile.java @@ -86,8 +86,7 @@ public class PropertiesStructuralSearchProfile extends StructuralSearchProfile { if (elements.length > 1) throw new MalformedPatternException(); final CompiledPattern pattern = globalVisitor.getContext().getPattern(); for (PsiElement element : elements) { - if (element instanceof PsiComment) { - final PsiComment comment = (PsiComment)element; + if (element instanceof PsiComment comment) { final String commentText = comment.getText(); if (globalVisitor.hasFragments(commentText)) { final MatchingHandler handler = @@ -101,8 +100,7 @@ public class PropertiesStructuralSearchProfile extends StructuralSearchProfile { } pattern.getHandler(element).setFilter(e -> e instanceof PsiComment); } - else if (element instanceof Property) { - final Property property = (Property)element; + else if (element instanceof Property property) { pattern.getHandler(element).setFilter(e -> e instanceof Property); final PsiElement firstChild = property.getFirstChild(); if (firstChild instanceof PropertyKeyImpl) { diff --git a/plugins/rareJavaRefactorings/src/com/intellij/refactoring/removemiddleman/DelegationUtils.java b/plugins/rareJavaRefactorings/src/com/intellij/refactoring/removemiddleman/DelegationUtils.java index ada969793e39..ed3354146153 100644 --- a/plugins/rareJavaRefactorings/src/com/intellij/refactoring/removemiddleman/DelegationUtils.java +++ b/plugins/rareJavaRefactorings/src/com/intellij/refactoring/removemiddleman/DelegationUtils.java @@ -69,10 +69,9 @@ public final class DelegationUtils { } private static boolean isDelegationCall(PsiExpression expression, PsiField field, PsiMethod method) { - if (!(expression instanceof PsiMethodCallExpression)) { + if (!(expression instanceof PsiMethodCallExpression call)) { return false; } - final PsiMethodCallExpression call = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = call.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); if (!(qualifier instanceof PsiReferenceExpression)) { diff --git a/plugins/rareJavaRefactorings/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java b/plugins/rareJavaRefactorings/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java index ab268b028e6e..8b3ad212454d 100644 --- a/plugins/rareJavaRefactorings/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java +++ b/plugins/rareJavaRefactorings/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java @@ -357,8 +357,7 @@ public class WrapReturnValueProcessor extends FixableUsagesRefactoringProcessor super.visitReturnStatement(statement); final PsiExpression returnValue = statement.getReturnValue(); - if (myUseExistingClass && returnValue instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression callExpression = (PsiMethodCallExpression)returnValue; + if (myUseExistingClass && returnValue instanceof PsiMethodCallExpression callExpression) { if (callExpression.getArgumentList().isEmpty()) { final PsiReferenceExpression callMethodExpression = callExpression.getMethodExpression(); final String methodName = callMethodExpression.getReferenceName(); diff --git a/plugins/sh/core/src/com/intellij/sh/ShAnnotator.java b/plugins/sh/core/src/com/intellij/sh/ShAnnotator.java index aea608bd67c9..e28a7a3bda1e 100644 --- a/plugins/sh/core/src/com/intellij/sh/ShAnnotator.java +++ b/plugins/sh/core/src/com/intellij/sh/ShAnnotator.java @@ -33,8 +33,7 @@ final class ShAnnotator implements Annotator { mark(node.getPsi(), holder, COMPOSED_VARIABLE); } } - else if (o instanceof ShSubshellCommand) { - ShSubshellCommand subshellCommand = (ShSubshellCommand)o; + else if (o instanceof ShSubshellCommand subshellCommand) { mark(subshellCommand.getLeftParen(), holder, SUBSHELL_COMMAND); mark(subshellCommand.getRightParen(), holder, SUBSHELL_COMMAND); } diff --git a/plugins/sh/core/src/com/intellij/sh/codeInsight/ShIncludeCommandReference.java b/plugins/sh/core/src/com/intellij/sh/codeInsight/ShIncludeCommandReference.java index 79c35379294d..110c86fc5a87 100644 --- a/plugins/sh/core/src/com/intellij/sh/codeInsight/ShIncludeCommandReference.java +++ b/plugins/sh/core/src/com/intellij/sh/codeInsight/ShIncludeCommandReference.java @@ -37,8 +37,7 @@ public class ShIncludeCommandReference extends PsiReferenceBase { @Nullable private PsiElement resolveInner() { PsiElement parent = myElement.getParent(); - if (!(parent instanceof ShIncludeCommandImpl)) return null; - ShIncludeCommandImpl includeCommand = (ShIncludeCommandImpl)parent; + if (!(parent instanceof ShIncludeCommandImpl includeCommand)) return null; List commandList = includeCommand.getSimpleCommandElementList(); if (commandList.size() <= 0 || commandList.get(0) != myElement) return null; return ((ShIncludeCommandImpl)parent).getReferencingFile(myElement); diff --git a/plugins/sh/core/src/com/intellij/sh/codeInsight/processor/ShFunctionDeclarationProcessor.java b/plugins/sh/core/src/com/intellij/sh/codeInsight/processor/ShFunctionDeclarationProcessor.java index 7410225a0db8..bd7c53683354 100644 --- a/plugins/sh/core/src/com/intellij/sh/codeInsight/processor/ShFunctionDeclarationProcessor.java +++ b/plugins/sh/core/src/com/intellij/sh/codeInsight/processor/ShFunctionDeclarationProcessor.java @@ -18,8 +18,7 @@ public class ShFunctionDeclarationProcessor implements PsiScopeProcessor { @Override public boolean execute(@NotNull PsiElement element, @NotNull ResolveState state) { - if (!(element instanceof ShFunctionDefinition)) return true; - ShFunctionDefinition functionDefinition = (ShFunctionDefinition)element; + if (!(element instanceof ShFunctionDefinition functionDefinition)) return true; PsiElement identifier = functionDefinition.getWord(); if (identifier == null) return true; if (!identifier.getText().equals(myFunctionName)) return true; diff --git a/plugins/sh/core/src/com/intellij/sh/completion/ShFilePathCompletionContributor.java b/plugins/sh/core/src/com/intellij/sh/completion/ShFilePathCompletionContributor.java index 55f7a535cf05..0d7e116806b5 100644 --- a/plugins/sh/core/src/com/intellij/sh/completion/ShFilePathCompletionContributor.java +++ b/plugins/sh/core/src/com/intellij/sh/completion/ShFilePathCompletionContributor.java @@ -146,8 +146,7 @@ public class ShFilePathCompletionContributor extends CompletionContributor imple @Nullable private static PsiElement getNearestVarIfExist(@NotNull PsiFile file, int offset) { PsiElement e = file.findElementAt(offset); - if (!(e instanceof LeafPsiElement)) return null; - LeafPsiElement leaf = (LeafPsiElement) e; + if (!(e instanceof LeafPsiElement leaf)) return null; if (leaf.getElementType() == ShTypes.VAR) return leaf; if (isStringOfVar(leaf)) return leaf.getPrevSibling(); return null; diff --git a/plugins/sh/core/src/com/intellij/sh/psi/impl/ShIncludeCommandMixin.java b/plugins/sh/core/src/com/intellij/sh/psi/impl/ShIncludeCommandMixin.java index f3c7d6b2bc46..4e28aaf81e74 100644 --- a/plugins/sh/core/src/com/intellij/sh/psi/impl/ShIncludeCommandMixin.java +++ b/plugins/sh/core/src/com/intellij/sh/psi/impl/ShIncludeCommandMixin.java @@ -36,8 +36,7 @@ abstract class ShIncludeCommandMixin extends ShCommandImpl implements ShIncludeC public @Nullable PsiFile getReferencingFile(@NotNull PsiElement element) { String relativeFilePath = element.getText(); - if (element instanceof ShString) { - ShString shString = (ShString)element; + if (element instanceof ShString shString) { if (relativeFilePath.length() >= 2 && (shString.getOpenQuote() != null && shString.getCloseQuote() != null) || (shString.getRawString() != null && relativeFilePath.startsWith("'") && relativeFilePath.endsWith("'"))) { diff --git a/plugins/sh/terminal/src/com/intellij/sh/run/terminal/ShTerminalRunner.java b/plugins/sh/terminal/src/com/intellij/sh/run/terminal/ShTerminalRunner.java index 2f12772124f5..af099946c923 100644 --- a/plugins/sh/terminal/src/com/intellij/sh/run/terminal/ShTerminalRunner.java +++ b/plugins/sh/terminal/src/com/intellij/sh/run/terminal/ShTerminalRunner.java @@ -81,11 +81,10 @@ final class ShTerminalRunner implements ShRunner { private static @Nullable Pair getSuitableProcess(@NotNull Content content, @NotNull String workingDirectory) { JBTerminalWidget widget = TerminalToolWindowManager.getWidgetByContent(content); - if (!(widget instanceof ShellTerminalWidget)) { + if (!(widget instanceof ShellTerminalWidget shellTerminalWidget)) { return null; } - ShellTerminalWidget shellTerminalWidget = (ShellTerminalWidget)widget; if (!shellTerminalWidget.getTypedShellCommand().isEmpty() || shellTerminalWidget.hasRunningCommands()) { return null; } diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/psi/impl/JavaStreamChainBuilder.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/psi/impl/JavaStreamChainBuilder.java index 56b085172480..454a2654427b 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/psi/impl/JavaStreamChainBuilder.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/psi/impl/JavaStreamChainBuilder.java @@ -125,8 +125,7 @@ public class JavaStreamChainBuilder implements StreamChainBuilder { final PsiElement parent = expression.getParent(); if (!(parent instanceof PsiReferenceExpression)) return; final PsiElement parentCall = parent.getParent(); - if (parentCall instanceof PsiMethodCallExpression && myDetector.isStreamCall((PsiMethodCallExpression)parentCall)) { - final PsiMethodCallExpression parentCallExpression = (PsiMethodCallExpression)parentCall; + if (parentCall instanceof PsiMethodCallExpression parentCallExpression && myDetector.isStreamCall((PsiMethodCallExpression)parentCall)) { myPreviousCalls.put(parentCallExpression, expression); updateCallTree(parentCallExpression); } diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/EvaluateExpressionTracer.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/EvaluateExpressionTracer.java index 0de83d0a0001..62cd48771a52 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/EvaluateExpressionTracer.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/EvaluateExpressionTracer.java @@ -62,8 +62,7 @@ public class EvaluateExpressionTracer implements StreamTracer { if (reference instanceof ObjectReference) { final ReferenceType type = ((ObjectReference)reference).referenceType(); - if (type instanceof ClassType) { - ClassType classType = (ClassType)type; + if (type instanceof ClassType classType) { while (classType != null && !CommonClassNames.JAVA_LANG_THROWABLE.equals(classType.name())) { classType = classType.superclass(); } diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/CollectIdentityTraceInterpreter.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/CollectIdentityTraceInterpreter.java index d753e499e7f6..c34f2822da21 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/CollectIdentityTraceInterpreter.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/CollectIdentityTraceInterpreter.java @@ -27,12 +27,10 @@ public class CollectIdentityTraceInterpreter implements CallTraceInterpreter { @NotNull @Override public TraceInfo resolve(@NotNull StreamCall call, @NotNull Value value) { - if (!(value instanceof ArrayReference)) { + if (!(value instanceof ArrayReference array)) { throw new UnexpectedValueTypeException("Array reference expected. But " + value.type().name() + " received"); } - final ArrayReference array = (ArrayReference)value; - final TraceInfo resolved = myPeekResolver.resolve(call, array.getValue(0)); final Map before = resolved.getValuesOrderBefore(); if (before.isEmpty()) { diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/DistinctCallTraceInterpreter.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/DistinctCallTraceInterpreter.java index dcc645c49f3e..870e920f5a28 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/DistinctCallTraceInterpreter.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/DistinctCallTraceInterpreter.java @@ -48,13 +48,10 @@ public class DistinctCallTraceInterpreter implements CallTraceInterpreter { private static Map> resolve(@NotNull Value value, @NotNull TraceInfo order, @NotNull Direction direction) { - if (value instanceof ArrayReference) { - final ArrayReference convertedMap = (ArrayReference)value; + if (value instanceof ArrayReference convertedMap) { final Value keys = convertedMap.getValue(0); final Value values = convertedMap.getValue(1); - if (keys instanceof ArrayReference && values instanceof ArrayReference) { - final ArrayReference keysArray = (ArrayReference)keys; - final ArrayReference valuesArray = (ArrayReference)values; + if (keys instanceof ArrayReference keysArray && values instanceof ArrayReference valuesArray) { return Direction.DIRECT.equals(direction) ? resolveDirectTrace(keysArray, valuesArray, order) : resolveReverseTrace(keysArray, valuesArray, order); diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/MatchInterpreterBase.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/MatchInterpreterBase.java index a49c7869e68b..634a9bd3fa8f 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/MatchInterpreterBase.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/MatchInterpreterBase.java @@ -28,8 +28,7 @@ public abstract class MatchInterpreterBase implements CallTraceInterpreter { @NotNull @Override public TraceInfo resolve(@NotNull StreamCall call, @NotNull Value value) { - if (value instanceof ArrayReference) { - final ArrayReference array = (ArrayReference)value; + if (value instanceof ArrayReference array) { if (array.length() != 2) { throw new UnexpectedArrayLengthException("trace array for *match call should contain two items. Actual = " + array.length()); } diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/OptionalTraceInterpreter.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/OptionalTraceInterpreter.java index 4bf0940232e0..33e4aa325830 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/OptionalTraceInterpreter.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/OptionalTraceInterpreter.java @@ -46,11 +46,10 @@ public class OptionalTraceInterpreter implements CallTraceInterpreter { @Nullable private static Value getOptionalValue(@NotNull Value optionalTrace) { - if (!(optionalTrace instanceof ArrayReference)) { + if (!(optionalTrace instanceof ArrayReference trace)) { throw new UnexpectedValueTypeException("optional trace must be an array value"); } - final ArrayReference trace = (ArrayReference)optionalTrace; if (!optionalIsPresent(trace)) { return null; } diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/SimplePeekCallTraceInterpreter.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/SimplePeekCallTraceInterpreter.java index 2c3958b21b00..e461c54dd48f 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/SimplePeekCallTraceInterpreter.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/interpret/SimplePeekCallTraceInterpreter.java @@ -24,8 +24,7 @@ public class SimplePeekCallTraceInterpreter implements CallTraceInterpreter { @NotNull @Override public TraceInfo resolve(@NotNull StreamCall call, @NotNull Value value) { - if (value instanceof ArrayReference) { - final ArrayReference trace = (ArrayReference)value; + if (value instanceof ArrayReference trace) { final Value before = trace.getValue(0); final Value after = trace.getValue(1); if (before instanceof ArrayReference && after instanceof ArrayReference) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java index 501ae2a61c0f..0381dd7692bc 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java @@ -277,8 +277,7 @@ public class SvnAnnotationProvider implements AnnotationProvider, VcsCacheableAn @Override public VcsAnnotation createCacheable(FileAnnotation fileAnnotation) { - if (!(fileAnnotation instanceof SvnFileAnnotation)) return null; - final SvnFileAnnotation svnFileAnnotation = (SvnFileAnnotation)fileAnnotation; + if (!(fileAnnotation instanceof SvnFileAnnotation svnFileAnnotation)) return null; final AnnotationSourceSwitcher annotationSourceSwitcher = svnFileAnnotation.getAnnotationSourceSwitcher(); if (annotationSourceSwitcher != null) { annotationSourceSwitcher.switchTo(AnnotationSource.LOCAL); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SelectBranchPopup.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SelectBranchPopup.java index 504dbd81751d..ae6415d35ffd 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SelectBranchPopup.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SelectBranchPopup.java @@ -124,8 +124,7 @@ public final class SelectBranchPopup { @NotNull @Override public String getTextFor(@NotNull Object value) { - if (value instanceof Url) { - Url url = (Url)value; + if (value instanceof Url url) { String suffix = url.equals(myConfiguration.getTrunk()) ? " (" + TRUNK_NAME + ")" : ELLIPSIS; return url.getTail() + suffix; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TwoWaySslCallback.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TwoWaySslCallback.java index 116ab309785e..c7f913ebb898 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TwoWaySslCallback.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TwoWaySslCallback.java @@ -30,8 +30,7 @@ public class TwoWaySslCallback extends UsernamePasswordCallback { @Override public void updateParameters(@NotNull Command command) { - if (myAuthentication instanceof CertificateAuthenticationData) { - CertificateAuthenticationData auth = (CertificateAuthenticationData)myAuthentication; + if (myAuthentication instanceof CertificateAuthenticationData auth) { // TODO: Seems that config option should be specified for concrete server and not for global group. // as in that case it could be overriden by settings in config file diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/UsernamePasswordCallback.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/UsernamePasswordCallback.java index a40299e5f2c1..10fd5a3da716 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/UsernamePasswordCallback.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/UsernamePasswordCallback.java @@ -60,8 +60,7 @@ public class UsernamePasswordCallback extends AuthCallbackCase { @Override public void updateParameters(@NotNull Command command) { - if (myAuthentication instanceof PasswordAuthenticationData) { - PasswordAuthenticationData auth = (PasswordAuthenticationData)myAuthentication; + if (myAuthentication instanceof PasswordAuthenticationData auth) { command.put("--username"); command.put(auth.getUserName()); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java index 1e19a166dee6..013fa9d65192 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java @@ -145,8 +145,7 @@ public class SvnConfigureProxiesComponent extends MasterDetailsComponent { }); result.add(new MyDeleteAction(forAll(o -> { - if (o instanceof MyNode) { - final MyNode node = (MyNode)o; + if (o instanceof MyNode node) { if (node.getConfigurable() instanceof GroupConfigurable) { final ProxyGroup group = ((GroupConfigurable)node.getConfigurable()).getEditableObject(); return !group.isDefault(); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java index e0705f3d1362..5bfb120c86f8 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java @@ -152,8 +152,7 @@ public class RepositoryBrowserComponent extends JPanel implements Disposable, Da return null; } Object element = selection.getLastPathComponent(); - if (element instanceof RepositoryTreeNode) { - RepositoryTreeNode node = (RepositoryTreeNode)element; + if (element instanceof RepositoryTreeNode node) { return node.getSVNDirEntry(); } return null; @@ -172,8 +171,7 @@ public class RepositoryBrowserComponent extends JPanel implements Disposable, Da return null; } Object element = selection.getLastPathComponent(); - if (element instanceof RepositoryTreeNode) { - RepositoryTreeNode node = (RepositoryTreeNode)element; + if (element instanceof RepositoryTreeNode node) { return node.getURL(); } return null; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryTreeNode.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryTreeNode.java index b8127010f441..c21578b72224 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryTreeNode.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryTreeNode.java @@ -198,8 +198,7 @@ public class RepositoryTreeNode implements TreeNode, Disposable { myChildren.add(child); myChildrenLoadState = oldState; } - else if (child instanceof SimpleTextNode) { - SimpleTextNode node = (SimpleTextNode)child; + else if (child instanceof SimpleTextNode node) { myChildren.add(new SimpleTextNode(node.getText(), node.isError())); myChildrenLoadState = oldState; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.java index d43e4da25e27..6359975a1507 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.java @@ -115,8 +115,7 @@ public class SetPropertyDialog extends DialogWrapper { } }); Component editor = myPropertyNameBox.getEditor().getEditorComponent(); - if (editor instanceof JTextField) { - JTextField jTextField = (JTextField)editor; + if (editor instanceof JTextField jTextField) { jTextField.getDocument().addDocumentListener(new DocumentAdapter() { @Override protected void textChanged(@NotNull DocumentEvent e) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/WCInfo.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/WCInfo.java index 2a49c6b6bbd5..21fb5757084f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/WCInfo.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/WCInfo.java @@ -76,9 +76,7 @@ public class WCInfo { @Override public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof WCInfo)) return false; - - final WCInfo wcInfo = (WCInfo)o; + if (!(o instanceof WCInfo wcInfo)) return false; return getPath().equals(wcInfo.getPath()); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/AbstractOpeningExpander.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/AbstractOpeningExpander.java index 12e40224c166..6c71194822c4 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/AbstractOpeningExpander.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/AbstractOpeningExpander.java @@ -58,8 +58,7 @@ public abstract class AbstractOpeningExpander implements Expander { final Enumeration children = node.children(); while (children.hasMoreElements()) { final TreeNode treeNode = (TreeNode)children.nextElement(); - if (treeNode instanceof RepositoryTreeNode) { - final RepositoryTreeNode repositoryTreeNode = (RepositoryTreeNode)treeNode; + if (treeNode instanceof RepositoryTreeNode repositoryTreeNode) { Url childUrl = repositoryTreeNode.getURL(); if (checkChild(childUrl)) { if (mySelectionPath.equals(childUrl)) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browserCache/KeepingExpandedExpander.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browserCache/KeepingExpandedExpander.java index 2b6cd12ad47e..39a8f38d1b24 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browserCache/KeepingExpandedExpander.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browserCache/KeepingExpandedExpander.java @@ -35,8 +35,7 @@ public class KeepingExpandedExpander implements Expander { final Enumeration children = node.children(); while (children.hasMoreElements()) { final TreeNode treeNode = children.nextElement(); - if (treeNode instanceof RepositoryTreeNode) { - final RepositoryTreeNode repositoryNode = (RepositoryTreeNode) treeNode; + if (treeNode instanceof RepositoryTreeNode repositoryNode) { final List thirdLevelChildren = repositoryNode.getAllAlreadyLoadedChildren(); final String nodeName = repositoryNode.getSVNDirEntry().getName(); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnTreeConflictDiffRequestProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnTreeConflictDiffRequestProvider.java index dcbf6917e9ed..d34439c618fc 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnTreeConflictDiffRequestProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnTreeConflictDiffRequestProvider.java @@ -29,9 +29,7 @@ public class SvnTreeConflictDiffRequestProvider implements ChangeDiffRequestProv @NotNull @Override public ThreeState isEquals(@NotNull Change change1, @NotNull Change change2) { - if (change1 instanceof ConflictedSvnChange && change2 instanceof ConflictedSvnChange) { - ConflictedSvnChange conflict1 = (ConflictedSvnChange)change1; - ConflictedSvnChange conflict2 = (ConflictedSvnChange)change2; + if (change1 instanceof ConflictedSvnChange conflict1 && change2 instanceof ConflictedSvnChange conflict2) { if (!conflict1.isTreeConflict() && !conflict2.isTreeConflict()) return ThreeState.UNSURE; if (!conflict1.isTreeConflict() || !conflict2.isTreeConflict()) return ThreeState.NO; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java index fa57694b9159..6358eb06c358 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java @@ -354,8 +354,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator { @Override public boolean report(@NotNull CommittedChangeList list) { - if (list instanceof SvnChangeList) { - final SvnChangeList svnList = (SvnChangeList)list; + if (list instanceof SvnChangeList svnList) { final String wcPath = svnList.getWcPath(); if (wcPath != null) { final CommittedChangeListsListener refresher = refreshers.get(ensureEndsWithSeparator(wcPath)); @@ -618,10 +617,9 @@ public class RootsAndBranches implements CommittedChangeListDecorator { private SvnMergeInfoRootPanelManual getPanelData(final List listsList) { for (CommittedChangeList list : listsList) { - if (!(list instanceof SvnChangeList)) { + if (!(list instanceof SvnChangeList svnList)) { return null; } - final SvnChangeList svnList = (SvnChangeList)list; final String wcPath = svnList.getWcPath(); if (wcPath == null) { continue; @@ -633,11 +631,10 @@ public class RootsAndBranches implements CommittedChangeListDecorator { @Nullable public ListMergeStatus getStatus(final CommittedChangeList list, final boolean ignoreEnabled) { - if (!(list instanceof SvnChangeList)) { + if (!(list instanceof SvnChangeList svnList)) { return null; } - final SvnChangeList svnList = (SvnChangeList)list; final String wcPath = svnList.getWcPath(); MergeInfoHolder holder = null; if (wcPath == null) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java index a37c3dee6fad..49480a92216b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java @@ -488,8 +488,7 @@ public class ToBeMergedDialog extends DialogWrapper { myRenderer.setBackground(null); // 7-8, a hack - if (value instanceof SvnChangeList) { - final SvnChangeList changeList = (SvnChangeList)value; + if (value instanceof SvnChangeList changeList) { myRenderer.renderChangeList(table, changeList); final Color bg = selected ? UIUtil.getTableSelectionBackground(true) : UIUtil.getTableBackground(); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java index af55c90130c1..4161507d8233 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java @@ -255,8 +255,7 @@ public final class MergeFromTheirsResolver extends BackgroundTaskGroup { } private void processBinaryChangeError(@NotNull Throwable error) throws VcsException { - if (error instanceof VcsException) { - VcsException vcsError = (VcsException)error; + if (error instanceof VcsException vcsError) { if (vcsError.isWarning()) { addError(vcsError); } diff --git a/plugins/tasks/tasks-api/src/com/intellij/tasks/impl/BaseRepository.java b/plugins/tasks/tasks-api/src/com/intellij/tasks/impl/BaseRepository.java index 87d643fb361e..11ba091022c9 100644 --- a/plugins/tasks/tasks-api/src/com/intellij/tasks/impl/BaseRepository.java +++ b/plugins/tasks/tasks-api/src/com/intellij/tasks/impl/BaseRepository.java @@ -115,11 +115,9 @@ public abstract class BaseRepository extends TaskRepository { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof BaseRepository)) return false; + if (!(o instanceof BaseRepository that)) return false; if (!super.equals(o)) return false; - BaseRepository that = (BaseRepository)o; - if (!Objects.equals(getUrl(), that.getUrl())) return false; if (!Objects.equals(getPassword(), that.getPassword())) return false; if (!Objects.equals(getUsername(), that.getUsername())) return false; diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepository.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepository.java index 127c75cf4825..4fb3e0f2c6ce 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepository.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepository.java @@ -90,9 +90,7 @@ public class JiraRepository extends BaseRepositoryImpl { @Override public boolean equals(Object o) { if (!super.equals(o)) return false; - if (!(o instanceof JiraRepository)) return false; - - JiraRepository repository = (JiraRepository)o; + if (!(o instanceof JiraRepository repository)) return false; if (!Objects.equals(mySearchQuery, repository.getSearchQuery())) return false; if (!Objects.equals(myJiraVersion, repository.getJiraVersion())) return false; diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlAnnotator.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlAnnotator.java index eea9fbcfcc11..c6b1c5874f99 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlAnnotator.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlAnnotator.java @@ -54,8 +54,7 @@ public class JqlAnnotator implements Annotator { } boolean operandIsListLiteral = operand instanceof JqlList; boolean operandIsListFunction = false; - if (operand instanceof JqlFunctionCall) { - JqlFunctionCall functionCall = (JqlFunctionCall)operand; + if (operand instanceof JqlFunctionCall functionCall) { JqlStandardFunction standardFunction = JqlStandardFunction.byName(functionCall.getFunctionName().getText()); operandIsListFunction = standardFunction != null && standardFunction.hasMultipleResults(); } diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlCompletionContributor.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlCompletionContributor.java index 8168c627be05..06c34110b663 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlCompletionContributor.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlCompletionContributor.java @@ -30,8 +30,7 @@ public class JqlCompletionContributor extends CompletionContributor { private static final FilterPattern BEGINNING_OF_LINE = new FilterPattern(new ElementFilter() { @Override public boolean isAcceptable(Object element, @Nullable PsiElement context) { - if (!(element instanceof PsiElement)) return false; - PsiElement p = (PsiElement)element; + if (!(element instanceof PsiElement p)) return false; PsiFile file = p.getContainingFile().getOriginalFile(); char[] chars = file.textToCharArray(); for (int offset = p.getTextOffset() - 1; offset >= 0; offset--) { diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/bugzilla/BugzillaRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/bugzilla/BugzillaRepository.java index aa7f125c6d6a..53818fa5aed7 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/bugzilla/BugzillaRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/bugzilla/BugzillaRepository.java @@ -435,8 +435,7 @@ public class BugzillaRepository extends BaseRepositoryImpl { public boolean equals(Object o) { if (!super.equals(o)) return false; - if (!(o instanceof BugzillaRepository)) return false; - BugzillaRepository repository = (BugzillaRepository)o; + if (!(o instanceof BugzillaRepository repository)) return false; if (!Objects.equals(myProductName, repository.getProductName())) return false; if (!Objects.equals(myComponentName, repository.getComponentName())) return false; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/GenericRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/GenericRepository.java index 481431462a59..cc2a0e1c74eb 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/GenericRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/GenericRepository.java @@ -145,9 +145,8 @@ public class GenericRepository extends BaseRepositoryImpl { @Override public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof GenericRepository)) return false; + if (!(o instanceof GenericRepository that)) return false; if (!super.equals(o)) return false; - GenericRepository that = (GenericRepository)o; if (!Objects.equals(getLoginUrl(), that.getLoginUrl())) return false; if (!Objects.equals(getTasksListUrl(), that.getTasksListUrl())) return false; if (!Objects.equals(getSingleTaskUrl(), that.getSingleTaskUrl())) return false; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/SelectorBasedResponseHandler.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/SelectorBasedResponseHandler.java index 70451d0dfacf..4d71bb5bcf4b 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/SelectorBasedResponseHandler.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/SelectorBasedResponseHandler.java @@ -141,9 +141,7 @@ public abstract class SelectorBasedResponseHandler extends ResponseHandler { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof SelectorBasedResponseHandler)) return false; - - SelectorBasedResponseHandler handler = (SelectorBasedResponseHandler)o; + if (!(o instanceof SelectorBasedResponseHandler handler)) return false; if (!mySelectors.equals(handler.mySelectors)) return false; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java index 7477bd11fa80..611417c285a0 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java @@ -293,9 +293,8 @@ public class LighthouseRepository extends BaseRepositoryImpl { @Override public boolean equals(Object o) { if (!super.equals(o)) return false; - if (!(o instanceof LighthouseRepository)) return false; + if (!(o instanceof LighthouseRepository that)) return false; - LighthouseRepository that = (LighthouseRepository)o; if (getProjectId() != null ? !getProjectId().equals(that.getProjectId()) : that.getProjectId() != null) return false; return true; } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepository.java index f855390260ad..0d21794127f3 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepository.java @@ -209,9 +209,8 @@ public class PivotalTrackerRepository extends NewBaseRepositoryImpl { @Override public boolean equals(final Object o) { if (!super.equals(o)) return false; - if (!(o instanceof PivotalTrackerRepository)) return false; + if (!(o instanceof PivotalTrackerRepository that)) return false; - final PivotalTrackerRepository that = (PivotalTrackerRepository)o; if (getProjectId() != null ? !getProjectId().equals(that.getProjectId()) : that.getProjectId() != null) return false; return true; } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepository.java index 5bac40faa2b2..9d7e75eccf4b 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepository.java @@ -101,8 +101,7 @@ public class RedmineRepository extends NewBaseRepositoryImpl { @Override public boolean equals(Object o) { if (!super.equals(o)) return false; - if (!(o instanceof RedmineRepository)) return false; - RedmineRepository that = (RedmineRepository)o; + if (!(o instanceof RedmineRepository that)) return false; if (!Objects.equals(getAPIKey(), that.getAPIKey())) return false; if (!Comparing.equal(getCurrentProject(), that.getCurrentProject())) return false; if (isAssignedToMe() != that.isAssignedToMe()) return false; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineProject.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineProject.java index f07c750b659a..fc9f40577629 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineProject.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/model/RedmineProject.java @@ -24,9 +24,7 @@ public class RedmineProject { @Override public final boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof RedmineProject)) return false; - - RedmineProject project = (RedmineProject)o; + if (!(o instanceof RedmineProject project)) return false; return id == project.id; } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java index 2d0716055ad8..85da05c6022d 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java @@ -365,8 +365,7 @@ public final class TrelloRepository extends NewBaseRepositoryImpl { @Override public void process(HttpRequest request, HttpContext context) throws HttpException, IOException { // pass - if (request instanceof HttpRequestWrapper) { - final HttpRequestWrapper wrapper = (HttpRequestWrapper)request; + if (request instanceof HttpRequestWrapper wrapper) { try { wrapper.setURI(new URIBuilder(wrapper.getURI()) .addParameter("token", myPassword) diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/model/TrelloModel.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/model/TrelloModel.java index 95a56b52906d..572e69dad179 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/model/TrelloModel.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/model/TrelloModel.java @@ -62,8 +62,7 @@ public abstract class TrelloModel { @Override public final boolean equals(Object obj) { if (obj == this) return true; - if (!(obj instanceof TrelloModel)) return false; - TrelloModel model = (TrelloModel) obj; + if (!(obj instanceof TrelloModel model)) return false; return !id.equals(ILLEGAL_ID) && id.equals(model.id); } diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalUtil.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalUtil.java index d4e9ae2c4207..9a314ac42245 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalUtil.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalUtil.java @@ -42,8 +42,7 @@ public final class TerminalUtil { }); return !pidToChildPidsMap.get(shellPid).isEmpty(); } - if (SystemInfo.isWindows && process instanceof WinPtyProcess) { - WinPtyProcess winPty = (WinPtyProcess)process; + if (SystemInfo.isWindows && process instanceof WinPtyProcess winPty) { try { String executable = FileUtil.toSystemIndependentName(StringUtil.notNullize(getExecutable(winPty))); int consoleProcessCount = winPty.getConsoleProcessCount(); @@ -56,8 +55,7 @@ public final class TerminalUtil { throw new IllegalStateException(e); } } - if (process instanceof WinConPtyProcess) { - WinConPtyProcess conPtyProcess = (WinConPtyProcess)process; + if (process instanceof WinConPtyProcess conPtyProcess) { try { String executable = FileUtil.toSystemIndependentName(StringUtil.notNullize(ContainerUtil.getFirstItem(conPtyProcess.getCommand()))); int consoleProcessCount = conPtyProcess.getConsoleProcessCount(); diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java index 6cb76c5e89ff..4a08ae64f43c 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java @@ -443,11 +443,10 @@ public class TestNGConfiguration extends JavaTestConfigurationWithDiscoverySuppo return RunConfigurationExtension.wrapRefactoringElementListener(element, this, listener); } else if (data.TEST_OBJECT.equals(TestType.METHOD.getType())) { - if (!(element instanceof PsiMethod)) { + if (!(element instanceof PsiMethod method)) { final RefactoringElementListener listener = RefactoringListeners.getClassOrPackageListener(element, myClass); return RunConfigurationExtension.wrapRefactoringElementListener(element, this, listener); } - final PsiMethod method = (PsiMethod)element; if (!method.getName().equals(data.getMethodName())) return null; if (!method.getContainingClass().equals(myClass.getPsiElement())) return null; class Listener extends RefactoringElementAdapter implements UndoRefactoringElementListener { diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertJavadocInspection.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertJavadocInspection.java index 0083816821ec..0d2c2d3a699a 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertJavadocInspection.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertJavadocInspection.java @@ -163,8 +163,7 @@ public class ConvertJavadocInspection extends AbstractBaseJavaLocalInspectionToo for (PsiElement element : docComment.getChildren()) { //if it's anything other than a doc token, then it must stay if (element instanceof PsiWhiteSpace) continue; - if (!(element instanceof PsiDocToken)) return; - PsiDocToken docToken = (PsiDocToken)element; + if (!(element instanceof PsiDocToken docToken)) return; if (docToken.getTokenType() == JavaDocTokenType.DOC_COMMENT_DATA && !docToken.getText().trim().isEmpty()) { return; } diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/ExpectedExceptionNeverThrownTestNGInspection.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/ExpectedExceptionNeverThrownTestNGInspection.java index ea60e93c26c2..c4240cf92876 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/ExpectedExceptionNeverThrownTestNGInspection.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/ExpectedExceptionNeverThrownTestNGInspection.java @@ -50,8 +50,7 @@ public class ExpectedExceptionNeverThrownTestNGInspection extends AbstractBaseJa if (value instanceof PsiClassObjectAccessExpression) { checkAnnotationMemberValue(value, method, exceptionsThrown); } - else if (value instanceof PsiArrayInitializerMemberValue) { - final PsiArrayInitializerMemberValue arrayInitializerMemberValue = (PsiArrayInitializerMemberValue)value; + else if (value instanceof PsiArrayInitializerMemberValue arrayInitializerMemberValue) { for (PsiAnnotationMemberValue memberValue : arrayInitializerMemberValue.getInitializers()) { checkAnnotationMemberValue(memberValue, method, exceptionsThrown); } @@ -60,16 +59,14 @@ public class ExpectedExceptionNeverThrownTestNGInspection extends AbstractBaseJa private void checkAnnotationMemberValue(PsiAnnotationMemberValue annotationMemberValue, PsiMethod method, List exceptionsThrown) { - if (!(annotationMemberValue instanceof PsiClassObjectAccessExpression)) { + if (!(annotationMemberValue instanceof PsiClassObjectAccessExpression classObjectAccessExpression)) { return; } - final PsiClassObjectAccessExpression classObjectAccessExpression = (PsiClassObjectAccessExpression)annotationMemberValue; final PsiTypeElement operand = classObjectAccessExpression.getOperand(); final PsiType type = operand.getType(); - if (!(type instanceof PsiClassType)) { + if (!(type instanceof PsiClassType expectedType)) { return; } - final PsiClassType expectedType = (PsiClassType)type; if (InheritanceUtil.isInheritor(expectedType, CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION)) { return; } diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/JUnitConvertTool.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/JUnitConvertTool.java index da16da4b4a58..b14d036c21e6 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/JUnitConvertTool.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/JUnitConvertTool.java @@ -218,8 +218,7 @@ public class JUnitConvertTool extends AbstractBaseJavaLocalInspectionTool { @Override public void visitExpressionStatement(@NotNull PsiExpressionStatement statement) { PsiExpression expression = statement.getExpression(); - if (expression instanceof PsiMethodCallExpression) { - PsiMethodCallExpression methodCall = (PsiMethodCallExpression)expression; + if (expression instanceof PsiMethodCallExpression methodCall) { if (methodCall.getArgumentList().getExpressionCount() == 1) { PsiMethod resolved = methodCall.resolveMethod(); if (resolved != null && "junit.framework.TestCase".equals(resolved.getContainingClass().getQualifiedName()) && diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/MalformedDataProviderInspection.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/MalformedDataProviderInspection.java index 4ed727e2c064..d4c2256f3418 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/MalformedDataProviderInspection.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/MalformedDataProviderInspection.java @@ -38,7 +38,7 @@ public class MalformedDataProviderInspection extends AbstractBaseJavaLocalInspec final PsiElement element = reference.getElement(); final PsiClass topLevelClass = PsiUtil.getTopLevelClass(element); final PsiClass providerClass = TestNGUtil.getProviderClass(element, topLevelClass); - if (!(dataProviderMethod instanceof PsiMethod)) { + if (!(dataProviderMethod instanceof PsiMethod providerMethod)) { final LocalQuickFix[] fixes; if (isOnTheFly && providerClass != null) { fixes = new LocalQuickFix[] {createMethodFix(provider, providerClass, topLevelClass)}; @@ -52,7 +52,6 @@ public class MalformedDataProviderInspection extends AbstractBaseJavaLocalInspec if (TestNGUtil.isVersionOrGreaterThan(holder.getProject(), ModuleUtilCore.findModuleForPsiElement(providerClass), 6, 9, 13)) { break; } - final PsiMethod providerMethod = (PsiMethod)dataProviderMethod; if (providerClass != topLevelClass && !providerMethod.hasModifierProperty(PsiModifier.STATIC)) { holder.registerProblem(provider, TestngBundle.message("inspection.testng.data.provider.need.to.be.static")); } diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGCanBeStaticExtension.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGCanBeStaticExtension.java index dc56d35cd700..27e99bf90ed8 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGCanBeStaticExtension.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGCanBeStaticExtension.java @@ -24,8 +24,7 @@ import com.theoryinpractice.testng.util.TestNGUtil; public class TestNGCanBeStaticExtension implements Condition { @Override public boolean value(PsiElement member) { - if (member instanceof PsiMethod) { - PsiMethod method = (PsiMethod)member; + if (member instanceof PsiMethod method) { return TestNGUtil.hasTest(method, false) || TestNGUtil.hasConfig(method); } return false; diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java index 2eb9b324f995..3bf4c7b667b3 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java +++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java @@ -111,10 +111,9 @@ public class TestData implements Cloneable @Override public boolean equals(Object obj) { - if (!(obj instanceof TestData)) { + if (!(obj instanceof TestData data)) { return false; } else { - TestData data = (TestData) obj; return Objects.equals(TEST_OBJECT, data.TEST_OBJECT) && Objects.equals(getMainClassName(), data.getMainClassName()) && Objects.equals(getPackageName(), data.getPackageName()) diff --git a/plugins/testng/src/com/theoryinpractice/testng/ui/actions/RerunFailedTestsAction.java b/plugins/testng/src/com/theoryinpractice/testng/ui/actions/RerunFailedTestsAction.java index d2ac76119db2..7d924c54940d 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/ui/actions/RerunFailedTestsAction.java +++ b/plugins/testng/src/com/theoryinpractice/testng/ui/actions/RerunFailedTestsAction.java @@ -93,8 +93,7 @@ public class RerunFailedTestsAction extends JavaRerunFailedTestsAction { final Location location = proxy.getLocation(project, scope); if (location != null) { final PsiElement element = location.getPsiElement(); - if (element instanceof PsiMethod && element.isValid()) { - final PsiMethod psiMethod = (PsiMethod)element; + if (element instanceof PsiMethod psiMethod && element.isValid()) { PsiClass psiClass = psiMethod.getContainingClass(); if (psiClass != null && psiClass.hasModifierProperty(PsiModifier.ABSTRACT)) { final AbstractTestProxy parent = proxy.getParent(); diff --git a/plugins/ui-designer-core/src/com/intellij/designer/AbstractToolWindowManager.java b/plugins/ui-designer-core/src/com/intellij/designer/AbstractToolWindowManager.java index 433b9f5e3b28..b590e6313849 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/AbstractToolWindowManager.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/AbstractToolWindowManager.java @@ -19,8 +19,7 @@ public abstract class AbstractToolWindowManager extends LightToolWindowManager { @Nullable @Override protected DesignerEditorPanelFacade getDesigner(FileEditor editor) { - if (editor instanceof DesignerEditor) { - DesignerEditor designerEditor = (DesignerEditor)editor; + if (editor instanceof DesignerEditor designerEditor) { return designerEditor.getDesignerPanel(); } return null; diff --git a/plugins/ui-designer-core/src/com/intellij/designer/DesignerEditorState.java b/plugins/ui-designer-core/src/com/intellij/designer/DesignerEditorState.java index c2c36353e1dd..43459ffe929f 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/DesignerEditorState.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/DesignerEditorState.java @@ -41,8 +41,7 @@ public class DesignerEditorState implements FileEditorState { if (this == object) { return true; } - if (object instanceof DesignerEditorState) { - DesignerEditorState state = (DesignerEditorState)object; + if (object instanceof DesignerEditorState state) { return myModificationStamp == state.myModificationStamp && myZoom == state.myZoom; } return false; diff --git a/plugins/ui-designer-core/src/com/intellij/designer/actions/CommonEditActionsProvider.java b/plugins/ui-designer-core/src/com/intellij/designer/actions/CommonEditActionsProvider.java index 3f02aad2e5bc..4cafa7bf5750 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/actions/CommonEditActionsProvider.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/actions/CommonEditActionsProvider.java @@ -246,8 +246,7 @@ public class CommonEditActionsProvider implements DeleteProvider, CopyProvider, private String getSerializedComponentData() { try { Object transferData = CopyPasteManager.getInstance().getContents(DATA_FLAVOR); - if (transferData instanceof SerializedComponentData) { - SerializedComponentData data = (SerializedComponentData)transferData; + if (transferData instanceof SerializedComponentData data) { String xmlComponents = data.getSerializedComponents(); if (xmlComponents.startsWith("")) { return xmlComponents; diff --git a/plugins/ui-designer-core/src/com/intellij/designer/componentTree/ComponentTree.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/ComponentTree.java index c16dd68fbf9f..316184fa1d38 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/componentTree/ComponentTree.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/ComponentTree.java @@ -143,8 +143,7 @@ public final class ComponentTree extends Tree implements DataProvider { DefaultMutableTreeNode node = (DefaultMutableTreeNode)value; Object userObject = node.getUserObject(); - if (myDesigner != null && userObject instanceof TreeNodeDescriptor) { - TreeNodeDescriptor descriptor = (TreeNodeDescriptor)userObject; + if (myDesigner != null && userObject instanceof TreeNodeDescriptor descriptor) { Object element = descriptor.getElement(); if (element instanceof RadComponent) { diff --git a/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeContentProvider.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeContentProvider.java index d62af8e7bf6b..b945a4749404 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeContentProvider.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeContentProvider.java @@ -43,8 +43,7 @@ public final class TreeContentProvider extends AbstractTreeStructure { if (element == myTreeRoot) { return myDesigner.getTreeRoots(); } - if (element instanceof RadComponent) { - RadComponent component = (RadComponent)element; + if (element instanceof RadComponent component) { return component.getTreeChildren(); } throw new IllegalArgumentException("Unknown element: " + element); @@ -52,8 +51,7 @@ public final class TreeContentProvider extends AbstractTreeStructure { @Override public Object getParentElement(@NotNull Object element) { - if (element instanceof RadComponent) { - RadComponent component = (RadComponent)element; + if (element instanceof RadComponent component) { return component.getParent(); } return null; diff --git a/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeDropListener.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeDropListener.java index 5b9c6c4e8e52..994c8b2395d4 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeDropListener.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeDropListener.java @@ -118,9 +118,8 @@ public class TreeDropListener extends DropTargetAdapter { return; } - if (myToolProvider.getActiveTool() instanceof CreationTool) { + if (myToolProvider.getActiveTool() instanceof CreationTool tool) { myContext.setType(OperationContext.CREATE); - CreationTool tool = (CreationTool)myToolProvider.getActiveTool(); try { myContext.setComponents(Collections.singletonList(tool.getFactory().create())); } diff --git a/plugins/ui-designer-core/src/com/intellij/designer/model/RadVisualComponent.java b/plugins/ui-designer-core/src/com/intellij/designer/model/RadVisualComponent.java index c06402bb77b1..1619207066a8 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/model/RadVisualComponent.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/model/RadVisualComponent.java @@ -40,8 +40,7 @@ public abstract class RadVisualComponent extends RadComponent { @Override public Rectangle fromModel(@NotNull Component target, @NotNull Rectangle bounds) { - if (target != myNativeComponent && myNativeComponent instanceof ScalableComponent) { - ScalableComponent scalableComponent = (ScalableComponent)myNativeComponent; + if (target != myNativeComponent && myNativeComponent instanceof ScalableComponent scalableComponent) { double zoom = scalableComponent.getScale(); if (zoom != 1) { @@ -63,8 +62,7 @@ public abstract class RadVisualComponent extends RadComponent { Rectangle bounds = myNativeComponent == source ? new Rectangle(rectangle) : SwingUtilities.convertRectangle(source, rectangle, myNativeComponent); - if (myNativeComponent != source && myNativeComponent instanceof ScalableComponent) { - ScalableComponent scalableComponent = (ScalableComponent)myNativeComponent; + if (myNativeComponent != source && myNativeComponent instanceof ScalableComponent scalableComponent) { double zoom = scalableComponent.getScale(); if (zoom != 1) { @@ -81,8 +79,7 @@ public abstract class RadVisualComponent extends RadComponent { @Override public Point fromModel(@NotNull Component target, @NotNull Point point) { - if (target != myNativeComponent && myNativeComponent instanceof ScalableComponent) { - ScalableComponent scalableComponent = (ScalableComponent)myNativeComponent; + if (target != myNativeComponent && myNativeComponent instanceof ScalableComponent scalableComponent) { double zoom = scalableComponent.getScale(); if (zoom != 1) { @@ -102,8 +99,7 @@ public abstract class RadVisualComponent extends RadComponent { Point p = myNativeComponent == source ? new Point(point) : SwingUtilities.convertPoint(source, point, myNativeComponent); - if (myNativeComponent != source && myNativeComponent instanceof ScalableComponent) { - ScalableComponent scalableComponent = (ScalableComponent)myNativeComponent; + if (myNativeComponent != source && myNativeComponent instanceof ScalableComponent scalableComponent) { double zoom = scalableComponent.getScale(); if (zoom != 1) { @@ -120,8 +116,7 @@ public abstract class RadVisualComponent extends RadComponent { public Dimension fromModel(@NotNull Component target, @NotNull Dimension size) { size = new Dimension(size); - if (target != myNativeComponent && myNativeComponent instanceof ScalableComponent) { - ScalableComponent scalableComponent = (ScalableComponent)myNativeComponent; + if (target != myNativeComponent && myNativeComponent instanceof ScalableComponent scalableComponent) { double zoom = scalableComponent.getScale(); if (zoom != 1) { @@ -137,8 +132,7 @@ public abstract class RadVisualComponent extends RadComponent { public Dimension toModel(@NotNull Component source, @NotNull Dimension size) { size = new Dimension(size); - if (myNativeComponent != source && myNativeComponent instanceof ScalableComponent) { - ScalableComponent scalableComponent = (ScalableComponent)myNativeComponent; + if (myNativeComponent != source && myNativeComponent instanceof ScalableComponent scalableComponent) { double zoom = scalableComponent.getScale(); if (zoom != 1) { @@ -158,8 +152,7 @@ public abstract class RadVisualComponent extends RadComponent { public Point convertPoint(Component relativeFrom, int x, int y) { Point p = myNativeComponent == relativeFrom ? new Point(x, y) : SwingUtilities.convertPoint(relativeFrom, x, y, myNativeComponent); - if (myNativeComponent != relativeFrom && myNativeComponent instanceof ScalableComponent) { - ScalableComponent scalableComponent = (ScalableComponent)myNativeComponent; + if (myNativeComponent != relativeFrom && myNativeComponent instanceof ScalableComponent scalableComponent) { double zoom = scalableComponent.getScale(); if (zoom != 1) { diff --git a/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteContainer.java b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteContainer.java index 2468bde9cc51..be5bc35d9cf5 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteContainer.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteContainer.java @@ -64,8 +64,7 @@ public class PaletteContainer extends JPanel implements Scrollable { int height = 0; for (Component component : parent.getComponents()) { - if (component instanceof PaletteGroupComponent) { - PaletteGroupComponent groupComponent = (PaletteGroupComponent)component; + if (component instanceof PaletteGroupComponent groupComponent) { groupComponent.setLocation(0, height); if (groupComponent.isVisible()) { int groupHeight = groupComponent.getPreferredSize().height; @@ -91,8 +90,7 @@ public class PaletteContainer extends JPanel implements Scrollable { int height = 0; for (Component component : parent.getComponents()) { - if (component instanceof PaletteGroupComponent) { - PaletteGroupComponent groupComponent = (PaletteGroupComponent)component; + if (component instanceof PaletteGroupComponent groupComponent) { height += groupComponent.getHeight(); if (groupComponent.isSelected()) { height += groupComponent.getItemsComponent().getPreferredHeight(width); diff --git a/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteGroupComponent.java b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteGroupComponent.java index df3eaf279acf..5e7c66e2326e 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteGroupComponent.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteGroupComponent.java @@ -109,8 +109,7 @@ public class PaletteGroupComponent extends JCheckBox { Component next = myMoveDown ? policy.getComponentAfter(container, PaletteGroupComponent.this) : policy.getComponentBefore(container, PaletteGroupComponent.this); - if (next instanceof PaletteItemsComponent) { - PaletteItemsComponent list = (PaletteItemsComponent)next; + if (next instanceof PaletteItemsComponent list) { if (list.getModel().getSize() != 0) { list.takeFocusFrom(list == myItemsComponent ? 0 : -1); return; diff --git a/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/renderers/ColorIcon.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/renderers/ColorIcon.java index 40e604db0412..4def2ffbcbcb 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/renderers/ColorIcon.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/renderers/ColorIcon.java @@ -49,8 +49,7 @@ public final class ColorIcon extends EmptyIcon { int iconWidth = getIconWidth(); int iconHeight = getIconHeight(); - if (component instanceof SimpleColoredComponent) { - SimpleColoredComponent coloredComponent = (SimpleColoredComponent)component; + if (component instanceof SimpleColoredComponent coloredComponent) { g.setColor(component.getBackground()); g.fillRect(left - coloredComponent.getIpad().left, 0, iconWidth + coloredComponent.getIpad().left + coloredComponent.getIconTextGap(), component.getHeight()); diff --git a/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteContentWindow.java b/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteContentWindow.java index 15161efe0d20..7a9afba76977 100644 --- a/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteContentWindow.java +++ b/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteContentWindow.java @@ -61,8 +61,7 @@ public class PaletteContentWindow extends JPanel implements Scrollable { int height = 0; for(Component c: parent.getComponents()) { - if (c instanceof PaletteGroupHeader) { - PaletteGroupHeader groupHeader = (PaletteGroupHeader) c; + if (c instanceof PaletteGroupHeader groupHeader) { groupHeader.setLocation(0, height); if (groupHeader.isVisible()) { groupHeader.setSize(width, groupHeader.getPreferredSize().height); @@ -91,8 +90,7 @@ public class PaletteContentWindow extends JPanel implements Scrollable { int height = 0; int width = parent.getWidth(); for(Component c: parent.getComponents()) { - if (c instanceof PaletteGroupHeader) { - PaletteGroupHeader groupHeader = (PaletteGroupHeader) c; + if (c instanceof PaletteGroupHeader groupHeader) { height += groupHeader.getHeight(); if (groupHeader.isSelected()) { height += groupHeader.getComponentList().getPreferredHeight(width); diff --git a/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java b/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java index 398fe34ec5a3..02510af3ff92 100644 --- a/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java +++ b/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java @@ -169,8 +169,7 @@ public class PaletteGroupHeader extends JCheckBox implements DataProvider { if (null == policy) policy = kfm.getDefaultFocusTraversalPolicy(); Component next = moveDown ? policy.getComponentAfter(container, PaletteGroupHeader.this) : policy.getComponentBefore(container, PaletteGroupHeader.this); - if (next instanceof PaletteComponentList) { - final PaletteComponentList list = (PaletteComponentList)next; + if (next instanceof PaletteComponentList list) { if (list.getModel().getSize() != 0) { list.takeFocusFrom(PaletteGroupHeader.this, list == myComponentList ? 0 : -1); return; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/AbstractToolWindowManager.java b/plugins/ui-designer/src/com/intellij/uiDesigner/AbstractToolWindowManager.java index e6cb4b06de4f..8d9543631cb8 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/AbstractToolWindowManager.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/AbstractToolWindowManager.java @@ -23,8 +23,7 @@ public abstract class AbstractToolWindowManager extends LightToolWindowManager { @Nullable @Override protected DesignerEditorPanelFacade getDesigner(FileEditor editor) { - if (editor instanceof UIFormEditor) { - UIFormEditor formEditor = (UIFormEditor)editor; + if (editor instanceof UIFormEditor formEditor) { return formEditor.getEditor(); } return null; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/CutCopyPasteSupport.java b/plugins/ui-designer/src/com/intellij/uiDesigner/CutCopyPasteSupport.java index fbc1631b14ea..de4e350cf33a 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/CutCopyPasteSupport.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/CutCopyPasteSupport.java @@ -199,11 +199,10 @@ public final class CutCopyPasteSupport implements CopyProvider, CutProvider, Pas private static String getSerializedComponents() { try { final Object transferData = CopyPasteManager.getInstance().getContents(ourDataFlavor); - if (!(transferData instanceof SerializedComponentData)) { + if (!(transferData instanceof SerializedComponentData dataProxy)) { return null; } - final SerializedComponentData dataProxy = (SerializedComponentData)transferData; return dataProxy.getSerializedComponents(); } catch (Exception e) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/ErrorAnalyzer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/ErrorAnalyzer.java index 2041424d0403..cbbad2b5c8b6 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/ErrorAnalyzer.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/ErrorAnalyzer.java @@ -147,13 +147,11 @@ public final class ErrorAnalyzer { // Clear previous error (if any) component.putClientProperty(CLIENT_PROP_ERROR_ARRAY, null); - if (!(component instanceof IContainer)) { + if (!(component instanceof IContainer container)) { return true; } - final IContainer container = (IContainer)component; - if (container instanceof IRootContainer) { - final IRootContainer rootContainer = (IRootContainer)container; + if (container instanceof IRootContainer rootContainer) { if (rootContainer.getComponentCount() > 1) { // TODO[vova] implement putError(component, new ErrorInfo( diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/FormEditingUtil.java b/plugins/ui-designer/src/com/intellij/uiDesigner/FormEditingUtil.java index 16c3e0d4ee43..f5d09675f4ec 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/FormEditingUtil.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/FormEditingUtil.java @@ -136,8 +136,7 @@ public final class FormEditingUtil { public boolean visit(final IComponent component) { RadComponent rc = (RadComponent)component; for (IProperty p : component.getModifiedProperties()) { - if (p instanceof IntroComponentProperty) { - IntroComponentProperty icp = (IntroComponentProperty)p; + if (p instanceof IntroComponentProperty icp) { final String value = icp.getValue(rc); if (deletedComponentIds.contains(value)) { try { @@ -465,12 +464,10 @@ public final class FormEditingUtil { return false; } - if (!(component instanceof IContainer)) { + if (!(component instanceof IContainer container)) { return true; } - final IContainer container = (IContainer)component; - for (int i = 0; i < container.getComponentCount(); i++) { final IComponent c = container.getComponent(i); if (!iterateImpl(c, visitor)) { @@ -877,11 +874,10 @@ public final class FormEditingUtil { if (id.equals(component.getId())) { return component; } - if (!(component instanceof IContainer)) { + if (!(component instanceof IContainer uiContainer)) { return null; } - final IContainer uiContainer = (IContainer)component; for (int i = 0; i < uiContainer.getComponentCount(); i++) { final IComponent found = findComponent(uiContainer.getComponent(i), id); if (found != null) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/GridBuildUtil.java b/plugins/ui-designer/src/com/intellij/uiDesigner/GridBuildUtil.java index d9300ddc4005..4e79f63c3ad2 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/GridBuildUtil.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/GridBuildUtil.java @@ -37,10 +37,9 @@ public final class GridBuildUtil { if (selection.size() != 1){ return; } - if (!(selection.get(0) instanceof RadContainer)) { + if (!(selection.get(0) instanceof RadContainer container)) { return; } - final RadContainer container = (RadContainer)selection.get(0); if ( container instanceof RadScrollPane || container instanceof RadSplitPane || diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/SelectionWatcher.java b/plugins/ui-designer/src/com/intellij/uiDesigner/SelectionWatcher.java index 644c93720ae9..ea30728ce73d 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/SelectionWatcher.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/SelectionWatcher.java @@ -42,8 +42,7 @@ public abstract class SelectionWatcher { private void install(@NotNull final RadComponent component){ component.addPropertyChangeListener(myChangeListener); - if(component instanceof RadContainer){ - final RadContainer container = (RadContainer)component; + if(component instanceof RadContainer container){ for(int i = container.getComponentCount() - 1; i>= 0; i--){ install(container.getComponent(i)); } @@ -52,8 +51,7 @@ public abstract class SelectionWatcher { private void deinstall(@NotNull final RadComponent component){ component.removePropertyChangeListener(myChangeListener); - if(component instanceof RadContainer){ - final RadContainer container = (RadContainer)component; + if(component instanceof RadContainer container){ for(int i = container.getComponentCount() - 1; i>= 0; i--){ deinstall(container.getComponent(i)); } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/XmlReader.java b/plugins/ui-designer/src/com/intellij/uiDesigner/XmlReader.java index b613471a2d64..d7d135e60cb0 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/XmlReader.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/XmlReader.java @@ -57,8 +57,7 @@ public final class XmlReader { final RadComponent component; Class componentClass = null; - if (lwComponent instanceof LwNestedForm) { - LwNestedForm nestedForm = (LwNestedForm) lwComponent; + if (lwComponent instanceof LwNestedForm nestedForm) { boolean recursiveNesting = false; try { Utils.validateNestedFormLoop(nestedForm.getFormFileName(), new PsiNestedFormLoader(module.getModule())); @@ -131,8 +130,7 @@ public final class XmlReader { else if (lwComponent instanceof LwToolBar) { component = new RadToolBar(module, componentClass, id); } - else if (lwComponent instanceof LwContainer) { - final LwContainer lwContainer = (LwContainer)lwComponent; + else if (lwComponent instanceof LwContainer lwContainer) { LayoutManager layout = lwContainer.getLayout(); if (layout instanceof XYLayoutManager) { // replace stub layout with the real one @@ -227,8 +225,7 @@ public final class XmlReader { } } - if (component instanceof RadRootContainer) { - final RadRootContainer radRootContainer = (RadRootContainer)component; + if (component instanceof RadRootContainer radRootContainer) { final LwRootContainer lwRootContainer = (LwRootContainer)lwComponent; radRootContainer.setClassToBind(lwRootContainer.getClassToBind()); radRootContainer.setMainComponentBinding(lwRootContainer.getMainComponentBinding()); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateComponentAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateComponentAction.java index 2dad500d284f..ecf3e300a1c1 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateComponentAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateComponentAction.java @@ -77,8 +77,7 @@ public class CreateComponentAction extends AbstractGuiEditorAction { container = editor.getRootContainer(); } if (container instanceof RadRootContainer && container.getComponentCount() == 1 && - container.getComponent(0) instanceof RadContainer) { - RadContainer childContainer = (RadContainer)container.getComponent(0); + container.getComponent(0) instanceof RadContainer childContainer) { dropLocation = childContainer.getDropLocation(null); } else { @@ -87,8 +86,7 @@ public class CreateComponentAction extends AbstractGuiEditorAction { } else { final RadRootContainer container = editor.getRootContainer(); - if (container.getComponentCount() == 1 && container.getComponent(0) instanceof RadContainer) { - RadContainer childContainer = (RadContainer)container.getComponent(0); + if (container.getComponentCount() == 1 && container.getComponent(0) instanceof RadContainer childContainer) { dropLocation = childContainer.getDropLocation(null); } else { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DuplicateComponentsAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DuplicateComponentsAction.java index 576380d3b135..7adccb10e3d0 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DuplicateComponentsAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DuplicateComponentsAction.java @@ -68,9 +68,8 @@ public final class DuplicateComponentsAction extends AbstractGuiEditorAction { private static void fillDuplicateMap(Map duplicates, final RadComponent c, final RadComponent copy) { duplicates.put(c, copy); - if (c instanceof RadContainer) { + if (c instanceof RadContainer container) { LOG.assertTrue(copy instanceof RadContainer); - final RadContainer container = (RadContainer)c; final RadContainer containerCopy = (RadContainer)copy; for(int i=0; i selection) { - if (selection.size() != 1 || !(selection.get(0) instanceof RadContainer)) { + if (selection.size() != 1 || !(selection.get(0) instanceof RadContainer container)) { return null; } - RadContainer container = (RadContainer)selection.get(0); if (!container.getParent().isXY()) { return null; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/BoundIconRenderer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/BoundIconRenderer.java index 5b9528a09839..775734c95a9d 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/BoundIconRenderer.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/BoundIconRenderer.java @@ -31,8 +31,7 @@ public class BoundIconRenderer extends GutterIconRenderer { public BoundIconRenderer(@NotNull final PsiElement element) { myElement = element; - if (myElement instanceof PsiField) { - final PsiField field = (PsiField)myElement; + if (myElement instanceof PsiField field) { final PsiType type = field.getType(); if (type instanceof PsiClassType) { PsiClass componentClass = ((PsiClassType)type).resolve(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FieldFormReference.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FieldFormReference.java index ebc60be2d8fb..22ae7d75a597 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FieldFormReference.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FieldFormReference.java @@ -51,11 +51,10 @@ public final class FieldFormReference extends ReferenceInForm { @Override public PsiElement bindToElement(@NotNull final PsiElement element) throws IncorrectOperationException { - if (!(element instanceof PsiField)) { + if (!(element instanceof PsiField field)) { throw new IncorrectOperationException(); } - final PsiField field = (PsiField)element; PsiClass fieldClass = field.getContainingClass(); if (fieldClass == null || !myClassReference.isReferenceTo(fieldClass)) { throw new IncorrectOperationException(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java index efe5f318418a..ce550f737ee8 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java @@ -22,15 +22,13 @@ public class FormClassAnnotator implements Annotator { @Override public void annotate(@NotNull PsiElement psiElement, @NotNull AnnotationHolder holder) { - if (psiElement instanceof PsiField) { - PsiField field = (PsiField) psiElement; + if (psiElement instanceof PsiField field) { final PsiFile boundForm = FormReferenceProvider.getFormFile(field); if (boundForm != null) { annotateFormField(field, boundForm, holder); } } - else if (psiElement instanceof PsiClass) { - PsiClass aClass = (PsiClass) psiElement; + else if (psiElement instanceof PsiClass aClass) { final List formsBoundToClass = FormClassIndex.findFormsBoundToClass(aClass.getProject(), aClass); if (formsBoundToClass.size() > 0) { holder.newSilentAnnotation(HighlightSeverity.INFORMATION).range(aClass.getNameIdentifier()).gutterIconRenderer(new BoundIconRenderer(aClass)).create(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java index 534d570ec553..e583656c4369 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java @@ -57,8 +57,7 @@ public class FormReferenceProvider extends PsiReferenceProvider { @Override public PsiReference @NotNull [] getReferencesByElement(@NotNull final PsiElement element, @NotNull final ProcessingContext context) { - if (element instanceof PsiPlainTextFile) { - PsiPlainTextFile plainTextFile = (PsiPlainTextFile) element; + if (element instanceof PsiPlainTextFile plainTextFile) { if (plainTextFile.getFileType().equals(GuiFormFileType.INSTANCE)) { return getCachedData(plainTextFile).myReferences; } @@ -274,8 +273,7 @@ public class FormReferenceProvider extends PsiReferenceProvider { PsiMethod getter = PropertyUtilBase.findPropertyGetter(psiClass, tag.getName(), false, true); if (getter != null) { final PsiType returnType = getter.getReturnType(); - if (returnType instanceof PsiClassType) { - PsiClassType propClassType = (PsiClassType)returnType; + if (returnType instanceof PsiClassType propClassType) { PsiClass propClass = propClassType.resolve(); if (propClass != null) { if (propClass.isEnum()) { @@ -336,8 +334,7 @@ public class FormReferenceProvider extends PsiReferenceProvider { final PsiReferenceProcessor.CollectElements processor = new PsiReferenceProcessor.CollectElements() { @Override public boolean execute(PsiReference ref) { - if (ref instanceof FieldFormReference) { - final FieldFormReference fieldRef = ((FieldFormReference)ref); + if (ref instanceof FieldFormReference fieldRef) { final String componentClassName = fieldRef.getComponentClassName(); if (componentClassName != null) { final PsiClassType type = JavaPsiFacade.getInstance(element.getProject()).getElementFactory() diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java index 64daa0b6b21d..d84adcb8934e 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java @@ -80,8 +80,7 @@ public class FormReferencesSearcher implements QueryExecutor result = new ArrayList<>(paths.length); for (TreePath path : paths) { final DefaultMutableTreeNode node = (DefaultMutableTreeNode)path.getLastPathComponent(); - if (node != null && node.getUserObject() instanceof ComponentPtrDescriptor) { - final ComponentPtrDescriptor descriptor = (ComponentPtrDescriptor)node.getUserObject(); + if (node != null && node.getUserObject() instanceof ComponentPtrDescriptor descriptor) { final ComponentPtr ptr = descriptor.getElement(); if (ptr != null && ptr.isValid()) { result.add(ptr.getComponent()); @@ -400,8 +398,7 @@ public final class ComponentTree extends Tree implements DataProvider { final boolean hasFocus ) { final DefaultMutableTreeNode node = (DefaultMutableTreeNode)value; - if (node.getUserObject() instanceof ComponentPtrDescriptor) { - final ComponentPtrDescriptor descriptor = (ComponentPtrDescriptor)node.getUserObject(); + if (node.getUserObject() instanceof ComponentPtrDescriptor descriptor) { final ComponentPtr ptr = descriptor.getElement(); if (ptr == null) return; final RadComponent component = ptr.getComponent(); @@ -434,8 +431,7 @@ public final class ComponentTree extends Tree implements DataProvider { else if (component instanceof RadHSpacer) { append(UIDesignerBundle.message("component.horizontal.spacer"), getAttribute(myClassAttributes, level)); } - else if (component instanceof RadErrorComponent) { - final RadErrorComponent c = (RadErrorComponent)component; + else if (component instanceof RadErrorComponent c) { append(c.getErrorDescription(), getAttribute(myUnknownAttributes, level)); } else if (component instanceof RadRootContainer) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTreeStructure.java b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTreeStructure.java index 1b180ae49604..898eef1836ab 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTreeStructure.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTreeStructure.java @@ -50,12 +50,10 @@ final class ComponentTreeStructure extends AbstractTreeStructure { } return elements.toArray(); } - else if (element instanceof ComponentPtr) { - final ComponentPtr ptr = (ComponentPtr)element; + else if (element instanceof ComponentPtr ptr) { LOG.assertTrue(ptr.isValid()); // pointer must be valid final RadComponent component = ptr.getComponent(); - if (component instanceof RadContainer) { - final RadContainer container = (RadContainer)component; + if (component instanceof RadContainer container) { final ComponentPtr[] ptrs = new ComponentPtr[container.getComponentCount()]; for (int i = 0; i < ptrs.length; i++) { ptrs[i] = new ComponentPtr(myEditor, container.getComponent(i)); @@ -101,8 +99,7 @@ final class ComponentTreeStructure extends AbstractTreeStructure { else if (element instanceof RadButtonGroup) { return myEditor.getRootContainer().getButtonGroups(); } - else if (element instanceof ComponentPtr) { // RadContainer is also RadComponent - final ComponentPtr ptr = (ComponentPtr)element; + else if (element instanceof ComponentPtr ptr) { // RadContainer is also RadComponent if (!ptr.isValid()) return myRootElement; final RadComponent component = ptr.getComponent(); if (component instanceof RadRootContainer) { @@ -129,8 +126,7 @@ final class ComponentTreeStructure extends AbstractTreeStructure { else if (element instanceof LwInspectionSuppression[]) { return new SuppressionGroupDescriptor(parentDescriptor, (LwInspectionSuppression[])element); } - else if (element instanceof LwInspectionSuppression) { - final LwInspectionSuppression suppression = (LwInspectionSuppression)element; + else if (element instanceof LwInspectionSuppression suppression) { RadComponent target = (RadComponent)(suppression.getComponentId() == null ? null : FormEditingUtil.findComponent(myEditor.getRootContainer(), suppression.getComponentId())); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java index 0e5064e59047..9cd972e43d4e 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java @@ -528,10 +528,9 @@ public final class GridCaptionPanel extends JPanel implements ComponentSelection if (mySelectedContainer == null) { return false; } - if (!(aEvent.getAttachedObject() instanceof MyDragBean)) { + if (!(aEvent.getAttachedObject() instanceof MyDragBean bean)) { return false; } - MyDragBean bean = (MyDragBean) aEvent.getAttachedObject(); if (bean.isRow != myIsRow || bean.cells.length == 0) { return false; } @@ -559,10 +558,9 @@ public final class GridCaptionPanel extends JPanel implements ComponentSelection @Override public void drop(DnDEvent aEvent) { - if (!(aEvent.getAttachedObject() instanceof MyDragBean)) { + if (!(aEvent.getAttachedObject() instanceof MyDragBean dragBean)) { return; } - MyDragBean dragBean = (MyDragBean) aEvent.getAttachedObject(); int targetCell = getDropGridLine(aEvent); if (targetCell < 0) return; mySelectedContainer.getGridLayoutManager().processCellsMoved(mySelectedContainer, myIsRow, dragBean.cells, targetCell); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GroupSelectionProcessor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GroupSelectionProcessor.java index de6d1fd293d8..88ad2e4174dd 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GroupSelectionProcessor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GroupSelectionProcessor.java @@ -117,8 +117,7 @@ public final class GroupSelectionProcessor extends EventProcessor { } } - if (component instanceof RadContainer){ - final RadContainer container = (RadContainer)component; + if (component instanceof RadContainer container){ // [anton] it is very important to iterate through a STORED array because setSelected can // change order of components so iteration via getComponent(i) is incorrect final RadComponent[] components = container.getComponents(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java index be98916a194e..b984231ddb18 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java @@ -499,10 +499,9 @@ public final class GuiEditor extends JPanel implements DesignerEditorPanelFacade } } - if (component instanceof RadContainer) { + if (component instanceof RadContainer container) { component.refresh(); - final RadContainer container = (RadContainer)component; for (int i = container.getComponentCount() - 1; i >= 0; i--) { refreshImpl(container.getComponent(i)); } @@ -686,8 +685,7 @@ public final class GuiEditor extends JPanel implements DesignerEditorPanelFacade final RadComponent radComponent = (RadComponent)component; boolean componentModified = false; for (IProperty prop : component.getModifiedProperties()) { - if (prop instanceof IntroStringProperty) { - IntroStringProperty strProp = (IntroStringProperty)prop; + if (prop instanceof IntroStringProperty strProp) { componentModified = strProp.refreshValue(radComponent) || componentModified; } } @@ -905,8 +903,7 @@ public final class GuiEditor extends JPanel implements DesignerEditorPanelFacade private Map saveTabbedPaneSelectedTabs() { final Map result = new HashMap<>(); FormEditingUtil.iterate(getRootContainer(), component -> { - if (component instanceof RadTabbedPane) { - RadTabbedPane tabbedPane = (RadTabbedPane)component; + if (component instanceof RadTabbedPane tabbedPane) { RadComponent c = tabbedPane.getSelectedTab(); if (c != null) { result.put(tabbedPane.getId(), c.getId()); @@ -919,8 +916,7 @@ public final class GuiEditor extends JPanel implements DesignerEditorPanelFacade private void restoreTabbedPaneSelectedTabs(final Map tabbedPaneSelectedTabs) { FormEditingUtil.iterate(getRootContainer(), component -> { - if (component instanceof RadTabbedPane) { - RadTabbedPane tabbedPane = (RadTabbedPane)component; + if (component instanceof RadTabbedPane tabbedPane) { String selectedTabId = tabbedPaneSelectedTabs.get(tabbedPane.getId()); if (selectedTabId != null) { for (RadComponent c : tabbedPane.getComponents()) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java index 489fd68300f1..be838e7c57c8 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java @@ -108,13 +108,10 @@ public class ListenerNavigateButton extends JButton implements ActionListener { final LocalSearchScope scope = new LocalSearchScope(boundClassFile); ReferencesSearch.search(boundField, scope).forEach(ref -> { final PsiElement element = ref.getElement(); - if (element.getParent() instanceof PsiReferenceExpression) { - PsiReferenceExpression refExpr = (PsiReferenceExpression) element.getParent(); - if (refExpr.getParent() instanceof PsiMethodCallExpression) { - PsiMethodCallExpression methodCall = (PsiMethodCallExpression) refExpr.getParent(); + if (element.getParent() instanceof PsiReferenceExpression refExpr) { + if (refExpr.getParent() instanceof PsiMethodCallExpression methodCall) { final PsiElement psiElement = refExpr.resolve(); - if (psiElement instanceof PsiMethod) { - PsiMethod method = (PsiMethod) psiElement; + if (psiElement instanceof PsiMethod method) { for(EventSetDescriptor eventSetDescriptor: eventSetDescriptors) { if (Objects.equals(eventSetDescriptor.getAddListenerMethod().getName(), method.getName())) { final String eventName = eventSetDescriptor.getName(); @@ -150,15 +147,13 @@ public class ListenerNavigateButton extends JButton implements ActionListener { final PsiElement[] defs = DefUseUtil.getDefs(codeBlock, (PsiVariable)psiElement, listenerArg); if (defs.length == 1) { final PsiElement def = defs[0]; - if (def instanceof PsiVariable) { - PsiVariable var = (PsiVariable) def; + if (def instanceof PsiVariable var) { if (var.getInitializer() != listenerArg) { addListenerRef(actionGroup, eventName, var.getInitializer()); return; } } - else if (def.getParent() instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression assignmentExpr = (PsiAssignmentExpression)def.getParent(); + else if (def.getParent() instanceof PsiAssignmentExpression assignmentExpr) { if (def.equals(assignmentExpr.getLExpression())) { addListenerRef(actionGroup, eventName, assignmentExpr.getRExpression()); return; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/Painter.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/Painter.java index 0ef3fe416e02..5dd352abb581 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/Painter.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/Painter.java @@ -124,8 +124,7 @@ public final class Painter { boolean highlightBoundaries = (getDesignTimeInsets(component) > 2); - if (component instanceof RadContainer && !component.isDragBorder()) { - RadContainer container = (RadContainer)component; + if (component instanceof RadContainer container && !component.isDragBorder()) { if (!highlightBoundaries && (container.getBorderTitle() != null || container.getBorderType() != BorderType.NONE)) { return; } @@ -181,10 +180,9 @@ public final class Painter { if (!editor.isShowGrid()) { return; } - if (!(component instanceof RadContainer)) { + if (!(component instanceof RadContainer container)) { return; } - final RadContainer container = (RadContainer)component; if (!container.getLayoutManager().isGrid()) { return; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/editor/MyEditorState.java b/plugins/ui-designer/src/com/intellij/uiDesigner/editor/MyEditorState.java index bc4fc5cfa885..a7704f8a7465 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/editor/MyEditorState.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/editor/MyEditorState.java @@ -36,9 +36,7 @@ final class MyEditorState implements FileEditorState{ public boolean equals(final Object o){ if (this == o) return true; - if (!(o instanceof MyEditorState)) return false; - - final MyEditorState state = (MyEditorState)o; + if (!(o instanceof MyEditorState state)) return false; if (myDocumentModificationStamp != state.myDocumentModificationStamp) return false; if (!Arrays.equals(mySelectedComponentIds, state.mySelectedComponentIds)) return false; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/BoundFieldAssignmentInspection.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/BoundFieldAssignmentInspection.java index a40720253328..dad439a008d8 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/BoundFieldAssignmentInspection.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/BoundFieldAssignmentInspection.java @@ -40,18 +40,15 @@ public class BoundFieldAssignmentInspection extends AbstractBaseJavaLocalInspect @Override public void visitAssignmentExpression(@NotNull PsiAssignmentExpression expression) { PsiExpression lExpression = expression.getLExpression(); - if (lExpression instanceof PsiReferenceExpression) { - PsiReferenceExpression lExpr = (PsiReferenceExpression)lExpression; + if (lExpression instanceof PsiReferenceExpression lExpr) { PsiElement lElement = lExpr.resolve(); - if (!(lElement instanceof PsiField)) { + if (!(lElement instanceof PsiField field)) { return; } - PsiField field = (PsiField) lElement; PsiReference formReference = FormReferenceProvider.getFormReference(field); - if (!(formReference instanceof FieldFormReference)) { + if (!(formReference instanceof FieldFormReference ref)) { return; } - FieldFormReference ref = (FieldFormReference) formReference; if (ref.isCustomCreate()) { return; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/DuplicateMnemonicInspection.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/DuplicateMnemonicInspection.java index 5f63a0076c54..4a2f4a850051 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/DuplicateMnemonicInspection.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/DuplicateMnemonicInspection.java @@ -47,8 +47,7 @@ public class DuplicateMnemonicInspection extends BaseFormInspection { IProperty prop = FormInspectionUtil.findProperty(component, SwingProperties.TEXT); if (prop != null) { Object propValue = prop.getPropertyValue(component); - if (propValue instanceof StringDescriptor) { - StringDescriptor descriptor = (StringDescriptor)propValue; + if (propValue instanceof StringDescriptor descriptor) { String value; if (component instanceof RadComponent) { value = StringDescriptorManager.getInstance(module).resolve((RadComponent) component, descriptor); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormInspectionUtil.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormInspectionUtil.java index dc69da379d87..758ed4dbb38b 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormInspectionUtil.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormInspectionUtil.java @@ -43,8 +43,7 @@ public final class FormInspectionUtil { if (textProperty != null) { Object propValue = textProperty.getPropertyValue(component); String value = null; - if (propValue instanceof StringDescriptor) { - StringDescriptor descriptor = (StringDescriptor) propValue; + if (propValue instanceof StringDescriptor descriptor) { if (component instanceof RadComponent) { value = StringDescriptorManager.getInstance(module).resolve((RadComponent) component, descriptor); } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoButtonGroupInspection.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoButtonGroupInspection.java index ad0b284e115b..1331cd089b8c 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoButtonGroupInspection.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoButtonGroupInspection.java @@ -61,8 +61,7 @@ public class NoButtonGroupInspection extends BaseFormInspection { } private static boolean areCellsAdjacent(final IContainer parent, final GridConstraints c1, final GridConstraints c2) { - if (parent instanceof RadContainer) { - final RadContainer container = (RadContainer)parent; + if (parent instanceof RadContainer container) { if (!container.getLayoutManager().isGrid()) return false; if (c1.getRow() == c2.getRow()) { return FormEditingUtil.prevCol(container, c1.getColumn()) == c2.getColumn() || diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoLabelForInspection.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoLabelForInspection.java index c409633138f5..9846c7f0ea67 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoLabelForInspection.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoLabelForInspection.java @@ -48,9 +48,8 @@ public class NoLabelForInspection extends BaseFormInspection { found.set(Boolean.TRUE); return false; } - else if (component instanceof RadComponent && + else if (component instanceof RadComponent radComponent && (prop == null || StringUtil.isEmpty((String)prop.getPropertyValue(c2)))) { - RadComponent radComponent = (RadComponent) component; final RadComponent radComponent2 = (RadComponent)c2; allLabels.add(radComponent2); if (radComponent.getParent() == radComponent2.getParent() && radComponent.getParent().getLayoutManager().isGrid()) { @@ -101,8 +100,7 @@ public class NoLabelForInspection extends BaseFormInspection { IntrospectedProperty[] props = palette.getIntrospectedProperties(myLabel); boolean modified = false; for(IntrospectedProperty prop: props) { - if (prop.getName().equals(SwingProperties.LABEL_FOR) && prop instanceof IntroComponentProperty) { - IntroComponentProperty icp = (IntroComponentProperty) prop; + if (prop.getName().equals(SwingProperties.LABEL_FOR) && prop instanceof IntroComponentProperty icp) { icp.setValueEx(myLabel, myComponent.getId()); modified = true; break; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/StringDescriptorInspection.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/StringDescriptorInspection.java index 4ee946600f24..3d27e2adbaca 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/StringDescriptorInspection.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/StringDescriptorInspection.java @@ -20,22 +20,19 @@ public abstract class StringDescriptorInspection extends BaseFormInspection { protected void checkComponentProperties(Module module, @NotNull IComponent component, FormErrorCollector collector) { for(IProperty prop: component.getModifiedProperties()) { Object propValue = prop.getPropertyValue(component); - if (propValue instanceof StringDescriptor) { - StringDescriptor descriptor = (StringDescriptor) propValue; + if (propValue instanceof StringDescriptor descriptor) { checkStringDescriptor(module, component, prop, descriptor, collector); } } - if (component instanceof IContainer) { - IContainer container = (IContainer) component; + if (component instanceof IContainer container) { StringDescriptor descriptor = container.getBorderTitle(); if (descriptor != null) { checkStringDescriptor(module, component, myBorderProperty.getValue(), descriptor, collector); } } - if (component.getParentContainer() instanceof ITabbedPane) { - ITabbedPane parentTabbedPane = (ITabbedPane) component.getParentContainer(); + if (component.getParentContainer() instanceof ITabbedPane parentTabbedPane) { StringDescriptor descriptor = parentTabbedPane.getTabProperty(component, ITabbedPane.TAB_TITLE_PROPERTY); if (descriptor != null) { checkStringDescriptor(module, component, MockTabTitleProperty.INSTANCE, descriptor, collector); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/make/FormSourceCodeGenerator.java b/plugins/ui-designer/src/com/intellij/uiDesigner/make/FormSourceCodeGenerator.java index bf1f5392d448..b9a4980dfd6c 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/make/FormSourceCodeGenerator.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/make/FormSourceCodeGenerator.java @@ -397,16 +397,14 @@ public final class FormSourceCodeGenerator { if (psiElement == null) { return; } - if (psiElement instanceof PsiField) { - PsiField field = (PsiField) psiElement; + if (psiElement instanceof PsiField field) { if (field.getContainingClass().equals(classToBind)) { if (Utils.isBoundField(rootContainer, field.getName())) { result.set(Boolean.TRUE); } } } - else if (psiElement instanceof PsiMethod) { - PsiMethod method = (PsiMethod) psiElement; + else if (psiElement instanceof PsiMethod method) { if (method.isConstructor()) { if (method.getContainingClass() == classToBind) { if (callsThisConstructor != null) { @@ -1062,8 +1060,7 @@ public final class FormSourceCodeGenerator { } } - if (component instanceof LwContainer) { - final LwContainer container = (LwContainer)component; + if (component instanceof LwContainer container) { for (int i = 0; i < container.getComponentCount(); i++) { generateComponentReferenceProperties((LwComponent)container.getComponent(i), component2variable, class2variableIndex, id2component, aClass); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java index 049f89258b72..bbae75ab3d54 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java @@ -200,8 +200,7 @@ public final class ComponentItem implements Cloneable, PaletteItem { // [vova] It's safe to cast to ImageIcon here because all icons loaded by IconLoader // are ImageIcon(s). final Icon icon = getIcon(); - if (icon instanceof ImageIcon) { - final ImageIcon imageIcon = (ImageIcon)icon; + if (icon instanceof ImageIcon imageIcon) { mySmallIcon = new MySmallIcon(imageIcon.getImage()); } else { @@ -297,9 +296,7 @@ public final class ComponentItem implements Cloneable, PaletteItem { public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof ComponentItem)) return false; - - final ComponentItem componentItem = (ComponentItem)o; + if (!(o instanceof ComponentItem componentItem)) return false; if (myClassName != null ? !myClassName.equals(componentItem.myClassName) : componentItem.myClassName != null) return false; if (myDefaultConstraints != null diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/GroupItem.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/GroupItem.java index 2e8e1167893c..741bdf978a53 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/GroupItem.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/GroupItem.java @@ -140,8 +140,7 @@ public final class GroupItem implements Cloneable, PaletteGroup { @Override public void handleDrop(Project project, PaletteItem droppedItem, int index) { - if (droppedItem instanceof ComponentItem) { - ComponentItem componentItem = (ComponentItem) droppedItem; + if (droppedItem instanceof ComponentItem componentItem) { Palette palette = Palette.getInstance(project); int oldIndex = myItems.indexOf(componentItem); if (oldIndex >= 0) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/PaletteRefactoringListenerProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/PaletteRefactoringListenerProvider.java index b611f405d9e1..4ca10d564a90 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/PaletteRefactoringListenerProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/PaletteRefactoringListenerProvider.java @@ -13,8 +13,7 @@ import org.jetbrains.annotations.NotNull; final class PaletteRefactoringListenerProvider implements RefactoringElementListenerProvider { @Override public RefactoringElementListener getListener(PsiElement element) { - if (element instanceof PsiClass) { - PsiClass psiClass = (PsiClass) element; + if (element instanceof PsiClass psiClass) { final String oldName = ClassUtil.getJVMClassName(psiClass); if (oldName != null) { final ComponentItem item = Palette.getInstance(element.getProject()).getItem(oldName); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/Form.java b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/Form.java index 4c76c53e84e2..47c9cfb1b595 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/Form.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/Form.java @@ -34,8 +34,7 @@ public class Form implements Navigatable, Iterable { } public boolean equals(Object object) { - if (object instanceof Form){ - Form form = (Form)object; + if (object instanceof Form form){ return myFormFiles.equals(form.myFormFiles) && myClassToBind.equals(form.myClassToBind); } else { return false; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java index aa417ddc91d7..570a89d2a69a 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java @@ -42,8 +42,7 @@ public final class FormMergerTreeStructureProvider implements TreeStructureProvi // Optimization. Check if there are any forms at all. boolean formsFound = false; for (AbstractTreeNode node : children) { - if (node.getValue() instanceof PsiFile) { - PsiFile file = (PsiFile)node.getValue(); + if (node.getValue() instanceof PsiFile file) { if (file.getFileType() == GuiFormFileType.INSTANCE) { formsFound = true; break; @@ -122,8 +121,7 @@ public final class FormMergerTreeStructureProvider implements TreeStructureProvi List> result = new ArrayList<>(); Set psiFiles = new HashSet<>(forms); for (final AbstractTreeNode child : children) { - if (child instanceof BasePsiNode) { - BasePsiNode treeNode = (BasePsiNode)child; + if (child instanceof BasePsiNode treeNode) { if (psiFiles.contains(treeNode.getValue())) { result.add(treeNode); } @@ -158,8 +156,7 @@ public final class FormMergerTreeStructureProvider implements TreeStructureProvi private static PsiElement[] collectFormPsiElements(Collection> selected) { Set result = new HashSet<>(); for(AbstractTreeNode node: selected) { - if (node.getValue() instanceof Form) { - Form form = (Form)node.getValue(); + if (node.getValue() instanceof Form form) { result.add(form.getClassToBind()); ContainerUtil.addAll(result, form.getFormFiles()); } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java index bb6315aa959d..cdc04d4303e8 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java @@ -76,8 +76,7 @@ public class UIDesignerFavoriteNodeProvider extends FavoriteNodeProvider { @Override public boolean elementContainsFile(final Object element, final VirtualFile vFile) { - if (element instanceof Form){ - Form form = (Form) element; + if (element instanceof Form form){ return form.containsFile(vFile); } return false; @@ -122,8 +121,7 @@ public class UIDesignerFavoriteNodeProvider extends FavoriteNodeProvider { @Override @Nullable @NonNls public String getElementUrl(Object element) { - if (element instanceof Form) { - Form form = (Form)element; + if (element instanceof Form form) { return form.getClassToBind().getQualifiedName(); } return null; @@ -131,8 +129,7 @@ public class UIDesignerFavoriteNodeProvider extends FavoriteNodeProvider { @Override public String getElementModuleName(final Object element) { - if (element instanceof Form) { - Form form = (Form)element; + if (element instanceof Form form) { final Module module = ModuleUtil.findModuleForPsiElement(form.getClassToBind()); return module != null ? module.getName() : null; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java index 46f40e1e62e6..036d7bc94f48 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java @@ -526,8 +526,7 @@ public final class PropertyInspectorTable extends JBTable implements DataProvide addProperty(result, CustomCreateProperty.getInstance(myProject)); } - if(component instanceof RadContainer){ - RadContainer container = (RadContainer) component; + if(component instanceof RadContainer container){ if (container.getLayoutManager().getName() != null) { addProperty(result, myLayoutManagerProperty); } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java index af38e922821c..b915aaf53b3c 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java @@ -112,8 +112,7 @@ public final class KeyChooserDialog extends DialogWrapper{ keyColumn.setMaxWidth(width); keyColumn.setMinWidth(width); final TableCellRenderer defaultRenderer = myTable.getDefaultRenderer(String.class); - if (defaultRenderer instanceof JComponent) { - final JComponent component = (JComponent)defaultRenderer; + if (defaultRenderer instanceof JComponent component) { component.putClientProperty("html.disable", Boolean.TRUE); } selectKey(keyToPreselect); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/AbstractGridLayoutProperty.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/AbstractGridLayoutProperty.java index 1956b1981764..8525318a6c26 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/AbstractGridLayoutProperty.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/AbstractGridLayoutProperty.java @@ -27,18 +27,16 @@ public abstract class AbstractGridLayoutProperty extends Property { CardLayout layout = (CardLayout) component.getLayout(); return layout.getHgap(); } - if (component.getLayout() instanceof AbstractLayout) { - final AbstractLayout layoutManager=(AbstractLayout)component.getLayout(); + if (component.getLayout() instanceof AbstractLayout layoutManager) { return layoutManager.getHGap(); } return null; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/IntroStringProperty.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/IntroStringProperty.java index 7f6a26fcf2ef..166d1909b5ab 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/IntroStringProperty.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/IntroStringProperty.java @@ -131,15 +131,13 @@ public final class IntroStringProperty extends IntrospectedProperty { @Override public Insets getValue(final RadContainer component) { - if (component.getLayout() instanceof AbstractLayout) { - final AbstractLayout layoutManager=(AbstractLayout) component.getLayout(); + if (component.getLayout() instanceof AbstractLayout layoutManager) { return layoutManager.getMargin(); } return DEFAULT_INSETS; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/VGapProperty.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/VGapProperty.java index 587fdbc89c99..76dbd89042dd 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/VGapProperty.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/VGapProperty.java @@ -30,8 +30,7 @@ public final class VGapProperty extends AbstractIntProperty { CardLayout layout = (CardLayout) component.getLayout(); return layout.getVgap(); } - if (component.getLayout() instanceof AbstractLayout) { - final AbstractLayout layoutManager=(AbstractLayout)component.getLayout(); + if (component.getLayout() instanceof AbstractLayout layoutManager) { return layoutManager.getVGap(); } return null; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/FormLayoutColumnProperties.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/FormLayoutColumnProperties.java index d41b54096b2b..d96435e968e2 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/FormLayoutColumnProperties.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/FormLayoutColumnProperties.java @@ -199,8 +199,7 @@ public class FormLayoutColumnProperties implements CustomPropertiesPanel { private void showSize(Size size) { Size minimumSize = null; Size maximumSize = null; - if (size instanceof BoundedSize) { - BoundedSize boundedSize = (BoundedSize)size; + if (size instanceof BoundedSize boundedSize) { minimumSize = boundedSize.getLowerBound(); maximumSize = boundedSize.getUpperBound(); size = boundedSize.getBasis(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadComponent.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadComponent.java index bb06b4d9d04b..fc0bfc594aae 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadComponent.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadComponent.java @@ -714,8 +714,7 @@ public abstract class RadComponent implements IComponent { } } - if (this instanceof RadContainer) { - RadContainer container = (RadContainer)this; + if (this instanceof RadContainer container) { StringDescriptor descriptor = container.getBorderTitle(); if (descriptor != null) { if (descriptor.getResolvedValue() == null) { @@ -725,8 +724,7 @@ public abstract class RadComponent implements IComponent { } } - if (getParent() instanceof RadTabbedPane) { - RadTabbedPane parentTabbedPane = (RadTabbedPane)getParent(); + if (getParent() instanceof RadTabbedPane parentTabbedPane) { final StringDescriptor descriptor = parentTabbedPane.getChildTitle(this); if (descriptor != null) { if (descriptor.getResolvedValue() == null) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadContainer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadContainer.java index 5c0539bcc07b..2b5f5f5f0924 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadContainer.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadContainer.java @@ -171,8 +171,7 @@ public class RadContainer extends RadComponent implements IContainer { myDelegeeLayout = layout; getDelegee().setLayout(layout); - if (layout instanceof AbstractLayout) { - AbstractLayout aLayout = (AbstractLayout)layout; + if (layout instanceof AbstractLayout aLayout) { for (int i = 0; i < getComponentCount(); i++) { final RadComponent c = getComponent(i); aLayout.addLayoutComponent(c.getDelegee(), c.getConstraints()); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadFlowLayoutManager.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadFlowLayoutManager.java index 74bfd522ac31..20ec952421c5 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadFlowLayoutManager.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadFlowLayoutManager.java @@ -78,8 +78,7 @@ public class RadFlowLayoutManager extends RadAbstractIndexedLayoutManager { @Override public Integer getValue(final RadContainer component) { final LayoutManager layout = component.getLayout(); - if (!(layout instanceof FlowLayout)) return null; - FlowLayout flowLayout = (FlowLayout)layout; + if (!(layout instanceof FlowLayout flowLayout)) return null; return flowLayout.getAlignment(); } @@ -109,8 +108,7 @@ public class RadFlowLayoutManager extends RadAbstractIndexedLayoutManager { @Override public boolean isModified(final RadContainer component) { final LayoutManager layout = component.getLayout(); - if (!(layout instanceof FlowLayout)) return false; - FlowLayout flowLayout = (FlowLayout)layout; + if (!(layout instanceof FlowLayout flowLayout)) return false; return flowLayout.getAlignment() != FlowLayout.CENTER; } } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadFormLayoutManager.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadFormLayoutManager.java index 723adf5b3a44..348827a304af 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadFormLayoutManager.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadFormLayoutManager.java @@ -143,8 +143,7 @@ public class RadFormLayoutManager extends RadAbstractGridLayoutManager implement public void addComponentToContainer(final RadContainer container, final RadComponent component, final int index) { super.addComponentToContainer(container, component, index); final CellConstraints cc = gridToCellConstraints(component); - if (component.getCustomLayoutConstraints() instanceof CellConstraints) { - CellConstraints customCellConstraints = (CellConstraints) component.getCustomLayoutConstraints(); + if (component.getCustomLayoutConstraints() instanceof CellConstraints customCellConstraints) { cc.insets = customCellConstraints.insets; } component.setCustomLayoutConstraints(cc); @@ -159,8 +158,7 @@ public class RadFormLayoutManager extends RadAbstractGridLayoutManager implement CellConstraints.Alignment vAlign = ((gc.getVSizePolicy() & GridConstraints.SIZEPOLICY_WANT_GROW) != 0) ? CellConstraints.FILL : CellConstraints.DEFAULT; - if (component.getCustomLayoutConstraints() instanceof CellConstraints) { - CellConstraints cc = (CellConstraints) component.getCustomLayoutConstraints(); + if (component.getCustomLayoutConstraints() instanceof CellConstraints cc) { hAlign = cc.hAlign; vAlign = cc.vAlign; } @@ -170,8 +168,7 @@ public class RadFormLayoutManager extends RadAbstractGridLayoutManager implement @Override public void writeChildConstraints(final XmlWriter writer, final RadComponent child) { writeGridConstraints(writer, child); - if (child.getCustomLayoutConstraints() instanceof CellConstraints) { - CellConstraints cc = (CellConstraints) child.getCustomLayoutConstraints(); + if (child.getCustomLayoutConstraints() instanceof CellConstraints cc) { writer.startElement(UIFormXmlConstants.ELEMENT_FORMS); try { if (!cc.insets.equals(new Insets(0, 0, 0, 0))) { @@ -702,8 +699,7 @@ public class RadFormLayoutManager extends RadAbstractGridLayoutManager implement } private static ConstantSize scaleSize(final FormSpec rowSpec, final RadContainer container, final int newPx) { - if (rowSpec.getSize() instanceof ConstantSize) { - ConstantSize oldSize = (ConstantSize) rowSpec.getSize(); + if (rowSpec.getSize() instanceof ConstantSize oldSize) { int oldPx = oldSize.getPixelSize(container.getDelegee()); double newValue = Math.round(oldSize.getValue() * newPx / oldPx * 10) / 10; return new ConstantSize(newValue, oldSize.getUnit()); @@ -859,8 +855,7 @@ public class RadFormLayoutManager extends RadAbstractGridLayoutManager implement @Override public Insets getValue(final RadComponent component) { - if (component.getCustomLayoutConstraints() instanceof CellConstraints) { - final CellConstraints cellConstraints = (CellConstraints)component.getCustomLayoutConstraints(); + if (component.getCustomLayoutConstraints() instanceof CellConstraints cellConstraints) { return cellConstraints.insets; } return new Insets(0, 0, 0, 0); @@ -868,8 +863,7 @@ public class RadFormLayoutManager extends RadAbstractGridLayoutManager implement @Override protected void setValueImpl(final RadComponent component, final Insets value) throws Exception { - if (component.getCustomLayoutConstraints() instanceof CellConstraints) { - final CellConstraints cellConstraints = (CellConstraints)component.getCustomLayoutConstraints(); + if (component.getCustomLayoutConstraints() instanceof CellConstraints cellConstraints) { cellConstraints.insets = value; FormLayout layout = (FormLayout) component.getParent().getLayout(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadGridBagLayoutManager.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadGridBagLayoutManager.java index 1b263e5b04b4..acc27a4538d8 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadGridBagLayoutManager.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadGridBagLayoutManager.java @@ -65,8 +65,7 @@ public class RadGridBagLayoutManager extends RadAbstractGridLayoutManager { @Override public void writeChildConstraints(final XmlWriter writer, final RadComponent child) { writeGridConstraints(writer, child); - if (child.getCustomLayoutConstraints() instanceof GridBagConstraints) { - GridBagConstraints gbc = (GridBagConstraints)child.getCustomLayoutConstraints(); + if (child.getCustomLayoutConstraints() instanceof GridBagConstraints gbc) { writer.startElement(UIFormXmlConstants.ELEMENT_GRIDBAG); try { if (!gbc.insets.equals(new Insets(0, 0, 0, 0))) { @@ -442,8 +441,7 @@ public class RadGridBagLayoutManager extends RadAbstractGridLayoutManager { @Override public Insets getValue(final RadComponent component) { - if (component.getCustomLayoutConstraints() instanceof GridBagConstraints) { - final GridBagConstraints gbc = (GridBagConstraints)component.getCustomLayoutConstraints(); + if (component.getCustomLayoutConstraints() instanceof GridBagConstraints gbc) { return gbc.insets; } return new Insets(0, 0, 0, 0); @@ -451,8 +449,7 @@ public class RadGridBagLayoutManager extends RadAbstractGridLayoutManager { @Override protected void setValueImpl(final RadComponent component, final Insets value) throws Exception { - if (component.getCustomLayoutConstraints() instanceof GridBagConstraints) { - final GridBagConstraints cellConstraints = (GridBagConstraints)component.getCustomLayoutConstraints(); + if (component.getCustomLayoutConstraints() instanceof GridBagConstraints cellConstraints) { cellConstraints.insets = value; GridBagLayout layout = (GridBagLayout)component.getParent().getLayout(); @@ -485,8 +482,7 @@ public class RadGridBagLayoutManager extends RadAbstractGridLayoutManager { @Override public Double getValue(final RadComponent component) { - if (component.getCustomLayoutConstraints() instanceof GridBagConstraints) { - GridBagConstraints gbc = (GridBagConstraints)component.getCustomLayoutConstraints(); + if (component.getCustomLayoutConstraints() instanceof GridBagConstraints gbc) { return myIsWeightX ? gbc.weightx : gbc.weighty; } return 0.0; @@ -494,8 +490,7 @@ public class RadGridBagLayoutManager extends RadAbstractGridLayoutManager { @Override protected void setValueImpl(final RadComponent component, final Double value) throws Exception { - if (component.getCustomLayoutConstraints() instanceof GridBagConstraints) { - GridBagConstraints gbc = (GridBagConstraints)component.getCustomLayoutConstraints(); + if (component.getCustomLayoutConstraints() instanceof GridBagConstraints gbc) { if (myIsWeightX) { gbc.weightx = value.doubleValue(); } @@ -544,8 +539,7 @@ public class RadGridBagLayoutManager extends RadAbstractGridLayoutManager { @Override public Integer getValue(final RadComponent component) { - if (component.getCustomLayoutConstraints() instanceof GridBagConstraints) { - GridBagConstraints gbc = (GridBagConstraints)component.getCustomLayoutConstraints(); + if (component.getCustomLayoutConstraints() instanceof GridBagConstraints gbc) { return myIsIpadX ? gbc.ipadx : gbc.ipady; } return 0; @@ -553,8 +547,7 @@ public class RadGridBagLayoutManager extends RadAbstractGridLayoutManager { @Override protected void setValueImpl(final RadComponent component, final Integer value) throws Exception { - if (component.getCustomLayoutConstraints() instanceof GridBagConstraints) { - GridBagConstraints gbc = (GridBagConstraints)component.getCustomLayoutConstraints(); + if (component.getCustomLayoutConstraints() instanceof GridBagConstraints gbc) { if (myIsIpadX) { gbc.ipadx = value.intValue(); } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadTabbedPane.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadTabbedPane.java index da070b3d368a..97f92e16633c 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadTabbedPane.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadTabbedPane.java @@ -80,8 +80,7 @@ public final class RadTabbedPane extends RadContainer implements ITabbedPane { private RadComponent getRadComponent(final int i) { RadComponent c = null; final Component component = getTabbedPane().getComponentAt(i); - if (component instanceof JComponent) { - JComponent jc = (JComponent) component; + if (component instanceof JComponent jc) { c = (RadComponent) jc.getClientProperty(RadComponent.CLIENT_PROP_RAD_COMPONENT); } return c; diff --git a/plugins/webp/src/com/android/tools/adtui/webp/WebpImageReaderSpi.java b/plugins/webp/src/com/android/tools/adtui/webp/WebpImageReaderSpi.java index 489c3ae917fd..d1881381ef2e 100644 --- a/plugins/webp/src/com/android/tools/adtui/webp/WebpImageReaderSpi.java +++ b/plugins/webp/src/com/android/tools/adtui/webp/WebpImageReaderSpi.java @@ -59,9 +59,8 @@ public class WebpImageReaderSpi extends ImageReaderSpi { @Override public boolean canDecodeInput(@NotNull Object source) throws IOException { - if (!(source instanceof ImageInputStream)) return false; + if (!(source instanceof ImageInputStream stream)) return false; - ImageInputStream stream = (ImageInputStream)source; long length = stream.length(); // The length may be -1 for files of unknown size. // Accept them for now and if needed, throw an IOException later. diff --git a/plugins/webp/src/com/android/tools/adtui/webp/WebpImageWriterSpi.java b/plugins/webp/src/com/android/tools/adtui/webp/WebpImageWriterSpi.java index 59467a1a6fe3..1aaafc27a8cc 100644 --- a/plugins/webp/src/com/android/tools/adtui/webp/WebpImageWriterSpi.java +++ b/plugins/webp/src/com/android/tools/adtui/webp/WebpImageWriterSpi.java @@ -224,9 +224,8 @@ public class WebpImageWriterSpi extends ImageWriterSpi { } else { RenderedImage renderedImage = image.getRenderedImage(); - if (renderedImage instanceof BufferedImage) { + if (renderedImage instanceof BufferedImage bufferedImage) { // Convert indexed to RGB - BufferedImage bufferedImage = (BufferedImage)renderedImage; if (renderedImage.getColorModel() instanceof IndexColorModel) { //noinspection UndesirableClassUsage BufferedImage rgb = new BufferedImage(bufferedImage.getWidth(), bufferedImage.getHeight(), BufferedImage.TYPE_INT_ARGB); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathLanguage.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathLanguage.java index eaf1ef6c4d17..174892a8b92f 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathLanguage.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathLanguage.java @@ -121,9 +121,8 @@ public final class XPathLanguage extends Language { @NotNull public @NlsSafe String getNodeText(@NotNull PsiElement element, boolean useFullName) { if (useFullName) { - if (element instanceof NavigationItem) { - final NavigationItem navigationItem = ((NavigationItem)element); - final ItemPresentation presentation = navigationItem.getPresentation(); + if (element instanceof NavigationItem navigationItem) { + final ItemPresentation presentation = navigationItem.getPresentation(); if (presentation != null) { final String text = presentation.getPresentableText(); if (text != null) { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/CompletionLists.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/CompletionLists.java index 2ae6c6b616a1..9eb38be62fb3 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/CompletionLists.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/CompletionLists.java @@ -291,8 +291,7 @@ public final class CompletionLists { xpathFile.accept(new PsiRecursiveElementVisitor() { @Override public void visitElement(@NotNull PsiElement e) { - if (e instanceof XPathNodeTest) { - final XPathNodeTest nodeTest = (XPathNodeTest)e; + if (e instanceof XPathNodeTest nodeTest) { final XPathNodeTest.PrincipalType _principalType = nodeTest.getPrincipalType(); if (_principalType == principalType) { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/XPathCompletionContributor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/XPathCompletionContributor.java index f1a149a065af..9f9e0fdfbd39 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/XPathCompletionContributor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/XPathCompletionContributor.java @@ -162,8 +162,7 @@ public class XPathCompletionContributor extends CompletionContributor { prefix = "$" + prefix; } - if (element.getParent() instanceof XPathNodeTest) { - final XPathNodeTest nodeTest = ((XPathNodeTest)element.getParent()); + if (element.getParent() instanceof XPathNodeTest nodeTest) { if (nodeTest.isNameTest()) { final PrefixedName prefixedName = nodeTest.getQName(); assert prefixedName != null; diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/ResolveUtil.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/ResolveUtil.java index 5503b86899d6..be6bfd5d46d4 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/ResolveUtil.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/ResolveUtil.java @@ -229,8 +229,7 @@ public final class ResolveUtil { PsiElement cur = elt; do { - if (cur instanceof XmlTag) { - final XmlTag tag = (XmlTag)cur; + if (cur instanceof XmlTag tag) { if (!processor.process(tag)) { if (processor instanceof ResolveProcessor) { return ((ResolveProcessor)processor).getResult(); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/ExpectedTypeUtil.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/ExpectedTypeUtil.java index d6364d9d3249..0b47e7d273de 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/ExpectedTypeUtil.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/ExpectedTypeUtil.java @@ -121,11 +121,10 @@ public final class ExpectedTypeUtil { public static boolean isExplicitConversion(XPathExpression expression) { expression = unparenthesize(expression); - if (!(expression instanceof XPathFunctionCall)) { + if (!(expression instanceof XPathFunctionCall call)) { return false; } - final XPathFunctionCall call = ((XPathFunctionCall)expression); if (call.getArgumentList().length != 1) { return false; } else if (call.getQName().getPrefix() != null) { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/XPathAnnotator.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/XPathAnnotator.java index a9017c249a8b..ab4f0799ad82 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/XPathAnnotator.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/XPathAnnotator.java @@ -153,8 +153,7 @@ public final class XPathAnnotator extends XPath2ElementVisitor implements Annota } else if (number == expression.getROperand()) { final XPathExpression next = PsiTreeUtil.getParentOfType(PsiTreeUtil.nextLeaf(expression), XPathExpression.class, true); - if (next instanceof XPathBinaryExpression) { - final XPathBinaryExpression left = (XPathBinaryExpression)next; + if (next instanceof XPathBinaryExpression left) { final XPathExpression rOperand = left.getROperand(); if (rOperand != null && lOperand != null) { final String display = number.getText() + " " + left.getOperationSign(); @@ -539,8 +538,7 @@ public final class XPathAnnotator extends XPath2ElementVisitor implements Annota private static void checkPrefixReferences(AnnotationHolder holder, QNameElement element, ContextProvider myProvider) { final PsiReference[] references = element.getReferences(); for (PsiReference reference : references) { - if (reference instanceof PrefixReference) { - final PrefixReference pr = ((PrefixReference)reference); + if (reference instanceof PrefixReference pr) { if (!pr.isSoft() && pr.isUnresolved()) { final TextRange range = pr.getRangeInElement().shiftRight(pr.getElement().getTextRange().getStartOffset()); AnnotationBuilder builder = diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/HardwiredNamespacePrefix.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/HardwiredNamespacePrefix.java index 8cc9aa51449e..8ba512f23539 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/HardwiredNamespacePrefix.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/HardwiredNamespacePrefix.java @@ -41,11 +41,10 @@ public class HardwiredNamespacePrefix extends XPathInspection { return new Visitor(manager, isOnTheFly) { @Override protected void checkExpression(XPathExpression expression) { - if (!(expression instanceof XPathBinaryExpression)) { + if (!(expression instanceof XPathBinaryExpression expr)) { return; } - final XPathBinaryExpression expr = (XPathBinaryExpression)expression; - if (expr.getOperator() == XPathTokenTypes.EQ) { + if (expr.getOperator() == XPathTokenTypes.EQ) { final XPathExpression lop = expr.getLOperand(); final XPathExpression rop = expr.getROperand(); @@ -85,11 +84,10 @@ public class HardwiredNamespacePrefix extends XPathInspection { } private static boolean isNameFunctionCall(XPathExpression op1) { - if (!(op1 instanceof XPathFunctionCall)) { + if (!(op1 instanceof XPathFunctionCall fc)) { return false; } - final XPathFunctionCall fc = (XPathFunctionCall)op1; - return "name".equals(fc.getFunctionName()); + return "name".equals(fc.getFunctionName()); } @Override diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/IndexZeroPredicate.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/IndexZeroPredicate.java index ab5daf2b272d..8c045a013005 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/IndexZeroPredicate.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/IndexZeroPredicate.java @@ -65,9 +65,8 @@ public class IndexZeroPredicate extends XPathInspection { addProblem(myManager.createProblemDescriptor(expr, message, (LocalQuickFix)null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly)); } - } else if (expr instanceof XPathBinaryExpression && expr.getType() == XPathType.BOOLEAN) { - final XPathBinaryExpression expression = (XPathBinaryExpression)expr; - if (!XPathTokenTypes.BOOLEAN_OPERATIONS.contains(expression.getOperator())) { + } else if (expr instanceof XPathBinaryExpression expression && expr.getType() == XPathType.BOOLEAN) { + if (!XPathTokenTypes.BOOLEAN_OPERATIONS.contains(expression.getOperator())) { return; } @@ -98,12 +97,11 @@ public class IndexZeroPredicate extends XPathInspection { private static boolean isPosition(XPathExpression expression) { expression = ExpectedTypeUtil.unparenthesize(expression); - if (!(expression instanceof XPathFunctionCall)) { + if (!(expression instanceof XPathFunctionCall call)) { return false; } - final XPathFunctionCall call = (XPathFunctionCall)expression; - final PrefixedName qName = call.getQName(); + final PrefixedName qName = call.getQName(); if (qName.getPrefix() != null) return false; return "position".equals(qName.getLocalName()); } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java index cb0e8f62583c..4bccbd9555d6 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java @@ -351,11 +351,10 @@ public final class XsltSupport { @Override public CachedValueProvider.Result compute(PsiFile psiFile) { - if (!(psiFile instanceof XmlFile)) { + if (!(psiFile instanceof XmlFile xmlFile)) { return CachedValueProvider.Result.create(XsltChecker.LanguageLevel.NONE, PsiModificationTracker.MODIFICATION_COUNT); } - final XmlFile xmlFile = (XmlFile)psiFile; if (psiFile instanceof PsiFileEx) { if (((PsiFileEx)psiFile).isContentsLoaded()) { final XmlDocument doc = xmlFile.getDocument(); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java index e8a9bd6d64bb..a8eee440b623 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java @@ -165,8 +165,7 @@ final class AssociationsEditor implements Disposable { @Nullable private static Object getObject(Object component) { - if (!(component instanceof DefaultMutableTreeNode)) return null; - final DefaultMutableTreeNode node = ((DefaultMutableTreeNode)component); + if (!(component instanceof DefaultMutableTreeNode node)) return null; final Object userObject = node.getUserObject(); if (!(userObject instanceof ProjectViewNode)) return null; return ((ProjectViewNode)userObject).getValue(); @@ -365,8 +364,7 @@ final class AssociationsEditor implements Disposable { int row, boolean hasFocus) { final Object object = getObject(value); - if (object instanceof PsiFile) { - final PsiFile file = (PsiFile)object; + if (object instanceof PsiFile file) { final Object userObject = ((DefaultMutableTreeNode)value).getUserObject(); if (myManager.getAssociationsFor(file).length > 0) { //noinspection unchecked diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProviderBase.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProviderBase.java index 877575c147a9..2ca577f5fc99 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProviderBase.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProviderBase.java @@ -86,8 +86,7 @@ public abstract class XsltContextProviderBase extends ContextProvider { } private static void fillFromSchema(PsiFile file, ElementNames names) { - if (!(file instanceof XmlFile)) return; - final XmlFile f = (XmlFile)file; + if (!(file instanceof XmlFile f)) return; final XmlDocument d = f.getDocument(); if (d == null) return; final XmlTag rootTag = d.getRootTag(); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltNamespaceContext.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltNamespaceContext.java index 4f3760a71da8..b784239a8a32 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltNamespaceContext.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltNamespaceContext.java @@ -104,8 +104,7 @@ public class XsltNamespaceContext implements NamespaceContext { return new SchemaPrefix(attribute, textRange, prefix) { @Override public boolean equals(Object obj) { - if (obj instanceof SchemaPrefix) { - final SchemaPrefix p = (SchemaPrefix)obj; + if (obj instanceof SchemaPrefix p) { return prefix.equals(p.getName()) && p.getParent() == attribute; } return super.equals(obj); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XPathLanguageInjector.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XPathLanguageInjector.java index ab4f0b93af70..f881599a690e 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XPathLanguageInjector.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XPathLanguageInjector.java @@ -133,8 +133,7 @@ public class XPathLanguageInjector implements MultiHostInjector { public void getLanguagesToInject(@NotNull MultiHostRegistrar registrar, @NotNull PsiElement context) { XmlAttributeValueImpl value = (XmlAttributeValueImpl)context; PsiElement parent = value.getParent(); - if (!(parent instanceof XmlAttribute)) return; - final XmlAttribute attribute = (XmlAttribute)parent; + if (!(parent instanceof XmlAttribute attribute)) return; if (!XsltSupport.isXPathAttribute(attribute)) return; ASTNode type = value.findChildByType(XmlElementType.XML_ENTITY_REF); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltDocumentationProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltDocumentationProvider.java index 828f8edffc7f..3853fcbe48af 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltDocumentationProvider.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltDocumentationProvider.java @@ -126,8 +126,7 @@ final class XsltDocumentationProvider implements DocumentationProvider { @Override public @Nullable @Nls String generateDoc(PsiElement psiElement, PsiElement psiElement1) { - if (psiElement instanceof DocElement) { - final DocElement element = (DocElement)psiElement; + if (psiElement instanceof DocElement element) { return getDocumentation(element.getName(), element.getCategory()); } @@ -217,8 +216,7 @@ final class XsltDocumentationProvider implements DocumentationProvider { } } } - if (object instanceof FunctionLookup) { - final FunctionLookup lookup = ((FunctionLookup)object); + if (object instanceof FunctionLookup lookup) { return new DocElement(mgr, psiElement, "function", lookup.getName()); } else if (object instanceof ElementProvider) { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltFormattingModelBuilder.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltFormattingModelBuilder.java index 19f008e9005e..7d512aa09a29 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltFormattingModelBuilder.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltFormattingModelBuilder.java @@ -65,8 +65,7 @@ final class XsltFormattingModelBuilder implements CustomFormattingModelBuilder { static Block getDelegatingBlock(final CodeStyleSettings settings, FormattingModel baseModel) { final Block block = baseModel.getRootBlock(); - if (block instanceof XmlBlock) { - final XmlBlock xmlBlock = (XmlBlock)block; + if (block instanceof XmlBlock xmlBlock) { final XmlPolicy xmlPolicy = new XmlPolicy(settings, baseModel.getDocumentModel()) { @Override diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltImplicitUsagesProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltImplicitUsagesProvider.java index 4a404b05cae0..f28a8c12e925 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltImplicitUsagesProvider.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltImplicitUsagesProvider.java @@ -19,11 +19,10 @@ import org.jetbrains.annotations.NotNull; public final class XsltImplicitUsagesProvider implements ImplicitUsageProvider { @Override public boolean isImplicitUsage(@NotNull PsiElement element) { - if (!(element instanceof XmlAttribute)) { + if (!(element instanceof XmlAttribute attr)) { return false; } - final XmlAttribute attr = (XmlAttribute)element; - if (!attr.isNamespaceDeclaration()) { + if (!attr.isNamespaceDeclaration()) { return false; } final PsiFile file = attr.getContainingFile(); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltStuffProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltStuffProvider.java index f1db97a72645..fa3f848209d6 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltStuffProvider.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltStuffProvider.java @@ -137,12 +137,10 @@ public class XsltStuffProvider implements UsageGroupingRuleProvider { @Nullable @Override protected UsageGroup getParentGroupFor(@NotNull Usage usage, UsageTarget @NotNull [] targets) { - if (usage instanceof UsageInfo2UsageAdapter) { - final UsageInfo2UsageAdapter u = (UsageInfo2UsageAdapter)usage; - final UsageInfo usageInfo = u.getUsageInfo(); - if (usageInfo instanceof MoveRenameUsageInfo) { - final MoveRenameUsageInfo info = (MoveRenameUsageInfo)usageInfo; - return buildGroup(info.getReferencedElement(), usageInfo, true); + if (usage instanceof UsageInfo2UsageAdapter u) { + final UsageInfo usageInfo = u.getUsageInfo(); + if (usageInfo instanceof MoveRenameUsageInfo info) { + return buildGroup(info.getReferencedElement(), usageInfo, true); } else { for (UsageTarget target : targets) { UsageGroup group = target instanceof PsiElementUsageTarget ? @@ -157,9 +155,8 @@ public class XsltStuffProvider implements UsageGroupingRuleProvider { @Nullable private static UsageGroup buildGroup(PsiElement referencedElement, UsageInfo u, boolean mustBeForeign) { - if (referencedElement instanceof XsltParameter) { - final XsltParameter parameter = (XsltParameter)referencedElement; - final PsiElement element = u.getElement(); + if (referencedElement instanceof XsltParameter parameter) { + final PsiElement element = u.getElement(); if (element == null) return null; final XsltTemplate template = XsltCodeInsightUtil.getTemplate(element, false); if (template == null) return null; diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java index b2c6eb0abdd4..40e836ae8768 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java @@ -57,9 +57,8 @@ abstract class SimpleAttributeReference implements PsiReference { @Override public boolean isReferenceTo(@NotNull PsiElement element) { - if (this instanceof PsiPolyVariantReference) { - final PsiPolyVariantReference reference = (PsiPolyVariantReference)this; - final ResolveResult[] results = reference.multiResolve(false); + if (this instanceof PsiPolyVariantReference reference) { + final ResolveResult[] results = reference.multiResolve(false); for (ResolveResult result : results) { if (Comparing.equal(result.getElement(), element)) return true; } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/XsltReferenceProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/XsltReferenceProvider.java index 693b84f0653b..71c3eb88623b 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/XsltReferenceProvider.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/XsltReferenceProvider.java @@ -44,8 +44,7 @@ public class XsltReferenceProvider extends PsiReferenceProvider { @Override public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement e, @NotNull ProcessingContext context) { final PsiElement element = e.getParent(); - if (element instanceof XmlAttribute) { - final XmlAttribute attribute = (XmlAttribute)element; + if (element instanceof XmlAttribute attribute) { CachedValue cachedValue = attribute.getUserData(CACHED_XSLT_REFS); if (cachedValue == null) { @@ -187,9 +186,8 @@ public class XsltReferenceProvider extends PsiReferenceProvider { assert !super.isReferenceTo(element); if (element == myParam) return false; - if (!(element instanceof XsltParameter)) return false; + if (!(element instanceof XsltParameter param)) return false; - final XsltParameter param = ((XsltParameter)element); final String name = param.getName(); if (name == null || !name.equals(myParam.getName())) return false; diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/intentions/InlineXslAttribute.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/intentions/InlineXslAttribute.java index 5b9be9e5a780..833138db162b 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/intentions/InlineXslAttribute.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/intentions/InlineXslAttribute.java @@ -78,16 +78,14 @@ public class InlineXslAttribute implements IntentionAction { final XmlTag[] exprs = tag.findSubTags("value-of", XsltSupport.XSLT_NS); final PsiElement[] children = tag.getChildren(); for (PsiElement child : children) { - if (child instanceof XmlText) { - final XmlText text = (XmlText)child; - if (text.getText().trim().length() == 0) { + if (child instanceof XmlText text) { + if (text.getText().trim().length() == 0) { if (texts.length == 0 && exprs.length == 0) { return false; } } - } else if (child instanceof XmlTag) { - final XmlTag t = (XmlTag)child; - if (XsltSupport.isXsltTag(t)) { + } else if (child instanceof XmlTag t) { + if (XsltSupport.isXsltTag(t)) { if ("text".equals(t.getLocalName())) { } else if ("value-of".equals(t.getLocalName())) { @@ -115,14 +113,12 @@ public class InlineXslAttribute implements IntentionAction { final StringBuilder sb = new StringBuilder(); final PsiElement[] children = tag.getChildren(); for (PsiElement child : children) { - if (child instanceof XmlText) { - final XmlText text = (XmlText)child; - if (text.getText().trim().length() > 0) { + if (child instanceof XmlText text) { + if (text.getText().trim().length() > 0) { sb.append(text.getText().replaceAll("\"", """)); } - } else if (child instanceof XmlTag) { - final XmlTag t = (XmlTag)child; - if (XsltSupport.isXsltTag(t)) { + } else if (child instanceof XmlTag t) { + if (XsltSupport.isXsltTag(t)) { if ("text".equals(t.getLocalName())) { sb.append(t.getValue().getText().replaceAll("\"", """)); } else if ("value-of".equals(t.getLocalName())) { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltFindUsagesProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltFindUsagesProvider.java index 8b334a8d603e..0aec1c537958 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltFindUsagesProvider.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltFindUsagesProvider.java @@ -80,9 +80,8 @@ class XsltFindUsagesProvider implements FindUsagesProvider { @NotNull public @NlsSafe String getNodeText(@NotNull PsiElement element, boolean useFullName) { if (useFullName) { - if (element instanceof NavigationItem) { - final NavigationItem navigationItem = ((NavigationItem)element); - final ItemPresentation presentation = navigationItem.getPresentation(); + if (element instanceof NavigationItem navigationItem) { + final ItemPresentation presentation = navigationItem.getPresentation(); if (presentation != null && presentation.getPresentableText() != null) { return presentation.getPresentableText(); } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltVariableImpl.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltVariableImpl.java index eac7609406af..8b33700a43bf 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltVariableImpl.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltVariableImpl.java @@ -57,10 +57,9 @@ public class XsltVariableImpl extends XsltElementImpl implements XsltVariable { return XPathType.fromString(attr.getValue()); } final XPathExpression value = getValue(); - if (value instanceof XPathVariableReference) { + if (value instanceof XPathVariableReference reference) { // recursive reference - final XPathVariableReference reference = (XPathVariableReference)value; - if (reference.resolve() == this) { + if (reference.resolve() == this) { return XPathType.UNKNOWN; } } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/extractTemplate/XsltExtractTemplateAction.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/extractTemplate/XsltExtractTemplateAction.java index 3be3363d1d45..6d60fc39b651 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/extractTemplate/XsltExtractTemplateAction.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/extractTemplate/XsltExtractTemplateAction.java @@ -157,9 +157,8 @@ public class XsltExtractTemplateAction extends XsltRefactoringActionBase { PsiElement e = start; while (e != null) { - if (e instanceof XmlTag) { - final XmlTag tag = (XmlTag)e; - if (XsltSupport.isVariable(tag)) { + if (e instanceof XmlTag tag) { + if (XsltSupport.isVariable(tag)) { final XsltVariable variable = XsltElementFactory.getInstance().wrapElement(tag, XsltVariable.class); final LocalSearchScope searchScope = new LocalSearchScope(parentScope); final Query query = ReferencesSearch.search(variable, searchScope); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/introduceParameter/IntroduceParameterProcessor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/introduceParameter/IntroduceParameterProcessor.java index b42d9cba77a2..16471a5e3a7d 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/introduceParameter/IntroduceParameterProcessor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/introduceParameter/IntroduceParameterProcessor.java @@ -125,9 +125,8 @@ class IntroduceParameterProcessor extends BaseRefactoringProcessor { XmlTag anchorParam = null; for (UsageInfo info : usageInfos) { - if (info instanceof XPathUsageInfo) { - final XPathUsageInfo x = (XPathUsageInfo)info; - final XPathVariableReference variableReference = XPathChangeUtil.createVariableReference(x.getExpression(), mySettings.getName()); + if (info instanceof XPathUsageInfo x) { + final XPathVariableReference variableReference = XPathChangeUtil.createVariableReference(x.getExpression(), mySettings.getName()); final XmlAttribute attribute = x.getAttribute(); assert attribute != null; diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java index 91d94ab8368c..1fe282e93a34 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java @@ -292,8 +292,7 @@ class XsltRunSettingsEditor extends SettingsEditor final Module[] modules = ModuleManager.getInstance(project).getModules(); myModule.setModel(new DefaultComboBoxModel<>(ArrayUtil.mergeArrays(new Object[]{""}, modules))); myModule.setRenderer(SimpleListCellRenderer.create((label, value, index) -> { - if (value instanceof Module) { - final Module module = (Module)value; + if (value instanceof Module module) { final String moduleName = ReadAction.compute(() -> module.getName()); label.setText(moduleName); label.setIcon(ModuleType.get(module).getIcon()); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltPatternValidator.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltPatternValidator.java index 74ca5fd6e418..7ade16f0f837 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltPatternValidator.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltPatternValidator.java @@ -46,8 +46,7 @@ class XsltPatternValidator { } private static boolean checkPattern(XPathExpression element) { - if (element instanceof XPathBinaryExpression) { - final XPathBinaryExpression expression = (XPathBinaryExpression)element; + if (element instanceof XPathBinaryExpression expression) { if (expression.getOperator() == XPathTokenTypes.UNION) { if (checkPattern(expression.getLOperand()) && checkPattern(expression.getROperand())) { return true; @@ -101,8 +100,7 @@ class XsltPatternValidator { } private static boolean checkIdKeyPattern(PsiElement child) { - if (child instanceof XPathFunctionCall) { - final XPathFunctionCall call = (XPathFunctionCall)child; + if (child instanceof XPathFunctionCall call) { final XPathExpression[] arguments = call.getArgumentList(); if ("id".equals(call.getFunctionName())) { if (arguments.length != 1) return false; diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/InspectionUtil.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/InspectionUtil.java index 74a1b9d68994..d57150f31d47 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/InspectionUtil.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/InspectionUtil.java @@ -79,9 +79,8 @@ public final class InspectionUtil { return isSuppressedAt(prevSibling, tool); } } - if (prevSibling instanceof XmlComment) { - final XmlComment comment = (XmlComment)prevSibling; - final String text = comment.getCommentText(); + if (prevSibling instanceof XmlComment comment) { + final String text = comment.getCommentText(); final Matcher matcher = SUPPRESSION_PATTERN.matcher(text); if (matcher.matches()) { final String[] strings = matcher.group(1).split(","); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/SuppressInspectionAction.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/SuppressInspectionAction.java index 97259f0d668b..ea76322ba673 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/SuppressInspectionAction.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/SuppressInspectionAction.java @@ -79,9 +79,8 @@ abstract class SuppressInspectionAction extends SuppressIntentionAction { prevSibling = PsiTreeUtil.getPrevSiblingOfType(prevSibling, XmlComment.class); } } - if (prevSibling instanceof XmlComment) { - final XmlComment comment = (XmlComment)prevSibling; - final String text = comment.getCommentText(); + if (prevSibling instanceof XmlComment comment) { + final String text = comment.getCommentText(); if (InspectionUtil.SUPPRESSION_PATTERN.matcher(text).matches()) { final String s = text.trim() + ", " + myToolId; final XmlComment newComment = createComment(project, s); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/TemplateInvocationInspection.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/TemplateInvocationInspection.java index d4eac42552c5..e0dfa4976565 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/TemplateInvocationInspection.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/TemplateInvocationInspection.java @@ -74,9 +74,8 @@ public class TemplateInvocationInspection extends XsltInspection { } } - if (call instanceof XsltCallTemplate) { - final XsltCallTemplate ct = ((XsltCallTemplate)call); - final PsiElement nameToken = ct.getNameIdentifier(); + if (call instanceof XsltCallTemplate ct) { + final PsiElement nameToken = ct.getNameIdentifier(); final XsltTemplate template = ct.getTemplate(); if (template != null) { diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ExpressionTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ExpressionTest.java index ad998ca2eb58..75c71a80aed0 100644 --- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ExpressionTest.java +++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ExpressionTest.java @@ -129,8 +129,7 @@ public class XPath2ExpressionTest extends TestBase { // all these cases must be green myFixture.checkHighlighting(); - if (symmetric && expression instanceof XPathBinaryExpression) { - final XPathBinaryExpression expr = (XPathBinaryExpression)expression; + if (symmetric && expression instanceof XPathBinaryExpression expr) { if (expr.getLOperand().getType() != expr.getROperand().getType()) { myFixture.configureByText(XPathFileType.XPATH2, expr.getROperand().getText() + " " + expr.getOperationSign() + " " + expr.getLOperand().getText()); diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java index f009ba437163..e31cae10da46 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java @@ -221,9 +221,8 @@ public class XPathEvalAction extends XPathAction { LOG.debug("result = " + result); LOG.assertTrue(result != null, "null result?"); - if (result instanceof List) { - final List list = (List)result; - if (!list.isEmpty()) { + if (result instanceof List list) { + if (!list.isEmpty()) { if (cfg.HIGHLIGHT_RESULTS) { highlightResult(contextNode, editor, list); } @@ -372,10 +371,9 @@ public class XPathEvalAction extends XPathAction { for (final Object o : list) { LOG.assertTrue(o != null, "null element?"); - if (o instanceof PsiElement) { - final PsiElement element = (PsiElement)o; + if (o instanceof PsiElement element) { - if (element.getContainingFile() == contextNode.getContainingFile()) { + if (element.getContainingFile() == contextNode.getContainingFile()) { lowestOffset = highlightElement(editor, element, cfg, lowestOffset); } } else { @@ -492,9 +490,8 @@ public class XPathEvalAction extends XPathAction { for (int i = 0; i < size; i++) { indicator.checkCanceled(); Object o = list.get(i); - if (o instanceof PsiElement) { - final PsiElement element = (PsiElement)o; - processor.process(new UsageInfo2UsageAdapter(new UsageInfo(element))); + if (o instanceof PsiElement element) { + processor.process(new UsageInfo2UsageAdapter(new UsageInfo(element))); indicator.setText2(element.getContainingFile().getName()); } indicator.setFraction(i / (double)size); diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathExpressionGenerator.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathExpressionGenerator.java index 9a56387bd755..67d09cb0a9d1 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathExpressionGenerator.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathExpressionGenerator.java @@ -270,13 +270,11 @@ public final class XPathExpressionGenerator { try { final XPath xPath = xpathSupport.createXPath(file, uniquePath, Namespace.fromMap(usedPrefixes)); final Object o = xPath.evaluate(file.getDocument()); - if (o instanceof List) { + if (o instanceof List list) { //noinspection RawUseOfParameterizedType - final List list = (List)o; - if (list.size() > 1) { - if (what instanceof XmlTag) { - final XmlTag tag = (XmlTag)what; - final XmlAttribute[] attributes = tag.getAttributes(); + if (list.size() > 1) { + if (what instanceof XmlTag tag) { + final XmlAttribute[] attributes = tag.getAttributes(); for (XmlAttribute attribute : attributes) { final String name = attribute.getName(); final XmlAttributeDescriptor descriptor = attribute.getDescriptor(); diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/SearchScope.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/SearchScope.java index 91eea0d0dccb..70b1393bf5b3 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/SearchScope.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/SearchScope.java @@ -171,8 +171,7 @@ public final class SearchScope { assert myCustomScope != null; final ContentIterator iterator; - if (myCustomScope instanceof GlobalSearchScope) { - final GlobalSearchScope searchScope = (GlobalSearchScope)myCustomScope; + if (myCustomScope instanceof GlobalSearchScope searchScope) { iterator = new MyFileIterator(processor, virtualFile13 -> searchScope.contains(virtualFile13)); if (searchScope.isSearchInLibraries()) { final OrderEnumerator enumerator = OrderEnumerator.orderEntries(project).withoutModuleSourceEntries().withoutDepModules(); diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/XPathUsageSearcher.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/XPathUsageSearcher.java index ec5c5e63c4cf..7128a8eb7a0b 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/XPathUsageSearcher.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/XPathUsageSearcher.java @@ -103,9 +103,8 @@ class XPathUsageSearcher implements UsageSearcher { FindBundle.message("find.searching.for.string.in.file.progress", myExpression.expression, t.getPresentableUrl())); final PsiFile psiFile = myManager.findFile(t); - if (psiFile instanceof XmlFile) { - final XmlFile t1 = (XmlFile)psiFile; - final XmlDocument document; + if (psiFile instanceof XmlFile t1) { + final XmlDocument document; FileViewProvider fileViewProvider = t1.getViewProvider(); if (fileViewProvider instanceof TemplateLanguageFileViewProvider) { diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/InputExpressionDialog.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/InputExpressionDialog.java index 6184ec1101d6..b98a56eda57f 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/InputExpressionDialog.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/InputExpressionDialog.java @@ -214,9 +214,8 @@ public abstract class InputExpressionDialog extends if (element instanceof QNameElement) { final PsiReference[] references = element.getReferences(); for (PsiReference reference : references) { - if (reference instanceof PrefixReference) { - final PrefixReference prefixReference = (PrefixReference)reference; - if (prefixReference.isUnresolved()) { + if (reference instanceof PrefixReference prefixReference) { + if (prefixReference.isUnresolved()) { prefixes.add(prefixReference.getPrefix()); } } diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/util/HighlighterUtil.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/util/HighlighterUtil.java index f880c39a19c5..848c18f32108 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/util/HighlighterUtil.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/util/HighlighterUtil.java @@ -125,9 +125,8 @@ public final class HighlighterUtil { public static RangeHighlighter highlightNode(Editor editor, final PsiElement node, TextAttributes attrs, Config cfg) { TextRange range; final PsiElement realElement; - if ((node instanceof XmlTag) && cfg.isHighlightStartTagOnly()) { - XmlTag tag = (XmlTag)node; - realElement = MyPsiUtil.getNameElement(tag); + if ((node instanceof XmlTag tag) && cfg.isHighlightStartTagOnly()) { + realElement = MyPsiUtil.getNameElement(tag); range = realElement.getTextRange(); } else { range = node.getTextRange(); diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltStackFrame.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltStackFrame.java index feeb9295595a..66610a610758 100644 --- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltStackFrame.java +++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltStackFrame.java @@ -142,8 +142,7 @@ public class XsltStackFrame extends XStackFrame { @Override public void computeChildren(@NotNull XCompositeNode node) { - if (myVariable.getValue().getValue() instanceof Value.NodeSet) { - final Value.NodeSet set = (Value.NodeSet)myVariable.getValue().getValue(); + if (myVariable.getValue().getValue() instanceof Value.NodeSet set) { final XValueChildrenList list = new XValueChildrenList(); for (final Value.Node n : set.getNodes()) { list.add(n.myXPath, new NodeValue(n)); diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/GeneratedStructureRenderer.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/GeneratedStructureRenderer.java index c17cbcca4e13..91edd5f52491 100644 --- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/GeneratedStructureRenderer.java +++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/GeneratedStructureRenderer.java @@ -44,8 +44,7 @@ class GeneratedStructureRenderer extends ColoredTreeCellRenderer { // "..." node append((String)o, SimpleTextAttributes.SYNTHETIC_ATTRIBUTES); setToolTipText(XsltDebuggerBundle.message("tooltip.element.is.not.finished.yet")); - } else if (o instanceof OutputEventQueue.NodeEvent) { - final OutputEventQueue.NodeEvent event = (OutputEventQueue.NodeEvent)o; + } else if (o instanceof OutputEventQueue.NodeEvent event) { final OutputEventQueue.NodeEvent.QName qname = event.getQName(); switch (event.getType()) { case OutputEventQueue.START_ELEMENT -> { diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/CopyValueAction.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/CopyValueAction.java index ab5c52d3b752..6d6a141eecfe 100644 --- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/CopyValueAction.java +++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/CopyValueAction.java @@ -45,8 +45,7 @@ public class CopyValueAction extends AnAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { final DefaultMutableTreeNode node = e.getData(SELECTED_NODE); - if (node instanceof GeneratedStructureModel.StructureNode) { - final GeneratedStructureModel.StructureNode structureNode = (GeneratedStructureModel.StructureNode)node; + if (node instanceof GeneratedStructureModel.StructureNode structureNode) { final OutputEventQueue.NodeEvent event = structureNode.getUserObject(); setClipboardData(event.getValue()); } @@ -58,8 +57,7 @@ public class CopyValueAction extends AnAction { protected static boolean isEnabled(AnActionEvent e) { final DefaultMutableTreeNode node = e.getData(SELECTED_NODE); - if (node instanceof GeneratedStructureModel.StructureNode) { - final GeneratedStructureModel.StructureNode structureNode = (GeneratedStructureModel.StructureNode)node; + if (node instanceof GeneratedStructureModel.StructureNode structureNode) { final OutputEventQueue.NodeEvent event = structureNode.getUserObject(); return event != null && event.getValue() != null; } diff --git a/plugins/yaml/src/org/jetbrains/yaml/YAMLSpellcheckerStrategy.java b/plugins/yaml/src/org/jetbrains/yaml/YAMLSpellcheckerStrategy.java index c9170bea33f6..85cf6731a026 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/YAMLSpellcheckerStrategy.java +++ b/plugins/yaml/src/org/jetbrains/yaml/YAMLSpellcheckerStrategy.java @@ -40,8 +40,7 @@ final class YAMLSpellcheckerStrategy extends SpellcheckingStrategy { private final Tokenizer myQuotedTextTokenizer = new TokenizerBase<>(PlainTextSplitter.getInstance()) { @Override public void tokenize(@NotNull PsiElement leafElement, @NotNull TokenConsumer consumer) { - if (leafElement instanceof LeafPsiElement && leafElement.getParent() instanceof YAMLQuotedText) { - YAMLQuotedText quotedText = (YAMLQuotedText)leafElement.getParent(); + if (leafElement instanceof LeafPsiElement && leafElement.getParent() instanceof YAMLQuotedText quotedText) { TextRange range = ElementManipulators.getValueTextRange(quotedText); if (!range.isEmpty()) { diff --git a/plugins/yaml/src/org/jetbrains/yaml/YAMLWebReferenceContributor.java b/plugins/yaml/src/org/jetbrains/yaml/YAMLWebReferenceContributor.java index 3bcd8a0dfed9..c5730d9e2725 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/YAMLWebReferenceContributor.java +++ b/plugins/yaml/src/org/jetbrains/yaml/YAMLWebReferenceContributor.java @@ -28,11 +28,9 @@ final class YAMLWebReferenceContributor extends PsiReferenceContributor { @Override public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) { - if (!(element instanceof YAMLScalar)) return PsiReference.EMPTY_ARRAY; + if (!(element instanceof YAMLScalar scalarElement)) return PsiReference.EMPTY_ARRAY; if (!element.textContains(':')) return PsiReference.EMPTY_ARRAY; - YAMLScalar scalarElement = (YAMLScalar)element; - LiteralTextEscaper escaper = scalarElement.createLiteralTextEscaper(); if (!escaper.isOneLine()) return PsiReference.EMPTY_ARRAY; diff --git a/plugins/yaml/src/org/jetbrains/yaml/meta/impl/YamlMetaTypeCompletionProviderBase.java b/plugins/yaml/src/org/jetbrains/yaml/meta/impl/YamlMetaTypeCompletionProviderBase.java index 1e661071009e..070b23d06df0 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/meta/impl/YamlMetaTypeCompletionProviderBase.java +++ b/plugins/yaml/src/org/jetbrains/yaml/meta/impl/YamlMetaTypeCompletionProviderBase.java @@ -111,8 +111,7 @@ public abstract class YamlMetaTypeCompletionProviderBase extends CompletionProvi } } - if (insertedScalar.getParent() instanceof YAMLSequenceItem) { - YAMLSequenceItem currentItem = (YAMLSequenceItem)insertedScalar.getParent(); + if (insertedScalar.getParent() instanceof YAMLSequenceItem currentItem) { List siblingItems = Optional.ofNullable(currentItem.getParent()) .filter(YAMLSequence.class::isInstance) diff --git a/plugins/yaml/src/org/jetbrains/yaml/meta/impl/YamlMetaTypeProvider.java b/plugins/yaml/src/org/jetbrains/yaml/meta/impl/YamlMetaTypeProvider.java index 4310de123d93..76726f1a9cf2 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/meta/impl/YamlMetaTypeProvider.java +++ b/plugins/yaml/src/org/jetbrains/yaml/meta/impl/YamlMetaTypeProvider.java @@ -89,8 +89,7 @@ public class YamlMetaTypeProvider { Field root = myMetaModel.getRoot((YAMLDocument)typed); return FieldAndRelation.forNullable(root, Field.Relation.OBJECT_CONTENTS); } - if (typed instanceof YAMLSequenceItem) { - YAMLSequenceItem sequenceItem = (YAMLSequenceItem)typed; + if (typed instanceof YAMLSequenceItem sequenceItem) { YAMLSequence sequence = ObjectUtils.tryCast(sequenceItem.getParent(), YAMLSequence.class); if (sequence == null) { debug(() -> "Unexpected: sequenceItem parent is not a sequence: " + sequenceItem.getParent()); @@ -109,8 +108,7 @@ public class YamlMetaTypeProvider { return null; } - if (typed instanceof YAMLKeyValue) { - YAMLKeyValue keyValue = (YAMLKeyValue)typed; + if (typed instanceof YAMLKeyValue keyValue) { Field keyValueType = computeMetaType(keyValue); if (keyValueType == null) { return null; diff --git a/plugins/yaml/src/org/jetbrains/yaml/meta/model/YamlComposedTypeBase.java b/plugins/yaml/src/org/jetbrains/yaml/meta/model/YamlComposedTypeBase.java index 2cce02a02488..7e51b6bc8e93 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/meta/model/YamlComposedTypeBase.java +++ b/plugins/yaml/src/org/jetbrains/yaml/meta/model/YamlComposedTypeBase.java @@ -31,8 +31,7 @@ public abstract class YamlComposedTypeBase extends YamlMetaType { if (next instanceof YamlScalarType) { flattenedTypes.add(next); } - else if (next instanceof YamlComposedTypeBase) { - YamlComposedTypeBase that = (YamlComposedTypeBase)next; + else if (next instanceof YamlComposedTypeBase that) { flattenedTypes.addAll(that.myTypes); } else { diff --git a/plugins/yaml/src/org/jetbrains/yaml/meta/model/YamlMetaType.java b/plugins/yaml/src/org/jetbrains/yaml/meta/model/YamlMetaType.java index c57353387b59..84af04a077b0 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/meta/model/YamlMetaType.java +++ b/plugins/yaml/src/org/jetbrains/yaml/meta/model/YamlMetaType.java @@ -98,8 +98,7 @@ public abstract class YamlMetaType { // TODO a case for sequence - if(value instanceof YAMLMapping) { - YAMLMapping mapping = (YAMLMapping)value; + if(value instanceof YAMLMapping mapping) { Collection keyValues = mapping.getKeyValues(); diff --git a/plugins/yaml/src/org/jetbrains/yaml/schema/YamlJsonPsiWalker.java b/plugins/yaml/src/org/jetbrains/yaml/schema/YamlJsonPsiWalker.java index b229ba693375..f4b7d2735f5d 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/schema/YamlJsonPsiWalker.java +++ b/plugins/yaml/src/org/jetbrains/yaml/schema/YamlJsonPsiWalker.java @@ -152,8 +152,7 @@ public final class YamlJsonPsiWalker implements JsonLikePsiWalker { while (!breakCondition(current)) { final PsiElement position = current; current = current.getParent(); - if (current instanceof YAMLSequence) { - YAMLSequence array = (YAMLSequence)current; + if (current instanceof YAMLSequence array) { final List expressions = array.getItems(); int idx = -1; for (int i = 0; i < expressions.size(); i++) { diff --git a/python/ide/impl/src/com/jetbrains/python/PyCharmProfessionalAdvertiser.java b/python/ide/impl/src/com/jetbrains/python/PyCharmProfessionalAdvertiser.java index 7346a907bd1f..9426dbdf665b 100644 --- a/python/ide/impl/src/com/jetbrains/python/PyCharmProfessionalAdvertiser.java +++ b/python/ide/impl/src/com/jetbrains/python/PyCharmProfessionalAdvertiser.java @@ -30,9 +30,8 @@ public class PyCharmProfessionalAdvertiser implements Annotator { return; } - if (element instanceof PyFile) { + if (element instanceof PyFile pyFile) { - final PyFile pyFile = (PyFile)element; final VirtualFile vFile = pyFile.getVirtualFile(); if (vFile != null && FileIndexFacade.getInstance(project).isInLibraryClasses(vFile)) { return; diff --git a/python/ide/impl/src/com/jetbrains/python/PythonSourceRootConfigurator.java b/python/ide/impl/src/com/jetbrains/python/PythonSourceRootConfigurator.java index 6e4f65cecbdf..56e9aa8856e7 100644 --- a/python/ide/impl/src/com/jetbrains/python/PythonSourceRootConfigurator.java +++ b/python/ide/impl/src/com/jetbrains/python/PythonSourceRootConfigurator.java @@ -70,8 +70,7 @@ final class PythonSourceRootConfigurator implements DirectoryProjectConfigurator final PyKeywordArgument packageDirArg = argList.getKeywordArgument("package_dir"); if (packageDirArg != null) { final PyExpression valueExpression = packageDirArg.getValueExpression(); - if (valueExpression instanceof PyDictLiteralExpression) { - PyDictLiteralExpression packageDirDict = (PyDictLiteralExpression)valueExpression; + if (valueExpression instanceof PyDictLiteralExpression packageDirDict) { for (PyKeyValueExpression keyValue : packageDirDict.getElements()) { final PyExpression keyExpr = keyValue.getKey(); final PyExpression valueExpr = keyValue.getValue(); diff --git a/python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java b/python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java index e2cdcc7ee99d..6ec7c97534f8 100644 --- a/python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java +++ b/python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java @@ -36,9 +36,8 @@ public class PythonGenerateProjectCallback extends AbstractNewProjectStep.Abs @Override public void consume(@Nullable ProjectSettingsStepBase step, @NotNull ProjectGeneratorPeer projectGeneratorPeer) { - if (!(step instanceof ProjectSpecificSettingsStep)) return; + if (!(step instanceof ProjectSpecificSettingsStep settingsStep)) return; - final ProjectSpecificSettingsStep settingsStep = (ProjectSpecificSettingsStep)step; final DirectoryProjectGenerator generator = settingsStep.getProjectGenerator(); Sdk sdk = settingsStep.getSdk(); @@ -84,15 +83,13 @@ public class PythonGenerateProjectCallback extends AbstractNewProjectStep.Abs final ProjectSpecificSettingsStep settingsStep, @NotNull final ProjectGeneratorPeer projectGeneratorPeer) { Object projectSettings = null; - if (generator instanceof PythonProjectGenerator) { - final PythonProjectGenerator projectGenerator = (PythonProjectGenerator)generator; + if (generator instanceof PythonProjectGenerator projectGenerator) { projectSettings = projectGenerator.getProjectSettings(); } else if (generator instanceof WebProjectTemplate) { projectSettings = projectGeneratorPeer.getSettings(); } - if (projectSettings instanceof PyNewProjectSettings) { - final PyNewProjectSettings newProjectSettings = (PyNewProjectSettings)projectSettings; + if (projectSettings instanceof PyNewProjectSettings newProjectSettings) { newProjectSettings.setSdk(settingsStep.getSdk()); newProjectSettings.setInstallFramework(settingsStep.installFramework()); newProjectSettings.setRemotePath(settingsStep.getRemotePath()); diff --git a/python/pluginJava/com/jetbrains/python/psi/impl/PyJavaClassType.java b/python/pluginJava/com/jetbrains/python/psi/impl/PyJavaClassType.java index 73aeb3f9db46..55358f4ff259 100644 --- a/python/pluginJava/com/jetbrains/python/psi/impl/PyJavaClassType.java +++ b/python/pluginJava/com/jetbrains/python/psi/impl/PyJavaClassType.java @@ -225,9 +225,7 @@ public class PyJavaClassType implements PyClassLikeType { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PyJavaClassType)) return false; - - PyJavaClassType type = (PyJavaClassType)o; + if (!(o instanceof PyJavaClassType type)) return false; if (myDefinition != type.myDefinition) return false; if (myClass != null ? !myClass.equals(type.myClass) : type.myClass != null) return false; diff --git a/python/pluginJava/com/jetbrains/python/psi/impl/PyJavaTypeProvider.java b/python/pluginJava/com/jetbrains/python/psi/impl/PyJavaTypeProvider.java index 5c9e7b48194d..6ff89f3832f9 100644 --- a/python/pluginJava/com/jetbrains/python/psi/impl/PyJavaTypeProvider.java +++ b/python/pluginJava/com/jetbrains/python/psi/impl/PyJavaTypeProvider.java @@ -42,8 +42,7 @@ public class PyJavaTypeProvider extends PyTypeProviderBase { @Nullable public static PyType asPyType(@Nullable PsiType type) { - if (type instanceof PsiClassType) { - final PsiClassType classType = (PsiClassType)type; + if (type instanceof PsiClassType classType) { final PsiClass psiClass = classType.resolve(); if (psiClass != null) { return new PyJavaClassType(psiClass, false); @@ -62,8 +61,7 @@ public class PyJavaTypeProvider extends PyTypeProviderBase { if (index < 0) return null; final List superMethodParameterTypes = new ArrayList<>(); PySuperMethodsSearch.search(func, context).forEach(psiElement -> { - if (psiElement instanceof PsiMethod) { - final PsiMethod method = (PsiMethod)psiElement; + if (psiElement instanceof PsiMethod method) { final PsiParameter[] psiParameters = method.getParameterList().getParameters(); int javaIndex = method.hasModifierProperty(PsiModifier.STATIC) ? index : index-1; // adjust for 'self' parameter if (javaIndex < psiParameters.length) { diff --git a/python/pydevSrc/com/jetbrains/python/debugger/PyDebugValue.java b/python/pydevSrc/com/jetbrains/python/debugger/PyDebugValue.java index f461e6a2b51e..2fa31d4d9f63 100644 --- a/python/pydevSrc/com/jetbrains/python/debugger/PyDebugValue.java +++ b/python/pydevSrc/com/jetbrains/python/debugger/PyDebugValue.java @@ -429,8 +429,7 @@ public class PyDebugValue extends XNamedValue { List> variables = new ArrayList<>(); for (int i = 0; i < childrenList.size(); i++) { XValue value = childrenList.getValue(i); - if (value instanceof PyDebugValue) { - PyDebugValue debugValue = (PyDebugValue)value; + if (value instanceof PyDebugValue debugValue) { if (debugValue.getLoadValuePolicy() == ValuesPolicy.ASYNC) { variables.add(new PyFrameAccessor.PyAsyncValue<>(debugValue, debugValue.createDebugValueCallback())); } @@ -473,8 +472,7 @@ public class PyDebugValue extends XNamedValue { private void setConfigureTypeRenderersLink(@NotNull XValueNode node) { String typeRendererId = getTypeRendererId(); - if (node instanceof XValueNodeImpl) { - XValueNodeImpl valueNode = (XValueNodeImpl)node; + if (node instanceof XValueNodeImpl valueNode) { valueNode.clearAdditionalHyperlinks(); if (typeRendererId != null) { XDebuggerTreeNodeHyperlink link = myFrameAccessor.getUserTypeRenderersLink(typeRendererId); @@ -704,8 +702,7 @@ public class PyDebugValue extends XNamedValue { if (values == null) return; for (int i = 0; i < values.size(); i++) { - if (values.getValue(i) instanceof PyDebugValue) { - PyDebugValue value = (PyDebugValue) values.getValue(i); + if (values.getValue(i) instanceof PyDebugValue value) { descriptor = childrenDescriptors.getOrDefault(value.getName(), null); if (descriptor == null) { descriptor = new PyDebugValueDescriptor(); diff --git a/python/pydevSrc/com/jetbrains/python/debugger/PySourcePosition.java b/python/pydevSrc/com/jetbrains/python/debugger/PySourcePosition.java index 02c2065dd88b..134b1490a547 100644 --- a/python/pydevSrc/com/jetbrains/python/debugger/PySourcePosition.java +++ b/python/pydevSrc/com/jetbrains/python/debugger/PySourcePosition.java @@ -36,9 +36,7 @@ public abstract class PySourcePosition { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PySourcePosition)) return false; - - PySourcePosition that = (PySourcePosition)o; + if (!(o instanceof PySourcePosition that)) return false; if (line != that.line) return false; if (file != null ? !file.equals(that.file) : that.file != null) return false; diff --git a/python/python-psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java b/python/python-psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java index 6ecd7482c972..af0299b2fed1 100644 --- a/python/python-psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java +++ b/python/python-psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java @@ -215,8 +215,7 @@ public final class NameResolverTools { @Override public boolean value(final PsiElement element) { - if (element instanceof PyCallExpression) { - PyCallExpression callExpression = (PyCallExpression)element; + if (element instanceof PyCallExpression callExpression) { return isCalleeShortCut(callExpression, myNameToSearch); } return false; diff --git a/python/python-psi-api/src/com/jetbrains/python/psi/PyCallExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyCallExpression.java index 879299d741e7..8096d520c813 100644 --- a/python/python-psi-api/src/com/jetbrains/python/psi/PyCallExpression.java +++ b/python/python-psi-api/src/com/jetbrains/python/psi/PyCallExpression.java @@ -113,8 +113,7 @@ public interface PyCallExpression extends PyCallSiteExpression { @Nullable default PyExpression getKeywordArgument(@NotNull String keyword) { for (PyExpression arg : getArguments()) { - if (arg instanceof PyKeywordArgument) { - final PyKeywordArgument keywordArg = (PyKeywordArgument)arg; + if (arg instanceof PyKeywordArgument keywordArg) { if (keyword.equals(keywordArg.getKeyword())) { return keywordArg.getValueExpression(); } diff --git a/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalConstraints.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalConstraints.java index ab303420b131..ab456f5b1d5d 100644 --- a/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalConstraints.java +++ b/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalConstraints.java @@ -49,9 +49,7 @@ class TypeEvalConstraints { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof TypeEvalConstraints)) return false; - - TypeEvalConstraints that = (TypeEvalConstraints)o; + if (!(o instanceof TypeEvalConstraints that)) return false; return myAllowDataFlow == that.myAllowDataFlow && myAllowStubToAST == that.myAllowStubToAST && diff --git a/python/python-psi-impl/src/com/jetbrains/python/PyStringFormatParser.java b/python/python-psi-impl/src/com/jetbrains/python/PyStringFormatParser.java index 79d64a41428f..dfb02c6e9af5 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/PyStringFormatParser.java +++ b/python/python-psi-impl/src/com/jetbrains/python/PyStringFormatParser.java @@ -586,8 +586,7 @@ public class PyStringFormatParser { @Nullable public static PyExpression getFormatValueExpression(@NotNull PyStringLiteralExpression element) { final PsiElement parent = element.getParent(); - if (parent instanceof PyBinaryExpression) { - final PyBinaryExpression binaryExpr = (PyBinaryExpression)parent; + if (parent instanceof PyBinaryExpression binaryExpr) { if (binaryExpr.isOperator("%")) { PyExpression expr = binaryExpr.getRightExpression(); while (expr instanceof PyParenthesizedExpression) { @@ -605,13 +604,11 @@ public class PyStringFormatParser { @Nullable public static PyArgumentList getNewStyleFormatValueExpression(@NotNull PyStringLiteralExpression element) { final PsiElement parent = element.getParent(); - if (parent instanceof PyQualifiedExpression) { - final PyQualifiedExpression qualifiedExpr = (PyQualifiedExpression)parent; + if (parent instanceof PyQualifiedExpression qualifiedExpr) { final String name = qualifiedExpr.getReferencedName(); if (PyNames.FORMAT.equals(name)) { final PsiElement parent2 = qualifiedExpr.getParent(); - if (parent2 instanceof PyCallExpression) { - final PyCallExpression callExpr = (PyCallExpression)parent2; + if (parent2 instanceof PyCallExpression callExpr) { return callExpr.getArgumentList(); } } diff --git a/python/python-psi-impl/src/com/jetbrains/python/PythonParserDefinition.java b/python/python-psi-impl/src/com/jetbrains/python/PythonParserDefinition.java index a0ccc2acb6ba..f6e77776045e 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/PythonParserDefinition.java +++ b/python/python-psi-impl/src/com/jetbrains/python/PythonParserDefinition.java @@ -62,8 +62,7 @@ public class PythonParserDefinition implements ParserDefinition { @NotNull public PsiElement createElement(@NotNull ASTNode node) { final IElementType type = node.getElementType(); - if (type instanceof PyElementType) { - PyElementType pyElType = (PyElementType)type; + if (type instanceof PyElementType pyElType) { return pyElType.createElement(node); } else if (type instanceof PyStubElementType) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java index 69696aba7de6..fa321e250367 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java @@ -382,8 +382,7 @@ public class PySubstitutionChunkReference extends PsiReferenceBase subGraphElements = getSubGraphElements(subGraph); for (PsiElement element : subGraphElements) { - if (element instanceof PyFromImportStatement) { - final PyFromImportStatement fromImportStatement = (PyFromImportStatement)element; + if (element instanceof PyFromImportStatement fromImportStatement) { if (fromImportStatement.getStarImportElement() != null) { starImports++; } @@ -407,8 +405,7 @@ public final class PyCodeFragmentUtil { private static List getReadInstructions(@NotNull List subGraph) { final List result = new ArrayList<>(); for (Instruction instruction : subGraph) { - if (instruction instanceof ReadWriteInstruction) { - final ReadWriteInstruction readWriteInstruction = (ReadWriteInstruction)instruction; + if (instruction instanceof ReadWriteInstruction readWriteInstruction) { if (readWriteInstruction.getAccess().isReadAccess()) { result.add(readWriteInstruction); } @@ -421,8 +418,7 @@ public final class PyCodeFragmentUtil { private static List getWriteInstructions(@NotNull List subGraph) { final List result = new ArrayList<>(); for (Instruction instruction : subGraph) { - if (instruction instanceof ReadWriteInstruction) { - final ReadWriteInstruction readWriteInstruction = (ReadWriteInstruction)instruction; + if (instruction instanceof ReadWriteInstruction readWriteInstruction) { if (readWriteInstruction.getAccess().isWriteAccess()) { result.add(readWriteInstruction); } diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyKeywordCompletionContributor.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyKeywordCompletionContributor.java index fff641cebf33..ea3406831904 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyKeywordCompletionContributor.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyKeywordCompletionContributor.java @@ -56,10 +56,9 @@ public class PyKeywordCompletionContributor extends CompletionContributor implem @Override public boolean isAcceptable(Object element, PsiElement context) { - if (element instanceof PsiElement) { + if (element instanceof PsiElement p) { final ASTNode ctxNode = context.getNode(); if (ctxNode != null && PyTokenTypes.STRING_NODES.contains(ctxNode.getElementType())) return false; // no sense inside string - PsiElement p = (PsiElement)element; int firstOffset = p.getTextRange().getStartOffset(); // we must be a stmt ourselves, not a part of another stmt // try to climb to the stmt level with the same offset @@ -147,8 +146,7 @@ public class PyKeywordCompletionContributor extends CompletionContributor implem private static class StartOfLineFilter implements ElementFilter { @Override public boolean isAcceptable(Object what, PsiElement context) { - if (!(what instanceof PsiElement)) return false; - PsiElement p = (PsiElement)what; + if (!(what instanceof PsiElement p)) return false; if (p instanceof PsiComment) return false; // just in case int point = p.getTextOffset(); PsiDocumentManager docMgr = PsiDocumentManager.getInstance(p.getProject()); @@ -203,10 +201,9 @@ public class PyKeywordCompletionContributor extends CompletionContributor implem @Override public boolean isAcceptable(Object element, PsiElement context) { - if (!(element instanceof PsiElement)) { + if (!(element instanceof PsiElement psiElement)) { return false; } - PsiElement psiElement = (PsiElement) element; PsiElement definition = PsiTreeUtil.getParentOfType(psiElement, PyDocStringOwner.class, false, PyStatementList.class); if (definition != null) { if (PsiTreeUtil.getParentOfType(psiElement, PyParameterList.class) == null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java index e920a20480ba..8b6813b47095 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java @@ -227,8 +227,7 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor { public void visitPyDelStatement(@NotNull PyDelStatement node) { myBuilder.startNode(node); for (PyExpression target : node.getTargets()) { - if (target instanceof PyReferenceExpression){ - PyReferenceExpression expr = (PyReferenceExpression)target; + if (target instanceof PyReferenceExpression expr){ myBuilder.addNode(ReadWriteInstruction.newInstruction(myBuilder, target, expr.getName(), ReadWriteInstruction.ACCESS.DELETE)); PyExpression qualifier = expr.getQualifier(); if (qualifier != null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyTypeAssertionEvaluator.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyTypeAssertionEvaluator.java index 030128a0561e..a52c822c79b2 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyTypeAssertionEvaluator.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyTypeAssertionEvaluator.java @@ -50,8 +50,7 @@ public class PyTypeAssertionEvaluator extends PyRecursiveElementVisitor { public void visitPyCallExpression(@NotNull PyCallExpression node) { if (node.isCalleeText(PyNames.ISINSTANCE, PyNames.ASSERT_IS_INSTANCE)) { final PyExpression[] args = node.getArguments(); - if (args.length == 2 && args[0] instanceof PyReferenceExpression) { - final PyReferenceExpression target = (PyReferenceExpression)args[0]; + if (args.length == 2 && args[0] instanceof PyReferenceExpression target) { final PyExpression typeElement = args[1]; pushAssertion(target, myPositive, false, context -> context.getType(typeElement), typeElement); @@ -59,16 +58,14 @@ public class PyTypeAssertionEvaluator extends PyRecursiveElementVisitor { } else if (node.isCalleeText(PyNames.CALLABLE_BUILTIN)) { final PyExpression[] args = node.getArguments(); - if (args.length == 1 && args[0] instanceof PyReferenceExpression) { - final PyReferenceExpression target = (PyReferenceExpression)args[0]; + if (args.length == 1 && args[0] instanceof PyReferenceExpression target) { pushAssertion(target, myPositive, false, context -> PyTypingTypeProvider.createTypingCallableType(node), null); } } else if (node.isCalleeText(PyNames.ISSUBCLASS)) { final PyExpression[] args = node.getArguments(); - if (args.length == 2 && args[0] instanceof PyReferenceExpression) { - final PyReferenceExpression target = (PyReferenceExpression)args[0]; + if (args.length == 2 && args[0] instanceof PyReferenceExpression target) { final PyExpression typeElement = args[1]; pushAssertion(target, myPositive, true, context -> context.getType(typeElement), typeElement); @@ -163,9 +160,8 @@ public class PyTypeAssertionEvaluator extends PyRecursiveElementVisitor { @Nullable private static PyType transformTypeFromAssertion(@Nullable PyType type, boolean transformToDefinition, @NotNull TypeEvalContext context, @Nullable PyExpression typeElement) { - if (type instanceof PyTupleType) { + if (type instanceof PyTupleType tupleType) { final List members = new ArrayList<>(); - final PyTupleType tupleType = (PyTupleType)type; final int count = tupleType.getElementCount(); final PyTupleExpression tupleExpression = PyUtil @@ -193,8 +189,7 @@ public class PyTypeAssertionEvaluator extends PyRecursiveElementVisitor { return transformTypeFromAssertion(typeFromTypingProvider.get(), transformToDefinition, context, null); } } - else if (type instanceof PyInstantiableType) { - final PyInstantiableType instantiableType = (PyInstantiableType)type; + else if (type instanceof PyInstantiableType instantiableType) { return transformToDefinition ? instantiableType.toClass() : instantiableType.toInstance(); } return type; diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/PyReachingDefsDfaInstance.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/PyReachingDefsDfaInstance.java index 9efc27ea40fb..e0a5fb79c157 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/PyReachingDefsDfaInstance.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/PyReachingDefsDfaInstance.java @@ -55,8 +55,7 @@ public class PyReachingDefsDfaInstance implements DfaMapInstance String name = null; // Process readwrite instruction - if (instruction instanceof ReadWriteInstruction) { - ReadWriteInstruction rwInstruction = (ReadWriteInstruction) instruction; + if (instruction instanceof ReadWriteInstruction rwInstruction) { if (rwInstruction.getAccess().isWriteAccess()) { name = ((ReadWriteInstruction)instruction).getName(); } diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/scope/ScopeUtil.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/scope/ScopeUtil.java index 6a375299c662..e6847e270200 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/scope/ScopeUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/scope/ScopeUtil.java @@ -129,8 +129,7 @@ public final class ScopeUtil { return nextOwner; } // Function return annotations and type comments are resolved outside of the function - if (firstOwner instanceof PyFunction) { - final PyFunction function = (PyFunction)firstOwner; + if (firstOwner instanceof PyFunction function) { if (isAncestor(function.getAnnotation(), element, false) || isAncestor(function.getTypeComment(), element, false)) { return nextOwner; } diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/scope/impl/ScopeVariableImpl.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/scope/impl/ScopeVariableImpl.java index a06c874ebc19..0dbe8218bfef 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/scope/impl/ScopeVariableImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/scope/impl/ScopeVariableImpl.java @@ -48,9 +48,8 @@ public class ScopeVariableImpl implements ScopeVariable { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ScopeVariableImpl)) return false; + if (!(o instanceof ScopeVariableImpl that)) return false; - ScopeVariableImpl that = (ScopeVariableImpl)o; if (isParameter != that.isParameter) return false; if (myDeclarations != null ? !myDeclarations.equals(that.myDeclarations) : that.myDeclarations != null) return false; if (myName != null ? !myName.equals(that.myName) : that.myName != null) return false; diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java index 6b9cd6f550d3..54f1b90a6164 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java @@ -203,8 +203,7 @@ public final class AddImportHelper { final boolean isInjected = InjectedLanguageManager.getInstance(feeler.getProject()).isInjectedFragment(feeler.getContainingFile()); PyImportStatementBase importAbove = null, importBelow = null; do { - if (feeler instanceof PyImportStatementBase && !isInjected) { - final PyImportStatementBase existingImport = (PyImportStatementBase)feeler; + if (feeler instanceof PyImportStatementBase existingImport && !isInjected) { if (priority != null && newImport != null) { if (shouldInsertBefore(newImport, existingImport, priority)) { importBelow = existingImport; @@ -335,8 +334,7 @@ public final class AddImportHelper { static ImportPriorityChoice getImportPriorityWithReason(@NotNull PyImportStatementBase importStatement) { final PsiElement resolved; final PsiElement resolveAnchor; - if (importStatement instanceof PyFromImportStatement) { - final PyFromImportStatement fromImportStatement = (PyFromImportStatement)importStatement; + if (importStatement instanceof PyFromImportStatement fromImportStatement) { if (fromImportStatement.isFromFuture()) { return new ImportPriorityChoice(ImportPriority.FUTURE, "import from __future__"); } @@ -823,8 +821,7 @@ public final class AddImportHelper { } public static boolean isAssignmentToModuleLevelDunderName(@Nullable PsiElement element) { - if (element instanceof PyAssignmentStatement && PyUtil.isTopLevel(element)) { - PyAssignmentStatement statement = (PyAssignmentStatement)element; + if (element instanceof PyAssignmentStatement statement && PyUtil.isTopLevel(element)) { PyExpression[] targets = statement.getTargets(); if (targets.length == 1) { String name = targets[0].getName(); diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/ImportCandidateHolder.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/ImportCandidateHolder.java index 65083e5d62c8..8149f88f6484 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/ImportCandidateHolder.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/ImportCandidateHolder.java @@ -145,9 +145,8 @@ public class ImportCandidateHolder implements Comparable sb.append(")"); } } - if (parent instanceof PyFromImportStatement) { + if (parent instanceof PyFromImportStatement fromImportStatement) { sb.append(" from "); - final PyFromImportStatement fromImportStatement = (PyFromImportStatement)parent; sb.append(StringUtil.repeat(".", fromImportStatement.getRelativeLevel())); final PyReferenceExpression source = fromImportStatement.getImportSource(); if (source != null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollector.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollector.java index 6b2c1b1a6977..adfa049b9381 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollector.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/PyImportCollector.java @@ -61,8 +61,7 @@ public class PyImportCollector { private PsiFile addCandidatesFromExistingImports() { PsiFile existingImportFile = null; // if there's a matching existing import, this is the file it imports PsiFile file = myNode.getContainingFile(); - if (file instanceof PyFile) { - PyFile pyFile = (PyFile)file; + if (file instanceof PyFile pyFile) { for (PyImportElement importElement : pyFile.getImportTargets()) { existingImportFile = addImportViaElement(existingImportFile, importElement, importElement.resolve()); } @@ -177,10 +176,8 @@ public class PyImportCollector { // getArgumentList() still returns empty (but not null) element in this case return decorator != null && !decorator.hasArgumentList(); } - if (myNode.getParent() instanceof PyArgumentList) { - final PyArgumentList argumentList = (PyArgumentList)myNode.getParent(); - if (argumentList.getParent() instanceof PyClass) { - final PyClass pyClass = (PyClass)argumentList.getParent(); + if (myNode.getParent() instanceof PyArgumentList argumentList) { + if (argumentList.getParent() instanceof PyClass pyClass) { if (pyClass.getSuperClassExpressionList() == argumentList) { return false; } diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ConvertFormatOperatorToMethodIntention.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ConvertFormatOperatorToMethodIntention.java index 8456e4baec02..6dd5cc5adbf9 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ConvertFormatOperatorToMethodIntention.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ConvertFormatOperatorToMethodIntention.java @@ -226,8 +226,7 @@ public class ConvertFormatOperatorToMethodIntention extends PyBaseIntentionActio if (binaryExpression == null) { return false; } - if (binaryExpression.getLeftExpression() instanceof PyStringLiteralExpression && binaryExpression.getOperator() == PyTokenTypes.PERC) { - final PyStringLiteralExpression str = (PyStringLiteralExpression)binaryExpression.getLeftExpression(); + if (binaryExpression.getLeftExpression() instanceof PyStringLiteralExpression str && binaryExpression.getOperator() == PyTokenTypes.PERC) { if ((str.getText().length() > 0 && Character.toUpperCase(str.getText().charAt(0)) == 'B')) { return false; } @@ -278,8 +277,7 @@ public class ConvertFormatOperatorToMethodIntention extends PyBaseIntentionActio if (rhs instanceof PyReferenceExpression && rhsType instanceof PyTupleType) { target.append("(*").append(paramText).append(")"); } - else if (rhs instanceof PyCallExpression) { // potential dict(foo=1) -> format(foo=1) - final PyCallExpression callExpression = (PyCallExpression)rhs; + else if (rhs instanceof PyCallExpression callExpression) { // potential dict(foo=1) -> format(foo=1) final PyExpression callee = callExpression.getCallee(); final PyClassType classType = PyUtil.as(rhsType, PyClassType.class); if (classType != null && callee != null && isDictCall(callee, classType, context)) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ConvertVariadicParamIntention.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ConvertVariadicParamIntention.java index d47a1cf6e77e..999e1a53bed9 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ConvertVariadicParamIntention.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ConvertVariadicParamIntention.java @@ -226,8 +226,7 @@ public class ConvertVariadicParamIntention extends PyBaseIntentionAction { private static boolean isKeywordContainerCall(@Nullable PsiElement element, @NotNull PyParameter keywordContainer) { if (element instanceof PyCallExpression) { final PyExpression callee = ((PyCallExpression)element).getCallee(); - if (callee instanceof PyQualifiedExpression) { - final PyQualifiedExpression qualifiedCallee = (PyQualifiedExpression)callee; + if (callee instanceof PyQualifiedExpression qualifiedCallee) { final PyExpression qualifier = qualifiedCallee.getQualifier(); if (qualifier instanceof PyReferenceExpression) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportFromToImportIntention.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportFromToImportIntention.java index 01985e9c2369..45a32e9b914a 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportFromToImportIntention.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportFromToImportIntention.java @@ -190,8 +190,7 @@ public class ImportFromToImportIntention extends PyBaseIntentionAction { @Override public boolean execute(@NotNull PsiElement element) { PyPsiUtils.assertValid(element); - if (element instanceof PyReferenceExpression && PsiTreeUtil.getParentOfType(element, PyImportElement.class) == null) { - PyReferenceExpression ref = (PyReferenceExpression)element; + if (element instanceof PyReferenceExpression ref && PsiTreeUtil.getParentOfType(element, PyImportElement.class) == null) { if (!ref.isQualified()) { ResolveResult[] resolved = ref.getReference().multiResolve(false); for (ResolveResult rr : resolved) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportToImportFromIntention.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportToImportFromIntention.java index 4c50741af9f5..f488392bdbd6 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportToImportFromIntention.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportToImportFromIntention.java @@ -54,8 +54,7 @@ public class ImportToImportFromIntention extends PyBaseIntentionAction { myRelativeLevel = 0; available = true; } - else if (parent instanceof PyFromImportStatement) { - final PyFromImportStatement fromImport = (PyFromImportStatement)parent; + else if (parent instanceof PyFromImportStatement fromImport) { final int relativeLevel = fromImport.getRelativeLevel(); PyPsiUtils.assertValid(fromImport); if (fromImport.isValid() && relativeLevel > 0 && fromImport.getImportSource() == null) { @@ -89,8 +88,7 @@ public class ImportToImportFromIntention extends PyBaseIntentionAction { PsiTreeUtil.processElements(file, new PsiElementProcessor() { @Override public boolean execute(@NotNull PsiElement element) { - if (element instanceof PyReferenceExpression && PsiTreeUtil.getParentOfType(element, PyImportElement.class) == null) { - final PyReferenceExpression ref = (PyReferenceExpression)element; + if (element instanceof PyReferenceExpression ref && PsiTreeUtil.getParentOfType(element, PyImportElement.class) == null) { if (myQualifierName.equals(PyPsiUtils.toPath(ref))) { // filter out other names that might resolve to our target final PsiElement parentElt = ref.getParent(); if (parentElt instanceof PyQualifiedExpression) { // really qualified by us, not just referencing? diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportToggleAliasIntention.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportToggleAliasIntention.java index 2f2eed9cd520..9f1c7b1fc177 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportToggleAliasIntention.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/ImportToggleAliasIntention.java @@ -172,8 +172,7 @@ public class ImportToggleAliasIntention extends PyBaseIntentionAction { if (files != null) { for (Pair pair : files) { final PsiElement first = pair.getFirst(); - if (first instanceof ScopeOwner) { - final ScopeOwner scopeOwner = (ScopeOwner)first; + if (first instanceof ScopeOwner scopeOwner) { PsiTreeUtil.processElements(scopeOwner, new PsiElementProcessor<>() { @Override public boolean execute(@NotNull PsiElement element) { @@ -189,9 +188,8 @@ public class ImportToggleAliasIntention extends PyBaseIntentionAction { } private void getReferences(PsiElement element) { - if (element instanceof PyReferenceExpression && PsiTreeUtil.getParentOfType(element, - PyImportElement.class) == null) { - PyReferenceExpression ref = (PyReferenceExpression)element; + if (element instanceof PyReferenceExpression ref && PsiTreeUtil.getParentOfType(element, + PyImportElement.class) == null) { if (remove_name.equals(PyPsiUtils.toPath(ref))) { // filter out other names that might resolve to our target PsiElement resolved = ref.getReference().resolve(); if (resolved == referee || diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotationIntention.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotationIntention.java index 87beefa2361b..9b2be657298b 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotationIntention.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotationIntention.java @@ -95,15 +95,13 @@ public final class PyConvertTypeCommentToVariableAnnotationIntention extends PyB private static @NotNull Map mapTargetsToAnnotations(@NotNull PsiComment typeComment) { final PsiElement parent = typeComment.getParent(); - if (parent instanceof PyAssignmentStatement) { - final PyAssignmentStatement assignment = (PyAssignmentStatement)parent; + if (parent instanceof PyAssignmentStatement assignment) { final PyExpression[] rawTargets = assignment.getRawTargets(); if (rawTargets.length == 1) { return mapTargetsToAnnotations(rawTargets[0], typeComment); } } - else if (parent instanceof PyForPart) { - final PyForPart forPart = (PyForPart)parent; + else if (parent instanceof PyForPart forPart) { final PyExpression target = forPart.getTarget(); if (target != null) { return mapTargetsToAnnotations(target, typeComment); diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyJoinIfIntention.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyJoinIfIntention.java index 700088271e5c..65e634f2b7cc 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyJoinIfIntention.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyJoinIfIntention.java @@ -58,8 +58,7 @@ public class PyJoinIfIntention extends PyBaseIntentionAction { PyStatement firstStatement = getFirstStatement(outer); PyStatementList outerStList = outer.getIfPart().getStatementList(); if (outerStList.getStatements().length != 1) return false; - if (firstStatement instanceof PyIfStatement) { - final PyIfStatement inner = (PyIfStatement)firstStatement; + if (firstStatement instanceof PyIfStatement inner) { if (inner.getElsePart() != null || inner.getElifParts().length > 0) return false; PyStatementList stList = inner.getIfPart().getStatementList(); if (stList.getStatements().length != 0) return true; diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyTransformConditionalExpressionIntention.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyTransformConditionalExpressionIntention.java index 534986bafbe5..42d5e9bee020 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyTransformConditionalExpressionIntention.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyTransformConditionalExpressionIntention.java @@ -58,8 +58,7 @@ public class PyTransformConditionalExpressionIntention extends PyBaseIntentionAc assert assignmentStatement != null; final PyExpression assignedValue = assignmentStatement.getAssignedValue(); - if (assignedValue instanceof PyConditionalExpression) { - final PyConditionalExpression expression = (PyConditionalExpression)assignedValue; + if (assignedValue instanceof PyConditionalExpression expression) { final PyExpression condition = expression.getCondition(); final PyExpression falsePart = expression.getFalsePart(); if (condition != null && falsePart != null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyTypeHintGenerationUtil.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyTypeHintGenerationUtil.java index f2851baf7a49..a3712301a3b9 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyTypeHintGenerationUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyTypeHintGenerationUtil.java @@ -342,9 +342,8 @@ public final class PyTypeHintGenerationUtil { else if (type instanceof PyClassType) { symbols.add(((PyClassType)type).getPyClass()); } - else if (type instanceof PyCallableType) { + else if (type instanceof PyCallableType callableType) { typingTypes.add("Callable"); - final PyCallableType callableType = (PyCallableType)type; for (PyCallableParameter parameter : ContainerUtil.notNullize(callableType.getParameters(context))) { collectImportTargetsFromType(parameter.getType(context), context, symbols, typingTypes); } @@ -380,8 +379,7 @@ public final class PyTypeHintGenerationUtil { else if (type instanceof PyClassType) { // In this order since PyCollectionTypeImpl implements PyClassType } - else if (type instanceof PyCallableType) { - final PyCallableType callableType = (PyCallableType)type; + else if (type instanceof PyCallableType callableType) { for (PyCallableParameter parameter : ContainerUtil.notNullize(callableType.getParameters(context))) { checkPep484Compatibility(parameter.getType(context), context); } diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyYieldFromIntention.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyYieldFromIntention.java index 8a8101abfd6c..be8401962138 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyYieldFromIntention.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyYieldFromIntention.java @@ -103,8 +103,7 @@ public class PyYieldFromIntention extends PyBaseIntentionAction { final PyStatement firstStmt = statements[0]; if (firstStmt instanceof PyExpressionStatement) { final PyExpression firstExpr = ((PyExpressionStatement)firstStmt).getExpression(); - if (firstExpr instanceof PyYieldExpression) { - final PyYieldExpression yieldExpr = (PyYieldExpression)firstExpr; + if (firstExpr instanceof PyYieldExpression yieldExpr) { final PyExpression yieldValue = yieldExpr.getExpression(); if (yieldValue instanceof PyReferenceExpression) { return (PyReferenceExpression)yieldValue; diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/stdlib/PyStdlibTypeProvider.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/stdlib/PyStdlibTypeProvider.java index b96676a5e191..41678b87c886 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/stdlib/PyStdlibTypeProvider.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/stdlib/PyStdlibTypeProvider.java @@ -80,11 +80,9 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase { private static @Nullable Ref getEnumType(@NotNull PsiElement referenceTarget, @NotNull TypeEvalContext context, @Nullable PsiElement anchor) { - if (referenceTarget instanceof PyTargetExpression) { - final PyTargetExpression target = (PyTargetExpression)referenceTarget; + if (referenceTarget instanceof PyTargetExpression target) { final ScopeOwner owner = ScopeUtil.getScopeOwner(target); - if (owner instanceof PyClass) { - final PyClass cls = (PyClass)owner; + if (owner instanceof PyClass cls) { final List types = cls.getAncestorTypes(context); for (PyClassLikeType type : types) { if (type != null && PyNames.TYPE_ENUM.equals(type.getClassQName())) { @@ -96,8 +94,7 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase { } } } - if (referenceTarget instanceof PyQualifiedNameOwner) { - final PyQualifiedNameOwner qualifiedNameOwner = (PyQualifiedNameOwner)referenceTarget; + if (referenceTarget instanceof PyQualifiedNameOwner qualifiedNameOwner) { final String name = qualifiedNameOwner.getQualifiedName(); if ((PyNames.TYPE_ENUM + ".name").equals(name)) { return Ref.create(PyBuiltinCache.getInstance(referenceTarget).getStrType()); @@ -105,8 +102,8 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase { else if ("enum.IntEnum.value".equals(name) && anchor instanceof PyReferenceExpression) { return Ref.create(PyBuiltinCache.getInstance(referenceTarget).getIntType()); } - else if ((PyNames.TYPE_ENUM + ".value").equals(name) && anchor instanceof PyReferenceExpression && context.maySwitchToAST(anchor)) { - final PyReferenceExpression anchorExpr = (PyReferenceExpression)anchor; + else if ((PyNames.TYPE_ENUM + ".value").equals(name) && + anchor instanceof PyReferenceExpression anchorExpr && context.maySwitchToAST(anchor)) { final PyExpression qualifier = anchorExpr.getQualifier(); // An enum value is retrieved programmatically, e.g. MyEnum[name].value, or just type-hinted if (qualifier != null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java index e282378d14cb..147427fb24d7 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java @@ -355,8 +355,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable @Override public Ref getReturnType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) { - if (callable instanceof PyFunction) { - final PyFunction function = (PyFunction)callable; + if (callable instanceof PyFunction function) { final PyExpression returnTypeAnnotation = getReturnTypeAnnotation(function, context); if (returnTypeAnnotation != null) { @@ -470,8 +469,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Override public Ref getReferenceType(@NotNull PsiElement referenceTarget, @NotNull TypeEvalContext context, @Nullable PsiElement anchor) { - if (referenceTarget instanceof PyTargetExpression) { - final PyTargetExpression target = (PyTargetExpression)referenceTarget; + if (referenceTarget instanceof PyTargetExpression target) { final String targetQName = target.getQualifiedName(); // Depends on typing.Generic defined as a target expression @@ -1020,8 +1018,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static Ref getClassVarType(@NotNull PsiElement resolved, @NotNull Context context) { - if (resolved instanceof PySubscriptionExpression) { - final PySubscriptionExpression subscriptionExpr = (PySubscriptionExpression)resolved; + if (resolved instanceof PySubscriptionExpression subscriptionExpr) { if (resolvesToClassVar(subscriptionExpr.getOperand(), context.getTypeContext())) { final PyExpression indexExpr = subscriptionExpr.getIndexExpression(); if (indexExpr != null) { @@ -1056,8 +1053,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static Ref getClassObjectType(@NotNull PsiElement resolved, @NotNull Context context) { - if (resolved instanceof PySubscriptionExpression) { - final PySubscriptionExpression subsExpr = (PySubscriptionExpression)resolved; + if (resolved instanceof PySubscriptionExpression subsExpr) { final PyExpression operand = subsExpr.getOperand(); final Collection operandNames = resolveToQualifiedNames(operand, context.getTypeContext()); if (operandNames.contains(TYPE) || operandNames.contains(PyNames.TYPE)) { @@ -1108,8 +1104,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { private static Ref getClassType(@NotNull PsiElement element, @NotNull TypeEvalContext context) { if (element instanceof PyTypedElement) { final PyType type = context.getType((PyTypedElement)element); - if (type instanceof PyClassLikeType) { - final PyClassLikeType classType = (PyClassLikeType)type; + if (type instanceof PyClassLikeType classType) { if (classType.isDefinition()) { final PyType instanceType = classType.toInstance(); return Ref.create(instanceType); @@ -1124,8 +1119,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static Ref getOptionalType(@NotNull PsiElement element, @NotNull Context context) { - if (element instanceof PySubscriptionExpression) { - final PySubscriptionExpression subscriptionExpr = (PySubscriptionExpression)element; + if (element instanceof PySubscriptionExpression subscriptionExpr) { final PyExpression operand = subscriptionExpr.getOperand(); final Collection operandNames = resolveToQualifiedNames(operand, context.getTypeContext()); if (operandNames.contains(OPTIONAL)) { @@ -1144,8 +1138,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static Ref getLiteralType(@NotNull PsiElement resolved, @NotNull Context context) { - if (resolved instanceof PySubscriptionExpression) { - final PySubscriptionExpression subscriptionExpr = (PySubscriptionExpression)resolved; + if (resolved instanceof PySubscriptionExpression subscriptionExpr) { final Collection operandNames = resolveToQualifiedNames(subscriptionExpr.getOperand(), context.getTypeContext()); if (ContainerUtil.exists(operandNames, name -> name.equals(LITERAL) || name.equals(LITERAL_EXT))) { @@ -1162,8 +1155,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static Ref getAnnotatedType(@NotNull PsiElement resolved, @NotNull Context context) { - if (resolved instanceof PySubscriptionExpression) { - final PySubscriptionExpression subscriptionExpr = (PySubscriptionExpression)resolved; + if (resolved instanceof PySubscriptionExpression subscriptionExpr) { final PyExpression operand = subscriptionExpr.getOperand(); Collection resolvedNames = resolveToQualifiedNames(operand, context.getTypeContext()); @@ -1181,8 +1173,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static Ref getRequiredOrNotRequiredType(@NotNull PsiElement resolved, @NotNull Context context) { - if (resolved instanceof PySubscriptionExpression) { - final PySubscriptionExpression subscriptionExpr = (PySubscriptionExpression)resolved; + if (resolved instanceof PySubscriptionExpression subscriptionExpr) { final PyExpression operand = subscriptionExpr.getOperand(); Collection resolvedNames = resolveToQualifiedNames(operand, context.getTypeContext()); @@ -1201,8 +1192,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static Ref getFinalType(@NotNull PsiElement resolved, @NotNull Context context) { - if (resolved instanceof PySubscriptionExpression) { - final PySubscriptionExpression subscriptionExpr = (PySubscriptionExpression)resolved; + if (resolved instanceof PySubscriptionExpression subscriptionExpr) { if (resolvesToFinal(subscriptionExpr.getOperand(), context.getTypeContext())) { final PyExpression indexExpr = subscriptionExpr.getIndexExpression(); if (indexExpr != null) { @@ -1416,21 +1406,18 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static PyType getCallableType(@NotNull PsiElement resolved, @NotNull Context context) { - if (resolved instanceof PySubscriptionExpression) { - final PySubscriptionExpression subscriptionExpr = (PySubscriptionExpression)resolved; + if (resolved instanceof PySubscriptionExpression subscriptionExpr) { final PyExpression operand = subscriptionExpr.getOperand(); final Collection operandNames = resolveToQualifiedNames(operand, context.getTypeContext()); if (operandNames.contains(CALLABLE)) { final PyExpression indexExpr = subscriptionExpr.getIndexExpression(); - if (indexExpr instanceof PyTupleExpression) { - final PyTupleExpression tupleExpr = (PyTupleExpression)indexExpr; + if (indexExpr instanceof PyTupleExpression tupleExpr) { final PyExpression[] elements = tupleExpr.getElements(); if (elements.length == 2) { final PyExpression parametersExpr = elements[0]; final PyExpression returnTypeExpr = elements[1]; - if (parametersExpr instanceof PyListLiteralExpression) { + if (parametersExpr instanceof PyListLiteralExpression listExpr) { final List parameters = new ArrayList<>(); - final PyListLiteralExpression listExpr = (PyListLiteralExpression)parametersExpr; for (PyExpression argExpr : listExpr.getElements()) { parameters.add(PyCallableParameterImpl.nonPsi(Ref.deref(getType(argExpr, context)))); } @@ -1499,8 +1486,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static PyType getUnionType(@NotNull PsiElement element, @NotNull Context context) { - if (element instanceof PySubscriptionExpression) { - final PySubscriptionExpression subscriptionExpr = (PySubscriptionExpression)element; + if (element instanceof PySubscriptionExpression subscriptionExpr) { final PyExpression operand = subscriptionExpr.getOperand(); final Collection operandNames = resolveToQualifiedNames(operand, context.getTypeContext()); if (operandNames.contains(UNION)) { @@ -1512,9 +1498,8 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static PyType getConcatenateType(@NotNull PsiElement element, @NotNull Context context) { - if (!(element instanceof PySubscriptionExpression)) return null; + if (!(element instanceof PySubscriptionExpression subscriptionExpr)) return null; - final var subscriptionExpr = (PySubscriptionExpression)element; final var operand = subscriptionExpr.getOperand(); final var operandNames = resolveToQualifiedNames(operand, context.myContext); if (!operandNames.contains(TYPING_CONCATENATE) && !operandNames.contains(TYPING_EXTENSIONS_CONCATENATE)) return null; @@ -1540,8 +1525,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static PyGenericType getGenericTypeFromTypeVar(@NotNull PsiElement element, @NotNull Context context) { - if (element instanceof PyCallExpression) { - final PyCallExpression assignedCall = (PyCallExpression)element; + if (element instanceof PyCallExpression assignedCall) { final PyExpression callee = assignedCall.getCallee(); if (callee != null) { final Collection calleeQNames = resolveToQualifiedNames(callee, context.getTypeContext()); @@ -1630,9 +1614,8 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static PyParamSpecType getParamSpecType(@NotNull PsiElement element, @NotNull Context context) { - if (!(element instanceof PyCallExpression)) return null; + if (!(element instanceof PyCallExpression assignedCall)) return null; - final var assignedCall = (PyCallExpression)element; final var callee = assignedCall.getCallee(); if (callee == null) return null; @@ -1674,8 +1657,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { private static List getIndexTypes(@NotNull PySubscriptionExpression expression, @NotNull Context context) { final List types = new ArrayList<>(); final PyExpression indexExpr = expression.getIndexExpression(); - if (indexExpr instanceof PyTupleExpression) { - final PyTupleExpression tupleExpr = (PyTupleExpression)indexExpr; + if (indexExpr instanceof PyTupleExpression tupleExpr) { for (PyExpression expr : tupleExpr.getElements()) { types.add(Ref.deref(getType(expr, context))); } @@ -1688,8 +1670,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static PyType getParameterizedType(@NotNull PsiElement element, @NotNull Context context) { - if (element instanceof PySubscriptionExpression) { - final PySubscriptionExpression subscriptionExpr = (PySubscriptionExpression)element; + if (element instanceof PySubscriptionExpression subscriptionExpr) { final PyExpression operand = subscriptionExpr.getOperand(); final PyExpression indexExpr = subscriptionExpr.getIndexExpression(); if (indexExpr != null) { @@ -1756,8 +1737,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { continue; } // Presumably, a TypeVar definition or a type alias - if (element instanceof PyTargetExpression) { - final PyTargetExpression targetExpr = (PyTargetExpression)element; + if (element instanceof PyTargetExpression targetExpr) { final PyExpression assignedValue; if (context.maySwitchToAST(targetExpr)) { assignedValue = targetExpr.findAssignedValue(); @@ -1805,8 +1785,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase { @Nullable private static String getQualifiedName(@NotNull PsiElement element) { - if (element instanceof PyQualifiedNameOwner) { - final PyQualifiedNameOwner qualifiedNameOwner = (PyQualifiedNameOwner)element; + if (element instanceof PyQualifiedNameOwner qualifiedNameOwner) { return qualifiedNameOwner.getQualifiedName(); } return null; diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/userSkeletons/PyUserSkeletonsUtil.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/userSkeletons/PyUserSkeletonsUtil.java index 7ab4ba66942a..fc25e70a83aa 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/userSkeletons/PyUserSkeletonsUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/userSkeletons/PyUserSkeletonsUtil.java @@ -205,12 +205,10 @@ public final class PyUserSkeletonsUtil { if (owner != null && name != null) { assert owner != element; final PsiElement originalOwner = getUserSkeleton(owner, skeletonFile, context); - if (originalOwner instanceof PyClass) { - final PyClass classOwner = (PyClass)originalOwner; + if (originalOwner instanceof PyClass classOwner) { final var fallbackContext = TypeEvalContext.codeInsightFallback(classOwner.getProject()); final PyType type = fallbackContext.getType(classOwner); - if (type instanceof PyClassLikeType) { - final PyClassLikeType classType = (PyClassLikeType)type; + if (type instanceof PyClassLikeType classType) { final PyClassLikeType instanceType = classType.toInstance(); final PyResolveContext resolveContext = PyResolveContext.defaultContext(ObjectUtils.notNull(context, fallbackContext)); final List resolveResults = instanceType.resolveMember(name, null, AccessDirection.READ, diff --git a/python/python-psi-impl/src/com/jetbrains/python/documentation/PyDocumentationBuilder.java b/python/python-psi-impl/src/com/jetbrains/python/documentation/PyDocumentationBuilder.java index 1a1601451fcc..35e58cd953e4 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/documentation/PyDocumentationBuilder.java +++ b/python/python-psi-impl/src/com/jetbrains/python/documentation/PyDocumentationBuilder.java @@ -760,8 +760,7 @@ public class PyDocumentationBuilder { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof DocstringFormatterRequest)) return false; - DocstringFormatterRequest structure = (DocstringFormatterRequest)o; + if (!(o instanceof DocstringFormatterRequest structure)) return false; return body.equals(structure.body) && fragments.equals(structure.fragments); } diff --git a/python/python-psi-impl/src/com/jetbrains/python/documentation/PyTypeModelBuilder.java b/python/python-psi-impl/src/com/jetbrains/python/documentation/PyTypeModelBuilder.java index cc65f1f0033c..53796f8d988f 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/documentation/PyTypeModelBuilder.java +++ b/python/python-psi-impl/src/com/jetbrains/python/documentation/PyTypeModelBuilder.java @@ -251,8 +251,7 @@ public class PyTypeModelBuilder { myVisited.put(type, null); //mark as evaluating TypeModel result = null; - if (type instanceof PyTypedDictType) { - PyTypedDictType typedDictType = (PyTypedDictType)type; + if (type instanceof PyTypedDictType typedDictType) { if (typedDictType.isInferred()) { return build(new PyCollectionTypeImpl(typedDictType.getPyClass(), false, typedDictType.getElementTypes()), allowUnions); @@ -274,8 +273,7 @@ public class PyTypeModelBuilder { else if (type instanceof PyNamedTupleType) { result = NamedType.nameOrAny(type); } - else if (type instanceof PyTupleType) { - final PyTupleType tupleType = (PyTupleType)type; + else if (type instanceof PyTupleType tupleType) { final List elementTypes = tupleType.isHomogeneous() ? Collections.singletonList(tupleType.getIteratedItemType()) @@ -285,8 +283,7 @@ public class PyTypeModelBuilder { final List elementModels = ContainerUtil.map(elementTypes, elementType -> build(elementType, true)); result = new TupleType(elementModels, tupleType.isHomogeneous(), useTypingAlias); } - else if (type instanceof PyCollectionType) { - final PyCollectionType asCollection = (PyCollectionType)type; + else if (type instanceof PyCollectionType asCollection) { final List elementModels = new ArrayList<>(); for (PyType elementType : asCollection.getElementTypes()) { elementModels.add(build(elementType, true)); @@ -297,8 +294,7 @@ public class PyTypeModelBuilder { result = new CollectionOf(collectionType, elementModels, useTypingAlias); } } - else if (type instanceof PyUnionType && allowUnions) { - final PyUnionType unionType = (PyUnionType)type; + else if (type instanceof PyUnionType unionType && allowUnions) { final Collection unionMembers = unionType.getMembers(); final Pair, List> literalsAndOthers = extractLiterals(unionType); final Ref optionalType = getOptionalType(unionType); diff --git a/python/python-psi-impl/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java b/python/python-psi-impl/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java index 42edf3737491..85439efaa8c0 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java +++ b/python/python-psi-impl/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java @@ -61,8 +61,7 @@ public class PythonDocumentationProvider implements DocumentationProvider { final TypeEvalContext context = TypeEvalContext.userInitiated(originalElement.getProject(), originalElement.getContainingFile()); - if (element instanceof PyFunction) { - final PyFunction function = (PyFunction)element; + if (element instanceof PyFunction function) { final HtmlBuilder result = new HtmlBuilder(); final PyClass cls = function.getContainingClass(); @@ -419,8 +418,7 @@ public class PythonDocumentationProvider implements DocumentationProvider { boolean link, @NotNull TypeEvalContext context) { if (link) { - if (expression instanceof PyReferenceExpression) { - final PyReferenceExpression referenceExpression = (PyReferenceExpression)expression; + if (expression instanceof PyReferenceExpression referenceExpression) { if (!referenceExpression.isQualified()) { final PyResolveContext resolveContext = PyResolveContext.defaultContext(context); diff --git a/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringParameterReference.java b/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringParameterReference.java index a25b13650ede..7013894f9b6c 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringParameterReference.java +++ b/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringParameterReference.java @@ -85,8 +85,7 @@ public class DocStringParameterReference extends PsiReferenceBase result = new ArrayList<>(); // XXX: It does not work with multielement docstrings StructuredDocString docString = DocStringUtil.parse(text, element); - if (docString instanceof TagBasedDocString) { - final TagBasedDocString taggedDocString = (TagBasedDocString)docString; + if (docString instanceof TagBasedDocString taggedDocString) { final Set nameReferenceRanges = new HashSet<>(); result.addAll(referencesFromNames(expr, offset, docString, taggedDocString.getTagArguments(TagBasedDocString.PARAM_TAGS), @@ -83,8 +82,7 @@ public class DocStringReferenceProvider extends PsiReferenceProvider { ReferenceType.INSTANCE_VARIABLE)); result.addAll(returnTypes(element, docString, offset)); } - else if (docString instanceof SectionBasedDocString) { - final SectionBasedDocString sectioned = (SectionBasedDocString)docString; + else if (docString instanceof SectionBasedDocString sectioned) { result.addAll(referencesFromFields(expr, offset, sectioned.getParameterFields(), ReferenceType.PARAMETER)); result.addAll(referencesFromFields(expr, offset, sectioned.getKeywordArgumentFields(), ReferenceType.KEYWORD)); result.addAll(referencesFromFields(expr, offset, sectioned.getAttributeFields(), diff --git a/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringTypeReference.java b/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringTypeReference.java index 45489559960b..be949717a21a 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringTypeReference.java +++ b/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringTypeReference.java @@ -43,9 +43,7 @@ public class DocStringTypeReference extends PsiPolyVariantReferenceBase findScopeOwner = typeVar -> pyFunction; diff --git a/python/python-psi-impl/src/com/jetbrains/python/formatter/PyBlock.java b/python/python-psi-impl/src/com/jetbrains/python/formatter/PyBlock.java index 9e7c5ebcd1b8..1b660997aaf6 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/formatter/PyBlock.java +++ b/python/python-psi-impl/src/com/jetbrains/python/formatter/PyBlock.java @@ -717,8 +717,7 @@ public class PyBlock implements ASTBlock { } private boolean isSliceOperand(@NotNull ASTNode child) { - if (myNode.getPsi() instanceof PySliceExpression) { - final PySliceExpression sliceExpression = (PySliceExpression)myNode.getPsi(); + if (myNode.getPsi() instanceof PySliceExpression sliceExpression) { final PyExpression operand = sliceExpression.getOperand(); return operand.getNode() == child; } @@ -1270,8 +1269,7 @@ public class PyBlock implements ASTBlock { if (isIncompleteCall(lastChild)) return true; } - if (myNode.getPsi() instanceof PyArgumentList) { - final PyArgumentList argumentList = (PyArgumentList)myNode.getPsi(); + if (myNode.getPsi() instanceof PyArgumentList argumentList) { return argumentList.getClosingParen() == null; } if (isIncompleteCall(myNode) || isIncompleteExpressionWithBrackets(myNode.getPsi())) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/formatter/PyWhiteSpaceFormattingStrategy.java b/python/python-psi-impl/src/com/jetbrains/python/formatter/PyWhiteSpaceFormattingStrategy.java index 0ea350ff830f..f8946d49fb31 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/formatter/PyWhiteSpaceFormattingStrategy.java +++ b/python/python-psi-impl/src/com/jetbrains/python/formatter/PyWhiteSpaceFormattingStrategy.java @@ -262,10 +262,9 @@ public class PyWhiteSpaceFormattingStrategy extends StaticSymbolWhiteSpaceDefini } private static boolean inFromImportParentheses(PsiElement statement, int offset) { - if (!(statement instanceof PyFromImportStatement)) { + if (!(statement instanceof PyFromImportStatement fromImportStatement)) { return false; } - PyFromImportStatement fromImportStatement = (PyFromImportStatement)statement; PsiElement leftParen = fromImportStatement.getLeftParen(); if (leftParen != null && offset >= leftParen.getTextRange().getEndOffset()) { return true; diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyArgumentListInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyArgumentListInspection.java index 6a9fcdf28782..c04c35b5adec 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyArgumentListInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyArgumentListInspection.java @@ -109,8 +109,7 @@ public class PyArgumentListInspection extends PyInspection { final PyCallableType callableType = mapping.getCallableType(); if (callableType != null) { final PyCallable callable = callableType.getCallable(); - if (callable instanceof PyFunction) { - final PyFunction function = (PyFunction)callable; + if (callable instanceof PyFunction function) { // Decorate functions may have different parameter lists. We don't match arguments with parameters of decorators yet if (PyKnownDecoratorUtil.hasUnknownOrChangingSignatureDecorator(function, context) || diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyAssignmentToLoopOrWithParameterInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyAssignmentToLoopOrWithParameterInspection.java index 3ff40942bf15..eb9756143d0e 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyAssignmentToLoopOrWithParameterInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyAssignmentToLoopOrWithParameterInspection.java @@ -152,14 +152,12 @@ public class PyAssignmentToLoopOrWithParameterInspection extends PyInspection { @NotNull private static List getNamedElementsOfForAndWithStatements(@NotNull PsiElement element) { - if (element instanceof PyForStatement) { - final PyForStatement forStatement = (PyForStatement)element; + if (element instanceof PyForStatement forStatement) { final PyExpression target = forStatement.getForPart().getTarget(); return dropUnderscores(PyUtil.flattenedParensAndStars(target)); } - else if (element instanceof PyWithStatement) { - final PyWithStatement withStatement = (PyWithStatement)element; + else if (element instanceof PyWithStatement withStatement) { final List result = new ArrayList<>(); for (PyWithItem item : withStatement.getWithItems()) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyByteLiteralInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyByteLiteralInspection.java index 330b2b3e1f9f..ebd994630ca3 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyByteLiteralInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyByteLiteralInspection.java @@ -56,8 +56,7 @@ public class PyByteLiteralInspection extends PyInspection { PsiFile file = node.getContainingFile(); // can't cache this in the instance, alas if (file == null) return; boolean default_bytes = false; - if (file instanceof PyFile) { - PyFile pyfile = (PyFile)file; + if (file instanceof PyFile pyfile) { default_bytes = (!UNICODE_LITERALS.requiredAt(pyfile.getLanguageLevel()) && !pyfile.hasImportFromFuture(UNICODE_LITERALS) ); diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyCompatibilityInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyCompatibilityInspection.java index 5f4a871eb999..d620b240aa11 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyCompatibilityInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyCompatibilityInspection.java @@ -184,8 +184,7 @@ public class PyCompatibilityInspection extends PyInspection { .map(e -> e instanceof PyClass ? ((PyClass)e).findInitOrNew(false, context) : e) .orElse(null); - if (resolvedCallee instanceof PyFunction) { - final PyFunction function = (PyFunction)resolvedCallee; + if (resolvedCallee instanceof PyFunction function) { final PyClass containingClass = function.getContainingClass(); final String functionName = PyUtil.isInitOrNewMethod(function) ? callee.getText() : function.getName(); @@ -211,8 +210,7 @@ public class PyCompatibilityInspection extends PyInspection { node); } } - else if (resolvedCallee instanceof PyTargetExpression) { - final PyTargetExpression target = (PyTargetExpression)resolvedCallee; + else if (resolvedCallee instanceof PyTargetExpression target) { if (!target.isQualified() && PyNames.TYPE_LONG.equals(target.getName()) && diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyDictCreationInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyDictCreationInspection.java index 2a098226f585..0936234bbcc2 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyDictCreationInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyDictCreationInspection.java @@ -60,8 +60,7 @@ public class PyDictCreationInspection extends PyInspection { PyStatement statement = PsiTreeUtil.getNextSiblingOfType(node, PyStatement.class); - while (statement instanceof PyAssignmentStatement) { - final PyAssignmentStatement assignmentStatement = (PyAssignmentStatement)statement; + while (statement instanceof PyAssignmentStatement assignmentStatement) { final List> targets = getDictTargets(target, name, assignmentStatement); if (targets == null) return; @@ -83,8 +82,7 @@ public class PyDictCreationInspection extends PyInspection { @NotNull final PyAssignmentStatement assignmentStatement) { final List> targets = new ArrayList<>(); for (Pair targetToValue : assignmentStatement.getTargetsToValuesMapping()) { - if (targetToValue.first instanceof PySubscriptionExpression) { - final PySubscriptionExpression subscriptionExpression = (PySubscriptionExpression)targetToValue.first; + if (targetToValue.first instanceof PySubscriptionExpression subscriptionExpression) { if (name.equals(subscriptionExpression.getOperand().getName()) && subscriptionExpression.getIndexExpression() != null && !referencesTarget(targetToValue.second, target)) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyExceptClausesOrderInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyExceptClausesOrderInspection.java index 69fe910059f0..fa06a00059e2 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyExceptClausesOrderInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyExceptClausesOrderInspection.java @@ -51,8 +51,7 @@ public class PyExceptClausesOrderInspection extends PyInspection { PyExpression exceptClass = exceptPart.getExceptClass(); if (exceptClass instanceof PyReferenceExpression) { PsiElement element = ((PyReferenceExpression) exceptClass).followAssignmentsChain(getResolveContext()).getElement(); - if (element instanceof PyClass) { - PyClass pyClass = (PyClass)element; + if (element instanceof PyClass pyClass) { if (exceptClasses.contains(pyClass)) { registerProblem(exceptClass, PyPsiBundle.message("INSP.bad.except.exception.class.already.caught", pyClass.getName())); } else { diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyExceptionInheritInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyExceptionInheritInspection.java index 7fe9f60aabd8..bcaf216a0adf 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyExceptionInheritInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyExceptionInheritInspection.java @@ -54,8 +54,7 @@ public class PyExceptionInheritInspection extends PyInspection { if (callee instanceof PyReferenceExpression) { final PsiPolyVariantReference reference = ((PyReferenceExpression)callee).getReference(getResolveContext()); PsiElement psiElement = reference.resolve(); - if (psiElement instanceof PyClass) { - PyClass aClass = (PyClass) psiElement; + if (psiElement instanceof PyClass aClass) { for (PyClassLikeType type : aClass.getAncestorTypes(myTypeEvalContext)) { if (type == null) { return; diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyListCreationInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyListCreationInspection.java index d9b023b3a31e..ef426bc6c09c 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyListCreationInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyListCreationInspection.java @@ -75,9 +75,8 @@ public class PyListCreationInspection extends PyInspection { PyStatement expressionStatement = PsiTreeUtil.getNextSiblingOfType(assignment, PyStatement.class); while (expressionStatement instanceof PyExpressionStatement) { final PyExpression statement = ((PyExpressionStatement)expressionStatement).getExpression(); - if (!(statement instanceof PyCallExpression)) break; + if (!(statement instanceof PyCallExpression callExpression)) break; - final PyCallExpression callExpression = (PyCallExpression)statement; final PyExpression callee = callExpression.getCallee(); if (!(callee instanceof PyQualifiedExpression)) break; diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyMethodOverridingInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyMethodOverridingInspection.java index a9863afde71a..b155afb73b20 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyMethodOverridingInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyMethodOverridingInspection.java @@ -44,8 +44,7 @@ public class PyMethodOverridingInspection extends PyInspection { } for (PsiElement psiElement : PySuperMethodsSearch.search(function, myTypeEvalContext)) { - if (psiElement instanceof PyFunction) { - final PyFunction baseMethod = (PyFunction)psiElement; + if (psiElement instanceof PyFunction baseMethod) { if (!PyUtil.isSignatureCompatibleTo(function, baseMethod, myTypeEvalContext)) { final PyClass baseClass = baseMethod.getContainingClass(); final String msg = PyPsiBundle.message("INSP.signature.mismatch", diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyNoneFunctionAssignmentInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyNoneFunctionAssignmentInspection.java index e429ab54bb11..aeaf2855440c 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyNoneFunctionAssignmentInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyNoneFunctionAssignmentInspection.java @@ -48,9 +48,8 @@ public class PyNoneFunctionAssignmentInspection extends PyInspection { @Override public void visitPyAssignmentStatement(@NotNull PyAssignmentStatement node) { final PyExpression value = node.getAssignedValue(); - if (value instanceof PyCallExpression) { + if (value instanceof PyCallExpression call) { final PyType type = myTypeEvalContext.getType(value); - final PyCallExpression call = (PyCallExpression)value; final PyExpression callee = call.getCallee(); if (type instanceof PyNoneType && callee != null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyPropertyDefinitionInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyPropertyDefinitionInspection.java index 88b964a32df9..a00f33e65b8a 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyPropertyDefinitionInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyPropertyDefinitionInspection.java @@ -273,8 +273,7 @@ public class PyPropertyDefinitionInspection extends PyInspection { @NotNull PsiElement beingChecked, boolean allowed, @NotNull @InspectionMessage String message) { - if (callable instanceof PyFunction) { - final PyFunction function = (PyFunction)callable; + if (callable instanceof PyFunction function) { if (PyKnownDecoratorUtil.hasAbstractDecorator(function, myTypeEvalContext)) { return; diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyRedeclarationInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyRedeclarationInspection.java index 122baf7eb381..7e712ececb2c 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyRedeclarationInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyRedeclarationInspection.java @@ -119,8 +119,7 @@ public class PyRedeclarationInspection extends PyInspection { final Ref writeElementRef = Ref.create(null); final Ref underPossiblyFalseCondition = Ref.create(false); ControlFlowUtil.iteratePrev(startInstruction, instructions, instruction -> { - if (instruction instanceof ReadWriteInstruction && instruction.num() != startInstruction) { - final ReadWriteInstruction rwInstruction = (ReadWriteInstruction)instruction; + if (instruction instanceof ReadWriteInstruction rwInstruction && instruction.num() != startInstruction) { if (name.equals(rwInstruction.getName())) { final PsiElement originalElement = rwInstruction.getElement(); if (originalElement != null) { @@ -178,8 +177,7 @@ public class PyRedeclarationInspection extends PyInspection { return !PyEvaluator.evaluateAsBoolean(forPart.getSource(), false); } - if (instruction instanceof ConditionalInstruction) { - final ConditionalInstruction conditionalInstruction = (ConditionalInstruction)instruction; + if (instruction instanceof ConditionalInstruction conditionalInstruction) { final PsiElement condition = conditionalInstruction.getCondition(); if (condition instanceof PyExpression) { return conditionalInstruction.getResult() diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyRedundantParenthesesInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyRedundantParenthesesInspection.java index d82ed05640d6..f2d720e4326f 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyRedundantParenthesesInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyRedundantParenthesesInspection.java @@ -122,8 +122,7 @@ public final class PyRedundantParenthesesInspection extends PyInspection { registerProblem(node, PyPsiBundle.message("QFIX.redundant.parentheses"), new RedundantParenthesesQuickFix()); } } - else if (expression instanceof PyBinaryExpression) { - final PyBinaryExpression binaryExpression = (PyBinaryExpression)expression; + else if (expression instanceof PyBinaryExpression binaryExpression) { if (parent instanceof PyPrefixExpression) { return; diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStatementEffectInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStatementEffectInspection.java index 5d548f10db59..193fb814efcc 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStatementEffectInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStatementEffectInspection.java @@ -94,8 +94,7 @@ public class PyStatementEffectInspection extends PyInspection { return true; } } - else if (expression instanceof PyBinaryExpression) { - final PyBinaryExpression binary = (PyBinaryExpression)expression; + else if (expression instanceof PyBinaryExpression binary) { final PyElementType operator = binary.getOperator(); if (PyTokenTypes.COMPARISON_OPERATIONS.contains(operator)) return false; @@ -124,16 +123,13 @@ public class PyStatementEffectInspection extends PyInspection { } } } - else if (expression instanceof PyConditionalExpression) { - PyConditionalExpression conditionalExpression = (PyConditionalExpression)expression; + else if (expression instanceof PyConditionalExpression conditionalExpression) { return hasEffect(conditionalExpression.getTruePart()) || hasEffect(conditionalExpression.getFalsePart()); } - else if (expression instanceof PyParenthesizedExpression) { - PyParenthesizedExpression parenthesizedExpression = (PyParenthesizedExpression)expression; + else if (expression instanceof PyParenthesizedExpression parenthesizedExpression) { return hasEffect(parenthesizedExpression.getContainedExpression()); } - else if (expression instanceof PyReferenceExpression) { - PyReferenceExpression referenceExpression = (PyReferenceExpression)expression; + else if (expression instanceof PyReferenceExpression referenceExpression) { ResolveResult[] results = referenceExpression.getReference(getResolveContext()).multiResolve(true); for (ResolveResult res : results) { if (res.getElement() instanceof PyFunction) { @@ -152,8 +148,7 @@ public class PyStatementEffectInspection extends PyInspection { } } } - else if (expression instanceof PyPrefixExpression) { - final PyPrefixExpression prefixExpr = (PyPrefixExpression)expression; + else if (expression instanceof PyPrefixExpression prefixExpr) { return prefixExpr.getOperator() == PyTokenTypes.AWAIT_KEYWORD; } else if (expression instanceof PyNoneLiteralExpression && ((PyNoneLiteralExpression)expression).isEllipsis()) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStringFormatInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStringFormatInspection.java index 001799f692e1..7f06fc96bdd7 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStringFormatInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStringFormatInspection.java @@ -89,8 +89,7 @@ public class PyStringFormatInspection extends PyInspection { if (PsiTreeUtil.instanceOf(rightExpression, SIMPLE_RHS_EXPRESSIONS)) { if (s != null) { final PyType rightType = myTypeEvalContext.getType(rightExpression); - if (rightType instanceof PyTupleType) { - final PyTupleType tupleType = (PyTupleType)rightType; + if (rightType instanceof PyTupleType tupleType) { matchEntireTupleTypes(problemTarget, tupleType); return tupleType.getElementCount(); } @@ -665,9 +664,8 @@ public class PyStringFormatInspection extends PyInspection { @Override public void visitPyBinaryExpression(final @NotNull PyBinaryExpression node) { - if (node.getLeftExpression() instanceof PyStringLiteralExpression && node.isOperator("%")) { + if (node.getLeftExpression() instanceof PyStringLiteralExpression literalExpression && node.isOperator("%")) { final Inspection inspection = new Inspection(this, myTypeEvalContext); - final PyStringLiteralExpression literalExpression = (PyStringLiteralExpression)node.getLeftExpression(); inspection.inspectPercentFormat(literalExpression); if (inspection.isProblem()) { return; diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTupleAssignmentBalanceInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTupleAssignmentBalanceInspection.java index 17e017b35b0a..f04217c9952b 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTupleAssignmentBalanceInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTupleAssignmentBalanceInspection.java @@ -82,8 +82,7 @@ public class PyTupleAssignmentBalanceInspection extends PyInspection { else if (assignedValue instanceof PyNumericLiteralExpression || assignedValue instanceof PyNoneLiteralExpression) { return 1; } - else if (assignedValue instanceof PyCallExpression) { - final PyCallExpression call = (PyCallExpression)assignedValue; + else if (assignedValue instanceof PyCallExpression call) { if (call.isCalleeText("dict")) { return call.getArguments().length; } diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTupleItemAssignmentInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTupleItemAssignmentInspection.java index ccd20846868f..b60d396f3d94 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTupleItemAssignmentInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTupleItemAssignmentInspection.java @@ -47,13 +47,10 @@ public class PyTupleItemAssignmentInspection extends PyInspection { @Override public void visitPyAssignmentStatement(@NotNull PyAssignmentStatement node) { PyExpression[] targets = node.getTargets(); - if (targets.length == 1 && targets[0] instanceof PySubscriptionExpression) { - PySubscriptionExpression subscriptionExpression = (PySubscriptionExpression)targets[0]; - if (subscriptionExpression.getOperand() instanceof PyReferenceExpression) { - PyReferenceExpression referenceExpression = (PyReferenceExpression)subscriptionExpression.getOperand(); + if (targets.length == 1 && targets[0] instanceof PySubscriptionExpression subscriptionExpression) { + if (subscriptionExpression.getOperand() instanceof PyReferenceExpression referenceExpression) { PsiElement element = referenceExpression.followAssignmentsChain(getResolveContext()).getElement(); - if (element instanceof PyExpression) { - PyExpression expression = (PyExpression)element; + if (element instanceof PyExpression expression) { PyType type = myTypeEvalContext.getType(expression); if (type instanceof PyTupleType) { registerProblem(node, PyPsiBundle.message("INSP.tuples.never.assign.items"), new PyReplaceTupleWithListQuickFix()); diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java index 58f28cf48179..8183489d774f 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java @@ -81,8 +81,7 @@ public class PyTypeCheckerInspection extends PyInspection { @Override public void visitPyReturnStatement(@NotNull PyReturnStatement node) { ScopeOwner owner = ScopeUtil.getScopeOwner(node); - if (owner instanceof PyFunction) { - PyFunction function = (PyFunction)owner; + if (owner instanceof PyFunction function) { PyAnnotation annotation = function.getAnnotation(); String typeCommentAnnotation = function.getTypeCommentAnnotation(); if (annotation != null || typeCommentAnnotation != null) { @@ -316,11 +315,10 @@ public class PyTypeCheckerInspection extends PyInspection { analyzeParamSpec((PyParamSpecType)expected, allArguments, substitutions, result, unmatchedArguments, unmatchedParameters); break; } - else if (expected instanceof PyConcatenateType) { + else if (expected instanceof PyConcatenateType concatenateType) { final var allArguments = callSite.getArguments(callableType.getCallable()); if (allArguments.isEmpty()) break; - final var concatenateType = (PyConcatenateType)expected; final var firstExpectedTypes = concatenateType.getFirstTypes(); final var argumentRightBound = Math.min(firstExpectedTypes.size(), allArguments.size()); final var firstArguments = allArguments.subList(0, argumentRightBound); diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTypeCheckerInspectionProblemRegistrar.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTypeCheckerInspectionProblemRegistrar.java index 01c31f93f072..b3068eeb4228 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTypeCheckerInspectionProblemRegistrar.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyTypeCheckerInspectionProblemRegistrar.java @@ -181,8 +181,7 @@ final class PyTypeCheckerInspectionProblemRegistrar { @NotNull private static PsiElement getMultiCalleeElementToHighlight(@NotNull PyCallSiteExpression callSite) { - if (callSite instanceof PyCallExpression) { - final PyCallExpression call = (PyCallExpression)callSite; + if (callSite instanceof PyCallExpression call) { final PyArgumentList argumentList = call.getArgumentList(); final PsiElement result = Optional diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyUnboundLocalVariableInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyUnboundLocalVariableInspection.java index 558dea6de531..4f7ffe3a5933 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyUnboundLocalVariableInspection.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyUnboundLocalVariableInspection.java @@ -178,8 +178,7 @@ public class PyUnboundLocalVariableInspection extends PyInspection { } final Ref first = Ref.create(true); ControlFlowUtil.iteratePrev(num, instructions, instruction -> { - if (instruction instanceof ReadWriteInstruction) { - final ReadWriteInstruction rwInstruction = (ReadWriteInstruction)instruction; + if (instruction instanceof ReadWriteInstruction rwInstruction) { final String name = rwInstruction.getName(); final PsiElement element = rwInstruction.getElement(); if (element != null && name != null && name.equals(nodeName) && instruction.num() < num) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddFunctionQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddFunctionQuickFix.java index b7dbaca788a0..38a3c3765825 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddFunctionQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddFunctionQuickFix.java @@ -90,8 +90,7 @@ public class AddFunctionQuickFix implements LocalQuickFix { if (arg instanceof PyKeywordArgument) { // foo(bar) -> def foo(bar_1) builder.parameter(((PyKeywordArgument)arg).getKeyword()); } - else if (arg instanceof PyReferenceExpression) { - PyReferenceExpression refex = (PyReferenceExpression)arg; + else if (arg instanceof PyReferenceExpression refex) { builder.parameter(refex.getReferencedName()); } else { // use a boring name diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddGlobalQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddGlobalQuickFix.java index c484f209bcc8..91468f602d05 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddGlobalQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddGlobalQuickFix.java @@ -22,8 +22,7 @@ public class AddGlobalQuickFix implements LocalQuickFix { @Override public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) { PsiElement problemElt = descriptor.getPsiElement(); - if (problemElt instanceof PyReferenceExpression) { - final PyReferenceExpression expression = (PyReferenceExpression)problemElt; + if (problemElt instanceof PyReferenceExpression expression) { final String name = expression.getReferencedName(); final ScopeOwner owner = PsiTreeUtil.getParentOfType(problemElt, ScopeOwner.class); assert owner instanceof PyClass || owner instanceof PyFunction : "Add global quickfix is available only inside class or function, but applied for " + owner; diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddMethodQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddMethodQuickFix.java index aa43e9992c34..649b44a6d58e 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddMethodQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddMethodQuickFix.java @@ -106,8 +106,7 @@ public class AddMethodQuickFix implements LocalQuickFix { if (arg instanceof PyKeywordArgument) { // foo(bar) -> def foo(self, bar_1) builder.parameter(((PyKeywordArgument)arg).getKeyword()); } - else if (arg instanceof PyReferenceExpression) { - PyReferenceExpression refex = (PyReferenceExpression)arg; + else if (arg instanceof PyReferenceExpression refex) { builder.parameter(refex.getReferencedName()); } else { // use a boring name diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddSelfQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddSelfQuickFix.java index a056bdebcf4c..06b0d83d27e0 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddSelfQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AddSelfQuickFix.java @@ -38,8 +38,7 @@ public class AddSelfQuickFix implements LocalQuickFix { @Override public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) { PsiElement element = descriptor.getPsiElement(); - if (element instanceof PyParameterList) { - final PyParameterList parameterList = (PyParameterList)element; + if (element instanceof PyParameterList parameterList) { PyNamedParameter newParameter = PyElementGenerator.getInstance(project).createParameter(myParamName); parameterList.addParameter(newParameter); } diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AugmentedAssignmentQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AugmentedAssignmentQuickFix.java index ae1772c3d453..05fe2d17a029 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AugmentedAssignmentQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/AugmentedAssignmentQuickFix.java @@ -31,8 +31,7 @@ public class AugmentedAssignmentQuickFix implements LocalQuickFix { public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { PsiElement element = descriptor.getPsiElement(); - if (element instanceof PyAssignmentStatement && element.isWritable()) { - final PyAssignmentStatement statement = (PyAssignmentStatement)element; + if (element instanceof PyAssignmentStatement statement && element.isWritable()) { final PyExpression target = statement.getLeftHandSideExpression(); final PyBinaryExpression expression = (PyBinaryExpression)statement.getAssignedValue(); diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/ComparisonWithNoneQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/ComparisonWithNoneQuickFix.java index 55f351a7117f..dbd8a053947a 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/ComparisonWithNoneQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/ComparisonWithNoneQuickFix.java @@ -23,8 +23,7 @@ public class ComparisonWithNoneQuickFix implements LocalQuickFix { @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { PsiElement problemElement = descriptor.getPsiElement(); - if (problemElement instanceof PyBinaryExpression) { - PyBinaryExpression binaryExpression = (PyBinaryExpression)problemElement; + if (problemElement instanceof PyBinaryExpression binaryExpression) { PyElementType operator = binaryExpression.getOperator(); PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project); String temp; diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/DictCreationQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/DictCreationQuickFix.java index fde4f034d1e8..98b4f5478165 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/DictCreationQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/DictCreationQuickFix.java @@ -50,8 +50,7 @@ public class DictCreationQuickFix implements LocalQuickFix { final PyExpression assignedValue = myStatement.getAssignedValue(); if (assignedValue instanceof PyDictLiteralExpression) { for (PsiElement expression : assignedValue.getChildren()) { - if (expression instanceof PyKeyValueExpression) { - PyKeyValueExpression kvExpr = (PyKeyValueExpression)expression; + if (expression instanceof PyKeyValueExpression kvExpr) { final PyExpression value = kvExpr.getValue(); if (value != null) { statementsMap.put(kvExpr.getKey().getText(), value.getText()); @@ -63,8 +62,7 @@ public class DictCreationQuickFix implements LocalQuickFix { } PyStatement statement = PsiTreeUtil.getNextSiblingOfType(myStatement, PyStatement.class); - while (statement instanceof PyAssignmentStatement) { - final PyAssignmentStatement assignmentStatement = (PyAssignmentStatement)statement; + while (statement instanceof PyAssignmentStatement assignmentStatement) { final PyExpression target = myStatement.getTargets()[0]; final String targetName = target.getName(); if (targetName != null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyAddPropertyForFieldQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyAddPropertyForFieldQuickFix.java index 19ccfe918623..68450b1bbd19 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyAddPropertyForFieldQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyAddPropertyForFieldQuickFix.java @@ -33,8 +33,7 @@ public class PyAddPropertyForFieldQuickFix implements LocalQuickFix { if (element instanceof PyReferenceExpression) { final PsiReference reference = element.getReference(); final PsiElement resolved = reference.resolve(); - if (resolved instanceof PyTargetExpression) { - PyTargetExpression target = (PyTargetExpression)resolved; + if (resolved instanceof PyTargetExpression target) { final PyClass containingClass = target.getContainingClass(); if (containingClass != null) { final String name = target.getName(); diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyMoveAttributeToInitQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyMoveAttributeToInitQuickFix.java index 69eab11788f1..a877e81dc705 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyMoveAttributeToInitQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyMoveAttributeToInitQuickFix.java @@ -29,8 +29,7 @@ public class PyMoveAttributeToInitQuickFix implements LocalQuickFix { @Override public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PyTargetExpression)) return; - final PyTargetExpression targetExpression = (PyTargetExpression)element; + if (!(element instanceof PyTargetExpression targetExpression)) return; final PyClass containingClass = targetExpression.getContainingClass(); final PyAssignmentStatement assignment = PsiTreeUtil.getParentOfType(element, PyAssignmentStatement.class); diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRemoveArgumentQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRemoveArgumentQuickFix.java index 7f0202ef84c0..d029241c0ba7 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRemoveArgumentQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRemoveArgumentQuickFix.java @@ -23,8 +23,7 @@ public class PyRemoveArgumentQuickFix implements LocalQuickFix { @Override public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PyExpression)) return; - final PyExpression expression = (PyExpression)element; + if (!(element instanceof PyExpression expression)) return; final PsiElement nextSibling = PsiTreeUtil.skipWhitespacesForward(expression); final PsiElement prevSibling = PsiTreeUtil.skipWhitespacesBackward(expression); expression.delete(); diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRenameUnresolvedRefQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRenameUnresolvedRefQuickFix.java index a0182c9116a9..5cd4cfde081c 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRenameUnresolvedRefQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRenameUnresolvedRefQuickFix.java @@ -53,10 +53,9 @@ public class PyRenameUnresolvedRefQuickFix implements LocalQuickFix { @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); - if (!(element instanceof PyReferenceExpression)) { + if (!(element instanceof PyReferenceExpression referenceExpression)) { return; } - final PyReferenceExpression referenceExpression = (PyReferenceExpression)element; ScopeOwner parentScope = ScopeUtil.getScopeOwner(referenceExpression); if (parentScope == null) return; diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyReplaceTupleWithListQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyReplaceTupleWithListQuickFix.java index 034bf2a94858..4ff81f8e6053 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyReplaceTupleWithListQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyReplaceTupleWithListQuickFix.java @@ -37,10 +37,8 @@ public class PyReplaceTupleWithListQuickFix implements LocalQuickFix { PsiElement element = descriptor.getPsiElement(); assert element instanceof PyAssignmentStatement; PyExpression[] targets = ((PyAssignmentStatement)element).getTargets(); - if (targets.length == 1 && targets[0] instanceof PySubscriptionExpression) { - PySubscriptionExpression subscriptionExpression = (PySubscriptionExpression)targets[0]; - if (subscriptionExpression.getOperand() instanceof PyReferenceExpression) { - PyReferenceExpression referenceExpression = (PyReferenceExpression)subscriptionExpression.getOperand(); + if (targets.length == 1 && targets[0] instanceof PySubscriptionExpression subscriptionExpression) { + if (subscriptionExpression.getOperand() instanceof PyReferenceExpression referenceExpression) { final TypeEvalContext context = TypeEvalContext.userInitiated(project, element.getContainingFile()); final PyResolveContext resolveContext = PyResolveContext.defaultContext(context); element = referenceExpression.followAssignmentsChain(resolveContext).getElement(); diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/RemoveTrailingSuffixQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/RemoveTrailingSuffixQuickFix.java index 7cd3f8430826..c34c165c0370 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/RemoveTrailingSuffixQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/RemoveTrailingSuffixQuickFix.java @@ -36,8 +36,7 @@ public class RemoveTrailingSuffixQuickFix implements LocalQuickFix { @Override public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { PsiElement numericLiteralExpression = descriptor.getPsiElement(); - if (numericLiteralExpression instanceof PyNumericLiteralExpression) { - PyNumericLiteralExpression numeric = (PyNumericLiteralExpression)numericLiteralExpression; + if (numericLiteralExpression instanceof PyNumericLiteralExpression numeric) { String suffix = numeric.getIntegerLiteralSuffix(); if (suffix == null) return; String text = numeric.getText(); diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/UnresolvedRefCreateFunctionQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/UnresolvedRefCreateFunctionQuickFix.java index 46dcdb4fac98..2058f893aa36 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/UnresolvedRefCreateFunctionQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/UnresolvedRefCreateFunctionQuickFix.java @@ -65,8 +65,7 @@ public class UnresolvedRefCreateFunctionQuickFix implements LocalQuickFix { if (param instanceof PyKeywordArgument) { functionBuilder.parameter(((PyKeywordArgument)param).getKeyword()); } - else if (param instanceof PyReferenceExpression) { - PyReferenceExpression refex = (PyReferenceExpression)param; + else if (param instanceof PyReferenceExpression refex) { functionBuilder.parameter(refex.getReferencedName()); } else { diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesVisitor.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesVisitor.java index 15066b1a55e0..7095afbc6e97 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesVisitor.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesVisitor.java @@ -186,8 +186,7 @@ public abstract class PyUnresolvedReferencesVisitor extends PyInspectionVisitor processReferenceInImportGuard(node, guard); return; } - if (node instanceof PyQualifiedExpression) { - final PyQualifiedExpression qExpr = (PyQualifiedExpression)node; + if (node instanceof PyQualifiedExpression qExpr) { final PyExpression qualifier = qExpr.getQualifier(); final String name = node.getName(); if (qualifier != null && name != null && PyHasAttrHelper.INSTANCE.getNamesFromHasAttrs(node, qualifier).contains(name)) { @@ -196,8 +195,7 @@ public abstract class PyUnresolvedReferencesVisitor extends PyInspectionVisitor } PsiElement target = null; final boolean unresolved; - if (reference instanceof PsiPolyVariantReference) { - final PsiPolyVariantReference poly = (PsiPolyVariantReference)reference; + if (reference instanceof PsiPolyVariantReference poly) { final ResolveResult[] resolveResults = poly.multiResolve(false); unresolved = (resolveResults.length == 0); for (ResolveResult resolveResult : resolveResults) { @@ -292,8 +290,7 @@ public abstract class PyUnresolvedReferencesVisitor extends PyInspectionVisitor return; } List fixes = new ArrayList<>(); - if (element instanceof PyReferenceExpression) { - PyReferenceExpression expr = (PyReferenceExpression)element; + if (element instanceof PyReferenceExpression expr) { if (PyNames.COMPARISON_OPERATORS.contains(refName)) { return; } @@ -346,8 +343,7 @@ public abstract class PyUnresolvedReferencesVisitor extends PyInspectionVisitor return; } ContainerUtil.addAll(fixes, getCreateMemberFromUsageFixes(type, reference, refText)); - if (type instanceof PyClassType) { - final PyClassType classType = (PyClassType)type; + if (type instanceof PyClassType classType) { if (reference instanceof PyOperatorReference) { String className = type.getName(); if (classType.isDefinition()) { @@ -639,8 +635,7 @@ public abstract class PyUnresolvedReferencesVisitor extends PyInspectionVisitor } } PsiFileSystemItem importedElement; - if (unusedImport instanceof PyImportElement) { - final PyImportElement importElement = (PyImportElement)unusedImport; + if (unusedImport instanceof PyImportElement importElement) { final PsiElement element = importElement.resolve(); if (element == null) { if (importElement.getImportedQName() != null) { @@ -812,8 +807,7 @@ public abstract class PyUnresolvedReferencesVisitor extends PyInspectionVisitor } } } - else if (element instanceof PyReferenceExpression) { - final PyReferenceExpression expr = (PyReferenceExpression)element; + else if (element instanceof PyReferenceExpression expr) { final PyExpression qualifier = expr.getQualifier(); final String exprName = expr.getName(); if (exprName != null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/unusedLocal/PyUnusedLocalInspectionVisitor.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/unusedLocal/PyUnusedLocalInspectionVisitor.java index 89a68e64b9a3..36725725c392 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/unusedLocal/PyUnusedLocalInspectionVisitor.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/unusedLocal/PyUnusedLocalInspectionVisitor.java @@ -143,8 +143,7 @@ public final class PyUnusedLocalInspectionVisitor extends PyInspectionVisitor { myUnusedElements.add(element); } } - else if (instruction instanceof ReadWriteInstruction) { - final ReadWriteInstruction readWriteInstruction = (ReadWriteInstruction)instruction; + else if (instruction instanceof ReadWriteInstruction readWriteInstruction) { final ReadWriteInstruction.ACCESS access = readWriteInstruction.getAccess(); if (!access.isWriteAccess()) { continue; @@ -187,8 +186,7 @@ public final class PyUnusedLocalInspectionVisitor extends PyInspectionVisitor { } private static boolean parameterInMethodWithFixedSignature(@NotNull ScopeOwner owner, @NotNull PsiElement element) { - if (owner instanceof PyFunction && element instanceof PyParameter) { - final PyFunction function = (PyFunction)owner; + if (owner instanceof PyFunction function && element instanceof PyParameter) { final String functionName = function.getName(); final LanguageLevel level = LanguageLevel.forElement(function); @@ -205,8 +203,7 @@ public final class PyUnusedLocalInspectionVisitor extends PyInspectionVisitor { final Instruction[] instructions = ControlFlowCache.getControlFlow(owner).getInstructions(); for (int i = 0; i < instructions.length; i++) { final Instruction instruction = instructions[i]; - if (instruction instanceof ReadWriteInstruction) { - final ReadWriteInstruction readWriteInstruction = (ReadWriteInstruction)instruction; + if (instruction instanceof ReadWriteInstruction readWriteInstruction) { final ReadWriteInstruction.ACCESS access = readWriteInstruction.getAccess(); if (!access.isReadAccess()) { continue; @@ -260,8 +257,7 @@ public final class PyUnusedLocalInspectionVisitor extends PyInspectionVisitor { } } // Mark write access as used - else if (inst instanceof ReadWriteInstruction) { - final ReadWriteInstruction rwInstruction = (ReadWriteInstruction)inst; + else if (inst instanceof ReadWriteInstruction rwInstruction) { if (rwInstruction.getAccess().isWriteAccess() && name.equals(rwInstruction.getName())) { // Look up higher in CFG for actual definitions if (instElement != null && PyTypeDeclarationStatementNavigator.isTypeDeclarationTarget(instElement)) { @@ -328,9 +324,8 @@ public final class PyUnusedLocalInspectionVisitor extends PyInspectionVisitor { PyPsiBundle.message("INSP.unused.locals.local.function.isnot.used", ((PyFunction)element).getName()), new PyRemoveStatementQuickFix()); } - else if (element instanceof PyClass) { + else if (element instanceof PyClass cls) { // Local class - final PyClass cls = (PyClass)element; final PsiElement name = cls.getNameIdentifier(); registerWarning(name != null ? name : element, PyPsiBundle.message("INSP.unused.locals.local.class.isnot.used", cls.getName()), new PyRemoveStatementQuickFix()); @@ -353,8 +348,7 @@ public final class PyUnusedLocalInspectionVisitor extends PyInspectionVisitor { boolean mayBeField = false; PyClass containingClass = null; PyParameterList paramList = PsiTreeUtil.getParentOfType(element, PyParameterList.class); - if (paramList != null && paramList.getParent() instanceof PyFunction) { - final PyFunction func = (PyFunction) paramList.getParent(); + if (paramList != null && paramList.getParent() instanceof PyFunction func) { containingClass = func.getContainingClass(); if (containingClass != null && PyUtil.isInitMethod(func) && @@ -456,10 +450,9 @@ public final class PyUnusedLocalInspectionVisitor extends PyInspectionVisitor { private boolean isRangeIteration(@NotNull PyForStatement forStatement) { final PyExpression source = forStatement.getForPart().getSource(); - if (!(source instanceof PyCallExpression)) { + if (!(source instanceof PyCallExpression expr)) { return false; } - final PyCallExpression expr = (PyCallExpression)source; if (expr.isCalleeText("range", "xrange")) { final PyResolveContext resolveContext = PyResolveContext.defaultContext(myTypeEvalContext); final PyBuiltinCache builtinCache = PyBuiltinCache.getInstance(forStatement); @@ -491,9 +484,8 @@ public final class PyUnusedLocalInspectionVisitor extends PyInspectionVisitor { element = parent; parent = element.getParent(); } - if (parent instanceof PyTupleExpression) { + if (parent instanceof PyTupleExpression tuple) { // if all the items of the tuple are unused, we still highlight all of them; if some are unused, we ignore - final PyTupleExpression tuple = (PyTupleExpression)parent; for (PyExpression expression : tuple.getElements()) { if (expression instanceof PyStarExpression){ if (!myUnusedElements.contains(((PyStarExpression)expression).getExpression())){ diff --git a/python/python-psi-impl/src/com/jetbrains/python/lexer/PythonIndentingProcessor.java b/python/python-psi-impl/src/com/jetbrains/python/lexer/PythonIndentingProcessor.java index 3b5d170b044d..de71d0f512c0 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/lexer/PythonIndentingProcessor.java +++ b/python/python-psi-impl/src/com/jetbrains/python/lexer/PythonIndentingProcessor.java @@ -428,8 +428,7 @@ public class PythonIndentingProcessor extends MergingLexerAdapter { protected int skipPrecedingCommentsWithIndent(int indent, int index) { // insert the DEDENT before previous comments that have the same indent as the current token indent boolean foundComment = false; - while(index > 0 && myTokenQueue.get(index-1) instanceof PendingCommentToken) { - final PendingCommentToken commentToken = (PendingCommentToken)myTokenQueue.get(index - 1); + while(index > 0 && myTokenQueue.get(index - 1) instanceof PendingCommentToken commentToken) { if (commentToken.getIndent() != indent) { break; } diff --git a/python/python-psi-impl/src/com/jetbrains/python/parsing/ParsingScope.java b/python/python-psi-impl/src/com/jetbrains/python/parsing/ParsingScope.java index b779c5d1b378..bcc6dc46db39 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/parsing/ParsingScope.java +++ b/python/python-psi-impl/src/com/jetbrains/python/parsing/ParsingScope.java @@ -85,9 +85,8 @@ public class ParsingScope { @Override public boolean equals(Object o) { if (o == this) return true; - if (!(o instanceof ParsingScope)) return false; + if (!(o instanceof ParsingScope scope)) return false; - final ParsingScope scope = (ParsingScope)o; return myFunction == scope.myFunction && myClass == scope.myClass && mySuite == scope.mySuite && diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/PyStringLiteralUtil.java b/python/python-psi-impl/src/com/jetbrains/python/psi/PyStringLiteralUtil.java index 8642224504f2..c1457c90ab97 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/PyStringLiteralUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/PyStringLiteralUtil.java @@ -154,8 +154,7 @@ public final class PyStringLiteralUtil extends PyStringLiteralCoreUtil { if (o == null) { return null; } - if (o instanceof PyStringLiteralExpression) { - PyStringLiteralExpression literalExpression = (PyStringLiteralExpression)o; + if (o instanceof PyStringLiteralExpression literalExpression) { return literalExpression.getStringValue(); } else { diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/PyUtil.java b/python/python-psi-impl/src/com/jetbrains/python/psi/PyUtil.java index 53a0da38428d..9277c39f14de 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/PyUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/PyUtil.java @@ -84,16 +84,13 @@ public final class PyUtil { boolean unfoldListLiterals, boolean unfoldStarExpressions) { // NOTE: this proliferation of instanceofs is not very beautiful. Maybe rewrite using a visitor. for (PyExpression exp : targets) { - if (exp instanceof PyParenthesizedExpression) { - final PyParenthesizedExpression parenExpr = (PyParenthesizedExpression)exp; + if (exp instanceof PyParenthesizedExpression parenExpr) { unfoldParentheses(new PyExpression[]{parenExpr.getContainedExpression()}, receiver, unfoldListLiterals, unfoldStarExpressions); } - else if (exp instanceof PyTupleExpression) { - final PyTupleExpression tupleExpr = (PyTupleExpression)exp; + else if (exp instanceof PyTupleExpression tupleExpr) { unfoldParentheses(tupleExpr.getElements(), receiver, unfoldListLiterals, unfoldStarExpressions); } - else if (exp instanceof PyListLiteralExpression && unfoldListLiterals) { - final PyListLiteralExpression listLiteral = (PyListLiteralExpression)exp; + else if (exp instanceof PyListLiteralExpression listLiteral && unfoldListLiterals) { unfoldParentheses(listLiteral.getElements(), receiver, true, unfoldStarExpressions); } else if (exp instanceof PyStarExpression && unfoldStarExpressions) { @@ -274,8 +271,7 @@ public final class PyUtil { return false; } final ScopeOwner owner = ScopeUtil.getScopeOwner(target); - if (owner instanceof PyFunction) { - final PyFunction method = (PyFunction)owner; + if (owner instanceof PyFunction method) { if (method.getContainingClass() != null) { if (method.getStub() != null) { return true; @@ -312,13 +308,11 @@ public final class PyUtil { if (condition instanceof PyParenthesizedExpression) { return isNameEqualsMain(((PyParenthesizedExpression)condition).getContainedExpression()); } - if (condition instanceof PyBinaryExpression) { - PyBinaryExpression binaryExpression = (PyBinaryExpression)condition; + if (condition instanceof PyBinaryExpression binaryExpression) { if (binaryExpression.getOperator() == PyTokenTypes.OR_KEYWORD) { return isNameEqualsMain(binaryExpression.getLeftExpression()) || isNameEqualsMain(binaryExpression.getRightExpression()); } - if (binaryExpression.getRightExpression() instanceof PyStringLiteralExpression) { - final PyStringLiteralExpression rhs = (PyStringLiteralExpression) binaryExpression.getRightExpression(); + if (binaryExpression.getRightExpression() instanceof PyStringLiteralExpression rhs) { return binaryExpression.getOperator() == PyTokenTypes.EQEQ && binaryExpression.getLeftExpression().getText().equals(PyNames.NAME) && rhs.getStringValue().equals("__main__"); @@ -901,8 +895,7 @@ public final class PyUtil { */ @Nullable public static PsiElement turnDirIntoInit(@Nullable PsiElement target) { - if (target instanceof PsiDirectory) { - final PsiDirectory dir = (PsiDirectory)target; + if (target instanceof PsiDirectory dir) { final PsiFile initStub = dir.findFile(PyNames.INIT_DOT_PYI); if (initStub != null && !PyiStubSuppressor.isIgnoredStub(initStub)) { return initStub; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/ParamHelper.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/ParamHelper.java index 9b3ad2156010..cb865aff24b5 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/ParamHelper.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/ParamHelper.java @@ -55,8 +55,7 @@ public final class ParamHelper { final boolean first = i == 0; final boolean last = i == parameters.size() - 1; - if (psi instanceof PyTupleParameter) { - final PyTupleParameter tupleParameter = (PyTupleParameter)psi; + if (psi instanceof PyTupleParameter tupleParameter) { walker.enterTupleParameter(tupleParameter, first, last); walkDownParamArray(tupleParameter.getContents(), walker); walker.leaveTupleParameter(tupleParameter, first, last); diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PropertyBunch.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PropertyBunch.java index c2073cd8abf7..12f1216c014d 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PropertyBunch.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PropertyBunch.java @@ -68,11 +68,9 @@ public abstract class PropertyBunch { @Nullable public static PyCallExpression findPropertyCallSite(@Nullable PyExpression source) { - if (source instanceof PyCallExpression) { - final PyCallExpression call = (PyCallExpression)source; + if (source instanceof PyCallExpression call) { final PyExpression callee = call.getCallee(); - if (callee instanceof PyReferenceExpression) { - final PyReferenceExpression ref = (PyReferenceExpression)callee; + if (callee instanceof PyReferenceExpression ref) { if (!ref.isQualified() && PyNames.PROPERTY.equals(callee.getName()) && diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyAssignmentStatementImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyAssignmentStatementImpl.java index fde1e7efacf9..8cd3f0ef7961 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyAssignmentStatementImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyAssignmentStatementImpl.java @@ -239,8 +239,7 @@ public class PyAssignmentStatementImpl extends PyElementImpl implements PyAssign public PsiNamedElement getNamedElement(@NotNull final String the_name) { // performance: check simple case first PyExpression[] targets = getTargets(); - if (targets.length == 1 && targets[0] instanceof PyTargetExpression) { - PyTargetExpression target = (PyTargetExpression)targets[0]; + if (targets.length == 1 && targets[0] instanceof PyTargetExpression target) { return !target.isQualified() && the_name.equals(target.getName()) ? target : null; } return PyUtil.IterHelper.findName(getNamedElements(), the_name); diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyBinaryExpressionImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyBinaryExpressionImpl.java index 3bdb897f61f7..c3975252f883 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyBinaryExpressionImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyBinaryExpressionImpl.java @@ -245,8 +245,7 @@ public class PyBinaryExpressionImpl extends PyElementImpl implements PyBinaryExp private static boolean isTrueDivEnabled(@NotNull PyElement anchor) { final PsiFile file = anchor.getContainingFile(); - if (file instanceof PyFile) { - final PyFile pyFile = (PyFile)file; + if (file instanceof PyFile pyFile) { return FutureFeature.DIVISION.requiredAt(pyFile.getLanguageLevel()) || pyFile.hasImportFromFuture(FutureFeature.DIVISION); } return false; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java index 754c3f89bf0d..983f14b6942e 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java @@ -81,9 +81,8 @@ public final class PyCallExpressionHelper { PsiElement resolved; QualifiedResolveResult resolveResult; - if (callee instanceof PyReferenceExpression) { + if (callee instanceof PyReferenceExpression ref) { // dereference - PyReferenceExpression ref = (PyReferenceExpression)callee; resolveResult = ref.followAssignmentsChain(PyResolveContext.defaultContext(TypeEvalContext.codeInsightFallback(ref.getProject()))); resolved = resolveResult.getElement(); } @@ -94,8 +93,7 @@ public final class PyCallExpressionHelper { if (resolved instanceof PyClass) { return (PyClass)resolved; } - else if (resolved instanceof PyFunction) { - final PyFunction pyFunction = (PyFunction)resolved; + else if (resolved instanceof PyFunction pyFunction) { return pyFunction.getContainingClass(); } @@ -142,8 +140,7 @@ public final class PyCallExpressionHelper { @Nullable public static PyExpression getReceiver(@NotNull PyCallExpression call, @Nullable PyCallable resolvedCallee) { - if (resolvedCallee instanceof PyFunction) { - final PyFunction function = (PyFunction)resolvedCallee; + if (resolvedCallee instanceof PyFunction function) { if (!PyNames.NEW.equals(function.getName()) && function.getModifier() == PyFunction.Modifier.STATICMETHOD) { return null; } @@ -165,8 +162,7 @@ public final class PyCallExpressionHelper { private static boolean isImplicitlyInvokedMethod(@Nullable PyCallable resolvedCallee) { if (PyUtil.isInitOrNewMethod(resolvedCallee)) return true; - if (resolvedCallee instanceof PyFunction) { - final PyFunction function = (PyFunction)resolvedCallee; + if (resolvedCallee instanceof PyFunction function) { return PyNames.CALL.equals(function.getName()) && function.getContainingClass() != null; } @@ -230,8 +226,7 @@ public final class PyCallExpressionHelper { final List result = new ArrayList<>(); for (PyType type : PyTypeUtil.toStream(calleeType)) { - if (type instanceof PyClassType) { - final var classType = (PyClassType)type; + if (type instanceof PyClassType classType) { final var implicitlyInvokedMethods = forEveryScopeTakeOverloadsOtherwiseImplementations( @@ -261,8 +256,7 @@ public final class PyCallExpressionHelper { final PyExpression callee = call.getCallee(); final TypeEvalContext context = resolveContext.getTypeEvalContext(); - if (callee instanceof PyQualifiedExpression) { - final PyQualifiedExpression qualifiedCallee = (PyQualifiedExpression)callee; + if (callee instanceof PyQualifiedExpression qualifiedCallee) { final String referencedName = qualifiedCallee.getReferencedName(); if (referencedName == null) return Collections.emptyList(); @@ -324,8 +318,7 @@ public final class PyCallExpressionHelper { @NotNull PyResolveContext resolveContext) { final PsiElement resolved = resolveResult.getElement(); - if (resolved instanceof PyCallExpression) { // foo = classmethod(foo) - final PyCallExpression resolvedCall = (PyCallExpression)resolved; + if (resolved instanceof PyCallExpression resolvedCall) { // foo = classmethod(foo) final Pair wrapperInfo = interpretAsModifierWrappingCall(resolvedCall); if (wrapperInfo != null) { @@ -340,8 +333,7 @@ public final class PyCallExpressionHelper { return Collections.singletonList(result); } } - else if (resolved instanceof PyFunction) { - final PyFunction function = (PyFunction)resolved; + else if (resolved instanceof PyFunction function) { final TypeEvalContext context = resolveContext.getTypeEvalContext(); if (function.getProperty() != null && isQualifiedByInstance(function, resolveResult.getQualifiers(), context)) { @@ -367,8 +359,7 @@ public final class PyCallExpressionHelper { final PyCallableType callableType = PyUtil.as(context.getType((PyTypedElement)clarifiedResolved), PyCallableType.class); if (callableType == null) return null; - if (clarifiedResolved instanceof PyCallable) { - final PyCallable callable = (PyCallable)clarifiedResolved; + if (clarifiedResolved instanceof PyCallable callable) { final PyFunction.Modifier originalModifier = callable instanceof PyFunction ? ((PyFunction)callable).getModifier() : null; final PyFunction.Modifier resolvedModifier = ObjectUtils.chooseNotNull(originalModifier, resolveResult.myWrappedModifier); @@ -515,8 +506,7 @@ public final class PyCallExpressionHelper { @NotNull TypeEvalContext context) { final PyType qualifierType = context.getType(qualifier); - if (qualifierType instanceof PyClassType) { - final PyClassType qualifierClassType = (PyClassType)qualifierType; + if (qualifierType instanceof PyClassType qualifierClassType) { return qualifierClassType.isDefinition() && belongsToSpecifiedClassHierarchy(resolved, qualifierClassType.getPyClass(), context); } else if (qualifierType instanceof PyClassLikeType) { @@ -565,8 +555,7 @@ public final class PyCallExpressionHelper { if (args.length == 1) { final PyExpression arg = args[0]; final PyType argType = context.getType(arg); - if (argType instanceof PyClassType) { - final PyClassType classType = (PyClassType)argType; + if (argType instanceof PyClassType classType) { if (!classType.isDefinition()) { final PyClass cls = classType.getPyClass(); return context.getType(cls); @@ -628,8 +617,7 @@ public final class PyCallExpressionHelper { final PyType initOrNewCallType = initOrNewMethod.getCallType(context, callSite); if (receiverClass != initOrNewClass) { - if (initOrNewCallType instanceof PyTupleType) { - final PyTupleType tupleType = (PyTupleType)initOrNewCallType; + if (initOrNewCallType instanceof PyTupleType tupleType) { return new PyTupleType(receiverClass, tupleType.getElementTypes(), tupleType.isHomogeneous()); } @@ -660,8 +648,7 @@ public final class PyCallExpressionHelper { PyExpression[] args = argumentList.getArguments(); if (containingClass != null && args.length > 1) { PyExpression first_arg = args[0]; - if (first_arg instanceof PyReferenceExpression) { - final PyReferenceExpression firstArgRef = (PyReferenceExpression)first_arg; + if (first_arg instanceof PyReferenceExpression firstArgRef) { final PyExpression qualifier = firstArgRef.getQualifier(); if (qualifier != null && PyNames.__CLASS__.equals(firstArgRef.getReferencedName())) { final PsiReference qRef = qualifier.getReference(); @@ -674,8 +661,7 @@ public final class PyCallExpressionHelper { } } PsiElement possible_class = firstArgRef.getReference().resolve(); - if (possible_class instanceof PyClass && ((PyClass)possible_class).isNewStyleClass(context)) { - final PyClass first_class = (PyClass)possible_class; + if (possible_class instanceof PyClass first_class && ((PyClass)possible_class).isNewStyleClass(context)) { return new Maybe<>(getSuperCallTypeForArguments(context, first_class, args[1])); } } @@ -1311,8 +1297,7 @@ public final class PyCallExpressionHelper { final List unmappedArguments = new ArrayList<>(); final Map mappedParameters = new LinkedHashMap<>(); argument = PyPsiUtils.flattenParens(argument); - if (argument instanceof PySequenceExpression) { - final PySequenceExpression sequenceExpr = (PySequenceExpression)argument; + if (argument instanceof PySequenceExpression sequenceExpr) { final PyExpression[] argumentComponents = sequenceExpr.getElements(); final PyParameter[] parameterComponents = parameter.getContents(); for (int i = 0; i < parameterComponents.length; i++) { @@ -1410,8 +1395,7 @@ public final class PyCallExpressionHelper { else { seenVariadicPositionalArgument = true; final PsiElement expr = PyPsiUtils.flattenParens(PsiTreeUtil.getChildOfType(argument, PyExpression.class)); - if (expr instanceof PySequenceExpression) { - final PySequenceExpression sequenceExpr = (PySequenceExpression)expr; + if (expr instanceof PySequenceExpression sequenceExpr) { final List elements = Arrays.asList(sequenceExpr.getElements()); allPositionalArguments.addAll(elements); componentsOfVariadicPositionalArguments.addAll(elements); @@ -1466,8 +1450,7 @@ public final class PyCallExpressionHelper { @NotNull PyCallSiteExpression callSite, @NotNull PyResolveContext resolveContext) { final int implicitOffset; - if (callSite instanceof PyCallExpression) { - final PyCallExpression callExpr = (PyCallExpression)callSite; + if (callSite instanceof PyCallExpression callExpr) { final PyExpression callee = callExpr.getCallee(); if (callee instanceof PyReferenceExpression && callable instanceof PyFunction) { implicitOffset = getImplicitArgumentCount((PyReferenceExpression)callee, (PyFunction)callable, diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionNavigator.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionNavigator.java index 6dc064483166..e19f512c4f34 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionNavigator.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionNavigator.java @@ -26,8 +26,7 @@ public final class PyCallExpressionNavigator { @Nullable public static PyCallExpression getPyCallExpressionByCallee(final PsiElement element){ final PsiElement parent = element.getParent(); - if (parent instanceof PyCallExpression){ - final PyCallExpression expression = (PyCallExpression)parent; + if (parent instanceof PyCallExpression expression){ return expression.getCallee() == element ? expression : null; } return null; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyClassImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyClassImpl.java index 5dbbd03211c1..718b84571836 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyClassImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyClassImpl.java @@ -182,8 +182,7 @@ public class PyClassImpl extends PyBaseElementImpl implements PyCla } } // Heuristic: unfold Foo[Bar] to Foo for subscription expressions for superclasses - else if (expression instanceof PySubscriptionExpression) { - final PySubscriptionExpression subscriptionExpr = (PySubscriptionExpression)expression; + else if (expression instanceof PySubscriptionExpression subscriptionExpr) { return Collections.singletonList(subscriptionExpr.getOperand()); } @@ -1038,8 +1037,7 @@ public class PyClassImpl extends PyBaseElementImpl implements PyCla } List result = new ArrayList<>(); for (PsiElement psiElement : getStatementList().getChildren()) { - if (psiElement instanceof PyAssignmentStatement) { - final PyAssignmentStatement assignmentStatement = (PyAssignmentStatement)psiElement; + if (psiElement instanceof PyAssignmentStatement assignmentStatement) { final PyExpression[] targets = assignmentStatement.getTargets(); for (PyExpression target : targets) { if (target instanceof PyTargetExpression) { @@ -1482,8 +1480,7 @@ public class PyClassImpl extends PyBaseElementImpl implements PyCla else { final QualifiedName name = getMetaClassQName(); final PsiFile file = getContainingFile(); - if (file instanceof PyFile) { - final PyFile pyFile = (PyFile)file; + if (file instanceof PyFile pyFile) { if (name != null) { return classTypeFromQName(name, pyFile, context); } @@ -1492,8 +1489,7 @@ public class PyClassImpl extends PyBaseElementImpl implements PyCla final LanguageLevel level = LanguageLevel.forElement(this); if (level.isPython2()) { final PsiFile file = getContainingFile(); - if (file instanceof PyFile) { - final PyFile pyFile = (PyFile)file; + if (file instanceof PyFile pyFile) { final PsiElement element = pyFile.getElementNamed(PyNames.DUNDER_METACLASS); if (element instanceof PyTypedElement) { return context.getType((PyTypedElement)element); @@ -1585,8 +1581,7 @@ public class PyClassImpl extends PyBaseElementImpl implements PyCla if (!level.isPython2()) { // Requires AST access for (PyExpression expression : getSuperClassExpressions()) { - if (expression instanceof PyKeywordArgument) { - final PyKeywordArgument argument = (PyKeywordArgument)expression; + if (expression instanceof PyKeywordArgument argument) { if (PyNames.METACLASS.equals(argument.getKeyword())) { return argument.getValueExpression(); } @@ -1660,8 +1655,7 @@ public class PyClassImpl extends PyBaseElementImpl implements PyCla final List classes = new ArrayList<>(); classes.add(this); for (PyClassLikeType ancestorType : ancestorTypes) { - if (ancestorType instanceof PyClassType) { - final PyClassType classType = (PyClassType)ancestorType; + if (ancestorType instanceof PyClassType classType) { classes.add(classType.getPyClass()); } } diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyEvaluator.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyEvaluator.java index 0b849a93bdb6..72d8480841f4 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyEvaluator.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyEvaluator.java @@ -329,10 +329,9 @@ public class PyEvaluator { if (arguments.length > 0) { final Map result = new HashMap<>(); for (final PyExpression argument : arguments) { - if (!(argument instanceof PyKeywordArgument)) { + if (!(argument instanceof PyKeywordArgument keywordArgument)) { continue; } - final PyKeywordArgument keywordArgument = (PyKeywordArgument)argument; final String keyword = keywordArgument.getKeyword(); if (keyword == null) { continue; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFileImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFileImpl.java index 6d7a83355d0e..d73d6d9db883 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFileImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFileImpl.java @@ -67,17 +67,15 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression { final StubElement stub = getStub(); processDeclarations(PyPsiUtils.collectAllStubChildren(PyFileImpl.this, stub), element -> { - if (element instanceof PsiNamedElement && + if (element instanceof PsiNamedElement namedElement && !(element instanceof PyKeywordArgument) && !(stub == null && element.getParent() instanceof PyImportElement)) { - final PsiNamedElement namedElement = (PsiNamedElement)element; myNamedElements.computeIfAbsent(namedElement.getName(), __ -> new ArrayList<>()).add(namedElement); } if (element instanceof PyImportedNameDefiner) { myImportedNameDefiners.add((PyImportedNameDefiner)element); } - if (element instanceof PyFromImportStatement) { - final PyFromImportStatement fromImportStatement = (PyFromImportStatement)element; + if (element instanceof PyFromImportStatement fromImportStatement) { final PyStarImportElement starImportElement = fromImportStatement.getStarImportElement(); if (starImportElement != null) { myImportedNameDefiners.add(starImportElement); @@ -86,8 +84,7 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression { Collections.addAll(myImportedNameDefiners, fromImportStatement.getImportElements()); } } - else if (element instanceof PyImportStatement) { - final PyImportStatement importStatement = (PyImportStatement)element; + else if (element instanceof PyImportStatement importStatement) { Collections.addAll(myImportedNameDefiners, importStatement.getImportElements()); } return true; @@ -103,8 +100,7 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression { if (!processor.process(child)) { return false; } - if (child instanceof PyExceptPart) { - final PyExceptPart part = (PyExceptPart)child; + if (child instanceof PyExceptPart part) { if (!processDeclarations(PyPsiUtils.collectAllStubChildren(part, part.getStub()), processor)) { return false; } @@ -343,8 +339,7 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression { public List getStatements() { List stmts = new ArrayList<>(); for (PsiElement child : getChildren()) { - if (child instanceof PyStatement) { - PyStatement statement = (PyStatement)child; + if (child instanceof PyStatement statement) { stmts.add(statement); } } @@ -533,8 +528,7 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression { if (PyNames.ALL.equals(node.getName())) { myFoundDunderAll = true; final PyExpression value = node.findAssignedValue(); - if (value instanceof PyBinaryExpression) { - final PyBinaryExpression binaryExpression = (PyBinaryExpression)value; + if (value instanceof PyBinaryExpression binaryExpression) { if (binaryExpression.isOperator("+")) { processSubList(getStringListFromValue(binaryExpression.getLeftExpression())); processSubList(getStringListFromValue(binaryExpression.getRightExpression())); diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java index 2a57da2f0bdf..0cda2b69758c 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java @@ -293,14 +293,12 @@ public class PyFunctionImpl extends PyBaseElementImpl implements boolean allowCoroutineOrGenerator) { if (receiver != null) { // TODO: Currently we substitute only simple subclass types and unions, but we could handle collection types as well - if (returnType instanceof PyClassType) { - final PyClassType returnClassType = (PyClassType)returnType; + if (returnType instanceof PyClassType returnClassType) { if (returnClassType.getPyClass() == getContainingClass()) { final PyType receiverType = context.getType(receiver); - if (receiverType instanceof PyClassType) { - final PyClassType receiverClassType = (PyClassType)receiverType; + if (receiverType instanceof PyClassType receiverClassType) { if (receiverClassType.getPyClass() != returnClassType.getPyClass() && PyTypeChecker.match(returnClassType.toClass(), receiverClassType.toClass(), context)) { @@ -428,10 +426,8 @@ public class PyFunctionImpl extends PyBaseElementImpl implements public static @Nullable String extractDeprecationMessage(List statements) { for (PyStatement statement : statements) { - if (statement instanceof PyExpressionStatement) { - PyExpressionStatement expressionStatement = (PyExpressionStatement)statement; - if (expressionStatement.getExpression() instanceof PyCallExpression) { - PyCallExpression callExpression = (PyCallExpression)expressionStatement.getExpression(); + if (statement instanceof PyExpressionStatement expressionStatement) { + if (expressionStatement.getExpression() instanceof PyCallExpression callExpression) { if (callExpression.isCalleeText(PyNames.WARN)) { PyReferenceExpression warningClass = callExpression.getArgument(1, PyReferenceExpression.class); if (warningClass != null && (PyNames.DEPRECATION_WARNING.equals(warningClass.getReferencedName()) || diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyGlobalStatementNavigator.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyGlobalStatementNavigator.java index 0a3ce01308d4..adad146f244a 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyGlobalStatementNavigator.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyGlobalStatementNavigator.java @@ -27,8 +27,7 @@ public final class PyGlobalStatementNavigator { @Nullable public static PyGlobalStatement getByArgument(final PsiElement element){ final PsiElement parent = element.getParent(); - if (parent instanceof PyGlobalStatement){ - final PyGlobalStatement statement = (PyGlobalStatement)parent; + if (parent instanceof PyGlobalStatement statement){ return ArrayUtil.find(statement.getGlobals(), element) != -1 ? statement : null; } return null; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java index 1db6ede73187..9f01734a2f77 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java @@ -325,8 +325,7 @@ public class PyNamedParameterImpl extends PyBaseElementImpl isLast = false; break; } - if (p instanceof PyNamedParameter) { - PyNamedParameter named = (PyNamedParameter)p; + if (p instanceof PyNamedParameter named) { if (named.isKeywordContainer() || named.isPositionalContainer()) { beforeWhat = p.getNode(); isLast = false; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyPsiFacadeImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyPsiFacadeImpl.java index 7f54c0c8653c..3dd2db825b50 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyPsiFacadeImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyPsiFacadeImpl.java @@ -121,8 +121,7 @@ public class PyPsiFacadeImpl extends PyPsiFacade { @NotNull @Override public LanguageLevel getLanguageLevel(@NotNull PsiElement element) { - if (element instanceof PsiDirectory) { - final PsiDirectory directory = (PsiDirectory)element; + if (element instanceof PsiDirectory directory) { return PythonLanguageLevelPusher.getLanguageLevelForVirtualFile(directory.getProject(), directory.getVirtualFile()); } diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java index 29b4e5b8fdd4..528c58cc34db 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java @@ -152,16 +152,14 @@ public class PyReferenceExpressionImpl extends PyElementImpl implements PyRefere for (ResolveResult resolveResult : node.myReferenceExpression.getReference(resolveContext).multiResolve(false)) { final PsiElement element = resolveResult.getElement(); - if (element instanceof PyTargetExpression && follow.test((PyTargetExpression)element)) { - final PyTargetExpression target = (PyTargetExpression)element; + if (element instanceof PyTargetExpression target && follow.test((PyTargetExpression)element)) { final List assignedFromElements = context.maySwitchToAST(target) ? Collections.singletonList(target.findAssignedValue()) : target.multiResolveAssignedValue(resolveContext); for (PsiElement assignedFrom : assignedFromElements) { - if (assignedFrom instanceof PyReferenceExpression) { - final PyReferenceExpression assignedReference = (PyReferenceExpression)assignedFrom; + if (assignedFrom instanceof PyReferenceExpression assignedReference) { if (!visited.add(assignedReference)) continue; @@ -345,8 +343,7 @@ public class PyReferenceExpressionImpl extends PyElementImpl implements PyRefere @Nullable private Ref getTypeOfProperty(@Nullable PyType qualifierType, @NotNull String name, @NotNull TypeEvalContext context) { - if (qualifierType instanceof PyClassType) { - final PyClassType classType = (PyClassType)qualifierType; + if (qualifierType instanceof PyClassType classType) { final PyClass pyClass = classType.getPyClass(); final Property property = pyClass.findProperty(name, true, context); @@ -363,8 +360,7 @@ public class PyReferenceExpressionImpl extends PyElementImpl implements PyRefere return Ref.create(); } } - else if (qualifierType instanceof PyUnionType) { - final PyUnionType unionType = (PyUnionType)qualifierType; + else if (qualifierType instanceof PyUnionType unionType) { for (PyType type : unionType.getMembers()) { final Ref result = getTypeOfProperty(type, name, context); if (result != null) { @@ -471,8 +467,7 @@ public class PyReferenceExpressionImpl extends PyElementImpl implements PyRefere if (target instanceof PyTypedElement) { return context.getType((PyTypedElement)target); } - if (target instanceof PsiDirectory) { - final PsiDirectory dir = (PsiDirectory)target; + if (target instanceof PsiDirectory dir) { final PsiFile file = dir.findFile(PyNames.INIT_DOT_PY); if (file != null) { return getTypeFromTarget(file, context, anchor); diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyStarImportElementImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyStarImportElementImpl.java index a63ee38c4d2d..fb83c183f762 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyStarImportElementImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyStarImportElementImpl.java @@ -51,14 +51,12 @@ public class PyStarImportElementImpl extends PyBaseElementImpl iterateNames() { - if (getParent() instanceof PyFromImportStatement) { - PyFromImportStatement fromImportStatement = (PyFromImportStatement)getParent(); + if (getParent() instanceof PyFromImportStatement fromImportStatement) { final List importedFiles = fromImportStatement.resolveImportSourceCandidates(); ChainIterable chain = new ChainIterable<>(); for (PsiElement importedFile : new HashSet<>(importedFiles)) { // resolver gives lots of duplicates final PsiElement source = PyUtil.turnDirIntoInit(importedFile); - if (source instanceof PyFile) { - final PyFile sourceFile = (PyFile)source; + if (source instanceof PyFile sourceFile) { chain.add(filterStarImportableNames(sourceFile.iterateNames(), sourceFile)); } } @@ -84,8 +82,7 @@ public class PyStarImportElementImpl extends PyBaseElementImpl calculateMultiResolveName(@NotNull String name) { final PsiElement parent = getParentByStub(); - if (parent instanceof PyFromImportStatement) { - final PyFromImportStatement fromImportStatement = (PyFromImportStatement)parent; + if (parent instanceof PyFromImportStatement fromImportStatement) { final List importedFiles = fromImportStatement.resolveImportSourceCandidates(); for (PsiElement importedFile : new HashSet<>(importedFiles)) { // resolver gives lots of duplicates final PyFile sourceFile = as(PyUtil.turnDirIntoInit(importedFile), PyFile.class); diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyStringLiteralDecoder.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyStringLiteralDecoder.java index 8546ca240565..3242403f8da4 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyStringLiteralDecoder.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyStringLiteralDecoder.java @@ -157,8 +157,7 @@ public class PyStringLiteralDecoder { return true; } final PsiFile file = myNode.getContainingFile(); - if (file instanceof PyFile) { - final PyFile pyFile = (PyFile)file; + if (file instanceof PyFile pyFile) { return pyFile.hasImportFromFuture(FutureFeature.UNICODE_LITERALS); } return false; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PySubscriptionExpressionImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PySubscriptionExpressionImpl.java index 912b1774d355..003f56ed9e82 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PySubscriptionExpressionImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PySubscriptionExpressionImpl.java @@ -75,15 +75,13 @@ public class PySubscriptionExpressionImpl extends PyElementImpl implements PySub public PyType getType(@NotNull TypeEvalContext context, @NotNull TypeEvalContext.Key key) { final PyExpression indexExpression = getIndexExpression(); final PyType type = indexExpression != null ? context.getType(getOperand()) : null; - if (type instanceof PyTupleType) { - final PyTupleType tupleType = (PyTupleType)type; + if (type instanceof PyTupleType tupleType) { return Optional .ofNullable(PyEvaluator.evaluate(indexExpression, Integer.class)) .map(tupleType::getElementType) .orElse(null); } - if (type instanceof PyTypedDictType) { - final PyTypedDictType typedDictType = (PyTypedDictType)type; + if (type instanceof PyTypedDictType typedDictType) { return Optional .ofNullable(PyEvaluator.evaluate(indexExpression, String.class)) .map(typedDictType::getElementType) diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java index d1634e761c09..c32e39e0f487 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java @@ -149,15 +149,13 @@ public class PyTargetExpressionImpl extends PyBaseElementImpl getValueAsStringList(String name) { Object value = myEvaluationResult.myNamespace.get(name); - if (value instanceof List) { - List valueList = (List)value; + if (value instanceof List valueList) { for (Object o : valueList) { if (o != null && !(o instanceof String)) { return Collections.emptyList(); @@ -232,11 +231,9 @@ public class PyBlockEvaluator { @Override public void visitPyCallExpression(@NotNull PyCallExpression node) { PyExpression callee = node.getCallee(); - if (callee instanceof PyReferenceExpression) { - PyReferenceExpression calleeRef = (PyReferenceExpression)callee; + if (callee instanceof PyReferenceExpression calleeRef) { PyExpression qualifier = calleeRef.getQualifier(); - if (qualifier instanceof PyReferenceExpression) { - PyReferenceExpression qualifierRef = (PyReferenceExpression)qualifier; + if (qualifier instanceof PyReferenceExpression qualifierRef) { if (!qualifierRef.isQualified()) { if (PyNames.EXTEND.equals(calleeRef.getReferencedName()) && node.getArguments().length == 1) { processExtendCall(node, qualifierRef.getReferencedName()); @@ -253,8 +250,7 @@ public class PyBlockEvaluator { public void visitPyFromImportStatement(final @NotNull PyFromImportStatement node) { if (node.isFromFuture()) return; final PsiElement source = PyUtil.turnDirIntoInit(node.resolveImportSource()); - if (source instanceof PyFile) { - final PyFile pyFile = (PyFile)source; + if (source instanceof PyFile pyFile) { PyEvaluationResult newlyEvaluatedResult = myContext.getCachedResult(pyFile); if (newlyEvaluatedResult == null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/KeywordArgumentCompletionUtil.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/KeywordArgumentCompletionUtil.java index 1f9e4f2cd67d..01f602679ed9 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/KeywordArgumentCompletionUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/KeywordArgumentCompletionUtil.java @@ -209,8 +209,7 @@ public final class KeywordArgumentCompletionUtil { else if (node.isCalleeText("__init__")) { kwArgsTransit = false; for (PyExpression e : node.getArguments()) { - if (e instanceof PyStarArgument) { - PyStarArgument kw = (PyStarArgument)e; + if (e instanceof PyStarArgument kw) { if (Objects.equals(myKwArgs.getName(), kw.getFirstChild().getNextSibling().getText())) { kwArgsTransit = true; break; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyImportReference.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyImportReference.java index 7f9773fcbb3e..2289a82dd22d 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyImportReference.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyImportReference.java @@ -114,8 +114,7 @@ public class PyImportReference extends PyReferenceImpl { if (item instanceof LookupElementBuilder) { variants[i] = ((LookupElementBuilder)item).withInsertHandler(insertHandler); } - else if (item instanceof PsiNamedElement) { - final PsiNamedElement element = (PsiNamedElement)item; + else if (item instanceof PsiNamedElement element) { final String name = element.getName(); assert name != null; // it can't really have null name variants[i] = LookupElementBuilder @@ -131,8 +130,7 @@ public class PyImportReference extends PyReferenceImpl { if (item instanceof PsiElement) { itemElement = (PsiElement) item; } - else if (item instanceof LookupElement) { - LookupElement lookupElement = (LookupElement) item; + else if (item instanceof LookupElement lookupElement) { final PsiElement element = lookupElement.getPsiElement(); if (element != null) { itemElement = element; @@ -184,10 +182,9 @@ public class PyImportReference extends PyReferenceImpl { ResolveResult[] resolved = src.getReference().multiResolve(false); for (ResolveResult result : resolved) { PsiElement modCandidate = result.getElement(); - if (modCandidate instanceof PyExpression) { + if (modCandidate instanceof PyExpression module) { addImportedNames(fromImport.getImportElements()); // don't propose already imported items // try to collect submodules - PyExpression module = (PyExpression)modCandidate; PyType qualifierType = myContext.getType(module); if (qualifierType != null) { ProcessingContext ctx = new ProcessingContext(); diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyQualifiedReference.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyQualifiedReference.java index 275cda3c6b7b..fadd40cbb299 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyQualifiedReference.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyQualifiedReference.java @@ -185,8 +185,7 @@ public class PyQualifiedReference extends PyReferenceImpl { Collections.addAll(variants, guessedType.getCompletionVariants(myElement.getName(), myElement, ctx)); } } - if (qualifier instanceof PyQualifiedExpression) { - final PyQualifiedExpression qualifierExpression = (PyQualifiedExpression)qualifier; + if (qualifier instanceof PyQualifiedExpression qualifierExpression) { final QualifiedName qualifiedName = qualifierExpression.asQualifiedName(); if (qualifiedName != null) { final Collection attrs = collectAssignedAttributes(qualifiedName, qualifier); @@ -229,8 +228,7 @@ public class PyQualifiedReference extends PyReferenceImpl { @Nullable private PyClassType guessClassTypeByName() { final PyExpression qualifierElement = myElement.getQualifier(); - if (qualifierElement instanceof PyReferenceExpression) { - PyReferenceExpression qualifier = (PyReferenceExpression)qualifierElement; + if (qualifierElement instanceof PyReferenceExpression qualifier) { final String className = qualifier.getReferencedName(); if (className != null) { Collection classes = PyClassNameIndexInsensitive.find(className, getElement().getProject()); @@ -413,8 +411,7 @@ public class PyQualifiedReference extends PyReferenceImpl { if (element instanceof PyParameter) { return true; } - if (element instanceof PyTargetExpression) { - final PyTargetExpression target = (PyTargetExpression)element; + if (element instanceof PyTargetExpression target) { return !target.isQualified() && ScopeUtil.getScopeOwner(target) instanceof PyFunction; } return false; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyReferenceImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyReferenceImpl.java index 3430da8b41a5..487026c19bdf 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyReferenceImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyReferenceImpl.java @@ -120,8 +120,7 @@ public class PyReferenceImpl implements PsiReferenceEx, PsiPolyVariantReference final PsiElement definition = instruction.getElement(); // TODO: This check may slow down resolving, but it is the current solution to the comprehension scopes problem if (isInnerComprehension(element, definition)) continue; - if (definition instanceof PyImportedNameDefiner && !(definition instanceof PsiNamedElement)) { - final PyImportedNameDefiner definer = (PyImportedNameDefiner)definition; + if (definition instanceof PyImportedNameDefiner definer && !(definition instanceof PsiNamedElement)) { final List resolvedResults = definer.multiResolveName(name); for (RatedResolveResult result : resolvedResults) { ret.add(new ImportedResolveResult(result.getElement(), result.getRate(), definer)); @@ -479,14 +478,12 @@ public class PyReferenceImpl implements PsiReferenceEx, PsiPolyVariantReference resolveResult = resolveResult.getNavigationElement(); } if (element instanceof PsiDirectory) { - if (resolveResult instanceof PyFile) { - final PyFile file = (PyFile)resolveResult; + if (resolveResult instanceof PyFile file) { if (PyUtil.isPackage(file) && file.getContainingDirectory() == element) { return true; } } - else if (resolveResult instanceof PsiDirectory) { - final PsiDirectory directory = (PsiDirectory)resolveResult; + else if (resolveResult instanceof PsiDirectory directory) { if (PyUtil.isPackage(directory, null) && directory == element) { return true; } @@ -526,8 +523,7 @@ public class PyReferenceImpl implements PsiReferenceEx, PsiPolyVariantReference } } } - if (element instanceof PyExpression) { - final PyExpression expr = (PyExpression)element; + if (element instanceof PyExpression expr) { if (PyUtil.isClassAttribute(myElement) && (PyUtil.isClassAttribute(expr) || PyUtil.isInstanceAttribute(expr))) { final PyClass c1 = PsiTreeUtil.getParentOfType(element, PyClass.class); final PyClass c2 = PsiTreeUtil.getParentOfType(myElement, PyClass.class); @@ -630,8 +626,7 @@ public class PyReferenceImpl implements PsiReferenceEx, PsiPolyVariantReference protected boolean resolvesToWrapper(PsiElement element, PsiElement resolveResult) { if (element instanceof PyFunction && ((PyFunction) element).getContainingClass() != null && resolveResult instanceof PyTargetExpression) { final PyExpression assignedValue = ((PyTargetExpression)resolveResult).findAssignedValue(); - if (assignedValue instanceof PyCallExpression) { - final PyCallExpression call = (PyCallExpression)assignedValue; + if (assignedValue instanceof PyCallExpression call) { final Pair functionPair = PyCallExpressionHelper.interpretAsModifierWrappingCall(call); if (functionPair != null && functionPair.second == element) { return true; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/stubs/PyClassElementType.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/stubs/PyClassElementType.java index e13d8ebf0f70..a1981914b1c4 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/stubs/PyClassElementType.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/stubs/PyClassElementType.java @@ -97,8 +97,7 @@ public class PyClassElementType extends PyStubElementType @Nullable private static QualifiedName resolveOriginalSuperClassQName(@NotNull PyExpression superClassExpression) { - if (superClassExpression instanceof PyReferenceExpression) { - final PyReferenceExpression reference = (PyReferenceExpression)superClassExpression; + if (superClassExpression instanceof PyReferenceExpression reference) { final String referenceName = reference.getName(); if (referenceName == null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/stubs/PyDecoratorCallElementType.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/stubs/PyDecoratorCallElementType.java index e24f529732e5..de2719a93416 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/stubs/PyDecoratorCallElementType.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/stubs/PyDecoratorCallElementType.java @@ -49,8 +49,7 @@ public class PyDecoratorCallElementType extends PyStubElementType positionalArguments = new ArrayList<>(); Map namedArguments = new HashMap<>(); for (PyExpression argument : arguments) { - if (argument instanceof PyKeywordArgument) { - PyKeywordArgument keywordArgument = (PyKeywordArgument)argument; + if (argument instanceof PyKeywordArgument keywordArgument) { String keyword = keywordArgument.getKeyword(); String value = extractLiteralValue(keywordArgument.getValueExpression()); if (keyword != null && value != null) { @@ -67,8 +66,7 @@ public class PyDecoratorCallElementType extends PyStubElementType> result = new LinkedHashMap<>(); for (PyExpression argument : arguments) { - if (!(argument instanceof PyKeywordArgument)) return null; + if (!(argument instanceof PyKeywordArgument keywordArgument)) return null; - final PyKeywordArgument keywordArgument = (PyKeywordArgument)argument; final String keyword = keywordArgument.getKeyword(); if (keyword == null) return null; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/CompletionVariantsProcessor.java b/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/CompletionVariantsProcessor.java index 9fe4f3305837..adcc8e84eca6 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/CompletionVariantsProcessor.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/CompletionVariantsProcessor.java @@ -87,8 +87,7 @@ public class CompletionVariantsProcessor extends VariantsProcessor { if (element instanceof PyFunction) { cls = ((PyFunction)element).getContainingClass(); } - else if (element instanceof PyTargetExpression) { - final PyTargetExpression expr = (PyTargetExpression)element; + else if (element instanceof PyTargetExpression expr) { if (expr.isQualified() || ScopeUtil.getScopeOwner(expr) instanceof PyClass) { cls = expr.getContainingClass(); } diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/PyResolveUtil.java b/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/PyResolveUtil.java index 308039c5ee04..fd306ca62273 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/PyResolveUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/PyResolveUtil.java @@ -376,8 +376,7 @@ public final class PyResolveUtil { } // Forward references are allowed in annotations according to PEP 563 PsiFile file = element.getContainingFile(); - if (file instanceof PyFile) { - final PyFile pyFile = (PyFile)file; + if (file instanceof PyFile pyFile) { return pyFile.getLanguageLevel().isAtLeast(LanguageLevel.PYTHON37) && pyFile.hasImportFromFuture(FutureFeature.ANNOTATIONS) && PsiTreeUtil.getParentOfType(element, PyAnnotation.class) != null; diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java b/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java index 71dc8f4c97cb..2681430a8a4d 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java @@ -44,8 +44,7 @@ public final class ResolveImportUtil { public static boolean isAbsoluteImportEnabledFor(PsiElement foothold) { if (foothold != null) { PsiFile file = foothold.getContainingFile(); - if (file instanceof PyFile) { - final PyFile pyFile = (PyFile)file; + if (file instanceof PyFile pyFile) { if (pyFile.getLanguageLevel().isPy3K()) { PsiElement originalFoothold = CompletionUtilCoreImpl.getOriginalOrSelf(foothold); if (foothold.getManager().isInProject(originalFoothold) && Registry.is("python.explicit.namespace.packages")) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/VariantsProcessor.java b/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/VariantsProcessor.java index e952b72d39cc..25b0c05d1813 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/VariantsProcessor.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/resolve/VariantsProcessor.java @@ -57,15 +57,13 @@ public abstract class VariantsProcessor implements PsiScopeProcessor { @Override public boolean execute(@NotNull PsiElement element, @NotNull ResolveState substitutor) { if (myNodeFilter != null && !myNodeFilter.value(element)) return true; // skip whatever the filter rejects - if (element instanceof PsiNamedElement) { - final PsiNamedElement namedElement = (PsiNamedElement)element; + if (element instanceof PsiNamedElement namedElement) { final String name = PyUtil.getElementNameWithoutExtension(namedElement); if (nameIsAcceptable(name)) { addElement(name, namedElement); } } - else if (element instanceof PyReferenceExpression) { - final PyReferenceExpression referenceExpression = (PyReferenceExpression)element; + else if (element instanceof PyReferenceExpression referenceExpression) { final String name = referenceExpression.getReferencedName(); if (nameIsAcceptable(name)) { addElement(name, referenceExpression); diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyABCUtil.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyABCUtil.java index 87532a60364c..b6a4b99f4c96 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyABCUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyABCUtil.java @@ -105,13 +105,11 @@ public final class PyABCUtil { // TODO: Convert abc types to structural types and check them properly return true; } - if (type instanceof PyClassType) { - final PyClassType classType = (PyClassType)type; + if (type instanceof PyClassType classType) { final PyClass pyClass = classType.getPyClass(); if (classType.isDefinition()) { final PyClassLikeType metaClassType = classType.getMetaClassType(context, true); - if (metaClassType instanceof PyClassType) { - final PyClassType metaClass = (PyClassType)metaClassType; + if (metaClassType instanceof PyClassType metaClass) { return isSubclass(metaClass.getPyClass(), superClassName, true, context); } } diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyCallableParameterImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyCallableParameterImpl.java index d2909c6f8c0a..7e659b05708b 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyCallableParameterImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyCallableParameterImpl.java @@ -213,8 +213,7 @@ public final class PyCallableParameterImpl implements PyCallableParameter { public PyType getArgumentType(@NotNull TypeEvalContext context) { final PyType parameterType = getType(context); - if (parameterType instanceof PyCollectionType) { - final PyCollectionType collectionType = (PyCollectionType)parameterType; + if (parameterType instanceof PyCollectionType collectionType) { if (isPositionalContainer()) { return collectionType.getIteratedItemType(); diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyCollectionTypeByModificationsProvider.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyCollectionTypeByModificationsProvider.java index c5538fec35e1..39eb0e0f279f 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyCollectionTypeByModificationsProvider.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyCollectionTypeByModificationsProvider.java @@ -24,11 +24,10 @@ public final class PyCollectionTypeByModificationsProvider extends PyTypeProvide if (qualifiedName != null && PyCollectionTypeUtil.INSTANCE.getCollectionConstructors(LanguageLevel.forElement(callSite)).contains(qualifiedName)) { PyExpression target = PyCollectionTypeUtil.INSTANCE.getTargetForValueInAssignment(callSite); - if (target instanceof PyTargetExpression) { + if (target instanceof PyTargetExpression element) { List arguments = callSite.getArguments(null); List argumentTypes = getTypesFromConstructorArguments(context, arguments); - PyTargetExpression element = (PyTargetExpression)target; ScopeOwner owner = ScopeUtil.getScopeOwner(element); if (owner != null) { final List typesByModifications = @@ -80,8 +79,7 @@ public final class PyCollectionTypeByModificationsProvider extends PyTypeProvide private static List extractTypesForDict(@NotNull List argumentTypes, @NotNull List typesByModifications) { if (argumentTypes.size() == 1) { final PyType type = ContainerUtil.getFirstItem(argumentTypes); - if (type instanceof PyTupleType) { - PyTupleType tuple = (PyTupleType)type; + if (type instanceof PyTupleType tuple) { argumentTypes = tuple.getElementTypes(); } else if (type == null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyImportedModuleType.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyImportedModuleType.java index b9027465f1b8..748ccb2767b4 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyImportedModuleType.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyImportedModuleType.java @@ -87,8 +87,7 @@ public class PyImportedModuleType implements PyType { result.addAll(moduleType.getCompletionVariantsAsLookupElements(location, context, false, false, typeEvalContext)); } - else if (resolveResult instanceof PsiDirectory) { - final PsiDirectory dir = (PsiDirectory)resolveResult; + else if (resolveResult instanceof PsiDirectory dir) { if (PyUtil.isPackage(dir, location)) { if (ResolveImportUtil.getPointInImport(location) != PointInImport.NONE) { result.addAll(PyModuleType.getSubModuleVariants(dir, location, null)); diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyModuleType.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyModuleType.java index e860697d5744..35e1b0b7dae2 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyModuleType.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyModuleType.java @@ -577,8 +577,7 @@ public class PyModuleType implements PyType { // Modules don't descend from obje @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PyModuleType)) return false; - PyModuleType type = (PyModuleType)o; + if (!(o instanceof PyModuleType type)) return false; return myModule.equals(type.myModule); } diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeChecker.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeChecker.java index f8e5206cb67b..9d62128e4928 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeChecker.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeChecker.java @@ -169,9 +169,7 @@ public final class PyTypeChecker { return Optional.of(expectedAttributes.containsAll(((PyStructuralType)actual).getAttributeNames())); } - if (actual instanceof PyCallableType && expected instanceof PyCallableType) { - final PyCallableType expectedCallable = (PyCallableType)expected; - final PyCallableType actualCallable = (PyCallableType)actual; + if (actual instanceof PyCallableType actualCallable && expected instanceof PyCallableType expectedCallable) { final Optional match = match(expectedCallable, actualCallable, context); if (match.isPresent()) { return match; @@ -262,8 +260,7 @@ public final class PyTypeChecker { private static boolean match(@NotNull PyParamSpecType expected, @Nullable PyType actual, @NotNull MatchContext context) { if (actual == null) return true; - if (!(actual instanceof PyParamSpecType)) return false; - final var callableActual = (PyParamSpecType)actual; + if (!(actual instanceof PyParamSpecType callableActual)) return false; final var parameters = callableActual.getParameters(); if (parameters == null) return false; context.mySubstitutions.paramSpecs.put(expected, expected.withParameters(parameters, context.context)); @@ -399,8 +396,7 @@ public final class PyTypeChecker { private static @Nullable PyType dropSelfIfNeeded(@NotNull PyClassType classType, @Nullable PyType elementType, @NotNull TypeEvalContext context) { - if (elementType instanceof PyFunctionType) { - PyFunctionType functionType = (PyFunctionType)elementType; + if (elementType instanceof PyFunctionType functionType) { if (PyUtil.isInitOrNewMethod(functionType.getCallable()) || !classType.isDefinition()) { return functionType.dropSelf(context); } @@ -529,15 +525,13 @@ public final class PyTypeChecker { matchContext.mySubstitutions.paramSpecs.put(expectedParamSpecType, expectedParamSpecType.withParameters(actualParameters, context)); break; } - else if (expectedParamType instanceof PyConcatenateType && expectedParameters.size() == 1) { + else if (expectedParamType instanceof PyConcatenateType expectedConcatenateType && expectedParameters.size() == 1) { if (i != 0) break; final var actualParamType = actualParam.getType(context); - final var expectedConcatenateType = (PyConcatenateType)expectedParamType; final var expectedFirstTypes = expectedConcatenateType.getFirstTypes(); - if (actualParamType instanceof PyConcatenateType) { - final var actualConcatenateType = (PyConcatenateType)actualParamType; + if (actualParamType instanceof PyConcatenateType actualConcatenateType) { final var actualFirstType = actualConcatenateType.getFirstTypes(); if (!match(expectedFirstTypes, actualFirstType, matchContext)) { return Optional.of(false); @@ -624,8 +618,7 @@ public final class PyTypeChecker { private static boolean consistsOfSameElementNumberTuples(@NotNull PyUnionType unionType, int elementCount) { for (PyType type : unionType.getMembers()) { - if (type instanceof PyTupleType) { - final PyTupleType tupleType = (PyTupleType)type; + if (type instanceof PyTupleType tupleType) { if (!tupleType.isHomogeneous() && elementCount != tupleType.getElementCount()) { return false; @@ -780,8 +773,7 @@ public final class PyTypeChecker { return true; } } - if (type instanceof PyUnionType) { - final PyUnionType union = (PyUnionType)type; + if (type instanceof PyUnionType union) { for (PyType t : union.getMembers()) { if (isUnknown(t, genericsAreUnknown, context)) { return true; @@ -867,27 +859,23 @@ public final class PyTypeChecker { if (type instanceof PySelfType) { generics.self = (PySelfType)type; } - else if (type instanceof PyUnionType) { - final PyUnionType union = (PyUnionType)type; + else if (type instanceof PyUnionType union) { for (PyType t : union.getMembers()) { collectGenerics(t, context, generics, visited); } } - else if (type instanceof PyTupleType) { - final PyTupleType tuple = (PyTupleType)type; + else if (type instanceof PyTupleType tuple) { final int n = tuple.isHomogeneous() ? 1 : tuple.getElementCount(); for (int i = 0; i < n; i++) { collectGenerics(tuple.getElementType(i), context, generics, visited); } } - else if (type instanceof PyCollectionType) { - final PyCollectionType collection = (PyCollectionType)type; + else if (type instanceof PyCollectionType collection) { for (PyType elementType : collection.getElementTypes()) { collectGenerics(elementType, context, generics, visited); } } - else if (type instanceof PyCallableType && !(type instanceof PyClassLikeType)) { - final PyCallableType callable = (PyCallableType)type; + else if (type instanceof PyCallableType callable && !(type instanceof PyClassLikeType)) { final List parameters = callable.getParameters(context); if (parameters != null) { for (PyCallableParameter parameter : parameters) { @@ -927,8 +915,7 @@ public final class PyTypeChecker { } try { if (hasGenerics(type, context)) { - if (type instanceof PyGenericType) { - final PyGenericType typeVar = (PyGenericType)type; + if (type instanceof PyGenericType typeVar) { PyType substitution = substitutions.typeVars.get(typeVar); if (substitution == null) { final PyInstantiableType invertedTypeVar = invert(typeVar); @@ -970,13 +957,11 @@ public final class PyTypeChecker { else if (type instanceof PyUnionType) { return ((PyUnionType)type).map(member -> substitute(member, substitutions, context, substituting)); } - else if (type instanceof PyCollectionTypeImpl) { - final PyCollectionTypeImpl collection = (PyCollectionTypeImpl)type; + else if (type instanceof PyCollectionTypeImpl collection) { final List elementTypes = collection.getElementTypes(); final List substitutes = new ArrayList<>(); for (PyType elementType : elementTypes) { - if (elementType instanceof PyParamSpecType) { - final var paramSpecType = (PyParamSpecType)elementType; + if (elementType instanceof PyParamSpecType paramSpecType) { final var paramSpecTypeSubst = substitutions.paramSpecs.get(paramSpecType); if (paramSpecTypeSubst != null && paramSpecTypeSubst.getParameters() != null) { substitutes.add(paramSpecTypeSubst); @@ -1002,8 +987,7 @@ public final class PyTypeChecker { ); return PyTypedDictType.Companion.createFromKeysToValueTypes(typedDictType.myClass, substitutedTDFields, false); } - else if (type instanceof PyTupleType) { - final PyTupleType tupleType = (PyTupleType)type; + else if (type instanceof PyTupleType tupleType) { final PyClass tupleClass = tupleType.getPyClass(); final List oldElementTypes = tupleType.isHomogeneous() @@ -1015,8 +999,7 @@ public final class PyTypeChecker { return new PyTupleType(tupleClass, newElementTypes, tupleType.isHomogeneous()); } - else if (type instanceof PyCallableType && !(type instanceof PyClassLikeType)) { - final PyCallableType callable = (PyCallableType)type; + else if (type instanceof PyCallableType callable && !(type instanceof PyClassLikeType)) { List substParams = null; final List parameters = callable.getParameters(context); if (parameters != null) { @@ -1030,8 +1013,7 @@ public final class PyTypeChecker { break; } } - if (parameters.size() == 1 && parameterType instanceof PyConcatenateType) { - final var concatenateType = (PyConcatenateType)parameterType; + if (parameters.size() == 1 && parameterType instanceof PyConcatenateType concatenateType) { final var paramSpecType = concatenateType.getParamSpec(); final var paramSpecTypeSubst = substitutions.paramSpecs.get(paramSpecType); if (paramSpecTypeSubst != null && paramSpecTypeSubst.getParameters() != null) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeParser.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeParser.java index 1732a5e644d5..be27fded17fe 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeParser.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeParser.java @@ -346,8 +346,7 @@ public final class PyTypeParser { tokens.add(first); tokens.addAll(rest); - if (file instanceof PyFile) { - final PyFile pyFile = (PyFile)file; + if (file instanceof PyFile pyFile) { final Map types = new HashMap<>(); final Map fullRanges = new HashMap<>(); final Map imports = new HashMap<>(); diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyUnionType.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyUnionType.java index ed543723949d..0806c0783a7f 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyUnionType.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyUnionType.java @@ -114,8 +114,7 @@ public class PyUnionType implements PyType { if (type == null) { return null; } - else if (type instanceof PyUnionType) { - final PyUnionType unionType = (PyUnionType)type; + else if (type instanceof PyUnionType unionType) { if (unionType.isWeak()) { return unionType; } @@ -178,8 +177,7 @@ public class PyUnionType implements PyType { @Override public boolean equals(Object other) { - if (other instanceof PyUnionType) { - final PyUnionType otherType = (PyUnionType)other; + if (other instanceof PyUnionType otherType) { return myMembers.equals(otherType.myMembers); } return false; diff --git a/python/python-psi-impl/src/com/jetbrains/python/pyi/PyiTypeProvider.java b/python/python-psi-impl/src/com/jetbrains/python/pyi/PyiTypeProvider.java index 7c4eedc76ff8..a79cc788afde 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/pyi/PyiTypeProvider.java +++ b/python/python-psi-impl/src/com/jetbrains/python/pyi/PyiTypeProvider.java @@ -37,8 +37,7 @@ public class PyiTypeProvider extends PyTypeProviderBase { final String name = param.getName(); if (name != null) { final PsiElement pythonStub = PyiUtil.getPythonStub(func); - if (pythonStub instanceof PyFunction) { - final PyFunction functionStub = (PyFunction)pythonStub; + if (pythonStub instanceof PyFunction functionStub) { final PyNamedParameter paramSkeleton = functionStub.getParameterList().findParameterByName(name); if (paramSkeleton != null) { final PyType type = context.getType(paramSkeleton); diff --git a/python/python-psi-impl/src/com/jetbrains/python/pyi/PyiUtil.java b/python/python-psi-impl/src/com/jetbrains/python/pyi/PyiUtil.java index d04b880f42f1..396a93059253 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/pyi/PyiUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/pyi/PyiUtil.java @@ -233,14 +233,12 @@ public final class PyiUtil { return true; }; - if (owner instanceof PyClass) { - final PyClass cls = (PyClass)owner; + if (owner instanceof PyClass cls) { if (name != null) { cls.visitMethods(overloadsProcessor, false, context); } } - else if (owner instanceof PyFile) { - final PyFile file = (PyFile)owner; + else if (owner instanceof PyFile file) { for (PyFunction f : file.getTopLevelFunctions()) { if (!overloadsProcessor.process(f)) { break; diff --git a/python/python-psi-impl/src/com/jetbrains/python/refactoring/PyDefUseUtil.java b/python/python-psi-impl/src/com/jetbrains/python/refactoring/PyDefUseUtil.java index 0e16e0b2860d..2f795af5fb74 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/refactoring/PyDefUseUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/refactoring/PyDefUseUtil.java @@ -76,8 +76,7 @@ public final class PyDefUseUtil { instruction -> { final PsiElement element = instruction.getElement(); final PyImplicitImportNameDefiner implicit = PyUtil.as(element, PyImplicitImportNameDefiner.class); - if (instruction instanceof ReadWriteInstruction) { - final ReadWriteInstruction rwInstruction = (ReadWriteInstruction)instruction; + if (instruction instanceof ReadWriteInstruction rwInstruction) { final ReadWriteInstruction.ACCESS access = rwInstruction.getAccess(); if (access.isWriteAccess() || acceptTypeAssertions && access.isAssertTypeAccess()) { final String name = elementName(element); diff --git a/python/python-psi-impl/src/com/jetbrains/python/refactoring/PyReplaceExpressionUtil.java b/python/python-psi-impl/src/com/jetbrains/python/refactoring/PyReplaceExpressionUtil.java index 5d4241aebc78..5fde06f63876 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/refactoring/PyReplaceExpressionUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/refactoring/PyReplaceExpressionUtil.java @@ -75,8 +75,7 @@ public final class PyReplaceExpressionUtil implements PyElementTypes { if (parentPriority > newPriority) { return true; } - else if (parentPriority == newPriority && parentPriority != 0 && parentExpr instanceof PyBinaryExpression) { - final PyBinaryExpression binaryExpression = (PyBinaryExpression)parentExpr; + else if (parentPriority == newPriority && parentPriority != 0 && parentExpr instanceof PyBinaryExpression binaryExpression) { if (isNotAssociative(binaryExpression) && oldExpr == getLeastPrioritySide(binaryExpression)) { return true; } diff --git a/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringUtil.java b/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringUtil.java index 2b9a4923348a..da69749190c0 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringUtil.java @@ -266,8 +266,7 @@ public final class PyClassRefactoringUtil { if (target instanceof PsiDirectory) { target = (PsiNamedElement)PyUtil.getPackageElement((PsiDirectory)target, sourceNode); } - if (target instanceof PyFunction) { - final PyFunction f = (PyFunction)target; + if (target instanceof PyFunction f) { final PyClass c = f.getContainingClass(); if (c != null && c.multiFindInitOrNew(false, null).contains(f)) { target = c; diff --git a/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/membersManager/MethodsManager.java b/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/membersManager/MethodsManager.java index f68df5e76d84..b6daa5af4d8b 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/membersManager/MethodsManager.java +++ b/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/membersManager/MethodsManager.java @@ -228,8 +228,7 @@ class MethodsManager extends MembersManager { final PsiReference calleeRef = callee.getReference(); if (calleeRef != null) { final PsiElement calleeDeclaration = calleeRef.resolve(); - if (calleeDeclaration instanceof PyFunction) { - final PyFunction calleeFunction = (PyFunction)calleeDeclaration; + if (calleeDeclaration instanceof PyFunction calleeFunction) { final PyClass clazz = calleeFunction.getContainingClass(); if (clazz != null) { if (PyUtil.isInitMethod(calleeFunction)) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/membersManager/PropertiesManager.java b/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/membersManager/PropertiesManager.java index f3bbab8677c7..92aa67b980d0 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/membersManager/PropertiesManager.java +++ b/python/python-psi-impl/src/com/jetbrains/python/refactoring/classes/membersManager/PropertiesManager.java @@ -214,11 +214,10 @@ class PropertiesManager extends MembersManager { } final PsiElement declaration = reference.resolve(); - if (!(declaration instanceof PyFunction)) { + if (!(declaration instanceof PyFunction function)) { return; } - final PyFunction function = (PyFunction)declaration; final Property property = function.getProperty(); if (property == null) { return; diff --git a/python/python-psi-impl/src/com/jetbrains/python/refactoring/inline/PyInlineLocalHandler.java b/python/python-psi-impl/src/com/jetbrains/python/refactoring/inline/PyInlineLocalHandler.java index 19c73b6fb693..7f1143e0e788 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/refactoring/inline/PyInlineLocalHandler.java +++ b/python/python-psi-impl/src/com/jetbrains/python/refactoring/inline/PyInlineLocalHandler.java @@ -138,8 +138,7 @@ public class PyInlineLocalHandler extends InlineActionHandler { boolean pasteInFStringInFString = PsiTreeUtil.getParentOfType(stringElement, PyFormattedStringElement.class) != null; var elementParent = element.getParent(); - if (valueIsStringElement && elementParent instanceof PyFStringFragment) { - var fStringFragment = (PyFStringFragment)elementParent; + if (valueIsStringElement && elementParent instanceof PyFStringFragment fStringFragment) { var stringLiteralValue = (PyStringLiteralExpression)value; if (fStringFragment.getTypeConversion() == null && fStringFragment.getFormatPart() == null) { PyStringElement valueStringElement = valueStringElements.get(0); @@ -421,8 +420,7 @@ public class PyInlineLocalHandler extends InlineActionHandler { private static PyExpression prepareValue(@NotNull PyStatement def, @NotNull String localName, @NotNull Project project) { final PyExpression value = getValue(def); assert value != null; - if (def instanceof PyAugAssignmentStatement) { - final PyAugAssignmentStatement expression = (PyAugAssignmentStatement)def; + if (def instanceof PyAugAssignmentStatement expression) { final PsiElement operation = expression.getOperation(); assert operation != null; final String op = operation.getText().replace('=', ' '); diff --git a/python/python-psi-impl/src/com/jetbrains/python/refactoring/introduce/IntroduceHandler.java b/python/python-psi-impl/src/com/jetbrains/python/refactoring/introduce/IntroduceHandler.java index 61f033f18a77..2c9a54eafc87 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/refactoring/introduce/IntroduceHandler.java +++ b/python/python-psi-impl/src/com/jetbrains/python/refactoring/introduce/IntroduceHandler.java @@ -295,8 +295,7 @@ abstract public class IntroduceHandler implements RefactoringActionHandler { return; } - if (singleElementSelection && element1 instanceof PyStringLiteralExpression) { - final PyStringLiteralExpression literal = (PyStringLiteralExpression)element1; + if (singleElementSelection && element1 instanceof PyStringLiteralExpression literal) { // Currently introduce for substrings of a multi-part string literals is not supported if (literal.getStringNodes().size() > 1) { showCannotPerformError(project, editor); diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/CompatibilityVisitor.java b/python/python-psi-impl/src/com/jetbrains/python/validation/CompatibilityVisitor.java index 3ef0f33bf5f7..bc87955b5919 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/validation/CompatibilityVisitor.java +++ b/python/python-psi-impl/src/com/jetbrains/python/validation/CompatibilityVisitor.java @@ -606,8 +606,7 @@ public abstract class CompatibilityVisitor extends PyAnnotator { seenKeywordArgument = true; keywordArgumentNames.add(keyword); } - else if (argument instanceof PyStarArgument) { - final PyStarArgument starArgument = (PyStarArgument)argument; + else if (argument instanceof PyStarArgument starArgument) { if (starArgument.isKeyword()) { if (seenKeywordContainer) { registerForAllMatchingVersions(level -> level.isOlderThan(LanguageLevel.PYTHON35) && registerForLanguageLevel(level), @@ -792,8 +791,7 @@ public abstract class CompatibilityVisitor extends PyAnnotator { if (file == null) return; final PsiElement descriptorElement = descriptor.getPsiElement(); - if (!(descriptorElement instanceof PyBinaryExpression)) return; - final PyBinaryExpression expression = (PyBinaryExpression)descriptorElement; + if (!(descriptorElement instanceof PyBinaryExpression expression)) return; final List types = collectUnionTypes(expression); final LanguageLevel languageLevel = LanguageLevel.forElement(file); diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/ReturnAnnotator.java b/python/python-psi-impl/src/com/jetbrains/python/validation/ReturnAnnotator.java index e75a37d78e55..00fa57a07d95 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/validation/ReturnAnnotator.java +++ b/python/python-psi-impl/src/com/jetbrains/python/validation/ReturnAnnotator.java @@ -31,8 +31,7 @@ public class ReturnAnnotator extends PyAnnotator { getHolder().newAnnotation(HighlightSeverity.ERROR, PyPsiBundle.message("ANN.yield.outside.of.function")).create(); } - if (node.isDelegating() && owner instanceof PyFunction) { - final PyFunction function = (PyFunction)owner; + if (node.isDelegating() && owner instanceof PyFunction function) { if (function.isAsync() && function.isAsyncAllowed()) { getHolder().newAnnotation(HighlightSeverity.ERROR, diff --git a/python/python-rest/src/com/jetbrains/rest/inspections/RestRoleInspection.java b/python/python-rest/src/com/jetbrains/rest/inspections/RestRoleInspection.java index c078fe59b0dc..404acb156757 100644 --- a/python/python-rest/src/com/jetbrains/rest/inspections/RestRoleInspection.java +++ b/python/python-rest/src/com/jetbrains/rest/inspections/RestRoleInspection.java @@ -80,8 +80,7 @@ public class RestRoleInspection extends RestInspection { if (config == null) return; PsiFile configFile = PsiManager.getInstance(project).findFile(config); - if (configFile instanceof PyFile) { - PyFile file = (PyFile)configFile; + if (configFile instanceof PyFile file) { List functions = file.getTopLevelFunctions(); for (PyFunction function : functions) { if (!"setup".equals(function.getName())) continue; diff --git a/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxConfigurationProducer.java b/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxConfigurationProducer.java index e98c6b4217ec..ae65af32f1af 100644 --- a/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxConfigurationProducer.java +++ b/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxConfigurationProducer.java @@ -30,9 +30,8 @@ public class SphinxConfigurationProducer extends LazyRunConfigurationProducer sourceElement) { assert (configuration instanceof SphinxRunConfiguration); PsiElement element = sourceElement.get(); - if (!(element instanceof PsiDirectory)) return false; + if (!(element instanceof PsiDirectory directory)) return false; - PsiDirectory directory = (PsiDirectory)element; boolean hasRstFile = false; boolean hasConf = false; for (PsiFile file : directory.getFiles()) { diff --git a/python/src/com/jetbrains/commandInterface/commandLine/CommandLineDocumentationProvider.java b/python/src/com/jetbrains/commandInterface/commandLine/CommandLineDocumentationProvider.java index 2f7f339808dc..9f9f246517e4 100644 --- a/python/src/com/jetbrains/commandInterface/commandLine/CommandLineDocumentationProvider.java +++ b/python/src/com/jetbrains/commandInterface/commandLine/CommandLineDocumentationProvider.java @@ -80,11 +80,10 @@ public final class CommandLineDocumentationProvider implements DocumentationProv */ @Nullable private static Help findHelp(@NotNull final PsiElement element) { - if (!(element instanceof CommandLinePart)) { + if (!(element instanceof CommandLinePart commandLinePart)) { return null; } - final CommandLinePart commandLinePart = (CommandLinePart)element; final Command realCommand = commandLinePart.findRealCommand(); if (realCommand == null) { return null; diff --git a/python/src/com/jetbrains/python/PyDirectoryIconProvider.java b/python/src/com/jetbrains/python/PyDirectoryIconProvider.java index 0c19bc04869b..3c1026d82ee4 100644 --- a/python/src/com/jetbrains/python/PyDirectoryIconProvider.java +++ b/python/src/com/jetbrains/python/PyDirectoryIconProvider.java @@ -18,8 +18,7 @@ import javax.swing.*; public class PyDirectoryIconProvider extends IconProvider { @Override public Icon getIcon(@NotNull PsiElement element, int flags) { - if (element instanceof PsiDirectory) { - final PsiDirectory directory = (PsiDirectory)element; + if (element instanceof PsiDirectory directory) { // Preserve original icons for excluded directories and source roots if (isSpecialDirectory(directory)) return null; if (PyUtil.isExplicitPackage(directory)) { diff --git a/python/src/com/jetbrains/python/codeInsight/PyInjectionUtil.java b/python/src/com/jetbrains/python/codeInsight/PyInjectionUtil.java index db533b214625..1eeb2d0b8428 100644 --- a/python/src/com/jetbrains/python/codeInsight/PyInjectionUtil.java +++ b/python/src/com/jetbrains/python/codeInsight/PyInjectionUtil.java @@ -87,8 +87,7 @@ public final class PyInjectionUtil { final PyExpression contained = ((PyParenthesizedExpression)element).getContainedExpression(); return contained != null && isStringLiteralPart(contained, context); } - else if (element instanceof PyBinaryExpression) { - final PyBinaryExpression expr = (PyBinaryExpression)element; + else if (element instanceof PyBinaryExpression expr) { final PyExpression left = expr.getLeftExpression(); final PyExpression right = expr.getRightExpression(); if (expr.isOperator("+")) { @@ -113,8 +112,7 @@ public final class PyInjectionUtil { @Nullable private static PyExpression getFormatCallQualifier(@NotNull PyCallExpression element) { final PyExpression callee = element.getCallee(); - if (callee instanceof PyQualifiedExpression) { - final PyQualifiedExpression qualifiedExpr = (PyQualifiedExpression)callee; + if (callee instanceof PyQualifiedExpression qualifiedExpr) { final PyExpression qualifier = qualifiedExpr.getQualifier(); if (qualifier != null && PyNames.FORMAT.equals(qualifiedExpr.getReferencedName())) { return qualifier; @@ -204,8 +202,7 @@ public final class PyInjectionUtil { return processStringLiteral(contained, registrar, prefix, suffix, formatting); } } - else if (element instanceof PyBinaryExpression) { - final PyBinaryExpression expr = (PyBinaryExpression)element; + else if (element instanceof PyBinaryExpression expr) { final PyExpression left = expr.getLeftExpression(); final PyExpression right = expr.getRightExpression(); final boolean isLeftString = isStringLiteralPart(left, null); diff --git a/python/src/com/jetbrains/python/codeInsight/PyLineMarkerProvider.java b/python/src/com/jetbrains/python/codeInsight/PyLineMarkerProvider.java index f0f40aec2320..b8e031c4dda0 100644 --- a/python/src/com/jetbrains/python/codeInsight/PyLineMarkerProvider.java +++ b/python/src/com/jetbrains/python/codeInsight/PyLineMarkerProvider.java @@ -50,11 +50,10 @@ public class PyLineMarkerProvider implements LineMarkerProvider, PyLineSeparator private static final Function ourSubclassTooltipProvider = identifier -> { PsiElement parent = identifier.getParent(); - if (!(parent instanceof PyClass)) return null; + if (!(parent instanceof PyClass pyClass)) return null; final HtmlBuilder builder = new HtmlBuilder(); builder.append(PyBundle.message("line.markers.tooltip.header.is.subclassed.by")); final AtomicInteger count = new AtomicInteger(); - PyClass pyClass = (PyClass)parent; PyClassInheritorsSearch.search(pyClass, true).forEach(inheritor -> { String className = inheritor.getName(); if (className == null) return true; @@ -70,11 +69,10 @@ public class PyLineMarkerProvider implements LineMarkerProvider, PyLineSeparator private static final Function ourOverridingMethodTooltipProvider = element -> { PsiElement parent = element.getParent(); - if (!(parent instanceof PyFunction)) return ""; + if (!(parent instanceof PyFunction pyFunction)) return ""; final HtmlBuilder builder = new HtmlBuilder(); builder.append(PyBundle.message("line.markers.tooltip.header.is.overridden.in")); final AtomicInteger count = new AtomicInteger(); - PyFunction pyFunction = (PyFunction)parent; PyClassInheritorsSearch.search(pyFunction.getContainingClass(), true).forEach(pyClass -> { String className = pyClass.getName(); @@ -165,8 +163,7 @@ public class PyLineMarkerProvider implements LineMarkerProvider, PyLineSeparator @Override public LineMarkerInfo getLineMarkerInfo(final @NotNull PsiElement element) { IElementType elementType = element.getNode().getElementType(); - if (elementType == PyTokenTypes.IDENTIFIER && element.getParent() instanceof PyFunction) { - final PyFunction function = (PyFunction)element.getParent(); + if (elementType == PyTokenTypes.IDENTIFIER && element.getParent() instanceof PyFunction function) { return getMethodMarker(element, function); } if (element instanceof PyTargetExpression && PyUtil.isClassAttribute(element)) { diff --git a/python/src/com/jetbrains/python/codeInsight/PyMethodNameTypedHandler.java b/python/src/com/jetbrains/python/codeInsight/PyMethodNameTypedHandler.java index 49dd088405ca..120a75413d02 100644 --- a/python/src/com/jetbrains/python/codeInsight/PyMethodNameTypedHandler.java +++ b/python/src/com/jetbrains/python/codeInsight/PyMethodNameTypedHandler.java @@ -76,8 +76,7 @@ public class PyMethodNameTypedHandler extends TypedHandlerDelegate { final ASTNode defNode = maybeDef.getNode(); if (defNode != null && defNode.getElementType() == PyTokenTypes.DEF_KEYWORD) { final PsiElement maybeFunc = token.getParent(); - if (maybeFunc instanceof PyFunction) { - final PyFunction func = (PyFunction)maybeFunc; + if (maybeFunc instanceof PyFunction func) { final PyUtil.MethodFlags flags = PyUtil.MethodFlags.of(func); if (flags != null) { // we're in a method diff --git a/python/src/com/jetbrains/python/codeInsight/regexp/PythonRegexpInjector.java b/python/src/com/jetbrains/python/codeInsight/regexp/PythonRegexpInjector.java index 9000f9f1d5b7..d59897aa5953 100644 --- a/python/src/com/jetbrains/python/codeInsight/regexp/PythonRegexpInjector.java +++ b/python/src/com/jetbrains/python/codeInsight/regexp/PythonRegexpInjector.java @@ -69,8 +69,7 @@ public class PythonRegexpInjector implements MultiHostInjector { private PsiElement resolvePossibleRegexpCall(@NotNull PyCallExpression call) { final PyExpression callee = call.getCallee(); - if (callee instanceof PyReferenceExpression && canBeRegexpCall(callee)) { - final PyReferenceExpression referenceExpression = (PyReferenceExpression)callee; + if (callee instanceof PyReferenceExpression referenceExpression && canBeRegexpCall(callee)) { final TypeEvalContext context = TypeEvalContext.codeAnalysis(call.getProject(), call.getContainingFile()); return referenceExpression.getReference(PyResolveContext.defaultContext(context)).resolve(); } @@ -102,16 +101,14 @@ public class PythonRegexpInjector implements MultiHostInjector { } private static boolean isVerbose(@Nullable PyExpression expression) { - if (expression instanceof PyKeywordArgument) { - final PyKeywordArgument keywordArgument = (PyKeywordArgument)expression; + if (expression instanceof PyKeywordArgument keywordArgument) { return "flags".equals(keywordArgument.getName()) && isVerbose(keywordArgument.getValueExpression()); } if (expression instanceof PyReferenceExpression) { final String flagName = ((PyReferenceExpression)expression).getReferencedName(); return "VERBOSE".equals(flagName) || "X".equals(flagName); } - if (expression instanceof PyBinaryExpression) { - final PyBinaryExpression binaryExpression = (PyBinaryExpression)expression; + if (expression instanceof PyBinaryExpression binaryExpression) { return isVerbose(binaryExpression.getLeftExpression()) || isVerbose(binaryExpression.getRightExpression()); } return false; diff --git a/python/src/com/jetbrains/python/codeInsight/typing/PyTypingAnnotationInjector.java b/python/src/com/jetbrains/python/codeInsight/typing/PyTypingAnnotationInjector.java index a126d84eae46..ae3d7802ff38 100644 --- a/python/src/com/jetbrains/python/codeInsight/typing/PyTypingAnnotationInjector.java +++ b/python/src/com/jetbrains/python/codeInsight/typing/PyTypingAnnotationInjector.java @@ -51,8 +51,7 @@ public class PyTypingAnnotationInjector extends PyInjectorBase { @Nullable @Override public Language getInjectedLanguage(@NotNull PsiElement context) { - if (context instanceof PyStringLiteralExpression) { - final PyStringLiteralExpression expr = (PyStringLiteralExpression)context; + if (context instanceof PyStringLiteralExpression expr) { final TypeEvalContext typeEvalContext = TypeEvalContext.codeAnalysis(expr.getProject(), expr.getContainingFile()); if (isTypingLiteralArgument(expr, typeEvalContext) || isTypingAnnotatedMetadataArgument(expr, typeEvalContext)) { return null; diff --git a/python/src/com/jetbrains/python/configuration/PythonPathEditor.java b/python/src/com/jetbrains/python/configuration/PythonPathEditor.java index 1278e08b918f..1812a01574a4 100644 --- a/python/src/com/jetbrains/python/configuration/PythonPathEditor.java +++ b/python/src/com/jetbrains/python/configuration/PythonPathEditor.java @@ -263,8 +263,7 @@ public class PythonPathEditor extends SdkPathEditor { myFoundFiles.addAll(list); myUserAddedToRemove.clear(); - if (modificator.getSdkAdditionalData() instanceof PythonSdkAdditionalData) { - PythonSdkAdditionalData data = (PythonSdkAdditionalData)modificator.getSdkAdditionalData(); + if (modificator.getSdkAdditionalData() instanceof PythonSdkAdditionalData data) { setAdded(data.getAddedPathFiles()); setExcluded(data.getExcludedPathFiles()); result.addAll(myExcluded); diff --git a/python/src/com/jetbrains/python/console/PythonConsoleView.java b/python/src/com/jetbrains/python/console/PythonConsoleView.java index d022344ee405..d56e18637cbf 100644 --- a/python/src/com/jetbrains/python/console/PythonConsoleView.java +++ b/python/src/com/jetbrains/python/console/PythonConsoleView.java @@ -622,8 +622,7 @@ public class PythonConsoleView extends LanguageConsoleImpl implements Observable public void restoreWindow() { Component component = getComponent(0); - if (mySplitView != null && component instanceof JBSplitter) { - JBSplitter pane = (JBSplitter)component; + if (mySplitView != null && component instanceof JBSplitter pane) { removeAll(); Disposer.dispose(mySplitView); mySplitView = null; diff --git a/python/src/com/jetbrains/python/debugger/PyCallSignatureTypeProvider.java b/python/src/com/jetbrains/python/debugger/PyCallSignatureTypeProvider.java index 7818ab63735e..4e373316fed1 100644 --- a/python/src/com/jetbrains/python/debugger/PyCallSignatureTypeProvider.java +++ b/python/src/com/jetbrains/python/debugger/PyCallSignatureTypeProvider.java @@ -28,8 +28,7 @@ public class PyCallSignatureTypeProvider extends PyTypeProviderBase { @Override public Ref getReturnType(@NotNull final PyCallable callable, @NotNull TypeEvalContext context) { - if (callable instanceof PyFunction) { - PyFunction function = (PyFunction)callable; + if (callable instanceof PyFunction function) { PySignature signature = PySignatureCacheManager.getInstance(function.getProject()).findSignature(function); if (signature != null && signature.getReturnType() != null) { final String typeName = signature.getReturnType().getTypeQualifiedName(); diff --git a/python/src/com/jetbrains/python/debugger/PyCythonExtensionWarning.java b/python/src/com/jetbrains/python/debugger/PyCythonExtensionWarning.java index a802cb39a8e5..45e2111c8184 100644 --- a/python/src/com/jetbrains/python/debugger/PyCythonExtensionWarning.java +++ b/python/src/com/jetbrains/python/debugger/PyCythonExtensionWarning.java @@ -90,10 +90,9 @@ public final class PyCythonExtensionWarning { return true; } final RunConfiguration configuration = selectedConfiguration.getConfiguration(); - if (!(configuration instanceof AbstractPythonRunConfiguration)) { + if (!(configuration instanceof AbstractPythonRunConfiguration runConfiguration)) { return true; } - AbstractPythonRunConfiguration runConfiguration = (AbstractPythonRunConfiguration)configuration; // Temporarily disable notification for Remote interpreters return PythonSdkUtil.isRemote(runConfiguration.getSdk()); } @@ -110,10 +109,9 @@ public final class PyCythonExtensionWarning { throw new ExecutionException(PyBundle.message("debugger.cython.python.run.configuration.should.be.selected")); } final RunConfiguration configuration = selectedConfiguration.getConfiguration(); - if (!(configuration instanceof AbstractPythonRunConfiguration)) { + if (!(configuration instanceof AbstractPythonRunConfiguration runConfiguration)) { throw new ExecutionException(PyBundle.message("debugger.cython.python.run.configuration.should.be.selected")); } - AbstractPythonRunConfiguration runConfiguration = (AbstractPythonRunConfiguration)configuration; final String interpreterPath = runConfiguration.getInterpreterPath(); final String helpersPath = PythonHelpersLocator.getHelpersRoot().getPath(); diff --git a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java index fe79aad967bd..349e9be8a3d5 100644 --- a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java +++ b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java @@ -403,8 +403,7 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr @Override public void showConsole(PyThreadInfo thread) { myConsoleContextFrame = new PyExecutionStack(this, thread).getTopFrame(); - if (myExecutionConsole instanceof PythonDebugLanguageConsoleView) { - PythonDebugLanguageConsoleView consoleView = (PythonDebugLanguageConsoleView)myExecutionConsole; + if (myExecutionConsole instanceof PythonDebugLanguageConsoleView consoleView) { UIUtil.invokeLaterIfNeeded(() -> { consoleView.enableConsole(false); consoleView.getPydevConsoleView().setConsoleEnabled(true); @@ -912,8 +911,7 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr if (e.getMessage().startsWith("Timeout")) { value.updateNodeValueAfterLoading(node, " ", "", PyBundle.message("debugger.variables.view.loading.timed.out")); ConfigureTypeRenderersHyperLink configureLink = new ConfigureTypeRenderersHyperLink(null, getProject(), value); - if (node instanceof XValueNodeImpl) { - XValueNodeImpl valueNode = (XValueNodeImpl)node; + if (node instanceof XValueNodeImpl valueNode) { valueNode.clearAdditionalHyperlinks(); valueNode.addAdditionalHyperlink(configureLink); } @@ -1340,8 +1338,7 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr PyResolveUtil.scopeCrawlUp(new PsiScopeProcessor() { @Override public boolean execute(@NotNull PsiElement element, @NotNull ResolveState state) { - if ((element instanceof PyImportElement)) { - PyImportElement importElement = (PyImportElement)element; + if ((element instanceof PyImportElement importElement)) { if (name.equals(importElement.getVisibleName())) { if (elementRef.isNull()) { elementRef.set(element); diff --git a/python/src/com/jetbrains/python/debugger/PyStackFrame.java b/python/src/com/jetbrains/python/debugger/PyStackFrame.java index b0f60d2b6c92..d0d5f7860201 100644 --- a/python/src/com/jetbrains/python/debugger/PyStackFrame.java +++ b/python/src/com/jetbrains/python/debugger/PyStackFrame.java @@ -144,8 +144,7 @@ public class PyStackFrame extends XStackFrame { for (int i = 0; i < children.size(); i++) { XValue value = children.getValue(i); String name = children.getName(i); - if (value instanceof PyDebugValue) { - PyDebugValue pyValue = (PyDebugValue)value; + if (value instanceof PyDebugValue pyValue) { restoreValueDescriptor(pyValue); diff --git a/python/src/com/jetbrains/python/debugger/PyStepIntoMyCodeAction.java b/python/src/com/jetbrains/python/debugger/PyStepIntoMyCodeAction.java index a2c1fee61538..7a75f7c28056 100644 --- a/python/src/com/jetbrains/python/debugger/PyStepIntoMyCodeAction.java +++ b/python/src/com/jetbrains/python/debugger/PyStepIntoMyCodeAction.java @@ -23,8 +23,7 @@ public class PyStepIntoMyCodeAction extends XDebuggerActionBase { @Override protected void perform(@NotNull final XDebugSession session, final DataContext dataContext) { final XDebugProcess debugProcess = session.getDebugProcess(); - if (debugProcess instanceof PyDebugProcess) { - PyDebugProcess pyDebugProcess = (PyDebugProcess)debugProcess; + if (debugProcess instanceof PyDebugProcess pyDebugProcess) { pyDebugProcess.startStepIntoMyCode(debugProcess.getSession().getSuspendContext()); } } diff --git a/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java b/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java index 07a6c7246b34..792c73e641d0 100644 --- a/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java +++ b/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java @@ -152,8 +152,7 @@ public class AsyncArrayTableModel extends AbstractTableModel { } public String correctStringValue(@NotNull Object value) { - if (value instanceof String) { - String corrected = (String)value; + if (value instanceof String corrected) { if (myStrategy.isNumeric(myDebugValue.getType())) { if (corrected.startsWith("'") || corrected.startsWith("\"")) { corrected = corrected.substring(1, corrected.length() - 1); diff --git a/python/src/com/jetbrains/python/debugger/containerview/PyViewNumericContainerAction.java b/python/src/com/jetbrains/python/debugger/containerview/PyViewNumericContainerAction.java index bff2298be32b..e1b552a93565 100644 --- a/python/src/com/jetbrains/python/debugger/containerview/PyViewNumericContainerAction.java +++ b/python/src/com/jetbrains/python/debugger/containerview/PyViewNumericContainerAction.java @@ -35,8 +35,7 @@ public class PyViewNumericContainerAction extends XDebuggerTreeActionBase { @Override protected void perform(XValueNodeImpl node, @NotNull String nodeName, AnActionEvent e) { Project p = e.getProject(); - if (p != null && node != null && node.getValueContainer() instanceof PyDebugValue && node.isComputed()) { - PyDebugValue debugValue = (PyDebugValue)node.getValueContainer(); + if (p != null && node != null && node.getValueContainer() instanceof PyDebugValue debugValue && node.isComputed()) { showNumericViewer(p, debugValue); } } @@ -59,13 +58,11 @@ public class PyViewNumericContainerAction extends XDebuggerTreeActionBase { } XValueNodeImpl node = selectedNodes.get(0); - if (!(node.getValueContainer() instanceof PyDebugValue) || !node.isComputed()) { + if (!(node.getValueContainer() instanceof PyDebugValue debugValue) || !node.isComputed()) { e.getPresentation().setVisible(false); return; } - PyDebugValue debugValue = (PyDebugValue)node.getValueContainer(); - String nodeType = debugValue.getType(); if ("ndarray".equals(nodeType)) { e.getPresentation().setText(PyBundle.message("debugger.numeric.view.as.array")); diff --git a/python/src/com/jetbrains/python/debugger/dataframe/DataFrameTableCellRenderer.java b/python/src/com/jetbrains/python/debugger/dataframe/DataFrameTableCellRenderer.java index b1edcc447035..ee94be31f2bd 100644 --- a/python/src/com/jetbrains/python/debugger/dataframe/DataFrameTableCellRenderer.java +++ b/python/src/com/jetbrains/python/debugger/dataframe/DataFrameTableCellRenderer.java @@ -26,13 +26,12 @@ class DataFrameTableCellRenderer extends DataViewCellRenderer implements Colored @Override protected void colorize(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - if (!(value instanceof TableValueDescriptor)) { + if (!(value instanceof TableValueDescriptor descriptor)) { this.setBackground(null); return; } Color background = null; - TableValueDescriptor descriptor = (TableValueDescriptor)value; if (myColored) { try { diff --git a/python/src/com/jetbrains/python/debugger/settings/PySteppingFilter.java b/python/src/com/jetbrains/python/debugger/settings/PySteppingFilter.java index 2f9737adf215..e6713ac8ccc3 100644 --- a/python/src/com/jetbrains/python/debugger/settings/PySteppingFilter.java +++ b/python/src/com/jetbrains/python/debugger/settings/PySteppingFilter.java @@ -66,9 +66,7 @@ public class PySteppingFilter { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PySteppingFilter)) return false; - - PySteppingFilter filter = (PySteppingFilter)o; + if (!(o instanceof PySteppingFilter filter)) return false; if (isEnabled() != filter.isEnabled()) return false; if (!getFilter().equals(filter.getFilter())) return false; diff --git a/python/src/com/jetbrains/python/debugger/smartstepinto/PySmartStepIntoContext.java b/python/src/com/jetbrains/python/debugger/smartstepinto/PySmartStepIntoContext.java index b3403687862a..9e91fdc60163 100644 --- a/python/src/com/jetbrains/python/debugger/smartstepinto/PySmartStepIntoContext.java +++ b/python/src/com/jetbrains/python/debugger/smartstepinto/PySmartStepIntoContext.java @@ -50,8 +50,7 @@ public class PySmartStepIntoContext { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PySmartStepIntoContext)) return false; - PySmartStepIntoContext context = (PySmartStepIntoContext)o; + if (!(o instanceof PySmartStepIntoContext context)) return false; return myStartLine == context.myStartLine && myEndLine == context.myEndLine && myFrame.getFrameId().equals(context.getFrame().getFrameId()); } diff --git a/python/src/com/jetbrains/python/debugger/smartstepinto/PySmartStepIntoVariant.java b/python/src/com/jetbrains/python/debugger/smartstepinto/PySmartStepIntoVariant.java index e5cef1605fa1..f608c22ca080 100644 --- a/python/src/com/jetbrains/python/debugger/smartstepinto/PySmartStepIntoVariant.java +++ b/python/src/com/jetbrains/python/debugger/smartstepinto/PySmartStepIntoVariant.java @@ -45,8 +45,7 @@ public abstract class PySmartStepIntoVariant extends XSmartStepIntoVariant { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof PySmartStepIntoVariant)) return false; - PySmartStepIntoVariant variant = (PySmartStepIntoVariant)o; + if (!(o instanceof PySmartStepIntoVariant variant)) return false; return myElement.equals(variant.myElement); } diff --git a/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyBrowser.java b/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyBrowser.java index 13704af63bab..53d94308fcb4 100644 --- a/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyBrowser.java +++ b/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyBrowser.java @@ -35,8 +35,7 @@ public class PyCallHierarchyBrowser extends CallHierarchyBrowserBase { @Nullable @Override protected PsiElement getElementFromDescriptor(@NotNull HierarchyNodeDescriptor descriptor) { - if (descriptor instanceof PyHierarchyNodeDescriptor) { - PyHierarchyNodeDescriptor pyDescriptor = (PyHierarchyNodeDescriptor)descriptor; + if (descriptor instanceof PyHierarchyNodeDescriptor pyDescriptor) { return pyDescriptor.getPsiElement(); } return null; diff --git a/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyTreeStructureBase.java b/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyTreeStructureBase.java index dd7bd40d4fdf..e2f6d5a731ca 100644 --- a/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyTreeStructureBase.java +++ b/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyTreeStructureBase.java @@ -33,8 +33,7 @@ public abstract class PyCallHierarchyTreeStructureBase extends HierarchyTreeStru @Override protected Object @NotNull [] buildChildren(@NotNull HierarchyNodeDescriptor descriptor) { final List descriptors = new ArrayList<>(); - if (descriptor instanceof PyHierarchyNodeDescriptor) { - final PyHierarchyNodeDescriptor pyDescriptor = (PyHierarchyNodeDescriptor)descriptor; + if (descriptor instanceof PyHierarchyNodeDescriptor pyDescriptor) { final PsiElement element = pyDescriptor.getPsiElement(); final boolean isCallable = element instanceof PyFunction || element instanceof PyClass || element instanceof PyFile; HierarchyNodeDescriptor nodeDescriptor = getBaseDescriptor(); diff --git a/python/src/com/jetbrains/python/hierarchy/treestructures/PySubTypesHierarchyTreeStructure.java b/python/src/com/jetbrains/python/hierarchy/treestructures/PySubTypesHierarchyTreeStructure.java index ece20a9ba0ec..cc2d33912be9 100644 --- a/python/src/com/jetbrains/python/hierarchy/treestructures/PySubTypesHierarchyTreeStructure.java +++ b/python/src/com/jetbrains/python/hierarchy/treestructures/PySubTypesHierarchyTreeStructure.java @@ -28,8 +28,7 @@ public class PySubTypesHierarchyTreeStructure extends HierarchyTreeStructure { protected Object @NotNull [] buildChildren(@NotNull HierarchyNodeDescriptor descriptor) { final List res = new ArrayList<>(); final PsiElement element = descriptor.getPsiElement(); - if (element instanceof PyClass) { - final PyClass cls = (PyClass)element; + if (element instanceof PyClass cls) { Query subClasses = PyClassInheritorsSearch.search(cls, false); for (PyClass subClass : subClasses) { res.add(new PyHierarchyNodeDescriptor(descriptor, subClass, false)); diff --git a/python/src/com/jetbrains/python/hierarchy/treestructures/PySuperTypesHierarchyTreeStructure.java b/python/src/com/jetbrains/python/hierarchy/treestructures/PySuperTypesHierarchyTreeStructure.java index 291eec4538ad..29206013996b 100644 --- a/python/src/com/jetbrains/python/hierarchy/treestructures/PySuperTypesHierarchyTreeStructure.java +++ b/python/src/com/jetbrains/python/hierarchy/treestructures/PySuperTypesHierarchyTreeStructure.java @@ -20,11 +20,9 @@ public class PySuperTypesHierarchyTreeStructure extends HierarchyTreeStructure { @Override protected Object @NotNull [] buildChildren(@NotNull HierarchyNodeDescriptor descriptor) { final List res = new ArrayList<>(); - if (descriptor instanceof PyHierarchyNodeDescriptor) { - final PyHierarchyNodeDescriptor pyDescriptor = (PyHierarchyNodeDescriptor)descriptor; + if (descriptor instanceof PyHierarchyNodeDescriptor pyDescriptor) { final PsiElement element = pyDescriptor.getPsiElement(); - if (element instanceof PyClass) { - final PyClass cls = (PyClass)element; + if (element instanceof PyClass cls) { final TypeEvalContext context = TypeEvalContext.codeAnalysis(cls.getProject(), cls.getContainingFile()); for (PyClass superClass : cls.getSuperClasses(context)) { res.add(new PyHierarchyNodeDescriptor(descriptor, superClass, false)); diff --git a/python/src/com/jetbrains/python/inspections/PyCompatibilityInspectionAdvertiser.java b/python/src/com/jetbrains/python/inspections/PyCompatibilityInspectionAdvertiser.java index 131ac7d6e76e..512d1cec70a8 100644 --- a/python/src/com/jetbrains/python/inspections/PyCompatibilityInspectionAdvertiser.java +++ b/python/src/com/jetbrains/python/inspections/PyCompatibilityInspectionAdvertiser.java @@ -50,9 +50,8 @@ public class PyCompatibilityInspectionAdvertiser implements Annotator { @Override public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { - if (element instanceof PyFile) { + if (element instanceof PyFile pyFile) { - final PyFile pyFile = (PyFile)element; final Project project = element.getProject(); final VirtualFile vFile = pyFile.getVirtualFile(); diff --git a/python/src/com/jetbrains/python/newProject/steps/ProjectSpecificSettingsStep.java b/python/src/com/jetbrains/python/newProject/steps/ProjectSpecificSettingsStep.java index 1ef200dd8cde..63b5566d54c3 100644 --- a/python/src/com/jetbrains/python/newProject/steps/ProjectSpecificSettingsStep.java +++ b/python/src/com/jetbrains/python/newProject/steps/ProjectSpecificSettingsStep.java @@ -96,8 +96,7 @@ public class ProjectSpecificSettingsStep extends ProjectSettingsStepBase i final PyAddSdkGroupPanel interpreterPanel = myInterpreterPanel; if (interpreterPanel == null) return null; final PyAddSdkPanel panel = interpreterPanel.getSelectedPanel(); - if (panel instanceof PyAddNewEnvironmentPanel) { - final PyAddNewEnvironmentPanel newEnvironmentPanel = (PyAddNewEnvironmentPanel)panel; + if (panel instanceof PyAddNewEnvironmentPanel newEnvironmentPanel) { return new PyLazySdk("Uninitialized environment", newEnvironmentPanel::getOrCreateSdk); } else if (panel instanceof PyAddExistingSdkPanel) { diff --git a/python/src/com/jetbrains/python/packaging/PyPackageUtil.java b/python/src/com/jetbrains/python/packaging/PyPackageUtil.java index 76c62027b5ba..be356174de9a 100644 --- a/python/src/com/jetbrains/python/packaging/PyPackageUtil.java +++ b/python/src/com/jetbrains/python/packaging/PyPackageUtil.java @@ -518,8 +518,7 @@ public final class PyPackageUtil { final String text = String.format("foo(%s=['%s'])", keyword, requirementName); final PyExpression generated = PyElementGenerator.getInstance(setupPy.getProject()).createExpressionFromText(languageLevel, text); - if (generated instanceof PyCallExpression) { - final PyCallExpression callExpression = (PyCallExpression)generated; + if (generated instanceof PyCallExpression callExpression) { return Stream .of(callExpression.getArguments()) diff --git a/python/src/com/jetbrains/python/packaging/PyPackagesNotificationPanel.java b/python/src/com/jetbrains/python/packaging/PyPackagesNotificationPanel.java index 00a7ead329ee..c26bf3e9ed4e 100644 --- a/python/src/com/jetbrains/python/packaging/PyPackagesNotificationPanel.java +++ b/python/src/com/jetbrains/python/packaging/PyPackagesNotificationPanel.java @@ -17,9 +17,7 @@ public class PyPackagesNotificationPanel extends PackagesNotificationPanel { public static void showPackageInstallationError(@NotNull @NlsContexts.DialogTitle String title, @NotNull PackageManagementService.ErrorDescription description) { - if (description instanceof PyPackageManagementService.PyPackageInstallationErrorDescription) { - final PyPackageManagementService.PyPackageInstallationErrorDescription errorDescription = - (PyPackageManagementService.PyPackageInstallationErrorDescription)description; + if (description instanceof PyPackageManagementService.PyPackageInstallationErrorDescription errorDescription) { final PyPackageInstallationErrorDialog dialog = new PyPackageInstallationErrorDialog(title, errorDescription); dialog.show(); } else { diff --git a/python/src/com/jetbrains/python/packaging/setupPy/SetupKeywordArgumentProvider.java b/python/src/com/jetbrains/python/packaging/setupPy/SetupKeywordArgumentProvider.java index 07cb9c0c319f..d430b5ed102c 100644 --- a/python/src/com/jetbrains/python/packaging/setupPy/SetupKeywordArgumentProvider.java +++ b/python/src/com/jetbrains/python/packaging/setupPy/SetupKeywordArgumentProvider.java @@ -18,8 +18,7 @@ public class SetupKeywordArgumentProvider implements PyKeywordArgumentProvider { public List getKeywordArguments(PyFunction function, PyCallExpression callExpr) { if ("setup".equals(function.getName())) { final ScopeOwner scopeOwner = PsiTreeUtil.getParentOfType(function, ScopeOwner.class, true); - if (scopeOwner instanceof PyFile) { - final PyFile file = (PyFile)scopeOwner; + if (scopeOwner instanceof PyFile file) { if (file.getName().equals("core.py") && file.getParent().getName().equals("distutils")) { final List arguments = getSetupPyKeywordArguments(file); if (arguments != null) { diff --git a/python/src/com/jetbrains/python/packaging/setupPy/SetupTaskIntrospector.java b/python/src/com/jetbrains/python/packaging/setupPy/SetupTaskIntrospector.java index ef261dd488aa..8a2a78e37c92 100644 --- a/python/src/com/jetbrains/python/packaging/setupPy/SetupTaskIntrospector.java +++ b/python/src/com/jetbrains/python/packaging/setupPy/SetupTaskIntrospector.java @@ -148,8 +148,7 @@ public final class SetupTaskIntrospector { if (value instanceof PySequenceExpression) { Collections.addAll(result, ((PySequenceExpression)value).getElements()); } - else if (value instanceof PyBinaryExpression) { - final PyBinaryExpression binaryExpression = (PyBinaryExpression)value; + else if (value instanceof PyBinaryExpression binaryExpression) { if (binaryExpression.isOperator("+")) { collectSequenceElements(binaryExpression.getLeftExpression(), result); collectSequenceElements(binaryExpression.getRightExpression(), result); diff --git a/python/src/com/jetbrains/python/packaging/ui/PyInstalledPackagesPanel.java b/python/src/com/jetbrains/python/packaging/ui/PyInstalledPackagesPanel.java index 3412293acae4..fb56e8617c4d 100644 --- a/python/src/com/jetbrains/python/packaging/ui/PyInstalledPackagesPanel.java +++ b/python/src/com/jetbrains/python/packaging/ui/PyInstalledPackagesPanel.java @@ -194,8 +194,7 @@ public class PyInstalledPackagesPanel extends InstalledPackagesPanel { @Override public boolean isSelected(AnActionEvent e) { final Sdk sdk = getSelectedSdk(); - if (myPackageManagementService instanceof PythonPackageManagementServiceBridge) { - var bridge = (PythonPackageManagementServiceBridge)myPackageManagementService; + if (myPackageManagementService instanceof PythonPackageManagementServiceBridge bridge) { return sdk != null && bridge.isConda() && bridge.getUseConda(); } return false; @@ -204,8 +203,7 @@ public class PyInstalledPackagesPanel extends InstalledPackagesPanel { @Override public void setSelected(AnActionEvent e, boolean state) { final Sdk sdk = getSelectedSdk(); - if (sdk == null || !(myPackageManagementService instanceof PythonPackageManagementServiceBridge)) return; - var bridge = (PythonPackageManagementServiceBridge)myPackageManagementService; + if (sdk == null || !(myPackageManagementService instanceof PythonPackageManagementServiceBridge bridge)) return; if (bridge.isConda()) { bridge.setUseConda(state); } @@ -215,8 +213,7 @@ public class PyInstalledPackagesPanel extends InstalledPackagesPanel { @Override public boolean isVisible() { final Sdk sdk = getSelectedSdk(); - if (myPackageManagementService instanceof PythonPackageManagementServiceBridge) { - var bridge = (PythonPackageManagementServiceBridge)myPackageManagementService; + if (myPackageManagementService instanceof PythonPackageManagementServiceBridge bridge) { return sdk != null && bridge.isConda(); } return false; diff --git a/python/src/com/jetbrains/python/packaging/ui/PyPackageManagementService.java b/python/src/com/jetbrains/python/packaging/ui/PyPackageManagementService.java index d11e0f484fff..447117550fc7 100644 --- a/python/src/com/jetbrains/python/packaging/ui/PyPackageManagementService.java +++ b/python/src/com/jetbrains/python/packaging/ui/PyPackageManagementService.java @@ -334,8 +334,7 @@ public class PyPackageManagementService extends PackageManagementServiceEx { private static PyPackageInstallationErrorDescription createDescription(@NotNull ExecutionException e, @Nullable Sdk sdk, @Nullable String packageName) { - if (e instanceof PyExecutionException) { - final PyExecutionException ee = (PyExecutionException)e; + if (e instanceof PyExecutionException ee) { final String stdout = ee.getStdout(); final String stdoutCause = findErrorCause(stdout); final String stderrCause = findErrorCause(ee.getStderr()); diff --git a/python/src/com/jetbrains/python/patterns/PythonPatterns.java b/python/src/com/jetbrains/python/patterns/PythonPatterns.java index f98c9b99baba..8f07c2bedbb0 100644 --- a/python/src/com/jetbrains/python/patterns/PythonPatterns.java +++ b/python/src/com/jetbrains/python/patterns/PythonPatterns.java @@ -45,8 +45,7 @@ public class PythonPatterns extends PlatformPatterns { return new PyElementPattern.Capture<>(new InitialPatternCondition<>(PyStringLiteralExpression.class) { @Override public boolean accepts(@Nullable Object o, ProcessingContext context) { - if (o instanceof PyStringLiteralExpression) { - final PyStringLiteralExpression expr = (PyStringLiteralExpression)o; + if (o instanceof PyStringLiteralExpression expr) { if (!DocStringUtil.isDocStringExpression(expr) && expr.getTextLength() < STRING_LITERAL_LIMIT) { final String value = expr.getStringValue(); return pattern.matcher(value).find(); diff --git a/python/src/com/jetbrains/python/projectView/PyElementNode.java b/python/src/com/jetbrains/python/projectView/PyElementNode.java index 1bf973031cff..f5eba66f03b0 100644 --- a/python/src/com/jetbrains/python/projectView/PyElementNode.java +++ b/python/src/com/jetbrains/python/projectView/PyElementNode.java @@ -29,8 +29,7 @@ public class PyElementNode extends BasePsiNode { protected Collection> getChildrenImpl() { PyElement value = getValue(); // for performance reasons, we don't show nested functions here - if (value instanceof PyClass) { - final PyClass pyClass = (PyClass)value; + if (value instanceof PyClass pyClass) { List> result = new ArrayList<>(); for (PyClass aClass : pyClass.getNestedClasses()) { result.add(new PyElementNode(myProject, aClass, getSettings())); diff --git a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureHandler.java b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureHandler.java index 9a909ad226a0..c00492df8cb3 100644 --- a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureHandler.java +++ b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureHandler.java @@ -92,7 +92,7 @@ public class PyChangeSignatureHandler implements ChangeSignatureHandler { showCannotRefactorErrorHint(project, editor, PyBundle.message("refactoring.change.signature.error.lambda.call")); return; } - if (!(element instanceof PyFunction)) { + if (!(element instanceof PyFunction function)) { showCannotRefactorErrorHint(project, editor, PyBundle.message("refactoring.change.signature.error.wrong.caret.position.method.name")); return; } @@ -113,7 +113,6 @@ public class PyChangeSignatureHandler implements ChangeSignatureHandler { } } - final PyFunction function = (PyFunction)element; final PyParameter[] parameters = function.getParameterList().getParameters(); for (PyParameter p : parameters) { if (p instanceof PyTupleParameter) { diff --git a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java index 5413071421bf..03cde33394c3 100644 --- a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java +++ b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java @@ -100,8 +100,7 @@ public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProc } if (element == null) return false; - if (element.getParent() instanceof PyCallExpression) { - final PyCallExpression call = (PyCallExpression)element.getParent(); + if (element.getParent() instanceof PyCallExpression call) { // Don't modify the call that was the cause of Change Signature invocation if (call.getUserData(PyChangeSignatureQuickFix.CHANGE_SIGNATURE_ORIGINAL_CALL) != null) { return true; @@ -278,8 +277,7 @@ public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProc @Override public boolean processPrimaryMethod(ChangeInfo changeInfo) { - if (changeInfo instanceof PyChangeInfo && changeInfo.getLanguage().is(PythonLanguage.getInstance())) { - final PyChangeInfo pyChangeInfo = (PyChangeInfo)changeInfo; + if (changeInfo instanceof PyChangeInfo pyChangeInfo && changeInfo.getLanguage().is(PythonLanguage.getInstance())) { processFunctionDeclaration(pyChangeInfo, pyChangeInfo.getMethod()); return true; } diff --git a/python/src/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpInfoModel.java b/python/src/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpInfoModel.java index 70d18de849cd..6bcf359ebc9d 100644 --- a/python/src/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpInfoModel.java +++ b/python/src/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpInfoModel.java @@ -55,9 +55,8 @@ class PyPullUpInfoModel extends AbstractUsesDependencyMemberInfoModel member) { final PyClass currentSuperClass = myView.getSelectedParent(); - if (member.getMember() instanceof PyClass) { + if (member.getMember() instanceof PyClass memberClass) { //TODO: Delegate to Memebers Managers - final PyClass memberClass = (PyClass)member.getMember(); if (memberClass.isSubclass(currentSuperClass, null) || currentSuperClass.isSubclass(memberClass, null)) { return false; //Class is already parent of superclass } diff --git a/python/src/com/jetbrains/python/refactoring/introduce/field/PyIntroduceFieldHandler.java b/python/src/com/jetbrains/python/refactoring/introduce/field/PyIntroduceFieldHandler.java index e4d15efb8e0d..ef0a4064317f 100644 --- a/python/src/com/jetbrains/python/refactoring/introduce/field/PyIntroduceFieldHandler.java +++ b/python/src/com/jetbrains/python/refactoring/introduce/field/PyIntroduceFieldHandler.java @@ -125,8 +125,7 @@ public class PyIntroduceFieldHandler extends IntroduceHandler { super.visitPyReferenceExpression(node); final PsiElement result = node.getReference().resolve(); if (result != null && PsiTreeUtil.getParentOfType(result, ScopeOwner.class) == myScope) { - if (result instanceof PyParameter && myScope instanceof PyFunction) { - final PyFunction function = (PyFunction)myScope; + if (result instanceof PyParameter && myScope instanceof PyFunction function) { final PyParameter[] parameters = function.getParameterList().getParameters(); if (parameters.length > 0 && result == parameters[0]) { final PyFunction.Modifier modifier = function.getModifier(); @@ -224,9 +223,8 @@ public class PyIntroduceFieldHandler extends IntroduceHandler { } private static boolean isAssignedLocalVariable(PsiElement element) { - if (element instanceof PyTargetExpression && element.getParent() instanceof PyAssignmentStatement && + if (element instanceof PyTargetExpression && element.getParent() instanceof PyAssignmentStatement stmt && PsiTreeUtil.getParentOfType(element, PyFunction.class) != null) { - PyAssignmentStatement stmt = (PyAssignmentStatement) element.getParent(); if (stmt.getTargets().length == 1) { return true; } diff --git a/python/src/com/jetbrains/python/refactoring/invertBoolean/PyInvertBooleanDelegate.java b/python/src/com/jetbrains/python/refactoring/invertBoolean/PyInvertBooleanDelegate.java index 931b09405d82..7ab2ca1bf3de 100644 --- a/python/src/com/jetbrains/python/refactoring/invertBoolean/PyInvertBooleanDelegate.java +++ b/python/src/com/jetbrains/python/refactoring/invertBoolean/PyInvertBooleanDelegate.java @@ -88,8 +88,7 @@ public class PyInvertBooleanDelegate extends InvertBooleanDelegate { @Override public PsiElement getElementToInvert(PsiElement namedElement, PsiElement element) { - if (element instanceof PyTargetExpression) { - final PyTargetExpression target = (PyTargetExpression)element; + if (element instanceof PyTargetExpression target) { final PyAssignmentStatement parent = PsiTreeUtil.getParentOfType(target, PyAssignmentStatement.class); if (parent != null && parent.getTargets().length == 1) { final PyExpression value = parent.getAssignedValue(); diff --git a/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java b/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java index f3b1829c3e03..4e5ddcb2a291 100644 --- a/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java +++ b/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java @@ -214,8 +214,7 @@ public abstract class PyBaseMakeFunctionTopLevelProcessor extends BaseRefactorin final ControlFlow controlFlow = ControlFlowCache.getControlFlow(owner); final AnalysisResult result = new AnalysisResult(); for (Instruction instruction : controlFlow.getInstructions()) { - if (instruction instanceof ReadWriteInstruction) { - final ReadWriteInstruction readWriteInstruction = (ReadWriteInstruction)instruction; + if (instruction instanceof ReadWriteInstruction readWriteInstruction) { final PsiElement element = readWriteInstruction.getElement(); if (element == null) { continue; diff --git a/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveSymbolProcessor.java b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveSymbolProcessor.java index 955c254f5643..b72ba3fa4174 100644 --- a/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveSymbolProcessor.java +++ b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveSymbolProcessor.java @@ -107,8 +107,7 @@ public class PyMoveSymbolProcessor { if (belongsToSomeMovedElement(usage)) { return; } - if (usage instanceof PyQualifiedExpression) { - final PyQualifiedExpression qualifiedExpr = (PyQualifiedExpression)usage; + if (usage instanceof PyQualifiedExpression qualifiedExpr) { if (myMovedElement instanceof PyClass && PyNames.INIT.equals(qualifiedExpr.getName())) { return; } diff --git a/python/src/com/jetbrains/python/refactoring/rename/RenamePyElementProcessor.java b/python/src/com/jetbrains/python/refactoring/rename/RenamePyElementProcessor.java index 37cf784f9ca1..f572ab5c0cfb 100644 --- a/python/src/com/jetbrains/python/refactoring/rename/RenamePyElementProcessor.java +++ b/python/src/com/jetbrains/python/refactoring/rename/RenamePyElementProcessor.java @@ -14,8 +14,7 @@ public abstract class RenamePyElementProcessor extends RenamePsiElementProcessor @Override public void findExistingNameConflicts(@NotNull PsiElement element, @NotNull String newName, @NotNull MultiMap conflicts) { PyElement container = PsiTreeUtil.getParentOfType(element, ScopeOwner.class); - if (container instanceof PyFile) { - PyFile pyFile = (PyFile)container; + if (container instanceof PyFile pyFile) { PyClass conflictingClass = pyFile.findTopLevelClass(newName); if (conflictingClass != null) { conflicts.putValue(conflictingClass, "A class named '" + newName + "' is already defined in " + pyFile.getName()); @@ -29,8 +28,7 @@ public abstract class RenamePyElementProcessor extends RenamePsiElementProcessor conflicts.putValue(conflictingFunction, "A variable named '" + newName + "' is already defined in " + pyFile.getName()); } } - else if (container instanceof PyClass) { - PyClass pyClass = (PyClass)container; + else if (container instanceof PyClass pyClass) { PyClass conflictingClass = pyClass.findNestedClass(newName, true); if (conflictingClass != null) { conflicts.putValue(conflictingClass, "A class named '" + newName + "' is already defined in class '" + pyClass.getName() + "'"); diff --git a/python/src/com/jetbrains/python/refactoring/rename/RenamePyVariableProcessor.java b/python/src/com/jetbrains/python/refactoring/rename/RenamePyVariableProcessor.java index 5682033b4763..0c0d3f1060e3 100644 --- a/python/src/com/jetbrains/python/refactoring/rename/RenamePyVariableProcessor.java +++ b/python/src/com/jetbrains/python/refactoring/rename/RenamePyVariableProcessor.java @@ -41,11 +41,9 @@ public class RenamePyVariableProcessor extends RenamePyElementProcessor { @Nullable @Override public PsiElement substituteElementToRename(@NotNull PsiElement element, @Nullable Editor editor) { - if (element instanceof PyLambdaExpression) { - final PyLambdaExpression lambdaExpression = (PyLambdaExpression)element; + if (element instanceof PyLambdaExpression lambdaExpression) { final ScopeOwner owner = ScopeUtil.getScopeOwner(lambdaExpression); - if (owner instanceof PyClass) { - final PyClass cls = (PyClass)owner; + if (owner instanceof PyClass cls) { final Property property = cls.findPropertyByCallable(lambdaExpression); if (property != null) { final PyTargetExpression site = property.getDefinitionSite(); diff --git a/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyBinaryConditionSurrounder.java b/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyBinaryConditionSurrounder.java index 195f6f7aab41..51f8e61ee211 100644 --- a/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyBinaryConditionSurrounder.java +++ b/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyBinaryConditionSurrounder.java @@ -35,8 +35,7 @@ public abstract class PyBinaryConditionSurrounder extends PyExpressionAsConditio @Nullable @Override protected PyExpression getCondition(PyStatement statement) { - if (statement instanceof PyIfStatement) { - PyIfStatement ifStatement = (PyIfStatement)statement; + if (statement instanceof PyIfStatement ifStatement) { PyExpression condition = ifStatement.getIfPart().getCondition(); if (condition == null) { return null; diff --git a/python/src/com/jetbrains/python/run/PythonCommandLineState.java b/python/src/com/jetbrains/python/run/PythonCommandLineState.java index f9d98fc41602..cabe4a081aa5 100644 --- a/python/src/com/jetbrains/python/run/PythonCommandLineState.java +++ b/python/src/com/jetbrains/python/run/PythonCommandLineState.java @@ -326,8 +326,7 @@ public abstract class PythonCommandLineState extends CommandLineState { // Python script that may be the debugger script that runs the original script PythonExecution realPythonExecution = builder.build(helpersAwareTargetRequest, pythonScript); - if (myConfig instanceof PythonRunConfiguration) { - PythonRunConfiguration pythonConfig = (PythonRunConfiguration)myConfig; + if (myConfig instanceof PythonRunConfiguration pythonConfig) { String inputFilePath = pythonConfig.getInputFile(); if (pythonConfig.isRedirectInput() && !StringUtil.isEmptyOrSpaces(inputFilePath)) { realPythonExecution.withInputFile(new File(inputFilePath)); diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java b/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java index 87e86169ec6f..ea70b3e672f7 100644 --- a/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java +++ b/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java @@ -525,8 +525,7 @@ public final class PythonSdkUpdater implements StartupActivity, DumbAware { @NotNull private static List getRemoteSdkMappedPaths(@NotNull Sdk sdk) { final SdkAdditionalData additionalData = sdk.getSdkAdditionalData(); - if (additionalData instanceof RemoteSdkProperties) { - final RemoteSdkProperties remoteSdkData = (RemoteSdkProperties)additionalData; + if (additionalData instanceof RemoteSdkProperties remoteSdkData) { final List paths = new ArrayList<>(); for (PathMappingSettings.PathMapping mapping : remoteSdkData.getPathMappings().getPathMappings()) { paths.add(mapping.getLocalRoot()); diff --git a/python/src/com/jetbrains/python/spellchecker/PythonSpellcheckerStrategy.java b/python/src/com/jetbrains/python/spellchecker/PythonSpellcheckerStrategy.java index 496bdcfaabf0..cefa911ba70b 100644 --- a/python/src/com/jetbrains/python/spellchecker/PythonSpellcheckerStrategy.java +++ b/python/src/com/jetbrains/python/spellchecker/PythonSpellcheckerStrategy.java @@ -84,8 +84,7 @@ public class PythonSpellcheckerStrategy extends SpellcheckingStrategy { return EMPTY_TOKENIZER; } PsiElement parent = element.getParent(); - if (parent instanceof PyBinaryExpression) { - PyBinaryExpression binaryExpression = (PyBinaryExpression)parent; + if (parent instanceof PyBinaryExpression binaryExpression) { if (element == binaryExpression.getLeftExpression() && binaryExpression.getOperator() == PyTokenTypes.PERC) { return myFormatStringTokenizer; } diff --git a/python/src/com/jetbrains/python/structureView/PyFieldsFilter.java b/python/src/com/jetbrains/python/structureView/PyFieldsFilter.java index 32fa6cab94fd..43833d0fd1fd 100644 --- a/python/src/com/jetbrains/python/structureView/PyFieldsFilter.java +++ b/python/src/com/jetbrains/python/structureView/PyFieldsFilter.java @@ -19,8 +19,7 @@ public class PyFieldsFilter implements Filter { @Override public boolean isVisible(TreeElement treeNode) { - if (treeNode instanceof PyStructureViewElement) { - final PyStructureViewElement sve = (PyStructureViewElement)treeNode; + if (treeNode instanceof PyStructureViewElement sve) { return !sve.isField(); } return true; diff --git a/python/src/com/jetbrains/python/structureView/PyInheritedMembersFilter.java b/python/src/com/jetbrains/python/structureView/PyInheritedMembersFilter.java index 850e92b2bc2a..d35ffaf9d350 100644 --- a/python/src/com/jetbrains/python/structureView/PyInheritedMembersFilter.java +++ b/python/src/com/jetbrains/python/structureView/PyInheritedMembersFilter.java @@ -36,8 +36,7 @@ public class PyInheritedMembersFilter implements FileStructureFilter { @Override public boolean isVisible(TreeElement treeNode) { - if (treeNode instanceof PyStructureViewElement) { - final PyStructureViewElement sve = (PyStructureViewElement)treeNode; + if (treeNode instanceof PyStructureViewElement sve) { return !sve.isInherited(); } return true; diff --git a/python/src/com/jetbrains/python/validation/HighlightingAnnotator.java b/python/src/com/jetbrains/python/validation/HighlightingAnnotator.java index d5c64762bd91..fce0547d30e0 100644 --- a/python/src/com/jetbrains/python/validation/HighlightingAnnotator.java +++ b/python/src/com/jetbrains/python/validation/HighlightingAnnotator.java @@ -37,8 +37,7 @@ public class HighlightingAnnotator extends PyAnnotator { } private static boolean isArgOrKwargParameter(PyParameter parameter) { - if (parameter instanceof PyNamedParameter) { - final PyNamedParameter namedParameter = (PyNamedParameter)parameter; + if (parameter instanceof PyNamedParameter namedParameter) { return namedParameter.isPositionalContainer() || namedParameter.isKeywordContainer(); } diff --git a/python/testSrc/com/intellij/execution/testframework/actions/RerunFailedActionsTestTools.java b/python/testSrc/com/intellij/execution/testframework/actions/RerunFailedActionsTestTools.java index ea36a6cf19ef..1efcb2db2594 100644 --- a/python/testSrc/com/intellij/execution/testframework/actions/RerunFailedActionsTestTools.java +++ b/python/testSrc/com/intellij/execution/testframework/actions/RerunFailedActionsTestTools.java @@ -92,8 +92,7 @@ public final class RerunFailedActionsTestTools { @Nullable public static ExecutionEnvironment findRestartAction(@NotNull final RunContentDescriptor descriptor) { for (final AnAction action : descriptor.getRestartActions()) { - if (action instanceof PyRerunFailedTestsAction) { - final PyRerunFailedTestsAction rerunFailedTestsAction = (PyRerunFailedTestsAction)action; + if (action instanceof PyRerunFailedTestsAction rerunFailedTestsAction) { return getReRunEnvironment(rerunFailedTestsAction); } } diff --git a/python/testSrc/com/jetbrains/env/debug/PyBaseDebuggerTask.java b/python/testSrc/com/jetbrains/env/debug/PyBaseDebuggerTask.java index 4154c08734ee..44ac57247611 100644 --- a/python/testSrc/com/jetbrains/env/debug/PyBaseDebuggerTask.java +++ b/python/testSrc/com/jetbrains/env/debug/PyBaseDebuggerTask.java @@ -334,8 +334,7 @@ public abstract class PyBaseDebuggerTask extends PyExecutionFixtureTestTask { public static void setBreakpointSuspendPolicy(Project project, int line, SuspendPolicy policy) { XBreakpointManager breakpointManager = XDebuggerManager.getInstance(project).getBreakpointManager(); for (XBreakpoint breakpoint : XDebuggerTestUtil.getBreakpoints(breakpointManager)) { - if (breakpoint instanceof XLineBreakpoint) { - final XLineBreakpoint lineBreakpoint = (XLineBreakpoint)breakpoint; + if (breakpoint instanceof XLineBreakpoint lineBreakpoint) { if (lineBreakpoint.getLine() == line) { WriteAction.runAndWait(() -> lineBreakpoint.setSuspendPolicy(policy)); diff --git a/python/testSrc/com/jetbrains/env/debug/PyCustomConfigDebuggerTask.java b/python/testSrc/com/jetbrains/env/debug/PyCustomConfigDebuggerTask.java index 244432d13650..108e24ef163e 100644 --- a/python/testSrc/com/jetbrains/env/debug/PyCustomConfigDebuggerTask.java +++ b/python/testSrc/com/jetbrains/env/debug/PyCustomConfigDebuggerTask.java @@ -173,8 +173,7 @@ public abstract class PyCustomConfigDebuggerTask extends PyBaseDebuggerTask { } protected void killDebugProcess() { - if (myDebugProcess.getProcessHandler() instanceof KillableColoredProcessHandler) { - KillableColoredProcessHandler h = (KillableColoredProcessHandler)myDebugProcess.getProcessHandler(); + if (myDebugProcess.getProcessHandler() instanceof KillableColoredProcessHandler h) { h.killProcess(); } diff --git a/python/testSrc/com/jetbrains/python/refactoring/classes/PyPresenterTestMemberEntry.java b/python/testSrc/com/jetbrains/python/refactoring/classes/PyPresenterTestMemberEntry.java index 930270088802..9f47e87faaaf 100644 --- a/python/testSrc/com/jetbrains/python/refactoring/classes/PyPresenterTestMemberEntry.java +++ b/python/testSrc/com/jetbrains/python/refactoring/classes/PyPresenterTestMemberEntry.java @@ -51,9 +51,7 @@ public final class PyPresenterTestMemberEntry { @Override public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof PyPresenterTestMemberEntry)) return false; - - final PyPresenterTestMemberEntry entry = (PyPresenterTestMemberEntry)o; + if (!(o instanceof PyPresenterTestMemberEntry entry)) return false; if (myEnabled != entry.myEnabled) return false; if (myMayBeAbstract != entry.myMayBeAbstract) return false; diff --git a/xml/dom-impl/src/com/intellij/util/xml/AbstractDomDeclarationSearcher.java b/xml/dom-impl/src/com/intellij/util/xml/AbstractDomDeclarationSearcher.java index 994e05d58f4e..edebcf5f2f7b 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/AbstractDomDeclarationSearcher.java +++ b/xml/dom-impl/src/com/intellij/util/xml/AbstractDomDeclarationSearcher.java @@ -26,8 +26,7 @@ public abstract class AbstractDomDeclarationSearcher extends PomDeclarationSearc final PsiElement parentElement = element.getParent(); final DomManager domManager = DomManager.getDomManager(token.getProject()); final DomElement nameElement; - if (tokenType == XmlTokenType.XML_DATA_CHARACTERS && element instanceof XmlText && parentElement instanceof XmlTag) { - final XmlTag tag = (XmlTag)parentElement; + if (tokenType == XmlTokenType.XML_DATA_CHARACTERS && element instanceof XmlText && parentElement instanceof XmlTag tag) { for (XmlText text : tag.getValue().getTextElements()) { if (InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)text)) { return; diff --git a/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java b/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java index ea4930ea093a..cf220f1924c6 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java +++ b/xml/dom-impl/src/com/intellij/util/xml/DomNameSuggestionProvider.java @@ -33,8 +33,7 @@ public class DomNameSuggestionProvider implements NameSuggestionProvider { public SuggestedNameInfo getSuggestedNames(final PsiElement element, final PsiElement nameSuggestionContext, final Set result) { if (element instanceof PsiMetaOwner) { final PsiMetaData psiMetaData = ((PsiMetaOwner)element).getMetaData(); - if (psiMetaData instanceof DomMetaData) { - final DomMetaData domMetaData = (DomMetaData)psiMetaData; + if (psiMetaData instanceof DomMetaData domMetaData) { final GenericDomValue value = domMetaData.getNameElement(domMetaData.getElement()); ContainerUtil.addIfNotNull(result, getNameFromNameValue(value, true)); } @@ -47,8 +46,7 @@ public class DomNameSuggestionProvider implements NameSuggestionProvider { if (o == null || o instanceof String) { return (String)o; } - else if (o instanceof GenericValue) { - final GenericValue value = (GenericValue)o; + else if (o instanceof GenericValue value) { if (!local) { final Object name = value.getValue(); if (name != null) { diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java index cc9892c47fdc..5b446177b28e 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java @@ -133,8 +133,7 @@ public class DomElementAnnotationHolderImpl extends SmartList result = new SmartList<>(); final Converter converter = WrappingConverter.getDeepestConverter(element.getConverter(), element); - if (converter instanceof ResolvingConverter) { - final ResolvingConverter resolvingConverter = (ResolvingConverter)converter; + if (converter instanceof ResolvingConverter resolvingConverter) { ContainerUtil .addAll(result, resolvingConverter.getQuickFixes(ConvertContextFactory.createConvertContext(DomManagerImpl.getDomInvocationHandler(element)))); } diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java index d6e3f9075a21..e04cd0862e85 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java @@ -256,8 +256,7 @@ public class DomElementAnnotationsManagerImpl extends DomElementAnnotationsManag final DomFileElement root = DomUtil.getFileElement(element); if (!isHolderOutdated(root.getFile())) { final DomElementsProblemsHolder holder = getProblemHolder(element); - if (holder instanceof DomElementsProblemsHolderImpl) { - DomElementsProblemsHolderImpl holderImpl = (DomElementsProblemsHolderImpl)holder; + if (holder instanceof DomElementsProblemsHolderImpl holderImpl) { final List> suitableInspections = getSuitableDomInspections(root, true); final DomElementsInspection mockInspection = getMockInspection(root); final boolean annotatorsFinished = mockInspection == null || holderImpl.isInspectionCompleted(mockInspection); diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java index 0ef53e4b45e2..98a6339d3279 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java @@ -190,8 +190,7 @@ public class DomElementProblemDescriptorImpl implements DomElementProblemDescrip return ((DomFileElement)myDomElement).getFile(); } - if (myDomElement instanceof GenericAttributeValue) { - GenericAttributeValue attributeValue = (GenericAttributeValue)myDomElement; + if (myDomElement instanceof GenericAttributeValue attributeValue) { final XmlAttributeValue value = attributeValue.getXmlAttributeValue(); return value != null && StringUtil.isNotEmpty(value.getText()) ? value : attributeValue.getXmlElement(); } diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightingHelperImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightingHelperImpl.java index 0d5a367035c2..bcd75d306546 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightingHelperImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomHighlightingHelperImpl.java @@ -72,8 +72,7 @@ public class DomHighlightingHelperImpl extends DomHighlightingHelper { final SmartList list = new SmartList<>(); final DomGenericInfo info = element.getGenericInfo(); for (final AbstractDomChildrenDescription description : info.getChildrenDescriptions()) { - if (description instanceof DomCollectionChildDescription && description.getValues(element).isEmpty()) { - final DomCollectionChildDescription childDescription = (DomCollectionChildDescription)description; + if (description instanceof DomCollectionChildDescription childDescription && description.getValues(element).isEmpty()) { final Required annotation = description.getAnnotation(Required.class); if (annotation != null && annotation.value()) { list.add(holder.createProblem(element, childDescription, XmlDomBundle.message("dom.inspections.child.tag.0.should.be.defined", ((DomCollectionChildDescription)description).getXmlElementName()))); diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/ChildrenDescriptionsHolder.java b/xml/dom-impl/src/com/intellij/util/xml/impl/ChildrenDescriptionsHolder.java index 0a71c775e8d1..bff5d9afa138 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/ChildrenDescriptionsHolder.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/ChildrenDescriptionsHolder.java @@ -83,9 +83,7 @@ public final class ChildrenDescriptionsHolder @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ChildrenDescriptionsHolder)) return false; - - ChildrenDescriptionsHolder holder = (ChildrenDescriptionsHolder)o; + if (!(o instanceof ChildrenDescriptionsHolder holder)) return false; if (myDelegate != null ? !myDelegate.equals(holder.myDelegate) : holder.myDelegate != null) return false; if (!myMap.equals(holder.myMap)) return false; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertAnnotationImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertAnnotationImpl.java index 66d7ce27b6ce..77fe2aa5870f 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertAnnotationImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertAnnotationImpl.java @@ -51,9 +51,7 @@ public class ConvertAnnotationImpl implements Convert { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ConvertAnnotationImpl)) return false; - - ConvertAnnotationImpl that = (ConvertAnnotationImpl)o; + if (!(o instanceof ConvertAnnotationImpl that)) return false; if (mySoft != that.mySoft) return false; if (!myConverter.getClass().equals(that.myConverter.getClass())) return false; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetDescriptionProvider.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetDescriptionProvider.java index 3c4de1223a86..0c2089f90446 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetDescriptionProvider.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetDescriptionProvider.java @@ -29,9 +29,7 @@ import org.jetbrains.annotations.NotNull; public class DefaultDomTargetDescriptionProvider extends PomDescriptionProvider { @Override public String getElementDescription(@NotNull PomTarget element, @NotNull ElementDescriptionLocation location) { - if (!(element instanceof DomTarget)) return null; - - final DomTarget target = (DomTarget)element; + if (!(element instanceof DomTarget target)) return null; DomElement domElement = target.getDomElement(); final ElementPresentationTemplate template = domElement.getChildDescription().getPresentationTemplate(); diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java index ee805af8b99a..5de547a3dc18 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java @@ -42,8 +42,7 @@ public abstract class DomAnchorImpl implements DomAnchor(fileElement.getFile(), fileElement.getRootElementClass()); } @@ -146,9 +145,7 @@ public abstract class DomAnchorImpl implements DomAnchor implements DomAnchor implements DomAnchor= totalCount) { diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomFileElementImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomFileElementImpl.java index dd8419c8f75b..7d8cbcf8ad7b 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomFileElementImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomFileElementImpl.java @@ -153,9 +153,7 @@ public class DomFileElementImpl implements DomFileElement< public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof DomFileElementImpl)) return false; - - final DomFileElementImpl that = (DomFileElementImpl)o; + if (!(o instanceof DomFileElementImpl that)) return false; if (myFile != null ? !myFile.equals(that.myFile) : that.myFile != null) return false; if (myRootElementClass != null ? !myRootElementClass.equals(that.myRootElementClass) : that.myRootElementClass != null) return false; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java index 298dc86bd70a..20542955ad2d 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java @@ -207,8 +207,7 @@ public final class DomImplUtil { } } } - if (type instanceof WildcardType) { - final WildcardType wildcardType = (WildcardType)type; + if (type instanceof WildcardType wildcardType) { for (final Type bound : wildcardType.getUpperBounds()) { final Class aClass = getErasure(bound); if (aClass != null) { diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java index a26c8d93334d..12ad869f3de6 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java @@ -375,8 +375,7 @@ public abstract class DomInvocationHandler extends UserDataHolderBase implements description.getValues(getProxy()).get(0).ensureXmlElementExists(); } } - else if (description instanceof DomFixedChildDescription) { - final DomFixedChildDescription childDescription = (DomFixedChildDescription)description; + else if (description instanceof DomFixedChildDescription childDescription) { List values = null; final int count = childDescription.getCount(); for (int i = 0; i < count; i++) { diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomMetaDataContributor.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomMetaDataContributor.java index 007eb89ab3dc..bdd6eec01b04 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomMetaDataContributor.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomMetaDataContributor.java @@ -18,8 +18,7 @@ public class DomMetaDataContributor implements MetaDataContributor { registrar.registerMetaData(new ElementFilter() { @Override public boolean isAcceptable(Object element, PsiElement context) { - if (element instanceof XmlTag) { - final XmlTag tag = (XmlTag)element; + if (element instanceof XmlTag tag) { final DomElement domElement = DomManager.getDomManager(tag.getProject()).getDomElement(tag); if (domElement != null) { return domElement.getGenericInfo().getNameDomElement(domElement) != null; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomRootInvocationHandler.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomRootInvocationHandler.java index eb7ad3a90d63..bcf755ed4dad 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomRootInvocationHandler.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomRootInvocationHandler.java @@ -75,9 +75,8 @@ public class DomRootInvocationHandler extends DomInvocationHandler { } public boolean equals(final Object obj) { - if (!(obj instanceof DomRootInvocationHandler)) return false; + if (!(obj instanceof DomRootInvocationHandler handler)) return false; - final DomRootInvocationHandler handler = (DomRootInvocationHandler)obj; return myParent.equals(handler.myParent); } diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java index 74926be19df0..0d2862ac72a5 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java @@ -41,8 +41,7 @@ public class GenericDomValueReference extends PsiReferenceBase im } protected TextRange createTextRange() { - if (myGenericValue instanceof GenericAttributeValue) { - final GenericAttributeValue genericAttributeValue = (GenericAttributeValue)myGenericValue; + if (myGenericValue instanceof GenericAttributeValue genericAttributeValue) { final XmlAttributeValue attributeValue = genericAttributeValue.getXmlAttributeValue(); if (attributeValue == null) { return TextRange.from(0, genericAttributeValue.getXmlAttribute().getTextLength()); @@ -178,8 +177,7 @@ public class GenericDomValueReference extends PsiReferenceBase im if (DomCompletionContributor.isSchemaEnumerated(getElement())) return ArrayUtilRt.EMPTY_OBJECT_ARRAY; } - if (converter instanceof ResolvingConverter) { - final ResolvingConverter resolvingConverter = (ResolvingConverter)converter; + if (converter instanceof ResolvingConverter resolvingConverter) { ArrayList result = new ArrayList<>(); final ConvertContext convertContext = getConvertContext(); for (T variant: resolvingConverter.getVariants(convertContext)) { diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/RootDomParentStrategy.java b/xml/dom-impl/src/com/intellij/util/xml/impl/RootDomParentStrategy.java index a8c7614a77cb..7d3fd0f7950d 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/RootDomParentStrategy.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/RootDomParentStrategy.java @@ -73,9 +73,7 @@ public class RootDomParentStrategy implements DomParentStrategy { public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof RootDomParentStrategy)) return false; - - final RootDomParentStrategy that = (RootDomParentStrategy)o; + if (!(o instanceof RootDomParentStrategy that)) return false; if (!myFileElement.equals(that.myFileElement)) return false; diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/VirtualDomParentStrategy.java b/xml/dom-impl/src/com/intellij/util/xml/impl/VirtualDomParentStrategy.java index e93fc1702e5b..ec6d413a435a 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/VirtualDomParentStrategy.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/VirtualDomParentStrategy.java @@ -95,9 +95,7 @@ public class VirtualDomParentStrategy implements DomParentStrategy { public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof VirtualDomParentStrategy)) return false; - - final VirtualDomParentStrategy that = (VirtualDomParentStrategy)o; + if (!(o instanceof VirtualDomParentStrategy that)) return false; if (!myParentHandler.equals(that.myParentHandler)) return false; diff --git a/xml/dom-impl/src/com/intellij/util/xml/stubs/StubParentStrategy.java b/xml/dom-impl/src/com/intellij/util/xml/stubs/StubParentStrategy.java index 360d4d352bb0..38c18576b981 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/stubs/StubParentStrategy.java +++ b/xml/dom-impl/src/com/intellij/util/xml/stubs/StubParentStrategy.java @@ -140,13 +140,12 @@ public class StubParentStrategy implements DomParentStrategy { @Override public boolean equals(Object obj) { - if (!(obj instanceof StubParentStrategy)) { + if (!(obj instanceof StubParentStrategy other)) { return PhysicalDomParentStrategy.strategyEquals(this, obj); } if (obj == this) return true; - StubParentStrategy other = (StubParentStrategy)obj; if (!other.getClass().equals(getClass())) return false; if (!other.myStub.equals(myStub)) return false; diff --git a/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java b/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java index ab5b32dc7d19..4093c7f6d33d 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java +++ b/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java @@ -70,10 +70,9 @@ final class DomStubBuilder implements BinaryFileStubBuilder.CompositeBinaryFileS public @Nullable Stub buildStubTree(@NotNull FileContent fileContent, @Nullable DomFileMetaData meta) { if (meta == null) return null; PsiFile psiFile = fileContent.getPsiFile(); - if (!(psiFile instanceof XmlFile)) return null; + if (!(psiFile instanceof XmlFile xmlFile)) return null; Project project = fileContent.getProject(); - XmlFile xmlFile = (XmlFile)psiFile; try { XmlUtil.BUILDING_DOM_STUBS.set(Boolean.TRUE); DomFileElement fileElement = DomManager.getDomManager(project).getFileElement(xmlFile); diff --git a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java index 79adff0f475e..a39c08701559 100644 --- a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java +++ b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java @@ -83,8 +83,7 @@ public class DomAttributeXmlDescriptor implements NamespaceAwareXmlAttributeDesc static String getQualifiedAttributeName(PsiElement context, XmlName xmlName) { final String localName = xmlName.getLocalName(); - if (context instanceof XmlTag) { - final XmlTag tag = (XmlTag)context; + if (context instanceof XmlTag tag) { final DomInvocationHandler handler = DomManagerImpl.getDomManager(context.getProject()).getDomHandler(tag); if (handler != null) { final String ns = handler.createEvaluatedXmlName(xmlName).getNamespace(tag, handler.getFile()); diff --git a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java index e7e796ca7dd9..23258378f980 100644 --- a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java +++ b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java @@ -49,8 +49,7 @@ public class DomElementXmlDescriptor extends AbstractDomChildrenDescriptor imple @NonNls public String getName(final PsiElement context) { final String name = getDefaultName(); - if (context instanceof XmlTag) { - XmlTag tag = (XmlTag)context; + if (context instanceof XmlTag tag) { final PsiFile file = tag.getContainingFile(); DomElement element = myManager.getDomElement(tag); if (element == null && tag.getParentTag() != null) { diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomReflectionUtil.java b/xml/dom-openapi/src/com/intellij/util/xml/DomReflectionUtil.java index c05f3176059f..ed43261210f8 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomReflectionUtil.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomReflectionUtil.java @@ -93,17 +93,15 @@ public final class DomReflectionUtil { } public static @Nullable Type extractCollectionElementType(Type returnType) { - if (!(returnType instanceof ParameterizedType)) { + if (!(returnType instanceof ParameterizedType parameterizedType)) { return null; } - ParameterizedType parameterizedType = (ParameterizedType)returnType; Type rawType = parameterizedType.getRawType(); - if (!(rawType instanceof Class)) { + if (!(rawType instanceof Class rawClass)) { return null; } - Class rawClass = (Class)rawType; if (!List.class.equals(rawClass) && !Collection.class.equals(rawClass)) { return null; } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomTarget.java b/xml/dom-openapi/src/com/intellij/util/xml/DomTarget.java index 48aace47bf62..def2cc9b5929 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomTarget.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomTarget.java @@ -38,8 +38,7 @@ public final class DomTarget extends DelegatePsiTarget implements PsiDeclaredTar @Nullable public static DomTarget getTarget(DomElement element, GenericDomValue nameElement) { - if (nameElement instanceof GenericAttributeValue) { - final GenericAttributeValue genericAttributeValue = (GenericAttributeValue)nameElement; + if (nameElement instanceof GenericAttributeValue genericAttributeValue) { final XmlAttributeValue attributeValue = genericAttributeValue.getXmlAttributeValue(); if (attributeValue == null) { return null; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java b/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java index 1092d2fe5060..e97e1d45b83f 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java @@ -142,8 +142,7 @@ public class DomUtil { @Nullable public static XmlElement getValueElement(GenericDomValue domValue) { - if (domValue instanceof GenericAttributeValue) { - GenericAttributeValue value = (GenericAttributeValue)domValue; + if (domValue instanceof GenericAttributeValue value) { XmlAttributeValue attributeValue = value.getXmlAttributeValue(); return attributeValue == null ? value.getXmlAttribute() : attributeValue; } else { @@ -213,8 +212,7 @@ public class DomUtil { } final XmlElement xmlElement = parent.getXmlElement(); - if (xmlElement instanceof XmlTag) { - XmlTag tag = (XmlTag) xmlElement; + if (xmlElement instanceof XmlTag tag) { final DomManager domManager = parent.getManager(); final SmartList result = new SmartList<>(); if (attributes) { diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentationManager.java b/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentationManager.java index 7e84aeb805a3..6f39de447238 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentationManager.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ElementPresentationManager.java @@ -71,8 +71,7 @@ public abstract class ElementPresentationManager { public static String getElementName(@NotNull Object element) { Object o = invokeNameValueMethod(element); if (o == null || o instanceof String) return (String)o; - if (o instanceof GenericValue) { - final GenericValue gv = (GenericValue)o; + if (o instanceof GenericValue gv) { final String s = gv.getStringValue(); if (s == null) { final Object value = gv.getValue(); @@ -97,8 +96,7 @@ public abstract class ElementPresentationManager { o = firstImpl != null ? firstImpl : o; String typeName = TypePresentationService.getService().getTypeName(o); if (typeName != null) return typeName; - if (o instanceof DomElement) { - final DomElement element = (DomElement)o; + if (o instanceof DomElement element) { return StringUtil.capitalizeWords(element.getNameStrategy().splitIntoWords(element.getXmlElementName()), true); } return TypePresentationService.getDefaultTypeName(o.getClass()); diff --git a/xml/dom-openapi/src/com/intellij/util/xml/EvaluatedXmlNameImpl.java b/xml/dom-openapi/src/com/intellij/util/xml/EvaluatedXmlNameImpl.java index 74a23c12d056..7d9fda18239f 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/EvaluatedXmlNameImpl.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/EvaluatedXmlNameImpl.java @@ -59,9 +59,7 @@ public final class EvaluatedXmlNameImpl implements EvaluatedXmlName { @Override public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof EvaluatedXmlNameImpl)) return false; - - final EvaluatedXmlNameImpl that = (EvaluatedXmlNameImpl)o; + if (!(o instanceof EvaluatedXmlNameImpl that)) return false; if (myEqualToParent != that.myEqualToParent) return false; if (myNamespaceKey != null ? !myNamespaceKey.equals(that.myNamespaceKey) : that.myNamespaceKey != null) return false; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java b/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java index ea434ffb06e5..b0afcbcf5e57 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java @@ -107,9 +107,7 @@ public final class JavaMethod implements AnnotatedElement { @Override public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof JavaMethod)) return false; - - final JavaMethod that = (JavaMethod)o; + if (!(o instanceof JavaMethod that)) return false; if (!myDeclaringClass.equals(that.myDeclaringClass)) return false; if (!mySignature.equals(that.mySignature)) return false; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/BasicDomElementsInspection.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/BasicDomElementsInspection.java index c8138073f867..e52b92d6afcd 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/BasicDomElementsInspection.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/BasicDomElementsInspection.java @@ -41,8 +41,7 @@ public abstract class BasicDomElementsInspection extends D @Override protected void checkDomElement(DomElement element, DomElementAnnotationHolder holder, DomHighlightingHelper helper) { int oldSize = holder.getSize(); - if (element instanceof GenericDomValue) { - final GenericDomValue genericDomValue = (GenericDomValue) element; + if (element instanceof GenericDomValue genericDomValue) { if (shouldCheckResolveProblems(genericDomValue)) { helper.checkResolveProblems(genericDomValue, holder); } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/BasicDomElementComponent.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/BasicDomElementComponent.java index ca9deb746d1f..17a7dc7714ee 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/BasicDomElementComponent.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/BasicDomElementComponent.java @@ -100,8 +100,7 @@ public abstract class BasicDomElementComponent extends Abs try { field.setAccessible(true); - if (description instanceof DomChildrenDescription) { - final DomChildrenDescription childrenDescription = (DomChildrenDescription)description; + if (description instanceof DomChildrenDescription childrenDescription) { if (convertFieldName(field.getName(), childrenDescription).equals(childrenDescription.getXmlElementName()) && field.get(this) instanceof JComponent) { return (JComponent)field.get(this); } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUINavigationProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUINavigationProvider.java index dab8d31829c1..ece7461b683f 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUINavigationProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomUINavigationProvider.java @@ -64,8 +64,7 @@ public class DomUINavigationProvider extends DomElementNavigationProvider { public static DomElement findDomElement(final CompositeCommittable compositCommitable, final Component component) { final List list = compositCommitable.getChildren(); for (Committable committable : list) { - if (committable instanceof DomUIControl) { - final DomUIControl uiControl = (DomUIControl)committable; + if (committable instanceof DomUIControl uiControl) { if (uiControl.getComponent().isAncestorOf(component)) { return uiControl.getDomElement(); } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java index 9bb4a8d02d7f..062daf489faa 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java @@ -101,8 +101,7 @@ public class ErrorableTableCellRenderer extends DefaultTab wrapper.add(errorLabel, BorderLayout.EAST); - if (component instanceof JComponent) { - final JComponent jComponent = (JComponent)component; + if (component instanceof JComponent jComponent) { wrapper.setBorder(jComponent.getBorder()); jComponent.setBorder(BorderFactory.createEmptyBorder()); jComponent.setToolTipText(TooltipUtils.getTooltipText(errorDescriptors)); diff --git a/xml/impl/src/com/intellij/codeInsight/completion/DtdCompletionContributor.java b/xml/impl/src/com/intellij/codeInsight/completion/DtdCompletionContributor.java index 9ebad262727a..cf3f2619c239 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/DtdCompletionContributor.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/DtdCompletionContributor.java @@ -89,8 +89,7 @@ public class DtdCompletionContributor extends CompletionContributor { final PsiElementProcessor processor = new PsiElementProcessor() { @Override public boolean execute(@NotNull final PsiElement element) { - if (element instanceof XmlEntityDecl) { - final XmlEntityDecl xmlEntityDecl = (XmlEntityDecl)element; + if (element instanceof XmlEntityDecl xmlEntityDecl) { String name = xmlEntityDecl.getName(); if (name != null && xmlEntityDecl.isInternalReference()) { result.addElement(LookupElementBuilder.create(name).withInsertHandler(XmlCompletionContributor.ENTITY_INSERT_HANDLER)); diff --git a/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java index 7e34471334db..4ef535dc08b2 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java @@ -105,8 +105,7 @@ public class ExtendedTagInsertHandler extends XmlTagInsertHandler { protected boolean isNamespaceBound(PsiElement psiElement) { PsiElement parent = psiElement.getParent(); - if (!(parent instanceof XmlTag)) return false; - final XmlTag tag = (XmlTag)parent; + if (!(parent instanceof XmlTag tag)) return false; final XmlElementDescriptor tagDescriptor = tag.getDescriptor(); final String tagNamespace = tag.getNamespace(); assert myNamespace != null; diff --git a/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionContributor.java b/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionContributor.java index 845d9b8c3655..230dc9cfddb5 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionContributor.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionContributor.java @@ -305,8 +305,7 @@ public class HtmlCompletionContributor extends CompletionContributor implements @Override public void activeLookupChanged(@Nullable Lookup oldLookup, @Nullable Lookup newLookup) { - if (newLookup instanceof LookupImpl && shouldTryDeselectingFirstPopupItem(newLookup)) { - LookupImpl lookup = (LookupImpl)newLookup; + if (newLookup instanceof LookupImpl lookup && shouldTryDeselectingFirstPopupItem(newLookup)) { lookup.setPrefixChangeListener(new PrefixChangeListener() { @Override public void afterAppend(char c) { diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java index 8c7296f45177..0f259d4eb2f9 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java @@ -117,8 +117,7 @@ public class XmlAttributeInsertHandler implements InsertHandler { private static void qualifyWithPrefix(@NotNull String namespacePrefix, @NotNull PsiElement context) { final PsiElement parent = context.getParent(); - if (parent instanceof XmlAttribute) { - final XmlAttribute attribute = (XmlAttribute)parent; + if (parent instanceof XmlAttribute attribute) { final String prefix = attribute.getNamespacePrefix(); if (!prefix.equals(namespacePrefix) && StringUtil.isNotEmpty(namespacePrefix)) { diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeReferenceCompletionProvider.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeReferenceCompletionProvider.java index c8b89e56640b..2f9024dbe3c1 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeReferenceCompletionProvider.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeReferenceCompletionProvider.java @@ -111,8 +111,7 @@ public class XmlAttributeReferenceCompletionProvider extends CompletionProvider< name = descriptor.getName(tag).substring(prefix.length()); } LookupElementBuilder element = LookupElementBuilder.create(name); - if (descriptor instanceof PsiPresentableMetaData) { - PsiPresentableMetaData presentableMetaData = (PsiPresentableMetaData)descriptor; + if (descriptor instanceof PsiPresentableMetaData presentableMetaData) { element = element.withIcon(presentableMetaData.getIcon()); String typeName = presentableMetaData.getTypeName(); if (!StringUtil.isEmpty(typeName)) { diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java index 41e78572d61d..8f2a64ab02db 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java @@ -202,12 +202,11 @@ public final class XmlCompletionContributor extends CompletionContributor { PsiElement element = parameters.getPosition(); if (!isXmlNameCompletion(parameters)) return; PsiElement parent = element.getParent(); - if (!(parent instanceof XmlTag) || + if (!(parent instanceof XmlTag tag) || !(parameters.getOriginalFile() instanceof XmlFile)) { return; } result.stopHere(); - final XmlTag tag = (XmlTag)parent; final String namespace = tag.getNamespace(); final String prefix = result.getPrefixMatcher().getPrefix(); final int pos = prefix.indexOf(':'); @@ -292,8 +291,7 @@ public final class XmlCompletionContributor extends CompletionContributor { final PsiElementProcessor processor = new PsiElementProcessor<>() { @Override public boolean execute(@NotNull final PsiElement element) { - if (element instanceof XmlEntityDecl) { - final XmlEntityDecl xmlEntityDecl = (XmlEntityDecl)element; + if (element instanceof XmlEntityDecl xmlEntityDecl) { if (xmlEntityDecl.isInternalReference() || acceptSystemEntities) { final LookupElementBuilder _item = buildEntityLookupItem(xmlEntityDecl); if (_item != null) { diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartCompletionProvider.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartCompletionProvider.java index 4bca3232dcba..a82e96acfbd8 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartCompletionProvider.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartCompletionProvider.java @@ -36,11 +36,10 @@ public class XmlSmartCompletionProvider { return; } result.stopHere(); - if (!(element.getParent() instanceof XmlTag)) { + if (!(element.getParent() instanceof XmlTag tag)) { return; } - final XmlTag tag = (XmlTag)element.getParent(); final XmlTag parentTag = tag.getParentTag(); if (parentTag == null) return; final XmlContentDFA dfa = XmlContentDFA.getContentDFA(parentTag); diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/AddSchemaPrefixIntention.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/AddSchemaPrefixIntention.java index a0eb7c0d34b8..6e838ea6ffcf 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/AddSchemaPrefixIntention.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/AddSchemaPrefixIntention.java @@ -156,8 +156,7 @@ public class AddSchemaPrefixIntention extends PsiElementBaseIntentionAction { @Nullable private static XmlAttribute getXmlnsDeclaration(PsiElement element) { final PsiElement parent = element.getParent(); - if (parent instanceof XmlTag) { - XmlTag tag = (XmlTag)parent; + if (parent instanceof XmlTag tag) { if (tag.getNamespacePrefix().isEmpty()) { while (tag != null) { final XmlAttribute attr = tag.getAttribute("xmlns"); diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java index 7880342c8829..7cb15613b3df 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java @@ -132,8 +132,7 @@ public class CreateNSDeclarationIntentionFix implements HintAction, LocalQuickFi @NotNull private IntentionPreviewInfo doPreview(@NotNull Project project, PsiElement element, @Nullable Editor editor) { PsiFile file = element.getContainingFile(); - if (!(file instanceof XmlFile)) return IntentionPreviewInfo.EMPTY; - XmlFile xmlFile = (XmlFile)file; + if (!(file instanceof XmlFile xmlFile)) return IntentionPreviewInfo.EMPTY; List namespaces = getNamespaces(element, xmlFile); String namespace = namespaces.isEmpty() ? "" : namespaces.get(0); new MyStringToAttributeProcessor(element, project, editor, xmlFile) @@ -357,8 +356,7 @@ public class CreateNSDeclarationIntentionFix implements HintAction, LocalQuickFi @Override public boolean isAcceptableMetaData(final PsiMetaData metaData, final String url) { - if (metaData instanceof XmlNSDescriptorImpl) { - final XmlNSDescriptorImpl nsDescriptor = (XmlNSDescriptorImpl)metaData; + if (metaData instanceof XmlNSDescriptorImpl nsDescriptor) { final XmlElementDescriptor descriptor = nsDescriptor.getElementDescriptor(searchFor(), url); return descriptor != null && !(descriptor instanceof AnyXmlElementDescriptor); diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java index dc97983ed3ea..90a0bd9f8af8 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java @@ -423,8 +423,7 @@ public final class FetchExtResourceAction extends BaseExtResourceAction { } } } - else if (element instanceof XmlTag) { - final XmlTag tag = (XmlTag)element; + else if (element instanceof XmlTag tag) { String schemaLocation = tag.getAttributeValue(XmlUtil.SCHEMA_LOCATION_ATT); if (schemaLocation != null) { diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/DtdSelectioner.java b/xml/impl/src/com/intellij/codeInsight/editorActions/DtdSelectioner.java index 275c7f923304..cfd72ddc23f0 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/DtdSelectioner.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/DtdSelectioner.java @@ -40,8 +40,7 @@ public class DtdSelectioner extends ExtendWordSelectionHandlerBase { PsiElement first = null; PsiElement last = null; for (PsiElement child : children) { - if (child instanceof XmlToken) { - XmlToken token = (XmlToken)child; + if (child instanceof XmlToken token) { if (token.getTokenType() == XmlTokenType.XML_TAG_END) { last = token; break; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCDATAContentSelectioner.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCDATAContentSelectioner.java index d842d7f6a85e..ac2a6303417b 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCDATAContentSelectioner.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCDATAContentSelectioner.java @@ -41,8 +41,7 @@ public class XmlCDATAContentSelectioner extends ExtendWordSelectionHandlerBase { PsiElement first = null; PsiElement last = null; for (PsiElement child : children) { - if (child instanceof XmlToken) { - XmlToken token = (XmlToken)child; + if (child instanceof XmlToken token) { if (token.getTokenType() == XmlTokenType.XML_CDATA_START) { first = token.getNextSibling(); } diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java index d6d0f37c3a9b..f9b37861d1d9 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java @@ -127,7 +127,7 @@ public class XmlGtTypedHandler extends TypedHandlerDelegate { element = element.getLastChild(); } if (element == null) return Result.CONTINUE; - if (!(element instanceof XmlTag)) { + if (!(element instanceof XmlTag tag)) { if (element instanceof XmlTokenImpl && element.getPrevSibling() !=null && element.getPrevSibling().getText().equals("<")) { @@ -137,7 +137,6 @@ public class XmlGtTypedHandler extends TypedHandlerDelegate { return Result.CONTINUE; } - XmlTag tag = (XmlTag)element; if (XmlUtil.getTokenOfType(tag, XmlTokenType.XML_TAG_END) != null) return Result.CONTINUE; if (XmlUtil.getTokenOfType(tag, XmlTokenType.XML_EMPTY_ELEMENT_END) != null) return Result.CONTINUE; final XmlToken startToken = XmlUtil.getTokenOfType(tag, XmlTokenType.XML_START_TAG_START); diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagSelectioner.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagSelectioner.java index 70d67fbcef35..75c83e0f9e2d 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagSelectioner.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagSelectioner.java @@ -56,8 +56,7 @@ public class XmlTagSelectioner extends ExtendWordSelectionHandlerBase { PsiElement first = null; PsiElement last = null; for (PsiElement child : children) { - if (child instanceof XmlToken) { - XmlToken token = (XmlToken)child; + if (child instanceof XmlToken token) { if (token.getTokenType() == XmlTokenType.XML_TAG_END) { first = token.getNextSibling(); } diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java b/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java index 74b4de74272a..9a17cfa0868b 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java @@ -116,11 +116,10 @@ public class XmlMover extends LineMover { if (down) { final XmlElement targetParent = getDestinationElement(file, movedParent, moveDestinationRange.getEndOffset(), false); if (targetParent != null) { - if (movedParent instanceof XmlTagChild && targetParent instanceof XmlTag) { + if (movedParent instanceof XmlTagChild && targetParent instanceof XmlTag tag) { if (targetParent == movedParent) return false; if (movedParent instanceof XmlTag && moveTags(info, (XmlTag)movedParent, (XmlTag)targetParent, true)) return true; - final XmlTag tag = (XmlTag)targetParent; final int offset = tag.isEmpty() ? tag.getTextRange().getStartOffset() : getTagContentRange(tag).getStartOffset(); updatedMovedIntoEnd(document, info, offset); if (tag.isEmpty()) { @@ -133,8 +132,7 @@ public class XmlMover extends LineMover { } else { final XmlElement targetParent = getDestinationElement(file, movedParent, moveDestinationRange.getStartOffset(), true); if (targetParent != null) { - if (movedParent instanceof XmlTagChild && targetParent instanceof XmlTag) { - final XmlTag tag = (XmlTag)targetParent; + if (movedParent instanceof XmlTagChild && targetParent instanceof XmlTag tag) { final TextRange tagValueRange = getTagContentRange(tag); // We need to update destination range to jump over tag start diff --git a/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java b/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java index c51dd12dadc2..5b7c6f8c0152 100644 --- a/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java +++ b/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java @@ -20,8 +20,7 @@ public class XmlElementSignatureProvider extends AbstractElementSignatureProvide @Override public String getSignature(@NotNull PsiElement element) { - if (element instanceof XmlTag) { - XmlTag tag = (XmlTag)element; + if (element instanceof XmlTag tag) { PsiElement parent = tag.getParent(); StringBuilder buffer = new StringBuilder(); diff --git a/xml/impl/src/com/intellij/codeInsight/hint/TagDeclarationRangeHandler.java b/xml/impl/src/com/intellij/codeInsight/hint/TagDeclarationRangeHandler.java index 52a308d35c66..7399794f4107 100644 --- a/xml/impl/src/com/intellij/codeInsight/hint/TagDeclarationRangeHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/hint/TagDeclarationRangeHandler.java @@ -32,8 +32,7 @@ public class TagDeclarationRangeHandler implements DeclarationRangeHandler { for (PsiElement child = xmlTag.getFirstChild(); child != null; child = child.getNextSibling()) { endOffset = child.getTextRange().getEndOffset(); - if (child instanceof XmlToken) { - XmlToken token = (XmlToken)child; + if (child instanceof XmlToken token) { IElementType tokenType = token.getTokenType(); if (tokenType == XmlTokenType.XML_EMPTY_ELEMENT_END || tokenType == XmlTokenType.XML_TAG_END) break; } diff --git a/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java b/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java index 0c9fca35e123..8553164436a1 100644 --- a/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java @@ -92,8 +92,7 @@ public class XmlParameterInfoHandler implements ParameterInfoHandler offset) return tag; - if (child instanceof XmlToken) { - XmlToken token = (XmlToken)child; + if (child instanceof XmlToken token) { if (token.getTokenType() == XmlTokenType.XML_TAG_END) return null; } } diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java index 53cb003acc19..f85a53b33ef5 100644 --- a/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java +++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java @@ -127,8 +127,7 @@ public class ZenCodingTemplate extends CustomLiveTemplateBase { break; } } - while (node instanceof FilterNode) { - FilterNode filterNode = (FilterNode)node; + while (node instanceof FilterNode filterNode) { String suffix = filterNode.getFilter(); for (ZenCodingGenerator generator : generators) { if (generator.isMyContext(callback, wrapping)) { @@ -146,8 +145,7 @@ public class ZenCodingTemplate extends CustomLiveTemplateBase { private static List getFilters(ZenCodingNode node, PsiElement context) { List result = new ArrayList<>(); - while (node instanceof FilterNode) { - FilterNode filterNode = (FilterNode)node; + while (node instanceof FilterNode filterNode) { String filterSuffix = filterNode.getFilter(); for (ZenCodingFilter filter : ZenCodingFilter.getInstances()) { if (filter.isMyContext(context) && filter.getSuffix().equals(filterSuffix)) { diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/nodes/MoreOperationNode.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/nodes/MoreOperationNode.java index 5e355574ebbe..3c122c10299b 100644 --- a/xml/impl/src/com/intellij/codeInsight/template/emmet/nodes/MoreOperationNode.java +++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/nodes/MoreOperationNode.java @@ -48,8 +48,7 @@ public class MoreOperationNode extends ZenCodingNode { boolean insertSurroundedTextAtTheEnd, GenerationNode parent) { if (myLeftOperand instanceof MulOperationNode || (myLeftOperand instanceof UnaryMulOperationNode && surroundedText != null)) { List result = new ArrayList<>(); - if (myLeftOperand instanceof MulOperationNode) { - MulOperationNode mul = (MulOperationNode)myLeftOperand; + if (myLeftOperand instanceof MulOperationNode mul) { for (int i = 0; i < mul.getRightOperand(); i++) { List parentNodes = mul.getLeftOperand().expand(i, totalIterations, surroundedText, callback, insertSurroundedTextAtTheEnd, parent); diff --git a/xml/impl/src/com/intellij/navigation/HtmlGotoRelatedProvider.java b/xml/impl/src/com/intellij/navigation/HtmlGotoRelatedProvider.java index 0fcc4acf4c2c..d184f3cf0c4f 100644 --- a/xml/impl/src/com/intellij/navigation/HtmlGotoRelatedProvider.java +++ b/xml/impl/src/com/intellij/navigation/HtmlGotoRelatedProvider.java @@ -40,8 +40,7 @@ public class HtmlGotoRelatedProvider extends GotoRelatedProvider { List items = new ArrayList<>(); for (PsiFile psiFile : file.getViewProvider().getAllFiles()) { - if (psiFile instanceof XmlFile) { - final XmlFile xmlFile = (XmlFile)psiFile; + if (psiFile instanceof XmlFile xmlFile) { for (RelatedToHtmlFilesContributor contributor : RelatedToHtmlFilesContributor.EP_NAME.getExtensionList()) { HashSet resultSet = new HashSet<>(); diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java index 245a10983962..eca8ba892b49 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java @@ -67,8 +67,7 @@ public abstract class AbstractXmlBlock extends AbstractBlock { * contains 'default'. If the attribute is not defined, return the current value. */ private static boolean shouldPreserveSpace(ASTNode node, boolean defaultValue) { - if (node.getPsi() instanceof XmlTag) { - XmlTag tag = (XmlTag)node.getPsi(); + if (node.getPsi() instanceof XmlTag tag) { if (tag != null) { XmlAttribute spaceAttr = tag.getAttribute("xml:space"); if (spaceAttr != null) { @@ -123,8 +122,7 @@ public abstract class AbstractXmlBlock extends AbstractBlock { if (elementType == XmlTokenType.XML_START_TAG_START) return tagBeginWrap; if (elementType == XmlTokenType.XML_END_TAG_START) { final PsiElement parent = SourceTreeToPsiMap.treeElementToPsi(child.getTreeParent()); - if (parent instanceof XmlTag) { - final XmlTag tag = (XmlTag)parent; + if (parent instanceof XmlTag tag) { if (canWrapTagEnd(tag)) { return getTagEndWrapping(tag); } diff --git a/xml/impl/src/com/intellij/psi/impl/smartPointers/XmlAnchorProvider.java b/xml/impl/src/com/intellij/psi/impl/smartPointers/XmlAnchorProvider.java index 779d49418eeb..96606c602997 100644 --- a/xml/impl/src/com/intellij/psi/impl/smartPointers/XmlAnchorProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/smartPointers/XmlAnchorProvider.java @@ -39,8 +39,7 @@ public class XmlAnchorProvider extends SmartPointerAnchorProvider { @Nullable @Override public PsiElement restoreElement(@NotNull PsiElement anchor) { - if (anchor instanceof XmlToken) { - XmlToken token = (XmlToken)anchor; + if (anchor instanceof XmlToken token) { return token.getTokenType() == XmlTokenType.XML_NAME ? token.getParent() : null; } return null; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JspxIncludePathReferenceProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JspxIncludePathReferenceProvider.java index f9d5fc984708..38fb8e893e00 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JspxIncludePathReferenceProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JspxIncludePathReferenceProvider.java @@ -32,15 +32,13 @@ public class JspxIncludePathReferenceProvider extends PsiReferenceProvider imple @Override public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, @NotNull final ProcessingContext context) { - if (element instanceof XmlAttributeValue) { - final XmlAttributeValue attributeValue = ((XmlAttributeValue)element); + if (element instanceof XmlAttributeValue attributeValue) { String valueString = attributeValue.getValue(); if(valueString.indexOf('?') >= 0) return getReferencesByString(valueString.substring(0, valueString.indexOf('?')), attributeValue, 1); return getReferencesByString(valueString, attributeValue, 1); - } else if (element instanceof XmlTag) { - final XmlTag tag = ((XmlTag)element); + } else if (element instanceof XmlTag tag) { final XmlTagValue value = tag.getValue(); final String text = value.getText(); diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XsContentDFA.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XsContentDFA.java index a44c4585945a..a9cb50d030ec 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XsContentDFA.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XsContentDFA.java @@ -90,8 +90,7 @@ class XsContentDFA extends XmlContentDFA { final List vector = myContentModel.whatCanGoHere(myState); ArrayList list = new ArrayList<>(); for (Object o : vector) { - if (o instanceof XSElementDecl) { - final XSElementDecl elementDecl = (XSElementDecl)o; + if (o instanceof XSElementDecl elementDecl) { XmlElementDescriptor descriptor = ContainerUtil.find(myElementDescriptors, elementDescriptor -> elementDecl.getName().equals(elementDescriptor.getName())); ContainerUtil.addIfNotNull(list, descriptor); diff --git a/xml/impl/src/com/intellij/refactoring/util/XmlNonCodeSearchElementDescriptionProvider.java b/xml/impl/src/com/intellij/refactoring/util/XmlNonCodeSearchElementDescriptionProvider.java index 431277600dbb..2319968ef8b6 100644 --- a/xml/impl/src/com/intellij/refactoring/util/XmlNonCodeSearchElementDescriptionProvider.java +++ b/xml/impl/src/com/intellij/refactoring/util/XmlNonCodeSearchElementDescriptionProvider.java @@ -13,8 +13,7 @@ import org.jetbrains.annotations.NotNull; public class XmlNonCodeSearchElementDescriptionProvider implements ElementDescriptionProvider { @Override public String getElementDescription(@NotNull final PsiElement element, @NotNull final ElementDescriptionLocation location) { - if (!(location instanceof NonCodeSearchDescriptionLocation)) return null; - final NonCodeSearchDescriptionLocation ncdLocation = (NonCodeSearchDescriptionLocation)location; + if (!(location instanceof NonCodeSearchDescriptionLocation ncdLocation)) return null; if (ncdLocation.isNonJava()) return null; if (element instanceof XmlTag) { return ((XmlTag)element).getValue().getTrimmedText(); diff --git a/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java b/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java index 43847fe79174..59be5099afc1 100644 --- a/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java +++ b/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java @@ -86,8 +86,7 @@ public class XmlSplitTagAction implements IntentionAction { final PsiElement psiElement = file.findElementAt(offset); if (psiElement != null) { final PsiElement containingTag = psiElement.getParent().getParent(); - if (containingTag instanceof XmlTag) { - XmlTag tag = (XmlTag)containingTag; + if (containingTag instanceof XmlTag tag) { TextRange tagRange = tag.getTextRange(); String name = tag.getName(); diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java index 49fdd9aeb7d7..754b2515d5c5 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java @@ -91,8 +91,7 @@ public class GenerateInstanceDocumentFromSchemaDialog extends DialogWrapper { } }); } - else if (component instanceof JComboBox) { - JComboBox jComboBox = ((JComboBox)component); + else if (component instanceof JComboBox jComboBox) { jComboBox.addActionListener(new ActionListener() { @Override @@ -180,8 +179,7 @@ public class GenerateInstanceDocumentFromSchemaDialog extends DialogWrapper { if (psifile instanceof XmlFile) { xmlFile = (XmlFile)psifile; } - else if (psifile.getViewProvider() instanceof TemplateLanguageFileViewProvider) { - TemplateLanguageFileViewProvider viewProvider = (TemplateLanguageFileViewProvider)psifile.getViewProvider(); + else if (psifile.getViewProvider() instanceof TemplateLanguageFileViewProvider viewProvider) { if (viewProvider.getPsi(viewProvider.getTemplateDataLanguage()) instanceof XmlFile) { xmlFile = (XmlFile)viewProvider.getPsi(viewProvider.getTemplateDataLanguage()); } diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java index bb2a266ab4c2..83af03bcea00 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java @@ -131,8 +131,7 @@ public class GenerateSchemaFromInstanceDocumentDialog extends DialogWrapper { validateData(); } }); - } else if (component instanceof JComboBox) { - JComboBox jComboBox = ((JComboBox) component); + } else if (component instanceof JComboBox jComboBox) { jComboBox.addActionListener(new ActionListener() { @Override diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/Xsd2InstanceUtils.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/Xsd2InstanceUtils.java index f148b940fdc0..048bcb3decee 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/Xsd2InstanceUtils.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/Xsd2InstanceUtils.java @@ -125,8 +125,7 @@ public final class Xsd2InstanceUtils { public static XmlElementDescriptor getDescriptor(XmlTag tag, String elementName) { final PsiMetaData metaData = tag.getMetaData(); - if (metaData instanceof XmlNSDescriptorImpl) { - final XmlNSDescriptorImpl nsDescriptor = (XmlNSDescriptorImpl) metaData; + if (metaData instanceof XmlNSDescriptorImpl nsDescriptor) { return nsDescriptor.getElementDescriptor(elementName, nsDescriptor.getDefaultNamespace()); } @@ -135,8 +134,7 @@ public final class Xsd2InstanceUtils { public static List addVariantsFromRootTag(XmlTag rootTag) { PsiMetaData metaData = rootTag.getMetaData(); - if (metaData instanceof XmlNSDescriptorImpl) { - XmlNSDescriptorImpl nsDescriptor = (XmlNSDescriptorImpl) metaData; + if (metaData instanceof XmlNSDescriptorImpl nsDescriptor) { List elementDescriptors = new ArrayList<>(); XmlElementDescriptor[] rootElementsDescriptors = nsDescriptor.getRootElementsDescriptors(PsiTreeUtil.getParentOfType(rootTag, XmlDocument.class)); diff --git a/xml/impl/src/com/intellij/xml/config/ConfigFilesTreeBuilder.java b/xml/impl/src/com/intellij/xml/config/ConfigFilesTreeBuilder.java index bf24e4479d78..f01f20de60d3 100644 --- a/xml/impl/src/com/intellij/xml/config/ConfigFilesTreeBuilder.java +++ b/xml/impl/src/com/intellij/xml/config/ConfigFilesTreeBuilder.java @@ -148,21 +148,18 @@ public class ConfigFilesTreeBuilder { public static void renderNode(Object value, boolean expanded, ColoredTreeCellRenderer renderer) { if (!(value instanceof DefaultMutableTreeNode)) return; final Object object = ((DefaultMutableTreeNode)value).getUserObject(); - if (object instanceof FileType) { - final FileType fileType = (FileType)object; + if (object instanceof FileType fileType) { final Icon icon = fileType.getIcon(); renderer.setIcon(icon); renderer.append(getFileTypeNodeName(fileType), SimpleTextAttributes.REGULAR_ATTRIBUTES); } - else if (object instanceof Module) { - final Module module = (Module)object; + else if (object instanceof Module module) { final Icon icon = ModuleType.get(module).getIcon(); renderer.setIcon(icon); final String moduleName = module.getName(); renderer.append(moduleName, SimpleTextAttributes.REGULAR_ATTRIBUTES); } - else if (object instanceof PsiFile) { - final PsiFile psiFile = (PsiFile)object; + else if (object instanceof PsiFile psiFile) { final Icon icon = psiFile.getIcon(0); renderer.setIcon(icon); final String fileName = psiFile.getName(); @@ -172,8 +169,7 @@ public class ConfigFilesTreeBuilder { renderPath(renderer, virtualFile); } } - else if (object instanceof VirtualFile) { - VirtualFile file = (VirtualFile)object; + else if (object instanceof VirtualFile file) { renderer.setIcon(VirtualFilePresentation.getIcon(file)); renderer.append(file.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES); renderPath(renderer, file); diff --git a/xml/impl/src/com/intellij/xml/impl/schema/SchemaDefinitionsSearch.java b/xml/impl/src/com/intellij/xml/impl/schema/SchemaDefinitionsSearch.java index c4feb3bc9617..a63808a8aaf8 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/SchemaDefinitionsSearch.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/SchemaDefinitionsSearch.java @@ -27,8 +27,7 @@ import java.util.function.BiFunction; public class SchemaDefinitionsSearch implements QueryExecutor { @Override public boolean execute(@NotNull final PsiElement queryParameters, @NotNull final Processor consumer) { - if (queryParameters instanceof XmlTag) { - final XmlTag xml = (XmlTag)queryParameters; + if (queryParameters instanceof XmlTag xml) { if (ReadAction.compute(() -> isTypeElement(xml))) { final Collection infos = ReadAction.compute(() -> gatherInheritors(xml)); diff --git a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java index 27f813b9a5b8..acc61c4a344c 100644 --- a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java +++ b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java @@ -34,10 +34,9 @@ public class XmlTagRenameHandler implements RenameHandler, TitledHandler { final PsiElement element = getElement(dataContext); if (element == null || PsiElementRenameHandler.isVetoed(element)) return false; PsiElement parent = element.getParent(); - if (!(parent instanceof XmlTag)) { + if (!(parent instanceof XmlTag tag)) { return false; } - XmlTag tag = (XmlTag)parent; String prefix = tag.getNamespacePrefix(); if (StringUtil.isNotEmpty(prefix)) { Editor editor = getEditor(dataContext); diff --git a/xml/impl/src/com/intellij/xml/template/formatter/AbstractXmlTemplateFormattingModelBuilder.java b/xml/impl/src/com/intellij/xml/template/formatter/AbstractXmlTemplateFormattingModelBuilder.java index 5b3266331dc4..337947a71237 100644 --- a/xml/impl/src/com/intellij/xml/template/formatter/AbstractXmlTemplateFormattingModelBuilder.java +++ b/xml/impl/src/com/intellij/xml/template/formatter/AbstractXmlTemplateFormattingModelBuilder.java @@ -48,8 +48,7 @@ public abstract class AbstractXmlTemplateFormattingModelBuilder extends SimpleTe final PsiFile psiFile = formattingContext.getContainingFile(); CodeStyleSettings settings = formattingContext.getCodeStyleSettings(); PsiElement element = formattingContext.getPsiElement(); - if (psiFile.getViewProvider() instanceof TemplateLanguageFileViewProvider) { - final TemplateLanguageFileViewProvider viewProvider = (TemplateLanguageFileViewProvider)psiFile.getViewProvider(); + if (psiFile.getViewProvider() instanceof TemplateLanguageFileViewProvider viewProvider) { if (isTemplateFile(psiFile)) { Language templateDataLanguage = viewProvider.getTemplateDataLanguage(); if (templateDataLanguage != psiFile.getLanguage()) { @@ -274,8 +273,7 @@ public abstract class AbstractXmlTemplateFormattingModelBuilder extends SimpleTe rangeStart = Math.min(currRange.getStartOffset(), rangeStart); rangeEnd = Math.max(currRange.getEndOffset(), rangeEnd); boolean isMarkupBlock = true; - if (block instanceof AnotherLanguageBlockWrapper) { - AnotherLanguageBlockWrapper wrapper = (AnotherLanguageBlockWrapper)block; + if (block instanceof AnotherLanguageBlockWrapper wrapper) { PsiElement otherLangElement = wrapper.getNode().getPsi(); if (isOuterLanguageElement(otherLangElement)) { isMarkupBlock = false; diff --git a/xml/impl/src/com/intellij/xml/template/formatter/TemplateFormatUtil.java b/xml/impl/src/com/intellij/xml/template/formatter/TemplateFormatUtil.java index 84b78f430fe8..26e05e019489 100644 --- a/xml/impl/src/com/intellij/xml/template/formatter/TemplateFormatUtil.java +++ b/xml/impl/src/com/intellij/xml/template/formatter/TemplateFormatUtil.java @@ -40,8 +40,7 @@ public final class TemplateFormatUtil { @NotNull static List findAllMarkupLanguageElementsInside(PsiElement outerLangElement) { PsiFile file = outerLangElement.getContainingFile(); - if (file != null && file.getViewProvider() instanceof TemplateLanguageFileViewProvider) { - TemplateLanguageFileViewProvider viewProvider = (TemplateLanguageFileViewProvider)file.getViewProvider(); + if (file != null && file.getViewProvider() instanceof TemplateLanguageFileViewProvider viewProvider) { return findAllElementsInside(outerLangElement.getTextRange(), viewProvider, false); } return EMPTY_PSI_ELEMENT_LIST; diff --git a/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java b/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java index ac8b69f801ff..cc26db587652 100644 --- a/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java +++ b/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java @@ -131,12 +131,10 @@ public class ColorSampleLookupValue { if (this == o) { return true; } - if (!(o instanceof ColorSampleLookupValue)) { + if (!(o instanceof ColorSampleLookupValue value)) { return false; } - ColorSampleLookupValue value = (ColorSampleLookupValue)o; - if (myIsStandard != value.myIsStandard) { return false; } diff --git a/xml/impl/src/com/intellij/xml/util/HtmlLinkUtil.java b/xml/impl/src/com/intellij/xml/util/HtmlLinkUtil.java index 3c8472999f2b..e1044d489b68 100644 --- a/xml/impl/src/com/intellij/xml/util/HtmlLinkUtil.java +++ b/xml/impl/src/com/intellij/xml/util/HtmlLinkUtil.java @@ -53,8 +53,7 @@ public final class HtmlLinkUtil { final XmlTag rootTag = injectedDocument.getRootTag(); if (rootTag != null) { for (PsiElement element1 = rootTag; element1 != null; element1 = element1.getNextSibling()) { - if (element1 instanceof XmlTag) { - final XmlTag tag = (XmlTag)element1; + if (element1 instanceof XmlTag tag) { String tagName = tag.getLocalName(); if (element1 instanceof HtmlTag || tag.getNamespacePrefix().length() > 0) tagName = StringUtil.toLowerCase(tagName); if (LINK.equalsIgnoreCase(tagName)) { diff --git a/xml/impl/src/com/intellij/xml/util/XmlEnumeratedValueReferenceProvider.java b/xml/impl/src/com/intellij/xml/util/XmlEnumeratedValueReferenceProvider.java index 9d9f30e1884e..f7c5e4d38f55 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlEnumeratedValueReferenceProvider.java +++ b/xml/impl/src/com/intellij/xml/util/XmlEnumeratedValueReferenceProvider.java @@ -61,8 +61,7 @@ public class XmlEnumeratedValueReferenceProvider extends P } @SuppressWarnings("unchecked") final Object descriptor = getDescriptor((T)element); - if (descriptor instanceof XmlEnumerationDescriptor) { - XmlEnumerationDescriptor enumerationDescriptor = (XmlEnumerationDescriptor)descriptor; + if (descriptor instanceof XmlEnumerationDescriptor enumerationDescriptor) { if (enumerationDescriptor.isFixed() || enumerationDescriptor.isEnumerated((XmlElement)element)) { //noinspection unchecked diff --git a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java index 0d16abb3482b..5692485269e5 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java @@ -190,8 +190,7 @@ public class HtmlDocumentationProvider implements DocumentationProvider { return documentation.getDocumentation(true, null); } - if (element instanceof XmlEntityDecl) { - final XmlEntityDecl entityDecl = (XmlEntityDecl)element; + if (element instanceof XmlEntityDecl entityDecl) { return new XmlDocumentationProvider().findDocRightAfterElement(element, entityDecl.getName()); } return null; diff --git a/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java b/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java index 38718347f798..32723bdf3693 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java @@ -58,8 +58,7 @@ public class XmlDocumentationProvider implements DocumentationProvider { @Override public List getUrlFor(PsiElement element, PsiElement originalElement) { - if (element instanceof XmlTag) { - XmlTag tag = (XmlTag)element; + if (element instanceof XmlTag tag) { MyPsiElementProcessor processor = new MyPsiElementProcessor(); XmlUtil.processXmlElements(tag,processor, true); @@ -86,14 +85,12 @@ public class XmlDocumentationProvider implements DocumentationProvider { return formatDocFromComment(curElement, ((XmlElementDecl)element).getNameElement().getText()); } } - else if (element instanceof XmlTag) { - XmlTag tag = (XmlTag)element; + else if (element instanceof XmlTag tag) { MyPsiElementProcessor processor = new MyPsiElementProcessor(); String name = tag.getAttributeValue(NAME_ATTR_NAME); String typeName = null; - if (originalElement != null && originalElement.getParent() instanceof XmlAttributeValue) { - XmlAttributeValue value = (XmlAttributeValue)originalElement.getParent(); + if (originalElement != null && originalElement.getParent() instanceof XmlAttributeValue value) { String toSearch = value.getValue(); XmlTag enumerationTag; @@ -157,8 +154,7 @@ public class XmlDocumentationProvider implements DocumentationProvider { } return findDocRightAfterElement(parent, referenceName); - } else if (element instanceof XmlEntityDecl) { - final XmlEntityDecl entityDecl = (XmlEntityDecl)element; + } else if (element instanceof XmlEntityDecl entityDecl) { return findDocRightAfterElement(element, entityDecl.getName()); } @@ -469,10 +465,9 @@ public class XmlDocumentationProvider implements DocumentationProvider { @Override public boolean execute(@NotNull PsiElement element) { - if (element instanceof XmlTag && + if (element instanceof XmlTag tag && ((XmlTag)element).getLocalName().equals(DOCUMENTATION_ELEMENT_LOCAL_NAME) ) { - final XmlTag tag = ((XmlTag)element); result = tag.getValue().getText().trim(); boolean withCData = false; diff --git a/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java b/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java index 5bf96f992ee4..5a15c0c0e3e1 100644 --- a/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java +++ b/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java @@ -35,8 +35,7 @@ public class RelaxedHtmlFromRngElementDescriptor extends DelegatingRelaxedHtmlEl @Override public int compareTo(@NotNull Object o) { - if (!(o instanceof RelaxedHtmlFromRngElementDescriptor)) return 1; - final RelaxedHtmlFromRngElementDescriptor other = (RelaxedHtmlFromRngElementDescriptor)o; + if (!(o instanceof RelaxedHtmlFromRngElementDescriptor other)) return 1; if (other.isHtml && !isHtml) return -1; if (!other.isHtml && isHtml) return 1; return 0; diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxNgMetaDataContributor.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxNgMetaDataContributor.java index ed7590fdc2b8..6d8065890f85 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxNgMetaDataContributor.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxNgMetaDataContributor.java @@ -60,8 +60,7 @@ public final class RelaxNgMetaDataContributor implements MetaDataContributor { registrar.registerMetaData(new ElementFilter() { @Override public boolean isAcceptable(Object element, PsiElement context) { - if (element instanceof XmlTag) { - final XmlTag tag = (XmlTag)element; + if (element instanceof XmlTag tag) { final DomElement domElement = DomManager.getDomManager(tag.getProject()).getDomElement(tag); return domElement instanceof RngDefine; } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/RngDocumentationProvider.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/RngDocumentationProvider.java index d1184ce221ae..6217f0c27b59 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/RngDocumentationProvider.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/RngDocumentationProvider.java @@ -51,12 +51,10 @@ final class RngDocumentationProvider implements DocumentationProvider { LOG.warn("Invalid context element passed to generateDoc()", new Throwable("")); return null; } - if (c instanceof XmlTag) { - final XmlTag xmlElement = (XmlTag)c; + if (c instanceof XmlTag xmlElement) { final XmlElementDescriptor descriptor = xmlElement.getDescriptor(); - if (descriptor instanceof CompositeDescriptor) { + if (descriptor instanceof CompositeDescriptor d) { final StringBuilder sb = new StringBuilder(); - final CompositeDescriptor d = (CompositeDescriptor)descriptor; final DElementPattern[] patterns = d.getElementPatterns(); final Set elements = new ReferenceOpenHashSet<>(); for (DElementPattern pattern : patterns) { @@ -75,8 +73,7 @@ final class RngDocumentationProvider implements DocumentationProvider { return makeDocumentation(getDocumentationFromTag((XmlTag)declaration, xmlElement.getLocalName(), "Element")); } } - } else if (c instanceof XmlAttribute) { - final XmlAttribute attribute = (XmlAttribute)c; + } else if (c instanceof XmlAttribute attribute) { final XmlAttributeDescriptor descriptor = attribute.getDescriptor(); if (descriptor instanceof RngXmlAttributeDescriptor) { final StringBuilder sb = new StringBuilder(); diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/ReferenceAnnotator.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/ReferenceAnnotator.java index fd38eda5b8b7..23975f6f776d 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/ReferenceAnnotator.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/ReferenceAnnotator.java @@ -73,8 +73,7 @@ public class ReferenceAnnotator extends RncElementVisitor implements Annotator { for (PsiReference reference : references) { if (!reference.isSoft()) { if (reference.resolve() == null) { - if (reference instanceof PsiPolyVariantReference) { - final PsiPolyVariantReference pvr = (PsiPolyVariantReference)reference; + if (reference instanceof PsiPolyVariantReference pvr) { if (pvr.multiResolve(false).length == 0) { addError(reference); } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/IdeaDriver.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/IdeaDriver.java index 337fe3f52898..a4fd01243729 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/IdeaDriver.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/IdeaDriver.java @@ -97,8 +97,7 @@ public class IdeaDriver { final String input = inputFile.getPath(); final String uri = UriOrFile.toUri(input); try { - if (inFormat instanceof MultiInputFormat) { - final MultiInputFormat format = (MultiInputFormat)inFormat; + if (inFormat instanceof MultiInputFormat format) { final String[] uris = new String[inputFiles.length]; for (int i = 0; i < inputFiles.length; i++) { uris[i] = UriOrFile.toUri(inputFiles[i].getPath()); diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDeprecatedElementInspection.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDeprecatedElementInspection.java index ee08c9b6fa42..ce0cbd2fa54b 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDeprecatedElementInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDeprecatedElementInspection.java @@ -72,10 +72,9 @@ public class XmlDeprecatedElementInspection extends XmlSuppressableInspectionToo } PsiElement declaration = metaData.getDeclaration(); - if (!(declaration instanceof XmlTag)) return false; + if (!(declaration instanceof XmlTag tag)) return false; XmlComment comment = XmlUtil.findPreviousComment(declaration); if (comment != null && pattern.matcher(comment.getCommentText().trim()).matches()) return true; - XmlTag tag = (XmlTag)declaration; return checkTag(ArrayUtil.getFirstElement(tag.findSubTags("annotation", tag.getNamespace())), pattern); } diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java index 0402c76a91b7..ab2566f7b159 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java @@ -203,8 +203,7 @@ public class XmlHighlightVisitor extends XmlElementVisitor implements HighlightV XmlElementDescriptor elementDescriptor; final PsiElement parent = tag.getParent(); - if (parent instanceof XmlTag) { - XmlTag parentTag = (XmlTag)parent; + if (parent instanceof XmlTag parentTag) { elementDescriptor = XmlUtil.getDescriptorFromContext(tag); @@ -400,12 +399,10 @@ public class XmlHighlightVisitor extends XmlElementVisitor implements HighlightV checkReferences(value); final PsiElement parent = value.getParent(); - if (!(parent instanceof XmlAttribute)) { + if (!(parent instanceof XmlAttribute attribute)) { return; } - XmlAttribute attribute = (XmlAttribute)parent; - XmlTag tag = attribute.getParent(); if (tag == null) { diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNamespaceAnnotator.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNamespaceAnnotator.java index 5b84dbf24fee..549ccae5d1a9 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNamespaceAnnotator.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNamespaceAnnotator.java @@ -17,8 +17,7 @@ import org.jetbrains.annotations.NotNull; public class XmlNamespaceAnnotator implements Annotator { @Override public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { - if (element instanceof XmlTag) { - XmlTag tag = (XmlTag)element; + if (element instanceof XmlTag tag) { String namespace = tag.getNamespace(); for (XmlNSColorProvider provider : XmlNSColorProvider.EP_NAME.getExtensionList()) { TextAttributesKey key = provider.getKeyForNamespace(namespace, tag); diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java index bd5b260172ad..a4d08bf480c9 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java @@ -50,8 +50,7 @@ public class XmlUnboundNsPrefixInspection extends XmlSuppressableInspectionTool if (element instanceof XmlToken && ((XmlToken)element).getTokenType() == XmlTokenType.XML_START_TAG_START) { PsiElement parent = element.getParent(); - if (parent instanceof XmlTag && !(token.getNextSibling() instanceof OuterLanguageElement)) { - XmlTag tag = (XmlTag)parent; + if (parent instanceof XmlTag tag && !(token.getNextSibling() instanceof OuterLanguageElement)) { checkUnboundNamespacePrefix(tag, tag, tag.getNamespacePrefix(), token, holder, isOnTheFly); } } @@ -111,8 +110,7 @@ public class XmlUnboundNsPrefixInspection extends XmlSuppressableInspectionTool return; } PsiFile psiFile = context.getContainingFile(); - if (!(psiFile instanceof XmlFile)) return; - final XmlFile containingFile = (XmlFile)psiFile; + if (!(psiFile instanceof XmlFile containingFile)) return; if (!HighlightingLevelManager.getInstance(containingFile.getProject()).shouldInspect(containingFile)) return; final XmlExtension extension = XmlExtension.getExtension(containingFile); @@ -144,10 +142,9 @@ public class XmlUnboundNsPrefixInspection extends XmlSuppressableInspectionTool isOnTheFly ? XmlQuickFixFactory.getInstance().createNSDeclarationIntentionFix(context, namespacePrefix, token) : null; reportTagProblem(element, localizedMessage, range, highlightType, fix, holder); } - else if (element instanceof XmlAttribute) { + else if (element instanceof XmlAttribute attribute) { LocalQuickFix fix = isOnTheFly ? XmlQuickFixFactory.getInstance().createNSDeclarationIntentionFix(element, namespacePrefix, token) : null; - XmlAttribute attribute = (XmlAttribute)element; holder.registerProblem(attribute.getNameElement(), localizedMessage, highlightType, range, fix); } else { diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlLocalInspectionTool.java b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlLocalInspectionTool.java index 96e080255909..4cdb551a882d 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlLocalInspectionTool.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlLocalInspectionTool.java @@ -64,8 +64,7 @@ public abstract class HtmlLocalInspectionTool extends XmlSuppressableInspectionT if (element instanceof XmlToken && ((XmlToken)element).getTokenType() == XmlTokenType.XML_START_TAG_START) { PsiElement parent = element.getParent(); - if (parent instanceof XmlTag && !(token.getNextSibling() instanceof OuterLanguageElement)) { - XmlTag tag = (XmlTag)parent; + if (parent instanceof XmlTag tag && !(token.getNextSibling() instanceof OuterLanguageElement)) { checkTag(tag, holder, isOnTheFly); } } diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongClosingTagNameInspection.java b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongClosingTagNameInspection.java index 2a2aa9ea0f6f..446ba3487ff1 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongClosingTagNameInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongClosingTagNameInspection.java @@ -30,8 +30,7 @@ public class XmlWrongClosingTagNameInspection implements Annotator { public void annotate(@NotNull PsiElement psiElement, @NotNull AnnotationHolder holder) { if (psiElement instanceof XmlToken) { PsiElement parent = psiElement.getParent(); - if (parent instanceof XmlTag) { - XmlTag tag = (XmlTag)parent; + if (parent instanceof XmlTag tag) { XmlToken start = XmlTagUtil.getStartTagNameElement(tag); XmlToken endTagName = XmlTagUtil.getEndTagNameElement(tag); if (start == psiElement) { diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongRootElementInspection.java b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongRootElementInspection.java index 28fcc0f7d8cf..e6a9baf051ad 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongRootElementInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/XmlWrongRootElementInspection.java @@ -37,12 +37,10 @@ public final class XmlWrongRootElementInspection extends HtmlLocalInspectionTool protected void checkTag(@NotNull final XmlTag tag, @NotNull final ProblemsHolder holder, final boolean isOnTheFly) { if (!(tag.getParent() instanceof XmlTag)) { final PsiFile psiFile = tag.getContainingFile(); - if (!(psiFile instanceof XmlFile)) { + if (!(psiFile instanceof XmlFile xmlFile)) { return; } - XmlFile xmlFile = (XmlFile) psiFile; - final XmlDocument document = xmlFile.getDocument(); if (document == null) { return; diff --git a/xml/xml-analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdRefReference.java b/xml/xml-analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdRefReference.java index ca3138d1c4e1..88c4280b7796 100644 --- a/xml/xml-analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdRefReference.java +++ b/xml/xml-analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdRefReference.java @@ -36,8 +36,7 @@ public class IdRefReference extends BasicAttributeValueReference { @Nullable protected PsiElement getIdValueElement(PsiElement element) { - if (element instanceof XmlTag) { - final XmlTag tag = (XmlTag)element; + if (element instanceof XmlTag tag) { XmlAttribute attribute = tag.getAttribute(IdReferenceProvider.ID_ATTR_NAME, null); if (!myIdAttrsOnly) { if (attribute == null) { @@ -56,8 +55,7 @@ public class IdRefReference extends BasicAttributeValueReference { @Nullable protected String getIdValue(final PsiElement element) { - if (element instanceof XmlTag) { - final XmlTag tag = (XmlTag)element; + if (element instanceof XmlTag tag) { String s = tag.getAttributeValue(IdReferenceProvider.ID_ATTR_NAME); if (!myIdAttrsOnly) { if (s == null) s = tag.getAttributeValue(IdReferenceProvider.NAME_ATTR_NAME); diff --git a/xml/xml-analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdReferenceProvider.java b/xml/xml-analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdReferenceProvider.java index 298df9174d13..0b38f6909903 100644 --- a/xml/xml-analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdReferenceProvider.java +++ b/xml/xml-analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/IdReferenceProvider.java @@ -47,8 +47,7 @@ public final class IdReferenceProvider extends PsiReferenceProvider { @Override public boolean isAcceptable(Object element, PsiElement context) { final PsiElement grandParent = ((PsiElement)element).getParent().getParent(); - if (grandParent instanceof XmlTag) { - final XmlTag tag = (XmlTag)grandParent; + if (grandParent instanceof XmlTag tag) { if (!tag.getNamespacePrefix().isEmpty()) { return true; diff --git a/xml/xml-analysis-impl/src/com/intellij/xml/util/XmlRefCountHolder.java b/xml/xml-analysis-impl/src/com/intellij/xml/util/XmlRefCountHolder.java index c42328bc2beb..d3de710f87a6 100644 --- a/xml/xml-analysis-impl/src/com/intellij/xml/util/XmlRefCountHolder.java +++ b/xml/xml-analysis-impl/src/com/intellij/xml/util/XmlRefCountHolder.java @@ -213,9 +213,7 @@ public final class XmlRefCountHolder { @Override public void visitXmlAttributeValue(final @NotNull XmlAttributeValue value) { final PsiElement element = value.getParent(); - if (!(element instanceof XmlAttribute)) return; - - final XmlAttribute attribute = (XmlAttribute)element; + if (!(element instanceof XmlAttribute attribute)) return; final XmlTag tag = attribute.getParent(); if (tag == null) return; diff --git a/xml/xml-psi-api/src/com/intellij/psi/filters/position/NamespaceFilter.java b/xml/xml-psi-api/src/com/intellij/psi/filters/position/NamespaceFilter.java index b4a39cd24b44..f74317cb23b7 100644 --- a/xml/xml-psi-api/src/com/intellij/psi/filters/position/NamespaceFilter.java +++ b/xml/xml-psi-api/src/com/intellij/psi/filters/position/NamespaceFilter.java @@ -36,8 +36,7 @@ public class NamespaceFilter implements ElementFilter { @Override public boolean isAcceptable(Object element, PsiElement context){ - if(element instanceof XmlTag){ - final XmlTag psiElement = (XmlTag)element; + if(element instanceof XmlTag psiElement){ if (!psiElement.isValid()) return false; final String ns = psiElement.getNamespace(); diff --git a/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java b/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java index a0d82dfd0256..353338c338b6 100644 --- a/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java +++ b/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java @@ -40,8 +40,7 @@ public abstract class XmlCodeFoldingBuilder extends CustomFoldingBuilder impleme boolean quick) { XmlDocument xmlDocument; - if (psiElement instanceof XmlFile) { - XmlFile file = (XmlFile)psiElement; + if (psiElement instanceof XmlFile file) { xmlDocument = file.getDocument(); } else if (psiElement instanceof XmlDocument) { @@ -139,8 +138,7 @@ public abstract class XmlCodeFoldingBuilder extends CustomFoldingBuilder impleme return new UnfairTextRange(nameEnd, end); } - if (element instanceof XmlComment) { - final XmlComment xmlComment = (XmlComment)element; + if (element instanceof XmlComment xmlComment) { final TextRange textRange = element.getTextRange(); int commentStartOffset = getCommentStartOffset(xmlComment); int commentEndOffset = getCommentStartEnd(xmlComment); @@ -150,8 +148,7 @@ public abstract class XmlCodeFoldingBuilder extends CustomFoldingBuilder impleme } return null; } - if (element instanceof XmlConditionalSection) { - final XmlConditionalSection conditionalSection = (XmlConditionalSection)element; + if (element instanceof XmlConditionalSection conditionalSection) { final TextRange textRange = element.getTextRange(); final PsiElement bodyStart = conditionalSection.getBodyStart(); int startOffset = bodyStart != null ? bodyStart.getStartOffsetInParent() : MIN_TEXT_RANGE_LENGTH; diff --git a/xml/xml-psi-impl/src/com/intellij/lang/xml/XmlFindUsagesProvider.java b/xml/xml-psi-impl/src/com/intellij/lang/xml/XmlFindUsagesProvider.java index f01ba463ab6d..0dc0e2397847 100644 --- a/xml/xml-psi-impl/src/com/intellij/lang/xml/XmlFindUsagesProvider.java +++ b/xml/xml-psi-impl/src/com/intellij/lang/xml/XmlFindUsagesProvider.java @@ -79,8 +79,7 @@ public class XmlFindUsagesProvider implements FindUsagesProvider { @Override @NotNull public String getNodeText(@NotNull PsiElement element, boolean useFullName) { - if (element instanceof XmlTag) { - final XmlTag xmlTag = (XmlTag)element; + if (element instanceof XmlTag xmlTag) { final PsiMetaData metaData = xmlTag.getMetaData(); final String name = metaData != null ? DescriptiveNameUtil.getMetaDataName(metaData) : xmlTag.getName(); diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java index df3eb67f2de4..26716a897558 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java @@ -51,8 +51,7 @@ public final class ScriptSupportUtil { PsiElementProcessor psiElementProcessor = new PsiElementProcessor() { @Override public boolean execute(@NotNull final PsiElement element1) { - if (element1 instanceof XmlTag) { - final XmlTag tag = (XmlTag)element1; + if (element1 instanceof XmlTag tag) { if (HtmlUtil.SCRIPT_TAG_NAME.equalsIgnoreCase(tag.getName())) { final XmlElementDescriptor descriptor = tag.getDescriptor(); diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdResolveUtil.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdResolveUtil.java index b4d738084942..035b82174544 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdResolveUtil.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdResolveUtil.java @@ -19,13 +19,11 @@ public final class DtdResolveUtil { final XmlElement parentThatProvidesMetaData = PsiTreeUtil .getParentOfType(CompletionUtilCoreImpl.getOriginalElement(element), XmlDocument.class, XmlMarkupDecl.class); - if (parentThatProvidesMetaData instanceof XmlDocument) { - final XmlDocument document = (XmlDocument)parentThatProvidesMetaData; + if (parentThatProvidesMetaData instanceof XmlDocument document) { XmlNSDescriptor rootTagNSDescriptor = document.getRootTagNSDescriptor(); if (rootTagNSDescriptor == null) rootTagNSDescriptor = (XmlNSDescriptor)document.getMetaData(); return rootTagNSDescriptor; - } else if (parentThatProvidesMetaData instanceof XmlMarkupDecl) { - final XmlMarkupDecl markupDecl = (XmlMarkupDecl)parentThatProvidesMetaData; + } else if (parentThatProvidesMetaData instanceof XmlMarkupDecl markupDecl) { final PsiMetaData psiMetaData = markupDecl.getMetaData(); if (psiMetaData instanceof XmlNSDescriptor) { diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java index 08dbb29c2493..8d3249c3ec47 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java @@ -154,8 +154,7 @@ public class SchemaReferencesProvider extends PsiReferenceProvider { @Nullable private static PsiReference createSchemaPrefixReference(final PsiElement element) { - if (element instanceof XmlAttributeValue) { - final XmlAttributeValue attributeValue = (XmlAttributeValue)element; + if (element instanceof XmlAttributeValue attributeValue) { final String prefix = XmlUtil.findPrefixByQualifiedName(attributeValue.getValue()); if (!prefix.isEmpty()) { return new SchemaPrefixReference(attributeValue, TextRange.from(1, prefix.length()), prefix, null); diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java index d3c59915444e..f99d6b46d0fd 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java @@ -41,8 +41,7 @@ public class URIReferenceProvider extends PsiReferenceProvider { @Override public boolean isAcceptable(Object element, PsiElement context) { final PsiElement parent = context.getParent(); - if (parent instanceof XmlAttribute) { - final XmlAttribute attribute = ((XmlAttribute)parent); + if (parent instanceof XmlAttribute attribute) { return attribute.isNamespaceDeclaration(); } return false; diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/SchemaPrefixReference.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/SchemaPrefixReference.java index f73e3019c475..5d17ad689fb0 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/SchemaPrefixReference.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/SchemaPrefixReference.java @@ -83,14 +83,12 @@ public class SchemaPrefixReference extends PsiReferenceBase implemen @Override public PsiElement handleElementRename(@NotNull String name) throws IncorrectOperationException { - if (myElement instanceof XmlAttribute) { - final XmlAttribute attr = (XmlAttribute)myElement; + if (myElement instanceof XmlAttribute attr) { return ("xmlns".equals(attr.getNamespacePrefix())) ? attr.setName(attr.getNamespacePrefix() + ":" + name) : attr.setName(name + ":" + attr.getLocalName()); } - else if (myElement instanceof XmlTag) { - final XmlTag tag = (XmlTag)myElement; + else if (myElement instanceof XmlTag tag) { return tag.setName(name + ":" + tag.getLocalName()); } return super.handleElementRename(name); diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java index d27b6ee67b8b..8c554c4ca622 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java @@ -151,8 +151,7 @@ public class TagNameReference implements PsiReference { public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException { PsiMetaData metaData = null; - if (element instanceof PsiMetaOwner){ - final PsiMetaOwner owner = (PsiMetaOwner)element; + if (element instanceof PsiMetaOwner owner){ metaData = owner.getMetaData(); if (metaData instanceof XmlElementDescriptor){ diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameVariantCollector.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameVariantCollector.java index a12ab42c26bb..2eb6d1dc5dd5 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameVariantCollector.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameVariantCollector.java @@ -35,8 +35,7 @@ public final class TagNameVariantCollector { PsiElement context = element.getParent(); PsiElement curElement = element.getParent(); - while(curElement instanceof XmlTag){ - final XmlTag declarationTag = (XmlTag)curElement; + while(curElement instanceof XmlTag declarationTag){ final String namespace = declarationTag.getNamespace(); if(!descriptorsMap.containsKey(namespace)) { diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeReference.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeReference.java index c25f1e955f9b..9fbcca3018f7 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeReference.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeReference.java @@ -66,8 +66,7 @@ public class XmlAttributeReference implements PsiPolyVariantReference { @Override public PsiElement handleElementRename(@NotNull String newElementName) throws IncorrectOperationException { String newName = newElementName; - if (getDescriptor() instanceof XmlAttributeDescriptorEx) { - final XmlAttributeDescriptorEx xmlAttributeDescriptorEx = (XmlAttributeDescriptorEx)getDescriptor(); + if (getDescriptor() instanceof XmlAttributeDescriptorEx xmlAttributeDescriptorEx) { final String s = xmlAttributeDescriptorEx.handleTargetRename(newElementName); if (s != null) { final String prefix = myAttribute.getNamespacePrefix(); @@ -79,8 +78,7 @@ public class XmlAttributeReference implements PsiPolyVariantReference { @Override public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException { - if (element instanceof PsiMetaOwner) { - final PsiMetaOwner owner = (PsiMetaOwner)element; + if (element instanceof PsiMetaOwner owner) { if (owner.getMetaData() instanceof XmlElementDescriptor) { myAttribute.setName(owner.getMetaData().getName()); } diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlConditionalSectionImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlConditionalSectionImpl.java index 976eb4fb8f0f..531f7c1c581f 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlConditionalSectionImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlConditionalSectionImpl.java @@ -55,9 +55,8 @@ public class XmlConditionalSectionImpl extends XmlElementImpl implements XmlCond PsiElement psiElement = targetFile != null ? XmlEntityCache.getCachedEntity(targetFile, name): null; - if (psiElement instanceof XmlEntityDecl) { - final XmlEntityDecl decl = (XmlEntityDecl)psiElement; - + if (psiElement instanceof XmlEntityDecl decl) { + if(decl.isInternalReference()) { for (ASTNode e = decl.getNode().getFirstChildNode(); e != null; e = e.getTreeNext()) { if (e.getElementType() == XmlElementType.XML_ATTRIBUTE_VALUE) { diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityDeclImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityDeclImpl.java index 10e8cb30e8b0..44fe3cdfe172 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityDeclImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityDeclImpl.java @@ -25,8 +25,7 @@ public class XmlEntityDeclImpl extends XmlElementImpl implements XmlEntityDecl, @Override public PsiElement getNameElement() { for (ASTNode e = getFirstChildNode(); e != null; e = e.getTreeNext()) { - if (e instanceof XmlTokenImpl) { - XmlTokenImpl xmlToken = (XmlTokenImpl)e; + if (e instanceof XmlTokenImpl xmlToken) { if (xmlToken.getTokenType() == XmlTokenType.XML_NAME) return xmlToken; } @@ -80,12 +79,10 @@ public class XmlEntityDeclImpl extends XmlElementImpl implements XmlEntityDecl, PsiElement dep = XmlElement.DEPENDING_ELEMENT.get(getParent()); PsiElement dependsOnElement = getValueElement(dep instanceof PsiFile ? (PsiFile)dep : baseFile); String value = null; - if (dependsOnElement instanceof XmlAttributeValue) { - XmlAttributeValue attributeValue = (XmlAttributeValue)dependsOnElement; + if (dependsOnElement instanceof XmlAttributeValue attributeValue) { value = attributeValue.getValue(); } - else if (dependsOnElement instanceof PsiFile) { - PsiFile file = (PsiFile)dependsOnElement; + else if (dependsOnElement instanceof PsiFile file) { value = file.getText(); } diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java index ff95a68b5b9a..6e521dfdabb9 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java @@ -78,8 +78,7 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef { PsiElementProcessor processor = new PsiElementProcessor<>() { @Override public boolean execute(@NotNull PsiElement element) { - if (element instanceof XmlDoctype) { - XmlDoctype xmlDoctype = (XmlDoctype)element; + if (element instanceof XmlDoctype xmlDoctype) { final String dtdUri = getDtdForEntity(xmlDoctype); if (dtdUri != null) { XmlFile file = XmlUtil.getContainingFile(element); @@ -97,8 +96,7 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef { if (!XmlUtil.processXmlElements(markupDecl, this, true)) return false; } } - else if (element instanceof XmlEntityDecl) { - XmlEntityDecl entityDecl = (XmlEntityDecl)element; + else if (element instanceof XmlEntityDecl entityDecl) { final String declName = entityDecl.getName(); if (StringUtil.equals(declName, entityName)) { result[0] = entityDecl; diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagDelegate.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagDelegate.java index 0d3af779261a..4035d3464dd6 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagDelegate.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagDelegate.java @@ -662,8 +662,7 @@ public abstract class XmlTagDelegate { for (final XmlAttribute attribute : attributes) { final ASTNode child = XmlChildRole.ATTRIBUTE_NAME_FINDER.findChild(attribute.getNode()); - if (child instanceof LeafElement) { - final LeafElement attrNameElement = (LeafElement)child; + if (child instanceof LeafElement attrNameElement) { if ((caseSensitive && Comparing.equal(attrNameElement.getChars(), qname) || !caseSensitive && Comparing.equal(attrNameElement.getChars(), qname, false))) { return attribute; diff --git a/xml/xml-psi-impl/src/com/intellij/xml/DefaultXmlNamespaceHelper.java b/xml/xml-psi-impl/src/com/intellij/xml/DefaultXmlNamespaceHelper.java index b52243fee0fd..b4a81a946e5b 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/DefaultXmlNamespaceHelper.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/DefaultXmlNamespaceHelper.java @@ -149,10 +149,9 @@ public class DefaultXmlNamespaceHelper extends XmlNamespaceHelper { @Override @NotNull public Set guessUnboundNamespaces(@NotNull final PsiElement element, @NotNull XmlFile file) { - if (!(element instanceof XmlTag)) { + if (!(element instanceof XmlTag tag)) { return Collections.emptySet(); } - final XmlTag tag = (XmlTag)element; final String name = tag.getLocalName(); final Set byTagName = getNamespacesByTagName(name, file); if (!byTagName.isEmpty()) { diff --git a/xml/xml-psi-impl/src/com/intellij/xml/XmlNamespaceHelper.java b/xml/xml-psi-impl/src/com/intellij/xml/XmlNamespaceHelper.java index 963b4546d6a6..c0af9ec477ab 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/XmlNamespaceHelper.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/XmlNamespaceHelper.java @@ -41,8 +41,7 @@ public abstract class XmlNamespaceHelper { @Nullable public String getNamespacePrefix(PsiElement element) { - if (element instanceof XmlAttribute) { - XmlAttribute attribute = (XmlAttribute)element; + if (element instanceof XmlAttribute attribute) { String prefix = attribute.getNamespacePrefix(); if (!StringUtil.isEmpty(prefix)) { return prefix; diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/XmlNamedReferenceProvider.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/XmlNamedReferenceProvider.java index 8f54ed75ea65..9bb5d9ba6aab 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/XmlNamedReferenceProvider.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/XmlNamedReferenceProvider.java @@ -26,10 +26,9 @@ public final class XmlNamedReferenceProvider implements PsiSymbolReferenceProvid @Override public Collection getReferences(@NotNull PsiExternalReferenceHost element, @NotNull PsiSymbolReferenceHints hints) { - if (!(element instanceof XmlNamedReferenceHost)) { + if (!(element instanceof XmlNamedReferenceHost host)) { return Collections.emptyList(); } - final XmlNamedReferenceHost host = (XmlNamedReferenceHost)element; final Collection beans = NamedReferenceProviders.getInstance().getNamedReferenceProviderBeans(host); final List result = new SmartList<>(); for (XmlNamedReferenceProviderBean bean : beans) { diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java index f15bbb94925e..8dec3ee9f268 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java @@ -111,8 +111,7 @@ public class XmlElementDescriptorImpl extends BaseXmlElementDescriptorImpl imple XmlUtil.processXmlElements(contentSpecElement, new PsiElementProcessor(){ @Override public boolean execute(@NotNull PsiElement child){ - if (child instanceof XmlToken) { - final XmlToken token = (XmlToken)child; + if (child instanceof XmlToken token) { if (token.getTokenType() == XmlTokenType.XML_NAME) { final String text = child.getText(); diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/ComplexTypeDescriptor.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/ComplexTypeDescriptor.java index ec29d75d0c0a..649c64f8bda4 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/ComplexTypeDescriptor.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/ComplexTypeDescriptor.java @@ -336,8 +336,7 @@ public class ComplexTypeDescriptor extends TypeDescriptor { if (base != null) { TypeDescriptor descriptor = info.documentDescriptor.findTypeDescriptor(base); - if (descriptor instanceof ComplexTypeDescriptor) { - ComplexTypeDescriptor complexTypeDescriptor = (ComplexTypeDescriptor)descriptor; + if (descriptor instanceof ComplexTypeDescriptor complexTypeDescriptor) { if (complexTypeDescriptor._canContainTag(localName, namespace, complexTypeDescriptor.myTag, context, visited, getContextInfo(info, base), restriction || XmlNSDescriptorImpl.equalsToSchemaName(tag, RESTRICTION_TAG_NAME))) { @@ -447,8 +446,7 @@ public class ComplexTypeDescriptor extends TypeDescriptor { visited.add(base); TypeDescriptor descriptor = myDocumentDescriptor.findTypeDescriptor(base); - if (descriptor instanceof ComplexTypeDescriptor) { - ComplexTypeDescriptor complexTypeDescriptor = (ComplexTypeDescriptor)descriptor; + if (descriptor instanceof ComplexTypeDescriptor complexTypeDescriptor) { if (dependencies != null) { XmlTag declaration = complexTypeDescriptor.getDeclaration(); dependencies.add(declaration.getContainingFile()); diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java index 66328ca4c824..33dc5f74ae7a 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java @@ -129,12 +129,10 @@ public class XmlAttributeDescriptorImpl extends XsdEnumerationDescriptor impleme if (!contextNs.equals(targetNs)) { final XmlElementDescriptor xmlElementDescriptor = contextTag.getDescriptor(); - if (xmlElementDescriptor instanceof XmlElementDescriptorImpl) { - final XmlElementDescriptorImpl elementDescriptor = (XmlElementDescriptorImpl)xmlElementDescriptor; + if (xmlElementDescriptor instanceof XmlElementDescriptorImpl elementDescriptor) { final TypeDescriptor type = elementDescriptor.getType(); - if (type instanceof ComplexTypeDescriptor) { - final ComplexTypeDescriptor typeDescriptor = (ComplexTypeDescriptor)type; + if (type instanceof ComplexTypeDescriptor typeDescriptor) { if (myReferenceName != null) { return myReferenceName.indexOf(':') != 0; } diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorByType.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorByType.java index f90b1485cd45..b96c40ef12dd 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorByType.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorByType.java @@ -64,9 +64,7 @@ public class XmlElementDescriptorByType extends XmlElementDescriptorImpl { public boolean equals(final Object o) { if (this == o) return true; - if (!(o instanceof XmlElementDescriptorByType)) return false; - - final XmlElementDescriptorByType that = (XmlElementDescriptorByType)o; + if (!(o instanceof XmlElementDescriptorByType that)) return false; if (myType != null ? !myType.equals(that.myType) : that.myType != null) return false; diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorImpl.java index 1d249da8000a..354e19df6187 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorImpl.java @@ -118,11 +118,10 @@ public class XmlElementDescriptorImpl extends XsdEnumerationDescriptor private XmlNSDescriptor getNSDescriptor(XmlElement context) { XmlNSDescriptor nsDescriptor = getNSDescriptor(); - if (context instanceof XmlTag && nsDescriptor instanceof XmlNSDescriptorImpl) { + if (context instanceof XmlTag tag && nsDescriptor instanceof XmlNSDescriptorImpl) { final String defaultNamespace = ((XmlNSDescriptorImpl)nsDescriptor).getDefaultNamespace(); if (XmlUtil.XML_SCHEMA_URI.equals(defaultNamespace)) return nsDescriptor; // do not check for overriden for efficiency - final XmlTag tag = (XmlTag)context; final String tagNs = tag.getNamespace(); if (tagNs.equals(defaultNamespace)) { XmlNSDescriptor previousDescriptor = nsDescriptor; @@ -179,9 +178,8 @@ public class XmlElementDescriptorImpl extends XsdEnumerationDescriptor } } } - else if (context instanceof XmlTag && nsDescriptor instanceof XmlNSDescriptorImpl) { + else if (context instanceof XmlTag tag && nsDescriptor instanceof XmlNSDescriptorImpl) { // check for redefined descriptor - XmlTag tag = (XmlTag)context; if (!tag.getNamespace().equals(((XmlNSDescriptorImpl)nsDescriptor).getDefaultNamespace())) { XmlNSDescriptor descriptor = tag.getNSDescriptor(tag.getNamespace(), true); if (descriptor != nsDescriptor && descriptor instanceof XmlNSTypeDescriptorProvider) { @@ -208,8 +206,7 @@ public class XmlElementDescriptorImpl extends XsdEnumerationDescriptor final TypeDescriptor type = getType(context); - if (type instanceof ComplexTypeDescriptor) { - final ComplexTypeDescriptor descriptor = (ComplexTypeDescriptor)type; + if (type instanceof ComplexTypeDescriptor descriptor) { PsiFile containingFile = context != null ? context.getContainingFile():null; if (context != null && !containingFile.isPhysical()) { @@ -239,8 +236,7 @@ public class XmlElementDescriptorImpl extends XsdEnumerationDescriptor private XmlElementDescriptor[] getElementsDescriptorsImpl(XmlElement context) { TypeDescriptor type = getType(context); - if (type instanceof ComplexTypeDescriptor) { - ComplexTypeDescriptor typeDescriptor = (ComplexTypeDescriptor)type; + if (type instanceof ComplexTypeDescriptor typeDescriptor) { XmlElementDescriptor[] elements = typeDescriptor.getElements(context); if (context instanceof XmlTag && elements.length > 0) { @@ -275,8 +271,7 @@ public class XmlElementDescriptorImpl extends XsdEnumerationDescriptor TypeDescriptor type = getType(context); - if (type instanceof ComplexTypeDescriptor) { - ComplexTypeDescriptor typeDescriptor = (ComplexTypeDescriptor)type; + if (type instanceof ComplexTypeDescriptor typeDescriptor) { XmlAttributeDescriptor[] attributeDescriptors = typeDescriptor.getAttributes(context); if (context != null) { @@ -338,8 +333,7 @@ public class XmlElementDescriptorImpl extends XsdEnumerationDescriptor if (containAttributeType != ComplexTypeDescriptor.CanContainAttributeType.CanContainAny && !namespace.isEmpty()) { final XmlNSDescriptor candidateNSDescriptor = context.getNSDescriptor(namespace, true); - if (candidateNSDescriptor instanceof XmlNSDescriptorImpl) { - final XmlNSDescriptorImpl nsDescriptor = (XmlNSDescriptorImpl)candidateNSDescriptor; + if (candidateNSDescriptor instanceof XmlNSDescriptorImpl nsDescriptor) { final XmlAttributeDescriptor xmlAttributeDescriptor = nsDescriptor.getAttribute(localName, namespace, context); if (xmlAttributeDescriptor != null) return xmlAttributeDescriptor; @@ -551,8 +545,7 @@ public class XmlElementDescriptorImpl extends XsdEnumerationDescriptor public boolean allowElementsFromNamespace(final String namespace, final XmlTag context) { final TypeDescriptor type = getType(context); - if (type instanceof ComplexTypeDescriptor) { - final ComplexTypeDescriptor typeDescriptor = (ComplexTypeDescriptor)type; + if (type instanceof ComplexTypeDescriptor typeDescriptor) { return typeDescriptor.canContainTag("a", namespace, context) || typeDescriptor.getNsDescriptor().hasSubstitutions() || XmlUtil.nsFromTemplateFramework(namespace); diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java index 1f2338687263..66525784dc8d 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java @@ -760,8 +760,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptorEx,Validator { - if (element instanceof XmlTag) { - final XmlTag tag1 = (XmlTag)element; + if (element instanceof XmlTag tag1) { @NonNls final String s = ((XmlTag)element).getLocalName(); if ((s.equals(XSD_SIMPLE_CONTENT_TAG) || @@ -428,8 +426,7 @@ public final class XmlUtil { } public static boolean isAntFile(final PsiFile file) { - if (file instanceof XmlFile) { - final XmlFile xmlFile = (XmlFile)file; + if (file instanceof XmlFile xmlFile) { final XmlDocument document = xmlFile.getDocument(); if (document != null) { final XmlTag tag = document.getRootTag(); @@ -458,14 +455,12 @@ public final class XmlUtil { @Nullable public static PsiFile findRelativeFile(String uri, PsiElement base) { - if (base instanceof PsiFile) { - PsiFile baseFile = (PsiFile)base; + if (base instanceof PsiFile baseFile) { VirtualFile file = UriUtil.findRelative(uri, baseFile.getOriginalFile()); if (file == null) return null; return base.getManager().findFile(file); } - else if (base instanceof PsiDirectory) { - PsiDirectory baseDir = (PsiDirectory)base; + else if (base instanceof PsiDirectory baseDir) { VirtualFile file = UriUtil.findRelative(uri, baseDir); if (file == null) return null; return base.getManager().findFile(file); @@ -488,8 +483,7 @@ public final class XmlUtil { @Nullable public static XmlElementDescriptor getDescriptorFromContext(@NotNull XmlTag tag) { PsiElement parent = tag.getParent(); - if (parent instanceof XmlTag) { - XmlTag parentTag = (XmlTag)parent; + if (parent instanceof XmlTag parentTag) { final XmlElementDescriptor parentDescriptor = parentTag.getDescriptor(); if (parentDescriptor != null) { @@ -503,8 +497,7 @@ public final class XmlUtil { XmlTag newTag = XmlElementFactory.getInstance(tag.getProject()).createTagFromText('<' + tag.getName() + ">'); ASTNode node = tag.getNode(); - if (!(node instanceof CompositeElement)) return; - CompositeElement compositeElement = (CompositeElement)node; + if (!(node instanceof CompositeElement compositeElement)) return; final LeafElement emptyTagEnd = (LeafElement)XmlChildRole.EMPTY_TAG_END_FINDER.findChild(compositeElement); if (emptyTagEnd == null) return; @@ -805,8 +798,7 @@ public final class XmlUtil { } } - if (typeDecr instanceof XmlNSDescriptorImpl) { - final XmlNSDescriptorImpl schemaDescriptor = (XmlNSDescriptorImpl)typeDecr; + if (typeDecr instanceof XmlNSDescriptorImpl schemaDescriptor) { elementDescriptor = schemaDescriptor.getDescriptorByType(type, xmlTag); } }