MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Untangle Java-based parsers

Browse Source
This commit is contained in:
Roman Shevchenko
2012-06-04 16:51:04 +04:00
parent 2dd21e1213
commit c2eb2a8514
21 changed files with 201 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/lang/java/parser/partial/AnnotationParserTest.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -16,7 +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.JavaParser;
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) {
JavaParsers.DECLARATION_PARSER.parseAnnotations(builder);
JavaParser.INSTANCE.getDeclarationParser().parseAnnotations(builder);
}
}
}
java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java
+2 -2
View File
@@ -16,7 +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.JavaParser;
import com.intellij.lang.java.parser.JavaParsingTestCase;
import com.intellij.pom.java.LanguageLevel;
@@ -121,7 +121,7 @@ public class DeclarationParserTest extends JavaParsingTestCase {
@Override
public void parse(final PsiBuilder builder) {
JavaParsers.DECLARATION_PARSER.parseClassBodyWithBraces(builder, myAnnotation, myAnEnum);
JavaParser.INSTANCE.getDeclarationParser().parseClassBodyWithBraces(builder, myAnnotation, myAnEnum);
}
}
}
java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
+2 -2
View File
@@ -16,7 +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.JavaParser;
import com.intellij.lang.java.parser.JavaParsingTestCase;
import org.jetbrains.annotations.NonNls;
@@ -128,7 +128,7 @@ public class ExpressionParserTest extends JavaParsingTestCase {
private static class MyTestParser implements TestParser {
@Override
public void parse(final PsiBuilder builder) {
JavaParsers.EXPRESSION_PARSER.parse(builder);
JavaParser.INSTANCE.getExpressionParser().parse(builder);
}
}
}
java/java-tests/testSrc/com/intellij/lang/java/parser/partial/FileParserTest.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -16,7 +16,7 @@
package com.intellij.lang.java.parser.partial;
import com.intellij.lang.PsiBuilder;
import com.intellij.lang.java.parser.FileParser;
import com.intellij.lang.java.parser.JavaParser;
import com.intellij.lang.java.parser.JavaParsingTestCase;
@@ -65,7 +65,7 @@ public class FileParserTest extends JavaParsingTestCase {
private static class MyTestParser implements TestParser {
@Override
public void parse(final PsiBuilder builder) {
FileParser.INSTANCE.parse(builder);
JavaParser.INSTANCE.getFileParser().parse(builder);
}
}
}
java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ReferenceParserTest.java
+6 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -16,7 +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.JavaParser;
import com.intellij.lang.java.parser.JavaParsingTestCase;
import com.intellij.lang.java.parser.ReferenceParser;
import com.intellij.pom.java.LanguageLevel;
@@ -68,7 +68,7 @@ public class ReferenceParserTest extends JavaParsingTestCase {
@Override
public void parse(final PsiBuilder builder) {
JavaParsers.REFERENCE_PARSER.parseJavaCodeReference(builder, myIncomplete, false, false, false, false);
JavaParser.INSTANCE.getReferenceParser().parseJavaCodeReference(builder, myIncomplete, false, false, false, false);
}
}
@@ -78,7 +78,8 @@ public class ReferenceParserTest extends JavaParsingTestCase {
private static class MyTestParser2 implements TestParser {
@Override
public void parse(final PsiBuilder builder) {
JavaParsers.REFERENCE_PARSER.parseType(builder, ReferenceParser.ELLIPSIS | ReferenceParser.DIAMONDS | ReferenceParser.DISJUNCTIONS);
JavaParser.INSTANCE.getReferenceParser()
.parseType(builder, ReferenceParser.ELLIPSIS | ReferenceParser.DIAMONDS | ReferenceParser.DISJUNCTIONS);
}
}
@@ -88,7 +89,7 @@ public class ReferenceParserTest extends JavaParsingTestCase {
private static class MyTestParser3 implements TestParser {
@Override
public void parse(final PsiBuilder builder) {
JavaParsers.REFERENCE_PARSER.parseTypeParameters(builder);
JavaParser.INSTANCE.getReferenceParser().parseTypeParameters(builder);
}
}
}
java/java-tests/testSrc/com/intellij/lang/java/parser/partial/StatementParserTest.java
+3 -3
View File
@@ -16,7 +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.JavaParser;
import com.intellij.lang.java.parser.JavaParsingTestCase;
public class StatementParserTest extends JavaParsingTestCase {
@@ -154,7 +154,7 @@ public class StatementParserTest extends JavaParsingTestCase {
private static class MyBlockTestParser implements TestParser {
@Override
public void parse(final PsiBuilder builder) {
JavaParsers.STATEMENT_PARSER.parseCodeBlockDeep(builder, true);
JavaParser.INSTANCE.getStatementParser().parseCodeBlockDeep(builder, true);
}
}
@@ -164,7 +164,7 @@ public class StatementParserTest extends JavaParsingTestCase {
private static class MyStatementsTestParser implements TestParser {
@Override
public void parse(final PsiBuilder builder) {
JavaParsers.STATEMENT_PARSER.parseStatements(builder);
JavaParser.INSTANCE.getStatementParser().parseStatements(builder);
}
}
}