MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[workspace model] EA-970770 Skip Computable properties from analyzing

Browse Source 
GitOrigin-RevId: 1c060730c72a09573c7bfdb784a020269f84b6c1
This commit is contained in:
Mikhail Mazurkevich
2023-12-11 17:11:19 +04:00
committed by intellij-monorepo-bot
parent 429545086b
commit 1e3bb825cd
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/devkit/intellij.devkit.workspaceModel/src/metaModel/impl/WorkspaceMetaModelProviderImpl.kt
View File

@@ -102,7 +102,12 @@ internal class WorkspaceMetaModelProviderImpl(
.filterIsInstance<PropertyDescriptor>()
.filter { it.kind.isReal }
for ((propertyId, property) in properties.withIndex()) {
objType.addField(createOwnProperty(property, propertyId, objType))
val kind = computeKind(property)
if (kind !is ObjProperty.ValueKind.Computable ||
// We can't simply skip all `Computable` because some of them are SymbolicIds
property.overriddenDescriptors.isNotEmpty()) {
objType.addField(createOwnProperty(property, propertyId, objType))
}
}
classDescriptor.typeConstructor.supertypes.forEach { superType ->
val superDescriptor = superType.constructor.declarationDescriptor
@@ -201,15 +206,15 @@ internal class WorkspaceMetaModelProviderImpl(
knownTypes[javaClassFqn] = blobType
return when {
isObject -> ValueType.Object<Any>(javaClassFqn, superTypes, createProperties(this@toValueType, knownTypes))
isObject -> ValueType.Object<Any>(javaClassFqn, superTypes, createProperties(this, knownTypes))
isEnumClass -> {
val values = unsubstitutedInnerClassesScope.getContributedDescriptors(DescriptorKindFilter.CLASSIFIERS)
.filterIsInstance<ClassDescriptor>().filter { it.isEnumEntry }.map { it.name.asString() }
ValueType.Enum<Any>(javaClassFqn, superTypes, values, createProperties(this@toValueType, knownTypes).withoutEnumFields())
ValueType.Enum<Any>(javaClassFqn, superTypes, values, createProperties(this, knownTypes).withoutEnumFields())
}
isSealed() -> {
val subclasses = sealedSubclasses.map {
convertType(it.defaultType, hashMapOf(javaClassFqn to blobType), false) as ValueType.JvmClass<*>
convertType(it.defaultType, knownTypes, false) as ValueType.JvmClass<*>
}
ValueType.AbstractClass<Any>(javaClassFqn, superTypes, subclasses)
}
@@ -218,10 +223,10 @@ internal class WorkspaceMetaModelProviderImpl(
throw IncorrectObjInterfaceException("$javaClassFqn is abstract type. Abstract types are not supported in generator")
}
val inheritors = inheritors(javaPsiFacade, allScope)
.map { it.toValueType(hashMapOf(javaClassFqn to blobType), processAbstractTypes) }
.map { it.toValueType(knownTypes, processAbstractTypes) }
ValueType.AbstractClass<Any>(javaClassFqn, superTypes, inheritors)
}
else -> ValueType.FinalClass<Any>(javaClassFqn, superTypes, createProperties(this@toValueType, knownTypes))
else -> ValueType.FinalClass<Any>(javaClassFqn, superTypes, createProperties(this, knownTypes))
}
}