Fix list property support for settings

Author: jbartok

lsp/src/main/kotlin/org/gradle/declarative/lsp/extension/AnalysisSchemaExtensions.kt

@@ -1,6 +1,12 @@
 package org.gradle.declarative.lsp.extension
 
-import org.gradle.declarative.dsl.schema.*
+import org.gradle.declarative.dsl.schema.AnalysisSchema
+import org.gradle.declarative.dsl.schema.DataClass
+import org.gradle.declarative.dsl.schema.DataTopLevelFunction
+import org.gradle.declarative.dsl.schema.DataType
+import org.gradle.declarative.dsl.schema.DataTypeRef
+import org.gradle.declarative.dsl.schema.EnumClass
+import org.gradle.declarative.dsl.schema.FqName
 import org.gradle.internal.declarativedsl.analysis.DefaultAnalysisSchema
 import org.gradle.internal.declarativedsl.analysis.DefaultDataClass
 import org.gradle.internal.declarativedsl.analysis.DefaultEnumClass
@@ -73,7 +79,7 @@ else {
                 enumTypes.first().javaTypeName,
                 enumTypes.flatMap { it.entryNames }.distinct()
             )
-        
+
         schemas.flatMap { it.dataClassTypesByFqName.values }.groupBy { it.name }
             .mapValues { (_, dataClasses) ->
                 when {
@@ -95,8 +101,20 @@ else {
 
     val newExternalFunctionsByFqName = run {
         val mergedResult = mutableMapOf<FqName, DataTopLevelFunction>()
-        schemas.forEach {
-            mergedResult.putAll(it.externalFunctionsByFqName)
+        schemas.forEach { schema ->
+            mergedResult.putAll(schema.externalFunctionsByFqName)
+        }
+        mergedResult
+    }
+
+    val genericInstantiationsByFqName = run {
+        val mergedResult = mutableMapOf<FqName, Map<List<DataType.ParameterizedTypeInstance.TypeArgument>, DataType.ClassDataType>>()
+        schemas.forEach { schema ->
+            schema.genericInstantiationsByFqName.forEach { instantiation ->
+                mergedResult.merge(instantiation.key, instantiation.value) { oldVal, newVal ->
+                    oldVal + newVal // TODO: is this correct?
+                }
+            }
         }
         mergedResult
     }
@@ -105,7 +123,7 @@ else {
         newTopLevelReceiver,
         dataClassesByFqName,
         emptyMap(),
-        emptyMap(),
+        genericInstantiationsByFqName,
         newExternalFunctionsByFqName,
         emptyMap(),
         emptySet()

lsp/src/test/kotlin/org/gradle/declarative/lsp/service/AbstractDeclarativeTextDocumentServiceTest.kt

@@ -93,7 +93,7 @@ abstract class AbstractDeclarativeTextDocumentServiceTest {
 
     @Suppress("LongMethod")
     private fun setupGradleBuild(dir: File): DeclarativeResourcesModel {
-        val androidEcosystemPluginVersion = "0.1.40"
+        val androidEcosystemPluginVersion = "0.1.41"
         settingsFile.writeText(
             """
             pluginManagement {
@@ -156,6 +156,7 @@ abstract class AbstractDeclarativeTextDocumentServiceTest {
                                 enabled = true
                             }
                         }
+                        debug {         }
                     }
                 }
             }

lsp/src/test/kotlin/org/gradle/declarative/lsp/service/DeclarativeTextDocumentServiceForSettingsScriptsTest.kt

@@ -73,6 +73,26 @@ class DeclarativeTextDocumentServiceForSettingsScriptsTest: AbstractDeclarativeT
         )
     }
 
-    // TODO: test for list properties
+    @Test
+    fun `code completion inside block with list properties`() {
+        openFile(script())
+
+        assertEquals(
+            "            debug {         }",
+            script().readLines()[60]
+        )
+
+        assertCompletion(
+            script(), 60, 21, """
+                |baselineProfile { this: BaselineProfile } --> baselineProfile {${'\n'}|${'\t'}${'$'}0${'\n'}|}
+                |defaultProguardFiles = listOf(vararg elements: ProguardFile) --> defaultProguardFiles = listOf(${'$'}1)${'$'}0
+                |dependencies { this: AndroidLibraryDependencies } --> dependencies {${'\n'}|${'\t'}${'$'}0${'\n'}|}
+                |minify { this: Minify } --> minify {${'\n'}|${'\t'}${'$'}0${'\n'}|}
+                |proguardFile(arg0: String) --> proguardFile("${'$'}{1}")${'$'}0
+                |proguardFiles = listOf(vararg elements: ProguardFile) --> proguardFiles = listOf(${'$'}1)${'$'}0
+            """.trimMargin()
+        )
+        // TODO: why is the name for the parameter in the "proguardFile(String)" function not "name" as in the source?
+    }
 
 }