From 5c4dd75110e4a20948411e2733333e580f186225 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 19 Nov 2014 14:14:38 +0300 Subject: [PATCH] Light Methods: Change PSI element language to Kotlin --- .../jet/asJava/FakeLightClassForFileOfPackage.java | 8 ++++++++ .../src/org/jetbrains/jet/asJava/KotlinLightField.java | 8 ++++++++ .../jet/asJava/KotlinLightMethodForDeclaration.kt | 3 +++ .../org/jetbrains/jet/asJava/KotlinLightParameter.java | 7 +++++++ .../jetbrains/jet/asJava/KotlinLightTypeParameter.java | 7 +++++++ .../jetbrains/jet/asJava/KotlinWrappingLightClass.java | 7 +++++++ 6 files changed, 40 insertions(+) diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java index 360673129ab..f085a535353 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.asJava; +import com.intellij.lang.Language; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; @@ -27,6 +28,7 @@ import org.jetbrains.jet.lang.psi.JetClassOrObject; import org.jetbrains.jet.lang.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; /** * This class serves as a workaround for usages of {@link JavaElementFinder#findClasses} which eventually only need names of files @@ -88,4 +90,10 @@ public class FakeLightClassForFileOfPackage extends AbstractLightClass implement public String getText() { return null; } + + @NotNull + @Override + public Language getLanguage() { + return JetLanguage.INSTANCE; + } } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightField.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightField.java index f92068cfeb0..da398e97ba2 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightField.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightField.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.asJava; +import com.intellij.lang.Language; import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; @@ -27,6 +28,7 @@ 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.jet.plugin.JetLanguage; // Copied from com.intellij.psi.impl.light.LightField public abstract class KotlinLightField extends LightElement @@ -166,4 +168,10 @@ public abstract class KotlinLightField