Rename package k2js -> kotlin.js in js.frontend

org.jetbrains.k2js -> org.jetbrains.kotlin.js
2015-01-05 03:39:14 +03:00
parent 36eb5eff1f
commit 03e3969544
56 changed files with 110 additions and 116 deletions
@@ -546,10 +546,6 @@
                        public protected *;
                    }

-                    -keep class org.jetbrains.k2js.** {
-                        public protected *;
-                    }
-
                    -keep class org.jetbrains.jet.** {
                        public protected *;
                    }
@@ -52,10 +52,10 @@ import org.jetbrains.jet.config.Services;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.utils.PathUtil;
-import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
-import org.jetbrains.k2js.config.Config;
-import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.config.LibrarySourcesConfig;
+import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS;
+import org.jetbrains.kotlin.js.config.Config;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.LibrarySourcesConfig;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.jetbrains.kotlin.js.facade.Status;

@@ -31,9 +31,9 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
-import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.config.LibrarySourcesConfigWithCaching;
+import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.LibrarySourcesConfigWithCaching;

 import java.util.List;
 import java.util.Map;
@@ -48,7 +48,7 @@ import org.jetbrains.jet.context.LazyResolveToken
 import org.jetbrains.jet.lang.resolve.java.JavaLazyAnalyzerPostConstruct
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolverPostConstruct
 import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider
-import org.jetbrains.k2js.resolve.KotlinJsDeclarationCheckerProvider
+import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider
 import org.jetbrains.jet.lang.types.DynamicTypesAllowed
 import org.jetbrains.jet.lang.types.DynamicTypesSettings

@@ -23,7 +23,7 @@ import org.jetbrains.jet.analyzer.AnalyzerFacade
 import com.intellij.openapi.project.Project
 import org.jetbrains.jet.context.GlobalContext
 import org.jetbrains.jet.analyzer.ResolverForProject
-import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS
+import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS
 import org.jetbrains.jet.lang.PlatformToKotlinClassMap
 import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService
 import org.jetbrains.jet.lang.resolve.BindingTraceContext
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.di.InjectorForLazyResolve
 import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.jet.analyzer.ModuleInfo
 import org.jetbrains.jet.analyzer.ModuleContent
