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

JetElement.getContainingJetFile() introduced

Browse Source
This commit is contained in:
Andrey Breslav
2014-04-21 18:25:17 +04:00
parent da0efe2a9e
commit 767eb04930
50 changed files with 89 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java
+1 -1
View File
@@ -124,7 +124,7 @@ public class KotlinJavaFileStubProvider<T extends WithFileStub> implements Cache
JetPsiUtil.isLocal(classOrObject),
new StubGenerationStrategy<OutermostKotlinClassLightClassData>() {
private JetFile getFile() {
return (JetFile) classOrObject.getContainingFile();
return classOrObject.getContainingJetFile();
}
@NotNull
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
+2 -2
View File
@@ -66,7 +66,7 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
@Nullable
public static KotlinLightClassForExplicitDeclaration create(@NotNull PsiManager manager, @NotNull JetClassOrObject classOrObject) {
if (LightClassUtil.belongsToKotlinBuiltIns((JetFile) classOrObject.getContainingFile())) {
if (LightClassUtil.belongsToKotlinBuiltIns(classOrObject.getContainingJetFile())) {
return null;
}
@@ -288,7 +288,7 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
@NotNull
@Override
public String getPackageName() {
return ((JetFile) classOrObject.getContainingFile()).getPackageFqName().asString();
return classOrObject.getContainingJetFile().getPackageFqName().asString();
}
@NotNull