From 329d9da8c86b80e4d46f4904cd0cc97dde137b93 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 6 Jan 2015 04:58:00 +0300
Subject: [PATCH] Rename package jet -> kotlin in backend-common

org.jetbrains.jet.backend.common -> org.jetbrains.kotlin.backend.common
org.jetbrains.jet.codegen.bridges ->
org.jetbrains.kotlin.backend.common.bridges
---
 .../{jet => kotlin}/backend/common/CodegenUtil.java       | 6 +++---
 .../{jet => kotlin}/backend/common/CodegenUtilKt.kt       | 6 +++---
 .../backend/common/DataClassMethodGenerator.java          | 4 ++--
 .../jetbrains/kotlin/backend/common}/bridges/bridges.kt   | 4 ++--
 .../jetbrains/kotlin/backend/common}/bridges/impl.kt      | 4 ++--
 .../src/org/jetbrains/jet/codegen/ClassBodyCodegen.java   | 2 +-
 .../src/org/jetbrains/jet/codegen/ExpressionCodegen.java  | 2 +-
 .../src/org/jetbrains/jet/codegen/FunctionCodegen.java    | 4 ++--
 .../jetbrains/jet/codegen/ImplementationBodyCodegen.java  | 6 +++---
 .../org/jetbrains/jet/codegen/PlatformStaticGenerator.kt  | 4 ++--
 compiler/tests/org/jetbrains/jet/codegen/BridgeTest.kt    | 8 ++++----
 .../kotlin/js/translate/declaration/ClassTranslator.java  | 6 +++---
 .../js/translate/declaration/DelegationTranslator.kt      | 4 ++--
 .../js/translate/declaration/JsDataClassGenerator.java    | 4 ++--
 .../kotlin/js/translate/utils/ManglingUtils.java          | 3 +--
 15 files changed, 33 insertions(+), 34 deletions(-)
 rename compiler/backend-common/src/org/jetbrains/{jet => kotlin}/backend/common/CodegenUtil.java (98%)
 rename compiler/backend-common/src/org/jetbrains/{jet => kotlin}/backend/common/CodegenUtilKt.kt (97%)
 rename compiler/backend-common/src/org/jetbrains/{jet => kotlin}/backend/common/DataClassMethodGenerator.java (98%)
 rename compiler/backend-common/src/{ => org/jetbrains/kotlin/backend/common}/bridges/bridges.kt (98%)
 rename compiler/backend-common/src/{ => org/jetbrains/kotlin/backend/common}/bridges/impl.kt (98%)

diff --git a/compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtil.java b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java
similarity index 98%
rename from compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtil.java
rename to compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java
index 67bc0f1e89c..4bcaeb8fe42 100644
--- a/compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtil.java
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.backend.common;
+package org.jetbrains.kotlin.backend.common;
 
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.util.TextRange;
@@ -22,7 +22,6 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.bridges.BridgesPackage;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -35,6 +34,7 @@ import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.TypeUtils;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
+import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage;
 
 import java.util.*;
 
diff --git a/compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtilKt.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt
similarity index 97%
rename from compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtilKt.kt
rename to compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt
index af3bbf5a6af..c872f4417db 100644
--- a/compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtilKt.kt
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.backend.common
+package org.jetbrains.kotlin.backend.common
 
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
@@ -67,4 +67,4 @@ public object CodegenUtilKt {
                 actualDelegates.firstOrNull()
             }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/backend-common/src/org/jetbrains/jet/backend/common/DataClassMethodGenerator.java b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java
similarity index 98%
rename from compiler/backend-common/src/org/jetbrains/jet/backend/common/DataClassMethodGenerator.java
rename to compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java
index 5e8d50e9f76..baabae72e04 100644
--- a/compiler/backend-common/src/org/jetbrains/jet/backend/common/DataClassMethodGenerator.java
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.backend.common;
+package org.jetbrains.kotlin.backend.common;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend-common/src/bridges/bridges.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt
similarity index 98%
rename from compiler/backend-common/src/bridges/bridges.kt
rename to compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt
index 89df7b49d6e..bff02d3a144 100644
--- a/compiler/backend-common/src/bridges/bridges.kt
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.bridges
+package org.jetbrains.kotlin.backend.common.bridges
 
 import org.jetbrains.jet.utils.DFS
 import java.util.HashSet
