Clean up: rename Jet* to Kt*

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
@@ -62,7 +62,7 @@ public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironmentMa
CompilerTestLanguageVersionSettingsKt.setupLanguageVersionSettingsForCompilerTests(FileUtil.loadFile(file, true), environment);
KtFile ktFile = KotlinTestUtils.loadJetFile(environment.getProject(), file);
KtFile ktFile = KotlinTestUtils.loadKtFile(environment.getProject(), file);
SetMultimap<KtElement, Pseudocode> data = LinkedHashMultimap.create();
AnalysisResult analysisResult = KotlinTestUtils.analyzeFile(ktFile, environment);
@@ -68,7 +68,7 @@ fun getExpectedTypePredicate(
val pseudocode = value.createdAt?.owner ?: return AllTypes
val typePredicates = LinkedHashSet<TypePredicate?>()
fun addSubtypesOf(jetType: KotlinType?) = typePredicates.add(jetType?.getSubtypesPredicate())
fun addSubtypesOf(kotlinType: KotlinType?) = typePredicates.add(kotlinType?.getSubtypesPredicate())
fun addByExplicitReceiver(resolvedCall: ResolvedCall<*>?) {
val receiverValue = (resolvedCall ?: return).getExplicitReceiverValue()
@@ -67,8 +67,8 @@ abstract public class AbstractGenerateNotNullAssertionsTest extends CodegenTestC
}
private void assertNoIntrinsicsMethodIsCalledInMyClasses(boolean noClassFileIsAnError) {
for (KtFile jetFile : myFiles.getPsiFiles()) {
String fileClassName = JvmFileClassUtil.getFileClassInfoNoResolve(jetFile).getFileClassFqName().asString();
for (KtFile ktFile : myFiles.getPsiFiles()) {
String fileClassName = JvmFileClassUtil.getFileClassInfoNoResolve(ktFile).getFileClassFqName().asString();
assertNoIntrinsicsMethodIsCalled(fileClassName, noClassFileIsAnError);
}
}
@@ -116,7 +116,7 @@ abstract class AbstractCompileJavaAgainstKotlinTest : TestCaseWithTmpdir() {
updateConfiguration(environment.configuration)
environment.registerJavac(
javaFiles = javaFiles,
kotlinFiles = listOf(KotlinTestUtils.loadJetFile(environment.project, ktFiles.first()))
kotlinFiles = listOf(KotlinTestUtils.loadKtFile(environment.project, ktFiles.first()))
)
if (!ktFiles.isEmpty()) {
LoadDescriptorUtil.compileKotlinToDirAndGetModule(ktFiles, outDir, environment)
@@ -97,9 +97,9 @@ abstract class AbstractResolvedCallsTest : KotlinTestWithEnvironment() {
}
protected open fun buildCachedCallAtIndex(
bindingContext: BindingContext, jetFile: KtFile, index: Int
bindingContext: BindingContext, ktFile: KtFile, index: Int
): Pair<PsiElement?, ResolvedCall<out CallableDescriptor>?> {
val element = jetFile.findElementAt(index)!!
val element = ktFile.findElementAt(index)!!
val expression = element.getStrictParentOfType<KtExpression>()
val cachedCall = expression?.getParentResolvedCall(bindingContext, strict = false)
@@ -28,9 +28,9 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
abstract class AbstractResolvedConstructorDelegationCallsTests : AbstractResolvedCallsTest() {
override fun buildCachedCallAtIndex(
bindingContext: BindingContext, jetFile: KtFile, index: Int
bindingContext: BindingContext, ktFile: KtFile, index: Int
): Pair<PsiElement?, ResolvedCall<out CallableDescriptor>?> {
val element = jetFile.findElementAt(index)
val element = ktFile.findElementAt(index)
val constructor = element?.getNonStrictParentOfType<KtSecondaryConstructor>()!!
val delegationCall = constructor.getDelegationCall()
@@ -17,7 +17,7 @@ import java.util.regex.Pattern
object BuiltinsTestUtils {
fun compileBuiltinsModule(environment: KotlinCoreEnvironment): ModuleDescriptor {
val files = KotlinTestUtils.loadToJetFiles(
val files = KotlinTestUtils.loadToKtFiles(
environment, ContainerUtil.concat<File>(
allFilesUnder("core/builtins/native"),
allFilesUnder("core/builtins/src"),
@@ -224,13 +224,13 @@ public class KotlinTestUtils {
for (KotlinSourceRoot root : roots) {
File file = new File(root.getPath());
if (file.isFile()) {
ktFiles.add(loadJetFile(environment.getProject(), file));
ktFiles.add(loadKtFile(environment.getProject(), file));
}
else {
//noinspection ConstantConditions
for (File childFile : file.listFiles()) {
if (childFile.getName().endsWith(".kt") || childFile.getName().endsWith(".kts")) {
ktFiles.add(loadJetFile(environment.getProject(), childFile));
ktFiles.add(loadKtFile(environment.getProject(), childFile));
}
}
}
@@ -597,18 +597,18 @@ public class KotlinTestUtils {
}
@NotNull
public static KtFile loadJetFile(@NotNull Project project, @NotNull File ioFile) throws IOException {
public static KtFile loadKtFile(@NotNull Project project, @NotNull File ioFile) throws IOException {
String text = FileUtil.loadFile(ioFile, true);
return new KtPsiFactory(project).createPhysicalFile(ioFile.getName(), text);
}
@NotNull
public static List<KtFile> loadToJetFiles(@NotNull KotlinCoreEnvironment environment, @NotNull List<File> files) throws IOException {
List<KtFile> jetFiles = Lists.newArrayList();
public static List<KtFile> loadToKtFiles(@NotNull KotlinCoreEnvironment environment, @NotNull List<File> files) throws IOException {
List<KtFile> ktFiles = Lists.newArrayList();
for (File file : files) {
jetFiles.add(loadJetFile(environment.getProject(), file));
ktFiles.add(loadKtFile(environment.getProject(), file));
}
return jetFiles;
return ktFiles;
}
@NotNull