Merge pull request #103 from retronym/topic/idea-14.1

retronym · retronym · commit 05ee082c5abf · 2015-03-30T12:58:38.000+10:00
Topic/idea 14.1
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>net.orfjackal.idea-sbt-plugin</groupId>
     <artifactId>sbt</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -23,8 +23,8 @@
              command line with -Didea.home=...
 
              Do not commit any changes to this part of the POM. -->
-        <idea.version>110.187</idea.version>
-        <idea.home>/Applications/Nika-IU-110.187.app</idea.home>
+        <idea.version>141.177</idea.version>
+        <idea.home>/Applications/IntelliJ IDEA 14.app/Contents</idea.home>
     </properties>
 
     <name>SBT</name>
diff --git a/sbt-dist/pom.xml b/sbt-dist/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.orfjackal.idea-sbt-plugin</groupId>
         <artifactId>sbt</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sbt-dist</artifactId>
diff --git a/sbt-plugin/pom.xml b/sbt-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.orfjackal.idea-sbt-plugin</groupId>
         <artifactId>sbt</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sbt-plugin</artifactId>
diff --git a/sbt-plugin/sbt-plugin.iml b/sbt-plugin/sbt-plugin.iml
@@ -10,11 +10,10 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA IU-139.1117.1" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.miglayout:miglayout:3.7.3.1" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
   </component>
-</module>
-
+</module>
diff --git a/sbt-plugin/src/main/java/net/orfjackal/sbt/plugin/SbtConsole.java b/sbt-plugin/src/main/java/net/orfjackal/sbt/plugin/SbtConsole.java
@@ -4,49 +4,31 @@
 
 package net.orfjackal.sbt.plugin;
 
-import com.intellij.execution.console.*;
+import com.intellij.execution.console.LanguageConsoleImpl;
 import com.intellij.execution.filters.*;
 import com.intellij.execution.impl.ConsoleViewImpl;
-import com.intellij.execution.process.ConsoleHistoryModel;
 import com.intellij.execution.process.ProcessAdapter;
 import com.intellij.execution.process.ProcessEvent;
 import com.intellij.execution.process.ProcessHandler;
-import com.intellij.execution.runners.ConsoleExecuteActionHandler;
 import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.ScrollingModel;
-import com.intellij.openapi.editor.event.VisibleAreaEvent;
-import com.intellij.openapi.editor.event.VisibleAreaListener;
-import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.testFramework.LightVirtualFile;
-import com.intellij.ui.components.JBScrollBar;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentFactory;
-import com.intellij.util.ReflectionUtil;
-import com.intellij.util.ui.UIUtil;
-import net.orfjackal.sbt.plugin.sbtlang.SbtFileType;
-import net.orfjackal.sbt.plugin.sbtlang.SbtLanguage;
-import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import javax.swing.plaf.basic.BasicScrollBarUI;
 import java.awt.*;