diff --git a/compiler/backend-common/src/bridges/impl.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt
similarity index 98%
rename from compiler/backend-common/src/bridges/impl.kt
rename to compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt
index bb41319f10c..cd8502b77b0 100644
--- a/compiler/backend-common/src/bridges/impl.kt
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.bridges
+package org.jetbrains.kotlin.backend.common.bridges
 
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java
index 4bec4ff5f77..566c4f8caa8 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java
@@ -18,7 +18,6 @@ package org.jetbrains.jet.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.bridges.BridgesPackage;
 import org.jetbrains.jet.codegen.context.ClassContext;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -28,6 +27,7 @@ import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index a08fa35665a..9f36fcce07d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -30,7 +30,6 @@ import kotlin.KotlinPackage;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.backend.common.CodegenUtil;
 import org.jetbrains.jet.codegen.binding.CalculatedClosure;
 import org.jetbrains.jet.codegen.binding.CodegenBinding;
 import org.jetbrains.jet.codegen.context.*;
@@ -71,6 +70,7 @@ import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
+import org.jetbrains.kotlin.backend.common.CodegenUtil;
 import org.jetbrains.org.objectweb.asm.Label;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
 import org.jetbrains.org.objectweb.asm.Opcodes;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
index 32315221fa6..f6543f3d860 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
@@ -26,8 +26,6 @@ import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.binding.CodegenBinding;
-import org.jetbrains.jet.codegen.bridges.Bridge;
-import org.jetbrains.jet.codegen.bridges.BridgesPackage;
 import org.jetbrains.jet.codegen.context.CodegenContext;
 import org.jetbrains.jet.codegen.context.MethodContext;
 import org.jetbrains.jet.codegen.context.PackageContext;
@@ -55,6 +53,8 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.types.Approximation;
 import org.jetbrains.jet.lang.types.TypesPackage;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
+import org.jetbrains.kotlin.backend.common.bridges.Bridge;
+import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage;
 import org.jetbrains.org.objectweb.asm.AnnotationVisitor;
 import org.jetbrains.org.objectweb.asm.Label;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
index e1c37503f9c..0accc3640a0 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
@@ -23,9 +23,6 @@ import com.intellij.util.ArrayUtil;
 import kotlin.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.backend.common.CodegenUtil;
-import org.jetbrains.jet.backend.common.CodegenUtilKt;
-import org.jetbrains.jet.backend.common.DataClassMethodGenerator;
 import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.codegen.context.*;
 import org.jetbrains.jet.codegen.signature.BothSignatureWriter;
@@ -61,6 +58,9 @@ import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetTokens;
+import org.jetbrains.kotlin.backend.common.CodegenUtil;
+import org.jetbrains.kotlin.backend.common.CodegenUtilKt;
+import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator;
 import org.jetbrains.org.objectweb.asm.*;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 import org.jetbrains.org.objectweb.asm.commons.Method;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PlatformStaticGenerator.kt b/compiler/backend/src/org/jetbrains/jet/codegen/PlatformStaticGenerator.kt
index dfadddae550..185f43afb90 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/PlatformStaticGenerator.kt
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/PlatformStaticGenerator.kt
@@ -27,7 +27,7 @@ import org.jetbrains.org.objectweb.asm.MethodVisitor
 import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature
 import org.jetbrains.jet.codegen.context.MethodContext
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.backend.common.CodegenUtil
+import org.jetbrains.kotlin.backend.common.CodegenUtil
 import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor
 import kotlin.platform.platformStatic
 
