2 files changed, 54 insertions, 1 deletions
diff --git a/plugins/base/src/test/kotlin/model/PropertyTest.kt b/plugins/base/src/test/kotlin/model/PropertyTest.kt
index 14f7b402..ac055c69 100644
--- a/plugins/base/src/test/kotlin/model/PropertyTest.kt
+++ b/plugins/base/src/test/kotlin/model/PropertyTest.kt
@@ -188,6 +188,59 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
             }
         }
     }
+
+    @Test fun genericTopLevelExtensionProperty(){
+        inlineModelTest(
+            """ | val <T : Number> List<T>.sampleProperty: T
+                |   get() { TODO() }
+            """.trimIndent()
+        ){
+            with((this / "property" / "sampleProperty").cast<DProperty>()) {
+                name equals "sampleProperty"
+                with(receiver.assertNotNull("Property receiver")) {
+                    type.name equals "List"
+                }
+                with(getter.assertNotNull("Getter")) {
+                    type.name equals "T"
+                }
+                setter equals null
+                generics counts 1
+                generics.forEach {
+                    it.name equals "T"
+                    it.bounds.first().name equals "Number"
+                }
+                visibility.values allEquals KotlinVisibility.Public
+            }
+        }
+    }
+
+    @Test fun genericExtensionPropertyInClass(){
+        inlineModelTest(
+            """ | package test
+                | class XD<T> {
+                |   var List<T>.sampleProperty: T
+                |       get() { TODO() }
+                |       set(value) { TODO() }
+                | }
+            """.trimIndent()
+        ){
+            with((this / "property" / "XD" / "sampleProperty").cast<DProperty>()) {
+                name equals "sampleProperty"
+                children counts 0
+                with(receiver.assertNotNull("Property receiver")) {
+                    type.name equals "List"
+                }
+                with(getter.assertNotNull("Getter")) {
+                    type.name equals "T"
+                }
+                with(setter.assertNotNull("Setter")){
+                    type.name equals "Unit"
+                }
+                generics counts 0
+                visibility.values allEquals KotlinVisibility.Public
+            }
+        }
+    }
 //    @Test
 //    fun annotatedProperty() {
 //        checkSourceExistsAndVerifyModel(
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html
index 1a32310b..de6b4b3b 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html
@@ -67,7 +67,7 @@
               <tr class="platform-tagged">
                 <td class="content"><a href="">size</a></td>
                 <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace"><a href="">Int</a></div></div></div>
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final val <a href="">size</a>: <a href="">Int</a></div></div></div>
                   <div class="brief "> </div>
                 </td>
                 <td class="platform-tagged">