Fight off detekt

gradle · Jun 6, 2024 · 1c93720 · 1c93720
1 parent d151435
commit 1c93720
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/gradle-client/src/jvmMain/kotlin/org/gradle/client/core/gradle/dcl/AnalysisUtils.kt b/gradle-client/src/jvmMain/kotlin/org/gradle/client/core/gradle/dcl/AnalysisUtils.kt
@@ -28,4 +28,4 @@ fun DeclarativeDocument.DocumentNode.ElementNode.type(resolutionContainer: Docum
         is ElementNotResolved -> null
         is ConfiguringElementResolved -> resolution.elementType
         is ContainerElementResolved -> resolution.elementType
-    }
+    }
diff --git a/...client/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/DeclarativeDomHelpers.kt b/...client/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/DeclarativeDomHelpers.kt
@@ -13,4 +13,4 @@ fun ElementNode.childElementNode(
     content.filterIsInstance<ElementNode>().singleOrNull() { it.name == name }
 
 fun ElementNode.property(name: String): PropertyNode? =
-    content.filterIsInstance<PropertyNode>().singleOrNull { it.name == name }
+    content.filterIsInstance<PropertyNode>().singleOrNull { it.name == name }
diff --git a/...ient/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/GetDeclarativeDocuments.kt b/...ient/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/GetDeclarativeDocuments.kt
@@ -39,7 +39,6 @@ import org.gradle.internal.declarativedsl.dom.operations.overlay.OverlayNodeOrig
 import org.gradle.internal.declarativedsl.dom.operations.overlay.OverlayOriginContainer
 import org.gradle.internal.declarativedsl.dom.resolution.DocumentResolutionContainer
 import org.gradle.internal.declarativedsl.evaluator.main.AnalysisDocumentUtils
-import org.gradle.internal.declarativedsl.evaluator.main.AnalysisSequenceResult
 import org.gradle.internal.declarativedsl.evaluator.runner.stepResultOrPartialResult
 import org.gradle.tooling.BuildAction
 import org.jetbrains.skiko.Cursor
@@ -122,12 +121,14 @@ class GetDeclarativeDocuments : GetModelAction.GetCompositeModelAction<ResolvedD
                 }
             },
             right = {
+                val sources = listOfNotNull(
+                    SourceFileViewInput(projectResult.sourceIdentifier().fileIdentifier, buildFileContent),
+                    SourceFileViewInput(settingsResult.sourceIdentifier().fileIdentifier, settingsFileContent)
+                        .takeIf { hasAnyConventionContent },
+                )
+
                 SourcesColumn(
-                    projectResult,
-                    buildFileContent,
-                    settingsResult,
-                    settingsFileContent,
-                    hasAnyConventionContent,
+                    sources,
                     highlightedSourceRangeByFileId
                 )
             },
@@ -136,32 +137,21 @@ class GetDeclarativeDocuments : GetModelAction.GetCompositeModelAction<ResolvedD
 
     @Composable
     private fun SourcesColumn(
-        projectResult: AnalysisSequenceResult,
-        projectFileContent: String,
-        settingsResult: AnalysisSequenceResult,
-        settingsFileContent: String,
-        hasAnyConventionUsage: Boolean,
+        sources: List<SourceFileViewInput>,
         highlightedSourceRangeByFileId: MutableState<Map<String, IntRange>>
     ) {
 
         Column {
-            val sources = listOfNotNull(
-                projectResult.sourceIdentifier().fileIdentifier to projectFileContent,
-                (settingsResult.sourceIdentifier().fileIdentifier to settingsFileContent).takeIf { hasAnyConventionUsage },
-            ).toMap()
-
             val sourceFileData by derivedStateOf {
-                sources.mapValues { (identifier, content) ->
+                sources.map { (identifier, content) ->
                     val highlightedRangeOrNull = highlightedSourceRangeByFileId.value[identifier]
                     SourceFileData(identifier, sourceFileAnnotatedString(highlightedRangeOrNull, content))
                 }
             }
 
-            val sourceFilesData = sourceFileData.values.toList()
-
-            sourceFilesData.forEachIndexed { index, data ->
+            sourceFileData.forEachIndexed { index, data ->
                 SourceFileTitleAndText(data.relativePath, data.annotatedSource)
-                if (index != sourceFilesData.lastIndex) {
+                if (index != sourceFileData.lastIndex) {
                     Spacer(modifier = Modifier.height(16.dp))
                 }
             }
@@ -335,7 +325,6 @@ class GetDeclarativeDocuments : GetModelAction.GetCompositeModelAction<ResolvedD
                 .pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)))
                 .withClickTextRangeSelection(propertyNode, highlightingContext),
             text = "${property.name}: ${property.kotlinType.simpleName} = ${
-                // TODO: display non-literal values with a proper structure:
                 propertyNode?.value?.sourceData?.text() ?: NOTHING_DECLARED
             }"
         )
@@ -386,6 +375,11 @@ private data class HighlightingContext(
     val highlightedSourceRange: MutableState<Map<String, IntRange>>
 )
 
+private data class SourceFileViewInput(
+    val fileIdentifier: String,
+    val fileContent: String
+)
+
 private fun Modifier.withHoverCursor() =
     pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)))