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

The case of no modifiers on a class supported in KotlinLightClassForExplicitDeclaration

Browse Source
This commit is contained in:
Andrey Breslav
2013-01-10 19:15:24 +04:00
parent b039c69952
commit eb06ac948b
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
+3 -7
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2012 JetBrains s.r.o. * Copyright 2010-2013 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -203,10 +203,6 @@ public class KotlinLightClassForExplicitDeclaration extends AbstractLightClass i
@NotNull @NotNull
private String[] computeModifiers() { private String[] computeModifiers() {
JetModifierList jetModifierList = classOrObject.getModifierList();
if (jetModifierList == null) {
return new String[0];
}
Collection<String> psiModifiers = Sets.newHashSet(); Collection<String> psiModifiers = Sets.newHashSet();
// PUBLIC, PROTECTED, PRIVATE, ABSTRACT, FINAL // PUBLIC, PROTECTED, PRIVATE, ABSTRACT, FINAL
@@ -219,7 +215,7 @@ public class KotlinLightClassForExplicitDeclaration extends AbstractLightClass i
Pair.create(FINAL_KEYWORD, PsiModifier.FINAL)); Pair.create(FINAL_KEYWORD, PsiModifier.FINAL));
for (Pair<JetKeywordToken, String> tokenAndModifier : jetTokenToPsiModifier) { for (Pair<JetKeywordToken, String> tokenAndModifier : jetTokenToPsiModifier) {
if (jetModifierList.hasModifier(tokenAndModifier.first)) { if (classOrObject.hasModifier(tokenAndModifier.first)) {
psiModifiers.add(tokenAndModifier.second); psiModifiers.add(tokenAndModifier.second);
} }
} }
@@ -229,7 +225,7 @@ public class KotlinLightClassForExplicitDeclaration extends AbstractLightClass i
} }
// FINAL // FINAL
if (!jetModifierList.hasModifier(OPEN_KEYWORD) && !jetModifierList.hasModifier(ABSTRACT_KEYWORD)) { if (!classOrObject.hasModifier(OPEN_KEYWORD) && !classOrObject.hasModifier(ABSTRACT_KEYWORD)) {
psiModifiers.add(PsiModifier.FINAL); psiModifiers.add(PsiModifier.FINAL);
} }