Support isRecursive

Enaium · Dec 9, 2024 · 2f51ad9 · 2f51ad9
1 parent 919d323
commit 2f51ad9
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/intellij/build.gradle.kts b/intellij/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "cn.enaium.jimmer"
-version = "1.0.0"
+version = "1.0.2"
 
 repositories {
     mavenCentral()

diff --git a/intellij/src/main/resources/META-INF/plugin.xml b/intellij/src/main/resources/META-INF/plugin.xml
@@ -6,6 +6,15 @@
         <![CDATA[<h1>A language server for Jimmer DTO</h1>
         <p>Provides support for Jimmer DTO in IntelliJ IDEA.</p>]]>
     </description>
+    <change-notes>
+        <![CDATA[<h1>Change notes</h1>
+        <p><b>1.0.2</b></p>
+        <ul><li>Support 'isRecursive'</li></ul>
+        <p><b>1.0.1</b></p>
+        <ul><li>Better to find classpath</li></ul>
+        <p><b>1.0.0</b></p>
+        <ul><li>First publish</li></ul>]]>
+    </change-notes>
     <depends>com.intellij.modules.platform</depends>
     <depends>com.redhat.devtools.lsp4ij</depends>
     <extensions defaultExtensionNs="com.intellij">

diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 val archiveName = "jimmer-dto-lsp"
 group = "cn.enaium.jimmer"
-version = "1.0.1"
+version = "1.0.2"
 
 repositories {
     mavenCentral()

diff --git a/server/src/main/kotlin/cn/enaium/jimmer/dto/lsp/compiler/ImmutableProp.kt b/server/src/main/kotlin/cn/enaium/jimmer/dto/lsp/compiler/ImmutableProp.kt
@@ -16,6 +16,7 @@
 
 package cn.enaium.jimmer.dto.lsp.compiler
 
+import cn.enaium.jimmer.dto.lsp.Main.logger
 import org.babyfish.jimmer.Formula
 import org.babyfish.jimmer.Immutable
 import org.babyfish.jimmer.dto.compiler.spi.BaseProp
@@ -28,6 +29,7 @@ import kotlin.reflect.KClass
  */
 class ImmutableProp(
     private val context: Context,
+    val declaringType: ImmutableType,
     val member: KCallable<*>
 ) : BaseProp {
     private val targetDeclaration = if (isList) {
@@ -106,7 +108,11 @@ class ImmutableProp(
     override val isNullable: Boolean =
         member.returnType.isMarkedNullable
 
-    override val isRecursive: Boolean = false
+    override val isRecursive: Boolean by lazy {
+        declaringType.isEntity && manyToManyViewBaseProp === null && targetDeclaration !== null && declaringType.klass.isAssignableFrom(
+            targetDeclaration
+        )
+    }
 
     override val isTransient: Boolean =
         member.annotations.any { it.annotationClass.qualifiedName == Transient::class.qualifiedName }

diff --git a/server/src/main/kotlin/cn/enaium/jimmer/dto/lsp/compiler/ImmutableType.kt b/server/src/main/kotlin/cn/enaium/jimmer/dto/lsp/compiler/ImmutableType.kt
@@ -48,11 +48,11 @@ class ImmutableType(
         get() = klass.kotlin.members
             .filter { it.annotations.any { it.annotationClass.qualifiedName == Id::class.qualifiedName } }
             .associateBy({ it.name }) {
-                ImmutableProp(context, it)
+                ImmutableProp(context, this, it)
             } + klass.kotlin.members
             .filter { it.annotations.any { it.annotationClass.qualifiedName != Id::class.qualifiedName } || it.annotations.isEmpty() }
             .associateBy({ it.name }) {
-                ImmutableProp(context, it)
+                ImmutableProp(context, this, it)
             }
 
     private val superPropMap: Map<String, ImmutableProp> = superTypes
@@ -67,7 +67,7 @@ class ImmutableType(
     private val redefinedProps = superPropMap.filterKeys {
         primarySuperType == null || !primarySuperType.properties.contains(it)
     }.mapValues {
-        ImmutableProp(context, it.value.member)
+        ImmutableProp(context, this, it.value.member)
     }
 
     val properties: Map<String, ImmutableProp> =

diff --git a/vscode/package.json b/vscode/package.json
@@ -3,7 +3,7 @@
   "displayName": "Jimmer DTO LSP",
   "publisher": "enaium",
   "author": "Enaium",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A language server for Jimmer DTO",
   "icon": "icons/logo.png",
   "main": "out/extensions",