Merge pull request #388 from FWDekker/uds

Basic unified data syntax implementation

Author: fwdekker

.config/detekt/.detekt.yml

@@ -57,6 +57,9 @@ style:
     # Such comments are OK.
     ForbiddenComment:
         active: false
+    # One more is fine in my opinion.
+    LoopWithTooManyJumpStatements:
+        maxJumpCount: 2
     # No braces are easier to read.
     MandatoryBracesIfStatements:
         active: false

gradle.properties

@@ -1,5 +1,5 @@
 group   = com.fwdekker
-version = 2.7.3-dev
+version = 3.0.0-dev
 
 # Compatibility
 # * If latest is 20xx.y, then support at least [20xx-1].[y+1].

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip

src/main/kotlin/com/fwdekker/randomness/DataActions.kt

@@ -262,7 +262,7 @@ abstract class DataInsertAction(private val icon: Icon) : AnAction() {
         } catch (e: TimeoutException) {
             throw DataGenerationException("Timed out while generating data.", e)
         } catch (e: ExecutionException) {
-            throw DataGenerationException(e.message, e)
+            throw DataGenerationException(e.cause?.message ?: e.message, e)
         } finally {
             executor.shutdown()
         }

src/main/kotlin/com/fwdekker/randomness/PopupAction.kt

@@ -7,6 +7,8 @@ import com.fwdekker.randomness.integer.IntegerGroupAction
 import com.fwdekker.randomness.integer.IntegerSettingsAction
 import com.fwdekker.randomness.string.StringGroupAction
 import com.fwdekker.randomness.string.StringSettingsAction
+import com.fwdekker.randomness.uds.UDSGroupAction
+import com.fwdekker.randomness.uds.UDSSettingsAction
 import com.fwdekker.randomness.ui.registerModifierActions
 import com.fwdekker.randomness.uuid.UuidGroupAction
 import com.fwdekker.randomness.uuid.UuidSettingsAction
@@ -115,6 +117,7 @@ class PopupAction : AnAction() {
                 StringGroupAction(),
                 WordGroupAction(),
                 UuidGroupAction(),
+                UDSGroupAction(),
                 Separator(),
                 ArraySettingsAction()
             )
@@ -136,6 +139,7 @@ class PopupAction : AnAction() {
                 StringSettingsAction(),
                 WordSettingsAction(),
                 UuidSettingsAction(),
+                UDSSettingsAction(),
                 Separator(),
                 ArraySettingsAction()
             )

src/main/kotlin/com/fwdekker/randomness/uds/UDSActions.kt

@@ -0,0 +1,113 @@
+package com.fwdekker.randomness.uds
+
+import com.fwdekker.randomness.DataGenerationException
+import com.fwdekker.randomness.DataGroupAction
+import com.fwdekker.randomness.DataInsertAction
+import com.fwdekker.randomness.DataInsertArrayAction
+import com.fwdekker.randomness.DataInsertRepeatAction
+import com.fwdekker.randomness.DataInsertRepeatArrayAction
+import com.fwdekker.randomness.DataQuickSwitchSchemeAction
+import com.fwdekker.randomness.DataSettingsAction
+import com.fwdekker.randomness.array.ArrayScheme
+import com.fwdekker.randomness.array.ArraySettings
+import com.fwdekker.randomness.array.ArraySettingsAction
+import icons.RandomnessIcons
+
+
+/**
+ * All actions related to inserting UDS-based strings.
+ */
+class UDSGroupAction : DataGroupAction(RandomnessIcons.Data.Base) {
+    override val insertAction = UDSInsertAction()
+    override val insertArrayAction = UDSInsertAction.ArrayAction()
+    override val insertRepeatAction = UDSInsertAction.RepeatAction()
+    override val insertRepeatArrayAction = UDSInsertAction.RepeatArrayAction()
+    override val settingsAction = UDSSettingsAction()
+    override val quickSwitchSchemeAction = UDSSettingsAction.UDSQuickSwitchSchemeAction()
+    override val quickSwitchArraySchemeAction = ArraySettingsAction.ArrayQuickSwitchSchemeAction()
+}
+
+
+/**
+ * Inserts random arbitrary strings based on the UDS descriptor.
+ *
+ * @param scheme the scheme to use for generating UDS-based strings
+ */
+class UDSInsertAction(private val scheme: UDSScheme = UDSSettings.default.currentScheme) :
+    DataInsertAction(RandomnessIcons.Data.Base) {
+    override val name = "Random Decimal"
+
+
+    /**
+     * Returns random UDS-based strings based on the descriptor.
+     *
+     * @param count the number of strings to generate
+     * @return random UDS-based strings based on the descriptor
+     */
+    override fun generateStrings(count: Int) =
+        try {
+            UDSParser.parse(scheme.descriptor).also { it.random = this.random }.generateStrings(count)
+        } catch (e: UDSParseException) {
+            throw DataGenerationException(e.message, e)
+        }
+
+    /**
+     * Inserts an array-like string of UDS-based strings.
+     *
+     * @param arrayScheme the scheme to use for generating arrays
+     * @param scheme the scheme to use for generating strings
+     */
+    class ArrayAction(
+        arrayScheme: ArrayScheme = ArraySettings.default.currentScheme,
+        scheme: UDSScheme = UDSSettings.default.currentScheme
+    ) : DataInsertArrayAction(arrayScheme, UDSInsertAction(scheme), RandomnessIcons.Data.Array) {
+        override val name = "Random UDS Array"
+    }
+
+    /**
+     * Inserts repeated random UDS-based strings.
+     *
+     * @param scheme the settings to use for generating strings
+     */
+    class RepeatAction(scheme: UDSScheme = UDSSettings.default.currentScheme) :
+        DataInsertRepeatAction(UDSInsertAction(scheme), RandomnessIcons.Data.Repeat) {
+        override val name = "Random Repeated UDS"
+    }
+
+    /**
+     * Inserts repeated array-like strings of UDS-based strings.
+     *
+     * @param arrayScheme the scheme to use for generating arrays
+     * @param scheme the scheme to use for generating strings
+     */
+    class RepeatArrayAction(
+        arrayScheme: ArrayScheme = ArraySettings.default.currentScheme,
+        scheme: UDSScheme = UDSSettings.default.currentScheme
+    ) : DataInsertRepeatArrayAction(ArrayAction(arrayScheme, scheme), RandomnessIcons.Data.RepeatArray) {
+        override val name = "Random Repeated UDS Array"
+    }
+}
+
+
+/**
+ * Controller for random string generation settings.
+ *
+ * @see UDSSettings
+ * @see UDSSettingsComponent
+ */
+class UDSSettingsAction : DataSettingsAction(RandomnessIcons.Data.Settings) {
+    override val name = "UDS Settings"
+
+    override val configurableClass = UDSSettingsConfigurable::class.java
+
+
+    /**
+     * Opens a popup to allow the user to quickly switch to the selected scheme.
+     *
+     * @param settings the settings containing the schemes that can be switched between
+     */
+    class UDSQuickSwitchSchemeAction(settings: UDSSettings = UDSSettings.default) :
+        DataQuickSwitchSchemeAction<UDSScheme>(settings, RandomnessIcons.Data.QuickSwitchScheme) {
+        override val name = "Quick Switch UDS Scheme"
+    }
+}