Adopt new API

gradle · Sep 30, 2024 · 4421d12 · 4421d12
1 parent 6ee51fb
commit 4421d12
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/lsp/src/main/kotlin/org/gradle/declarative/lsp/extension/AnalysisSchemaExtensions.kt b/lsp/src/main/kotlin/org/gradle/declarative/lsp/extension/AnalysisSchemaExtensions.kt
@@ -2,6 +2,7 @@ package org.gradle.declarative.lsp.extension
 
 import org.gradle.declarative.dsl.schema.AnalysisSchema
 import org.gradle.declarative.dsl.schema.DataClass
+import org.gradle.declarative.dsl.schema.EnumClass
 
 /*
  * Copyright 2024 the original author or authors.
@@ -19,5 +20,14 @@ import org.gradle.declarative.dsl.schema.DataClass
  * limitations under the License.
  */
 
-fun AnalysisSchema.typeByFqn(name: String): DataClass =
-    dataClassesByFqName.entries.single { it.key.qualifiedName == name }.value
+fun AnalysisSchema.typeByFqn(name: String): DataClass {
+    val type = dataClassTypesByFqName
+        .entries
+        .single { it.key.qualifiedName == name }
+        .value
+
+    return when (type) {
+        is DataClass -> type
+        is EnumClass -> error("Expected a data class type, but got an enum class type")
+    }
+}
diff --git a/lsp/src/main/kotlin/org/gradle/declarative/lsp/mutation/definition/AddDependency.kt b/lsp/src/main/kotlin/org/gradle/declarative/lsp/mutation/definition/AddDependency.kt
@@ -49,7 +49,7 @@ class AddDependency: MutationDefinition {
 
     override fun isCompatibleWithSchema(projectAnalysisSchema: AnalysisSchema): Boolean =
         projectAnalysisSchema
-            .dataClassesByFqName
+            .dataClassTypesByFqName
             .keys
             .any { it.qualifiedName == "org.gradle.api.experimental.common.HasLibraryDependencies" }
 

diff --git a/lsp/src/main/kotlin/org/gradle/declarative/lsp/mutation/definition/SetJavaVersion.kt b/lsp/src/main/kotlin/org/gradle/declarative/lsp/mutation/definition/SetJavaVersion.kt
@@ -43,7 +43,7 @@ class SetJavaVersion : MutationDefinition {
 
     override fun isCompatibleWithSchema(projectAnalysisSchema: AnalysisSchema): Boolean =
         projectAnalysisSchema
-            .dataClassesByFqName
+            .dataClassTypesByFqName
             .keys
             .any {
                 it.qualifiedName == "org.gradle.api.experimental.jvm.HasJvmApplication"

diff --git a/lsp/src/main/kotlin/org/gradle/declarative/lsp/visitor/SemanticErrorToDiagnosticVisitor.kt b/lsp/src/main/kotlin/org/gradle/declarative/lsp/visitor/SemanticErrorToDiagnosticVisitor.kt
@@ -24,6 +24,7 @@ import org.gradle.internal.declarativedsl.dom.CrossScopeAccess
 import org.gradle.internal.declarativedsl.dom.DeclarativeDocument
 import org.gradle.internal.declarativedsl.dom.DocumentResolution
 import org.gradle.internal.declarativedsl.dom.IsError
+import org.gradle.internal.declarativedsl.dom.NonEnumValueNamedReference
 import org.gradle.internal.declarativedsl.dom.NotAssignable
 import org.gradle.internal.declarativedsl.dom.ResolutionFailureReason
 import org.gradle.internal.declarativedsl.dom.UnresolvedBase
@@ -63,6 +64,7 @@ class SemanticErrorToDiagnosticVisitor(private val documentOverlayResult: Docume
         NotAssignable -> "Not assignable"
         UnresolvedValueUsed -> "Unresolved value used"
         ValueTypeMismatch -> "Value type mismatch"
+        NonEnumValueNamedReference -> "Non-enum value named reference"
     }
 
 }