-import org.jetbrains.k2js.resolve.KotlinJsDeclarationCheckerProvider
+import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider
 import org.jetbrains.jet.lang.types.DynamicTypesAllowed

 public class JsResolverForModule(
@@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider;
 import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider;
 import org.jetbrains.jet.lang.types.DynamicTypesAllowed;
 import org.jetbrains.jet.lang.types.DynamicTypesSettings;
-import org.jetbrains.k2js.resolve.KotlinJsDeclarationCheckerProvider;
+import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider;

 public interface TargetPlatform {
    @NotNull
@@ -2,10 +2,10 @@
    <id>org.jetbrains.kotlin</id>

    <extensions defaultExtensionNs="org.jetbrains.kotlin">
-        <defaultErrorMessages implementation="org.jetbrains.k2js.resolve.diagnostics.DefaultErrorMessagesJs"/>
-        <suppressStringProvider implementation="org.jetbrains.k2js.analyze.SuppressUnusedParameterForJsNative"/>
-        <suppressStringProvider implementation="org.jetbrains.k2js.analyze.SuppressNoBodyErrorsForNativeDeclarations"/>
-        <diagnosticSuppressor implementation="org.jetbrains.k2js.analyze.SuppressUninitializedErrorsForNativeDeclarations"/>
-        <diagnosticSuppressor implementation="org.jetbrains.k2js.analyze.SuppressWarningsFromExternalModules"/>
+        <defaultErrorMessages implementation="org.jetbrains.kotlin.js.resolve.diagnostics.DefaultErrorMessagesJs"/>
+        <suppressStringProvider implementation="org.jetbrains.kotlin.js.analyze.SuppressUnusedParameterForJsNative"/>
+        <suppressStringProvider implementation="org.jetbrains.kotlin.js.analyze.SuppressNoBodyErrorsForNativeDeclarations"/>
+        <diagnosticSuppressor implementation="org.jetbrains.kotlin.js.analyze.SuppressUninitializedErrorsForNativeDeclarations"/>
+        <diagnosticSuppressor implementation="org.jetbrains.kotlin.js.analyze.SuppressWarningsFromExternalModules"/>
    </extensions>
 </idea-plugin>
@@ -32,7 +32,7 @@ import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerWorkspaceSettings;
-import org.jetbrains.k2js.JavaScript;
+import org.jetbrains.kotlin.js.JavaScript;

 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.framework.JSLibraryStdDescription;
 import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
 import org.jetbrains.jet.utils.PathUtil;
-import org.jetbrains.k2js.JavaScript;
+import org.jetbrains.kotlin.js.JavaScript;

 import java.io.File;

@@ -31,7 +31,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.JavaScript;
+import org.jetbrains.kotlin.js.JavaScript;

 import java.io.File;
 import java.io.IOException;
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.NamePackage;
 import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
-import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
+import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS;

 import java.util.List;

@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFacto
 import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
 import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer;
 import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider;
-import org.jetbrains.k2js.resolve.KotlinJsDeclarationCheckerProvider;
+import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider;
 import org.jetbrains.jet.lang.types.DynamicTypesAllowed;
 import org.jetbrains.jet.lang.resolve.AnnotationResolver;
 import org.jetbrains.jet.lang.resolve.calls.CallResolver;
@@ -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.k2js
+package org.jetbrains.kotlin.js

 object JavaScript {
    val FULL_NAME = "JavaScript"
@@ -23,4 +23,4 @@ object JavaScript {

    val EXTENSION = "js"
    val DOT_EXTENSION = "." + EXTENSION
-}
+}
@@ -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.k2js
+package org.jetbrains.kotlin.js

 import kotlin.properties.Delegates
 import org.jetbrains.jet.lang.resolve.name.FqName
@@ -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.k2js.analyze;
+package org.jetbrains.kotlin.js.analyze;

 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -35,8 +35,8 @@ import org.jetbrains.jet.lang.resolve.*;
 import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.k2js.config.Config;
 import org.jetbrains.kotlin.di.InjectorForTopDownAnalyzerForJs;
+import org.jetbrains.kotlin.js.config.Config;

 import java.util.Collection;
 import java.util.Collections;
@@ -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,18 +14,18 @@
 * limitations under the License.
 */

-package org.jetbrains.k2js.analyze
+package org.jetbrains.kotlin.js.analyze

 import org.jetbrains.jet.lang.diagnostics.Errors
-import org.jetbrains.k2js.PredefinedAnnotation.*
+import org.jetbrains.kotlin.js.PredefinedAnnotation.*
 import org.jetbrains.jet.lang.diagnostics.Diagnostic
 import org.jetbrains.jet.lang.diagnostics.Severity
 import org.jetbrains.jet.lang.psi.JetFile
-import org.jetbrains.k2js.config.LibrarySourcesConfig
+import org.jetbrains.kotlin.js.config.LibrarySourcesConfig
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor
 import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1
-import org.jetbrains.k2js.translate.utils.AnnotationsUtils
+import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils
 import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression
 import org.jetbrains.jet.lang.resolve.diagnostics.SuppressDiagnosticsByAnnotations
 import org.jetbrains.jet.lang.resolve.diagnostics.FUNCTION_NO_BODY_ERRORS
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 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.k2js.config;
+package org.jetbrains.kotlin.js.config;

 import com.google.common.collect.Lists;
 import com.intellij.openapi.project.Project;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 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.k2js.config;
+package org.jetbrains.kotlin.js.config;

 import org.jetbrains.annotations.NotNull;

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 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.k2js.config;
+package org.jetbrains.kotlin.js.config;

 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
@@ -30,8 +30,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.JetFileType;
-import org.jetbrains.k2js.JavaScript;
 import org.jetbrains.jet.utils.LibraryUtils;
+import org.jetbrains.kotlin.js.JavaScript;

 import java.io.File;
 import java.util.ArrayList;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 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.k2js.config;
+package org.jetbrains.kotlin.js.config;

 import com.google.common.base.Predicates;
 import com.intellij.openapi.project.Project;
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetPsiFactory;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.utils.PathUtil;
-import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
+import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS;

 import java.io.IOException;
 import java.util.Arrays;
@@ -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.k2js.resolve
+package org.jetbrains.kotlin.js.resolve

 import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider
 import org.jetbrains.jet.lang.resolve.AnnotationChecker
@@ -23,12 +23,12 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.lang.diagnostics.DiagnosticSink
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
 import org.jetbrains.jet.lang.psi.JetNamedFunction
-import org.jetbrains.k2js.resolve.diagnostics.ErrorsJs
+import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import org.jetbrains.jet.lang.types.TypeUtils
-import org.jetbrains.k2js.PredefinedAnnotation
+import org.jetbrains.kotlin.js.PredefinedAnnotation
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
-import org.jetbrains.k2js.translate.utils.AnnotationsUtils
+import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils
 import org.jetbrains.jet.lang.descriptors.Visibilities
 import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf

@@ -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.k2js.resolve.diagnostics
+package org.jetbrains.kotlin.js.resolve.diagnostics

 import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages
 import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticFactoryToRendererMap
@@ -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,10 +14,13 @@
 * limitations under the License.
 */

-package org.jetbrains.k2js.resolve.diagnostics;
+package org.jetbrains.kotlin.js.resolve.diagnostics;

 import com.intellij.openapi.util.TextRange;
-import org.jetbrains.jet.lang.diagnostics.*;
+import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory0;
+import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1;
+import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory2;
+import org.jetbrains.jet.lang.diagnostics.Errors;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.psi.JetExpression;
@@ -25,9 +28,7 @@ import org.jetbrains.jet.lang.types.JetType;

 import java.util.List;

-import static org.jetbrains.jet.lang.diagnostics.PositioningStrategies.CALL_EXPRESSION;
-import static org.jetbrains.jet.lang.diagnostics.PositioningStrategies.DECLARATION_RETURN_TYPE;
-import static org.jetbrains.jet.lang.diagnostics.PositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT;
+import static org.jetbrains.jet.lang.diagnostics.PositioningStrategies.*;
 import static org.jetbrains.jet.lang.diagnostics.Severity.ERROR;
 import static org.jetbrains.jet.lang.diagnostics.Severity.WARNING;

@@ -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,15 +14,12 @@
 * limitations under the License.
 */

-package org.jetbrains.k2js.resolve.diagnostics
+package org.jetbrains.kotlin.js.resolve.diagnostics

 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.lang.diagnostics.Diagnostic
-import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1
 import org.jetbrains.jet.lang.diagnostics.PositioningStrategy
 import org.jetbrains.jet.lang.psi.JetExpression
-import org.jetbrains.jet.renderer.Renderer
 import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2
 import org.jetbrains.jet.lang.diagnostics.ParametrizedDiagnostic

@@ -32,4 +29,4 @@ public object JsCodePositioningStrategy : PositioningStrategy<PsiElement>() {
        val diagnosticWithParameters = diagnostic as DiagnosticWithParameters2<JetExpression, String, List<TextRange>>
        return diagnosticWithParameters.getB()
    }
-}
+}
@@ -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.k2js.translate.utils;
+package org.jetbrains.kotlin.js.translate.utils;

 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.k2js.PredefinedAnnotation;
