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

Refactor: remove useless check in PsiDeclarationProviderFactory

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-11-08 19:16:38 +04:00
parent da47c31a86
commit eb155bb204
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java
+2 -11
View File
@@ -19,10 +19,6 @@ package org.jetbrains.jet.lang.resolve.java.provider;
import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiPackage; import com.intellij.psi.PsiPackage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
public final class PsiDeclarationProviderFactory { public final class PsiDeclarationProviderFactory {
private PsiDeclarationProviderFactory() { private PsiDeclarationProviderFactory() {
@@ -41,14 +37,9 @@ public final class PsiDeclarationProviderFactory {
@NotNull @NotNull
public static KotlinNamespacePsiDeclarationProvider createDeclarationForKotlinNamespace( public static KotlinNamespacePsiDeclarationProvider createDeclarationForKotlinNamespace(
@NotNull PsiPackage psiPackage, @NotNull PsiPackage psiPackage,
@NotNull PsiClass psiClass, @NotNull PsiClass psiClass
@Nullable FqName fqName
) { ) {
KotlinNamespacePsiDeclarationProvider result = new KotlinNamespacePsiDeclarationProvider(psiPackage, psiClass); return new KotlinNamespacePsiDeclarationProvider(psiPackage, psiClass);
if (fqName != null && fqName.lastSegmentIs(Name.identifier(JvmAbi.PACKAGE_CLASS))) {
throw new IllegalStateException("Kotlin namespace cannot have last segment " + JvmAbi.PACKAGE_CLASS + ": " + fqName);
}
return result;
} }
@NotNull @NotNull
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java
+1 -1
View File
@@ -155,7 +155,7 @@ public final class JavaNamespaceResolver {
fqName, javaSemanticServices); fqName, javaSemanticServices);
} }
return new JavaScopeForKotlinNamespace(namespaceDescriptor, return new JavaScopeForKotlinNamespace(namespaceDescriptor,
createDeclarationForKotlinNamespace(psiPackage, psiClass, fqName), createDeclarationForKotlinNamespace(psiPackage, psiClass),
fqName, javaSemanticServices); fqName, javaSemanticServices);
} }