@@ -96,4 +96,4 @@ class PlatformStaticGenerator(
             return staticFunctionDescriptor
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/BridgeTest.kt b/compiler/tests/org/jetbrains/jet/codegen/BridgeTest.kt
index 933f5024bba..a6731286405 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/BridgeTest.kt
+++ b/compiler/tests/org/jetbrains/jet/codegen/BridgeTest.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.codegen
 
 import junit.framework.TestCase
-import org.jetbrains.jet.codegen.bridges.*
+import org.jetbrains.kotlin.backend.common.bridges.*
 import kotlin.test.assertEquals
 import java.util.HashSet
 import org.jetbrains.jet.utils.DFS
@@ -42,7 +42,7 @@ class BridgeTest : TestCase() {
     }
 
     private fun v(text: String): Fun {
-        assert(text.length == 3, "Function vertex representation should consist of 3 characters: $text")
+        assert(text.length() == 3, "Function vertex representation should consist of 3 characters: $text")
         assert(text[0] in setOf('-', '+'), "First character should be '-' for abstract functions or '+' for concrete ones: $text")
         assert(text[1] in setOf('D', 'F'), "Second character should be 'D' for declarations or 'F' for fake overrides: $text")
         assert(text[2].isDigit(),
@@ -91,7 +91,7 @@ class BridgeTest : TestCase() {
 
         for (vertex in vertices) {
             val directConcreteSuperFunctions = vertex.overriddenFunctions.filter { !it.isAbstract }
-            assert(directConcreteSuperFunctions.size <= 1,
+            assert(directConcreteSuperFunctions.size() <= 1,
                    "Incorrect test data: function $vertex has more than one direct concrete super-function: ${vertex.overriddenFunctions}\n" +
                    "This is not allowed because only classes can contain implementations (concrete functions), and having more than one " +
                    "concrete super-function means having more than one superclass, which is prohibited in Kotlin")
@@ -112,7 +112,7 @@ class BridgeTest : TestCase() {
             if (!vertex.isAbstract) {
                 assert(!concreteDeclarations.isEmpty(),
                        "Incorrect test data: concrete fake override vertex $vertex has no concrete super-declarations")
-                assert(concreteDeclarations.size == 1,
+                assert(concreteDeclarations.size() == 1,
                        "Incorrect test data: concrete fake override vertex $vertex has more than one concrete super-declaration: " +
                        "$concreteDeclarations")
             }
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java
index 00eb31c5f84..6dc26a349f5 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java
@@ -19,9 +19,6 @@ package org.jetbrains.kotlin.js.translate.declaration;
 import com.google.dart.compiler.backend.js.ast.*;
 import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.backend.common.CodegenUtil;
-import org.jetbrains.jet.codegen.bridges.Bridge;
-import org.jetbrains.jet.codegen.bridges.BridgesPackage;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetObjectDeclaration;
@@ -29,6 +26,9 @@ import org.jetbrains.jet.lang.psi.JetParameter;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.TypeConstructor;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
+import org.jetbrains.kotlin.backend.common.CodegenUtil;
+import org.jetbrains.kotlin.backend.common.bridges.Bridge;
+import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage;
 import org.jetbrains.kotlin.js.translate.context.DefinitionPlace;
 import org.jetbrains.kotlin.js.translate.context.Namer;
 import org.jetbrains.kotlin.js.translate.context.TranslationContext;
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt
index fcf31f41fd0..f3246715905 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt
@@ -29,12 +29,12 @@ import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
 import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.*
 
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
-import org.jetbrains.jet.backend.common.CodegenUtil
+import org.jetbrains.kotlin.backend.common.CodegenUtil
 import java.util.HashMap
 import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.addGetterAndSetter
 import org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getMangledMemberNameForExplicitDelegation
 import org.jetbrains.kotlin.js.translate.utils.generateDelegateCall
-import org.jetbrains.jet.backend.common.CodegenUtilKt
+import org.jetbrains.kotlin.backend.common.CodegenUtilKt
 
 public class DelegationTranslator(
         private val classDeclaration: JetClassOrObject,
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java
index 427c8c77857..7028eb18d5d 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java
@@ -18,11 +18,11 @@ package org.jetbrains.kotlin.js.translate.declaration;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.backend.common.CodegenUtil;
-import org.jetbrains.jet.backend.common.DataClassMethodGenerator;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetParameter;
+import org.jetbrains.kotlin.backend.common.CodegenUtil;
+import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator;
 import org.jetbrains.kotlin.js.translate.context.Namer;
 import org.jetbrains.kotlin.js.translate.context.TranslationContext;
 import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java
index c51b386326c..5c38a6b4144 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java
@@ -20,14 +20,13 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.backend.common.CodegenUtil;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
-import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils;
+import org.jetbrains.kotlin.backend.common.CodegenUtil;
 
 import java.util.*;