From f475f3ba319d692f146f3844de48cdaea7382fc9 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Thu, 13 Mar 2014 12:46:30 +0400 Subject: [PATCH] Inline checkbox in BytecodeToolWindow --- .../org/jetbrains/jet/lang/types/lang/InlineUtil.java | 2 -- .../plugin/internal/codewindow/BytecodeToolWindow.java | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineUtil.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineUtil.java index 8a9bcd74d0c..dc5fac040a5 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineUtil.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineUtil.java @@ -32,8 +32,6 @@ public class InlineUtil { public static boolean DEFAULT_INLINE_FLAG_FOR_TEST = true; - public static boolean DEFAULT_INLINE_FLAG_FOR_TOOLWINDOW = true; - public static boolean DEFAULT_INLINE_FLAG_FOR_STUB = false; /*always false*/ public static boolean hasNoinlineAnnotation(@NotNull CallableDescriptor valueParameterDescriptor) { 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 6b7436718b6..92746c55697 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java +++ b/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java @@ -112,7 +112,7 @@ public class BytecodeToolWindow extends JPanel implements Disposable { 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*/); + enableInline.isSelected()); KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION); } catch (ProcessCanceledException e) { @@ -176,6 +176,7 @@ public class BytecodeToolWindow extends JPanel implements Disposable { private final Editor myEditor; private final Project myProject; private final ToolWindow toolWindow; + private final JCheckBox enableInline; public BytecodeToolWindow(Project project, ToolWindow toolWindow) { super(new BorderLayout()); @@ -186,6 +187,13 @@ public class BytecodeToolWindow extends JPanel implements Disposable { EditorFactory.getInstance().createDocument(""), project, JavaFileType.INSTANCE, true); add(myEditor.getComponent()); + JPanel optionPanel = new JPanel(new BorderLayout()); + add(optionPanel, BorderLayout.NORTH); + + /*TODO: try to extract default parameter from compiler options*/ + enableInline = new JCheckBox("Enable inline"); + optionPanel.add(enableInline, BorderLayout.WEST); + new InfinitePeriodicalTask(UPDATE_DELAY, Alarm.ThreadToUse.SWING_THREAD, this, new Computable() { @Override public LongRunningReadTask compute() {