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

[java-rd] IDEA-322563 refactoring for java rem-dev

Browse Source 
- rename BasicJavaDocElementType with BASIC_, to distinct them from usual ones

GitOrigin-RevId: 4f33eb1ddb49412501bd21a9c7cf53a1ea591521
This commit is contained in:
Mikhail Pyltsin
2023-09-29 09:19:18 +00:00
committed by intellij-monorepo-bot
parent 4cf2e16167
commit b851673c40
16 changed files with 66 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/AbstractBasicJavadocTypedHandler.java
+6 -6
View File
@@ -164,11 +164,11 @@ public abstract class AbstractBasicJavadocTypedHandler extends TypedHandlerDeleg
return false;
}
ASTNode astNode = BasicJavaAstTreeUtil.toNode(element);
if (BasicJavaAstTreeUtil.is(astNode, DOC_PARAMETER_REF)) {
if (BasicJavaAstTreeUtil.is(astNode, BASIC_DOC_PARAMETER_REF)) {
astNode = astNode.getTreeParent();
}
if (BasicJavaAstTreeUtil.is(astNode, DOC_TAG, DOC_SNIPPET_TAG, DOC_INLINE_TAG) &&
if (BasicJavaAstTreeUtil.is(astNode, BASIC_DOC_TAG, BASIC_DOC_SNIPPET_TAG, BASIC_DOC_INLINE_TAG) &&
"param".equals(BasicJavaAstTreeUtil.getTagName(astNode)) &&
isTypeParamBracketClosedAfterParamTag(astNode, offset)) {
return false;
@@ -176,15 +176,15 @@ public abstract class AbstractBasicJavadocTypedHandler extends TypedHandlerDeleg
// The contents of inline tags is not HTML, so the paired tag completion isn't appropriate there.
if (BasicJavaAstTreeUtil.is(astNode, DOC_INLINE_TAG, DOC_SNIPPET_TAG) ||
BasicJavaAstTreeUtil.getParentOfType(astNode, ParentAwareTokenSet.create(DOC_INLINE_TAG, DOC_SNIPPET_TAG)) != null) {
if (BasicJavaAstTreeUtil.is(astNode, BASIC_DOC_INLINE_TAG, BASIC_DOC_SNIPPET_TAG) ||
BasicJavaAstTreeUtil.getParentOfType(astNode, ParentAwareTokenSet.create(BASIC_DOC_INLINE_TAG, BASIC_DOC_SNIPPET_TAG)) != null) {
return false;
}
ASTNode node = element.getNode();
return node != null
&& (JavaDocTokenType.ALL_JAVADOC_TOKENS.contains(node.getElementType())
|| ALL_JAVADOC_ELEMENTS.contains(node.getElementType()));
|| BASIC_ALL_JAVADOC_ELEMENTS.contains(node.getElementType()));
}
private static boolean isTypeParamBracketClosedAfterParamTag(ASTNode tag, int bracketOffset) {
@@ -198,7 +198,7 @@ public abstract class AbstractBasicJavadocTypedHandler extends TypedHandlerDeleg
@Nullable
private static ASTNode getDocumentingParameter(@NotNull ASTNode tag) {
for (ASTNode element = tag.getFirstChildNode(); element != null; element = element.getTreeNext()) {
if (BasicJavaAstTreeUtil.is(element, DOC_PARAMETER_REF)) {
if (BasicJavaAstTreeUtil.is(element, BASIC_DOC_PARAMETER_REF)) {
return element;
}
}
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/smartEnter/CommentBreakerEnterProcessor.java
+2 -2
View File
@@ -29,12 +29,12 @@ import com.intellij.psi.impl.source.BasicJavaAstTreeUtil;
import com.intellij.psi.tree.ParentAwareTokenSet;
import org.jetbrains.annotations.NotNull;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.BASIC_DOC_COMMENT;
public class CommentBreakerEnterProcessor implements ASTNodeEnterProcessor {
private final ParentAwareTokenSet myCommentTypes = ParentAwareTokenSet.orSet(
ParentAwareTokenSet.create(BasicElementTypes.BASIC_JAVA_PLAIN_COMMENT_BIT_SET), ParentAwareTokenSet.create(DOC_COMMENT)
ParentAwareTokenSet.create(BasicElementTypes.BASIC_JAVA_PLAIN_COMMENT_BIT_SET), ParentAwareTokenSet.create(BASIC_DOC_COMMENT)
);
@Override
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/smartEnter/IfConditionFixer.java
+2 -2
View File
@@ -14,7 +14,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_PLAIN_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.BASIC_DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaElementType.*;
public class IfConditionFixer implements Fixer {
@@ -42,7 +42,7 @@ public class IfConditionFixer implements Fixer {
if (lParen != null && PsiUtilCore.getElementType(lastChild) == JavaTokenType.C_STYLE_COMMENT) {
innerComment = lastChild.getText();
}
else if (BasicJavaAstTreeUtil.is(lastChild, DOC_COMMENT) ||
else if (BasicJavaAstTreeUtil.is(lastChild, BASIC_DOC_COMMENT) ||
BasicJavaAstTreeUtil.is(lastChild, BASIC_JAVA_PLAIN_COMMENT_BIT_SET)
) {
lastComment = lastChild.getText();
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AbstractBasicBackBasicSelectioner.java
+1 -1
View File
@@ -39,7 +39,7 @@ public abstract class AbstractBasicBackBasicSelectioner extends ExtendWordSelect
!BasicJavaAstTreeUtil.is(node, JAVA_CODE_REFERENCE_ELEMENT_SET) &&
!(BasicJavaAstTreeUtil.isJavaToken(node) &&
!BasicJavaAstTreeUtil.isKeyword(node)) &&
!BasicJavaAstTreeUtil.is(node, DOC_TAG, DOC_SNIPPET_TAG, DOC_INLINE_TAG) &&
!BasicJavaAstTreeUtil.is(node, BASIC_DOC_TAG, BASIC_DOC_SNIPPET_TAG, BASIC_DOC_INLINE_TAG) &&
getElementPredicate().test(e);
}
}
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/DocCommentSelectioner.java
+2 -2
View File
@@ -12,13 +12,13 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.BASIC_DOC_COMMENT;
public class DocCommentSelectioner extends LineCommentSelectioner {
@Override
public boolean canSelect(@NotNull PsiElement e) {
return BasicJavaAstTreeUtil.is(BasicJavaAstTreeUtil.toNode(e), DOC_COMMENT);
return BasicJavaAstTreeUtil.is(BasicJavaAstTreeUtil.toNode(e), BASIC_DOC_COMMENT);
}
@Override
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/DocTagSelectioner.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class DocTagSelectioner extends WordSelectioner {
@Override
public boolean canSelect(@NotNull PsiElement e) {
ASTNode node = BasicJavaAstTreeUtil.toNode(e);
return BasicJavaAstTreeUtil.is(node, DOC_TAG, DOC_SNIPPET_TAG, DOC_INLINE_TAG);
return BasicJavaAstTreeUtil.is(node, BASIC_DOC_TAG, BASIC_DOC_SNIPPET_TAG, BASIC_DOC_INLINE_TAG);
}
@Override
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/JavaBasicWordSelectionFilter.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class JavaBasicWordSelectionFilter implements Condition<PsiElement> {
!BasicJavaAstTreeUtil.is(node, BASIC_BLOCK_STATEMENT) &&
!BasicJavaAstTreeUtil.is(node, JAVA_CODE_REFERENCE_ELEMENT_SET) &&
!BasicJavaAstTreeUtil.isJavaToken(node) &&
!BasicJavaAstTreeUtil.is(node, DOC_TAG, DOC_SNIPPET_TAG, DOC_INLINE_TAG) &&
!BasicJavaAstTreeUtil.is(node, BASIC_DOC_TAG, BASIC_DOC_SNIPPET_TAG, BASIC_DOC_INLINE_TAG) &&
!(BasicJavaAstTreeUtil.isDocToken(node) &&
BasicJavaAstTreeUtil.is(node, JavaDocTokenType.DOC_COMMENT_DATA));
}
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java
+2 -2
View File
@@ -16,7 +16,7 @@ import java.util.List;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_COMMENT_OR_WHITESPACE_BIT_SET;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.BASIC_DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaElementType.*;
public class MethodOrClassSelectioner extends AbstractBasicBackBasicSelectioner {
@@ -43,7 +43,7 @@ public class MethodOrClassSelectioner extends AbstractBasicBackBasicSelectioner
List<ASTNode> children = BasicJavaAstTreeUtil.getChildren(node);
int i = 1;
if (BasicJavaAstTreeUtil.is(firstChild, DOC_COMMENT)) {
if (BasicJavaAstTreeUtil.is(firstChild, BASIC_DOC_COMMENT)) {
while (BasicJavaAstTreeUtil.isWhiteSpace(children.get(i))) {
i++;
}
java/java-frontback-impl/src/com/intellij/ide/highlighter/AbstractBasicJavaFileHighlighter.java
+1 -1
View File
@@ -69,7 +69,7 @@ public abstract class AbstractBasicJavaFileHighlighter extends SyntaxHighlighter
ourMap1.put(JavaTokenType.SEMICOLON, JavaHighlightingColors.JAVA_SEMICOLON);
ourMap1.put(JavaTokenType.C_STYLE_COMMENT, JavaHighlightingColors.JAVA_BLOCK_COMMENT);
ourMap1.put(DOC_COMMENT, JavaHighlightingColors.DOC_COMMENT);
ourMap1.put(BASIC_DOC_COMMENT, JavaHighlightingColors.DOC_COMMENT);
ourMap1.put(JavaTokenType.END_OF_LINE_COMMENT, JavaHighlightingColors.LINE_COMMENT);
ourMap1.put(TokenType.BAD_CHARACTER, HighlighterColors.BAD_CHARACTER);
java/java-frontback-impl/src/com/intellij/javadoc/AbstractBasicJavadocHelper.java
+7 -7
View File
@@ -29,9 +29,9 @@ public abstract class AbstractBasicJavadocHelper {
public static final Pair<JavadocParameterInfo, List<JavadocParameterInfo>> EMPTY
= new Pair<>(null, Collections.emptyList());
private static final @NotNull ParentAwareTokenSet TAG_TOKEN_SET = ParentAwareTokenSet.create(DOC_TAG,
DOC_SNIPPET_TAG,
DOC_INLINE_TAG);
private static final @NotNull ParentAwareTokenSet TAG_TOKEN_SET = ParentAwareTokenSet.create(BASIC_DOC_TAG,
BASIC_DOC_SNIPPET_TAG,
BASIC_DOC_INLINE_TAG);
protected AbstractBasicJavadocHelper() {
}
@@ -166,10 +166,10 @@ public abstract class AbstractBasicJavadocHelper {
return null;
}
final ASTNode paramRef = BasicJavaAstTreeUtil.findChildByType(tag, DOC_TAG_VALUE_ELEMENT,
DOC_METHOD_OR_FIELD_REF,
DOC_PARAMETER_REF,
DOC_SNIPPET_TAG_VALUE);
final ASTNode paramRef = BasicJavaAstTreeUtil.findChildByType(tag, BASIC_DOC_TAG_VALUE_ELEMENT,
BASIC_DOC_METHOD_OR_FIELD_REF,
BASIC_DOC_PARAMETER_REF,
BASIC_DOC_SNIPPET_TAG_VALUE);
if (paramRef == null) {
return null;
}
java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicJavaParserUtil.java
+2 -2
View File
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.PropertyKey;
import java.util.function.Function;
import java.util.function.Predicate;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.BASIC_DOC_COMMENT;
@ApiStatus.Experimental
public final class BasicJavaParserUtil {
@@ -198,7 +198,7 @@ public final class BasicJavaParserUtil {
final Project project = psi.getProject();
final PsiBuilderFactory factory = PsiBuilderFactory.getInstance();
final Lexer lexer = BasicJavaAstTreeUtil.is(chameleon, DOC_COMMENT) ? javaDocLexer.apply(level) : javaLexer.apply(level);
final Lexer lexer = BasicJavaAstTreeUtil.is(chameleon, BASIC_DOC_COMMENT) ? javaDocLexer.apply(level) : javaLexer.apply(level);
final PsiBuilder builder =
factory.createBuilder(project, chameleon, lexer, chameleon.getElementType().getLanguage(), chameleon.getChars());
setLanguageLevel(builder, level);
java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicElementTypes.java
+1 -1
View File
@@ -18,7 +18,7 @@ public interface BasicElementTypes extends JavaTokenType, JavaDocTokenType, Basi
TokenSet BASIC_JAVA_PLAIN_COMMENT_BIT_SET = TokenSet.create(END_OF_LINE_COMMENT, C_STYLE_COMMENT);
ParentAwareTokenSet BASIC_JAVA_COMMENT_BIT_SET =
ParentAwareTokenSet.orSet(ParentAwareTokenSet.create(BASIC_JAVA_PLAIN_COMMENT_BIT_SET), ParentAwareTokenSet.create(DOC_COMMENT));
ParentAwareTokenSet.orSet(ParentAwareTokenSet.create(BASIC_JAVA_PLAIN_COMMENT_BIT_SET), ParentAwareTokenSet.create(BASIC_DOC_COMMENT));
ParentAwareTokenSet BASIC_JAVA_COMMENT_OR_WHITESPACE_BIT_SET =
ParentAwareTokenSet.orSet(ParentAwareTokenSet.create(WHITE_SPACE), BASIC_JAVA_COMMENT_BIT_SET);
TokenSet BASIC_KEYWORD_BIT_SET = TokenSet.create(
java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaAstTreeUtil.java
+4 -4
View File
@@ -25,8 +25,8 @@ import java.util.Set;
import static com.intellij.psi.JavaTokenType.JAVA_TOKEN_TYPE_SET;
import static com.intellij.psi.JavaTokenType.RPARENTH;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_KEYWORD_BIT_SET;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.DOC_SNIPPET_ATTRIBUTE_VALUE;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.BASIC_DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.BASIC_DOC_SNIPPET_ATTRIBUTE_VALUE;
import static com.intellij.psi.impl.source.BasicJavaElementType.*;
public final class BasicJavaAstTreeUtil {
@@ -226,7 +226,7 @@ public final class BasicJavaAstTreeUtil {
@Nullable
public static ASTNode getDocComment(@Nullable ASTNode element) {
return findChildByType(element, DOC_COMMENT);
return findChildByType(element, BASIC_DOC_COMMENT);
}
@Nullable
@@ -367,7 +367,7 @@ public final class BasicJavaAstTreeUtil {
return
element != null &&
element.getElementType().getClass().equals(IJavaDocElementType.class) &&
!is(element, DOC_SNIPPET_ATTRIBUTE_VALUE);
!is(element, BASIC_DOC_SNIPPET_ATTRIBUTE_VALUE);
}
@Nullable
java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaDocElementType.java
+21 -20
View File
@@ -25,28 +25,28 @@ import java.util.function.Function;
import java.util.function.Supplier;
public interface BasicJavaDocElementType {
IElementType DOC_TAG = new IJavaDocElementType("DOC_TAG");
IElementType DOC_INLINE_TAG = new IJavaDocElementType("DOC_INLINE_TAG");
IElementType DOC_METHOD_OR_FIELD_REF = new IJavaDocElementType("DOC_METHOD_OR_FIELD_REF");
IElementType DOC_PARAMETER_REF = new IJavaDocElementType("DOC_PARAMETER_REF");
IElementType DOC_TAG_VALUE_ELEMENT = new IJavaDocElementType("DOC_TAG_VALUE_ELEMENT");
IElementType DOC_SNIPPET_TAG = new IJavaDocElementType("DOC_SNIPPET_TAG");
IElementType DOC_SNIPPET_TAG_VALUE = new IJavaDocElementType("DOC_SNIPPET_TAG_VALUE");
IElementType DOC_SNIPPET_BODY = new IJavaDocElementType("DOC_SNIPPET_BODY");
IElementType DOC_SNIPPET_ATTRIBUTE = new IJavaDocElementType("DOC_SNIPPET_ATTRIBUTE");
IElementType DOC_SNIPPET_ATTRIBUTE_LIST =
IElementType BASIC_DOC_TAG = new IJavaDocElementType("DOC_TAG");
IElementType BASIC_DOC_INLINE_TAG = new IJavaDocElementType("DOC_INLINE_TAG");
IElementType BASIC_DOC_METHOD_OR_FIELD_REF = new IJavaDocElementType("DOC_METHOD_OR_FIELD_REF");
IElementType BASIC_DOC_PARAMETER_REF = new IJavaDocElementType("DOC_PARAMETER_REF");
IElementType BASIC_DOC_TAG_VALUE_ELEMENT = new IJavaDocElementType("DOC_TAG_VALUE_ELEMENT");
IElementType BASIC_DOC_SNIPPET_TAG = new IJavaDocElementType("DOC_SNIPPET_TAG");
IElementType BASIC_DOC_SNIPPET_TAG_VALUE = new IJavaDocElementType("DOC_SNIPPET_TAG_VALUE");
IElementType BASIC_DOC_SNIPPET_BODY = new IJavaDocElementType("DOC_SNIPPET_BODY");
IElementType BASIC_DOC_SNIPPET_ATTRIBUTE = new IJavaDocElementType("DOC_SNIPPET_ATTRIBUTE");
IElementType BASIC_DOC_SNIPPET_ATTRIBUTE_LIST =
new IJavaDocElementType("DOC_SNIPPET_ATTRIBUTE_LIST");
IElementType DOC_SNIPPET_ATTRIBUTE_VALUE = new IJavaDocElementType("DOC_SNIPPET_ATTRIBUTE_VALUE");
IElementType BASIC_DOC_SNIPPET_ATTRIBUTE_VALUE = new IJavaDocElementType("DOC_SNIPPET_ATTRIBUTE_VALUE");
IElementType DOC_REFERENCE_HOLDER = new IJavaDocElementType("DOC_REFERENCE_HOLDER");
IElementType BASIC_DOC_REFERENCE_HOLDER = new IJavaDocElementType("DOC_REFERENCE_HOLDER");
IElementType DOC_TYPE_HOLDER = new IJavaDocElementType("DOC_TYPE_HOLDER");
IElementType BASIC_DOC_TYPE_HOLDER = new IJavaDocElementType("DOC_TYPE_HOLDER");
IElementType DOC_COMMENT = new IJavaDocElementType("DOC_COMMENT");
IElementType BASIC_DOC_COMMENT = new IJavaDocElementType("DOC_COMMENT");
ParentAwareTokenSet ALL_JAVADOC_ELEMENTS = ParentAwareTokenSet.create(
DOC_TAG, DOC_INLINE_TAG, DOC_METHOD_OR_FIELD_REF, DOC_PARAMETER_REF, DOC_TAG_VALUE_ELEMENT,
DOC_REFERENCE_HOLDER, DOC_TYPE_HOLDER, DOC_COMMENT);
ParentAwareTokenSet BASIC_ALL_JAVADOC_ELEMENTS = ParentAwareTokenSet.create(
BASIC_DOC_TAG, BASIC_DOC_INLINE_TAG, BASIC_DOC_METHOD_OR_FIELD_REF, BASIC_DOC_PARAMETER_REF, BASIC_DOC_TAG_VALUE_ELEMENT,
BASIC_DOC_REFERENCE_HOLDER, BASIC_DOC_TYPE_HOLDER, BASIC_DOC_COMMENT);
class JavaDocCompositeElementType extends IJavaDocElementType implements ICompositeElementType, ParentProviderElementType {
@@ -103,7 +103,7 @@ public interface BasicJavaDocElementType {
public DocReferenceHolderElementType(@NotNull Supplier<? extends BasicJavaParser> parser,
@NotNull Function<LanguageLevel, JavaDocLexer> docLexerFunction,
@NotNull Function<LanguageLevel, BasicJavaLexer> javaLexer) {
super("DOC_REFERENCE_HOLDER", DOC_REFERENCE_HOLDER);
super("DOC_REFERENCE_HOLDER", BASIC_DOC_REFERENCE_HOLDER);
this.myJavaThinParser = parser;
this.javaDocLexer = docLexerFunction;
this.javaLexer = javaLexer;
@@ -128,7 +128,7 @@ public interface BasicJavaDocElementType {
public DocTypeHolderElementType(@NotNull Supplier<? extends BasicJavaParser> parser,
@NotNull Function<LanguageLevel, JavaDocLexer> docLexerFunction,
@NotNull Function<LanguageLevel, BasicJavaLexer> javaLexer) {
super("DOC_TYPE_HOLDER", DOC_TYPE_HOLDER);
super("DOC_TYPE_HOLDER", BASIC_DOC_TYPE_HOLDER);
this.myJavaThinParser = parser;
this.javaDocLexer = docLexerFunction;
this.javaLexer = javaLexer;
@@ -152,7 +152,8 @@ public interface BasicJavaDocElementType {
private final Function<Project, Lexer> lexerByProject;
private static final Set<IElementType> myParentElementTypes = Collections.singleton(DOC_COMMENT);
private static final Set<IElementType> myParentElementTypes = Collections.singleton(BASIC_DOC_COMMENT);
public DocCommentElementType(@NotNull Function<LanguageLevel, JavaDocLexer> function,
@NotNull Function<LanguageLevel, BasicJavaLexer> lexerFunction,
@NotNull AbstractBasicJavaDocElementTypeFactory factory,
java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/WhiteSpaceAndCommentSetHolder.java
+2 -2
View File
@@ -10,7 +10,7 @@ import com.intellij.psi.tree.TokenSet;
import java.util.List;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_PLAIN_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.BASIC_DOC_COMMENT;
import static com.intellij.psi.tree.ParentAwareTokenSet.create;
import static com.intellij.psi.tree.ParentAwareTokenSet.orSet;
@@ -65,7 +65,7 @@ public class WhiteSpaceAndCommentSetHolder {
// 1. bind doc comment
for (int idx = tokens.size() - 1; idx >= 0; idx--) {
if (BasicJavaAstTreeUtil.is(tokens.get(idx), DOC_COMMENT)) return idx;
if (BasicJavaAstTreeUtil.is(tokens.get(idx), BASIC_DOC_COMMENT)) return idx;
}
// 2. bind plain comments
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaDocElementType.java
+11 -11
View File
@@ -44,18 +44,18 @@ public interface JavaDocElementType {
}
}
IElementType DOC_TAG = new JavaDocCompositeElementType("DOC_TAG", () -> new PsiDocTagImpl(), BasicJavaDocElementType.DOC_TAG);
IElementType DOC_INLINE_TAG = new JavaDocCompositeElementType("DOC_INLINE_TAG", () -> new PsiInlineDocTagImpl(), BasicJavaDocElementType.DOC_INLINE_TAG);
IElementType DOC_METHOD_OR_FIELD_REF = new JavaDocCompositeElementType("DOC_METHOD_OR_FIELD_REF", () -> new PsiDocMethodOrFieldRef(), BasicJavaDocElementType.DOC_METHOD_OR_FIELD_REF);
IElementType DOC_PARAMETER_REF = new JavaDocCompositeElementType("DOC_PARAMETER_REF", () -> new PsiDocParamRef(), BasicJavaDocElementType.DOC_PARAMETER_REF);
IElementType DOC_TAG_VALUE_ELEMENT = new JavaDocParentProviderElementType("DOC_TAG_VALUE_ELEMENT", BasicJavaDocElementType.DOC_TAG_VALUE_ELEMENT);
IElementType DOC_SNIPPET_TAG = new JavaDocCompositeElementType("DOC_SNIPPET_TAG", () -> new PsiSnippetDocTagImpl(), BasicJavaDocElementType.DOC_SNIPPET_TAG);
IElementType DOC_SNIPPET_TAG_VALUE = new JavaDocCompositeElementType("DOC_SNIPPET_TAG_VALUE", () -> new PsiSnippetDocTagValueImpl(), BasicJavaDocElementType.DOC_SNIPPET_TAG_VALUE);
IElementType DOC_SNIPPET_BODY = new JavaDocCompositeElementType("DOC_SNIPPET_BODY", () -> new PsiSnippetDocTagBodyImpl(), BasicJavaDocElementType.DOC_SNIPPET_BODY);
IElementType DOC_SNIPPET_ATTRIBUTE = new JavaDocCompositeElementType("DOC_SNIPPET_ATTRIBUTE", () -> new PsiSnippetAttributeImpl(), BasicJavaDocElementType.DOC_SNIPPET_ATTRIBUTE);
IElementType DOC_TAG = new JavaDocCompositeElementType("DOC_TAG", () -> new PsiDocTagImpl(), BasicJavaDocElementType.BASIC_DOC_TAG);
IElementType DOC_INLINE_TAG = new JavaDocCompositeElementType("DOC_INLINE_TAG", () -> new PsiInlineDocTagImpl(), BasicJavaDocElementType.BASIC_DOC_INLINE_TAG);
IElementType DOC_METHOD_OR_FIELD_REF = new JavaDocCompositeElementType("DOC_METHOD_OR_FIELD_REF", () -> new PsiDocMethodOrFieldRef(), BasicJavaDocElementType.BASIC_DOC_METHOD_OR_FIELD_REF);
IElementType DOC_PARAMETER_REF = new JavaDocCompositeElementType("DOC_PARAMETER_REF", () -> new PsiDocParamRef(), BasicJavaDocElementType.BASIC_DOC_PARAMETER_REF);
IElementType DOC_TAG_VALUE_ELEMENT = new JavaDocParentProviderElementType("DOC_TAG_VALUE_ELEMENT", BasicJavaDocElementType.BASIC_DOC_TAG_VALUE_ELEMENT);
IElementType DOC_SNIPPET_TAG = new JavaDocCompositeElementType("DOC_SNIPPET_TAG", () -> new PsiSnippetDocTagImpl(), BasicJavaDocElementType.BASIC_DOC_SNIPPET_TAG);
IElementType DOC_SNIPPET_TAG_VALUE = new JavaDocCompositeElementType("DOC_SNIPPET_TAG_VALUE", () -> new PsiSnippetDocTagValueImpl(), BasicJavaDocElementType.BASIC_DOC_SNIPPET_TAG_VALUE);
IElementType DOC_SNIPPET_BODY = new JavaDocCompositeElementType("DOC_SNIPPET_BODY", () -> new PsiSnippetDocTagBodyImpl(), BasicJavaDocElementType.BASIC_DOC_SNIPPET_BODY);
IElementType DOC_SNIPPET_ATTRIBUTE = new JavaDocCompositeElementType("DOC_SNIPPET_ATTRIBUTE", () -> new PsiSnippetAttributeImpl(), BasicJavaDocElementType.BASIC_DOC_SNIPPET_ATTRIBUTE);
IElementType DOC_SNIPPET_ATTRIBUTE_LIST =
new JavaDocCompositeElementType("DOC_SNIPPET_ATTRIBUTE_LIST", () -> new PsiSnippetAttributeListImpl(), BasicJavaDocElementType.DOC_SNIPPET_ATTRIBUTE_LIST);
IElementType DOC_SNIPPET_ATTRIBUTE_VALUE = new JavaDocParentProviderElementType("DOC_SNIPPET_ATTRIBUTE_VALUE", BasicJavaDocElementType.DOC_SNIPPET_ATTRIBUTE_VALUE);
new JavaDocCompositeElementType("DOC_SNIPPET_ATTRIBUTE_LIST", () -> new PsiSnippetAttributeListImpl(), BasicJavaDocElementType.BASIC_DOC_SNIPPET_ATTRIBUTE_LIST);
IElementType DOC_SNIPPET_ATTRIBUTE_VALUE = new JavaDocParentProviderElementType("DOC_SNIPPET_ATTRIBUTE_VALUE", BasicJavaDocElementType.BASIC_DOC_SNIPPET_ATTRIBUTE_VALUE);
ILazyParseableElementType DOC_REFERENCE_HOLDER = new BasicJavaDocElementType.DocReferenceHolderElementType(
() -> JavaParser.INSTANCE,