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

CodegenAnnotator does not exist anymore

Browse Source 
Injectors regenerated to reflect that
This commit is contained in:
Alex Tkachman
2012-08-28 11:54:52 +03:00
parent 5ee0f0871f
commit 7452bb2957
13 changed files with 324 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
+6 -2
View File
@@ -40,6 +40,7 @@ import org.jetbrains.jet.analyzer.AnalyzeExhaust;
import org.jetbrains.jet.codegen.JetTypeMapper;
import org.jetbrains.jet.codegen.MapTypeMode;
import org.jetbrains.jet.codegen.NamespaceCodegen;
import org.jetbrains.jet.codegen.context.CodegenBinding;
import org.jetbrains.jet.di.InjectorForJetTypeMapper;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.psi.*;
@@ -204,8 +205,11 @@ public class JetPositionManager implements PositionManager {
List<JetFile> namespaceFiles = JetFilesProvider.getInstance(file.getProject()).allNamespaceFiles().fun(file);
JetTypeMapper typeMapper = new InjectorForJetTypeMapper(new DelegatingBindingTrace(analyzeExhaust.getBindingContext()), namespaceFiles).getJetTypeMapper();
typeMapper.getCodegenAnnotator().init();
final DelegatingBindingTrace bindingTrace = new DelegatingBindingTrace(analyzeExhaust.getBindingContext());
final InjectorForJetTypeMapper injector = new InjectorForJetTypeMapper(bindingTrace, namespaceFiles);
JetTypeMapper typeMapper = injector.getJetTypeMapper();
//noinspection unchecked
CodegenBinding.initTrace(bindingTrace, injector.getListOfJetFile());
return new Result<JetTypeMapper>(typeMapper, PsiModificationTracker.MODIFICATION_COUNT);
}
}, false);
idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTest.java
+6 -2
View File
@@ -20,6 +20,7 @@ import com.intellij.debugger.engine.DebugProcess;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.codegen.GenerationState;
import org.jetbrains.jet.codegen.JetTypeMapper;
import org.jetbrains.jet.codegen.context.CodegenBinding;
import org.jetbrains.jet.di.InjectorForJetTypeMapper;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace;
@@ -45,8 +46,11 @@ public class JetPositionManagerTest extends PositionManagerTestCase {
JetPositionManager positionManager = (JetPositionManager) jetPositionManagerFactory.createPositionManager(process);
assertNotNull(positionManager);
JetTypeMapper typeMapper = new InjectorForJetTypeMapper(new DelegatingBindingTrace(state.getBindingContext()), files).getJetTypeMapper();
typeMapper.getCodegenAnnotator().init();
final DelegatingBindingTrace bindingTrace = new DelegatingBindingTrace(state.getBindingContext());
final InjectorForJetTypeMapper injector = new InjectorForJetTypeMapper(bindingTrace, files);
JetTypeMapper typeMapper = injector.getJetTypeMapper();
//noinspection unchecked
CodegenBinding.initTrace(bindingTrace, injector.getListOfJetFile());
for (JetFile file : files) {
positionManager.addTypeMapper(file, typeMapper);
}