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

JS backend: JsDescriptorUtils.isAsPrivate remake to isSimpleProperty

Browse Source
This commit is contained in:
Erokhin Stanislav
2013-09-05 20:06:05 +04:00
parent 638beff551
commit 550cf581c4
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
+1 -1
View File
@@ -328,7 +328,7 @@ public final class StaticContext {
}
String name = descriptor.getName().asString();
if (!isEcma5() || JsDescriptorUtils.isAsPrivate((PropertyDescriptor) descriptor)) {
if (!isEcma5() || !JsDescriptorUtils.isSimpleProperty((PropertyDescriptor) descriptor)) {
name = Namer.getKotlinBackingFieldName(name);
}
js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
+2 -4
View File
@@ -58,11 +58,9 @@ public final class PropertyTranslator extends AbstractTranslator {
@Nullable JetProperty declaration,
@NotNull List<JsPropertyInitializer> result,
@NotNull TranslationContext context) {
if (context.isEcma5() && !JsDescriptorUtils.isAsPrivate(descriptor)) {
return;
if (!JsDescriptorUtils.isSimpleProperty(descriptor)) {
new PropertyTranslator(descriptor, declaration, context).translate(result);
}
new PropertyTranslator(descriptor, declaration, context).translate(result);
}
private PropertyTranslator(@NotNull PropertyDescriptor descriptor, @Nullable JetProperty declaration, @NotNull TranslationContext context) {
js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java
+4 -4
View File
@@ -140,10 +140,10 @@ public final class JsDescriptorUtils {
return accessorDescriptor == null || accessorDescriptor.isDefault();
}
public static boolean isAsPrivate(@NotNull PropertyDescriptor propertyDescriptor) {
return isExtension(propertyDescriptor) ||
!isDefaultAccessor(propertyDescriptor.getGetter()) ||
!isDefaultAccessor(propertyDescriptor.getSetter());
public static boolean isSimpleProperty(@NotNull PropertyDescriptor propertyDescriptor) {
return !isExtension(propertyDescriptor) &&
isDefaultAccessor(propertyDescriptor.getGetter()) &&
isDefaultAccessor(propertyDescriptor.getSetter());
}
public static boolean isStandardDeclaration(@NotNull DeclarationDescriptor descriptor) {