Add Toolbar to ToolWindow

The ethersync tool window provides now buttons to start and stop the
ethersync daemon (see #4).

Author: schrieveslaach

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+kls_database.db
 
 ### IntelliJ IDEA ###
 .idea/modules.xml

src/main/kotlin/io/github/ethersync/EthersyncService.kt

@@ -4,5 +4,7 @@ interface EthersyncService {
 
    fun start(peer: String?)
 
+   fun shutdown()
+
    fun startWithCustomCommandLine(commandLine: String)
 }

src/main/kotlin/io/github/ethersync/EthersyncServiceImpl.kt

@@ -5,6 +5,7 @@ import com.intellij.execution.process.ColoredProcessHandler
 import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.process.ProcessListener
 import com.intellij.execution.ui.ConsoleView
+import com.intellij.openapi.application.EDT
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.editor.EditorFactory
@@ -15,7 +16,6 @@ import com.intellij.openapi.fileEditor.TextEditor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.project.ProjectManagerListener
-import com.intellij.openapi.rd.util.withUiContext
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.wm.ToolWindowManager
@@ -27,7 +27,9 @@ import io.github.ethersync.settings.AppSettings
 import io.github.ethersync.sync.Changetracker
 import io.github.ethersync.sync.Cursortracker
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.eclipse.lsp4j.jsonrpc.Launcher
 import org.eclipse.lsp4j.jsonrpc.ResponseErrorException
 import java.io.BufferedReader
@@ -99,14 +101,18 @@ class EthersyncServiceImpl(
 
       ProjectManager.getInstance().addProjectManagerListener(project, object: ProjectManagerListener {
          override fun projectClosingBeforeSave(project: Project) {
-            cs.launch {
-               shutdown()
-            }
+            shutdown()
          }
       })
    }
 
-   suspend fun shutdown() {
+   override fun shutdown() {
+      cs.launch {
+         shutdownImpl()
+      }
+   }
+
+   private suspend fun shutdownImpl() {
       clientProcess?.let {
          it.destroy()
          it.awaitExit()
@@ -165,14 +171,14 @@ class EthersyncServiceImpl(
       }
 
       cs.launch {
-         shutdown()
+         shutdownImpl()
 
          if (!ethersyncDirectory.exists()) {
             LOG.debug("Creating ethersync directory")
             ethersyncDirectory.mkdir()
          }
 
-         withUiContext {
+         withContext(Dispatchers.EDT) {
             daemonProcess = ColoredProcessHandler(cmd)
 
             daemonProcess!!.addProcessListener(object : ProcessListener {
@@ -183,15 +189,13 @@ class EthersyncServiceImpl(
                }
 
                override fun processTerminated(event: ProcessEvent) {
-                  cs.launch {
-                     shutdown()
-                  }
+                  shutdown()
                }
             })
 
 
             val tw = ToolWindowManager.getInstance(project).getToolWindow("ethersync")!!
-            val console =  tw.contentManager.findContent("Daemon")!!.component
+            val console = tw.contentManager.findContent("Daemon")!!.component
             if (console is ConsoleView) {
                console.attachToProcess(daemonProcess!!)
             }

src/main/kotlin/io/github/ethersync/EthersyncToolWindowFactory.kt

@@ -1,21 +1,42 @@
 package io.github.ethersync
 
 import com.intellij.execution.filters.TextConsoleBuilderFactory
+import com.intellij.openapi.actionSystem.ActionGroup
+import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.ui.content.ContentFactory
+import java.awt.BorderLayout
+import javax.swing.BoxLayout
+import javax.swing.JPanel
+
 
 class EthersyncToolWindowFactory : ToolWindowFactory {
 
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
-       val console = TextConsoleBuilderFactory.getInstance()
+        val panel = JPanel()
+        panel.setLayout(BorderLayout())
+
+        val console = TextConsoleBuilderFactory.getInstance()
             .createBuilder(project)
             .console
 
-        val content = ContentFactory.getInstance()
-            .createContent(console.component, "Daemon", true)
+        panel.add(console.component, BorderLayout.CENTER)
+
+        val actionToolBar = ActionManager.getInstance().createActionToolbar("", object : ActionGroup() {
+            override fun getChildren(p0: AnActionEvent?): Array<AnAction> {
+               return arrayOf(StartEthersyncDaemonAction(), StopEthersyncDaemonAction())
+            }
+        }, true)
+
+        panel.add(
+            actionToolBar.component, BorderLayout.NORTH)
 
-        toolWindow.contentManager.addContent(content)
+        toolWindow.contentManager.addContent(ContentFactory.getInstance()
+            .createContent(panel, "Daemon", true))
     }
 }

src/main/kotlin/io/github/ethersync/StartEthersyncDaemonAction.kt

@@ -1,15 +1,16 @@
 package io.github.ethersync
 
+import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.components.service
 import com.intellij.openapi.ui.Messages
 
-class StartEthersyncDaemonAction : AnAction() {
+class StartEthersyncDaemonAction : AnAction("Connect to peer", "Connect to a running ethersync daemon or start a new peer",
+   AllIcons.CodeWithMe.CwmInvite) {
 
    override fun actionPerformed(e: AnActionEvent) {
       val project = e.project ?: return
-
       val address = Messages.showInputDialog(
          project,
          "Provide ethersync peer address. Leave empty if you want to host a new session.",

src/main/kotlin/io/github/ethersync/StopEthersyncDaemonAction.kt

@@ -0,0 +1,15 @@
+package io.github.ethersync
+
+import com.intellij.icons.AllIcons
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.components.service
+
+class StopEthersyncDaemonAction : AnAction("Stpo daemon", "Stop running ethersync daemon", AllIcons.Run.Stop) {
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project ?: return
+
+        val service = project.service<EthersyncService>()
+        service.shutdown()
+    }
+}