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

[java] IDEA-365317 fix tests after refactorings (91abdd2d6f95d7940ec19ca573d9bbc76609f9eb)

Browse Source 
GitOrigin-RevId: 2ca31243de2668ae475f3aace78c36cddb5edbf9
This commit is contained in:
Mikhail Pyltsin
2025-04-22 18:28:04 +00:00
committed by intellij-monorepo-bot
parent b2176011e4
commit 9b9c5fd3e2
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaDocElementType.java
+1
View File
@@ -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
*/
java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicJavaElementType.java
+6 -2
View File
@@ -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
*/
java/java-psi-impl/src/com/intellij/lang/java/syntax/JavaElementTypeConverterExtension.kt
+3 -1
View File
@@ -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(
java/java-tests/testSrc/com/intellij/java/lexer/LayeredLexerTest.java
+6 -2
View File
@@ -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);