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

rename "Jet" from names of IDE classes; consistently use Kt prefix for PSI elements and classes directly related to specific PSI elements

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-02 18:22:52 +01:00
parent fff404780c
commit 3bd7f87d2b
434 changed files with 1867 additions and 1924 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt
+9 -9
View File
@@ -61,8 +61,8 @@ public class KotlinIndicesHelper(
public fun getTopLevelCallablesByName(name: String): Collection<CallableDescriptor> {
val declarations = HashSet<KtNamedDeclaration>()
declarations.addTopLevelNonExtensionCallablesByName(JetFunctionShortNameIndex.getInstance(), name)
declarations.addTopLevelNonExtensionCallablesByName(JetPropertyShortNameIndex.getInstance(), name)
declarations.addTopLevelNonExtensionCallablesByName(KotlinFunctionShortNameIndex.getInstance(), name)
declarations.addTopLevelNonExtensionCallablesByName(KotlinPropertyShortNameIndex.getInstance(), name)
return declarations.flatMap {
if (it.getContainingJetFile().isCompiled()) { //TODO: it's temporary while resolveToDescriptor does not work for compiled declarations
resolutionFacade.resolveImportReference(moduleDescriptor, it.getFqName()!!).filterIsInstance<CallableDescriptor>()
@@ -81,8 +81,8 @@ public class KotlinIndicesHelper(
}
public fun getTopLevelCallables(nameFilter: (String) -> Boolean): Collection<CallableDescriptor> {
return (JetTopLevelFunctionFqnNameIndex.getInstance().getAllKeys(project).asSequence() +
JetTopLevelPropertyFqnNameIndex.getInstance().getAllKeys(project).asSequence())
return (KotlinTopLevelFunctionFqnNameIndex.getInstance().getAllKeys(project).asSequence() +
KotlinTopLevelPropertyFqnNameIndex.getInstance().getAllKeys(project).asSequence())
.map { FqName(it) }
.filter { nameFilter(it.shortName().asString()) }
.toSet()
@@ -110,13 +110,13 @@ public class KotlinIndicesHelper(
val receiverTypeNames = HashSet<String>()
receiverTypes.forEach { receiverTypeNames.addTypeNames(it) }
val index = JetTopLevelExtensionsByReceiverTypeIndex.INSTANCE
val index = KotlinTopLevelExtensionsByReceiverTypeIndex.INSTANCE
val declarations = index.getAllKeys(project)
.asSequence()
.filter {
JetTopLevelExtensionsByReceiverTypeIndex.receiverTypeNameFromKey(it) in receiverTypeNames
&& nameFilter(JetTopLevelExtensionsByReceiverTypeIndex.callableNameFromKey(it))
KotlinTopLevelExtensionsByReceiverTypeIndex.receiverTypeNameFromKey(it) in receiverTypeNames
&& nameFilter(KotlinTopLevelExtensionsByReceiverTypeIndex.callableNameFromKey(it))
}
.flatMap { index.get(it, project, scope).asSequence() }
@@ -170,7 +170,7 @@ public class KotlinIndicesHelper(
.toSet()
public fun getKotlinClasses(nameFilter: (String) -> Boolean, kindFilter: (ClassKind) -> Boolean): Collection<ClassDescriptor> {
return JetFullClassNameIndex.getInstance().getAllKeys(project).asSequence()
return KotlinFullClassNameIndex.getInstance().getAllKeys(project).asSequence()
.map { FqName(it) }
.filter { nameFilter(it.shortName().asString()) }
.toList()
@@ -178,7 +178,7 @@ public class KotlinIndicesHelper(
}
private fun getClassDescriptorsByFQName(classFQName: FqName, kindFilter: (ClassKind) -> Boolean): Collection<ClassDescriptor> {
val declarations = JetFullClassNameIndex.getInstance()[classFQName.asString(), project, scope]
val declarations = KotlinFullClassNameIndex.getInstance()[classFQName.asString(), project, scope]
if (declarations.isEmpty()) {
// This fqn is absent in caches, dead or not in scope
idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/JetCodeStyleSettings.java → idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
+6 -6
View File
@@ -22,7 +22,7 @@ import com.intellij.psi.codeStyle.*;
import com.intellij.util.ReflectionUtil;
import org.jetbrains.annotations.NotNull;
public class JetCodeStyleSettings extends CustomCodeStyleSettings {
public class KotlinCodeStyleSettings extends CustomCodeStyleSettings {
public final PackageEntryTable PACKAGES_TO_USE_STAR_IMPORTS = new PackageEntryTable();
public boolean SPACE_AROUND_RANGE = false;
@@ -40,7 +40,7 @@ public class JetCodeStyleSettings extends CustomCodeStyleSettings {
public int NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS = ApplicationManager.getApplication().isUnitTestMode() ? Integer.MAX_VALUE : 3;
public boolean IMPORT_NESTED_CLASSES = false;
public JetCodeStyleSettings(CodeStyleSettings container) {
public KotlinCodeStyleSettings(CodeStyleSettings container) {
super("JetCodeStyleSettings", container);
// defaults in IDE but not in tests
@@ -50,18 +50,18 @@ public class JetCodeStyleSettings extends CustomCodeStyleSettings {
}
}
public static JetCodeStyleSettings getInstance(Project project) {
return CodeStyleSettingsManager.getSettings(project).getCustomSettings(JetCodeStyleSettings.class);
public static KotlinCodeStyleSettings getInstance(Project project) {
return CodeStyleSettingsManager.getSettings(project).getCustomSettings(KotlinCodeStyleSettings.class);
}
@Override
public Object clone() {
JetCodeStyleSettings clone = new JetCodeStyleSettings(getContainer());
KotlinCodeStyleSettings clone = new KotlinCodeStyleSettings(getContainer());
clone.copyFrom(this);
return clone;
}
private void copyFrom(@NotNull JetCodeStyleSettings from) {
private void copyFrom(@NotNull KotlinCodeStyleSettings from) {
ReflectionUtil.copyFields(getClass().getFields(), from, this);
PACKAGES_TO_USE_STAR_IMPORTS.copyFrom(from.PACKAGES_TO_USE_STAR_IMPORTS);
idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt
+3 -3
View File
@@ -21,7 +21,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.idea.JetBundle
import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.resolve.OverrideResolver
public class ImplementMembersHandler : OverrideImplementMembersHandler(), IntentionAction {
@@ -34,8 +34,8 @@ public class ImplementMembersHandler : OverrideImplementMembersHandler(), Intent
override fun getNoMembersFoundHint() = "No members to implement have been found"
override fun getText() = JetBundle.message("implement.members")
override fun getFamilyName() = JetBundle.message("implement.members")
override fun getText() = KotlinBundle.message("implement.members")
override fun getFamilyName() = KotlinBundle.message("implement.members")
override fun isAvailable(project: Project, editor: Editor, file: PsiFile) = isValidFor(editor, file)
}
idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiClassToDescriptor.kt
+3 -3
View File
@@ -17,9 +17,9 @@
package org.jetbrains.kotlin.idea.core
import com.intellij.psi.PsiClass
import org.jetbrains.kotlin.asJava.KotlinLightClass
import org.jetbrains.kotlin.asJava.KtLightClass
import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.KotlinLightClassForDecompiledDeclaration
import org.jetbrains.kotlin.idea.caches.resolve.KtLightClassForDecompiledDeclaration
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.idea.resolve.frontendService
import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
@@ -30,7 +30,7 @@ public fun ResolutionFacade.psiClassToDescriptor(
psiClass: PsiClass,
declarationTranslator: (KtClassOrObject) -> KtClassOrObject? = { it }
): ClassifierDescriptor? {
return if (psiClass is KotlinLightClass && psiClass !is KotlinLightClassForDecompiledDeclaration) {
return if (psiClass is KtLightClass && psiClass !is KtLightClassForDecompiledDeclaration) {
val origin = psiClass.getOrigin () ?: return null
val declaration = declarationTranslator(origin) ?: return null
resolveToDescriptor(declaration)
idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt
+3 -3
View File
@@ -26,7 +26,7 @@ import com.intellij.psi.PsiMember
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.idea.JetDescriptorIconProvider
import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider
import org.jetbrains.kotlin.psi.KtClass
import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtFile
@@ -87,7 +87,7 @@ public open class DescriptorMemberChooserObject(
if (declaration is KtDeclaration) {
// kotlin declaration
// visibility and abstraction better detect by a descriptor
return JetDescriptorIconProvider.getIcon(descriptor, declaration, flags)
return KotlinDescriptorIconProvider.getIcon(descriptor, declaration, flags)
}
else {
// it is better to show java icons for java code
@@ -95,7 +95,7 @@ public open class DescriptorMemberChooserObject(
}
}
else {
return JetDescriptorIconProvider.getIcon(descriptor, declaration, 0)
return KotlinDescriptorIconProvider.getIcon(descriptor, declaration, 0)
}
}
}