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-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 org.jetbrains.kotlin.analysis.api.fir.utils.configureOptionalTestCompilerPlugin
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.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.idea.references.KotlinFirReferenceContributor
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.test.builders.TestConfigurationBuilder
object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService {
object FirAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService {
override fun TestConfigurationBuilder.configureTest(disposable: Disposable) {
with(FirLowLevelFrontendApiTestConfiguratorService) { configureTest(disposable) }
with(FirLowLevelAnalysisApiTestConfiguratorService) { configureTest(disposable) }
configureOptionalTestCompilerPlugin()
}
override fun processTestFiles(files: List<KtFile>): List<KtFile> {
return FirLowLevelFrontendApiTestConfiguratorService.processTestFiles(files)
return FirLowLevelAnalysisApiTestConfiguratorService.processTestFiles(files)
}
override fun getOriginalFile(file: KtFile): KtFile {
return FirLowLevelFrontendApiTestConfiguratorService.getOriginalFile(file)
return FirLowLevelAnalysisApiTestConfiguratorService.getOriginalFile(file)
}
override fun registerProjectServices(
@@ -45,7 +45,7 @@ object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorServic
projectStructureProvider: ProjectStructureProvider,
jarFileSystem: CoreJarFileSystem,
) {
FirLowLevelFrontendApiTestConfiguratorService.registerProjectServices(
FirLowLevelAnalysisApiTestConfiguratorService.registerProjectServices(
project,
compilerConfig,
files,
@@ -56,7 +56,7 @@ object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorServic
}
override fun registerApplicationServices(application: MockApplication) {
FirLowLevelFrontendApiTestConfiguratorService.registerApplicationServices(application)
FirLowLevelAnalysisApiTestConfiguratorService.registerApplicationServices(application)
if (application.getServiceIfCreated(KotlinReferenceProvidersService::class.java) == null) {
application.registerService(KotlinReferenceProvidersService::class.java, HLApiReferenceProviderService::class.java)
application.registerService(KotlinReferenceProviderContributor::class.java, KotlinFirReferenceContributor::class.java)
@@ -64,6 +64,6 @@ object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorServic
}
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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.source.LibrarySourceFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
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.test.TestMetadata;
import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractReferenceResolveTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return LibrarySourceFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return LibrarySourceAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceResolveTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnDeclarationsTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirAnalysisApiAnnotationsOnDeclarationsTestGenerated extends AbstractAnalysisApiAnnotationsOnDeclarationsTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnFilesTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirAnalysisApiAnnotationsOnFilesTestGenerated extends AbstractAnalysisApiAnnotationsOnFilesTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnTypesTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirAnalysisApiAnnotationsOnTypesTestGenerated extends AbstractAnalysisApiAnnotationsOnTypesTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirResolveCallTestGenerated extends AbstractResolveCallTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirResolveCandidatesTestGenerated extends AbstractResolveCandidatesTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirCompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTimeConstantEvaluatorTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.diagnosticProvider.AbstractCollectDiagnosticsTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirCollectDiagnosticsTestGenerated extends AbstractCollectDiagnosticsTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractReturnTargetSymbolTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirReturnTargetSymbolTestGenerated extends AbstractReturnTargetSymbolTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractWhenMissingCasesTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirWhenMissingCasesTestGenerated extends AbstractWhenMissingCasesTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractDeclarationReturnTypeTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirDeclarationReturnTypeTestGenerated extends AbstractDeclarationReturnTypeTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractExpectedExpressionTypeTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirExpectedExpressionTypeTestGenerated extends AbstractExpectedExpressionTypeTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractHLExpressionTypeTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirHLExpressionTypeTestGenerated extends AbstractHLExpressionTypeTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
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) {
val mainKtFile = ktFiles.singleOrNull() ?: ktFiles.first { it.name == "main.kt" }
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
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.base.AbstractHLApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractExpressionPsiTypeProviderTest : AbstractHLApiSingleFileTest(){
abstract class AbstractExpressionPsiTypeProviderTest : AbstractAnalysisApiSingleFileTest(){
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val declarationAtCaret = testServices.expressionMarkerProvider.getSelectedElement(ktFile) as KtExpression
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.PsiElementVisitor
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.base.AbstractHLApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
import org.jetbrains.kotlin.asJava.classes.KtLightClass
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.utils.addToStdlib.firstIsInstanceOrNull
abstract class AbstractPsiTypeProviderTest : AbstractHLApiSingleFileTest(){
abstract class AbstractPsiTypeProviderTest : AbstractAnalysisApiSingleFileTest(){
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val declaration = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtDeclaration>(ktFile)
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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider.AbstractHLSmartCastInfoTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirHLSmartCastInfoTestGenerated extends AbstractHLSmartCastInfoTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractIsSubclassOfTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirIsSubclassOfTestGenerated extends AbstractIsSubclassOfTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractOverriddenDeclarationProviderTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirOverriddenDeclarationProviderTestGenerated extends AbstractOverriddenDeclarationProviderTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationRenderer.AbstractRendererTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirRendererTestGenerated extends AbstractRendererTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator.AbstractTypeParameterTypeTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirTypeParameterTypeTestGenerated extends AbstractTypeParameterTypeTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractFunctionClassKindTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirFunctionClassKindTestGenerated extends AbstractFunctionClassKindTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractIsDenotableTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirIsDenotableTestGenerated extends AbstractIsDenotableTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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.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.base.AbstractHLApiSingleFileTest
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
import org.jetbrains.kotlin.analysis.api.types.KtType
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractFirGetSuperTypesTest : AbstractHLApiSingleFileTest(){
abstract class AbstractFirGetSuperTypesTest : AbstractAnalysisApiSingleFileTest(){
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider.AbstractHasCommonSubtypeTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirHasCommonSubtypeTestGenerated extends AbstractHasCommonSubtypeTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.components.importOptimizer.AbstractHLImportOptimizerTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirHLImportOptimizerTestGenerated extends AbstractHLImportOptimizerTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider.AbstractExpressionPsiTypeProviderTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirExpressionPsiTypeProviderTestGenerated extends AbstractExpressionPsiTypeProviderTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider.AbstractPsiTypeProviderTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirPsiTypeProviderTestGenerated extends AbstractPsiTypeProviderTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.components.typeProvider.AbstractFirGetSuperTypesTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirFirGetSuperTypesTestGenerated extends AbstractFirGetSuperTypesTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractDelegateMemberScopeTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirDelegateMemberScopeTestGenerated extends AbstractDelegateMemberScopeTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractFileScopeTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirFileScopeTestGenerated extends AbstractFileScopeTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractMemberScopeByFqNameTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirMemberScopeByFqNameTestGenerated extends AbstractMemberScopeByFqNameTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractSubstitutionOverridesUnwrappingTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirSubstitutionOverridesUnwrappingTestGenerated extends AbstractSubstitutionOverridesUnwrappingTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirSymbolByFqNameTestGenerated extends AbstractSymbolByFqNameTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -25,8 +24,8 @@ import java.util.regex.Pattern;
public class FirSymbolByPsiTestGenerated extends AbstractSymbolByPsiTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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 org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public class FirSymbolByReferenceTestGenerated extends AbstractSymbolByReferenceTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
return FirFrontendApiTestConfiguratorService.INSTANCE;
public AnalysisApiTestConfiguratorService getConfigurator() {
return FirAnalysisApiTestConfiguratorService.INSTANCE;
}
@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.compiled.ClassFileDecompilers
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInDecompiler
import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinClassFileDecompiler
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.test.builders.TestConfigurationBuilder
object LibraryFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService {
object LibraryAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService {
override val allowDependedAnalysisSession: Boolean get() = false
override fun TestConfigurationBuilder.configureTest(disposable: Disposable) {
@@ -50,7 +50,7 @@ object LibraryFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorSe
}
override fun registerApplicationServices(application: MockApplication) {
FirFrontendApiTestConfiguratorService.registerApplicationServices(application)
FirAnalysisApiTestConfiguratorService.registerApplicationServices(application)
if (application.getServiceIfCreated(ClsKotlinBinaryClassCache::class.java) != null) return
application.registerService(ClsKotlinBinaryClassCache::class.java)
application.registerService(FileAttributeService::class.java, DummyFileAttributeService)
@@ -68,6 +68,6 @@ object LibraryFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorSe
}
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.vfs.impl.jar.CoreJarFileSystem
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService
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.project.structure.ProjectStructureProvider
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.services.ServiceRegistrationData
object LibrarySourceFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService {
object LibrarySourceAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService {
override val allowDependedAnalysisSession: Boolean get() = false
override fun TestConfigurationBuilder.configureTest(disposable: Disposable) {
@@ -43,10 +43,10 @@ object LibrarySourceFrontendApiTestConfiguratorService : FrontendApiTestConfigur
}
override fun registerApplicationServices(application: MockApplication) {
FirFrontendApiTestConfiguratorService.registerApplicationServices(application)
FirAnalysisApiTestConfiguratorService.registerApplicationServices(application)
}
override fun doOutOfBlockModification(file: KtFile) {
FirFrontendApiTestConfiguratorService.doOutOfBlockModification(file)
FirAnalysisApiTestConfiguratorService.doOutOfBlockModification(file)
}
}