more renames to get rid of "Jet" in class and method names
This commit is contained in:
+1
-1
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.KtFile;
|
||||
* <p/>
|
||||
* See {@link LineBreakpoint#findClassCandidatesInSourceContent} for the primary usage this was introduced
|
||||
*/
|
||||
public class FakeLightClassForFileOfPackage extends AbstractLightClass implements KtLightClass, JetJavaMirrorMarker {
|
||||
public class FakeLightClassForFileOfPackage extends AbstractLightClass implements KtLightClass, KtJavaMirrorMarker {
|
||||
private final KtLightClassForFacade delegate;
|
||||
private final KtFile file;
|
||||
|
||||
|
||||
+2
-2
@@ -165,7 +165,7 @@ public class KotlinJavaFileStubProvider<T extends WithFileStubAndExtraDiagnostic
|
||||
classOrObject.isLocal(),
|
||||
new StubGenerationStrategy<OutermostKotlinClassLightClassData>() {
|
||||
private KtFile getFile() {
|
||||
return classOrObject.getContainingJetFile();
|
||||
return classOrObject.getContainingKtFile();
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@@ -292,7 +292,7 @@ public class KotlinJavaFileStubProvider<T extends WithFileStubAndExtraDiagnostic
|
||||
@Override
|
||||
public void generate(@NotNull GenerationState state, @NotNull Collection<KtFile> files) {
|
||||
PackageCodegen packageCodegen = state.getFactory().forPackage(getPackageFqName(), files);
|
||||
KtFile file = classOrObject.getContainingJetFile();
|
||||
KtFile file = classOrObject.getContainingKtFile();
|
||||
Type packagePartType = FileClasses.getFileClassType(state.getFileClassesProvider(), file);
|
||||
PackageContext context = state.getRootContext().intoPackagePart(packageCodegen.getPackageFragment(), packagePartType, file);
|
||||
packageCodegen.generateClassOrObject(classOrObject, context);
|
||||
|
||||
+3
-3
@@ -51,7 +51,7 @@ public open class KtLightClassForExplicitDeclaration(
|
||||
manager: PsiManager,
|
||||
protected val classFqName: FqName, // FqName of (possibly inner) class
|
||||
protected val classOrObject: KtClassOrObject)
|
||||
: KtWrappingLightClass(manager), JetJavaMirrorMarker, StubBasedPsiElement<KotlinClassOrObjectStub<out KtClassOrObject>> {
|
||||
: KtWrappingLightClass(manager), KtJavaMirrorMarker, StubBasedPsiElement<KotlinClassOrObjectStub<out KtClassOrObject>> {
|
||||
private var delegate: PsiClass? = null
|
||||
|
||||
private fun getLocalClassParent(): PsiElement? {
|
||||
@@ -179,7 +179,7 @@ public open class KtLightClassForExplicitDeclaration(
|
||||
val virtualFile = classOrObject.containingFile.virtualFile
|
||||
assert(virtualFile != null) { "No virtual file for " + classOrObject.text }
|
||||
|
||||
object : FakeFileForLightClass(classOrObject.getContainingJetFile().packageFqName, virtualFile, myManager, this, { getJavaFileStub() }) {
|
||||
object : FakeFileForLightClass(classOrObject.getContainingKtFile().packageFqName, virtualFile, myManager, this, { getJavaFileStub() }) {
|
||||
override fun processDeclarations(
|
||||
processor: PsiScopeProcessor,
|
||||
state: ResolveState,
|
||||
@@ -391,7 +391,7 @@ public open class KtLightClassForExplicitDeclaration(
|
||||
classOrObject: KtClassOrObject,
|
||||
psiClass: PsiClass? = null
|
||||
): KtLightClassForExplicitDeclaration? {
|
||||
if (LightClassUtil.belongsToKotlinBuiltIns(classOrObject.getContainingJetFile())) {
|
||||
if (LightClassUtil.belongsToKotlinBuiltIns(classOrObject.getContainingKtFile())) {
|
||||
return null
|
||||
}
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ public class KtLightClassForFacade private constructor(
|
||||
private val lightClassDataCache: CachedValue<KotlinFacadeLightClassData>,
|
||||
files: Collection<KtFile>,
|
||||
private val deprecated: Boolean
|
||||
) : KtWrappingLightClass(manager), JetJavaMirrorMarker {
|
||||
) : KtWrappingLightClass(manager), KtJavaMirrorMarker {
|
||||
|
||||
private data class StubCacheKey(val fqName: FqName, val searchScope: GlobalSearchScope)
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.kotlin.idea.KotlinLanguage;
|
||||
import org.jetbrains.kotlin.psi.*;
|
||||
import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt;
|
||||
import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -75,7 +75,7 @@ public class KtLightParameter extends LightParameter implements KtLightElement<K
|
||||
KtDeclaration declaration = method.getOrigin();
|
||||
if (declaration == null) return null;
|
||||
|
||||
int jetIndex = JetPsiUtilKt.isExtensionDeclaration(declaration) ? index - 1 : index;
|
||||
int jetIndex = KtPsiUtilKt.isExtensionDeclaration(declaration) ? index - 1 : index;
|
||||
if (jetIndex < 0) return null;
|
||||
|
||||
if (declaration instanceof KtFunction) {
|
||||
|
||||
Reference in New Issue
Block a user