chore: release 6.9.3

Author: mdddj

CHANGELOG.md

@@ -3,6 +3,16 @@
 ## Unreleased
 
 
+## 6.9.3 - 2026-03-24
+
+### 🐛 Bug Fixes
+- Fixed a Compose/Jewel layout crash when opening the Dart VM Service tool window on newer Android Studio builds.
+- Replaced the VM tool window's tab strip implementation to avoid `ScrollableContainer` constraint exceptions during focus and measure.
+- Stabilized several Dart VM panes so split layouts and scrollable content receive consistent full-size constraints.
+
+### 🔧 Compatibility
+- Updated bundled IDE plugin dependencies to `Dart 503.0.0` and `io.flutter 90.0.0`.
+
 ## 6.9.2 - 2026-02-11
 
 ### ✨ Network Inspector Enhancements

build.gradle.kts

@@ -74,7 +74,7 @@ dependencies {
         intellijIdeaCommunity("2025.2.1")
         bundledPlugins(bPlugins)
         //"io.flutter:88.2.0"
-        plugins("Dart:$dartVersion","io.flutter:88.2.0")
+        plugins("Dart:$dartVersion","io.flutter:90.0.0")
         pluginVerifier()
         zipSigner()
         javaCompiler()

gradle.properties

@@ -1,6 +1,6 @@
 kotlin.stdlib.default.dependency=false
-pluginVersion=6.9.2
-dartVersion=500.0.0
+pluginVersion=6.9.3
+dartVersion=503.0.0
 sinceBuildVersion=252
 kotlin.daemon.jvmargs=-Xmx5024m
-org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8

src/main/kotlin/shop/itbug/flutterx/widget/CustomTabCompose.kt

@@ -1,15 +1,24 @@
 package shop.itbug.flutterx.widget
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import org.jetbrains.jewel.foundation.ExperimentalJewelApi
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.foundation.theme.JewelTheme
-import org.jetbrains.jewel.ui.component.SimpleTabContent
-import org.jetbrains.jewel.ui.component.TabData
-import org.jetbrains.jewel.ui.component.TabStrip
+import org.jetbrains.jewel.ui.component.Text
 import org.jetbrains.jewel.ui.component.styling.TabStyle
 import org.jetbrains.jewel.ui.theme.editorTabStyle
+import org.jetbrains.jewel.ui.theme.simpleListItemStyle
 
 /**
  * 自定义的 TabRow 容器。
@@ -19,27 +28,39 @@ import org.jetbrains.jewel.ui.theme.editorTabStyle
  * @param modifier 应用于整个组件的 Modifier。
  * @param onTabClick 当一个 Tab 被点击时的回调，返回被点击的 Tab 索引。
  */
-@OptIn(ExperimentalJewelApi::class)
 @Composable
+@Suppress("UNUSED_PARAMETER")
 fun CustomTabRow(
     selectedTabIndex: Int,
     tabs: List<String>,
     modifier: Modifier = Modifier,
     onTabClick: (Int) -> Unit,
     style: TabStyle = JewelTheme.editorTabStyle
 ) {
-    val tabs = remember(selectedTabIndex,tabs) {
-        tabs.mapIndexed { index, string ->
-            TabData.Default(
-                selected = index == selectedTabIndex,
-                content = { SimpleTabContent(string,it) },
-                closable = false,
-                onClick = { onTabClick(index) }
+    Row(
+        modifier = modifier
+            .horizontalScroll(rememberScrollState())
+            .padding(horizontal = 6.dp, vertical = 4.dp),
+        horizontalArrangement = Arrangement.spacedBy(6.dp)
+    ) {
+        tabs.forEachIndexed { index, title ->
+            val selected = index == selectedTabIndex
+            val backgroundColor =
+                if (selected) JewelTheme.simpleListItemStyle.colors.backgroundSelectedActive else Color.Transparent
+            val textColor =
+                if (selected) JewelTheme.globalColors.text.normal else JewelTheme.globalColors.text.info
+
+            Text(
+                text = title,
+                color = textColor,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier =
+                    Modifier.clip(RoundedCornerShape(6.dp))
+                        .background(backgroundColor)
+                        .clickable { onTabClick(index) }
+                        .padding(horizontal = 12.dp, vertical = 6.dp)
             )
         }
     }
-    TabStrip(
-        tabs, style = style,
-        modifier = modifier,
-    )
 }

src/main/kotlin/shop/itbug/flutterx/window/vm/DartVmHttpComposeComponent.kt

@@ -83,7 +83,7 @@ private fun AppContentPanel(app: FlutterAppInstance, project: Project) {
 
     HorizontalSplitLayout(
         state = outerSplitState,
-        modifier = Modifier.fillMaxWidth().border(1.dp, color = JewelTheme.globalColors.borders.normal),
+        modifier = Modifier.fillMaxSize().border(1.dp, color = JewelTheme.globalColors.borders.normal),
         first = {
             RequestListPanel(
                 vmService = vmService,
@@ -316,11 +316,16 @@ private fun RequestDetailPanel(
 
 
     Column(modifier = Modifier.fillMaxSize()) {
-        CustomTabRow(selectedTabIndex, tabs = tabs.map { it }, onTabClick = {
-            selectedTabIndex = it
-        })
+        CustomTabRow(
+            selectedTabIndex,
+            tabs = tabs,
+            onTabClick = {
+                selectedTabIndex = it
+            },
+            modifier = Modifier.fillMaxWidth().background(JewelTheme.globalColors.panelBackground)
+        )
         Divider(Orientation.Horizontal, Modifier.fillMaxWidth())
-        Box(modifier = Modifier.weight(1f).padding(8.dp)) {
+        Box(modifier = Modifier.weight(1f).fillMaxWidth().padding(8.dp)) {
             when (selectedTabIndex) {
                 0 -> OverviewTab(detailedRequest, project)
                 1 -> HeadersTab(detailedRequest.requestHeaders, detailedRequest.responseHeaders)
@@ -347,7 +352,7 @@ private fun OverviewTab(request: NetworkRequest, project: Project) {
     val powerShellText = request.toPowerShellString()
     Column(
         verticalArrangement = Arrangement.spacedBy(6.dp),
-        modifier = Modifier.verticalScroll(rememberScrollState())
+        modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
     ) {
         SelectionContainer {
             Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
@@ -841,4 +846,4 @@ private fun String.toHttpUrlOrNull(): SimpleHttpUrl? {
     } catch (_: Exception) {
         null
     }
-}
+}

src/main/kotlin/shop/itbug/flutterx/window/vm/DartVmStatusComponent.kt

@@ -52,10 +52,10 @@ private fun FlutterAppStatusPanel(project: Project, app: FlutterAppInstance) {
 
     if (vm != null) {
         HorizontalSplitLayout(
-            modifier = Modifier.fillMaxWidth().border(1.dp, color = JewelTheme.globalColors.borders.normal),
+            modifier = Modifier.fillMaxSize().border(1.dp, color = JewelTheme.globalColors.borders.normal),
             first = {
                 Column(
-                    modifier = Modifier.padding(12.dp).verticalScroll(rememberScrollState()),
+                    modifier = Modifier.fillMaxSize().padding(12.dp).verticalScroll(rememberScrollState()),
                     verticalArrangement = Arrangement.spacedBy(6.dp)
                 ) {
                     VmInfoDisplay(vm!!)
@@ -90,7 +90,7 @@ private fun VmMemoryDisplay(app: FlutterAppInstance, vm: VM, vmService: VmServic
     }
 
     Column(
-        modifier = Modifier.padding(12.dp).verticalScroll(rememberScrollState()),
+        modifier = Modifier.fillMaxSize().padding(12.dp).verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.spacedBy(6.dp)
     ) {
         Row(horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically) {
@@ -262,4 +262,4 @@ private fun InspectorStateComponent(vmService: VmService, project: Project) {
     ) {
         Text("Inspector: ${if(isSelect) "On" else "Off"}")
     }
-}
+}

src/main/kotlin/shop/itbug/flutterx/window/vm/FlutterAppsTab.kt

@@ -99,14 +99,20 @@ If you are running on a real device, please make sure the device is connected to
         }
     } else {
         Column(modifier = Modifier.fillMaxSize()) {
-            CustomTabRow(tabIndex, tabs = flutterAppList.map { it.appInfo.deviceId }.toList(), onTabClick = {
-                tabIndex = it
-            })
+            CustomTabRow(
+                tabIndex,
+                tabs = flutterAppList.map { it.appInfo.deviceId },
+                onTabClick = {
+                    tabIndex = it
+                },
+                modifier = Modifier.fillMaxWidth().background(JewelTheme.globalColors.panelBackground)
+            )
             val selectApp = flutterAppList.getOrNull(tabIndex)
             if (selectApp != null) {
-                body.invoke(selectApp)
+                Box(modifier = Modifier.weight(1f).fillMaxWidth()) {
+                    body.invoke(selectApp)
+                }
             }
         }
     }
 }
-

src/main/kotlin/shop/itbug/flutterx/window/vm/ProviderComposeComponent.kt

@@ -95,7 +95,7 @@ private fun ProviderList(state: ProviderState) {
     val bgColor = if (JewelTheme.isDark) Color.DarkGray else Color.White
 
     Column(
-        modifier = Modifier.padding(12.dp).verticalScroll(rememberScrollState()),
+        modifier = Modifier.fillMaxSize().padding(12.dp).verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.spacedBy(6.dp)
     ) {
         Row(horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically) {
@@ -138,7 +138,7 @@ private fun ProviderList(state: ProviderState) {
 private fun ProviderDetails(vmService: VmService, provider: ProviderNode) {
     println("provider详情:$provider")
     val rootPath = remember(provider, provider.id) { provider.getProviderPath() }
-    Column(modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(8.dp)) {
+    Column(modifier = Modifier.fillMaxSize().padding(8.dp).verticalScroll(rememberScrollState())) {
         InstanceNodeViewer(vmService = vmService, path = rootPath)
     }
 }