+import org.jetbrains.kotlin.js.PredefinedAnnotation;

 import java.util.List;
 import java.util.Set;
@@ -39,11 +39,11 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetPsiFactory;
 import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment;
 import org.jetbrains.jet.plugin.JetFileType;
-import org.jetbrains.k2js.JavaScript;
-import org.jetbrains.k2js.config.Config;
-import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.config.LibrarySourcesConfig;
-import org.jetbrains.k2js.config.LibrarySourcesConfigWithCaching;
+import org.jetbrains.kotlin.js.JavaScript;
+import org.jetbrains.kotlin.js.config.Config;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.LibrarySourcesConfig;
+import org.jetbrains.kotlin.js.config.LibrarySourcesConfigWithCaching;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.jetbrains.kotlin.js.facade.Status;
 import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.js.test;

 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker;

@@ -16,7 +16,7 @@

 package org.jetbrains.kotlin.js.test

-import org.jetbrains.k2js.config.EcmaVersion
+import org.jetbrains.kotlin.js.config.EcmaVersion
 import org.jetbrains.kotlin.js.facade.MainCallParameters
 import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker
 import org.jetbrains.kotlin.js.test.utils.JsTestUtils.getAllFilesInDir
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
 import org.jetbrains.kotlin.js.test.semantics.TranslatorTestCaseBuilder;

 import java.io.File;
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test;

 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker;
 import org.jetbrains.kotlin.js.test.rhino.RhinoSystemOutputChecker;
