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

Inline checkbox in BytecodeToolWindow

Browse Source
This commit is contained in:
Mikhael Bogdanov
2014-03-13 12:46:30 +04:00
parent 53e41e94d9
commit f475f3ba31
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineUtil.java
-2
View File
@@ -32,8 +32,6 @@ public class InlineUtil {
public static boolean DEFAULT_INLINE_FLAG_FOR_TEST = true; 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 DEFAULT_INLINE_FLAG_FOR_STUB = false; /*always false*/
public static boolean hasNoinlineAnnotation(@NotNull CallableDescriptor valueParameterDescriptor) { public static boolean hasNoinlineAnnotation(@NotNull CallableDescriptor valueParameterDescriptor) {
idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java
+9 -1
View File
@@ -112,7 +112,7 @@ public class BytecodeToolWindow extends JPanel implements Disposable {
state = new GenerationState(jetFile.getProject(), ClassBuilderFactories.TEST, Progress.DEAF, exhaust.getBindingContext(), state = new GenerationState(jetFile.getProject(), ClassBuilderFactories.TEST, Progress.DEAF, exhaust.getBindingContext(),
Collections.singletonList(jetFile), true, true, Collections.singletonList(jetFile), true, true,
GenerationState.GenerateClassFilter.GENERATE_ALL, 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); KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
} }
catch (ProcessCanceledException e) { catch (ProcessCanceledException e) {
@@ -176,6 +176,7 @@ public class BytecodeToolWindow extends JPanel implements Disposable {
private final Editor myEditor; private final Editor myEditor;
private final Project myProject; private final Project myProject;
private final ToolWindow toolWindow; private final ToolWindow toolWindow;
private final JCheckBox enableInline;
public BytecodeToolWindow(Project project, ToolWindow toolWindow) { public BytecodeToolWindow(Project project, ToolWindow toolWindow) {
super(new BorderLayout()); super(new BorderLayout());
@@ -186,6 +187,13 @@ public class BytecodeToolWindow extends JPanel implements Disposable {
EditorFactory.getInstance().createDocument(""), project, JavaFileType.INSTANCE, true); EditorFactory.getInstance().createDocument(""), project, JavaFileType.INSTANCE, true);
add(myEditor.getComponent()); 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<LongRunningReadTask>() { new InfinitePeriodicalTask(UPDATE_DELAY, Alarm.ThreadToUse.SWING_THREAD, this, new Computable<LongRunningReadTask>() {
@Override @Override
public LongRunningReadTask compute() { public LongRunningReadTask compute() {