MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-74293 (insert package statement in a correct place)

Browse Source
This commit is contained in:
Roman Shevchenko
2011-09-19 13:51:45 +02:00
parent 7d7017ccd4
commit 20ee4d615e
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java
+1 -1
View File
@@ -116,7 +116,7 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava
}
else {
if (packageName.length() > 0) {
add(factory.createPackageStatement(packageName));
addBefore(factory.createPackageStatement(packageName), getFirstChild());
}
}
}
java/java-impl/src/com/intellij/psi/impl/source/tree/java/JavaFileElement.java
+6 -14
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2011 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.
@@ -37,18 +37,10 @@ public class JavaFileElement extends FileElement {
super(JavaStubElementTypes.JAVA_FILE, text);
}
public TreeElement addInternal(TreeElement first, ASTNode last, ASTNode anchor, Boolean before) {
if (before == null && first == last && first.getElementType() == JavaElementType.PACKAGE_STATEMENT){ //?
anchor = getFirstChildNode();
before = Boolean.TRUE;
}
return super.addInternal(first, last, anchor, before);
}
public void deleteChildInternal(@NotNull ASTNode child){
if (child.getElementType() == JavaElementType.CLASS){
PsiJavaFile file = (PsiJavaFile)SourceTreeToPsiMap.treeElementToPsi(this);
if (file.getClasses().length == 1){
public void deleteChildInternal(@NotNull ASTNode child) {
if (child.getElementType() == JavaElementType.CLASS) {
PsiJavaFile file = SourceTreeToPsiMap.treeToPsiNotNull(this);
if (file.getClasses().length == 1) {
file.delete();
return;
}
@@ -59,7 +51,7 @@ public class JavaFileElement extends FileElement {
@Nullable
public ASTNode findChildByRole(int role) {
LOG.assertTrue(ChildRole.isUnique(role));
switch(role){
switch (role) {
default:
return null;