feat(desktop): implement recursive highlight

Irineu333 · Irineu333 · commit de38037d5d67 · 2024-12-19T22:43:33.000-03:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/application/build.gradle.kts b/application/build.gradle.kts
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import com.android.utils.jvmArchitecture
+@file:Suppress("UnstableApiUsage")
+
 import com.android.utils.osArchitecture
 import extension.catalog
 import extension.config
@@ -34,11 +35,6 @@ version = config.version.name()
 
 kotlin {
 
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-        vendor.set(JvmVendorSpec.ORACLE) // Oracle OpenJDK
-    }
-
     sourceSets {
         commonMain.dependencies {
 
diff --git a/application/src/androidMain/kotlin/com/neoutils/neoregex/App.android.kt b/application/src/androidMain/kotlin/com/neoutils/neoregex/App.android.kt
@@ -25,10 +25,8 @@ import com.neoutils.neoregex.core.designsystem.theme.NeoTheme
 import com.neoutils.neoregex.core.sharedui.di.WithKoin
 
 @Composable
-fun AndroidApp() {
-    WithKoin {
-        NeoTheme {
-            App(Modifier.safeDrawingPadding())
-        }
+fun AndroidApp() = WithKoin {
+    NeoTheme {
+        App(Modifier.safeDrawingPadding())
     }
 }
diff --git a/application/src/desktopMain/kotlin/com/neoutils/neoregex/App.desktop.kt b/application/src/desktopMain/kotlin/com/neoutils/neoregex/App.desktop.kt
@@ -30,7 +30,6 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
diff --git a/application/src/desktopMain/kotlin/com/neoutils/neoregex/Main.desktop.kt b/application/src/desktopMain/kotlin/com/neoutils/neoregex/Main.desktop.kt
@@ -19,13 +19,10 @@
 package com.neoutils.neoregex
 
 import androidx.compose.ui.window.launchApplication
-import kotlinx.coroutines.CoroutineScope
-import org.jetbrains.skiko.MainUIDispatcher
+import com.neoutils.neoregex.core.common.util.mainUIScope
 
 fun main() {
-    with(CoroutineScope(MainUIDispatcher)) {
-        launchApplication {
-            DesktopApp()
-        }
+    mainUIScope.launchApplication {
+        DesktopApp()
     }
 }
diff --git a/application/src/webMain/kotlin/com/neoutils/neoregex/Main.web.kt b/application/src/webMain/kotlin/com/neoutils/neoregex/Main.web.kt
@@ -18,30 +18,9 @@
 
 package com.neoutils.neoregex
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.MaterialTheme.colorScheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.CanvasBasedWindow
-import com.neoutils.neoregex.core.common.extension.toCss
 import com.neoutils.neoregex.core.common.util.SizeManager
-import com.neoutils.neoregex.core.designsystem.theme.NeoTheme
-import com.neoutils.neoregex.core.sharedui.di.WithKoin
-import kotlinx.browser.document
 import kotlinx.coroutines.flow.first
 import org.jetbrains.skiko.wasm.onWasmReady
 
diff --git a/build-logic/src/main/kotlin/com.neoutils.neoregex.android-app.gradle.kts b/build-logic/src/main/kotlin/com.neoutils.neoregex.android-app.gradle.kts
@@ -17,8 +17,10 @@
  */
 
 @file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+@file:Suppress("UnstableApiUsage")
 
 import extension.*
+import gradle.kotlin.dsl.accessors._3c98c44ac979be75a1ef93311f530471.kotlin
 import gradle.kotlin.dsl.accessors._9d6accdeac6876c73060866945fb6d8c.sourceSets
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -29,9 +31,17 @@ plugins {
 }
 
 kotlin {
+
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(21))
+            vendor.set(JvmVendorSpec.JETBRAINS)
+        }
+    }
+
     androidTarget {
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
+            jvmTarget.set(JvmTarget.JVM_21)
         }
     }
 
diff --git a/build-logic/src/main/kotlin/com.neoutils.neoregex.android-library.gradle.kts b/build-logic/src/main/kotlin/com.neoutils.neoregex.android-library.gradle.kts
@@ -16,13 +16,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+@file:Suppress("UnstableApiUsage")
+
 import extension.config
 
 plugins {
     id("com.android.library")
 }
 
 android {
+
     namespace = config.basePackage
     compileSdk = config.android.compileSdk
 
@@ -40,11 +43,6 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
diff --git a/build-logic/src/main/kotlin/com.neoutils.neoregex.core.gradle.kts b/build-logic/src/main/kotlin/com.neoutils.neoregex.core.gradle.kts
@@ -17,6 +17,7 @@
  */
 
 @file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+@file:Suppress("UnstableApiUsage")
 
 import extension.catalog
 import extension.config
@@ -37,16 +38,22 @@ version = config.version.name()
 
 kotlin {
 
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+        vendor.set(JvmVendorSpec.JETBRAINS)
+    }
+
     androidTarget {
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
+            jvmTarget.set(JvmTarget.JVM_21)
         }
     }
 
     jvm("desktop")
 
     js("web", IR) {
         browser()
+        binaries.library()
     }
 
     sourceSets {
diff --git a/build-logic/src/main/kotlin/com.neoutils.neoregex.desktop-app.gradle.kts b/build-logic/src/main/kotlin/com.neoutils.neoregex.desktop-app.gradle.kts
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+@file:Suppress("UnstableApiUsage")
+
 import extension.catalog
 import extension.config
 import extension.name
@@ -28,6 +30,12 @@ plugins {
 }
 
 kotlin {
+
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+        vendor.set(JvmVendorSpec.JETBRAINS)
+    }
+
     jvm(name = "desktop")
 
     sourceSets {
diff --git a/build-logic/src/main/kotlin/com.neoutils.neoregex.web-app.gradle.kts b/build-logic/src/main/kotlin/com.neoutils.neoregex.web-app.gradle.kts
@@ -1,26 +1,34 @@
+@file:Suppress("UnstableApiUsage")
+
 /*
- * NeoRegex.
- *
- * Copyright (C) 2024 Irineu A. Silva.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+* NeoRegex.
+*
+* Copyright (C) 2024 Irineu A. Silva.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
 
 plugins {
     id("org.jetbrains.kotlin.multiplatform")
 }
 
 kotlin {
+
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+        vendor.set(JvmVendorSpec.JETBRAINS)
+    }
+
     js(name = "web", IR) {
 
         moduleName = "app"
diff --git a/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/Coroutines.kt b/core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/Coroutines.kt
@@ -0,0 +1,24 @@
+/*
+ * NeoRegex.
+ *
+ * Copyright (C) 2024 Irineu A. Silva.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.neoutils.neoregex.core.common.util
+
+import kotlinx.coroutines.CoroutineScope
+import org.jetbrains.skiko.MainUIDispatcher
+
+val mainUIScope get() = CoroutineScope(MainUIDispatcher)
diff --git a/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/util/NeoRegexWindowExceptionHandlerFactory.kt b/core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/util/NeoRegexWindowExceptionHandlerFactory.kt
@@ -22,10 +22,9 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.window.WindowExceptionHandler
 import androidx.compose.ui.window.WindowExceptionHandlerFactory
 import androidx.compose.ui.window.launchApplication
+import com.neoutils.neoregex.core.common.util.mainUIScope
 import com.neoutils.neoregex.core.sharedui.component.FatalErrorWindow
 import com.neoutils.neoregex.core.sharedui.theme.NeoErrorTheme
-import kotlinx.coroutines.CoroutineScope
-import org.jetbrains.skiko.MainUIDispatcher
 import java.awt.event.WindowEvent
 import javax.swing.SwingUtilities
 import java.awt.Window as AwtWindows
@@ -37,11 +36,9 @@ object NeoRegexWindowExceptionHandlerFactory : WindowExceptionHandlerFactory {
 
         SwingUtilities.invokeLater {
 
-            with(CoroutineScope(MainUIDispatcher)) {
-                launchApplication {
-                    NeoErrorTheme {
-                        FatalErrorWindow(throwable)
-                    }
+            mainUIScope.launchApplication {
+                NeoErrorTheme {
+                    FatalErrorWindow(throwable)
                 }
             }
 
diff --git a/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/MatcherScreen.kt b/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/MatcherScreen.kt
@@ -139,7 +139,7 @@ class MatcherScreen : Screen {
     private fun Footer(
         uiState: MatcherUiState,
         onAction: (MatcherAction) -> Unit,
-        syntax: Syntax.Regex = Syntax.Regex.Default,
+        syntax: Syntax.Regex = Syntax.Regex(),
         modifier: Modifier = Modifier
     ) = Surface(
         modifier = modifier,
diff --git a/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/model/Syntax.kt b/feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/model/Syntax.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,8 @@ import com.neoutils.neoregex.core.designsystem.theme.NeoTheme`
`25`	`25`	`import com.neoutils.neoregex.core.sharedui.di.WithKoin`
`26`	`26`
`27`	`27`	`@Composable`
`28`		`-fun AndroidApp() {`
`29`		`- WithKoin {`
`30`		`- NeoTheme {`
`31`		`- App(Modifier.safeDrawingPadding())`
`32`		`- }`
	`28`	`+fun AndroidApp() = WithKoin {`
	`29`	`+ NeoTheme {`
	`30`	`+ App(Modifier.safeDrawingPadding())`
`33`	`31`	`}`
`34`	`32`	`}`