@@ -21,7 +21,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
 import org.jetbrains.kotlin.js.facade.K2JSTranslator;
 import org.mozilla.javascript.*;

@@ -33,7 +33,7 @@ import java.util.Map;
 import java.util.Set;

 import static org.jetbrains.jet.utils.UtilsPackage.rethrow;
-import static org.jetbrains.k2js.config.LibrarySourcesConfig.*;
+import static org.jetbrains.kotlin.js.config.LibrarySourcesConfig.*;
 import static org.jetbrains.kotlin.js.test.BasicTest.DIST_DIR_PATH;
 import static org.jetbrains.kotlin.js.test.BasicTest.TEST_DATA_DIR_PATH;

@@ -21,7 +21,7 @@ import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.ExitCode;
 import org.jetbrains.jet.cli.js.K2JSCompiler;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
 import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;

 import java.io.File;
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.test.semantics;
 import com.google.common.collect.Lists;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.jetbrains.kotlin.js.test.MultipleFilesTranslationTest;
 import org.jetbrains.kotlin.js.test.rhino.RhinoSystemOutputChecker;
@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.js.test.semantics;

 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.JavaScript;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.JavaScript;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
 import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;

 import java.io.File;
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics;

 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
 import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;

 import java.util.List;
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.test.semantics;
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
 import org.jetbrains.kotlin.js.test.rhino.RhinoQUnitResultChecker;
 import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;

@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.js.test.semantics;

 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionNativeObjectResultChecker;
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.test.semantics;
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.js.test.semantics;

 import com.intellij.openapi.util.io.FileUtil;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.EcmaVersion;

 import java.io.File;
 import java.io.IOException;
@@ -20,8 +20,8 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.JavaScript;
-import org.jetbrains.k2js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.JavaScript;
+import org.jetbrains.kotlin.js.config.EcmaVersion;

 import java.io.File;
 import java.io.IOException;
@@ -40,8 +40,8 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.utils.fileUtils.FileUtilsPackage;
-import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
-import org.jetbrains.k2js.config.Config;
+import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS;
+import org.jetbrains.kotlin.js.config.Config;
 import org.jetbrains.kotlin.js.facade.exceptions.TranslationException;
 import org.jetbrains.kotlin.js.inline.JsInliner;
 import org.jetbrains.kotlin.js.sourceMap.JsSourceGenerationVisitor;
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.js.translate.callTranslator

 import org.jetbrains.jet.lang.descriptors.CallableDescriptor
-import org.jetbrains.k2js.translate.utils.AnnotationsUtils
+import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver
 import org.jetbrains.jet.lang.psi.JetSuperExpression
 import com.google.dart.compiler.backend.js.ast.JsExpression
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.VariableDescriptor
 import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall
 import org.jetbrains.kotlin.js.translate.context.TranslationContext
 import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.*
-import org.jetbrains.k2js.translate.utils.AnnotationsUtils
+import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils
 import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator
 import org.jetbrains.kotlin.js.translate.general.Translation
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver
@@ -33,8 +33,8 @@ import org.jetbrains.jet.lang.descriptors.Visibilities
 import com.intellij.util.SmartList
 import com.google.dart.compiler.backend.js.ast.JsArrayAccess
 import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
-import org.jetbrains.k2js.translate.utils.AnnotationsUtils
-import org.jetbrains.k2js.PredefinedAnnotation
+import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils
+import org.jetbrains.kotlin.js.PredefinedAnnotation
 import org.jetbrains.jet.lang.resolve.calls.tasks.isDynamic
 import org.jetbrains.jet.lang.psi.Call
 import org.jetbrains.kotlin.js.translate.operation.OperatorTable
@@ -29,9 +29,9 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.k2js.config.Config;
-import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.config.LibrarySourcesConfig;
+import org.jetbrains.kotlin.js.config.Config;
+import org.jetbrains.kotlin.js.config.EcmaVersion;
+import org.jetbrains.kotlin.js.config.LibrarySourcesConfig;
 import org.jetbrains.kotlin.js.translate.context.generator.Generator;
 import org.jetbrains.kotlin.js.translate.context.generator.Rule;
 import org.jetbrains.kotlin.js.translate.intrinsic.Intrinsics;
