From 19613ee60e53eda4cf469a3557f59f94fc9bbc0e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 2 Jul 2015 15:51:44 +0300 Subject: [PATCH] java: receiver parameter vetoed from rename --- .../refactoring/rename/JavaVetoRenameCondition.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/rename/JavaVetoRenameCondition.java b/java/java-impl/src/com/intellij/refactoring/rename/JavaVetoRenameCondition.java index e0baa8787526..2d20a2b0441d 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/JavaVetoRenameCondition.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/JavaVetoRenameCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2015 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. @@ -23,11 +23,16 @@ import com.intellij.psi.util.FileTypeUtils; public class JavaVetoRenameCondition implements Condition { @Override - public boolean value(final PsiElement element) { + public boolean value(PsiElement element) { if (element instanceof LightMethod) { - final PsiClass containingClass = ((LightMethod)element).getContainingClass(); + PsiClass containingClass = ((LightMethod)element).getContainingClass(); if (containingClass != null && containingClass.isEnum()) return true; } + + if (element instanceof PsiReceiverParameter) { + return true; + } + return element instanceof PsiJavaFile && !FileTypeUtils.isInServerPageFile(element) && !JavaProjectRootsUtil.isOutsideJavaSourceRoot((PsiFile)element) &&