From 9b9c5fd3e29628f3291cbb3211f46c62e22ae99c Mon Sep 17 00:00:00 2001 From: Mikhail Pyltsin Date: Tue, 22 Apr 2025 16:35:17 +0200 Subject: [PATCH] [java] IDEA-365317 fix tests after refactorings (91abdd2d6f95d7940ec19ca573d9bbc76609f9eb) GitOrigin-RevId: 2ca31243de2668ae475f3aace78c36cddb5edbf9 --- .../intellij/psi/impl/source/BasicJavaDocElementType.java | 1 + .../intellij/psi/impl/source/BasicJavaElementType.java | 8 ++++++-- .../lang/java/syntax/JavaElementTypeConverterExtension.kt | 4 +++- .../testSrc/com/intellij/java/lexer/LayeredLexerTest.java | 8 ++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaDocElementType.java b/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaDocElementType.java index 46413daa6412..259d5440483f 100644 --- a/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaDocElementType.java +++ b/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaDocElementType.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.Set; import java.util.function.Supplier; +//todo remove and merge with standard /** * @see JavaDocSyntaxElementType */ diff --git a/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaElementType.java b/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaElementType.java index 897c66015b67..ccd9208800c2 100644 --- a/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaElementType.java +++ b/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaElementType.java @@ -5,7 +5,10 @@ import com.intellij.java.syntax.element.JavaSyntaxTokenType; import com.intellij.java.syntax.lexer.JavaLexer; import com.intellij.java.syntax.parser.JavaParser; import com.intellij.java.syntax.parser.ReferenceParser; -import com.intellij.lang.*; +import com.intellij.lang.ASTNode; +import com.intellij.lang.Language; +import com.intellij.lang.LighterASTNode; +import com.intellij.lang.LighterLazyParseableNode; import com.intellij.lang.java.JavaLanguage; import com.intellij.lang.java.parser.BasicJavaParserUtil; import com.intellij.lang.java.parser.PsiSyntaxBuilderWithLanguageLevel; @@ -15,6 +18,7 @@ import com.intellij.platform.syntax.lexer.Lexer; import com.intellij.platform.syntax.lexer.TokenList; import com.intellij.platform.syntax.parser.SyntaxTreeBuilder; import com.intellij.platform.syntax.psi.ParsingDiagnostics; +import com.intellij.platform.syntax.psi.PsiSyntaxBuilder; import com.intellij.platform.syntax.util.parser.SyntaxBuilderUtil; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.PsiElement; @@ -27,7 +31,6 @@ import com.intellij.util.diff.FlyweightCapableTreeStructure; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.intellij.platform.syntax.psi.PsiSyntaxBuilder; import java.util.Collections; import java.util.Set; @@ -35,6 +38,7 @@ import java.util.function.Function; import java.util.function.Supplier; +//todo remove and merge with standard /** * @see com.intellij.java.syntax.element.JavaSyntaxElementType */ diff --git a/java/java-psi-impl/src/com/intellij/lang/java/syntax/JavaElementTypeConverterExtension.kt b/java/java-psi-impl/src/com/intellij/lang/java/syntax/JavaElementTypeConverterExtension.kt index 4fd97b7b4183..c5b19603a11d 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/syntax/JavaElementTypeConverterExtension.kt +++ b/java/java-psi-impl/src/com/intellij/lang/java/syntax/JavaElementTypeConverterExtension.kt @@ -13,8 +13,10 @@ import com.intellij.psi.JavaDocTokenType import com.intellij.psi.JavaTokenType import com.intellij.psi.impl.source.tree.JavaDocElementType import com.intellij.psi.impl.source.tree.JavaElementType +import org.jetbrains.annotations.VisibleForTesting -internal class JavaElementTypeConverterExtension : ElementTypeConverterFactory { +@VisibleForTesting +class JavaElementTypeConverterExtension : ElementTypeConverterFactory { override fun getElementTypeConverter(): ElementTypeConverter = javaConverter private val javaConverter: ElementTypeConverter = elementTypeConverterOf( diff --git a/java/java-tests/testSrc/com/intellij/java/lexer/LayeredLexerTest.java b/java/java-tests/testSrc/com/intellij/java/lexer/LayeredLexerTest.java index 849b7c5cd4a8..570838209739 100644 --- a/java/java-tests/testSrc/com/intellij/java/lexer/LayeredLexerTest.java +++ b/java/java-tests/testSrc/com/intellij/java/lexer/LayeredLexerTest.java @@ -1,10 +1,12 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.java.lexer; -import com.intellij.lang.java.JavaParserDefinition; +import com.intellij.java.syntax.JavaSyntaxDefinition; +import com.intellij.lang.java.syntax.JavaElementTypeConverterExtension; import com.intellij.lexer.LayeredLexer; import com.intellij.lexer.Lexer; import com.intellij.lexer.StringLiteralLexer; +import com.intellij.platform.syntax.psi.lexer.LexerAdapter; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.JavaTokenType; import com.intellij.psi.tree.IElementType; @@ -13,7 +15,9 @@ public class LayeredLexerTest extends AbstractBasicLayeredLexerTest { @Override protected Lexer setupLexer(String text) { - LayeredLexer lexer = new LayeredLexer(JavaParserDefinition.createLexer(LanguageLevel.JDK_1_3)); + LayeredLexer lexer = new LayeredLexer( + new LexerAdapter(JavaSyntaxDefinition.createLexer(LanguageLevel.JDK_1_3), + new JavaElementTypeConverterExtension().getElementTypeConverter())); lexer.registerSelfStoppingLayer(new StringLiteralLexer('\"', JavaTokenType.STRING_LITERAL), new IElementType[]{JavaTokenType.STRING_LITERAL}, IElementType.EMPTY_ARRAY);