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

Eliminate package "light" from org.jetbrains.jet.asJava

Browse Source 
Move everything to org.jetbrains.jet.asJava because classes for some light
elements were already there
This commit is contained in:
Alexander Udalov
2014-09-11 10:35:19 +04:00
parent 50a301865f
commit 83f47412b6
9 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightEnumConstant.kt → compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightEnumConstant.kt
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.asJava.light
package org.jetbrains.jet.asJava
import com.intellij.psi.*
import org.jetbrains.jet.lang.psi.JetEnumEntry
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightField.java → compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightField.java
+1 -2
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.asJava.light;
package org.jetbrains.jet.asJava;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.util.TextRange;
@@ -26,7 +26,6 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.asJava.KotlinLightElement;
import org.jetbrains.jet.lang.psi.JetDeclaration;
// Copied from com.intellij.psi.impl.light.LightField
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightFieldForDeclaration.kt → compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightFieldForDeclaration.kt
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.asJava.light
package org.jetbrains.jet.asJava
import com.intellij.psi.*
import org.jetbrains.jet.lang.psi.JetProperty
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt
+1 -9
View File
@@ -17,25 +17,17 @@
package org.jetbrains.jet.asJava
import com.intellij.psi.impl.light.LightMethod
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiMethod
import com.intellij.psi.PsiManager
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiNamedElement
import com.intellij.psi.*
import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.jet.asJava.light.LightParameterListBuilder
import com.intellij.psi.PsiParameterList
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 com.intellij.psi.PsiTypeParameterList
import org.jetbrains.jet.lang.psi.JetPropertyAccessor
import org.jetbrains.jet.lang.psi.psiUtil.getParentByType
import org.jetbrains.jet.lang.psi.JetProperty
import com.intellij.psi.PsiTypeParameter
import org.jetbrains.jet.lang.psi.JetClassOrObject
import com.intellij.psi.impl.light.LightTypeParameterListBuilder
import com.intellij.psi.search.SearchScope
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightParameter.java
+1 -2
View File
@@ -22,7 +22,6 @@ import com.intellij.psi.PsiParameter;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.asJava.light.LightParameter;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
import org.jetbrains.jet.plugin.JetLanguage;
@@ -99,4 +98,4 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
return setter != null ? setter.getParameter() : null;
}
}
}
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
-2
View File
@@ -28,8 +28,6 @@ import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.asJava.light.KotlinLightEnumConstant;
import org.jetbrains.jet.asJava.light.KotlinLightFieldForDeclaration;
import org.jetbrains.jet.lang.psi.*;
import java.util.List;
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightParameter.java → compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameter.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.asJava.light;
package org.jetbrains.jet.asJava;
import com.intellij.lang.Language;
import com.intellij.psi.*;
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightParameterListBuilder.java → compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameterListBuilder.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.asJava.light;
package org.jetbrains.jet.asJava;
import com.intellij.lang.Language;
import com.intellij.psi.*;
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightVariableBuilder.java → compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightVariableBuilder.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.asJava.light;
package org.jetbrains.jet.asJava;
import com.intellij.lang.Language;
import com.intellij.navigation.NavigationItem;