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

fix tests: imported FQ name of an import directive is nullable

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-08-05 19:41:29 +02:00
parent 43bbed495b
commit 5e1b44eac8
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
+1 -1
View File
@@ -66,7 +66,7 @@ public interface KotlinFunctionStub : KotlinCallableStubBase<JetNamedFunction> {
public interface KotlinImportDirectiveStub : StubElement<JetImportDirective> { public interface KotlinImportDirectiveStub : StubElement<JetImportDirective> {
public fun isAbsoluteInRootPackage(): Boolean public fun isAbsoluteInRootPackage(): Boolean
public fun isAllUnder(): Boolean public fun isAllUnder(): Boolean
public fun getImportedFqName(): FqName public fun getImportedFqName(): FqName?
public fun getAliasName(): String? public fun getAliasName(): String?
public fun isValid(): Boolean public fun isValid(): Boolean
} }
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetImportDirectiveElementType.java
+5 -2
View File
@@ -22,6 +22,7 @@ import com.intellij.psi.stubs.StubOutputStream;
import com.intellij.util.io.StringRef; import com.intellij.util.io.StringRef;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.JetImportDirective; import org.jetbrains.kotlin.psi.JetImportDirective;
import org.jetbrains.kotlin.psi.stubs.KotlinImportDirectiveStub; import org.jetbrains.kotlin.psi.stubs.KotlinImportDirectiveStub;
import org.jetbrains.kotlin.psi.stubs.impl.KotlinImportDirectiveStubImpl; import org.jetbrains.kotlin.psi.stubs.impl.KotlinImportDirectiveStubImpl;
@@ -35,7 +36,8 @@ public class JetImportDirectiveElementType extends JetStubElementType<KotlinImpo
@Override @Override
public KotlinImportDirectiveStub createStub(@NotNull JetImportDirective psi, StubElement parentStub) { public KotlinImportDirectiveStub createStub(@NotNull JetImportDirective psi, StubElement parentStub) {
StringRef fqName = StringRef.fromString(psi.getImportedFqName().asString()); FqName importedFqName = psi.getImportedFqName();
StringRef fqName = StringRef.fromString(importedFqName == null ? null : importedFqName.asString());
StringRef aliasName = StringRef.fromString(psi.getAliasName()); StringRef aliasName = StringRef.fromString(psi.getAliasName());
return new KotlinImportDirectiveStubImpl(parentStub, psi.isAbsoluteInRootPackage(), psi.isAllUnder(), return new KotlinImportDirectiveStubImpl(parentStub, psi.isAbsoluteInRootPackage(), psi.isAllUnder(),
fqName, aliasName, psi.isValidImport()); fqName, aliasName, psi.isValidImport());
@@ -45,7 +47,8 @@ public class JetImportDirectiveElementType extends JetStubElementType<KotlinImpo
public void serialize(@NotNull KotlinImportDirectiveStub stub, @NotNull StubOutputStream dataStream) throws IOException { public void serialize(@NotNull KotlinImportDirectiveStub stub, @NotNull StubOutputStream dataStream) throws IOException {
dataStream.writeBoolean(stub.isAbsoluteInRootPackage()); dataStream.writeBoolean(stub.isAbsoluteInRootPackage());
dataStream.writeBoolean(stub.isAllUnder()); dataStream.writeBoolean(stub.isAllUnder());
dataStream.writeName(stub.getImportedFqName().asString()); FqName importedFqName = stub.getImportedFqName();
dataStream.writeName(importedFqName != null ? importedFqName.asString() : null);
dataStream.writeName(stub.getAliasName()); dataStream.writeName(stub.getAliasName());
dataStream.writeBoolean(stub.isValid()); dataStream.writeBoolean(stub.isValid());
} }
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinImportDirectiveStubImpl.kt
+7 -2
View File
@@ -28,13 +28,18 @@ public class KotlinImportDirectiveStubImpl(
parent: StubElement<PsiElement>, parent: StubElement<PsiElement>,
private val isAbsoluteInRootPackage: Boolean, private val isAbsoluteInRootPackage: Boolean,
private val isAllUnder: Boolean, private val isAllUnder: Boolean,
private val importedFqName: StringRef, private val importedFqName: StringRef?,
private val aliasName: StringRef?, private val aliasName: StringRef?,
private val isValid: Boolean) : KotlinStubBaseImpl<JetImportDirective>(parent, JetStubElementTypes.IMPORT_DIRECTIVE), KotlinImportDirectiveStub { private val isValid: Boolean) : KotlinStubBaseImpl<JetImportDirective>(parent, JetStubElementTypes.IMPORT_DIRECTIVE), KotlinImportDirectiveStub {
override fun isAbsoluteInRootPackage(): Boolean = isAbsoluteInRootPackage override fun isAbsoluteInRootPackage(): Boolean = isAbsoluteInRootPackage
override fun isAllUnder(): Boolean = isAllUnder override fun isAllUnder(): Boolean = isAllUnder
override fun getImportedFqName(): FqName = FqName(StringRef.toString(importedFqName)!!)
override fun getImportedFqName(): FqName? {
val fqNameString = StringRef.toString(importedFqName)
return if (fqNameString != null) FqName(fqNameString) else null
}
override fun getAliasName(): String? = StringRef.toString(aliasName) override fun getAliasName(): String? = StringRef.toString(aliasName)
override fun isValid(): Boolean = isValid override fun isValid(): Boolean = isValid
} }