azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract some classes from descriptors module to :core:common

Browse Source 
This is needed to remove dependencies from fir modules to
  `:core:descriptors` module

What was extracted:
- Modality
- ClassKind
- org.jetbrains.kotlin.name package
This commit is contained in:
Dmitriy Novozhilov
2020-08-14 16:05:28 +03:00
parent 41ba9b0a2d
commit 9d9f9c52c0
21 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java
+2 -2
View File
@@ -131,7 +131,7 @@ public final class JsDescriptorUtils {
public static boolean sideEffectsPossibleOnRead(@NotNull PropertyDescriptor property) {
return DynamicCallsKt.isDynamic(property) || !isDefaultAccessor(property.getGetter()) ||
ModalityKt.isOverridableOrOverrides(property) || isStaticInitializationPossible(property);
ModalityUtilsKt.isOverridableOrOverrides(property) || isStaticInitializationPossible(property);
}
private static boolean isStaticInitializationPossible(PropertyDescriptor property) {
@@ -144,7 +144,7 @@ public final class JsDescriptorUtils {
isDefaultAccessor(propertyDescriptor.getGetter()) &&
isDefaultAccessor(propertyDescriptor.getSetter()) &&
!TranslationUtils.shouldAccessViaFunctions(propertyDescriptor) &&
!ModalityKt.isOverridableOrOverrides(propertyDescriptor);
!ModalityUtilsKt.isOverridableOrOverrides(propertyDescriptor);
}
@NotNull
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java
+4 -4
View File
@@ -105,7 +105,7 @@ public final class TranslationUtils {
@NotNull
private static JsPropertyInitializer translateExtensionFunctionAsEcma5DataDescriptor(@NotNull JsExpression functionExpression,
@NotNull FunctionDescriptor descriptor, @NotNull TranslationContext context) {
JsObjectLiteral meta = createDataDescriptor(functionExpression, ModalityKt.isOverridable(descriptor), false);
JsObjectLiteral meta = createDataDescriptor(functionExpression, ModalityUtilsKt.isOverridable(descriptor), false);
return new JsPropertyInitializer(context.getNameForDescriptor(descriptor).makeRef(), meta);
}
@@ -420,9 +420,9 @@ public final class TranslationUtils {
public static boolean isOverridableFunctionWithDefaultParameters(@NotNull FunctionDescriptor descriptor) {
return hasOrInheritsParametersWithDefaultValue(descriptor) &&
!(descriptor instanceof ConstructorDescriptor) &&
descriptor.getContainingDeclaration() instanceof ClassDescriptor &&
ModalityKt.isOverridable(descriptor);
!(descriptor instanceof ConstructorDescriptor) &&
descriptor.getContainingDeclaration() instanceof ClassDescriptor &&
ModalityUtilsKt.isOverridable(descriptor);
}
@NotNull