Clean up code

JetBrains · Oct 5, 2023 · 496d6ed · 496d6ed
1 parent c1ba714
commit 496d6ed
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 41 deletions.
diff --git a/samples/ide-plugin/build.gradle.kts b/samples/ide-plugin/build.gradle.kts
@@ -31,3 +31,10 @@ dependencies {
         exclude(group = "org.jetbrains.kotlinx")
     }
 }
+
+tasks {
+    // We don't have any settings in the demo plugin
+    buildSearchableOptions {
+        enabled = false
+    }
+}
diff --git a/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ContentItem.kt b/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ContentItem.kt
@@ -44,42 +44,58 @@ enum class ReleaseChannel(
 
     Stable(
         background = JBColor(
-            /* regular = */ JBColor.namedColor("ColorPalette.Green10", 0xE6F7E9),
-            /* dark  = */ JBColor.namedColor("ColorPalette.Green3", 0x436946),
+            /* regular = */
+            JBColor.namedColor("ColorPalette.Green10", 0xE6F7E9),
+            /* dark  = */
+            JBColor.namedColor("ColorPalette.Green3", 0x436946),
         ),
         foreground = JBColor(
-            /* regular = */ JBColor.namedColor("ColorPalette.Green5", 0x369650),
-            /* dark  = */ JBColor.namedColor("ColorPalette.Green6", 0x5FAD65),
+            /* regular = */
+            JBColor.namedColor("ColorPalette.Green5", 0x369650),
+            /* dark  = */
+            JBColor.namedColor("ColorPalette.Green6", 0x5FAD65),
         ),
     ),
     Beta(
         background = JBColor(
-            /* regular = */ JBColor.namedColor("ColorPalette.Yellow10", 0xFCEBA4),
-            /* dark  = */ JBColor.namedColor("ColorPalette.Yellow3", 0x826A41),
+            /* regular = */
+            JBColor.namedColor("ColorPalette.Yellow10", 0xFCEBA4),
+            /* dark  = */
+            JBColor.namedColor("ColorPalette.Yellow3", 0x826A41),
         ),
         foreground = JBColor(
-            /* regular = */ JBColor.namedColor("ColorPalette.Yellow4", 0xFFAF0F),
-            /* dark  = */ JBColor.namedColor("ColorPalette.Yellow6", 0xD6AE58),
+            /* regular = */
+            JBColor.namedColor("ColorPalette.Yellow4", 0xFFAF0F),
+            /* dark  = */
+            JBColor.namedColor("ColorPalette.Yellow6", 0xD6AE58),
         ),
     ),
     Canary(
         background = JBColor(
-            /* regular = */ JBColor.namedColor("ColorPalette.Orange8", 0xEC8F4C),
-            /* dark  = */ JBColor.namedColor("ColorPalette.Orange3", 0x825845),
+            /* regular = */
+            JBColor.namedColor("ColorPalette.Orange8", 0xEC8F4C),
+            /* dark  = */
+            JBColor.namedColor("ColorPalette.Orange3", 0x825845),
         ),
         foreground = JBColor(
-            /* regular = */ JBColor.namedColor("ColorPalette.Orange5", 0xEC8F4C),
-            /* dark  = */ JBColor.namedColor("ColorPalette.Orange6", 0xE08855),
+            /* regular = */
+            JBColor.namedColor("ColorPalette.Orange5", 0xEC8F4C),
+            /* dark  = */
+            JBColor.namedColor("ColorPalette.Orange6", 0xE08855),
         ),
     ),
     Other(
         background = JBColor(
-            /* regular = */ JBColor.namedColor("ColorPalette.Grey12", 0xEBECF0),
-            /* dark  = */ JBColor.namedColor("ColorPalette.Grey5", 0x4E5157),
+            /* regular = */
+            JBColor.namedColor("ColorPalette.Grey12", 0xEBECF0),
+            /* dark  = */
+            JBColor.namedColor("ColorPalette.Grey5", 0x4E5157),
         ),
         foreground = JBColor(
-            /* regular = */ JBColor.namedColor("ColorPalette.Grey6", 0x6C707E),
-            /* dark  = */ JBColor.namedColor("ColorPalette.Grey10", 0xB4B8BF),
+            /* regular = */
+            JBColor.namedColor("ColorPalette.Grey6", 0x6C707E),
+            /* dark  = */
+            JBColor.namedColor("ColorPalette.Grey10", 0xB4B8BF),
         ),
-    )
+    ),
 }
diff --git a/...lugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/JewelDemoToolWindowFactory.kt b/...lugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/JewelDemoToolWindowFactory.kt
@@ -25,23 +25,23 @@ internal class JewelDemoToolWindowFactory : ToolWindowFactory, DumbAware {
         addSwingTab(toolWindow)
 
         toolWindow.addComposeTab("Compose Sample") {
-
         }
     }
 
     private fun addSwingTab(toolWindow: ToolWindow) {
         val manager = toolWindow.contentManager
         val tabContent =
             manager.factory.createContent(
-                /* component = */ SwingDemoPanel(toolWindow.disposable.createCoroutineScope()),
-                /* displayName = */ "Swing Sample",
-                /* isLockable = */ true
+                SwingDemoPanel(toolWindow.disposable.createCoroutineScope()),
+                "Swing Sample",
+                true,
             )
         tabContent.isCloseable = false
         manager.addContent(tabContent)
     }
 }
 