-import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class SbtConsole {
@@ -69,17 +51,16 @@ public class SbtConsole {
     public SbtConsole(String title, Project project, SbtRunnerComponent runnerComponent) {
         this.title = title;
         this.project = project;
-        this.consoleView = createConsoleView(project, this);
+        this.consoleView = createConsoleView(project);
         this.runnerComponent = runnerComponent;
     }
 
-    private static ConsoleView createConsoleView(Project project, SbtConsole sbtConsole) {
-        boolean useClassicConsole = "true".equalsIgnoreCase(System.getProperty("idea.sbt.plugin.classic"));
-        if (useClassicConsole) {
-            return createTextConsole(project);
-        } else {
-            return createLanguageConsole(project, sbtConsole);
-        }
+    private static ConsoleView createConsoleView(Project project) {
+        // TODO can we figure out how to make this a LanguageConsole with IDEA 14.1+
+        //      We need that for console history
+        ConsoleView consoleView = createTextConsole(project);
+        addFilters(project, consoleView);
+        return consoleView;
     }
 
     private static ConsoleView createTextConsole(final Project project) {
@@ -94,150 +75,7 @@ private static ConsoleView createTextConsole(final Project project) {
         return builder.getConsole();
     }
 
-    private static ConsoleView createLanguageConsole(final Project project, final SbtConsole sbtConsole) {
-        LightVirtualFile lightFile = new LightVirtualFile("SBT", SbtLanguage.INSTANCE, "");
-        lightFile.setFileType(SbtFileType.INSTANCE);
-        final LanguageConsoleImpl sbtLanguageConsole = new LanguageConsoleImpl(project, "SBT", lightFile, false);
-        sbtLanguageConsole.setShowSeparatorLine(false);
-        sbtLanguageConsole.initComponents();
-        enableLinkedHorizontalScrollFromHistoryViewer(sbtLanguageConsole);
-
-        // important to only have one history controller, even if SBT is restarted.
-        final ConsoleHistoryModel myConsoleHistoryModel = new ConsoleHistoryModel();
-        final ConsoleHistoryController historyController = new ConsoleHistoryController("scala", null, sbtLanguageConsole, myConsoleHistoryModel);
-        historyController.install();
-        LanguageConsoleViewImpl consoleView = new LanguageConsoleViewImpl(sbtLanguageConsole) {
-            @Override
-            public void attachToProcess(ProcessHandler processHandler) {
-                super.attachToProcess(processHandler);
-                ConsoleExecuteActionHandler executeActionHandler = new ConsoleExecuteActionHandler(processHandler, false) {
-                    @Override
-                    public ConsoleHistoryModel getConsoleHistoryModel() {
-                        return myConsoleHistoryModel;
-                    }
-
-                    public void runExecuteAction(LanguageConsoleImpl languageConsole) {
-                        EditorEx consoleEditor = languageConsole.getConsoleEditor();
-                        consoleEditor.setCaretEnabled(false);
-
-                        super.runExecuteAction(languageConsole);
-
-                        // hide the prompts until the command has completed.
-                        languageConsole.setPrompt("  ");
-                        consoleEditor.setCaretEnabled(true);
-                    }
-                    protected void execute(@NotNull String text, @NotNull LanguageConsoleView console) {
-                        EditorEx consoleEditor = console.getConsole().getConsoleEditor();
-                        consoleEditor.setCaretEnabled(false);
-                        super.execute(text, console);
-                        // hide the prompts until the command has completed.
-                        console.getConsole().setPrompt("  ");
-                        consoleEditor.setCaretEnabled(true);
-                    }
-
-                };
-                // SBT echos the command, don't add it to the output a second time.
-                executeActionHandler.setAddCurrentToHistory(true);
-                try {
-                    java.util.List<Field> fields = ReflectionUtil.collectFields(executeActionHandler.getClass());
-                    for (Field field : fields) {
-                        if (field.getType() == ConsoleHistoryModel.class) {
-                            field.setAccessible(true);
-                            field.set(executeActionHandler, myConsoleHistoryModel);
-                        }
-                    }
-                } catch (Exception err) {
-                    logger.warn("Unable to reflectively set field in " + executeActionHandler.getClass() + ", history in the SBT console may not work.", err);
-                }
-                AnAction action = new ConsoleExecuteAction(this, executeActionHandler);
-                action.registerCustomShortcutSet(action.getShortcutSet(), sbtLanguageConsole.getComponent());
-            }
-
-            @Override
-            public boolean hasDeferredOutput() {
-                return super.hasDeferredOutput();
-            }
-        };
-        sbtLanguageConsole.setPrompt("  ");
-        addFilters(project, consoleView);
-
-        return consoleView;
-    }
-
-    private static void enableLinkedHorizontalScrollFromHistoryViewer(final LanguageConsoleImpl sbtLanguageConsole) {
-        JBScrollBar horizontalScrollBar = new JBScrollBar(Adjustable.HORIZONTAL);
-        horizontalScrollBar.setUI(new BasicScrollBarUI() {
-            @Override
-            public Dimension getPreferredSize(JComponent c) {
-                return new Dimension(0, 0);
-            }
-        });
-        sbtLanguageConsole.getHistoryViewer().getScrollPane().setHorizontalScrollBar(horizontalScrollBar);
-        sbtLanguageConsole.getHistoryViewer().setHorizontalScrollbarVisible(true);
-
-        final VisibleAreaListener areaListener = new VisibleAreaListener() {
-            public void visibleAreaChanged(VisibleAreaEvent e) {
-                final int offset = sbtLanguageConsole.getHistoryViewer().getScrollingModel().getHorizontalScrollOffset();
-                final ScrollingModel model = sbtLanguageConsole.getConsoleEditor().getScrollingModel();
-                final int historyOffset = model.getHorizontalScrollOffset();
-                if (historyOffset != offset) {
-                    try {
-                        model.disableAnimation();
-                        model.scrollHorizontally(offset);
-                    } finally {
-                        model.enableAnimation();
-                    }
-                }
-            }
-        };
-        sbtLanguageConsole.getHistoryViewer().getScrollingModel().addVisibleAreaListener(areaListener);
-    }
-
-    public void enablePrompt() {
-        if (consoleView instanceof LanguageConsoleViewImpl) {
-            final LanguageConsoleViewImpl languageConsoleView = (LanguageConsoleViewImpl) consoleView;
-            final LanguageConsoleImpl console = languageConsoleView.getConsole();
-
-            UIUtil.invokeAndWaitIfNeeded(new Runnable() {
-                public void run() {
-                    languageConsoleView.flushDeferredText();
-                    ApplicationManagerEx.getApplication().runWriteAction(new Runnable() {
-                        public void run() {
-                            Document document = console.getHistoryViewer().getDocument();
-                            EditorEx consoleEditor = console.getConsoleEditor();
-                            if (deleteTextFromEnd(document, "\n> ", "\n")) {
-                                console.setPrompt("> ");
-                            } else if (deleteTextFromEnd(document, "\nscala> ", "\n")) {
-                                console.setPrompt("scala> ");
-                                // not sure why this works, but it moves the caret to the end of the prompt.
-                                // without this, it apppears between the `c` and `a`.
-                                consoleEditor.getCaretModel().moveCaretRelatively(-1, 0, false, false, false);
-                            }
-                            consoleEditor.setCaretEnabled(true);
-                        }
-                    });
-                }
-            });
-        }
-    }
-
-    private static boolean deleteTextFromEnd(final Document document, String lastPrompt, final String replacement) {
-        final int startOffset = document.getTextLength() - lastPrompt.length();
-        if (startOffset > 0) {
-            String text = document.getText(TextRange.create(startOffset, document.getTextLength()));
-            if (text.equals(lastPrompt)) {
-                UIUtil.invokeAndWaitIfNeeded(new Runnable() {
-                    public void run() {
-                        document.replaceString(startOffset, document.getTextLength(), replacement);
-                    }
-                });
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static void addFilters(Project project, LanguageConsoleViewImpl consoleView) {
+    private static void addFilters(Project project, ConsoleView consoleView) {
         consoleView.addMessageFilter(new ExceptionFilter(GlobalSearchScope.allScope(project)));
         consoleView.addMessageFilter(new RegexpFilter(project, CONSOLE_FILTER_REGEXP));
         consoleView.addMessageFilter(new SbtColorizerFilter());
diff --git a/sbt-plugin/src/main/java/net/orfjackal/sbt/plugin/SbtRunnerComponent.java b/sbt-plugin/src/main/java/net/orfjackal/sbt/plugin/SbtRunnerComponent.java
@@ -145,7 +145,6 @@ public boolean executeAndWait(String action) throws IOException {
         boolean success;
         try {
             success = sbt.execute(action);
-            this.getConsole().enablePrompt();
             // TODO: update target folders (?)
             // org.jetbrains.idea.maven.project.MavenProjectsManager#updateProjectFolders
             // org.jetbrains.idea.maven.execution.MavenRunner#runBatch
@@ -202,11 +201,6 @@ public void run() {
                     } catch (Exception e) {
                         // ignore
                     }
-                    SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                            console.enablePrompt();
-                        }
-                    });
                 }
             });
         }
diff --git a/sbt-plugin/src/main/java/net/orfjackal/sbt/plugin/SelectSbtActionDialog.java b/sbt-plugin/src/main/java/net/orfjackal/sbt/plugin/SelectSbtActionDialog.java
@@ -5,6 +5,7 @@
 package net.orfjackal.sbt.plugin;
 
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.DialogWrapper;
 import net.miginfocom.swing.MigLayout;
 
@@ -68,7 +69,7 @@ protected JComponent createCenterPanel() {
         JLabel runInCurrentModuleLabel = new JLabel(MessageBundle.message("sbt.tasks.select.action.run.current"));
         runInCurrentModuleLabel.setToolTipText(MessageBundle.message("sbt.tasks.select.action.run.current.tooltip"));
 
-        actionField = new JComboBox(SBT_ACTIONS_WITH_SEPARATOR);
+        actionField = new ComboBox(SBT_ACTIONS_WITH_SEPARATOR);
         actionField.setEditable(true);
         actionField.setSelectedItem(selectedAction);
         actionField.setRenderer(new DefaultListCellRenderer() {
diff --git a/sbt-plugin/src/main/resources/META-INF/plugin.xml b/sbt-plugin/src/main/resources/META-INF/plugin.xml
@@ -4,7 +4,7 @@
     <id>SBT</id>
     <name>SBT</name>
     <version>${project.version}</version>
-    <idea-version since-build="135.475"/>
+    <idea-version since-build="141.177"/>
     <category>Build</category>
 
     <vendor url="http://www.orfjackal.net">Esko Luontola</vendor>
@@ -22,6 +22,13 @@
     ]]></description>
     <change-notes><![CDATA[
         <ul>
+        <dt><b>1.7.0 (2014-03-26)</b></dt>
+        <li>Be compatible with / require IntelliJ 14.1</li>
+        <li>Revert UI to a TextConsole rather than a LanguageConsole. We lose command history. Hopefully we can find a way to restore this feature in a subsequent release once we adapt to changes in IntelliJ</li>
+
+        <dt><b>1.6.0 (2014-05-17)</b></dt>
+        <li>Require IntelliJ IDEA 13.1 (Cardea)</li>
+
         <dt><b>1.6.1 (2014-05-17)</b></dt>
         <li>Relax version requirement to admit IDEA 13.1.0 (Cardea)</li>
         <dt><b>1.6.0 (2014-05-17)</b></dt>

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,6 @@ public boolean executeAndWait(String action) throws IOException {`
`145`	`145`	`boolean success;`
`146`	`146`	`try {`
`147`	`147`	`success = sbt.execute(action);`
`148`		`- this.getConsole().enablePrompt();`
`149`	`148`	`// TODO: update target folders (?)`
`150`	`149`	`// org.jetbrains.idea.maven.project.MavenProjectsManager#updateProjectFolders`
`151`	`150`	`// org.jetbrains.idea.maven.execution.MavenRunner#runBatch`
`@@ -202,11 +201,6 @@ public void run() {`
`202`	`201`	`} catch (Exception e) {`
`203`	`202`	`// ignore`
`204`	`203`	`}`
`205`		`- SwingUtilities.invokeLater(new Runnable() {`
`206`		`- public void run() {`
`207`		`- console.enablePrompt();`
`208`		`- }`
`209`		`- });`
`210`	`204`	`}`
`211`	`205`	`});`
`212`	`206`	`}`