From 929cd6154d0d4b1e5dbd5a1ae3b20551e16a7dba Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Sat, 19 Nov 2011 13:36:44 +0400 Subject: [PATCH] IDEA-77151: GUI freeze on opening a JSP file in the editor: ensure parsers instantiation order --- .../impl/source/tree/JavaTreeGenerator.java | 4 +-- .../lang/java/parser/DeclarationParser.java | 1 - .../lang/java/parser/ExpressionParser.java | 2 -- .../intellij/lang/java/parser/FileParser.java | 2 +- .../lang/java/parser/JavaParsers.java | 27 +++++++++++++++++++ .../lang/java/parser/JavadocParser.java | 4 +-- .../lang/java/parser/ReferenceParser.java | 1 - .../lang/java/parser/StatementParser.java | 2 -- .../psi/impl/PsiElementFactoryImpl.java | 4 +-- .../psi/impl/PsiJavaParserFacadeImpl.java | 26 +++++++++--------- .../psi/impl/compiled/ClsParsingUtil.java | 4 +-- .../psi/impl/source/tree/JavaElementType.java | 17 +++++------- .../parser/partial/AnnotationParserTest.java | 4 +-- .../parser/partial/DeclarationParserTest.java | 4 +-- .../parser/partial/ExpressionParserTest.java | 4 +-- .../parser/partial/ReferenceParserTest.java | 7 ++--- .../parser/partial/StatementParserTest.java | 6 ++--- 17 files changed, 69 insertions(+), 50 deletions(-) create mode 100644 java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParsers.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java index 3a72e4807d3e..27db22071b7f 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java @@ -19,8 +19,8 @@ package com.intellij.psi.impl.source.tree; import com.intellij.lang.ASTFactory; import com.intellij.lang.ASTNode; import com.intellij.lang.PsiBuilder; -import com.intellij.lang.java.parser.DeclarationParser; import com.intellij.lang.java.parser.JavaParserUtil; +import com.intellij.lang.java.parser.JavaParsers; import com.intellij.lexer.JavaLexer; import com.intellij.lexer.Lexer; import com.intellij.openapi.diagnostic.Logger; @@ -49,7 +49,7 @@ public class JavaTreeGenerator implements TreeGenerator { private static final JavaParserUtil.ParserWrapper MOD_LIST = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - DeclarationParser.INSTANCE.parseModifierList(builder); + JavaParsers.DECLARATION_PARSER.parseModifierList(builder); } }; diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java index 451105b8f6de..ccb8e83f70e2 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java @@ -35,7 +35,6 @@ import static com.intellij.lang.java.parser.JavaParserUtil.exprType; public class DeclarationParser { - public static final DeclarationParser INSTANCE = new DeclarationParser(); private final ExpressionParser myExpressionParser; private final StatementParser myStatementParser; private final ReferenceParser myReferenceParser; diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java index cbc8960705b8..8424d8defa81 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java @@ -18,7 +18,6 @@ package com.intellij.lang.java.parser; import com.intellij.codeInsight.daemon.JavaErrorMessages; import com.intellij.lang.PsiBuilder; import com.intellij.lang.PsiBuilderUtil; -import com.intellij.openapi.util.Key; import com.intellij.psi.JavaTokenType; import com.intellij.psi.TokenType; import com.intellij.psi.impl.source.tree.ElementType; @@ -33,7 +32,6 @@ import static com.intellij.lang.java.parser.JavaParserUtil.*; public class ExpressionParser { - public static final ExpressionParser INSTANCE = new ExpressionParser(); private final DeclarationParser myDeclarationParser; private final ReferenceParser myReferenceParser; diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/FileParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/FileParser.java index 2fd3dfc609bd..af79846224af 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/FileParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/FileParser.java @@ -42,7 +42,7 @@ public class FileParser { TokenSet.create(JavaTokenType.CLASS_KEYWORD, JavaTokenType.INTERFACE_KEYWORD, JavaTokenType.ENUM_KEYWORD, JavaTokenType.AT)); private FileParser() { - this(DeclarationParser.INSTANCE, ReferenceParser.INSTANCE); + this(JavaParsers.DECLARATION_PARSER, JavaParsers.REFERENCE_PARSER); } protected FileParser(DeclarationParser declarationParser, ReferenceParser referenceParser) { diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParsers.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParsers.java new file mode 100644 index 000000000000..9729dba3758f --- /dev/null +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParsers.java @@ -0,0 +1,27 @@ +/* + * Copyright 2000-2011 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.lang.java.parser; + +/** + * @author Dmitry Avdeev + * Date: 11/19/11 + */ +public class JavaParsers { + public static final DeclarationParser DECLARATION_PARSER = new DeclarationParser(); + public static final ExpressionParser EXPRESSION_PARSER = new ExpressionParser(); + public static final ReferenceParser REFERENCE_PARSER = new ReferenceParser(); + public static final StatementParser STATEMENT_PARSER = new StatementParser(); +} diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavadocParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavadocParser.java index 41d8c581673f..b72e4a88d0d5 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavadocParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavadocParser.java @@ -51,12 +51,12 @@ public class JavadocParser { private JavadocParser() { } public static void parseJavadocReference(@NotNull final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseJavaCodeReference(builder, true, true, false, false, false); + JavaParsers.REFERENCE_PARSER.parseJavaCodeReference(builder, true, true, false, false, false); swallowTokens(builder); } public static void parseJavadocType(@NotNull final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS | ReferenceParser.WILDCARD); + JavaParsers.REFERENCE_PARSER.parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS | ReferenceParser.WILDCARD); swallowTokens(builder); } diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java index 76f611b23f4f..72273f25b6e9 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java @@ -33,7 +33,6 @@ import static com.intellij.lang.java.parser.JavaParserUtil.*; public class ReferenceParser { - public static final ReferenceParser INSTANCE = new ReferenceParser(); private final DeclarationParser myDeclarationParser; public static final int EAT_LAST_DOT = 0x01; diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java index 184c632a969f..b4294f6a4cd9 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java @@ -17,7 +17,6 @@ package com.intellij.lang.java.parser; import com.intellij.codeInsight.daemon.JavaErrorMessages; import com.intellij.lang.PsiBuilder; -import com.intellij.openapi.util.Key; import com.intellij.psi.JavaTokenType; import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.psi.impl.source.tree.JavaElementType; @@ -35,7 +34,6 @@ import static com.intellij.lang.java.parser.JavaParserUtil.*; public class StatementParser { - public static final StatementParser INSTANCE = new StatementParser(); private final ExpressionParser myExpressionParser; private final DeclarationParser myDeclarationParser; private final ReferenceParser myReferenceParser; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java index e71ee879602a..30e8d38b7624 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java @@ -17,7 +17,7 @@ package com.intellij.psi.impl; import com.intellij.lang.*; import com.intellij.lang.java.parser.JavaParserUtil; -import com.intellij.lang.java.parser.StatementParser; +import com.intellij.lang.java.parser.JavaParsers; import com.intellij.lexer.JavaLexer; import com.intellij.lexer.Lexer; import com.intellij.openapi.diagnostic.Logger; @@ -693,7 +693,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps private static final JavaParserUtil.ParserWrapper CATCH_SECTION = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - StatementParser.INSTANCE.parseCatchBlock(builder); + JavaParsers.STATEMENT_PARSER.parseCatchBlock(builder); } }; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java index cbc3b3152643..c1b21ff5290b 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java @@ -53,28 +53,28 @@ public class PsiJavaParserFacadeImpl implements PsiJavaParserFacade { private static final JavaParserUtil.ParserWrapper ANNOTATION = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - DeclarationParser.INSTANCE.parseAnnotation(builder); + JavaParsers.DECLARATION_PARSER.parseAnnotation(builder); } }; private static final JavaParserUtil.ParserWrapper PARAMETER = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - DeclarationParser.INSTANCE.parseParameter(builder, true, false); + JavaParsers.DECLARATION_PARSER.parseParameter(builder, true, false); } }; private static final JavaParserUtil.ParserWrapper RESOURCE = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - DeclarationParser.INSTANCE.parseResource(builder); + JavaParsers.DECLARATION_PARSER.parseResource(builder); } }; private static final JavaParserUtil.ParserWrapper TYPE = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS | + JavaParsers.REFERENCE_PARSER.parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS | ReferenceParser.WILDCARD | ReferenceParser.DISJUNCTIONS); } }; @@ -82,63 +82,63 @@ public class PsiJavaParserFacadeImpl implements PsiJavaParserFacade { public static final JavaParserUtil.ParserWrapper REFERENCE = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseJavaCodeReference(builder, false, true, false, false, false); + JavaParsers.REFERENCE_PARSER.parseJavaCodeReference(builder, false, true, false, false, false); } }; public static final JavaParserUtil.ParserWrapper DIAMOND_REF = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseJavaCodeReference(builder, false, true, false, false, true); + JavaParsers.REFERENCE_PARSER.parseJavaCodeReference(builder, false, true, false, false, true); } }; public static final JavaParserUtil.ParserWrapper STATIC_IMPORT_REF = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseImportCodeReference(builder, true); + JavaParsers.REFERENCE_PARSER.parseImportCodeReference(builder, true); } }; private static final JavaParserUtil.ParserWrapper TYPE_PARAMETER = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseTypeParameter(builder); + JavaParsers.REFERENCE_PARSER.parseTypeParameter(builder); } }; private static final JavaParserUtil.ParserWrapper DECLARATION = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - DeclarationParser.INSTANCE.parse(builder, DeclarationParser.Context.CLASS); + JavaParsers.DECLARATION_PARSER.parse(builder, DeclarationParser.Context.CLASS); } }; private static final JavaParserUtil.ParserWrapper CODE_BLOCK = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - StatementParser.INSTANCE.parseCodeBlockDeep(builder, true); + JavaParsers.STATEMENT_PARSER.parseCodeBlockDeep(builder, true); } }; private static final JavaParserUtil.ParserWrapper STATEMENT = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - StatementParser.INSTANCE.parseStatement(builder); + JavaParsers.STATEMENT_PARSER.parseStatement(builder); } }; private static final JavaParserUtil.ParserWrapper EXPRESSION = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - ExpressionParser.INSTANCE.parse(builder); + JavaParsers.EXPRESSION_PARSER.parse(builder); } }; private static final JavaParserUtil.ParserWrapper ENUM_CONSTANT = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - DeclarationParser.INSTANCE.parseEnumConstant(builder); + JavaParsers.DECLARATION_PARSER.parseEnumConstant(builder); } }; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java index 1719d97d27dd..06d73a71bc16 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java @@ -16,8 +16,8 @@ package com.intellij.psi.impl.compiled; import com.intellij.lang.PsiBuilder; -import com.intellij.lang.java.parser.DeclarationParser; import com.intellij.lang.java.parser.JavaParserUtil; +import com.intellij.lang.java.parser.JavaParsers; import com.intellij.openapi.diagnostic.Logger; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; @@ -40,7 +40,7 @@ public class ClsParsingUtil { private static final JavaParserUtil.ParserWrapper ANNOTATION_VALUE = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - DeclarationParser.INSTANCE.parseAnnotationValue(builder); + JavaParsers.DECLARATION_PARSER.parseAnnotationValue(builder); } }; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java index 54cb6a0cd522..de737552382a 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java @@ -17,10 +17,7 @@ package com.intellij.psi.impl.source.tree; import com.intellij.lang.*; import com.intellij.lang.java.JavaLanguage; -import com.intellij.lang.java.parser.ExpressionParser; -import com.intellij.lang.java.parser.JavaParserUtil; -import com.intellij.lang.java.parser.ReferenceParser; -import com.intellij.lang.java.parser.StatementParser; +import com.intellij.lang.java.parser.*; import com.intellij.lexer.JavaLexer; import com.intellij.lexer.Lexer; import com.intellij.openapi.project.Project; @@ -156,14 +153,14 @@ public interface JavaElementType { @Override public ASTNode parseContents(final ASTNode chameleon) { final PsiBuilder builder = JavaParserUtil.createBuilder(chameleon); - StatementParser.INSTANCE.parseCodeBlockDeep(builder, true); + JavaParsers.STATEMENT_PARSER.parseCodeBlockDeep(builder, true); return builder.getTreeBuilt().getFirstChildNode(); } @Override public FlyweightCapableTreeStructure parseContents(final LighterLazyParseableNode chameleon) { final PsiBuilder builder = JavaParserUtil.createBuilder(chameleon); - StatementParser.INSTANCE.parseCodeBlockDeep(builder, true); + JavaParsers.STATEMENT_PARSER.parseCodeBlockDeep(builder, true); return builder.getLightTree(); } @@ -196,7 +193,7 @@ public interface JavaElementType { private final JavaParserUtil.ParserWrapper myParser = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - StatementParser.INSTANCE.parseStatements(builder); + JavaParsers.STATEMENT_PARSER.parseStatements(builder); } }; @@ -211,7 +208,7 @@ public interface JavaElementType { private final JavaParserUtil.ParserWrapper myParser = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - ExpressionParser.INSTANCE.parse(builder); + JavaParsers.EXPRESSION_PARSER.parse(builder); } }; @@ -226,7 +223,7 @@ public interface JavaElementType { private final JavaParserUtil.ParserWrapper myParser = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseJavaCodeReference(builder, false, true, false, false, false); + JavaParsers.REFERENCE_PARSER.parseJavaCodeReference(builder, false, true, false, false, false); } }; @@ -241,7 +238,7 @@ public interface JavaElementType { private final JavaParserUtil.ParserWrapper myParser = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS | + JavaParsers.REFERENCE_PARSER.parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS | ReferenceParser.WILDCARD | ReferenceParser.DISJUNCTIONS); } }; diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/AnnotationParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/AnnotationParserTest.java index 27258014f885..68b94739a2a2 100644 --- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/AnnotationParserTest.java +++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/AnnotationParserTest.java @@ -16,7 +16,7 @@ package com.intellij.lang.java.parser.partial; import com.intellij.lang.PsiBuilder; -import com.intellij.lang.java.parser.DeclarationParser; +import com.intellij.lang.java.parser.JavaParsers; import com.intellij.lang.java.parser.JavaParsingTestCase; @@ -45,7 +45,7 @@ public class AnnotationParserTest extends JavaParsingTestCase { private static class MyTestParser1 implements TestParser { @Override public void parse(final PsiBuilder builder) { - DeclarationParser.INSTANCE.parseAnnotations(builder); + JavaParsers.DECLARATION_PARSER.parseAnnotations(builder); } } } diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java index e1fe92219b91..a35c0298a067 100644 --- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java +++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java @@ -16,7 +16,7 @@ package com.intellij.lang.java.parser.partial; import com.intellij.lang.PsiBuilder; -import com.intellij.lang.java.parser.DeclarationParser; +import com.intellij.lang.java.parser.JavaParsers; import com.intellij.lang.java.parser.JavaParsingTestCase; import com.intellij.pom.java.LanguageLevel; @@ -117,7 +117,7 @@ public class DeclarationParserTest extends JavaParsingTestCase { @Override public void parse(final PsiBuilder builder) { - DeclarationParser.INSTANCE.parseClassBodyWithBraces(builder, myAnnotation, myAnEnum); + JavaParsers.DECLARATION_PARSER.parseClassBodyWithBraces(builder, myAnnotation, myAnEnum); } } } diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java index a97e6a2416e9..c6f9f547d99a 100644 --- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java +++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java @@ -16,7 +16,7 @@ package com.intellij.lang.java.parser.partial; import com.intellij.lang.PsiBuilder; -import com.intellij.lang.java.parser.ExpressionParser; +import com.intellij.lang.java.parser.JavaParsers; import com.intellij.lang.java.parser.JavaParsingTestCase; import com.intellij.pom.java.LanguageLevel; import org.jetbrains.annotations.NonNls; @@ -124,7 +124,7 @@ public class ExpressionParserTest extends JavaParsingTestCase { private static class MyTestParser implements TestParser { @Override public void parse(final PsiBuilder builder) { - ExpressionParser.INSTANCE.parse(builder); + JavaParsers.EXPRESSION_PARSER.parse(builder); } } } diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ReferenceParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ReferenceParserTest.java index 5041a852adb0..996cefa17fa4 100644 --- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ReferenceParserTest.java +++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ReferenceParserTest.java @@ -16,6 +16,7 @@ package com.intellij.lang.java.parser.partial; import com.intellij.lang.PsiBuilder; +import com.intellij.lang.java.parser.JavaParsers; import com.intellij.lang.java.parser.JavaParsingTestCase; import com.intellij.lang.java.parser.ReferenceParser; import com.intellij.pom.java.LanguageLevel; @@ -66,7 +67,7 @@ public class ReferenceParserTest extends JavaParsingTestCase { @Override public void parse(final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseJavaCodeReference(builder, myIncomplete, false, false, false, false); + JavaParsers.REFERENCE_PARSER.parseJavaCodeReference(builder, myIncomplete, false, false, false, false); } } @@ -76,7 +77,7 @@ public class ReferenceParserTest extends JavaParsingTestCase { private static class MyTestParser2 implements TestParser { @Override public void parse(final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseType(builder, ReferenceParser.ELLIPSIS | ReferenceParser.DIAMONDS | ReferenceParser.DISJUNCTIONS); + JavaParsers.REFERENCE_PARSER.parseType(builder, ReferenceParser.ELLIPSIS | ReferenceParser.DIAMONDS | ReferenceParser.DISJUNCTIONS); } } @@ -87,7 +88,7 @@ public class ReferenceParserTest extends JavaParsingTestCase { private static class MyTestParser3 implements TestParser { @Override public void parse(final PsiBuilder builder) { - ReferenceParser.INSTANCE.parseTypeParameters(builder); + JavaParsers.REFERENCE_PARSER.parseTypeParameters(builder); } } } diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/StatementParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/StatementParserTest.java index 9fb2dbec00f0..76e99441bba0 100644 --- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/StatementParserTest.java +++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/StatementParserTest.java @@ -16,8 +16,8 @@ package com.intellij.lang.java.parser.partial; import com.intellij.lang.PsiBuilder; +import com.intellij.lang.java.parser.JavaParsers; import com.intellij.lang.java.parser.JavaParsingTestCase; -import com.intellij.lang.java.parser.StatementParser; import com.intellij.pom.java.LanguageLevel; @@ -170,14 +170,14 @@ public class StatementParserTest extends JavaParsingTestCase { private static class MyTestParser2 implements TestParser { @Override public void parse(final PsiBuilder builder) { - StatementParser.INSTANCE.parseStatements(builder); + JavaParsers.STATEMENT_PARSER.parseStatements(builder); } } private static class MyTestParser1 implements TestParser { @Override public void parse(final PsiBuilder builder) { - StatementParser.INSTANCE.parseCodeBlockDeep(builder, true); + JavaParsers.STATEMENT_PARSER.parseCodeBlockDeep(builder, true); } } }