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

Rename jet -> kotlin in frontend: PSI

Browse Source 
org.jetbrains.jet.lang.psi -> org.jetbrains.kotlin.psi
This commit is contained in:
Alexander Udalov
2015-01-10 14:25:19 +03:00
parent ead8c8ac1d
commit d384e50a97
1323 changed files with 3365 additions and 3552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java
+1 -1
View File
@@ -27,7 +27,7 @@ import com.intellij.psi.impl.java.stubs.*;
import com.intellij.psi.stubs.StubBase;
import com.intellij.psi.stubs.StubElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.kotlin.psi.JetDeclaration;
class ClsWrapperStubPsiFactory extends StubPsiFactory {
public static final Key<PsiElement> ORIGIN_ELEMENT = Key.create("ORIGIN_ELEMENT");
compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java
+2 -2
View File
@@ -24,8 +24,8 @@ 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.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.plugin.JetLanguage;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java
+3 -3
View File
@@ -32,9 +32,9 @@ import com.intellij.util.SmartList;
import com.intellij.util.containers.SLRUCache;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetEnumEntry;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetEnumEntry;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.KotlinFinderMarker;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.psi.impl.PsiTreeChangeEventImpl.PsiEventType.*
import com.intellij.psi.impl.PsiTreeChangeEventImpl
import com.intellij.psi.impl.PsiTreeChangePreprocessor
import com.intellij.psi.util.PsiModificationTracker
import org.jetbrains.jet.lang.psi.*
import org.jetbrains.kotlin.psi.*
import com.intellij.psi.util.PsiTreeUtil
/**
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java
+4 -4
View File
@@ -48,10 +48,10 @@ import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
import org.jetbrains.kotlin.codegen.state.GenerationState;
import org.jetbrains.kotlin.codegen.state.Progress;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.lang.psi.JetScript;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetPsiUtil;
import org.jetbrains.kotlin.psi.JetScript;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava;
import com.intellij.psi.PsiClass;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.psi.JetClassOrObject
import org.jetbrains.kotlin.psi.JetClassOrObject
public trait KotlinLightClass : PsiClass, KotlinLightElement<JetClassOrObject, PsiClass> {
val fqName: FqName
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.types.JetType;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava
import com.intellij.psi.PsiManager
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lang.psi.JetEnumEntry
import org.jetbrains.kotlin.psi.JetEnumEntry
import com.intellij.psi.PsiEnumConstantInitializer
import com.intellij.psi.PsiEnumConstant
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java
+1 -1
View File
@@ -45,7 +45,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java
+2 -2
View File
@@ -34,8 +34,8 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker;
import org.jetbrains.jet.lang.resolve.name.FqName;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.asJava
import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.kotlin.psi.JetDeclaration
import com.intellij.psi.PsiElement
public trait KotlinLightElement<T : JetDeclaration, D : PsiElement> {
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightEnumConstant.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.asJava
import com.intellij.psi.*
import org.jetbrains.jet.lang.psi.JetEnumEntry
import org.jetbrains.kotlin.psi.JetEnumEntry
class KotlinLightEnumConstant(
manager: PsiManager,
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java
+1 -1
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.jet.lang.psi.JetDeclaration;
import org.jetbrains.kotlin.psi.JetDeclaration;
import org.jetbrains.jet.plugin.JetLanguage;
// Copied from com.intellij.psi.impl.light.LightField
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightFieldForDeclaration.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.asJava
import com.intellij.psi.*
import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.kotlin.psi.JetDeclaration
class KotlinLightFieldForDeclaration(
manager: PsiManager,
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt
+1 -1
View File
@@ -17,6 +17,6 @@
package org.jetbrains.kotlin.asJava
import com.intellij.psi.PsiMethod
import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.kotlin.psi.JetDeclaration
public trait KotlinLightMethod: PsiMethod, KotlinLightElement<JetDeclaration, PsiMethod>
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt
+2 -2
View File
@@ -18,14 +18,14 @@ package org.jetbrains.kotlin.asJava
import com.intellij.psi.impl.light.LightMethod
import com.intellij.psi.*
import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.kotlin.psi.JetDeclaration
import org.jetbrains.jet.plugin.JetLanguage
import kotlin.properties.Delegates
import com.intellij.psi.util.CachedValuesManager
import com.intellij.psi.util.PsiModificationTracker
import com.intellij.psi.util.CachedValueProvider
import com.intellij.psi.util.CachedValue
import org.jetbrains.jet.lang.psi.JetClassOrObject
import org.jetbrains.kotlin.psi.JetClassOrObject
import com.intellij.psi.search.SearchScope
import com.intellij.lang.Language
import com.intellij.psi.scope.PsiScopeProcessor
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForTraitFakeOverride.kt
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava
import com.intellij.psi.PsiManager
import com.intellij.psi.PsiMethod
import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.kotlin.psi.JetDeclaration
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java
+2 -2
View File
@@ -23,8 +23,8 @@ import com.intellij.psi.PsiParameter;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage;
import org.jetbrains.jet.plugin.JetLanguage;
import java.util.List;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java
+2 -2
View File
@@ -21,8 +21,8 @@ import com.intellij.psi.*;
import com.intellij.psi.impl.light.AbstractLightClass;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.JetTypeParameter;
import org.jetbrains.jet.lang.psi.JetTypeParameterListOwner;
import org.jetbrains.kotlin.psi.JetTypeParameter;
import org.jetbrains.kotlin.psi.JetTypeParameterListOwner;
import org.jetbrains.jet.plugin.JetLanguage;
public class KotlinLightTypeParameter
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
+1 -1
View File
@@ -33,7 +33,7 @@ import com.intellij.util.containers.ContainerUtil;
import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.plugin.JetLanguage;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java
+2 -2
View File
@@ -22,8 +22,8 @@ import com.intellij.psi.PsiClass;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.lang.resolve.name.FqName;
import java.util.Collection;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava
import com.intellij.psi.impl.java.stubs.PsiJavaFileStub
import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.lang.psi.JetClassOrObject
import org.jetbrains.kotlin.psi.JetClassOrObject
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
import org.jetbrains.jet.lang.resolve.name.FqName
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
+1 -1
View File
@@ -37,7 +37,7 @@ import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.codegen.AbstractClassBuilder;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin;
import org.jetbrains.jet.lang.resolve.name.FqName;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt
+6 -6
View File
@@ -18,19 +18,19 @@ package org.jetbrains.kotlin.asJava
import com.intellij.psi.PsiElement
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
import org.jetbrains.jet.lang.psi.JetFile
import org.jetbrains.jet.lang.psi.JetClassBody
import org.jetbrains.jet.lang.psi.JetClassOrObject
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.JetClassBody
import org.jetbrains.kotlin.psi.JetClassOrObject
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.jet.lang.psi.JetPropertyAccessor
import org.jetbrains.kotlin.psi.JetPropertyAccessor
import org.jetbrains.jet.lang.diagnostics.Diagnostic
import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm.*
import org.jetbrains.jet.lang.resolve.java.diagnostics.ConflictingJvmDeclarationsData
import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOriginKind.*
import org.jetbrains.jet.lang.diagnostics.Errors.*
import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory.*
import org.jetbrains.jet.lang.psi.JetParameter
import org.jetbrains.jet.lang.psi.JetClass
import org.jetbrains.kotlin.psi.JetParameter
import org.jetbrains.kotlin.psi.JetClass
import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory
public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Diagnostics, moduleScope: GlobalSearchScope): Diagnostics? {
compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
+3 -3
View File
@@ -17,11 +17,11 @@
package org.jetbrains.kotlin.asJava
import com.intellij.psi.*
import org.jetbrains.jet.lang.psi.*
import org.jetbrains.kotlin.psi.*
import java.util.Collections
import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import java.util.ArrayList
import org.jetbrains.jet.lang.psi.psiUtil.isExtensionDeclaration
import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration
import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
public fun JetClassOrObject.toLightClass(): KotlinLightClass? = LightClassUtil.getPsiClass(this) as KotlinLightClass?