| Chunk |
|---|
| Conflicting content |
|---|
*/
public class ControlFlowAnalyzer {
private TopDownAnalysisContext context;
<<<<<<< HEAD
private JetTypeInferrer.Services typeInferrerServices;
private final JetControlFlowDataTraceFactory flowDataTraceFactory;
=======
private ExpressionTypingServices typeInferrer;
>>>>>>> a9ab3b87cea810fde05f296444545a0b821c139b
public ControlFlowAnalyzer(TopDownAnalysisContext context, JetControlFlowDataTraceFactory flowDataTraceFactory) {
this.context = context; |
| Solution content |
|---|
*/
public class ControlFlowAnalyzer {
private TopDownAnalysisContext context;
private ExpressionTypingServices typeInferrerServices;
private final JetControlFlowDataTraceFactory flowDataTraceFactory;
public ControlFlowAnalyzer(TopDownAnalysisContext context, JetControlFlowDataTraceFactory flowDataTraceFactory) {
this.context = context; |
| File |
|---|
| ControlFlowAnalyzer.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |