From bd4f798bc6ed3ed9ec4ce8ac0e0062cb04692cf6 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Tue, 27 Dec 2016 19:39:19 +0300 Subject: [PATCH] [java] restrict automatic overloads renamer to Java Language (EA-64878), @NotNull --- .../naming/AutomaticOverloadsRenamerFactory.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticOverloadsRenamerFactory.java b/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticOverloadsRenamerFactory.java index fab97ba6c15f..9283fb31d3cb 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticOverloadsRenamerFactory.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticOverloadsRenamerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,16 +20,21 @@ */ package com.intellij.refactoring.rename.naming; -import com.intellij.psi.*; +import com.intellij.lang.java.JavaLanguage; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiMethod; import com.intellij.refactoring.JavaRefactoringSettings; import com.intellij.refactoring.RefactoringBundle; import com.intellij.usageView.UsageInfo; +import org.jetbrains.annotations.NotNull; import java.util.Collection; -public class AutomaticOverloadsRenamerFactory implements AutomaticRenamerFactory{ - public boolean isApplicable(PsiElement element) { - if (element instanceof PsiMethod && !((PsiMethod)element).isConstructor()) { +public class AutomaticOverloadsRenamerFactory implements AutomaticRenamerFactory { + + public boolean isApplicable(@NotNull PsiElement element) { + if (element.getLanguage() == JavaLanguage.INSTANCE && element instanceof PsiMethod && !((PsiMethod)element).isConstructor()) { final PsiClass containingClass = ((PsiMethod)element).getContainingClass(); return containingClass != null && containingClass.findMethodsByName(((PsiMethod)element).getName(), false).length > 1; } @@ -48,6 +53,7 @@ public class AutomaticOverloadsRenamerFactory implements AutomaticRenamerFactory JavaRefactoringSettings.getInstance().setRenameOverloads(enabled); } + @NotNull public AutomaticRenamer createRenamer(PsiElement element, String newName, Collection usages) { return new AutomaticOverloadsRenamer((PsiMethod)element, newName); }