Avoid conflicts when moving members wiith package-local visibility

Add tests for Java "Move members" refactoring
 #KT-4459 Fixed
This commit is contained in:
Alexey Sedunov
2014-02-24 18:58:08 +04:00
parent d7aa8e7fc8
commit 5ba49fbada
192 changed files with 1178 additions and 1 deletions
@@ -21,8 +21,11 @@ import com.intellij.lang.ASTNode;
import com.intellij.lang.FileASTNode;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.psi.FileViewProvider;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiClassOwner;
import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
@@ -33,7 +36,7 @@ import org.jetbrains.jet.plugin.JetLanguage;
import java.util.Collections;
import java.util.List;
public class JetFile extends PsiFileBase implements JetDeclarationContainer, JetElement {
public class JetFile extends PsiFileBase implements JetDeclarationContainer, JetElement, PsiClassOwner {
private final boolean isCompiled;
@@ -96,6 +99,7 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet
return ast != null ? (JetPackageDirective) ast.getPsi() : null;
}
@Override
@Nullable
public String getPackageName() {
PsiJetFileStub stub = (PsiJetFileStub) getStub();
@@ -107,6 +111,15 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet
return directive != null ? directive.getQualifiedName() : null;
}
@NotNull
@Override
public PsiClass[] getClasses() {
return PsiClass.EMPTY_ARRAY;
}
@Override
public void setPackageName(String packageName) { }
@Nullable
public JetScript getScript() {
return PsiTreeUtil.getChildOfType(this, JetScript.class);