Fix build after change in property accessor names

js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java

@@ -148,8 +148,9 @@ public abstract class Config {
     }
 
     private ModuleDescriptorImpl createModuleDescriptor(KotlinJavascriptMetadata metadata) {
-        assert metadata.getIsAbiVersionCompatible() :
-                "expected abi version " + KotlinJavascriptMetadataUtils.ABI_VERSION + ", but metadata.abiVersion = " + metadata.getAbiVersion();
+        assert metadata.isAbiVersionCompatible() :
+                "expected abi version " + KotlinJavascriptMetadataUtils.ABI_VERSION +
+                ", but metadata.abiVersion = " + metadata.getAbiVersion();
 
         ModuleDescriptorImpl moduleDescriptor = new ModuleDescriptorImpl(
                 Name.special("<" + metadata.getModuleName() + ">"), storageManager,

js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java

@@ -168,8 +168,10 @@ public class LibrarySourcesConfig extends Config {
                 }
 
                 for (KotlinJavascriptMetadata metadata : metadataList) {
-                    if (!metadata.getIsAbiVersionCompatible()) {
-                        report.invoke("File '" + path + "' was compiled with an incompatible version of Kotlin. Its ABI version is " + metadata.getAbiVersion() + ", expected ABI version is " + KotlinJavascriptMetadataUtils.ABI_VERSION);
+                    if (!metadata.isAbiVersionCompatible()) {
+                        report.invoke("File '" + path + "' was compiled with an incompatible version of Kotlin. " +
+                                      "Its ABI version is " + metadata.getAbiVersion() +
+                                      ", expected ABI version is " + KotlinJavascriptMetadataUtils.ABI_VERSION);
                         return true;
                     }
                 }

js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java

@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.js.translate.expression;
 
-
 import com.google.dart.compiler.backend.js.ast.*;
 import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties;
 import com.intellij.util.SmartList;
@@ -42,7 +41,7 @@ import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDe
 import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message;
 import static org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.translateFunctionBody;
 import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.setParameters;
-import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getIsEffectivelyPublicApi;
+import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.isEffectivelyPublicApi;
 
 public final class FunctionTranslator extends AbstractTranslator {
     @NotNull
@@ -100,7 +99,7 @@ public final class FunctionTranslator extends AbstractTranslator {
         JsName functionName = context().getNameForDescriptor(descriptor);
         generateFunctionObject();
 
-        if (shouldBeInlined(descriptor) && getIsEffectivelyPublicApi(descriptor)) {
+        if (shouldBeInlined(descriptor) && isEffectivelyPublicApi(descriptor)) {
             InlineMetadata metadata = InlineMetadata.compose(functionObject, descriptor);
             return new JsPropertyInitializer(functionName.makeRef(), metadata.getFunctionWithMetadata());
         }

js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java

@@ -82,7 +82,7 @@ public class ManglingUtils {
         DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
 
         if (containingDeclaration instanceof PackageFragmentDescriptor) {
-            return descriptor.getVisibility().getIsPublicAPI();
+            return descriptor.getVisibility().isPublicAPI();
         }
         else if (containingDeclaration instanceof ClassDescriptor) {
             ClassDescriptor classDescriptor = (ClassDescriptor) containingDeclaration;
@@ -98,7 +98,7 @@ public class ManglingUtils {
             }
 
             // Don't use stable mangling when it inside a non-public API declaration.
-            if (!classDescriptor.getVisibility().getIsPublicAPI()) {
+            if (!classDescriptor.getVisibility().isPublicAPI()) {
                 return false;
             }
 
@@ -144,9 +144,7 @@ public class ManglingUtils {
     @NotNull
     private static String getSuggestedName(@NotNull CallableDescriptor descriptor) {
         if (descriptor instanceof ConstructorDescriptor && !((ConstructorDescriptor) descriptor).isPrimary()) {
-            DeclarationDescriptor classDescriptor = descriptor.getContainingDeclaration();
-            assert classDescriptor != null;
-            return classDescriptor.getName().asString();
+            return descriptor.getContainingDeclaration().getName().asString();
         }
         else {
             return descriptor.getName().asString();
@@ -161,7 +159,7 @@ public class ManglingUtils {
 
         String nameToCompare = descriptor.getName().asString();
 
-        if (containingDeclaration != null && descriptor instanceof ConstructorDescriptor) {
+        if (descriptor instanceof ConstructorDescriptor) {
             nameToCompare = containingDeclaration.getName().asString();
             containingDeclaration = containingDeclaration.getContainingDeclaration();
         }