more renames to get rid of "Jet" in class and method names

This commit is contained in:
Dmitry Jemerov
2015-11-09 19:06:50 +01:00
parent a3241637ce
commit e64a270d1a
152 changed files with 465 additions and 474 deletions
@@ -27,7 +27,7 @@ public class CodegenStatementVisitor extends KtVisitor<StackValue, StackValue> {
}
@Override
public StackValue visitJetElement(@NotNull KtElement element, StackValue receiver) {
public StackValue visitKtElement(@NotNull KtElement element, StackValue receiver) {
return element.accept(codegen, receiver);
}
@@ -2324,7 +2324,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
}
final Type asmType =
state.getSamWrapperClasses().getSamWrapperClass(samType, expression.getContainingJetFile(), getParentCodegen());
state.getSamWrapperClasses().getSamWrapperClass(samType, expression.getContainingKtFile(), getParentCodegen());
return StackValue.operation(asmType, new Function1<InstructionAdapter, Unit>() {
@Override
@@ -1191,7 +1191,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
KtVisitorVoid visitor = new KtVisitorVoid() {
@Override
public void visitJetElement(@NotNull KtElement e) {
public void visitKtElement(@NotNull KtElement e) {
e.acceptChildren(this);
}
@@ -317,7 +317,7 @@ public abstract class MemberCodegen<T extends KtElement/* TODO: & JetDeclaration
return implementationOwnerType;
}
else {
return FileClasses.getFileClassType(fileClassesProvider, element.getContainingJetFile());
return FileClasses.getFileClassType(fileClassesProvider, element.getContainingKtFile());
}
}
/*disabled cause of KT-7775
@@ -34,7 +34,7 @@ data public class SourceInfo(val source: String, val pathOrCleanFQN: String, val
val isTopLevel = element is KtFile || (element is KtNamedFunction && element.getParent() is KtFile)
val cleanedClassFqName = if (!isTopLevel) internalClassName else internalClassName.substringBefore('$')
return SourceInfo(element.getContainingJetFile().getName(), cleanedClassFqName, lineNumbers!!)
return SourceInfo(element.getContainingKtFile().getName(), cleanedClassFqName, lineNumbers!!)
}
}
@@ -153,13 +153,13 @@ class CodegenAnnotatingVisitor extends KtVisitorVoid {
}
@Override
public void visitJetElement(@NotNull KtElement element) {
super.visitJetElement(element);
public void visitKtElement(@NotNull KtElement element) {
super.visitKtElement(element);
element.acceptChildren(this);
}
@Override
public void visitJetFile(@NotNull KtFile file) {
public void visitKtFile(@NotNull KtFile file) {
if (file.isScript()) {
// TODO: replace with visitScript override
//noinspection ConstantConditions
@@ -518,7 +518,7 @@ class CodegenAnnotatingVisitor extends KtVisitorVoid {
super.visitWhenExpression(expression);
if (!isWhenWithEnums(expression)) return;
String currentClassName = getCurrentTopLevelClassOrPackagePartInternalName(expression.getContainingJetFile());
String currentClassName = getCurrentTopLevelClassOrPackagePartInternalName(expression.getContainingKtFile());
if (bindingContext.get(MAPPINGS_FOR_WHENS_BY_ENUM_IN_CLASS_FILE, currentClassName) == null) {
bindingTrace.record(MAPPINGS_FOR_WHENS_BY_ENUM_IN_CLASS_FILE, currentClassName, new ArrayList<WhenByEnumsMapping>(1));
@@ -71,7 +71,7 @@ public final class PsiCodegenPredictor {
}
}
else {
KtFile containingFile = declaration.getContainingJetFile();
KtFile containingFile = declaration.getContainingKtFile();
if (declaration instanceof KtNamedFunction) {
Name name = ((KtNamedFunction) declaration).getNameAsName();
@@ -51,7 +51,7 @@ public class MappingsClassesForWhenByEnum {
Type mappingsClassType = Type.getObjectType(mapping.getMappingsClassInternalName());
mappingsCodegen.generate(mappings, mappingsClassType, expression.getContainingJetFile());
mappingsCodegen.generate(mappings, mappingsClassType, expression.getContainingKtFile());
generatedMappingClasses.add(mapping.getMappingsClassInternalName());
}
}