MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-05 08:06:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Pattern variable can be used mass cleanup

Browse Source 
GitOrigin-RevId: 55839bf0deca5f81d0f7eb5b1c190145a5ea0037
This commit is contained in:
Tagir Valeev
2023-02-07 13:24:01 +01:00
committed by intellij-monorepo-bot
parent daaa8e8930
commit f456ed0604
2270 changed files with 4362 additions and 8927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/javaFX/sceneBuilder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java
View File

@@ -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);
}

3
plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxEntryPoint.java
View File

@@ -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();

12
plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java
View File

@@ -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() + ">";

3
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlPresenceListener.java
View File

@@ -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();

9
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
View File

@@ -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);

15
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxColorProvider.java
View File

@@ -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)) {

3
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxImportsOptimizer.java
View File

@@ -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);

9
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxEventHandlerInspection.java
View File

@@ -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<PsiMethod> 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<PsiMethod> eventHandlerMethods = getEventHandlerMethods(attribute);
if (eventHandlerMethods.size() != 1) return;

3
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java
View File

@@ -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();

4
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxCollapseSubTagToAttributeIntention.java
View File

@@ -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;
}

3
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInTagDescriptor.java
View File

@@ -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();

3
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java
View File

@@ -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() &&

6
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxControllerFieldSearcher.java
View File

@@ -23,8 +23,7 @@ public class JavaFxControllerFieldSearcher implements QueryExecutor<PsiReference
@Override
public boolean execute(@NotNull final ReferencesSearch.SearchParameters queryParameters, @NotNull final Processor<? super PsiReference> 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<PsiReference
final PsiElement resolve = reference.resolve();
if (resolve instanceof XmlAttributeValue) {
final PsiElement parent = resolve.getParent();
if (parent instanceof XmlAttribute) {
final XmlAttribute attribute = (XmlAttribute)parent;
if (parent instanceof XmlAttribute attribute) {
if (FxmlConstants.FX_ID.equals(attribute.getName()) && fieldName.equals(attribute.getValue())) {
consumer.process(reference);
}

3
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxMethodSearcher.java
View File

@@ -32,8 +32,7 @@ public class JavaFxMethodSearcher implements QueryExecutor<PsiReference, Referen
if (elementToSearch instanceof PsiMethod) {
searchMethod((PsiMethod)elementToSearch, queryParameters, consumer);
}
if (elementToSearch instanceof JavaFxPropertyElement) {
final JavaFxPropertyElement propertyElement = (JavaFxPropertyElement)elementToSearch;
if (elementToSearch instanceof JavaFxPropertyElement propertyElement) {
final JavaFxPropertyReference propertyReference = propertyElement.getPropertyReference();
final PsiMethod staticSetter = propertyReference.getStaticSetter();
if (staticSetter != null) {

3
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxStaticPropertyReferenceProvider.java
View File

@@ -13,9 +13,8 @@ import org.jetbrains.plugins.javaFX.fxml.JavaFxPsiUtil;
public class JavaFxStaticPropertyReferenceProvider extends PsiReferenceProvider {
@Override
public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
if (!(element instanceof XmlAttribute) || !JavaFxFileTypeFactory.isFxml(element.getContainingFile())) return PsiReference.EMPTY_ARRAY;
if (!(element instanceof XmlAttribute xmlAttribute) || !JavaFxFileTypeFactory.isFxml(element.getContainingFile())) return PsiReference.EMPTY_ARRAY;
final XmlAttribute xmlAttribute = (XmlAttribute)element;
final String name = xmlAttribute.getName();
final int dotIndex = name.indexOf('.');
if (dotIndex <= 0 || name.indexOf('.', dotIndex + 1) >= 0) return PsiReference.EMPTY_ARRAY;

3
plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java
View File

@@ -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<PsiElement, String> elementsToRename = getElementsToRename(propertyReference, "a");
if (!canRename(project, editor, elementsToRename.keySet())) {
return;

3
plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxRenameFxIdFieldProcessor.java
View File

@@ -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();

3
plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderInfo.java
View File

@@ -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;