-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from strawberry-graphql/Reduce_unnecessary_res…
…olve_in_type_providers Reduce unnecessary resolve in type providers
- Loading branch information
Showing
3 changed files
with
20 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,15 @@ | ||
| package rocks.strawberry | ||
|
|
||
| import com.intellij.psi.PsiElement | ||
| import com.intellij.psi.ResolveResult | ||
| import com.intellij.psi.util.QualifiedName | ||
| import com.jetbrains.python.psi.PyClass | ||
| import com.jetbrains.python.psi.PyDecoratable | ||
| import com.jetbrains.python.psi.PyReferenceExpression | ||
| import com.jetbrains.python.psi.PyUtil | ||
| import com.jetbrains.python.psi.resolve.PyResolveContext | ||
| import com.jetbrains.python.psi.resolve.PyResolveUtil | ||
| import com.jetbrains.python.psi.types.PyClassType | ||
| import com.jetbrains.python.psi.types.PyType | ||
| import com.jetbrains.python.psi.types.PyUnionType | ||
| import com.jetbrains.python.psi.types.TypeEvalContext | ||
| import com.jetbrains.python.psi.* | ||
|
|
||
| val DATACLASS_QUALIFIED_NAME = QualifiedName.fromDottedString("strawberry.type") | ||
| const val DATACLASS_SHORT_NAME = "strawberry.type" | ||
| const val DATACLASS_LONG_NAME = "strawberry.object_type.type" | ||
|
|
||
| val DATACLASS_NAMES = listOf( | ||
| DATACLASS_SHORT_NAME, | ||
| DATACLASS_LONG_NAME | ||
| ) | ||
|
|
||
| fun hasDecorator(pyDecoratable: PyDecoratable, refName: QualifiedName): Boolean { | ||
| return pyDecoratable.decoratorList?.decorators?.mapNotNull { it.callee as? PyReferenceExpression }?.any { | ||
| PyResolveUtil.resolveImportedElementQNameLocally(it).any { decoratorQualifiedName -> | ||
| decoratorQualifiedName == refName | ||
| } | ||
| } ?: false | ||
| } | ||
|
|
||
|
|
||
| fun isDataclass(pyClass: PyClass): Boolean { | ||
| return hasDecorator(pyClass, DATACLASS_QUALIFIED_NAME) | ||
| } | ||
|
|
||
| fun getResolveElements(referenceExpression: PyReferenceExpression, context: TypeEvalContext): Array<ResolveResult> { | ||
| return PyResolveContext.defaultContext(context).let { | ||
| referenceExpression.getReference(it).multiResolve(false) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| fun getResolvedPsiElements(referenceExpression: PyReferenceExpression, context: TypeEvalContext): List<PsiElement> { | ||
| return getResolveElements(referenceExpression, context).let { PyUtil.filterTopPriorityResults(it) } | ||
| } | ||
|
|
||
|
|
||
| fun getPyClassTypeByPyTypes(pyType: PyType): List<PyClassType> { | ||
| return when (pyType) { | ||
| is PyUnionType -> pyType.members.mapNotNull { it }.flatMap { getPyClassTypeByPyTypes(it) } | ||
| is PyClassType -> listOf(pyType) | ||
| else -> listOf() | ||
| } | ||
| } | ||
| val DATACLASS_QUALIFIED_NAME = QualifiedName.fromDottedString(DATACLASS_SHORT_NAME) | ||
| internal val PyFunction.isDataclass: Boolean get() = qualifiedName in DATACLASS_NAMES |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,14 @@ | ||
| package rocks.strawberry | ||
|
|
||
| import com.intellij.psi.PsiElement | ||
| import com.jetbrains.python.codeInsight.stdlib.PyDataclassTypeProvider | ||
| import com.jetbrains.python.psi.* | ||
| import com.jetbrains.python.psi.impl.PyCallExpressionImpl | ||
| import com.jetbrains.python.psi.impl.PyCallExpressionNavigator | ||
| import com.jetbrains.python.psi.types.* | ||
|
|
||
| class StrawberryDataclassTypeProvider : PyTypeProviderBase() { | ||
| private val pyDataclassTypeProvider = PyDataclassTypeProvider() | ||
|
|
||
| override fun getReferenceExpressionType( | ||
| referenceExpression: PyReferenceExpression, | ||
| context: TypeEvalContext | ||
| ): PyType? { | ||
| return getDataclass(referenceExpression, context) | ||
| } | ||
|
|
||
|
|
||
| private fun getDataclassCallableType( | ||
| referenceTarget: PsiElement, | ||
| context: TypeEvalContext, | ||
| callSite: PyCallExpression? | ||
| ): PyCallableType? { | ||
| return pyDataclassTypeProvider.getReferenceType( | ||
| referenceTarget, | ||
| context, | ||
| callSite ?: PyCallExpressionImpl(referenceTarget.node) | ||
| )?.get() as? PyCallableType | ||
| } | ||
|
|
||
| private fun getDataclassType( | ||
| referenceTarget: PsiElement, | ||
| context: TypeEvalContext, | ||
| pyReferenceExpression: PyReferenceExpression, | ||
| definition: Boolean | ||
| ): PyType? { | ||
| val callSite = PyCallExpressionNavigator.getPyCallExpressionByCallee(pyReferenceExpression) | ||
| val dataclassCallableType = getDataclassCallableType(referenceTarget, context, callSite) ?: return null | ||
| val dataclassType = (dataclassCallableType).getReturnType(context) as? PyClassType ?: return null | ||
| if (!isDataclass(dataclassType.pyClass)) return null | ||
|
|
||
| return when { | ||
| callSite is PyCallExpression && definition -> dataclassCallableType | ||
| definition -> dataclassType.toClass() | ||
| else -> dataclassType | ||
| override fun getCallableType(callable: PyCallable, context: TypeEvalContext): PyType? { | ||
| if (callable is PyFunction && callable.isDataclass) { | ||
| // Drop fake dataclass return type | ||
| return PyCallableTypeImpl(callable.getParameters(context), null) | ||
| } | ||
| } | ||
|
|
||
|
|
||
| private fun getDataclass(referenceExpression: PyReferenceExpression, context: TypeEvalContext): PyType? { | ||
| return getResolvedPsiElements(referenceExpression, context) | ||
| .asSequence() | ||
| .mapNotNull { | ||
| when { | ||
| it is PyClass && isDataclass(it) -> | ||
| getDataclassType(it, context, referenceExpression, true) | ||
| it is PyTargetExpression -> (it as? PyTypedElement) | ||
| ?.let { pyTypedElement -> context.getType(pyTypedElement) } | ||
| ?.let { pyType -> getPyClassTypeByPyTypes(pyType) } | ||
| ?.filter { pyClassType -> isDataclass(pyClassType.pyClass) } | ||
| ?.mapNotNull { pyClassType -> | ||
| getDataclassType(pyClassType.pyClass, | ||
| context, | ||
| referenceExpression, | ||
| pyClassType.isDefinition) | ||
| } | ||
| ?.firstOrNull() | ||
| else -> null | ||
| } | ||
| }.firstOrNull() | ||
| return super.getCallableType(callable, context) | ||
| } | ||
| } |