Clean up: rename Jet* to Kt*
This commit is contained in:
@@ -24,7 +24,7 @@ interface KtElement : NavigatablePsiElement, KtPureElement {
|
||||
|
||||
fun <R, D> accept(visitor: KtVisitor<R, D>, data: D): R
|
||||
|
||||
@Deprecated("Don't use getReference() on JetElement for the choice is unpredictable")
|
||||
@Deprecated("Don't use getReference() on KtElement for the choice is unpredictable")
|
||||
override fun getReference(): PsiReference?
|
||||
}
|
||||
|
||||
|
||||
@@ -53,8 +53,8 @@ public class KtFunctionType extends KtElementImplStub<KotlinPlaceHolderStub<KtFu
|
||||
if (receiverTypeRef != null) {
|
||||
result.add(receiverTypeRef);
|
||||
}
|
||||
for (KtParameter jetParameter : getParameters()) {
|
||||
result.add(jetParameter.getTypeReference());
|
||||
for (KtParameter ktParameter : getParameters()) {
|
||||
result.add(ktParameter.getTypeReference());
|
||||
}
|
||||
KtTypeReference returnTypeRef = getReturnTypeReference();
|
||||
if (returnTypeRef != null) {
|
||||
|
||||
@@ -336,9 +336,9 @@ public class KtPsiUtil {
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public static KtClassOrObject getClassIfParameterIsProperty(@NotNull KtParameter jetParameter) {
|
||||
if (jetParameter.hasValOrVar()) {
|
||||
PsiElement grandParent = jetParameter.getParent().getParent();
|
||||
public static KtClassOrObject getClassIfParameterIsProperty(@NotNull KtParameter ktParameter) {
|
||||
if (ktParameter.hasValOrVar()) {
|
||||
PsiElement grandParent = ktParameter.getParent().getParent();
|
||||
if (grandParent instanceof KtPrimaryConstructor) {
|
||||
return ((KtPrimaryConstructor) grandParent).getContainingClassOrObject();
|
||||
}
|
||||
@@ -883,7 +883,7 @@ public class KtPsiUtil {
|
||||
KtSimpleNameExpression operationExpression = expression.getOperationReference();
|
||||
IElementType elementType = operationExpression.getReferencedNameElementType();
|
||||
assert elementType == null || elementType instanceof KtToken :
|
||||
"JetOperationExpression should have operation token of type KtToken: " +
|
||||
"KtOperationExpression should have operation token of type KtToken: " +
|
||||
expression;
|
||||
return (KtToken) elementType;
|
||||
}
|
||||
|
||||
@@ -418,8 +418,8 @@ public class KtVisitor<R, D> extends PsiElementVisitor {
|
||||
return visitKtElement(typeProjection, data);
|
||||
}
|
||||
|
||||
public R visitWhenEntry(@NotNull KtWhenEntry jetWhenEntry, D data) {
|
||||
return visitKtElement(jetWhenEntry, data);
|
||||
public R visitWhenEntry(@NotNull KtWhenEntry ktWhenEntry, D data) {
|
||||
return visitKtElement(ktWhenEntry, data);
|
||||
}
|
||||
|
||||
public R visitIsExpression(@NotNull KtIsExpression expression, D data) {
|
||||
|
||||
@@ -397,8 +397,8 @@ public class KtVisitorVoid extends KtVisitor<Void, Void> {
|
||||
super.visitTypeProjection(typeProjection, null);
|
||||
}
|
||||
|
||||
public void visitWhenEntry(@NotNull KtWhenEntry jetWhenEntry) {
|
||||
super.visitWhenEntry(jetWhenEntry, null);
|
||||
public void visitWhenEntry(@NotNull KtWhenEntry ktWhenEntry) {
|
||||
super.visitWhenEntry(ktWhenEntry, null);
|
||||
}
|
||||
|
||||
public void visitIsExpression(@NotNull KtIsExpression expression) {
|
||||
@@ -993,8 +993,8 @@ public class KtVisitorVoid extends KtVisitor<Void, Void> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public final Void visitWhenEntry(@NotNull KtWhenEntry jetWhenEntry, Void data) {
|
||||
visitWhenEntry(jetWhenEntry);
|
||||
public final Void visitWhenEntry(@NotNull KtWhenEntry ktWhenEntry, Void data) {
|
||||
visitWhenEntry(ktWhenEntry);
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
|
||||
|
||||
// methods with parameter
|
||||
|
||||
public void visitJetElementVoid(@NotNull KtElement element, P data) {
|
||||
public void visitKtElementVoid(@NotNull KtElement element, P data) {
|
||||
super.visitKtElement(element, data);
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
|
||||
super.visitDestructuringDeclarationEntry(multiDeclarationEntry, data);
|
||||
}
|
||||
|
||||
public void visitJetFileVoid(@NotNull KtFile file, P data) {
|
||||
public void visitKtFileVoid(@NotNull KtFile file, P data) {
|
||||
super.visitKtFile(file, data);
|
||||
}
|
||||
|
||||
@@ -370,8 +370,8 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
|
||||
super.visitTypeProjection(typeProjection, data);
|
||||
}
|
||||
|
||||
public void visitWhenEntryVoid(@NotNull KtWhenEntry jetWhenEntry, P data) {
|
||||
super.visitWhenEntry(jetWhenEntry, data);
|
||||
public void visitWhenEntryVoid(@NotNull KtWhenEntry ktWhenEntry, P data) {
|
||||
super.visitWhenEntry(ktWhenEntry, data);
|
||||
}
|
||||
|
||||
public void visitCollectionLiteralExpressionVoid(@NotNull KtCollectionLiteralExpression expression, P data) {
|
||||
@@ -425,7 +425,7 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
|
||||
// hidden methods
|
||||
@Override
|
||||
public final Void visitKtElement(@NotNull KtElement element, P data) {
|
||||
visitJetElementVoid(element, data);
|
||||
visitKtElementVoid(element, data);
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -473,7 +473,7 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
|
||||
|
||||
@Override
|
||||
public final Void visitKtFile(@NotNull KtFile file, P data) {
|
||||
visitJetFileVoid(file, data);
|
||||
visitKtFileVoid(file, data);
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -936,8 +936,8 @@ public class KtVisitorVoidWithParameter<P> extends KtVisitor<Void, P> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public final Void visitWhenEntry(@NotNull KtWhenEntry jetWhenEntry, P data) {
|
||||
visitWhenEntryVoid(jetWhenEntry, data);
|
||||
public final Void visitWhenEntry(@NotNull KtWhenEntry ktWhenEntry, P data) {
|
||||
visitWhenEntryVoid(ktWhenEntry, data);
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ public class KtWhenConditionInRange extends KtWhenCondition {
|
||||
|
||||
@Nullable @IfNotParsed
|
||||
public KtExpression getRangeExpression() {
|
||||
// Copied from JetBinaryExpression
|
||||
// Copied from KtBinaryExpression
|
||||
ASTNode node = getOperationReference().getNode().getTreeNext();
|
||||
while (node != null) {
|
||||
PsiElement psi = node.getPsi();
|
||||
|
||||
@@ -40,8 +40,8 @@ class KotlinFileStubImpl(
|
||||
val facadePartSimpleNames: List<String>?,
|
||||
) : PsiFileStubImpl<KtFile>(ktFile), KotlinFileStub, PsiClassHolderFileStub<KtFile> {
|
||||
|
||||
constructor(jetFile: KtFile?, packageName: String, isScript: Boolean) : this(
|
||||
jetFile,
|
||||
constructor(ktFile: KtFile?, packageName: String, isScript: Boolean) : this(
|
||||
ktFile,
|
||||
packageName,
|
||||
isScript,
|
||||
facadeFqNameString = null,
|
||||
|
||||
@@ -43,7 +43,7 @@ object ModifierMaskUtils {
|
||||
@JvmStatic
|
||||
fun maskHasModifier(mask: Long, modifierToken: KtModifierKeywordToken): Boolean {
|
||||
val index = MODIFIER_KEYWORDS_ARRAY.indexOf(modifierToken)
|
||||
assert(index >= 0) { "All JetModifierKeywordTokens should be present in MODIFIER_KEYWORDS_ARRAY" }
|
||||
assert(index >= 0) { "All KtModifierKeywordTokens should be present in MODIFIER_KEYWORDS_ARRAY" }
|
||||
return (mask and (1L shl index)) != 0L
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user