Merge pull request #100 from KotlinIsland/fix-constructors

intellij: Fix constructors returning `None`

Author: KotlinIsland

intellij/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ## [Unreleased]
 
+### Fixed
+- Constructors incorrectly returning `None`
 
 ## [0.1.0] - 2023-12-20
 

intellij/gradle.properties

@@ -4,15 +4,15 @@ pluginGroup = org.basedsoft.plugins.basedtyping
 pluginName = basedtyping
 pluginRepositoryUrl = https://github.com/KotlinIsland/basedtyping
 # SemVer format -> https://semver.org
-pluginVersion = 0.1.0
+pluginVersion = 0.1.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 233
 pluginUntilBuild = 233.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = IC
-platformVersion = 2023.3.1
+platformVersion = 2023.3.2
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

intellij/src/main/kotlin/org/basedsoft/plugins/basedtyping/BasedTypingTypeProvider.kt

@@ -33,7 +33,7 @@ private class BasedTypingTypeProvider : PyTypeProviderBase() {
 
     override fun getCallType(function: PyFunction, callSite: PyCallSiteExpression, context: TypeEvalContext): Ref<PyType>? {
         val annotation = function.annotation?.value ?: return null
-        return Ref.create(getType(annotation, context))
+        return Ref.create(getType(annotation, context, simple = true))
     }
 
     /**
@@ -63,11 +63,11 @@ class BasedPyFunctionTypeImpl(val callable: PyFunction) : PyFunctionTypeImpl(cal
     }
 }
 
-fun getType(expression: PyExpression, context: TypeEvalContext): PyType? {
+fun getType(expression: PyExpression, context: TypeEvalContext, simple: Boolean = false): PyType? {
     return getLiteralType(expression, context)
             ?: getUnionType(expression, context)
             ?: getTupleType(expression, context)
-            ?: Ref.deref(PyTypingTypeProvider.getType(expression, context))
+            ?: if (simple) null else PyTypingTypeProvider.getType(expression, context)?.get()
 }
 
 fun getLiteralType(target: PyExpression, context: TypeEvalContext): PyType? {