Switch to Stylus

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "dev.shota"
-version = "0.4.5"
+version = "0.4.6"
 
 kotlin {
  jvmToolchain {
@@ -37,6 +37,7 @@ repositories {
 
 dependencies {
  implementation(project("fernflower"))
+ implementation("dev.shota:stylus4j:0.1.0")
  implementation("com.formdev:flatlaf:2.3")
  implementation("org.fxmisc.richtext:richtextfx:0.10.9")
  implementation("org.kordamp.ikonli:ikonli-core:12.3.1")

src/main/kotlin/dev/shota/decompiler/window/Window.kt

@@ -47,8 +47,8 @@ object Window : JFrame() {
 
  for (font in fonts)
  Font.loadFont(javaClass.classLoader.getResourceAsStream("fonts/${font.split("-")[0]}/$font.ttf"), Toolkit.getToolkit().fontLoader.systemFontSize.toDouble())
- root.stylesheets.add(styles("global.less"))
- root.stylesheets.add(styles("syntax.less"))
+ root.stylesheets.add(styles("global.styl"))
+ root.stylesheets.add(styles("syntax.styl"))
 
  panel.scene = Scene(root, 894.0, 528.0)
  panel.scene.setOnDragOver {

src/main/kotlin/dev/shota/decompiler/window/popup/Popup.kt

@@ -17,7 +17,7 @@ open class Popup(title: String) : JDialog(Window, title, true) {
 
  fun run(root: Parent) {
  val panel = JFXPanel()
- root.stylesheets.add(styles("global.less"))
+ root.stylesheets.add(styles("global.styl"))
  panel.scene = Scene(root)
 
  val jroot = JRootPane()

src/main/kotlin/dev/shota/decompiler/window/utils/Styles.kt

@@ -1,12 +1,12 @@
 package dev.shota.decompiler.window.utils
 
-import com.github.sommeri.less4j.core.ThreadUnsafeLessCompiler
 import dev.shota.decompiler.window.Window
+import dev.shota.stylus4j.Stylus
 import java.util.*
 
 fun styles(file: String): String {
- val less = String(Window.javaClass.classLoader.getResourceAsStream("styles/$file").readAllBytes())
- val css = ThreadUnsafeLessCompiler().compile(less).css
+ val less = Window.javaClass.classLoader.getResourceAsStream("styles/$file")
+ val css = Stylus.compile(less)
  val base64 = Base64.getEncoder().encodeToString((css).toByteArray())
  return "data:text/css;base64,$base64"
 }

src/main/resources/styles/global.styl

@@ -0,0 +1,78 @@
+* {
+ -fx-font-family: "Open Sans"
+}
+
+.split-pane {
+ -fx-padding: 0
+ -fx-background-insets: 0
+
+ .split-pane-divider {
+ -fx-padding: 0
+ }
+}
+
+.tree-view {
+ -fx-padding: 0
+ -fx-background-color: none
+
+ .tree-cell {
+ -fx-text-fill: black
+ -fx-background-color: none
+
+ &:focused {
+ -fx-text-fill: white
+ -fx-background-color: #0196c9
+
+ .tree-disclosure-node .arrow {
+ -fx-background-color: white
+ }
+ }
+
+ .tree-disclosure-node .arrow {
+ -fx-background-color: derive(black, 50%)
+ }
+ }
+}
+
+.tab-pane {
+ .tab-header-area {
+ -fx-padding: 0
+
+ .tab-header-background {
+ -fx-background-color: none
+ }
+
+ .tab {
+ -fx-background-color: white
+ -fx-border-color: white
+ -fx-background-radius: 0
+ -fx-background-insets: 0
+ -fx-border-width: 0 0 1 0
+
+ &:selected {
+ -fx-border-color: #0196c9
+ }
+
+ .focus-indicator {
+ -fx-border-width: 0
+ }
+ }
+ }
+
+ .tab-content-area .virtualized-scroll-pane .styled-text-area {
+ * {
+ -fx-font-family: "JetBrains Mono"
+ -fx-font-size: 16
+ }
+
+ .selection {
+ -fx-fill: #0196c9
+ }
+
+ .lineno {
+ -fx-text-fill: derive(black, 50%)
+ -fx-font-style: normal
+ -fx-background-color: white
+ }
+ }
+}

src/main/resources/styles/syntax.styl

@@ -0,0 +1,14 @@
+.keyword {
+ -fx-fill: blue
+ -fx-font-weight: bold
+}
+.string {
+ -fx-fill: green
+}
+.paren, .bracket, .brace, .semicolon {
+ -fx-fill: black
+}
+.comment {
+ -fx-fill: gray
+ -fx-font-style: italic
+}

src/test/java/dev/shota/decompiler/Main.java

@@ -1,4 +1,4 @@
-package dev.shota.decompiler;
+package net.pryoscode.decompiler;
 
 public class Main {