MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +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-28 10:42:31 +02: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

12
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/AbstractBasicJavadocTypedHandler.java
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;
}
}

4
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/smartEnter/CommentBreakerEnterProcessor.java
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

4
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/smartEnter/IfConditionFixer.java
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();

2
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AbstractBasicBackBasicSelectioner.java
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);
}
}

4
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/DocCommentSelectioner.java
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

2
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/DocTagSelectioner.java
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

2
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/JavaBasicWordSelectionFilter.java
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));
}

4
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java
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++;
}

2
java/java-frontback-impl/src/com/intellij/ide/highlighter/AbstractBasicJavaFileHighlighter.java
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);

14
java/java-frontback-impl/src/com/intellij/javadoc/AbstractBasicJavadocHelper.java
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;
}