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

Disperse primitive type mapping in JavaToKotlinClassMap

Browse Source
This commit is contained in:
Alexander Udalov
2015-04-21 04:19:47 +03:00
parent d86b9c8f54
commit 0a66c78449
6 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPrimitiveTypeImpl.java
+7 -3
View File
@@ -18,7 +18,10 @@ package org.jetbrains.kotlin.load.java.structure.impl;
import com.intellij.psi.PsiPrimitiveType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.PrimitiveType;
import org.jetbrains.kotlin.load.java.structure.JavaPrimitiveType;
import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType;
public class JavaPrimitiveTypeImpl extends JavaTypeImpl<PsiPrimitiveType> implements JavaPrimitiveType {
public JavaPrimitiveTypeImpl(@NotNull PsiPrimitiveType psiPrimitiveType) {
@@ -26,8 +29,9 @@ public class JavaPrimitiveTypeImpl extends JavaTypeImpl<PsiPrimitiveType> implem
}
@Override
@NotNull
public String getCanonicalText() {
return getPsi().getCanonicalText();
@Nullable
public PrimitiveType getType() {
String text = getPsi().getCanonicalText();
return "void".equals(text) ? null : JvmPrimitiveType.get(text).getPrimitiveType();
}
}