From b7e12ba524fbed904ceacbb8c8a17466c1aad4d9 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Tue, 24 Dec 2013 16:12:01 +0400 Subject: [PATCH] TEXT->TEST in BytecodeToolWindow for inlining purposes --- .../jet/codegen/ClassBuilderFactories.java | 28 ------------------- .../codewindow/BytecodeToolWindow.java | 2 +- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactories.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactories.java index 0324b56a4eb..2882062d009 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactories.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactories.java @@ -54,34 +54,6 @@ public class ClassBuilderFactories { } }; - public static ClassBuilderFactory TEXT = new ClassBuilderFactory() { - @NotNull - @Override - public ClassBuilderMode getClassBuilderMode() { - return ClassBuilderMode.FULL; - } - - @Override - public ClassBuilder newClassBuilder() { - return new ClassBuilder.Concrete(new TraceClassVisitor(new PrintWriter(new StringWriter()))); - } - - @Override - public String asText(ClassBuilder builder) { - TraceClassVisitor visitor = (TraceClassVisitor) builder.getVisitor(); - - StringWriter writer = new StringWriter(); - visitor.p.print(new PrintWriter(writer)); - - return writer.toString(); - } - - @Override - public byte[] asBytes(ClassBuilder builder) { - throw new UnsupportedOperationException("TEXT generator asked for bytes"); - } - }; - public static ClassBuilderFactory BINARIES = new ClassBuilderFactory() { @NotNull @Override diff --git a/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java b/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java index b61bdf38dff..6b7436718b6 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java +++ b/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java @@ -109,7 +109,7 @@ public class BytecodeToolWindow extends JPanel implements Disposable { if (exhaust.isError()) { return printStackTraceToString(exhaust.getError()); } - state = new GenerationState(jetFile.getProject(), ClassBuilderFactories.TEXT, Progress.DEAF, exhaust.getBindingContext(), + state = new GenerationState(jetFile.getProject(), ClassBuilderFactories.TEST, Progress.DEAF, exhaust.getBindingContext(), Collections.singletonList(jetFile), true, true, GenerationState.GenerateClassFilter.GENERATE_ALL, InlineUtil.DEFAULT_INLINE_FLAG_FOR_TOOLWINDOW /*TODO add checkbox or extract it from option*/);