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

Clean up: rename Jet* to Kt*

Browse Source
This commit is contained in:
Vladimir Dolzhenko
2023-01-03 15:18:45 +01:00
parent d6e587171e
commit 4542b3947b
65 changed files with 179 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
+2 -2
View File
@@ -61,7 +61,7 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
private fun analyzeFileToPackageView(vararg extraClassPath: File): PackageViewDescriptor {
val environment = createEnvironment(extraClassPath.toList())
val ktFile = KotlinTestUtils.loadJetFile(environment.project, getTestDataFileWithExtension("kt"))
val ktFile = KotlinTestUtils.loadKtFile(environment.project, getTestDataFileWithExtension("kt"))
val result = JvmResolveUtil.analyzeAndCheckForErrors(ktFile, environment)
return result.moduleDescriptor.getPackage(LoadDescriptorUtil.TEST_PACKAGE_FQNAME).also {
@@ -197,7 +197,7 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
val library = compileLibrary("library")
val environment = createEnvironment(listOf(library))
val ktFile = KotlinTestUtils.loadJetFile(environment.project, getTestDataFileWithExtension("kt"))
val ktFile = KotlinTestUtils.loadKtFile(environment.project, getTestDataFileWithExtension("kt"))
val result = JvmResolveUtil.analyze(ktFile, environment)
result.throwIfError()
compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
+1 -1
View File
@@ -141,7 +141,7 @@ class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() {
val modules = HashMap<String, TestModule>()
for (dir in moduleDirs) {
val name = dir.name
val kotlinFiles = KotlinTestUtils.loadToJetFiles(environment, dir.listFiles { it -> it.extension == "kt" }?.toList().orEmpty())
val kotlinFiles = KotlinTestUtils.loadToKtFiles(environment, dir.listFiles { it -> it.extension == "kt" }?.toList().orEmpty())
val javaFilesScope = object : DelegatingGlobalSearchScope(GlobalSearchScope.allScope(project)) {
override fun contains(file: VirtualFile): Boolean {
if (file !in myBaseScope!!) return false
compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java
+4 -4
View File
@@ -40,11 +40,11 @@ public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment
}
public void testRecursive() throws Exception {
File ktFile = new File("compiler/testData/recursiveProcessor/declarations.kt");
File file = new File("compiler/testData/recursiveProcessor/declarations.kt");
File txtFile = new File("compiler/testData/recursiveProcessor/declarations.txt");
String text = FileUtil.loadFile(ktFile, true);
KtFile jetFile = KtTestUtil.createFile("declarations.kt", text, getEnvironment().getProject());
AnalysisResult result = KotlinTestUtils.analyzeFile(jetFile, getEnvironment());
String text = FileUtil.loadFile(file, true);
KtFile ktFile = KtTestUtil.createFile("declarations.kt", text, getEnvironment().getProject());
AnalysisResult result = KotlinTestUtils.analyzeFile(ktFile, getEnvironment());
PackageViewDescriptor testPackage = result.getModuleDescriptor().getPackage(FqName.topLevel(Name.identifier("test")));
List<String> descriptors = recursivelyCollectDescriptors(testPackage);
compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt
+2 -2
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.typeBinding.TypeBinding
import org.jetbrains.kotlin.resolve.typeBinding.createTypeBindingForReturnType
import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.KotlinTestUtils.assertEqualsToFile
import org.jetbrains.kotlin.test.KotlinTestUtils.loadJetFile
import org.jetbrains.kotlin.test.KotlinTestUtils.loadKtFile
import org.jetbrains.kotlin.test.KotlinTestWithEnvironment
import org.jetbrains.kotlin.utils.Printer
import java.io.File
@@ -36,7 +36,7 @@ abstract class AbstractTypeBindingTest : KotlinTestWithEnvironment() {
protected fun doTest(path: String) {
val testFile = File(path)
val testKtFile = loadJetFile(project, testFile)
val testKtFile = loadKtFile(project, testFile)
val analyzeResult = JvmResolveUtil.analyze(testKtFile, environment)
compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java
+1 -1
View File
@@ -571,7 +571,7 @@ public class KotlinTypeCheckerTest extends KotlinTestWithEnvironment {
@NotNull
private LexicalScope getDeclarationsScope() throws IOException {
KtFile ktFile = KotlinTestUtils.loadJetFile(getProject(), new File("compiler/testData/type-checker-test.kt"));
KtFile ktFile = KotlinTestUtils.loadKtFile(getProject(), new File("compiler/testData/type-checker-test.kt"));
AnalysisResult result = JvmResolveUtil.analyze(ktFile, getEnvironment());
//noinspection ConstantConditions
return result.getBindingContext().get(BindingContext.LEXICAL_SCOPE, ktFile);
compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java
+3 -3
View File
@@ -145,10 +145,10 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment {
}
private KotlinType resolveType(String typeStr) {
KtTypeReference jetTypeReference = new KtPsiFactory(getProject()).createType(typeStr);
AnalyzingUtils.checkForSyntacticErrors(jetTypeReference);
KtTypeReference ktTypeReference = new KtPsiFactory(getProject()).createType(typeStr);
AnalyzingUtils.checkForSyntacticErrors(ktTypeReference);
BindingTrace trace = new BindingTraceContext();
KotlinType type = container.getTypeResolver().resolveType(scope, jetTypeReference, trace, true);
KotlinType type = container.getTypeResolver().resolveType(scope, ktTypeReference, trace, true);
if (!trace.getBindingContext().getDiagnostics().isEmpty()) {
fail("Errors:\n" + StringUtil.join(trace.getBindingContext().getDiagnostics(), DefaultErrorMessages::render, "\n"));
}