@@ -41,8 +41,8 @@ import java.util.Map;

 import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isExtension;
-import static org.jetbrains.k2js.config.LibrarySourcesConfig.BUILTINS_JS_MODULE_NAME;
-import static org.jetbrains.k2js.translate.utils.AnnotationsUtils.*;
+import static org.jetbrains.kotlin.js.config.LibrarySourcesConfig.BUILTINS_JS_MODULE_NAME;
+import static org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils.*;
 import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.*;
 import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getMangledName;
 import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getSuggestedName;
@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.reflect.ReflectionTypes;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.k2js.config.Config;
+import org.jetbrains.kotlin.js.config.Config;
 import org.jetbrains.kotlin.js.translate.intrinsic.Intrinsics;
 import org.jetbrains.kotlin.js.translate.utils.TranslationUtils;

@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
+import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils;
 import org.jetbrains.kotlin.js.translate.context.DefinitionPlace;
 import org.jetbrains.kotlin.js.translate.context.TranslationContext;
 import org.jetbrains.kotlin.js.translate.general.AbstractTranslator;
@@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.psi.JetNamedFunction;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage;
 import org.jetbrains.jet.plugin.MainFunctionDetector;
-import org.jetbrains.k2js.config.Config;
+import org.jetbrains.kotlin.js.config.Config;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.jetbrains.kotlin.js.facade.exceptions.MainFunctionNotFoundException;
 import org.jetbrains.kotlin.js.facade.exceptions.TranslationException;
@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lang.types.lang.PrimitiveType;
-import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
+import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils;
 import org.jetbrains.kotlin.js.translate.callTranslator.CallInfo;
 import org.jetbrains.kotlin.js.translate.context.Namer;
 import org.jetbrains.kotlin.js.translate.context.TranslationContext;
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.ValueArgument;
 import org.jetbrains.jet.lang.resolve.calls.model.*;
-import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
+import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils;
 import org.jetbrains.kotlin.js.translate.context.TemporaryConstVariable;
 import org.jetbrains.kotlin.js.translate.context.TemporaryVariable;
 import org.jetbrains.kotlin.js.translate.context.TranslationContext;
@@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall;
 import org.jetbrains.jet.lang.types.lang.InlineStrategy;
 import org.jetbrains.jet.lang.types.lang.InlineUtil;
-import org.jetbrains.k2js.resolve.diagnostics.ErrorsJs;
+import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs;
 import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator;
 import org.jetbrains.kotlin.js.translate.context.TranslationContext;
 import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate;
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import com.google.dart.compiler.backend.js.ast.JsInvocation
 import org.jetbrains.jet.lang.descriptors.Visibilities
-import org.jetbrains.k2js.translate.utils.AnnotationsUtils
+import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils
 import org.jetbrains.jet.lang.psi.JetCallableReferenceExpression
 import org.jetbrains.kotlin.js.translate.utils.BindingUtils
 import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor
@@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.JetReferenceExpression;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
-import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
+import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils;
 import org.jetbrains.kotlin.js.translate.context.Namer;
 import org.jetbrains.kotlin.js.translate.context.TemporaryVariable;
 import org.jetbrains.kotlin.js.translate.context.TranslationContext;
@@ -37,7 +37,7 @@ import java.util.List;
 import java.util.Set;

 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*;
-import static org.jetbrains.k2js.translate.utils.AnnotationsUtils.isNativeObject;
+import static org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils.isNativeObject;

 public final class JsDescriptorUtils {
    // TODO: maybe we should use external annotations or something else.
@@ -27,7 +27,7 @@ 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.k2js.translate.utils.AnnotationsUtils;
+import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils;

 import java.util.*;

@@ -39,9 +39,9 @@ import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys
 import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import org.jetbrains.jet.lang.resolve.BindingTraceContext
-import org.jetbrains.k2js.config.LibrarySourcesConfig
-import org.jetbrains.k2js.config.EcmaVersion
-import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS
+import org.jetbrains.kotlin.js.config.LibrarySourcesConfig
+import org.jetbrains.kotlin.js.config.EcmaVersion
+import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS
 import com.intellij.openapi.Disposable
 import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport
 import org.jetbrains.jet.context.GlobalContext