Add reload action

dubreuia · Jan 17, 2019 · faaa55a · faaa55a
1 parent e1fa97a
commit faaa55a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 4 deletions.
diff --git a/.idea/saveactions_settings.xml b/.idea/saveactions_settings.xml
diff --git a/src/main/java/com/dubreuia/core/component/SaveActionManager.java b/src/main/java/com/dubreuia/core/component/SaveActionManager.java
@@ -96,6 +96,10 @@ public boolean isJavaAvailable() {
         return javaAvailable;
     }
 
+    public Storage getStorage(Project project) {
+        return storageFactory.getStorage(project);
+    }
+
     @Override
     public void beforeAllDocumentsSaving() {
         if (isRunning) {
@@ -136,8 +140,7 @@ public void processPsiFilesIfNecessary(Project project,
                                            Set<PsiFile> psiFiles,
                                            Action activation,
                                            ExecutionMode mode) {
-        Storage storage = storageFactory.getStorage(project);
-        Engine engine = new Engine(storage, processors, project, psiFiles, activation, mode);
+        Engine engine = new Engine(getStorage(project), processors, project, psiFiles, activation, mode);
         engine.processPsiFilesIfNecessary();
     }
 

diff --git a/src/main/java/com/dubreuia/model/Action.java b/src/main/java/com/dubreuia/model/Action.java
@@ -23,7 +23,7 @@ public enum Action {
     activateOnBatch("Activate save actions on batch (\"Code > Save Actions > Execute on multiple files\")",
             activation, false),
 
-    noActionIfCompileErrors("No action if compile errors",
+    noActionIfCompileErrors("No action if compile errors (applied per file)",
             activation, false),
 
     // Global
@@ -45,6 +45,9 @@ public enum Action {
     compile("Compile files (using \"Build > Build Project\")",
             build, false),
 
+    reload("Reload files in running debugger (using \"Run > Reload Changed Classes\")",
+            build, false),
+
     // Java fixes
 
     fieldCanBeFinal("Add final modifier to field",
@@ -136,4 +139,4 @@ public static Stream<Action> stream(ActionType type) {
         return Arrays.stream(values()).filter(action -> action.type.equals(type));
     }
 
-}
+}
diff --git a/src/main/java/com/dubreuia/processors/BuildProcessor.java b/src/main/java/com/dubreuia/processors/BuildProcessor.java
@@ -3,6 +3,10 @@
 import com.dubreuia.core.ExecutionMode;
 import com.dubreuia.core.component.SaveActionManager;
 import com.dubreuia.model.Action;
+import com.intellij.debugger.DebuggerManagerEx;
+import com.intellij.debugger.impl.DebuggerSession;
+import com.intellij.debugger.settings.DebuggerSettings;
+import com.intellij.debugger.ui.HotSwapUI;
 import com.intellij.openapi.compiler.CompilerManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
@@ -28,6 +32,21 @@ public enum BuildProcessor implements Processor {
                 }
             }),
 
+    reload(Action.reload,
+            (project, psiFiles) -> () -> {
+                if (SaveActionManager.getInstance().isCompilingAvailable()) {
+                    DebuggerManagerEx debuggerManager = DebuggerManagerEx.getInstanceEx(project);
+                    DebuggerSession session = debuggerManager.getContext().getDebuggerSession();
+                    if (session != null && session.isAttached()) {
+                        boolean compileEnabled = SaveActionManager.getInstance()
+                                .getStorage(project).isEnabled(Action.compile);
+                        boolean compileHotswapSetting = DebuggerSettings.getInstance().COMPILE_BEFORE_HOTSWAP;
+                        boolean compileBeforeHotswap = compileEnabled ? false : compileHotswapSetting;
+                        HotSwapUI.getInstance(project).reloadChangedClasses(session, compileBeforeHotswap);
+                    }
+                }
+            }),
+
     ;
 
     private final Action action;

diff --git a/src/main/java/com/dubreuia/ui/BuildPanel.java b/src/main/java/com/dubreuia/ui/BuildPanel.java
@@ -9,6 +9,7 @@
 import java.util.Map;
 
 import static com.dubreuia.model.Action.compile;
+import static com.dubreuia.model.Action.reload;
 
 class BuildPanel {
 
@@ -28,6 +29,7 @@ JPanel getPanel() {
         panel.setBorder(IdeBorderFactory.createTitledBorder(TEXT_TITLE_ACTIONS));
         panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS));
         panel.add(checkboxes.get(compile));
+        panel.add(checkboxes.get(reload));
         panel.add(Box.createHorizontalGlue());
         panel.setMinimumSize(new Dimension(Short.MAX_VALUE, 0));
         return panel;