Jonathan/Dracon - Change POQV6EZEPJLYHUC2HN3BYTRPR7V5V2ILWXU56SNMTA6ETE74QNTAC

Options screen

Created by Jonathan on April 11, 2021

POQV6EZEPJLYHUC2HN3BYTRPR7V5V2ILWXU56SNMTA6ETE74QNTAC

Dependencies

In channels

main

Change contents

Replacement in src/main/resources/messages/DraconBundle.properties at line 99 [3.105]

B:BD[2.179] → [2.179:218]

settings.pijul.path.detect.text=Detect

[2.179]

[2.218]

settings.pijul.path.description.text=Dracon does not embed the pijul binary, you should install it
settings.pijul.path.tooltip.text=Dracon does not embed the pijul binary, you should install it using cargo or by \
  downloading a build for your platform. See <a href="https://oblitersoftware.github.io/">Dracon installation</a>
settings.pijul.text=Pijul settings
settings.editor.text=Editor server settings
settings.editor.path.text=Editor server path:
settings.editor.path.tooltip.text=Dracon does not embed the editor-server binary, you should install it using cargo or by \
  downloading a build for your platform. See <a href="https://oblitersoftware.github.io/">Dracon installation</a>
settings.install.text=Click here to read more about Dracon installation.
settings.pijul.path.detect.text=Detect Pijul
settings.editor.path.detect.text=Detect Editor Server

Insertion in src/main/resources/messages/DraconBundle.properties at line 111 [3.105]
[2.270]
[2.270]
```
settings.editor.path.select.text=Select Editor Server Binary
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/util/Application.kt at line 3 [4.204]
[4.248]
[4.248]
```
import com.github.jonathanxd.dracon.config.PijulSettings
import com.intellij.openapi.components.service
```

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/util/Application.kt at line 9 [4.204]

[4.348]


fun findPijul(): String =
    service<PijulSettings>().getPathToPijul() ?: findBinary("pijul")
fun findPijulOrNull(): String? =
    service<PijulSettings>().getPathToPijul() ?: findBinaryOrNull("pijul")
fun findEditorServer(): String =
    service<PijulSettings>().getPathToEditorServer() ?: findBinary("editor-server")

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/util/Application.kt at line 19 [4.204]

[4.349]

fun findEditorServerOrNull(): String? =
    service<PijulSettings>().getPathToEditorServer() ?: findBinaryOrNull("editor-server")

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/config/PijulSettings.kt at line 42 [5.5385]

[2.3145]

[5.6169]


    fun savePathToEditorServer(pathToEditorServer: String?) {
        this.state.pathToEditorServer = pathToEditorServer
    }
    fun getPathToEditorServer() =
        this.state.pathToEditorServer

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/config/PijulSettings.kt at line 66 [5.5385]

[5.6634]

[6.13585]

    @get:OptionTag("PATH_TO_EDITOR_SERVER")
    var pathToEditorServer by string(defaultValue = findBinaryOrNull("editor-server"))

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsConfigurable.kt at line 24 [2.3324]
[2.4120]
[2.4120]
```
        val pathToEditor = settings.getPathToEditorServer()
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsConfigurable.kt at line 27 [2.3324]
[2.4268]
[2.4268]
```
        modified = modified || (this.pijulSettingsComponent?.editorServerPath?.text != pathToEditor)
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsConfigurable.kt at line 35 [2.3324]
[2.4564]
[2.4564]
```
        settings.savePathToEditorServer(this.pijulSettingsComponent?.editorServerPath?.text)
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsConfigurable.kt at line 46 [2.3324]
[2.4934]
[2.4934]
```
        this.pijulSettingsComponent?.editorServerPath?.text = settings.getPathToEditorServer() ?: ""
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 5 [2.5162]
[2.5323]
[2.5323]
```
import com.github.jonathanxd.dracon.util.wrapInHml
import com.intellij.ide.BrowserUtil
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 12 [2.5162]
[2.5588]
[2.5588]
```
import com.intellij.ui.HyperlinkLabel
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 15 [2.5162]
[2.5675]
[2.5675]
```
import com.intellij.ui.components.JBTextArea
```
Replacement in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 22 [2.5162]
B:BD[2.5890] → [2.5890:5973]
```
import javax.swing.JButton
import javax.swing.JComponent
import javax.swing.JPanel
```
[2.5890]
[2.5973]
```
import javax.swing.*
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 41 [2.5162]
[2.6599]
[2.6599]
```
        it.toolTipText = DraconBundle.message("settings.pijul.path.tooltip.text")
```

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 44 [2.5162]

[2.6606]

    val editorServerPath = TextFieldWithBrowseButton().also {
        it.addBrowseFolderListener(
            DraconBundle.message("settings.editor.path.select.text"),
            "",
            null,
            FileChooserDescriptor(true, false, false, false, false, false)
                .withFileFilter { file: VirtualFile? ->
                    file?.name == "editor-server"
                }
        )
        it.toolTipText = DraconBundle.message("settings.editor.path.tooltip.text")
    }

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 66 [2.5162]

[2.6928]

    val detectEditorServer = JButton(DraconBundle.message("settings.editor.path.detect.text")).also {
        it.addMouseListener(object : MouseAdapter() {
            override fun mouseClicked(e: MouseEvent) {
                editorServerPath.text = findBinaryOrNull("editor-server") ?: ""
            }
        })
        it.updateUI()
    }

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 77 [2.5162]
[2.6996]
[2.6996]
```
            .addLabeledComponent(JBLabel(DraconBundle.message("settings.pijul.text")), JSeparator())
```

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 79 [2.5162]

