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

move getJvmInternalName to JetPositionManager

Browse Source
This commit is contained in:
Alexander Udalov
2012-08-17 17:32:44 +04:00
parent 8e9ad9c2ef
commit eed755aae1
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
-9
View File
@@ -1075,15 +1075,6 @@ public class JetTypeMapper {
} }
} }
@Nullable
public String getJvmInternalName(JetClassOrObject jetClass) {
final ClassDescriptor classDescriptor = bindingContext.get(BindingContext.CLASS, jetClass);
if (classDescriptor == null) {
return null;
}
return mapType(classDescriptor.getDefaultType(), MapTypeMode.IMPL).getInternalName();
}
private static boolean isForceReal(JvmClassName className) { private static boolean isForceReal(JvmClassName className) {
return JvmPrimitiveType.getByWrapperClass(className) != null return JvmPrimitiveType.getByWrapperClass(className) != null
|| className.getFqName().getFqName().equals("java.lang.String") || className.getFqName().getFqName().equals("java.lang.String")
idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
+17 -5
View File
@@ -37,9 +37,12 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.analyzer.AnalyzeExhaust;
import org.jetbrains.jet.codegen.JetTypeMapper; import org.jetbrains.jet.codegen.JetTypeMapper;
import org.jetbrains.jet.codegen.MapTypeMode;
import org.jetbrains.jet.codegen.NamespaceCodegen; import org.jetbrains.jet.codegen.NamespaceCodegen;
import org.jetbrains.jet.di.InjectorForJetTypeMapper; import org.jetbrains.jet.di.InjectorForJetTypeMapper;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade; import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
@@ -130,23 +133,23 @@ public class JetPositionManager implements PositionManager {
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void run() { public void run() {
final JetFile namespace = (JetFile)sourcePosition.getFile(); final JetFile namespace = (JetFile) sourcePosition.getFile();
final JetTypeMapper typeMapper = prepareTypeMapper(namespace); final JetTypeMapper typeMapper = prepareTypeMapper(namespace);
PsiElement element = PsiTreeUtil.getParentOfType(sourcePosition.getElementAt(), JetClassOrObject.class, JetFunctionLiteralExpression.class, JetNamedFunction.class); PsiElement element = PsiTreeUtil.getParentOfType(sourcePosition.getElementAt(), JetClassOrObject.class, JetFunctionLiteralExpression.class, JetNamedFunction.class);
if (element instanceof JetClassOrObject) { if (element instanceof JetClassOrObject) {
result.set(typeMapper.getJvmInternalName((JetClassOrObject) element)); result.set(getJvmInternalName(typeMapper, (JetClassOrObject) element));
} }
else if (element instanceof JetFunctionLiteralExpression) { else if (element instanceof JetFunctionLiteralExpression) {
result.set(typeMapper.getClosureAnnotator().classNameForAnonymousClass((JetFunctionLiteralExpression)element).getInternalName()); result.set(typeMapper.getClosureAnnotator().classNameForAnonymousClass((JetFunctionLiteralExpression) element).getInternalName());
} }
else if (element instanceof JetNamedFunction) { else if (element instanceof JetNamedFunction) {
PsiElement parent = PsiTreeUtil.getParentOfType(element, JetClassOrObject.class, JetFunctionLiteralExpression.class, JetNamedFunction.class); PsiElement parent = PsiTreeUtil.getParentOfType(element, JetClassOrObject.class, JetFunctionLiteralExpression.class, JetNamedFunction.class);
if (parent instanceof JetClassOrObject) { if (parent instanceof JetClassOrObject) {
result.set(typeMapper.getJvmInternalName((JetClassOrObject) parent)); result.set(getJvmInternalName(typeMapper, (JetClassOrObject) parent));
} }
else if (parent instanceof JetFunctionLiteralExpression || parent instanceof JetNamedFunction) { else if (parent instanceof JetFunctionLiteralExpression || parent instanceof JetNamedFunction) {
result.set(typeMapper.getClosureAnnotator().classNameForAnonymousClass((JetElement)element).getInternalName()); result.set(typeMapper.getClosureAnnotator().classNameForAnonymousClass((JetElement) element).getInternalName());
} }
} }
@@ -168,6 +171,15 @@ public class JetPositionManager implements PositionManager {
return result.get(); return result.get();
} }
@Nullable
private String getJvmInternalName(JetTypeMapper typeMapper, JetClassOrObject jetClass) {
final ClassDescriptor classDescriptor = typeMapper.bindingContext.get(BindingContext.CLASS, jetClass);
if (classDescriptor == null) {
return null;
}
return typeMapper.mapType(classDescriptor.getDefaultType(), MapTypeMode.IMPL).getInternalName();
}
private JetTypeMapper prepareTypeMapper(final JetFile file) { private JetTypeMapper prepareTypeMapper(final JetFile file) {
FqName fqName = JetPsiUtil.getFQName(file); FqName fqName = JetPsiUtil.getFQName(file);
CachedValue<JetTypeMapper> value = myTypeMappers.get(fqName); CachedValue<JetTypeMapper> value = myTypeMappers.get(fqName);