+@Suppress("InjectDispatcher") // This is likely wrong anyway, it's only for the demo
 private fun Disposable.createCoroutineScope(): CoroutineScope {
     val job = SupervisorJob()
     val scopeDisposable = Disposable { job.cancel("Disposing") }

diff --git a/...n/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/swingsample/ApiLevelIndication.kt b/...n/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/swingsample/ApiLevelIndication.kt
@@ -32,7 +32,7 @@ internal class ApiLevelIndication(apiLevel: Int) : JLabel("API level $apiLevel")
                 height - y,
                 JBUIScale.scale(8),
                 ReleaseChannel.Other.background,
-                null
+                null,
             )
 
             graphicsConfig.restore()

diff --git a/...-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/swingsample/DetailsPanel.kt b/...-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/swingsample/DetailsPanel.kt
@@ -71,7 +71,7 @@ private class ItemDetailsPanel(
             JBScrollPane(
                 mainContentPanel,
                 ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
+                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER,
             )
 
         addToCenter(scrollingContainer)
@@ -84,7 +84,9 @@ private class ItemDetailsPanel(
                     val releaseDate = contentItem.releaseDate
                     if (releaseDate != null) {
                         it.comment("Released on ${formatter.format(releaseDate.toJavaLocalDate())}")
-                    } else it
+                    } else {
+                        it
+                    }
                 }
                 .component.font = JBFont.h1()
         }.bottomGap(BottomGap.MEDIUM)

diff --git a/...lugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/swingsample/ImageComponent.kt b/...lugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/swingsample/ImageComponent.kt
@@ -60,11 +60,12 @@ internal class ImageComponent(
         registerUiInspectorInfoProvider {
             mapOf(
                 "image" to image,
-                "imageSize" to image?.let { Dimension(ImageUtil.getUserWidth(it), ImageUtil.getUserHeight(it)) }
+                "imageSize" to image?.let { Dimension(ImageUtil.getUserWidth(it), ImageUtil.getUserHeight(it)) },
             )
         }
     }
 
+    @Suppress("InjectDispatcher") // It's ok in a silly sample
     private fun updateScaledImage() {
         resizeJob?.cancel("New image")
 
@@ -113,10 +114,14 @@ internal class ImageComponent(
             val componentHeight = height
 
             drawImage(
-                /* img = */ currentImage,
-                /* x = */ componentWidth / 2 - (imageWidth) / 2,
-                /* y = */ componentHeight / 2 - (imageHeight) / 2,
-                /* observer = */ null
+                /* img = */
+                currentImage,
+                /* x = */
+                componentWidth / 2 - (imageWidth) / 2,
+                /* y = */
+                componentHeight / 2 - (imageHeight) / 2,
+                /* observer = */
+                null,
             )
 
             graphicsConfig.restore()

diff --git a/...lugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/swingsample/SwingDemoPanel.kt b/...lugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/swingsample/SwingDemoPanel.kt
@@ -71,7 +71,7 @@ class SwingDemoPanel(scope: CoroutineScope) : BorderLayoutPanel() {
             }
 
             override fun getActionUpdateThread() = ActionUpdateThread.BGT
-        }
+        },
     )
 
     private val overflowAction = MoreActionGroup()
@@ -82,7 +82,7 @@ class SwingDemoPanel(scope: CoroutineScope) : BorderLayoutPanel() {
             overflowAction,
             overflowAction.templatePresentation.clone(),
             "JewelSwingDemoTopBar",
-            ActionToolbar.DEFAULT_MINIMUM_BUTTON_SIZE
+            ActionToolbar.DEFAULT_MINIMUM_BUTTON_SIZE,
         )
 
     private val topBar = BorderLayoutPanel().apply {
@@ -124,17 +124,21 @@ class SwingDemoPanel(scope: CoroutineScope) : BorderLayoutPanel() {
                 addToCenter(JBLabel(it.displayText))
 
                 if (it is ContentItem.AndroidStudio) {
-                    addToRight(JPanel().apply {
-                        layout = BoxLayout(this, BoxLayout.LINE_AXIS)
-                        isOpaque = false
-                        add(ChannelIndication(it.channel))
-                    })
+                    addToRight(
+                        JPanel().apply {
+                            layout = BoxLayout(this, BoxLayout.LINE_AXIS)
+                            isOpaque = false
+                            add(ChannelIndication(it.channel))
+                        },
+                    )
                 } else if (it is ContentItem.AndroidRelease) {
-                    addToRight(JPanel().apply {
-                        layout = BoxLayout(this, BoxLayout.LINE_AXIS)
-                        isOpaque = false
-                        add(ApiLevelIndication(it.apiLevel))
-                    })
+                    addToRight(
+                        JPanel().apply {
+                            layout = BoxLayout(this, BoxLayout.LINE_AXIS)
+                            isOpaque = false
+                            add(ApiLevelIndication(it.apiLevel))
+                        },
+                    )
                 }
             }
         }