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

don't collapse javadocs in package-info.java (IDEA-58936); extract duplicate constants to a common place

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-10-13 15:44:28 +02:00
parent 5109821e1a
commit f52ec362f8
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
+1 -2
View File
@@ -44,7 +44,6 @@ import java.util.Set;
*/
public class AnnotationsHighlightUtil {
private static final Logger LOG = Logger.getInstance("com.intellij.codeInsight.daemon.impl.analysis.AnnotationsHighlightUtil");
@NonNls private static final String PACKAGE_INFO_JAVA = "package-info.java";
public static HighlightInfo checkNameValuePair(PsiNameValuePair pair) {
PsiReference ref = pair.getReference();
@@ -297,7 +296,7 @@ public class AnnotationsHighlightUtil {
return null;
}
PsiFile file = statement.getContainingFile();
if (file != null && !PACKAGE_INFO_JAVA.equals(file.getName())) {
if (file != null && !PsiPackage.PACKAGE_INFO_FILE.equals(file.getName())) {
return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR,
statement.getAnnotationList().getTextRange(),
JavaErrorMessages.message("invalid.package.annotation.containing.file"));
java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java
+3
View File
@@ -227,6 +227,9 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
else if (element instanceof PsiDocComment) {
PsiElement parent = element.getParent();
if (parent instanceof PsiJavaFile) {
if (((PsiJavaFile)parent).getName().equals(PsiPackage.PACKAGE_INFO_FILE)) {
return false;
}
PsiElement firstChild = parent.getFirstChild();
if (firstChild instanceof PsiWhiteSpace) {
firstChild = firstChild.getNextSibling();
java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+1 -1
View File
@@ -472,7 +472,7 @@ public class JavaDocInfoGenerator {
private void generatePackageJavaDoc(final StringBuilder buffer, final PsiPackage psiPackage) {
for(PsiDirectory directory: psiPackage.getDirectories()) {
final PsiFile packageInfoFile = directory.findFile("package-info.java");
final PsiFile packageInfoFile = directory.findFile(PsiPackage.PACKAGE_INFO_FILE);
if (packageInfoFile != null) {
final ASTNode node = packageInfoFile.getNode();
if (node != null) {
java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
-1
View File
@@ -355,7 +355,6 @@ public class PsiPackageImpl extends PsiPackageBase implements PsiPackage, Querya
}
private class PackageAnnotationValueProvider implements CachedValueProvider<PsiModifierList> {
@NonNls private static final String PACKAGE_INFO_FILE = "package-info.java";
private final Object[] OOCB_DEPENDENCY = { PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT };
public Result<PsiModifierList> compute() {
java/java-psi-api/src/com/intellij/psi/PsiPackage.java
+2
View File
@@ -26,6 +26,8 @@ import org.jetbrains.annotations.Nullable;
* Represents a Java package.
*/
public interface PsiPackage extends PsiCheckedRenameElement, NavigationItem, PsiModifierListOwner, PsiDirectoryContainer, PsiQualifiedNamedElement {
@NonNls String PACKAGE_INFO_FILE = "package-info.java";
PsiPackage[] EMPTY_ARRAY = new PsiPackage[0];
/**