MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-15 11:12:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEADEV-41403: only bind additional preceding comments in pass 2 when the declaration does not yet have a "doc comment"

Browse Source
This commit is contained in:
Maas van den Berg
2009-11-17 18:13:01 +03:00
committed by Maxim Shafirov
parent e18995781e
commit 2eaa5fd6b5
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/parsing/ParseUtil.java
+13 -5
View File
@@ -116,12 +116,18 @@ public class ParseUtil {
}
});
// we'll only bind additional preceding comments in pass 2 when the declaration does not yet have a "doc comment"
boolean docCommentBound = false;
Iterator<ASTNode> iterator = comments.iterator();
while (iterator.hasNext()) {
ASTNode child = iterator.next();
IElementType type = child.getElementType();
if (type == JavaDocElementType.DOC_COMMENT) {
if (bindDocComment((TreeElement)child)) iterator.remove();
if (bindDocComment((TreeElement)child)) {
iterator.remove();
docCommentBound = true;
}
}
// bind "trailing comments" (like "int a; // comment")
else if (type == JavaTokenType.END_OF_LINE_COMMENT || type == JavaTokenType.C_STYLE_COMMENT) {
@@ -130,10 +136,12 @@ public class ParseUtil {
}
//pass 2: bind preceding comments (like "// comment \n void f();")
for (ASTNode child : comments) {
if (child.getElementType() == JavaTokenType.END_OF_LINE_COMMENT || child.getElementType() == JavaTokenType.C_STYLE_COMMENT) {
TreeElement next = (TreeElement)TreeUtil.skipElements(child, PRECEDING_COMMENT_OR_SPACE_BIT_SET);
bindPrecedingComment((TreeElement)child, next);
if (!docCommentBound) {
for (ASTNode child : comments) {
if (child.getElementType() == JavaTokenType.END_OF_LINE_COMMENT || child.getElementType() == JavaTokenType.C_STYLE_COMMENT) {
TreeElement next = (TreeElement)TreeUtil.skipElements(child, PRECEDING_COMMENT_OR_SPACE_BIT_SET);
bindPrecedingComment((TreeElement)child, next);
}
}
}
}