From 8ccc2a873594f81c5fd06f51fa171c28b0f9ccb6 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 4 Aug 2010 10:46:48 +0400 Subject: [PATCH] Obsolete javadoc token type eliminated --- .../ide/util/importProject/ModuleInsight.java | 3 ++- .../completion/JavaCompletionContributor.java | 5 +++-- .../completion/simple/RParenthTailType.java | 3 ++- .../impl/analysis/HighlightNamesUtil.java | 3 ++- .../editorActions/JavaQuoteHandler.java | 3 ++- .../smartEnter/SemicolonFixer.java | 3 ++- .../highlighting/JavaBraceMatcher.java | 3 ++- .../src/com/intellij/ide/util/JavaUtil.java | 3 ++- .../com/intellij/ide/util/JavaUtilForVfs.java | 3 ++- .../com/intellij/lang/java/JavaCommenter.java | 3 ++- .../lang/java/JavaParserDefinition.java | 5 +++-- .../intellij/lexer/JavaHighlightingLexer.java | 8 +++---- .../src/com/intellij/lexer/JavaLexer.java | 3 ++- .../src/com/intellij/lexer/_JavaLexer.flex | 3 ++- .../src/com/intellij/lexer/_JavaLexer.java | 3 ++- .../src/com/intellij/psi/TokenTypeEx.java | 22 ------------------- .../java/BlockContainingJavaBlock.java | 5 ++--- .../cache/impl/idCache/JavaFilterLexer.java | 4 ++-- .../psi/impl/source/PsiTypeElementImpl.java | 4 ++-- .../psi/impl/source/parsing/ParseUtil.java | 8 +++++-- .../psi/impl/source/tree/ElementType.java | 10 ++++----- .../impl/source/tree/JavaSharedImplUtil.java | 2 -- .../psi/impl/source/tree/StdTokenSets.java | 8 ++++--- .../impl/source/tree/java/ClassElement.java | 3 +-- .../source/tree/java/EnumConstantElement.java | 2 +- .../impl/source/tree/java/FieldElement.java | 2 +- .../impl/source/tree/java/MethodElement.java | 3 +-- .../java/PsiDeclarationStatementImpl.java | 2 +- .../tree/java/PsiExpressionListImpl.java | 2 +- .../src/com/intellij/psi/JavaTokenType.java | 18 +-------------- .../make/FormSourceCodeGenerator.java | 3 ++- 31 files changed, 63 insertions(+), 89 deletions(-) delete mode 100644 java/java-impl/src/com/intellij/psi/TokenTypeEx.java diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java index 890b2faa0235..ef597b904cf1 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java @@ -25,6 +25,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.JavaTokenType; +import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.util.StringBuilderSpinAllocator; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.StringInterner; @@ -576,7 +577,7 @@ public class ModuleInsight { } private static void skipWhiteSpaceAndComments(Lexer lexer){ - while(JavaTokenType.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(lexer.getTokenType())) { + while(ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(lexer.getTokenType())) { lexer.advance(); } } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java index 132b0b2b211c..a7d4765b5c74 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java @@ -46,6 +46,7 @@ import com.intellij.psi.filters.element.ExcludeDeclaredFilter; import com.intellij.psi.filters.element.ModifierFilter; import com.intellij.psi.filters.getters.ExpectedTypesGetter; import com.intellij.psi.filters.types.AssignableFromFilter; +import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.psi.scope.ElementClassFilter; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; @@ -530,14 +531,14 @@ public class JavaCompletionContributor extends CompletionContributor { return true; } - while (!iterator.atEnd() && JavaTokenType.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(iterator.getTokenType())) { + while (!iterator.atEnd() && ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(iterator.getTokenType())) { iterator.advance(); } if (iterator.atEnd() || iterator.getTokenType() != JavaTokenType.IDENTIFIER) return false; iterator.advance(); - while (!iterator.atEnd() && JavaTokenType.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(iterator.getTokenType())) { + while (!iterator.atEnd() && ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(iterator.getTokenType())) { iterator.advance(); } if (iterator.atEnd()) return false; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/simple/RParenthTailType.java b/java/java-impl/src/com/intellij/codeInsight/completion/simple/RParenthTailType.java index 9520d1b3e61c..842bb8c7fc93 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/simple/RParenthTailType.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/simple/RParenthTailType.java @@ -26,6 +26,7 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; +import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.java.IJavaElementType; import com.intellij.psi.util.PsiTreeUtil; @@ -87,7 +88,7 @@ public abstract class RParenthTailType extends TailType { for(HighlighterIterator iterator = highlighter.createIterator(tailOffset); !iterator.atEnd(); iterator.advance()){ final IElementType tokenType = iterator.getTokenType(); - if ((!(tokenType instanceof IJavaElementType) || !JavaTokenType.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(tokenType)) && + if ((!(tokenType instanceof IJavaElementType) || !ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(tokenType)) && tokenType != TokenType.WHITE_SPACE) { final int start = iterator.getStart(); if (iterator.getEnd() == start + 1 && ')' == charsSequence.charAt(start)) { diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java index 2726a40bbaec..84001ef7b9d2 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java @@ -33,6 +33,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.impl.source.jsp.jspJava.JspHolderMethod; +import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.psi.impl.source.tree.TreeUtil; import com.intellij.psi.search.scope.packageSet.NamedScope; import com.intellij.psi.search.scope.packageSet.NamedScopesHolder; @@ -241,7 +242,7 @@ public class HighlightNamesUtil { do { node = TreeUtil.nextLeaf(node); } - while (node != null && JavaTokenType.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(node.getElementType())); + while (node != null && ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(node.getElementType())); } if (node != null) return node.getTextRange().getStartOffset(); return textRange.getStartOffset(); diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaQuoteHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaQuoteHandler.java index 7b1d7eef4597..28b1548eb0e2 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaQuoteHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaQuoteHandler.java @@ -17,6 +17,7 @@ package com.intellij.codeInsight.editorActions; import com.intellij.openapi.editor.highlighter.HighlighterIterator; import com.intellij.psi.*; +import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; @@ -88,7 +89,7 @@ public class JavaQuoteHandler extends SimpleTokenSetQuoteHandler implements Java } public static boolean isAppropriateElementTypeForLiteralStatic(final IElementType tokenType) { - return TokenTypeEx.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(tokenType) + return ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(tokenType) || tokenType == JavaTokenType.SEMICOLON || tokenType == JavaTokenType.COMMA || tokenType == JavaTokenType.RPARENTH diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java index c2b9f4b45b2b..f5ab37233b37 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java @@ -20,6 +20,7 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; +import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.psi.impl.source.tree.TreeUtil; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; @@ -63,7 +64,7 @@ public class SemicolonFixer implements Fixer { int tailLength = 0; ASTNode leaf = TreeUtil.findLastLeaf(psiElement.getNode()); - while (JavaTokenType.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(leaf.getElementType())) { + while (ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(leaf.getElementType())) { tailLength += leaf.getTextLength(); leaf = TreeUtil.prevLeaf(leaf); } diff --git a/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java index 4fc418f28d98..14e9db2b9665 100644 --- a/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java +++ b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java @@ -20,6 +20,7 @@ import com.intellij.lang.BracePair; import com.intellij.lang.PairedBraceMatcher; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; +import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.java.IJavaElementType; import org.jetbrains.annotations.NotNull; @@ -43,7 +44,7 @@ public class JavaBraceMatcher implements PairedBraceMatcher { } private static boolean isPairedBracesAllowedBeforeTypeInJava(final IElementType tokenType) { - return TokenTypeEx.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(tokenType) + return ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(tokenType) || tokenType == JavaTokenType.SEMICOLON || tokenType == JavaTokenType.COMMA || tokenType == JavaTokenType.RPARENTH diff --git a/java/java-impl/src/com/intellij/ide/util/JavaUtil.java b/java/java-impl/src/com/intellij/ide/util/JavaUtil.java index e71d32f0448f..049225494558 100644 --- a/java/java-impl/src/com/intellij/ide/util/JavaUtil.java +++ b/java/java-impl/src/com/intellij/ide/util/JavaUtil.java @@ -28,6 +28,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.JavaTokenType; +import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.util.text.CharArrayCharSequence; import java.io.File; @@ -188,7 +189,7 @@ public class JavaUtil { } private static void skipWhiteSpaceAndComments(Lexer lexer){ - while(JavaTokenType.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(lexer.getTokenType())) { + while(ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(lexer.getTokenType())) { lexer.advance(); } } diff --git a/java/java-impl/src/com/intellij/ide/util/JavaUtilForVfs.java b/java/java-impl/src/com/intellij/ide/util/JavaUtilForVfs.java index 995a465e16ea..e72a9863c3e6 100644 --- a/java/java-impl/src/com/intellij/ide/util/JavaUtilForVfs.java +++ b/java/java-impl/src/com/intellij/ide/util/JavaUtilForVfs.java @@ -28,6 +28,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.JavaTokenType; +import com.intellij.psi.impl.source.tree.ElementType; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -176,7 +177,7 @@ public class JavaUtilForVfs { } private static void skipWhiteSpaceAndComments(Lexer lexer){ - while(JavaTokenType.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(lexer.getTokenType())) { + while(ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(lexer.getTokenType())) { lexer.advance(); } } diff --git a/java/java-impl/src/com/intellij/lang/java/JavaCommenter.java b/java/java-impl/src/com/intellij/lang/java/JavaCommenter.java index 3d01b7bce8ef..24d6e52d3a7b 100644 --- a/java/java-impl/src/com/intellij/lang/java/JavaCommenter.java +++ b/java/java-impl/src/com/intellij/lang/java/JavaCommenter.java @@ -18,6 +18,7 @@ package com.intellij.lang.java; import com.intellij.lang.CodeDocumentationAwareCommenter; import com.intellij.psi.JavaTokenType; import com.intellij.psi.PsiComment; +import com.intellij.psi.impl.source.tree.JavaDocElementType; import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.Nullable; @@ -59,7 +60,7 @@ public class JavaCommenter implements CodeDocumentationAwareCommenter { @Nullable public IElementType getDocumentationCommentTokenType() { - return JavaTokenType.DOC_COMMENT; + return JavaDocElementType.DOC_COMMENT; } public String getDocumentationCommentPrefix() { diff --git a/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java b/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java index b6ce684ffcab..a6379a2b8a9a 100644 --- a/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java +++ b/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java @@ -28,6 +28,7 @@ import com.intellij.psi.*; import com.intellij.psi.impl.java.stubs.JavaStubElementType; import com.intellij.psi.impl.java.stubs.JavaStubElementTypes; import com.intellij.psi.impl.source.PsiJavaFileImpl; +import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.psi.impl.source.tree.JavaElementType; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IFileElementType; @@ -56,12 +57,12 @@ public class JavaParserDefinition implements ParserDefinition { @NotNull public TokenSet getWhitespaceTokens() { - return JavaTokenType.WHITESPACE_BIT_SET; + return ElementType.JAVA_WHITESPACE_BIT_SET; } @NotNull public TokenSet getCommentTokens() { - return JavaTokenType.COMMENT_BIT_SET; + return ElementType.JAVA_COMMENT_BIT_SET; } @NotNull diff --git a/java/java-impl/src/com/intellij/lexer/JavaHighlightingLexer.java b/java/java-impl/src/com/intellij/lexer/JavaHighlightingLexer.java index 220572eeb3e8..e47b804fbd0d 100644 --- a/java/java-impl/src/com/intellij/lexer/JavaHighlightingLexer.java +++ b/java/java-impl/src/com/intellij/lexer/JavaHighlightingLexer.java @@ -18,6 +18,7 @@ package com.intellij.lexer; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.JavaDocTokenType; import com.intellij.psi.JavaTokenType; +import com.intellij.psi.impl.source.tree.JavaDocElementType; import com.intellij.psi.tree.IElementType; @@ -39,11 +40,8 @@ public class JavaHighlightingLexer extends LayeredLexer { HtmlHighlightingLexer lexer = new HtmlHighlightingLexer(); lexer.setHasNoEmbeddments(true); - docLexer.registerLayer(lexer, - new IElementType[]{JavaDocTokenType.DOC_COMMENT_DATA}); + docLexer.registerLayer(lexer, JavaDocTokenType.DOC_COMMENT_DATA); - registerSelfStoppingLayer(docLexer, - new IElementType[]{JavaTokenType.DOC_COMMENT}, - new IElementType[]{JavaDocTokenType.DOC_COMMENT_END}); + registerSelfStoppingLayer(docLexer, new IElementType[]{JavaDocElementType.DOC_COMMENT}, IElementType.EMPTY_ARRAY); } } diff --git a/java/java-impl/src/com/intellij/lexer/JavaLexer.java b/java/java-impl/src/com/intellij/lexer/JavaLexer.java index bc69953fcf41..21a8a1a00552 100644 --- a/java/java-impl/src/com/intellij/lexer/JavaLexer.java +++ b/java/java-impl/src/com/intellij/lexer/JavaLexer.java @@ -19,6 +19,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.JavaTokenType; import com.intellij.psi.TokenType; +import com.intellij.psi.impl.source.tree.JavaDocElementType; import com.intellij.psi.tree.IElementType; import gnu.trove.THashSet; @@ -254,7 +255,7 @@ public class JavaLexer extends LexerBase { myTokenEndOffset = getClosingComment(myBufferIndex + 2); } else { - myTokenType = JavaTokenType.DOC_COMMENT; + myTokenType = JavaDocElementType.DOC_COMMENT; myTokenEndOffset = getDocClosingComment(myBufferIndex + 3); } } diff --git a/java/java-impl/src/com/intellij/lexer/_JavaLexer.flex b/java/java-impl/src/com/intellij/lexer/_JavaLexer.flex index 4e79d1a07a96..ad8d108f22c1 100644 --- a/java/java-impl/src/com/intellij/lexer/_JavaLexer.flex +++ b/java/java-impl/src/com/intellij/lexer/_JavaLexer.flex @@ -1,6 +1,7 @@ /* It's an automatically generated code. Do not modify it. */ package com.intellij.lexer; import com.intellij.psi.*; +import com.intellij.psi.impl.source.tree.JavaDocElementType; import com.intellij.psi.tree.IElementType; %% @@ -70,7 +71,7 @@ ESCAPE_SEQUENCE=\\[^\r\n] {C_STYLE_COMMENT} { return JavaTokenType.C_STYLE_COMMENT; } {END_OF_LINE_COMMENT} { return JavaTokenType.END_OF_LINE_COMMENT; } - {DOC_COMMENT} { return JavaTokenType.DOC_COMMENT; } + {DOC_COMMENT} { return JavaDocElementType.DOC_COMMENT; } {LONG_LITERAL} { return JavaTokenType.LONG_LITERAL; } {INTEGER_LITERAL} { return JavaTokenType.INTEGER_LITERAL; } diff --git a/java/java-impl/src/com/intellij/lexer/_JavaLexer.java b/java/java-impl/src/com/intellij/lexer/_JavaLexer.java index 9e52e8fb98dd..4c4df7f4699c 100644 --- a/java/java-impl/src/com/intellij/lexer/_JavaLexer.java +++ b/java/java-impl/src/com/intellij/lexer/_JavaLexer.java @@ -19,6 +19,7 @@ /* It's an automatically generated code. Do not modify it. */ package com.intellij.lexer; import com.intellij.psi.*; +import com.intellij.psi.impl.source.tree.JavaDocElementType; import com.intellij.psi.tree.IElementType; @@ -1049,7 +1050,7 @@ class _JavaLexer implements FlexLexer { } case 116: break; case 55: - { return JavaTokenType.DOC_COMMENT; + { return JavaDocElementType.DOC_COMMENT; } case 117: break; case 64: diff --git a/java/java-impl/src/com/intellij/psi/TokenTypeEx.java b/java/java-impl/src/com/intellij/psi/TokenTypeEx.java deleted file mode 100644 index 9751bf7f496a..000000000000 --- a/java/java-impl/src/com/intellij/psi/TokenTypeEx.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2000-2009 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.psi; - -public interface TokenTypeEx extends - TokenType, - JavaTokenType, - JavaDocTokenType { -} diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java index 0ebfd63de31f..c8b11d1f9f08 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java @@ -17,7 +17,6 @@ package com.intellij.psi.formatter.java; import com.intellij.formatting.*; import com.intellij.lang.ASTNode; -import com.intellij.psi.JavaTokenType; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.formatter.FormatterUtil; import com.intellij.psi.impl.source.tree.ElementType; @@ -72,8 +71,8 @@ public class BlockContainingJavaBlock extends AbstractJavaBlock{ // We want to have the comment and method as distinct blocks then in order to correctly process indentation for inner method // elements. See IDEA-53778 for example of situation when it is significant. if (prevChild != null && myNode.getElementType() == ElementType.METHOD - && JavaTokenType.COMMENT_BIT_SET.contains(prevChild.getElementType()) - && !JavaTokenType.COMMENT_BIT_SET.contains(child.getElementType())) + && ElementType.JAVA_COMMENT_BIT_SET.contains(prevChild.getElementType()) + && !ElementType.JAVA_COMMENT_BIT_SET.contains(child.getElementType())) { prevChild = child; child = composeCodeBlock(result, child, Indent.getNoneIndent(), 0, null); diff --git a/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaFilterLexer.java b/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaFilterLexer.java index 04b1191a19cd..b544069e8901 100644 --- a/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaFilterLexer.java +++ b/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaFilterLexer.java @@ -18,6 +18,7 @@ package com.intellij.psi.impl.cache.impl.idCache; import com.intellij.lexer.Lexer; import com.intellij.psi.JavaTokenType; import com.intellij.psi.impl.cache.impl.BaseFilterLexer; +import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.psi.search.UsageSearchContext; import com.intellij.psi.tree.IElementType; @@ -41,8 +42,7 @@ public class JavaFilterLexer extends BaseFilterLexer { else if (tokenType == JavaTokenType.STRING_LITERAL) { scanWordsInToken(UsageSearchContext.IN_STRINGS | UsageSearchContext.IN_FOREIGN_LANGUAGES, false, true); } - else if (tokenType == JavaTokenType.END_OF_LINE_COMMENT || tokenType == JavaTokenType.C_STYLE_COMMENT || - tokenType == JavaTokenType.DOC_COMMENT) { + else if (ElementType.JAVA_COMMENT_BIT_SET.contains(tokenType)) { scanWordsInToken(UsageSearchContext.IN_COMMENTS, false, false); advanceTodoItemCountsInToken(); } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java index c81487e7c909..eb7db4d1b4de 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java @@ -97,7 +97,7 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl else if (elementType == JavaTokenType.QUEST) { cachedType = createWildcardType(); } - else if (JavaTokenType.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(elementType)) { + else if (ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(elementType)) { element = element.getTreeNext(); continue; } @@ -257,7 +257,7 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl List result = null; for (ASTNode child = getFirstChildNode(); child != null; child = child.getTreeNext()) { if (child.getElementType() != JavaElementType.ANNOTATION) continue; - ASTNode next = TreeUtil.skipElements(child.getTreeNext(), JavaTokenType.WHITE_SPACE_OR_COMMENT_BIT_SET); + ASTNode next = TreeUtil.skipElements(child.getTreeNext(), ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET); if (next != null && next.getElementType() == JavaTokenType.LBRACKET) continue; //annotation on array dimension if (result == null) result = new SmartList(); PsiElement element = child.getPsi(); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/parsing/ParseUtil.java b/java/java-impl/src/com/intellij/psi/impl/source/parsing/ParseUtil.java index 83daa4f650c6..452e39453a59 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/parsing/ParseUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/parsing/ParseUtil.java @@ -31,15 +31,19 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import com.intellij.util.CharTable; import com.intellij.util.SmartList; +import org.jetbrains.annotations.Nullable; import java.util.Iterator; import java.util.List; public class ParseUtil { + private ParseUtil() { } + + @Nullable public static TreeElement createTokenElement(Lexer lexer, CharTable table) { IElementType tokenType = lexer.getTokenType(); if (tokenType == null) return null; - if (tokenType == JavaTokenType.DOC_COMMENT) { + if (tokenType == JavaDocElementType.DOC_COMMENT) { return ASTFactory.lazy(JavaDocElementType.DOC_COMMENT, LexerUtil.internToken(lexer, table)); } else { @@ -263,7 +267,7 @@ public class ParseUtil { TokenType.WHITE_SPACE); private static void bindPrecedingComment(TreeElement comment, ASTNode bindTo) { - if (bindTo == null || bindTo.getFirstChildNode() != null && bindTo.getFirstChildNode().getElementType() == JavaTokenType.DOC_COMMENT) return; + if (bindTo == null || bindTo.getFirstChildNode() != null && bindTo.getFirstChildNode().getElementType() == JavaDocElementType.DOC_COMMENT) return; if (bindTo.getElementType() == JavaElementType.IMPORT_LIST && bindTo.getTextLength() == 0) { bindTo = bindTo.getTreeNext(); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/ElementType.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/ElementType.java index 0a648ba40451..322aec858cb2 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/ElementType.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/ElementType.java @@ -15,22 +15,20 @@ */ package com.intellij.psi.impl.source.tree; +import com.intellij.psi.JavaDocTokenType; import com.intellij.psi.JavaTokenType; import com.intellij.psi.PsiTypeElement; -import com.intellij.psi.TokenTypeEx; import com.intellij.psi.impl.source.PsiElementArrayConstructor; import com.intellij.psi.jsp.JspElementType; import com.intellij.psi.tree.TokenSet; -public interface ElementType extends - TokenTypeEx, - JavaElementType, - JavaDocElementType { +public interface ElementType extends JavaTokenType, JavaDocTokenType, + JavaElementType, JavaDocElementType { TokenSet WHITE_SPACE_BIT_SET = TokenSet.create(WHITE_SPACE, JspElementType.JSP_TEMPLATE_EXPRESSION); TokenSet JAVA_WHITESPACE_BIT_SET = TokenSet.create(WHITE_SPACE); - TokenSet JAVA_COMMENT_BIT_SET = TokenSet.create(END_OF_LINE_COMMENT, C_STYLE_COMMENT, JavaTokenType.DOC_COMMENT, JavaDocElementType.DOC_COMMENT); + TokenSet JAVA_COMMENT_BIT_SET = TokenSet.create(END_OF_LINE_COMMENT, C_STYLE_COMMENT, JavaDocElementType.DOC_COMMENT); TokenSet JAVA_COMMENT_OR_WHITESPACE_BIT_SET = TokenSet.orSet(JAVA_WHITESPACE_BIT_SET, JAVA_COMMENT_BIT_SET); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java index 2f9f9294306d..74aefb37e8d2 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java @@ -50,7 +50,6 @@ public class JavaSharedImplUtil { else if (i != JavaTokenType.RBRACKET && i != TokenType.WHITE_SPACE && i != JavaTokenType.C_STYLE_COMMENT && i != JavaDocElementType.DOC_COMMENT && - i != JavaTokenType.DOC_COMMENT && i != JavaTokenType.END_OF_LINE_COMMENT) { break; } @@ -79,7 +78,6 @@ public class JavaSharedImplUtil { else if (i != JavaTokenType.RBRACKET && i != TokenType.WHITE_SPACE && i != JavaTokenType.C_STYLE_COMMENT && i != JavaDocElementType.DOC_COMMENT && - i != JavaTokenType.DOC_COMMENT && i != JavaTokenType.END_OF_LINE_COMMENT) { break; } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/StdTokenSets.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/StdTokenSets.java index a5ffdfcbe3c9..218ed43235ce 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/StdTokenSets.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/StdTokenSets.java @@ -15,7 +15,6 @@ */ package com.intellij.psi.impl.source.tree; -import com.intellij.psi.JavaTokenType; import com.intellij.psi.jsp.JspElementType; import com.intellij.psi.tree.TokenSet; import com.intellij.psi.xml.XmlElementType; @@ -24,6 +23,9 @@ import com.intellij.psi.xml.XmlElementType; * @author mike */ public interface StdTokenSets { - TokenSet COMMENT_BIT_SET = TokenSet.orSet(ElementType.JAVA_COMMENT_BIT_SET, TokenSet.create(JspElementType.JSP_COMMENT, XmlElementType.XML_COMMENT)); - TokenSet WHITE_SPACE_OR_COMMENT_BIT_SET = TokenSet.orSet(ElementType.WHITE_SPACE_BIT_SET, JavaTokenType.COMMENT_BIT_SET); + TokenSet COMMENT_BIT_SET = TokenSet.orSet( + ElementType.JAVA_COMMENT_BIT_SET, TokenSet.create(JspElementType.JSP_COMMENT, XmlElementType.XML_COMMENT)); + + TokenSet WHITE_SPACE_OR_COMMENT_BIT_SET = TokenSet.orSet( + ElementType.WHITE_SPACE_BIT_SET, ElementType.JAVA_COMMENT_BIT_SET); } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java index 1fefd0c7d6f9..6e1097c33747 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java @@ -51,8 +51,7 @@ public class ClassElement extends CompositeElement implements Constants { public TreeElement addInternal(TreeElement first, ASTNode last, ASTNode anchor, Boolean before) { PsiClass psiClass = (PsiClass)SourceTreeToPsiMap.treeElementToPsi(this); if (anchor == null) { - if (first.getElementType() != JavaDocElementType.DOC_COMMENT && - first.getElementType() != JavaTokenType.DOC_COMMENT) { + if (first.getElementType() != JavaDocElementType.DOC_COMMENT) { if (before == null) { if (first == last) { PsiElement firstPsi = SourceTreeToPsiMap.treeElementToPsi(first); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java index 12aff32fdfe6..e3d3a0d27423 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java @@ -63,7 +63,7 @@ public class EnumConstantElement extends CompositeElement implements Constants { public int getChildRole(ASTNode child) { LOG.assertTrue(child.getTreeParent() == this); IElementType i = child.getElementType(); - if (i == JavaTokenType.DOC_COMMENT || i == JavaDocElementType.DOC_COMMENT) { + if (i == JavaDocElementType.DOC_COMMENT) { return getChildRole(child, ChildRole.DOC_COMMENT); } else if (i == JavaTokenType.C_STYLE_COMMENT || i == JavaTokenType.END_OF_LINE_COMMENT) { diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/FieldElement.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/FieldElement.java index 8dae2e212a35..5fd1c0c780a6 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/FieldElement.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/FieldElement.java @@ -82,7 +82,7 @@ public class FieldElement extends CompositeElement{ public int getChildRole(ASTNode child) { assert (child.getTreeParent() == this); IElementType i = child.getElementType(); - if (i == JavaTokenType.DOC_COMMENT || i == JavaDocElementType.DOC_COMMENT) { + if (i == JavaDocElementType.DOC_COMMENT) { return getChildRole(child, ChildRole.DOC_COMMENT); } else if (i == JavaTokenType.C_STYLE_COMMENT || i == JavaTokenType.END_OF_LINE_COMMENT) { diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java index db5f4d8e9f7c..7f5bf4a9e240 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java @@ -17,7 +17,6 @@ package com.intellij.psi.impl.source.tree.java; import com.intellij.lang.ASTNode; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.psi.JavaTokenType; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; import com.intellij.psi.TokenType; @@ -115,7 +114,7 @@ public class MethodElement extends CompositeElement implements Constants { public int getChildRole(ASTNode child) { LOG.assertTrue(child.getTreeParent() == this); IElementType i = child.getElementType(); - if (i == JavaTokenType.DOC_COMMENT || i == JavaDocElementType.DOC_COMMENT) { + if (i == JavaDocElementType.DOC_COMMENT) { return getChildRole(child, ChildRole.DOC_COMMENT); } else if (i == C_STYLE_COMMENT || i == END_OF_LINE_COMMENT) { diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java index ebbeb790dede..2d529395154d 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java @@ -77,7 +77,7 @@ public class PsiDeclarationStatementImpl extends CompositePsiElement implements ASTNode prev = child; do { prev = prev.getTreePrev(); - } while (prev != null && JavaTokenType.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(prev.getElementType())); + } while (prev != null && ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(prev.getElementType())); if (prev != null && prev.getElementType() == JavaTokenType.COMMA) deleteChildInternal(prev); } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java index aedf71709a7a..e77a8b470f1d 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java @@ -130,7 +130,7 @@ public class PsiExpressionListImpl extends CompositePsiElement implements PsiExp for (ASTNode child = element.getTreePrev(); child != null; child = child.getTreePrev()) { final IElementType t = child.getElementType(); if (t == JavaTokenType.COMMA) break; - if (ElementType.EXPRESSION_BIT_SET.contains(t) || ElementType.COMMENT_BIT_SET.contains(t)) { + if (ElementType.EXPRESSION_BIT_SET.contains(t) || ElementType.JAVA_COMMENT_BIT_SET.contains(t)) { TreeElement comma = Factory.createSingleLeafElement(JavaTokenType.COMMA, ",", 0, 1, treeCharTab, getManager()); super.addInternal(comma, comma, child, Boolean.FALSE); break; diff --git a/java/openapi/src/com/intellij/psi/JavaTokenType.java b/java/openapi/src/com/intellij/psi/JavaTokenType.java index b2d9876d07e9..e80690146766 100644 --- a/java/openapi/src/com/intellij/psi/JavaTokenType.java +++ b/java/openapi/src/com/intellij/psi/JavaTokenType.java @@ -23,11 +23,9 @@ import com.intellij.psi.tree.java.IKeywordElementType; @SuppressWarnings({"JavaDoc"}) public interface JavaTokenType extends TokenType{ - //IElementType WHITE_SPACE = new IJavaElementType("WHITE_SPACE"); IElementType IDENTIFIER = new IJavaElementType("IDENTIFIER"); IElementType C_STYLE_COMMENT = new IJavaElementType("C_STYLE_COMMENT"); IElementType END_OF_LINE_COMMENT = new IJavaElementType("END_OF_LINE_COMMENT"); - IElementType DOC_COMMENT = new IJavaElementType("DOC_COMMENT"); IElementType INTEGER_LITERAL = new IJavaElementType("INTEGER_LITERAL"); IElementType LONG_LITERAL = new IJavaElementType("LONG_LITERAL"); @@ -36,8 +34,8 @@ public interface JavaTokenType extends TokenType{ IElementType CHARACTER_LITERAL = new IJavaElementType("CHARACTER_LITERAL"); IElementType STRING_LITERAL = new IJavaElementType("STRING_LITERAL"); - IElementType TRUE_KEYWORD = new IKeywordElementType("TRUE_KEYWORD"); + IElementType FALSE_KEYWORD = new IKeywordElementType("FALSE_KEYWORD"); IElementType NULL_KEYWORD = new IKeywordElementType("NULL_KEYWORD"); IElementType ABSTRACT_KEYWORD = new IKeywordElementType("ABSTRACT_KEYWORD"); @@ -142,8 +140,6 @@ public interface JavaTokenType extends TokenType{ IElementType GTGTEQ = new IJavaElementType("GTGTEQ"); IElementType GTGTGTEQ = new IJavaElementType("GTGTGTEQ"); - IElementType FALSE_KEYWORD = new IKeywordElementType("FALSE_KEYWORD"); - TokenSet OPERATION_BIT_SET = TokenSet.create( EQ, GT, LT, EXCL, TILDE, QUEST, COLON, PLUS, MINUS, ASTERISK, DIV, AND, OR, XOR, PERC, EQEQ, LE, GE, NE, ANDAND, OROR, PLUSPLUS, MINUSMINUS, LTLT, GTGT, GTGTGT, @@ -168,16 +164,4 @@ public interface JavaTokenType extends TokenType{ ABSTRACT_KEYWORD, FINAL_KEYWORD, NATIVE_KEYWORD, STRICTFP_KEYWORD, SYNCHRONIZED_KEYWORD, TRANSIENT_KEYWORD, VOLATILE_KEYWORD ); - - TokenSet WHITE_SPACE_OR_COMMENT_BIT_SET = TokenSet.create( - WHITE_SPACE, END_OF_LINE_COMMENT, C_STYLE_COMMENT, DOC_COMMENT - ); - - TokenSet WHITESPACE_BIT_SET = TokenSet.create( - WHITE_SPACE - ); - - TokenSet COMMENT_BIT_SET = TokenSet.create( - END_OF_LINE_COMMENT, C_STYLE_COMMENT, DOC_COMMENT, JavaDocTokenType.DOC_COMMENT_DATA - ); } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/make/FormSourceCodeGenerator.java b/plugins/ui-designer/src/com/intellij/uiDesigner/make/FormSourceCodeGenerator.java index ebea7c275318..6a28751d7027 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/make/FormSourceCodeGenerator.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/make/FormSourceCodeGenerator.java @@ -33,6 +33,7 @@ import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.JavaCodeStyleManager; +import com.intellij.psi.impl.source.tree.JavaDocElementType; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.InheritanceUtil; @@ -390,7 +391,7 @@ public final class FormSourceCodeGenerator { if (oldLexem != newLexem) { return false; } - if (oldLexem != TokenType.WHITE_SPACE && oldLexem != JavaTokenType.DOC_COMMENT) { + if (oldLexem != TokenType.WHITE_SPACE && oldLexem != JavaDocElementType.DOC_COMMENT) { int oldStart = oldTextLexer.getTokenStart(); int newStart = newTextLexer.getTokenStart(); int oldLength = oldTextLexer.getTokenEnd() - oldTextLexer.getTokenStart();