From 03e3969544a1a6a7a74efd0d29c2992704797bf9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 5 Jan 2015 03:39:14 +0300 Subject: [PATCH] Rename package k2js -> kotlin.js in js.frontend org.jetbrains.k2js -> org.jetbrains.kotlin.js --- build.xml | 4 ---- .../src/org/jetbrains/jet/cli/js/K2JSCompiler.java | 8 ++++---- .../AbstractJetDiagnosticsTestWithJsStdLib.java | 6 +++--- .../generators/injectors/GenerateInjectors.kt | 2 +- .../jet/plugin/caches/resolve/JsAnalyzerFacade.kt | 4 ++-- .../jet/plugin/project/TargetPlatform.java | 2 +- idea/src/META-INF/extensions/kotlin2js.xml | 10 +++++----- .../jet/plugin/compiler/JetCompilerManager.java | 2 +- .../configuration/KotlinJsModuleConfigurator.java | 2 +- .../jet/plugin/k2jsrun/K2JSRunnerUtils.java | 2 +- .../jet/plugin/quickfix/ImportInsertHelperImpl.java | 2 +- .../kotlin/di/InjectorForTopDownAnalyzerForJs.java | 2 +- .../org/jetbrains/{k2js => kotlin/js}/JavaScript.kt | 6 +++--- .../{k2js => kotlin/js}/PredefinedAnnotation.kt | 4 ++-- .../js}/analyze/TopDownAnalyzerFacadeForJS.java | 6 +++--- .../{k2js => kotlin/js}/analyze/suppressWarnings.kt | 10 +++++----- .../{k2js => kotlin/js}/config/Config.java | 4 ++-- .../{k2js => kotlin/js}/config/EcmaVersion.java | 4 ++-- .../js}/config/LibrarySourcesConfig.java | 6 +++--- .../js}/config/LibrarySourcesConfigWithCaching.java | 6 +++--- .../resolve/KotlinJsDeclarationCheckerProvider.kt | 10 +++++----- .../resolve/diagnostics/DefaultErrorMessagesJs.kt | 4 ++-- .../js}/resolve/diagnostics/ErrorsJs.java | 13 +++++++------ .../resolve/diagnostics/JsPositioningStrategies.kt | 9 +++------ .../js}/translate/utils/AnnotationsUtils.java | 6 +++--- .../org/jetbrains/kotlin/js/test/BasicTest.java | 10 +++++----- .../js/test/MultipleFilesTranslationTest.java | 2 +- .../js/test/MultipleModulesTranslationTest.kt | 2 +- .../kotlin/js/test/OutputPrefixPostfixTest.java | 2 +- .../kotlin/js/test/SingleFileTranslationTest.java | 2 +- .../jetbrains/kotlin/js/test/rhino/RhinoUtils.java | 4 ++-- .../semantics/CompileMavenGeneratedJSLibrary.java | 2 +- .../kotlin/js/test/semantics/JsUnitTestBase.java | 2 +- .../kotlin/js/test/semantics/NativeInteropTest.java | 4 ++-- .../js/test/semantics/PropertyAccessTest.java | 2 +- .../js/test/semantics/StdLibQUnitTestSupport.java | 2 +- .../kotlin/js/test/semantics/StdLibTest.java | 2 +- .../kotlin/js/test/semantics/StdLibTestBase.java | 2 +- .../kotlin/js/test/semantics/StringTest.java | 2 +- .../jetbrains/kotlin/js/test/utils/JsTestUtils.java | 4 ++-- .../jetbrains/kotlin/js/facade/K2JSTranslator.java | 4 ++-- .../translate/callTranslator/CallInfoExtensions.kt | 2 +- .../js/translate/callTranslator/CallTranslator.kt | 2 +- .../translate/callTranslator/FunctionCallCases.kt | 4 ++-- .../kotlin/js/translate/context/StaticContext.java | 10 +++++----- .../js/translate/context/TranslationContext.java | 2 +- .../js/translate/declaration/PackageTranslator.java | 2 +- .../kotlin/js/translate/general/Translation.java | 2 +- .../intrinsic/functions/factories/TopLevelFIF.java | 2 +- .../translate/reference/CallArgumentTranslator.java | 2 +- .../reference/CallExpressionTranslator.java | 2 +- .../reference/CallableReferenceTranslator.kt | 2 +- .../reference/ClassObjectAccessTranslator.java | 2 +- .../js/translate/utils/JsDescriptorUtils.java | 2 +- .../kotlin/js/translate/utils/ManglingUtils.java | 2 +- .../test/kotlin/NoInternalVisibilityInStdLibTest.kt | 6 +++--- 56 files changed, 110 insertions(+), 116 deletions(-) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/JavaScript.kt (90%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/PredefinedAnnotation.kt (94%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/analyze/TopDownAnalyzerFacadeForJS.java (97%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/analyze/suppressWarnings.kt (91%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/config/Config.java (97%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/config/EcmaVersion.java (90%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/config/LibrarySourcesConfig.java (98%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/config/LibrarySourcesConfigWithCaching.java (97%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/resolve/KotlinJsDeclarationCheckerProvider.kt (95%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/resolve/diagnostics/DefaultErrorMessagesJs.kt (96%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/resolve/diagnostics/ErrorsJs.java (87%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/resolve/diagnostics/JsPositioningStrategies.kt (83%) rename js/js.frontend/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/AnnotationsUtils.java (97%) diff --git a/build.xml b/build.xml index e915806523c..9c84fef3d72 100644 --- a/build.xml +++ b/build.xml @@ -546,10 +546,6 @@ public protected *; } - -keep class org.jetbrains.k2js.** { - public protected *; - } - -keep class org.jetbrains.jet.** { public protected *; } diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java index c894533f891..d5b2164dc74 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java @@ -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; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java index 180eccf30d4..e817c2405b2 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java @@ -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; diff --git a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt index d2ec31d0472..d8c6328e6b3 100644 --- a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt +++ b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt @@ -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 diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt index 94f5e7a9249..25ea1c88f25 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt @@ -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( diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java index ade0e194311..629338c0939 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java @@ -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 diff --git a/idea/src/META-INF/extensions/kotlin2js.xml b/idea/src/META-INF/extensions/kotlin2js.xml index a503deeda3a..98de17c0752 100644 --- a/idea/src/META-INF/extensions/kotlin2js.xml +++ b/idea/src/META-INF/extensions/kotlin2js.xml @@ -2,10 +2,10 @@ org.jetbrains.kotlin - - - - - + + + + + diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java index 7175f450295..0200ce2988a 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java @@ -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; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java index b274ea4e191..29e707b449a 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java @@ -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; diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java index 4fafdf16129..f70cf37050a 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java @@ -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; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java index 4037a3c2737..d5e0212d72c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java @@ -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; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java index ef6a0ffb958..79c16678e89 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java @@ -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; diff --git a/js/js.frontend/src/org/jetbrains/k2js/JavaScript.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/JavaScript.kt similarity index 90% rename from js/js.frontend/src/org/jetbrains/k2js/JavaScript.kt rename to js/js.frontend/src/org/jetbrains/kotlin/js/JavaScript.kt index 02c93294813..24f05200872 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/JavaScript.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/JavaScript.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.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 -} \ No newline at end of file +} diff --git a/js/js.frontend/src/org/jetbrains/k2js/PredefinedAnnotation.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt similarity index 94% rename from js/js.frontend/src/org/jetbrains/k2js/PredefinedAnnotation.kt rename to js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt index 68b75610835..b9b96271d5f 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/PredefinedAnnotation.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.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.k2js +package org.jetbrains.kotlin.js import kotlin.properties.Delegates import org.jetbrains.jet.lang.resolve.name.FqName diff --git a/js/js.frontend/src/org/jetbrains/k2js/analyze/TopDownAnalyzerFacadeForJS.java b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java similarity index 97% rename from js/js.frontend/src/org/jetbrains/k2js/analyze/TopDownAnalyzerFacadeForJS.java rename to js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java index fc2e1b22e37..163a27f2462 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/analyze/TopDownAnalyzerFacadeForJS.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.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.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; diff --git a/js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt similarity index 91% rename from js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt rename to js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt index 8d74e763bd2..bc025ec6262 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.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,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 diff --git a/js/js.frontend/src/org/jetbrains/k2js/config/Config.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java similarity index 97% rename from js/js.frontend/src/org/jetbrains/k2js/config/Config.java rename to js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java index 10b84dd7f26..8d8ef0d9ce2 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/config/Config.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java @@ -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; diff --git a/js/js.frontend/src/org/jetbrains/k2js/config/EcmaVersion.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/EcmaVersion.java similarity index 90% rename from js/js.frontend/src/org/jetbrains/k2js/config/EcmaVersion.java rename to js/js.frontend/src/org/jetbrains/kotlin/js/config/EcmaVersion.java index 00cc597f5e8..9739df54bec 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/config/EcmaVersion.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/EcmaVersion.java @@ -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; diff --git a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java similarity index 98% rename from js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java rename to js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java index e1bfb32de02..cecda8b6775 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java @@ -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; diff --git a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfigWithCaching.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java similarity index 97% rename from js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfigWithCaching.java rename to js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java index a6a697c335f..23bd92c1b23 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfigWithCaching.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java @@ -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; diff --git a/js/js.frontend/src/org/jetbrains/k2js/resolve/KotlinJsDeclarationCheckerProvider.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt similarity index 95% rename from js/js.frontend/src/org/jetbrains/k2js/resolve/KotlinJsDeclarationCheckerProvider.kt rename to js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt index 8527e073c7a..99e710d11aa 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/resolve/KotlinJsDeclarationCheckerProvider.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.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.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 diff --git a/js/js.frontend/src/org/jetbrains/k2js/resolve/diagnostics/DefaultErrorMessagesJs.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/DefaultErrorMessagesJs.kt similarity index 96% rename from js/js.frontend/src/org/jetbrains/k2js/resolve/diagnostics/DefaultErrorMessagesJs.kt rename to js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/DefaultErrorMessagesJs.kt index dbad87eaf5d..af7b07854fa 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/resolve/diagnostics/DefaultErrorMessagesJs.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/DefaultErrorMessagesJs.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.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 diff --git a/js/js.frontend/src/org/jetbrains/k2js/resolve/diagnostics/ErrorsJs.java b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java similarity index 87% rename from js/js.frontend/src/org/jetbrains/k2js/resolve/diagnostics/ErrorsJs.java rename to js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java index c4c24b2d3d2..b3c9ceb850b 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/resolve/diagnostics/ErrorsJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.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,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; diff --git a/js/js.frontend/src/org/jetbrains/k2js/resolve/diagnostics/JsPositioningStrategies.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsPositioningStrategies.kt similarity index 83% rename from js/js.frontend/src/org/jetbrains/k2js/resolve/diagnostics/JsPositioningStrategies.kt rename to js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsPositioningStrategies.kt index 353a080cfd0..02e961fb274 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/resolve/diagnostics/JsPositioningStrategies.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsPositioningStrategies.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,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() { val diagnosticWithParameters = diagnostic as DiagnosticWithParameters2> return diagnosticWithParameters.getB() } -} \ No newline at end of file +} diff --git a/js/js.frontend/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java b/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java similarity index 97% rename from js/js.frontend/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java rename to js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java index 799178997d9..ec2804ec1b2 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.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.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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java index fe46bede2f7..63a6580206a 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleFilesTranslationTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleFilesTranslationTest.java index 58475c0d6e9..6768ea095ae 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleFilesTranslationTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleFilesTranslationTest.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt index bd8f0862704..83f35f801de 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt @@ -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 diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTest.java index 8f1125fbdb8..2e4d91b7040 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTest.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/SingleFileTranslationTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/SingleFileTranslationTest.java index c4f48e5eccd..ed048fc47f7 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/SingleFileTranslationTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/SingleFileTranslationTest.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java index 9142c4114a9..4cd5b11055f 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.java index f19e1c0e3b6..d01b40c17af 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.java index 639c578677f..79b446e6fb1 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NativeInteropTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NativeInteropTest.java index 8210d128313..3c954ffc30d 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NativeInteropTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NativeInteropTest.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyAccessTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyAccessTest.java index 5f78394f31b..7a0b1c3f6f8 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyAccessTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyAccessTest.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibQUnitTestSupport.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibQUnitTestSupport.java index c94d15efade..8d582b43878 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibQUnitTestSupport.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibQUnitTestSupport.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTest.java index 779b367fe64..bd70d76830f 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTest.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.java index b5fee9ae15d..ea979019002 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTest.java index 1b577c32e42..b6bd08a6c59 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTest.java @@ -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; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsTestUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsTestUtils.java index 83c91ce6363..9bf6ee84db7 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsTestUtils.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsTestUtils.java @@ -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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java index cbc67c2654b..d6e98ef5fde 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java @@ -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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt index 3d2bf625aa9..b91f2615a48 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt @@ -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 diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt index a599a5fa9dd..60937cc35c0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt @@ -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 diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt index 11b64be9df6..6ed7e453a5f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt @@ -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 diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java index 715a5d4e8d7..2ad89fa56f1 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java @@ -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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java index f29da7583a9..5f287be430e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java @@ -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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java index 386ba46e5e8..a5f7d892301 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java @@ -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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java index 68611ef70df..ea1a14a9778 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java @@ -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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java index fe8702f806d..6369b1b4497 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java @@ -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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java index 2fdc897019b..1f56c649fa7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java @@ -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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java index 001d6d104e6..1efb51eb14e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java @@ -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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt index b69da155946..f6e4665b1bd 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt @@ -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 diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java index ac80f111d07..ad103942371 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java @@ -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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java index a8782a6481e..1589ff0f71f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java @@ -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. 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 17700dc80cd..c51b386326c 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 @@ -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.*; diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt index b1c0c99cc60..80cebeb2ae2 100644 --- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt +++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt @@ -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