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

MapTypeMode renamed to JetTypeMapperMode and moved to state package

Browse Source
This commit is contained in:
Alex Tkachman
2012-08-30 12:26:58 +03:00
parent df094a4cd0
commit da064f95fd
21 changed files with 219 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
+4 -4
View File
@@ -38,8 +38,8 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.analyzer.AnalyzeExhaust;
import org.jetbrains.jet.codegen.ClassBuilderMode;
import org.jetbrains.jet.codegen.state.JetTypeMapperMode;
import org.jetbrains.jet.codegen.state.JetTypeMapper;
import org.jetbrains.jet.codegen.MapTypeMode;
import org.jetbrains.jet.codegen.NamespaceCodegen;
import org.jetbrains.jet.codegen.binding.CodegenBinding;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -183,12 +183,12 @@ public class JetPositionManager implements PositionManager {
if (classDescriptor == null) {
return null;
}
MapTypeMode mode;
JetTypeMapperMode mode;
if (jetClass instanceof JetClass && ((JetClass) jetClass).isTrait()) {
mode = MapTypeMode.TRAIT_IMPL;
mode = JetTypeMapperMode.TRAIT_IMPL;
}
else {
mode = MapTypeMode.IMPL;
mode = JetTypeMapperMode.IMPL;
}
return typeMapper.mapType(classDescriptor.getDefaultType(), mode).getInternalName();
}