B:BD[2.7030] → [2.7030:7125]

                JBLabel(DraconBundle.message("settings.pijul.path.text")), pijulPath, 1, false

[2.7030]

[2.7125]

                JBLabel(DraconBundle.message("settings.pijul.path.text")).also {
                    it.toolTipText = DraconBundle.message("settings.pijul.path.tooltip.text")
                }, pijulPath, 1, false

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 86 [2.5162]

[2.7311]

            }, 0
            )
            .addLabeledComponent(JBLabel(DraconBundle.message("settings.editor.text")), JSeparator())
            .addLabeledComponent(
                JBLabel(DraconBundle.message("settings.editor.path.text")).also {
                    it.toolTipText = DraconBundle.message("settings.editor.path.tooltip.text")
                }, editorServerPath, 1, false
            )
            .addComponent(JPanel(BorderLayout()).also {
                it.add(detectEditorServer, BorderLayout.EAST)

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 97 [2.5162]

[2.7329]

            .addComponent(HyperlinkLabel(DraconBundle.message("settings.install.text")).also {
                it.addMouseListener(object : MouseAdapter() {
                    override fun mouseClicked(e: MouseEvent) {
                        BrowserUtil.browse("https://oblitersoftware.github.io/")
                    }
                })
            })

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 970 [7.10972]
B:BD[7.14497] → [7.14497:14551]
```
            .command(listOf(this.findPijul()) + args)
```
[7.14497]
[7.14551]
```
            .command(listOf(findPijul()) + args)
```
Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1023 [7.10972]
B:BD[8.10312] → [8.10312:10366]
```
            .command(listOf(this.findPijul()) + args)
```
[8.10312]
[8.10366]
```
            .command(listOf(findPijul()) + args)
```
Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1079 [7.10972]
B:BD[9.6216] → [9.6216:6274]
```
                .command(listOf(this.findPijul()) + args)
```
[9.6216]
[9.6274]
```
                .command(listOf(findPijul()) + args)
```
Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1139 [7.10972]
∅:D[8.12899] → [10.22245:22299]
B:BD[10.22245] → [10.22245:22299]
```
            .command(listOf(this.findPijul()) + args)
```
[8.12899]
[10.22299]
```
            .command(listOf(findPijul()) + args)
```
Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1195 [7.10972]
B:BD[4.10298] → [4.10298:10352]
```
            .command(listOf(this.findPijul()) + args)
```
[4.10298]
[2.8625]
```
            .command(listOf(findPijul()) + args)
```
Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1248 [7.10972]
B:BD[2.10642] → [2.10642:10692]
```
        val cmd = listOf(this.findPijul()) + args
```
[2.10642]
[2.10692]
```
        val cmd = listOf(findPijul()) + args
```
Deletion in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1289 [7.10972]
B:BD[7.17510] → [7.17510:17511]
B:BD[7.17736] → [7.17736:17737]
B:BD[7.17737] → [2.11087:11198]
```
    private fun findPijul(): String =
        service<PijulSettings>().getPathToPijul() ?: findBinary("pijul")
```

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/activity/PijulPostStartupActivity.kt at line 9 [11.3670]

B:BD[11.3980] → [11.3980:4192]

import com.github.jonathanxd.dracon.util.escapeXml
import com.github.jonathanxd.dracon.util.findBinary
import com.github.jonathanxd.dracon.util.findBinaryOrNull
import com.github.jonathanxd.dracon.util.wrapInHml

[11.3980]

[11.4192]

import com.github.jonathanxd.dracon.util.*

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/activity/PijulPostStartupActivity.kt at line 34 [11.3670]

B:BD[11.5247] → [11.5247:5384]

            val hasPijul = findBinaryOrNull("pijul") != null
            val hasEditorServer = findBinaryOrNull("editor-server") != null

[11.5247]

[11.5384]

            val hasPijul = findPijulOrNull() != null
            val hasEditorServer = findEditorServerOrNull() != null

Options screen

Dependencies

In channels

Change contents

Replacement in src/main/resources/messages/DraconBundle.properties at line 99 [3.105]

Insertion in src/main/resources/messages/DraconBundle.properties at line 111 [3.105]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/util/Application.kt at line 3 [4.204]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/util/Application.kt at line 9 [4.204]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/util/Application.kt at line 19 [4.204]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/config/PijulSettings.kt at line 42 [5.5385]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/config/PijulSettings.kt at line 66 [5.5385]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsConfigurable.kt at line 24 [2.3324]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsConfigurable.kt at line 27 [2.3324]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsConfigurable.kt at line 35 [2.3324]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsConfigurable.kt at line 46 [2.3324]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 5 [2.5162]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 12 [2.5162]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 15 [2.5162]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 22 [2.5162]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 41 [2.5162]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 44 [2.5162]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 66 [2.5162]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 77 [2.5162]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 79 [2.5162]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 86 [2.5162]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/component/PijulSettingsComponent.kt at line 97 [2.5162]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 970 [7.10972]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1023 [7.10972]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1079 [7.10972]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1139 [7.10972]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1195 [7.10972]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1248 [7.10972]

Deletion in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 1289 [7.10972]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/activity/PijulPostStartupActivity.kt at line 9 [11.3670]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/activity/PijulPostStartupActivity.kt at line 34 [11.3670]