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

change the ID of the language from "jet" to "kotlin"; rename JetLanguage to KotlinLanguage

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-10-05 16:51:42 +02:00
parent 870b640008
commit c5d3673b6b
57 changed files with 171 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java
+2 -2
View File
@@ -24,7 +24,7 @@ import com.intellij.psi.PsiManager;
import com.intellij.psi.impl.light.AbstractLightClass;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetFile;
@@ -93,7 +93,7 @@ public class FakeLightClassForFileOfPackage extends AbstractLightClass implement
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@Override
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
+3 -3
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.fileClasses.NoResolveFileClassesProvider
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.lexer.JetTokens.*
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.FqNameUnsafe
@@ -66,7 +66,7 @@ public open class KotlinLightClassForExplicitDeclaration(
var createWrapper = forceMethodWrapping
// Use PsiClass wrapper instead of package light class to avoid names like "FooPackage" in Type Hierarchy and related views
if (containingClass is KotlinLightClassForFacade) {
containingClass = object : LightClass(containingClass as KotlinLightClassForFacade, JetLanguage.INSTANCE) {
containingClass = object : LightClass(containingClass as KotlinLightClassForFacade, KotlinLanguage.INSTANCE) {
override fun getName(): String? {
return currentFileName
}
@@ -75,7 +75,7 @@ public open class KotlinLightClassForExplicitDeclaration(
}
if (createWrapper) {
return object : LightMethod(myManager, method, containingClass!!, JetLanguage.INSTANCE) {
return object : LightMethod(myManager, method, containingClass!!, KotlinLanguage.INSTANCE) {
override fun getParent(): PsiElement {
return getContainingClass()!!
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForFacade.kt
+2 -2
View File
@@ -30,7 +30,7 @@ import com.intellij.psi.util.CachedValuesManager
import com.intellij.psi.util.PsiModificationTracker
import com.intellij.util.containers.SLRUCache
import org.jetbrains.annotations.NonNls
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.JetClassOrObject
@@ -111,7 +111,7 @@ public class KotlinLightClassForFacade private constructor(
facadeClassFqName.parent()
private val modifierList: PsiModifierList =
LightModifierList(manager, JetLanguage.INSTANCE, PsiModifier.PUBLIC, PsiModifier.FINAL)
LightModifierList(manager, KotlinLanguage.INSTANCE, PsiModifier.PUBLIC, PsiModifier.FINAL)
private val implementsList: LightEmptyImplementsList =
LightEmptyImplementsList(manager)
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java
+2 -2
View File
@@ -27,7 +27,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.JetDeclaration;
// Copied from com.intellij.psi.impl.light.LightField
@@ -172,7 +172,7 @@ public abstract class KotlinLightField<T extends JetDeclaration, D extends PsiFi
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@Override
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt
+3 -3
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.asJava
import com.intellij.psi.impl.light.LightMethod
import com.intellij.psi.*
import org.jetbrains.kotlin.psi.JetDeclaration
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import kotlin.properties.Delegates
import com.intellij.psi.util.CachedValuesManager
import com.intellij.psi.util.PsiModificationTracker
@@ -42,7 +42,7 @@ open public class KotlinLightMethodForDeclaration(
private val paramsList: CachedValue<PsiParameterList> by Delegates.blockingLazy {
val cacheManager = CachedValuesManager.getManager(delegate.getProject())
cacheManager.createCachedValue<PsiParameterList>({
val parameterBuilder = LightParameterListBuilder(getManager(), JetLanguage.INSTANCE, this)
val parameterBuilder = LightParameterListBuilder(getManager(), KotlinLanguage.INSTANCE, this)
for ((index, parameter) in delegate.getParameterList().getParameters().withIndex()) {
parameterBuilder.addParameter(KotlinLightParameter(parameter, index, this))
@@ -113,7 +113,7 @@ open public class KotlinLightMethodForDeclaration(
override fun getUseScope(): SearchScope = origin.getUseScope()
override fun getLanguage(): Language = JetLanguage.INSTANCE
override fun getLanguage(): Language = KotlinLanguage.INSTANCE
override fun processDeclarations(processor: PsiScopeProcessor, state: ResolveState, lastParent: PsiElement?, place: PsiElement): Boolean {
return getTypeParameters().all { processor.execute(it, state) }
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java
+2 -2
View File
@@ -23,11 +23,11 @@ import com.intellij.psi.impl.light.LightModifierList;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
public abstract class KotlinLightModifierList extends LightModifierList {
public KotlinLightModifierList(PsiManager psiManager, @NotNull String[] modifiers) {
super(psiManager, JetLanguage.INSTANCE, modifiers);
super(psiManager, KotlinLanguage.INSTANCE, modifiers);
}
public abstract PsiAnnotationOwner getDelegate();
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java
+3 -3
View File
@@ -25,7 +25,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage;
@@ -43,7 +43,7 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
private final KotlinLightMethod method;
public KotlinLightParameter(final PsiParameter delegate, int index, KotlinLightMethod method) {
super(getName(delegate, index), delegate.getType(), method, JetLanguage.INSTANCE);
super(getName(delegate, index), delegate.getType(), method, KotlinLanguage.INSTANCE);
this.delegate = delegate;
this.index = index;
@@ -122,7 +122,7 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@NotNull
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java
+3 -3
View File
@@ -22,7 +22,7 @@ import com.intellij.psi.impl.light.AbstractLightClass;
import com.intellij.psi.search.SearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.JetTypeParameter;
import org.jetbrains.kotlin.psi.JetTypeParameterListOwner;
@@ -36,7 +36,7 @@ public class KotlinLightTypeParameter
@NotNull PsiTypeParameterListOwner owner,
int index,
@NotNull String name) {
super(owner.getManager(), JetLanguage.INSTANCE);
super(owner.getManager(), KotlinLanguage.INSTANCE);
this.owner = owner;
this.index = index;
this.name = name;
@@ -133,7 +133,7 @@ public class KotlinLightTypeParameter
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
@NotNull
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameterListBuilder.kt
+2 -2
View File
@@ -17,13 +17,13 @@
package org.jetbrains.kotlin.asJava
import com.intellij.psi.PsiManager
import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.KotlinLanguage
import com.intellij.psi.impl.light.LightTypeParameterListBuilder
import com.intellij.psi.scope.PsiScopeProcessor
import com.intellij.psi.ResolveState
import com.intellij.psi.PsiElement
public class KotlinLightTypeParameterListBuilder(manager: PsiManager): LightTypeParameterListBuilder(manager, JetLanguage.INSTANCE) {
public class KotlinLightTypeParameterListBuilder(manager: PsiManager): LightTypeParameterListBuilder(manager, KotlinLanguage.INSTANCE) {
override fun processDeclarations(processor: PsiScopeProcessor, state: ResolveState, lastParent: PsiElement?, place: PsiElement): Boolean {
return getTypeParameters().all { processor.execute(it, state) }
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
+3 -3
View File
@@ -32,7 +32,7 @@ import kotlin.KotlinPackage;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage;
@@ -43,7 +43,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
private final ClassInnerStuffCache myInnersCache = new ClassInnerStuffCache(this);
protected KotlinWrappingLightClass(PsiManager manager) {
super(manager, JetLanguage.INSTANCE);
super(manager, KotlinLanguage.INSTANCE);
}
@Nullable
@@ -184,7 +184,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
@NotNull
@Override
public Language getLanguage() {
return JetLanguage.INSTANCE;
return KotlinLanguage.INSTANCE;
}
private boolean isTraitFakeOverride(@NotNull JetDeclaration originMethodDeclaration) {