azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[analysis api, refactoring] get rid of HL name in class names

Browse Source
This commit is contained in:
Ilya Kirillov
2022-03-16 18:23:26 +01:00
parent 3838552a75
commit 3206c0ce87
112 changed files with 352 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt → analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10AnalysisApiTestConfiguratorService.kt
+2 -2
View File
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade
import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisHandlerExtension import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisHandlerExtension
import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSessionProvider import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSessionProvider
import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10KotlinReferenceProviderContributor import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10KotlinReferenceProviderContributor
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService import org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService
import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -36,7 +36,7 @@ import java.nio.file.Path
import kotlin.io.path.extension import kotlin.io.path.extension
import kotlin.io.path.nameWithoutExtension import kotlin.io.path.nameWithoutExtension
object KtFe10FrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService { object KtFe10AnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService {
override val testPrefix: String override val testPrefix: String
get() = "descriptors" get() = "descriptors"
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.annotations;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnDeclarationsTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnDeclarationsTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated extends AbstractAnalysisApiAnnotationsOnDeclarationsTest { public class Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated extends AbstractAnalysisApiAnnotationsOnDeclarationsTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnTypesTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.annotations;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnTypesTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnTypesTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10AnalysisApiAnnotationsOnTypesTestGenerated extends AbstractAnalysisApiAnnotationsOnTypesTest { public class Fe10AnalysisApiAnnotationsOnTypesTestGenerated extends AbstractAnalysisApiAnnotationsOnTypesTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.components;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class Fe10ResolveCallTestGenerated extends AbstractResolveCallTest { public class Fe10ResolveCallTestGenerated extends AbstractResolveCallTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCandidatesTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.components;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class Fe10ResolveCandidatesTestGenerated extends AbstractResolveCandidatesTest { public class Fe10ResolveCandidatesTestGenerated extends AbstractResolveCandidatesTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.compileTimeConstantPro
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10CompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTimeConstantEvaluatorTest { public class Fe10CompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTimeConstantEvaluatorTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/diagnosticProvider/Fe10CollectDiagnosticsTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.diagnosticProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.diagnosticProvider.AbstractCollectDiagnosticsTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.diagnosticProvider.AbstractCollectDiagnosticsTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10CollectDiagnosticsTestGenerated extends AbstractCollectDiagnosticsTest { public class Fe10CollectDiagnosticsTestGenerated extends AbstractCollectDiagnosticsTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10ReturnTargetSymbolTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionInfoProvider
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractReturnTargetSymbolTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractReturnTargetSymbolTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10ReturnTargetSymbolTestGenerated extends AbstractReturnTargetSymbolTest { public class Fe10ReturnTargetSymbolTestGenerated extends AbstractReturnTargetSymbolTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10WhenMissingCasesTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionInfoProvider
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractWhenMissingCasesTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractWhenMissingCasesTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10WhenMissingCasesTestGenerated extends AbstractWhenMissingCasesTest { public class Fe10WhenMissingCasesTestGenerated extends AbstractWhenMissingCasesTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10DeclarationReturnTypeTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionTypeProvider
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractDeclarationReturnTypeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractDeclarationReturnTypeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10DeclarationReturnTypeTestGenerated extends AbstractDeclarationReturnTypeTest { public class Fe10DeclarationReturnTypeTestGenerated extends AbstractDeclarationReturnTypeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10ExpectedExpressionTypeTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionTypeProvider
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractExpectedExpressionTypeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractExpectedExpressionTypeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10ExpectedExpressionTypeTestGenerated extends AbstractExpectedExpressionTypeTest { public class Fe10ExpectedExpressionTypeTestGenerated extends AbstractExpectedExpressionTypeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10HLExpressionTypeTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionTypeProvider
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractHLExpressionTypeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractHLExpressionTypeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class Fe10HLExpressionTypeTestGenerated extends AbstractHLExpressionTypeTest { public class Fe10HLExpressionTypeTestGenerated extends AbstractHLExpressionTypeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/smartCastProvider/Fe10HLSmartCastInfoTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.smartCastProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider.AbstractHLSmartCastInfoTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider.AbstractHLSmartCastInfoTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10HLSmartCastInfoTestGenerated extends AbstractHLSmartCastInfoTest { public class Fe10HLSmartCastInfoTestGenerated extends AbstractHLSmartCastInfoTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10IsSubclassOfTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.symbolDeclarationOverr
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractIsSubclassOfTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractIsSubclassOfTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10IsSubclassOfTestGenerated extends AbstractIsSubclassOfTest { public class Fe10IsSubclassOfTestGenerated extends AbstractIsSubclassOfTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10OverriddenDeclarationProviderTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.symbolDeclarationOverr
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractOverriddenDeclarationProviderTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractOverriddenDeclarationProviderTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10OverriddenDeclarationProviderTestGenerated extends AbstractOverriddenDeclarationProviderTest { public class Fe10OverriddenDeclarationProviderTestGenerated extends AbstractOverriddenDeclarationProviderTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationRenderer/Fe10RendererTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.symbolDeclarationRende
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationRenderer.AbstractRendererTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationRenderer.AbstractRendererTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class Fe10RendererTestGenerated extends AbstractRendererTest { public class Fe10RendererTestGenerated extends AbstractRendererTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeCreator/Fe10TypeParameterTypeTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.typeCreator;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator.AbstractTypeParameterTypeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator.AbstractTypeParameterTypeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10TypeParameterTypeTestGenerated extends AbstractTypeParameterTypeTest { public class Fe10TypeParameterTypeTestGenerated extends AbstractTypeParameterTypeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeInfoProvider/Fe10IsDenotableTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.typeInfoProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractIsDenotableTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractIsDenotableTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10IsDenotableTestGenerated extends AbstractIsDenotableTest { public class Fe10IsDenotableTestGenerated extends AbstractIsDenotableTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeProvider/Fe10HasCommonSubtypeTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.typeProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider.AbstractHasCommonSubtypeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider.AbstractHasCommonSubtypeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10HasCommonSubtypeTestGenerated extends AbstractHasCommonSubtypeTest { public class Fe10HasCommonSubtypeTestGenerated extends AbstractHasCommonSubtypeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByFqNameTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.symbols;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class Fe10SymbolByFqNameTestGenerated extends AbstractSymbolByFqNameTest { public class Fe10SymbolByFqNameTestGenerated extends AbstractSymbolByFqNameTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByPsiTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.symbols;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class Fe10SymbolByPsiTestGenerated extends AbstractSymbolByPsiTest { public class Fe10SymbolByPsiTestGenerated extends AbstractSymbolByPsiTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByReferenceTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.symbols;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class Fe10SymbolByReferenceTestGenerated extends AbstractSymbolByReferenceTest { public class Fe10SymbolByReferenceTestGenerated extends AbstractSymbolByReferenceTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return KtFe10FrontendApiTestConfiguratorService.INSTANCE; return KtFe10AnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirFrontendApiTestConfiguratorService.kt → analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirAnalysisApiTestConfiguratorService.kt
+9 -9
View File
@@ -12,9 +12,9 @@ import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.analysis.api.fir.utils.configureOptionalTestCompilerPlugin import org.jetbrains.kotlin.analysis.api.fir.utils.configureOptionalTestCompilerPlugin
import org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService import org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService
import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.FirLowLevelFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.FirLowLevelAnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.idea.references.KotlinFirReferenceContributor import org.jetbrains.kotlin.idea.references.KotlinFirReferenceContributor
import org.jetbrains.kotlin.idea.references.KotlinReferenceProviderContributor import org.jetbrains.kotlin.idea.references.KotlinReferenceProviderContributor
@@ -23,18 +23,18 @@ import org.jetbrains.kotlin.psi.KotlinReferenceProvidersService
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService { object FirAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService {
override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { override fun TestConfigurationBuilder.configureTest(disposable: Disposable) {
with(FirLowLevelFrontendApiTestConfiguratorService) { configureTest(disposable) } with(FirLowLevelAnalysisApiTestConfiguratorService) { configureTest(disposable) }
configureOptionalTestCompilerPlugin() configureOptionalTestCompilerPlugin()
} }
override fun processTestFiles(files: List<KtFile>): List<KtFile> { override fun processTestFiles(files: List<KtFile>): List<KtFile> {
return FirLowLevelFrontendApiTestConfiguratorService.processTestFiles(files) return FirLowLevelAnalysisApiTestConfiguratorService.processTestFiles(files)
} }
override fun getOriginalFile(file: KtFile): KtFile { override fun getOriginalFile(file: KtFile): KtFile {
return FirLowLevelFrontendApiTestConfiguratorService.getOriginalFile(file) return FirLowLevelAnalysisApiTestConfiguratorService.getOriginalFile(file)
} }
override fun registerProjectServices( override fun registerProjectServices(
@@ -45,7 +45,7 @@ object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorServic
projectStructureProvider: ProjectStructureProvider, projectStructureProvider: ProjectStructureProvider,
jarFileSystem: CoreJarFileSystem, jarFileSystem: CoreJarFileSystem,
) { ) {
FirLowLevelFrontendApiTestConfiguratorService.registerProjectServices( FirLowLevelAnalysisApiTestConfiguratorService.registerProjectServices(
project, project,
compilerConfig, compilerConfig,
files, files,
@@ -56,7 +56,7 @@ object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorServic
} }
override fun registerApplicationServices(application: MockApplication) { override fun registerApplicationServices(application: MockApplication) {
FirLowLevelFrontendApiTestConfiguratorService.registerApplicationServices(application) FirLowLevelAnalysisApiTestConfiguratorService.registerApplicationServices(application)
if (application.getServiceIfCreated(KotlinReferenceProvidersService::class.java) == null) { if (application.getServiceIfCreated(KotlinReferenceProvidersService::class.java) == null) {
application.registerService(KotlinReferenceProvidersService::class.java, HLApiReferenceProviderService::class.java) application.registerService(KotlinReferenceProvidersService::class.java, HLApiReferenceProviderService::class.java)
application.registerService(KotlinReferenceProviderContributor::class.java, KotlinFirReferenceContributor::class.java) application.registerService(KotlinReferenceProviderContributor::class.java, KotlinFirReferenceContributor::class.java)
@@ -64,6 +64,6 @@ object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorServic
} }
override fun doOutOfBlockModification(file: KtFile) { override fun doOutOfBlockModification(file: KtFile) {
FirLowLevelFrontendApiTestConfiguratorService.doOutOfBlockModification(file) FirLowLevelAnalysisApiTestConfiguratorService.doOutOfBlockModification(file)
} }
} }
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.source.LibrarySourceFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.source.LibrarySourceAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractReferenceResolveTest { public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractReferenceResolveTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return LibrarySourceFrontendApiTestConfiguratorService.INSTANCE; return LibrarySourceAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java
Generated
+3 -4
View File
@@ -8,8 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceResolveTest { public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceResolveTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnDeclarationsTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.annotations;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnDeclarationsTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnDeclarationsTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirAnalysisApiAnnotationsOnDeclarationsTestGenerated extends AbstractAnalysisApiAnnotationsOnDeclarationsTest { public class FirAnalysisApiAnnotationsOnDeclarationsTestGenerated extends AbstractAnalysisApiAnnotationsOnDeclarationsTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnFilesTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.annotations;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnFilesTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnFilesTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirAnalysisApiAnnotationsOnFilesTestGenerated extends AbstractAnalysisApiAnnotationsOnFilesTest { public class FirAnalysisApiAnnotationsOnFilesTestGenerated extends AbstractAnalysisApiAnnotationsOnFilesTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnTypesTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.annotations;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnTypesTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnTypesTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirAnalysisApiAnnotationsOnTypesTestGenerated extends AbstractAnalysisApiAnnotationsOnTypesTest { public class FirAnalysisApiAnnotationsOnTypesTestGenerated extends AbstractAnalysisApiAnnotationsOnTypesTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.components;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirResolveCallTestGenerated extends AbstractResolveCallTest { public class FirResolveCallTestGenerated extends AbstractResolveCallTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCandidatesTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.components;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirResolveCandidatesTestGenerated extends AbstractResolveCandidatesTest { public class FirResolveCandidatesTestGenerated extends AbstractResolveCandidatesTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.compileTimeConstantProv
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirCompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTimeConstantEvaluatorTest { public class FirCompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTimeConstantEvaluatorTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/diagnosticProvider/FirCollectDiagnosticsTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.diagnosticProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.diagnosticProvider.AbstractCollectDiagnosticsTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.diagnosticProvider.AbstractCollectDiagnosticsTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirCollectDiagnosticsTestGenerated extends AbstractCollectDiagnosticsTest { public class FirCollectDiagnosticsTestGenerated extends AbstractCollectDiagnosticsTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirReturnTargetSymbolTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionInfoProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractReturnTargetSymbolTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractReturnTargetSymbolTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirReturnTargetSymbolTestGenerated extends AbstractReturnTargetSymbolTest { public class FirReturnTargetSymbolTestGenerated extends AbstractReturnTargetSymbolTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionInfoProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractWhenMissingCasesTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractWhenMissingCasesTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirWhenMissingCasesTestGenerated extends AbstractWhenMissingCasesTest { public class FirWhenMissingCasesTestGenerated extends AbstractWhenMissingCasesTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirDeclarationReturnTypeTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionTypeProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractDeclarationReturnTypeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractDeclarationReturnTypeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirDeclarationReturnTypeTestGenerated extends AbstractDeclarationReturnTypeTest { public class FirDeclarationReturnTypeTestGenerated extends AbstractDeclarationReturnTypeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionTypeProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractExpectedExpressionTypeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractExpectedExpressionTypeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirExpectedExpressionTypeTestGenerated extends AbstractExpectedExpressionTypeTest { public class FirExpectedExpressionTypeTestGenerated extends AbstractExpectedExpressionTypeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionTypeProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractHLExpressionTypeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractHLExpressionTypeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirHLExpressionTypeTestGenerated extends AbstractHLExpressionTypeTest { public class FirHLExpressionTypeTestGenerated extends AbstractHLExpressionTypeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/AbstractHLImportOptimizerTest.kt
+2 -3
View File
@@ -5,14 +5,13 @@
package org.jetbrains.kotlin.analysis.api.fir.components.importOptimizer package org.jetbrains.kotlin.analysis.api.fir.components.importOptimizer
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractHLImportOptimizerTest : AbstractHLApiSingleModuleTest(){ abstract class AbstractHLImportOptimizerTest : AbstractAnalysisApiBasedSingleModuleTest(){
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val mainKtFile = ktFiles.singleOrNull() ?: ktFiles.first { it.name == "main.kt" } val mainKtFile = ktFiles.singleOrNull() ?: ktFiles.first { it.name == "main.kt" }
val unusedImports = analyseForTest(mainKtFile) { analyseImports(mainKtFile).unusedImports } val unusedImports = analyseForTest(mainKtFile) { analyseImports(mainKtFile).unusedImports }
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractExpressionPsiTypeProviderTest.kt
+2 -3
View File
@@ -6,16 +6,15 @@
package org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider package org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider
import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.analyse
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractExpressionPsiTypeProviderTest : AbstractHLApiSingleFileTest(){ abstract class AbstractExpressionPsiTypeProviderTest : AbstractAnalysisApiSingleFileTest(){
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val declarationAtCaret = testServices.expressionMarkerProvider.getSelectedElement(ktFile) as KtExpression val declarationAtCaret = testServices.expressionMarkerProvider.getSelectedElement(ktFile) as KtExpression
val actual = analyse(ktFile) { val actual = analyse(ktFile) {
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractPsiTypeProviderTest.kt
+2 -3
View File
@@ -10,9 +10,8 @@ import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiElementVisitor
import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.analyse
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.asJava.elements.KtLightElement import org.jetbrains.kotlin.asJava.elements.KtLightElement
@@ -27,7 +26,7 @@ import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
abstract class AbstractPsiTypeProviderTest : AbstractHLApiSingleFileTest(){ abstract class AbstractPsiTypeProviderTest : AbstractAnalysisApiSingleFileTest(){
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val declaration = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtDeclaration>(ktFile) val declaration = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtDeclaration>(ktFile)
val containingClass = val containingClass =
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.smartCastProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider.AbstractHLSmartCastInfoTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider.AbstractHLSmartCastInfoTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirHLSmartCastInfoTestGenerated extends AbstractHLSmartCastInfoTest { public class FirHLSmartCastInfoTestGenerated extends AbstractHLSmartCastInfoTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirIsSubclassOfTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.symbolDeclarationOverri
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractIsSubclassOfTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractIsSubclassOfTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirIsSubclassOfTestGenerated extends AbstractIsSubclassOfTest { public class FirIsSubclassOfTestGenerated extends AbstractIsSubclassOfTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.symbolDeclarationOverri
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractOverriddenDeclarationProviderTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractOverriddenDeclarationProviderTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirOverriddenDeclarationProviderTestGenerated extends AbstractOverriddenDeclarationProviderTest { public class FirOverriddenDeclarationProviderTestGenerated extends AbstractOverriddenDeclarationProviderTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.components.symbolDeclarationRender
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationRenderer.AbstractRendererTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationRenderer.AbstractRendererTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirRendererTestGenerated extends AbstractRendererTest { public class FirRendererTestGenerated extends AbstractRendererTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeCreator/FirTypeParameterTypeTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeCreator;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator.AbstractTypeParameterTypeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator.AbstractTypeParameterTypeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirTypeParameterTypeTestGenerated extends AbstractTypeParameterTypeTest { public class FirTypeParameterTypeTestGenerated extends AbstractTypeParameterTypeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeInfoProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractFunctionClassKindTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractFunctionClassKindTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirFunctionClassKindTestGenerated extends AbstractFunctionClassKindTest { public class FirFunctionClassKindTestGenerated extends AbstractFunctionClassKindTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirIsDenotableTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeInfoProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractIsDenotableTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractIsDenotableTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirIsDenotableTestGenerated extends AbstractIsDenotableTest { public class FirIsDenotableTestGenerated extends AbstractIsDenotableTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/AbstractFirGetSuperTypesTest.kt
+2 -3
View File
@@ -7,16 +7,15 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeProvider
import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.analyse
import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.types.KtType
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractFirGetSuperTypesTest : AbstractHLApiSingleFileTest(){ abstract class AbstractFirGetSuperTypesTest : AbstractAnalysisApiSingleFileTest(){
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile)
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeProvider;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider.AbstractHasCommonSubtypeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider.AbstractHasCommonSubtypeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirHasCommonSubtypeTestGenerated extends AbstractHasCommonSubtypeTest { public class FirHasCommonSubtypeTestGenerated extends AbstractHasCommonSubtypeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/FirHLImportOptimizerTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api.
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.components.importOptimizer.AbstractHLImportOptimizerTest; import org.jetbrains.kotlin.analysis.api.fir.components.importOptimizer.AbstractHLImportOptimizerTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirHLImportOptimizerTestGenerated extends AbstractHLImportOptimizerTest { public class FirHLImportOptimizerTestGenerated extends AbstractHLImportOptimizerTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirExpressionPsiTypeProviderTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api.
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider.AbstractExpressionPsiTypeProviderTest; import org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider.AbstractExpressionPsiTypeProviderTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirExpressionPsiTypeProviderTestGenerated extends AbstractExpressionPsiTypeProviderTest { public class FirExpressionPsiTypeProviderTestGenerated extends AbstractExpressionPsiTypeProviderTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirPsiTypeProviderTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api.
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider.AbstractPsiTypeProviderTest; import org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider.AbstractPsiTypeProviderTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirPsiTypeProviderTestGenerated extends AbstractPsiTypeProviderTest { public class FirPsiTypeProviderTestGenerated extends AbstractPsiTypeProviderTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirFirGetSuperTypesTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api.
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.components.typeProvider.AbstractFirGetSuperTypesTest; import org.jetbrains.kotlin.analysis.api.fir.components.typeProvider.AbstractFirGetSuperTypesTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirFirGetSuperTypesTestGenerated extends AbstractFirGetSuperTypesTest { public class FirFirGetSuperTypesTestGenerated extends AbstractFirGetSuperTypesTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirDelegateMemberScopeTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractDelegateMemberScopeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractDelegateMemberScopeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirDelegateMemberScopeTestGenerated extends AbstractDelegateMemberScopeTest { public class FirDelegateMemberScopeTestGenerated extends AbstractDelegateMemberScopeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractFileScopeTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractFileScopeTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirFileScopeTestGenerated extends AbstractFileScopeTest { public class FirFileScopeTestGenerated extends AbstractFileScopeTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractMemberScopeByFqNameTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractMemberScopeByFqNameTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirMemberScopeByFqNameTestGenerated extends AbstractMemberScopeByFqNameTest { public class FirMemberScopeByFqNameTestGenerated extends AbstractMemberScopeByFqNameTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirSubstitutionOverridesUnwrappingTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractSubstitutionOverridesUnwrappingTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractSubstitutionOverridesUnwrappingTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirSubstitutionOverridesUnwrappingTestGenerated extends AbstractSubstitutionOverridesUnwrappingTest { public class FirSubstitutionOverridesUnwrappingTestGenerated extends AbstractSubstitutionOverridesUnwrappingTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByFqNameTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirSymbolByFqNameTestGenerated extends AbstractSymbolByFqNameTest { public class FirSymbolByFqNameTestGenerated extends AbstractSymbolByFqNameTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByPsiTestGenerated.java
Generated
+4 -5
View File
@@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirSymbolByPsiTestGenerated extends AbstractSymbolByPsiTest { public class FirSymbolByPsiTestGenerated extends AbstractSymbolByPsiTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByReferenceTestGenerated.java
Generated
+4 -4
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirSymbolByReferenceTestGenerated extends AbstractSymbolByReferenceTest { public class FirSymbolByReferenceTestGenerated extends AbstractSymbolByReferenceTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE; return FirAnalysisApiTestConfiguratorService.INSTANCE;
} }
@Test @Test
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryFrontendApiTestConfiguratorService.kt → analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryAnalysisApiTestConfiguratorService.kt
+5 -5
View File
@@ -15,8 +15,8 @@ import com.intellij.psi.ClassFileViewProviderFactory
import com.intellij.psi.FileTypeFileViewProviders import com.intellij.psi.FileTypeFileViewProviders
import com.intellij.psi.compiled.ClassFileDecompilers import com.intellij.psi.compiled.ClassFileDecompilers
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInDecompiler import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInDecompiler
import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinClassFileDecompiler import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinClassFileDecompiler
import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
object LibraryFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService { object LibraryAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService {
override val allowDependedAnalysisSession: Boolean get() = false override val allowDependedAnalysisSession: Boolean get() = false
override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { override fun TestConfigurationBuilder.configureTest(disposable: Disposable) {
@@ -50,7 +50,7 @@ object LibraryFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorSe
} }
override fun registerApplicationServices(application: MockApplication) { override fun registerApplicationServices(application: MockApplication) {
FirFrontendApiTestConfiguratorService.registerApplicationServices(application) FirAnalysisApiTestConfiguratorService.registerApplicationServices(application)
if (application.getServiceIfCreated(ClsKotlinBinaryClassCache::class.java) != null) return if (application.getServiceIfCreated(ClsKotlinBinaryClassCache::class.java) != null) return
application.registerService(ClsKotlinBinaryClassCache::class.java) application.registerService(ClsKotlinBinaryClassCache::class.java)
application.registerService(FileAttributeService::class.java, DummyFileAttributeService) application.registerService(FileAttributeService::class.java, DummyFileAttributeService)
@@ -68,6 +68,6 @@ object LibraryFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorSe
} }
override fun doOutOfBlockModification(file: KtFile) { override fun doOutOfBlockModification(file: KtFile) {
FirFrontendApiTestConfiguratorService.doOutOfBlockModification(file) FirAnalysisApiTestConfiguratorService.doOutOfBlockModification(file)
} }
} }
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceFrontendApiTestConfiguratorService.kt → analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceAnalysisApiTestConfiguratorService.kt
+5 -5
View File
@@ -10,8 +10,8 @@ import com.intellij.mock.MockProject
import com.intellij.openapi.Disposable import com.intellij.openapi.Disposable
import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.registerTestServices import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.registerTestServices
import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider
import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompiledLibraryProvider import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompiledLibraryProvider
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.services.ServiceRegistrationData import org.jetbrains.kotlin.test.services.ServiceRegistrationData
object LibrarySourceFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService { object LibrarySourceAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService {
override val allowDependedAnalysisSession: Boolean get() = false override val allowDependedAnalysisSession: Boolean get() = false
override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { override fun TestConfigurationBuilder.configureTest(disposable: Disposable) {
@@ -43,10 +43,10 @@ object LibrarySourceFrontendApiTestConfiguratorService : FrontendApiTestConfigur
} }
override fun registerApplicationServices(application: MockApplication) { override fun registerApplicationServices(application: MockApplication) {
FirFrontendApiTestConfiguratorService.registerApplicationServices(application) FirAnalysisApiTestConfiguratorService.registerApplicationServices(application)
} }
override fun doOutOfBlockModification(file: KtFile) { override fun doOutOfBlockModification(file: KtFile) {
FirFrontendApiTestConfiguratorService.doOutOfBlockModification(file) FirAnalysisApiTestConfiguratorService.doOutOfBlockModification(file)
} }
} }
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt
+2 -2
View File
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions
import org.jetbrains.kotlin.analysis.api.components.RendererModifier import org.jetbrains.kotlin.analysis.api.components.RendererModifier
import org.jetbrains.kotlin.analysis.api.impl.base.test.TestReferenceResolveResultRenderer.renderResolvedTo import org.jetbrains.kotlin.analysis.api.impl.base.test.TestReferenceResolveResultRenderer.renderResolvedTo
import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.*
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.utils.unwrapMultiReferences import org.jetbrains.kotlin.analysis.test.framework.utils.unwrapMultiReferences
import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.references.KtReference
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractReferenceResolveTest : AbstractHLApiSingleModuleTest() { abstract class AbstractReferenceResolveTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun configureTest(builder: TestConfigurationBuilder) { override fun configureTest(builder: TestConfigurationBuilder) {
super.configureTest(builder) super.configureTest(builder)
with(builder) { with(builder) {
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnDeclarationsTest.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations
import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotatedSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotatedSymbol
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractAnalysisApiAnnotationsOnDeclarationsTest : AbstractHLApiSingleFileTest() { abstract class AbstractAnalysisApiAnnotationsOnDeclarationsTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val ktDeclaration = testServices.expressionMarkerProvider val ktDeclaration = testServices.expressionMarkerProvider
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnFilesTest.kt
+2 -2
View File
@@ -5,13 +5,13 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractAnalysisApiAnnotationsOnFilesTest : AbstractHLApiSingleFileTest() { abstract class AbstractAnalysisApiAnnotationsOnFilesTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val actual = analyseForTest(ktFile) { val actual = analyseForTest(ktFile) {
val fileSymbol = ktFile.getFileSymbol() val fileSymbol = ktFile.getFileSymbol()
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AnalysisApiAnnotationsOnTypesTest.kt
+2 -2
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations
import org.jetbrains.kotlin.analysis.api.annotations.annotations import org.jetbrains.kotlin.analysis.api.annotations.annotations
import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.utils.indented import org.jetbrains.kotlin.analysis.test.framework.utils.indented
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractAnalysisApiAnnotationsOnTypesTest : AbstractHLApiSingleFileTest() { abstract class AbstractAnalysisApiAnnotationsOnTypesTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val ktTypeReference = testServices.expressionMarkerProvider val ktTypeReference = testServices.expressionMarkerProvider
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt
+2 -2
View File
@@ -8,14 +8,14 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.calls.KtCallInfo import org.jetbrains.kotlin.analysis.api.calls.KtCallInfo
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractResolveCallTest : AbstractHLApiSingleModuleTest() { abstract class AbstractResolveCallTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val ktFile = ktFiles.first() val ktFile = ktFiles.first()
val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile)
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCandidatesTest.kt
+2 -2
View File
@@ -8,14 +8,14 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.calls.KtCallCandidateInfo import org.jetbrains.kotlin.analysis.api.calls.KtCallCandidateInfo
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractResolveCandidatesTest : AbstractHLApiSingleModuleTest() { abstract class AbstractResolveCandidatesTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val ktFile = ktFiles.first() val ktFile = ktFiles.first()
val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile)
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider package org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider
import org.jetbrains.kotlin.analysis.api.components.KtConstantEvaluationMode import org.jetbrains.kotlin.analysis.api.components.KtConstantEvaluationMode
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractHLApiSingleFileTest() { abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val element = testServices.expressionMarkerProvider.getSelectedElement(ktFile) val element = testServices.expressionMarkerProvider.getSelectedElement(ktFile)
val expression = when (element) { val expression = when (element) {
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt
+2 -2
View File
@@ -9,7 +9,7 @@ import com.intellij.openapi.util.TextRange
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.analysis.api.components.KtDiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.api.components.KtDiagnosticCheckerFilter
import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnosticWithPsi import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnosticWithPsi
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.diagnostics.DiagnosticUtils.getLineAndColumnRangeInPsiFile import org.jetbrains.kotlin.diagnostics.DiagnosticUtils.getLineAndColumnRangeInPsiFile
import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils.offsetToLineAndColumn import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils.offsetToLineAndColumn
import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtElement
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
import kotlin.test.assertEquals import kotlin.test.assertEquals
abstract class AbstractCollectDiagnosticsTest : AbstractHLApiSingleFileTest() { abstract class AbstractCollectDiagnosticsTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
fun TextRange.asLineColumnRange(): String { fun TextRange.asLineColumnRange(): String {
return getLineAndColumnRangeInPsiFile(ktFile, this).toString() return getLineAndColumnRangeInPsiFile(ktFile, this).toString()
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractReturnTargetSymbolTest.kt
+2 -2
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionIn
import com.intellij.psi.PsiComment import com.intellij.psi.PsiComment
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.impl.source.tree.LeafPsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.utils.getNameWithPositionString import org.jetbrains.kotlin.analysis.test.framework.utils.getNameWithPositionString
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtReturnExpression import org.jetbrains.kotlin.psi.KtReturnExpression
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractReturnTargetSymbolTest : AbstractHLApiSingleFileTest() { abstract class AbstractReturnTargetSymbolTest : AbstractAnalysisApiSingleFileTest() {
val commentRegex = Regex("""/\* (.+@\(.+\)|null) \*/""") val commentRegex = Regex("""/\* (.+@\(.+\)|null) \*/""")
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val original = ktFile.text val original = ktFile.text
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractWhenMissingCasesTest.kt
+2 -3
View File
@@ -5,16 +5,15 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtWhenExpression import org.jetbrains.kotlin.psi.KtWhenExpression
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractWhenMissingCasesTest : AbstractHLApiSingleFileTest() { abstract class AbstractWhenMissingCasesTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val whenExpression = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtWhenExpression>(ktFile) val whenExpression = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtWhenExpression>(ktFile)
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractDeclarationReturnTypeTest.kt
+2 -3
View File
@@ -5,15 +5,14 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.utils.getNameWithPositionString import org.jetbrains.kotlin.analysis.test.framework.utils.getNameWithPositionString
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractDeclarationReturnTypeTest : AbstractHLApiSingleFileTest() { abstract class AbstractDeclarationReturnTypeTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val actual = buildString { val actual = buildString {
ktFile.accept(object : KtTreeVisitor<Int>() { ktFile.accept(object : KtTreeVisitor<Int>() {
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractExpectedExpressionTypeTest.kt
+2 -3
View File
@@ -5,9 +5,8 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer
import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -15,7 +14,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractExpectedExpressionTypeTest : AbstractHLApiSingleFileTest() { abstract class AbstractExpectedExpressionTypeTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val expressionAtCaret = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) as KtExpression val expressionAtCaret = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) as KtExpression
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt
+2 -3
View File
@@ -6,9 +6,8 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider
import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtValueArgument import org.jetbrains.kotlin.psi.KtValueArgument
@@ -16,7 +15,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractHLExpressionTypeTest : AbstractHLApiSingleFileTest() { abstract class AbstractHLExpressionTypeTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val selected = testServices.expressionMarkerProvider.getSelectedElement(ktFile) val selected = testServices.expressionMarkerProvider.getSelectedElement(ktFile)
val expression = when (selected) { val expression = when (selected) {
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/smartCastProvider/AbstractHLSmartCastInfoTest.kt
+2 -3
View File
@@ -5,16 +5,15 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider package org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractHLSmartCastInfoTest : AbstractHLApiSingleFileTest() { abstract class AbstractHLSmartCastInfoTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) as KtExpression val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) as KtExpression
val actual = executeOnPooledThreadInReadAction { val actual = executeOnPooledThreadInReadAction {
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractIsSubclassOfTest.kt
+2 -2
View File
@@ -6,14 +6,14 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider package org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest
import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractIsSubclassOfTest : AbstractHLApiSingleModuleTest() { abstract class AbstractIsSubclassOfTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val subClass = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtClassOrObject>(ktFiles.first(), "sub") val subClass = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtClassOrObject>(ktFiles.first(), "sub")
val superClass = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtClassOrObject>(ktFiles.first(), "super") val superClass = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtClassOrObject>(ktFiles.first(), "super")
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractOverriddenDeclarationProviderTest.kt
+2 -3
View File
@@ -8,9 +8,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclar
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions
import org.jetbrains.kotlin.analysis.api.impl.barebone.parentsOfType import org.jetbrains.kotlin.analysis.api.impl.barebone.parentsOfType
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest
import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtSyntheticJavaPropertySymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSyntheticJavaPropertySymbol
@@ -20,7 +19,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractOverriddenDeclarationProviderTest : AbstractHLApiSingleModuleTest() { abstract class AbstractOverriddenDeclarationProviderTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val declaration = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtDeclaration>(ktFiles.first()) val declaration = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtDeclaration>(ktFiles.first())
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationRenderer/AbstractRendererTest.kt
+2 -2
View File
@@ -8,13 +8,13 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclar
import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions
import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions
import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractRendererTest : AbstractHLApiSingleFileTest() { abstract class AbstractRendererTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val options = KtDeclarationRendererOptions.DEFAULT.copy( val options = KtDeclarationRendererOptions.DEFAULT.copy(
approximateTypes = true, approximateTypes = true,
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeCreator/AbstractTypeParameterTypeTest.kt
+2 -3
View File
@@ -6,16 +6,15 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator
import org.jetbrains.kotlin.analysis.api.components.buildTypeParameterType import org.jetbrains.kotlin.analysis.api.components.buildTypeParameterType
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtTypeParameter import org.jetbrains.kotlin.psi.KtTypeParameter
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractTypeParameterTypeTest : AbstractHLApiSingleFileTest() { abstract class AbstractTypeParameterTypeTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val expressionAtCaret = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) as KtTypeParameter val expressionAtCaret = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) as KtTypeParameter
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractFunctionClassKindTest.kt
+2 -3
View File
@@ -5,16 +5,15 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractFunctionClassKindTest : AbstractHLApiSingleFileTest() { abstract class AbstractFunctionClassKindTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val expressionAtCaret = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) as KtExpression val expressionAtCaret = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) as KtExpression
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractIsDenotableTest.kt
+2 -3
View File
@@ -8,8 +8,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProv
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.impl.source.tree.LeafPsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement
import org.jetbrains.kotlin.analysis.api.impl.barebone.parentOfType import org.jetbrains.kotlin.analysis.api.impl.barebone.parentOfType
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtAnnotatedExpression import org.jetbrains.kotlin.psi.KtAnnotatedExpression
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -26,7 +25,7 @@ import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
import java.io.File import java.io.File
abstract class AbstractIsDenotableTest : AbstractHLApiSingleFileTest() { abstract class AbstractIsDenotableTest : AbstractAnalysisApiSingleFileTest() {
val denotableName = Name.identifier("Denotable") val denotableName = Name.identifier("Denotable")
val undenotableName = Name.identifier("Nondenotable") val undenotableName = Name.identifier("Nondenotable")
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeProvider/AbstractHasCommonSubtypeTest.kt
+2 -3
View File
@@ -7,8 +7,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest
import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtCallExpression
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtTreeVisitorVoid import org.jetbrains.kotlin.psi.KtTreeVisitorVoid
@@ -22,7 +21,7 @@ import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
import java.io.File import java.io.File
abstract class AbstractHasCommonSubtypeTest : AbstractHLApiSingleFileTest() { abstract class AbstractHasCommonSubtypeTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val errors = mutableListOf<String>() val errors = mutableListOf<String>()
val originalText = ktFile.text val originalText = ktFile.text
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractDelegateMemberScopeTest.kt
-2
View File
@@ -6,12 +6,10 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.SymbolsData import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.SymbolsData
import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt
+2 -3
View File
@@ -5,15 +5,14 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest
import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractFileScopeTest : AbstractHLApiSingleFileTest() { abstract class AbstractFileScopeTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val actual = executeOnPooledThreadInReadAction { val actual = executeOnPooledThreadInReadAction {
analyseForTest(ktFile) { analyseForTest(ktFile) {
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractMemberScopeTest.kt
-2
View File
@@ -6,12 +6,10 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.SymbolsData import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.SymbolsData
import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt
-1
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolTest import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolTest
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.SymbolsData import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.SymbolsData
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByFqNameTest.kt
-2
View File
@@ -6,9 +6,7 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.ConfigurationDirectives import org.jetbrains.kotlin.test.directives.ConfigurationDirectives
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByPsiTest.kt
-2
View File
@@ -6,8 +6,6 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtParameter import org.jetbrains.kotlin.psi.KtParameter
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByReferenceTest.kt
-2
View File
@@ -6,9 +6,7 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.references.mainReference
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtNameReferenceExpression import org.jetbrains.kotlin.psi.KtNameReferenceExpression
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt
+2 -4
View File
@@ -7,13 +7,11 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest
import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer
import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtFileSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtFileSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
import org.jetbrains.kotlin.analysis.api.symbols.markers.KtPossibleMemberSymbol
import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -24,7 +22,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractSymbolTest : AbstractHLApiSingleFileTest() { abstract class AbstractSymbolTest : AbstractAnalysisApiSingleFileTest() {
private val renderingOptions = KtDeclarationRendererOptions.DEFAULT private val renderingOptions = KtDeclarationRendererOptions.DEFAULT
open val prettyRenderMode: PrettyRenderingMode = PrettyRenderingMode.RENDER_SYMBOLS_LINE_BY_LINE open val prettyRenderMode: PrettyRenderingMode = PrettyRenderingMode.RENDER_SYMBOLS_LINE_BY_LINE
analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/AbstractStandaloneModeSingleModuleTest.kt
+2 -2
View File
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.api.components.RendererModifier
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.api.impl.base.test.TestReferenceResolveResultRenderer.renderResolvedTo import org.jetbrains.kotlin.analysis.api.impl.base.test.TestReferenceResolveResultRenderer.renderResolvedTo
import org.jetbrains.kotlin.analysis.api.impl.base.test.findReferencesAtCaret import org.jetbrains.kotlin.analysis.api.impl.base.test.findReferencesAtCaret
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractStandaloneModeSingleModuleTest : AbstractHLApiSingleModuleTest() { abstract class AbstractStandaloneModeSingleModuleTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun configureTest(builder: TestConfigurationBuilder) { override fun configureTest(builder: TestConfigurationBuilder) {
super.configureTest(builder) super.configureTest(builder)
with(builder) { with(builder) {
analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeConfiguratorService.kt
+5 -5
View File
@@ -10,20 +10,20 @@ import com.intellij.mock.MockProject
import com.intellij.openapi.Disposable import com.intellij.openapi.Disposable
import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
object StandaloneModeConfiguratorService : FrontendApiTestConfiguratorService { object StandaloneModeConfiguratorService : AnalysisApiTestConfiguratorService {
override val allowDependedAnalysisSession: Boolean override val allowDependedAnalysisSession: Boolean
get() = false get() = false
override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { override fun TestConfigurationBuilder.configureTest(disposable: Disposable) {
with(FirFrontendApiTestConfiguratorService) { configureTest(disposable) } with(FirAnalysisApiTestConfiguratorService) { configureTest(disposable) }
} }
override fun registerProjectServices( override fun registerProjectServices(
@@ -48,6 +48,6 @@ object StandaloneModeConfiguratorService : FrontendApiTestConfiguratorService {
} }
override fun doOutOfBlockModification(file: KtFile) { override fun doOutOfBlockModification(file: KtFile) {
FirFrontendApiTestConfiguratorService.doOutOfBlockModification(file) FirAnalysisApiTestConfiguratorService.doOutOfBlockModification(file)
} }
} }
analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeSingleModuleTestGenerated.java
Generated
+2 -4
View File
@@ -8,10 +8,8 @@ package org.jetbrains.kotlin.analysis.api.standalone;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.standalone.StandaloneModeConfiguratorService;
import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
@@ -24,7 +22,7 @@ import java.util.regex.Pattern;
public class StandaloneModeSingleModuleTestGenerated extends AbstractStandaloneModeSingleModuleTest { public class StandaloneModeSingleModuleTestGenerated extends AbstractStandaloneModeSingleModuleTest {
@NotNull @NotNull
@Override @Override
public FrontendApiTestConfiguratorService getConfigurator() { public AnalysisApiTestConfiguratorService getConfigurator() {
return StandaloneModeConfiguratorService.INSTANCE; return StandaloneModeConfiguratorService.INSTANCE;
} }
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/FrontendApiTestConfiguratorService.kt → analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/AnalysisApiTestConfiguratorService.kt
+1 -1
View File
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import java.nio.file.Path import java.nio.file.Path
interface FrontendApiTestConfiguratorService { interface AnalysisApiTestConfiguratorService {
val testPrefix: String? get() = null val testPrefix: String? get() = null
val allowDependedAnalysisSession: Boolean get() = true val allowDependedAnalysisSession: Boolean get() = true
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleModuleTest.kt → analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedSingleModuleTest.kt
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestModuleStructure import org.jetbrains.kotlin.test.services.TestModuleStructure
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractHLApiSingleModuleTest : AnalysisApiBasedTest() { abstract class AbstractAnalysisApiBasedSingleModuleTest : AbstractAnalysisApiBasedTest() {
final override fun doTestByFileStructure(ktFiles: List<KtFile>, moduleStructure: TestModuleStructure, testServices: TestServices) { final override fun doTestByFileStructure(ktFiles: List<KtFile>, moduleStructure: TestModuleStructure, testServices: TestServices) {
val singleModule = moduleStructure.modules.single() val singleModule = moduleStructure.modules.single()
doTestByFileStructure(ktFiles, singleModule, testServices) doTestByFileStructure(ktFiles, singleModule, testServices)
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AnalysisApiBasedTest.kt → analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt
+4 -4
View File
@@ -11,7 +11,7 @@ import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.Disposer
import com.intellij.testFramework.TestDataFile import com.intellij.testFramework.TestDataFile
import junit.framework.ComparisonFailure import junit.framework.ComparisonFailure
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.TestWithDisposable import org.jetbrains.kotlin.analysis.test.framework.TestWithDisposable
import org.jetbrains.kotlin.analysis.test.framework.project.structure.KotlinProjectStructureProviderTestImpl import org.jetbrains.kotlin.analysis.test.framework.project.structure.KotlinProjectStructureProviderTestImpl
import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtModuleProvider import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtModuleProvider
@@ -46,8 +46,8 @@ import java.util.concurrent.ExecutionException
import kotlin.io.path.exists import kotlin.io.path.exists
import kotlin.io.path.nameWithoutExtension import kotlin.io.path.nameWithoutExtension
abstract class AnalysisApiBasedTest : TestWithDisposable() { abstract class AbstractAnalysisApiBasedTest : TestWithDisposable() {
abstract val configurator: FrontendApiTestConfiguratorService abstract val configurator: AnalysisApiTestConfiguratorService
protected open val enableTestInDependedMode: Boolean protected open val enableTestInDependedMode: Boolean
get() = configurator.allowDependedAnalysisSession get() = configurator.allowDependedAnalysisSession
@@ -127,7 +127,7 @@ abstract class AnalysisApiBasedTest : TestWithDisposable() {
configureTest(this) configureTest(this)
startingArtifactFactory = { ResultingArtifact.Source() } startingArtifactFactory = { ResultingArtifact.Source() }
this.testInfo = this@AnalysisApiBasedTest.testInfo this.testInfo = this@AbstractAnalysisApiBasedTest.testInfo
} }
protected open fun handleInitializationError(exception: Throwable, moduleStructure: TestModuleStructure): InitializationErrorAction = protected open fun handleInitializationError(exception: Throwable, moduleStructure: TestModuleStructure): InitializationErrorAction =
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleFileTest.kt → analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiSingleFileTest.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractHLApiSingleFileTest : AbstractHLApiSingleModuleTest() { abstract class AbstractAnalysisApiSingleFileTest : AbstractAnalysisApiBasedSingleModuleTest() {
final override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) { final override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val singleFile = ktFiles.singleOrNull() ?: ktFiles.first { it.name == "main.kt" } val singleFile = ktFiles.singleOrNull() ?: ktFiles.first { it.name == "main.kt" }
doTestByFileStructure(singleFile, module, testServices) doTestByFileStructure(singleFile, module, testServices)
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiSingleModuleTest.kt
+4 -4
View File
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.analysis.low.level.api.fir.test.base package org.jetbrains.kotlin.analysis.low.level.api.fir.test.base
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.base.AnalysisApiBasedTest import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedTest
abstract class AbstractLowLevelApiSingleModuleTest : AnalysisApiBasedTest() { abstract class AbstractLowLevelApiSingleModuleTest : AbstractAnalysisApiBasedTest() {
override val configurator: FrontendApiTestConfiguratorService get() = FirLowLevelFrontendApiTestConfiguratorService override val configurator: AnalysisApiTestConfiguratorService get() = FirLowLevelAnalysisApiTestConfiguratorService
} }
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelFrontendApiTestConfiguratorService.kt → analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelAnalysisApiTestConfiguratorService.kt
+2 -2
View File
@@ -16,14 +16,14 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.registerTe
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.originalKtFile import org.jetbrains.kotlin.analysis.low.level.api.fir.util.originalKtFile
import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider
import org.jetbrains.kotlin.analysis.providers.KotlinModificationTrackerFactory import org.jetbrains.kotlin.analysis.providers.KotlinModificationTrackerFactory
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.bind import org.jetbrains.kotlin.test.bind
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
object FirLowLevelFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService { object FirLowLevelAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService {
override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { override fun TestConfigurationBuilder.configureTest(disposable: Disposable) {
usePreAnalysisHandlers(::ModuleRegistrarPreAnalysisHandler.bind(disposable, false)) usePreAnalysisHandlers(::ModuleRegistrarPreAnalysisHandler.bind(disposable, false))
} }

Some files were not shown because too many files have changed in this diff Show More