From 2bc3aa2199c69c57791f9687081909fcac718e8b Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 4 Jan 2015 05:47:05 +0300 Subject: [PATCH] Rename package k2js -> kotlin.js in js.translator org.jetbrains.k2js -> org.jetbrains.kotlin.js --- .../jetbrains/jet/cli/js/K2JSCompiler.java | 10 ++-- .../k2js/analyze/suppressWarnings.kt | 5 +- .../jetbrains/kotlin/js/inline/JsInliner.java | 2 +- .../inline/clean/removeDefaultInitializers.kt | 6 +-- .../kotlin/js/inline/context/NamingContext.kt | 2 +- .../kotlin/js/inline/util/invocationUtils.kt | 2 +- .../util/rewriters/ReturnReplacingVisitor.kt | 2 +- .../org/jetbrains/k2js/test/BasicTest.java | 14 +++--- .../test/MultipleFilesTranslationTest.java | 2 +- .../test/MultipleModulesTranslationTest.kt | 5 +- .../k2js/test/SingleFileTranslationTest.java | 2 +- .../jetbrains/k2js/test/SourceMapTest.java | 2 +- .../rhino/RhinoFunctionResultChecker.java | 2 +- .../test/rhino/RhinoSystemOutputChecker.java | 2 +- .../jetbrains/k2js/test/rhino/RhinoUtils.java | 4 +- .../k2js/test/semantics/CharTest.java | 2 - .../k2js/test/semantics/ExamplesTest.java | 2 +- .../k2js/test/semantics/JsUnitTestBase.java | 11 +++-- .../k2js/test/semantics/MiscTest.java | 6 +-- .../k2js/test/semantics/NumberTest.java | 2 +- .../k2js/test/semantics/StdLibTest.java | 2 +- .../k2js/test/semantics/StdLibTestBase.java | 2 +- .../k2js/translate/LabelGenerator.java | 30 ------------ .../js}/facade/FacadeUtils.java | 4 +- .../js}/facade/K2JSTranslator.java | 16 +++--- .../js}/facade/MainCallParameters.java | 4 +- .../js}/facade/SourceMapBuilderConsumer.java | 6 +-- .../{k2js => kotlin/js}/facade/Status.kt | 6 +-- .../MainFunctionNotFoundException.java | 4 +- .../exceptions/TranslationException.java | 4 +- .../TranslationInternalException.java | 4 +- .../UnsupportedFeatureException.java | 4 +- .../sourceMap}/JsSourceGenerationVisitor.java | 5 +- .../js/sourceMap}/SourceMap3Builder.java | 4 +- .../js/sourceMap}/SourceMapBuilder.java | 4 +- .../js}/translate/callTranslator/CallInfo.kt | 24 +++------ .../callTranslator/CallInfoExtensions.kt | 31 +++--------- .../callTranslator/CallTranslator.kt | 10 ++-- .../callTranslator/FunctionCallCases.kt | 16 +++--- .../callTranslator/VarialbeCallCases.kt | 6 +-- .../translate/context/AliasingContext.java | 4 +- .../js}/translate/context/DefinitionPlace.kt | 4 +- .../js}/translate/context/DynamicContext.java | 6 +-- .../js}/translate/context/Namer.java | 8 +-- .../translate/context/StandardClasses.java | 6 +-- .../js}/translate/context/StaticContext.java | 18 +++---- .../context/TemporaryConstVariable.java | 4 +- .../translate/context/TemporaryVariable.java | 8 +-- .../translate/context/TranslationContext.java | 13 +++-- .../js}/translate/context/UsageTracker.kt | 6 +-- .../context/generator/Generator.java | 4 +- .../js}/translate/context/generator/Rule.java | 5 +- .../declaration/ClassTranslator.java | 37 +++++++------- .../declaration/DeclarationBodyVisitor.java | 26 +++++----- .../declaration/DefineInvocation.java | 9 ++-- .../declaration/DelegationTranslator.kt | 26 +++++----- .../translate/declaration/FileDeclaration.kt | 18 +++---- .../declaration/JsDataClassGenerator.java | 10 ++-- .../PackageDeclarationTranslator.java | 10 ++-- .../declaration/PackageTranslator.java | 12 ++--- .../declaration/PropertyTranslator.kt | 21 ++++---- .../translate/expression/CatchTranslator.kt | 22 ++++----- .../expression/ExpressionVisitor.java | 46 ++++++++--------- .../expression/FunctionTranslator.java | 22 ++++----- .../expression/LiteralFunctionTranslator.kt | 16 +++--- .../translate/expression/LoopTranslator.kt | 28 +++++------ .../MultiDeclarationTranslator.java | 10 ++-- .../expression/PatternTranslator.java | 24 ++++----- .../expression/StringTemplateTranslator.java | 20 ++++---- .../js}/translate/expression/TryTranslator.kt | 13 +++-- .../translate/expression/WhenTranslator.java | 18 +++---- .../translate/general/AbstractTranslator.java | 6 +-- .../general/JetTestFunctionDetector.java | 6 +-- .../js}/translate/general/Translation.java | 49 ++++++++++--------- .../translate/general/TranslatorVisitor.java | 11 +++-- .../ClassInitializerTranslator.java | 20 ++++---- .../initializer/InitializerUtils.java | 25 +++++----- .../initializer/InitializerVisitor.java | 18 +++---- .../js}/translate/intrinsic/Intrinsics.java | 8 +-- .../functions/FunctionIntrinsics.java | 8 +-- .../basic/BuiltInFunctionIntrinsic.java | 15 +++--- .../basic/BuiltInPropertyIntrinsic.java | 8 +-- .../functions/basic/FunctionIntrinsic.java | 8 +-- .../functions/factories/ArrayFIF.java | 30 ++++-------- .../functions/factories/CompositeFIF.java | 12 ++--- .../factories/FunctionIntrinsicFactory.java | 6 +-- .../factories/KotlinFunctionIntrinsic.java | 12 ++--- .../functions/factories/LongOperationFIF.kt | 18 +++---- .../factories/NumberAndCharConversionFIF.kt | 14 +++--- .../PrimitiveBinaryOperationFIF.java | 20 ++++---- .../factories/PrimitiveUnaryOperationFIF.java | 22 ++++----- .../factories/StringOperationFIF.java | 8 +-- .../functions/factories/TopLevelFIF.java | 26 +++++----- .../patterns/DescriptorPredicate.java | 4 +- .../functions/patterns/NamePredicate.java | 4 +- .../functions/patterns/PatternBuilder.java | 10 ++-- .../intrinsic/operation/CompareToBOIF.kt | 16 +++--- .../intrinsic/operation/EqualsBOIF.kt | 20 ++++---- .../intrinsic/operation/LongCompareToBOIF.kt | 20 ++++---- .../operation/binaryOperationIntrinsics.kt | 10 ++-- .../operation/AssignmentTranslator.java | 26 +++++----- .../operation/BinaryOperationTranslator.java | 30 ++++++------ .../operation/CompareToTranslator.java | 16 +++--- .../operation/IncrementTranslator.java | 26 +++++----- .../IntrinsicAssignmentTranslator.java | 11 ++--- .../IntrinsicIncrementTranslator.java | 10 ++-- .../translate/operation/OperatorTable.java | 4 +- .../OverloadedAssignmentTranslator.java | 9 ++-- .../OverloadedIncrementTranslator.java | 8 +-- .../operation/UnaryOperationTranslator.java | 24 ++++----- .../AbstractCallExpressionTranslator.java | 8 +-- .../reference/AccessTranslationUtils.java | 14 +++--- .../translate/reference/AccessTranslator.java | 4 +- .../reference/ArrayAccessTranslator.java | 16 +++--- .../BackingFieldAccessTranslator.java | 16 +++--- .../reference/CachedAccessTranslator.java | 6 +-- .../reference/CallArgumentTranslator.java | 18 +++---- .../reference/CallExpressionTranslator.java | 26 +++++----- .../reference/CallableReferenceTranslator.kt | 19 +++---- .../ClassObjectAccessTranslator.java | 16 +++--- .../QualifiedExpressionTranslator.java | 22 ++++----- .../reference/ReferenceAccessTranslator.java | 16 +++--- .../reference/ReferenceTranslator.java | 16 +++--- .../reference/VariableAccessTranslator.java | 12 ++--- .../js}/translate/test/CommonUnitTester.java | 4 +- .../js}/translate/test/JSRhinoUnitTester.java | 4 +- .../js}/translate/test/JSTestGenerator.java | 12 ++--- .../js}/translate/test/JSTester.java | 6 +-- .../js}/translate/test/QUnitTester.java | 4 +- .../js}/translate/utils/BindingUtils.java | 6 +-- .../translate/utils/ErrorReportingUtils.java | 4 +- .../utils/FunctionBodyTranslator.java | 20 ++++---- .../js}/translate/utils/InlineAnnotation.kt | 6 +-- .../js}/translate/utils/JsAstUtils.java | 8 +-- .../translate/utils/JsDescriptorUtils.java | 6 +-- .../js}/translate/utils/ManglingUtils.java | 7 +-- .../js}/translate/utils/PsiUtils.java | 4 +- .../js}/translate/utils/TemporariesUtils.java | 10 ++-- .../js}/translate/utils/TranslationUtils.java | 20 ++++---- .../js}/translate/utils/astUtils.kt | 4 +- .../mutator/AssignToExpressionMutator.java | 6 +-- .../utils/mutator/LastExpressionMutator.java | 6 +-- .../js}/translate/utils/mutator/Mutator.java | 4 +- .../js}/translate/utils/utils.kt | 10 ++-- 144 files changed, 815 insertions(+), 888 deletions(-) delete mode 100644 js/js.translator/src/org/jetbrains/k2js/translate/LabelGenerator.java rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/facade/FacadeUtils.java (93%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/facade/K2JSTranslator.java (94%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/facade/MainCallParameters.java (96%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/facade/SourceMapBuilderConsumer.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/facade/Status.kt (93%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/facade/exceptions/MainFunctionNotFoundException.java (89%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/facade/exceptions/TranslationException.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/facade/exceptions/TranslationInternalException.java (89%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/facade/exceptions/UnsupportedFeatureException.java (89%) rename js/js.translator/src/org/jetbrains/{js/compiler => kotlin/js/sourceMap}/JsSourceGenerationVisitor.java (95%) rename js/js.translator/src/org/jetbrains/{js/compiler/sourcemap => kotlin/js/sourceMap}/SourceMap3Builder.java (98%) rename js/js.translator/src/org/jetbrains/{js/compiler/sourcemap => kotlin/js/sourceMap}/SourceMapBuilder.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/callTranslator/CallInfo.kt (89%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/callTranslator/CallInfoExtensions.kt (73%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/callTranslator/CallTranslator.kt (96%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/callTranslator/FunctionCallCases.kt (96%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/callTranslator/VarialbeCallCases.kt (96%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/AliasingContext.java (98%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/DefinitionPlace.kt (94%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/DynamicContext.java (96%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/Namer.java (98%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/StandardClasses.java (97%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/StaticContext.java (97%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/TemporaryConstVariable.java (92%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/TemporaryVariable.java (92%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/TranslationContext.java (96%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/UsageTracker.kt (96%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/generator/Generator.java (94%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/context/generator/Rule.java (88%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/declaration/ClassTranslator.java (90%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/declaration/DeclarationBodyVisitor.java (83%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/declaration/DefineInvocation.java (92%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/declaration/DelegationTranslator.kt (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/declaration/FileDeclaration.kt (85%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/declaration/JsDataClassGenerator.java (97%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/declaration/PackageDeclarationTranslator.java (92%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/declaration/PackageTranslator.java (94%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/declaration/PropertyTranslator.kt (93%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/expression/CatchTranslator.kt (86%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/expression/ExpressionVisitor.java (92%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/expression/FunctionTranslator.java (88%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/expression/LiteralFunctionTranslator.kt (93%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/expression/LoopTranslator.kt (92%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/expression/MultiDeclarationTranslator.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/expression/PatternTranslator.java (86%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/expression/StringTemplateTranslator.java (87%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/expression/TryTranslator.kt (78%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/expression/WhenTranslator.java (93%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/general/AbstractTranslator.java (88%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/general/JetTestFunctionDetector.java (96%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/general/Translation.java (83%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/general/TranslatorVisitor.java (77%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/initializer/ClassInitializerTranslator.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/initializer/InitializerUtils.java (77%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/initializer/InitializerVisitor.java (76%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/Intrinsics.java (81%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/FunctionIntrinsics.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.java (77%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.java (88%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/basic/FunctionIntrinsic.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/factories/ArrayFIF.java (88%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/factories/CompositeFIF.java (85%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/factories/FunctionIntrinsicFactory.java (80%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java (79%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/factories/LongOperationFIF.kt (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt (89%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java (93%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java (89%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/factories/StringOperationFIF.java (82%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/factories/TopLevelFIF.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/patterns/DescriptorPredicate.java (88%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/patterns/NamePredicate.java (96%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/functions/patterns/PatternBuilder.java (97%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/operation/CompareToBOIF.kt (87%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/operation/EqualsBOIF.kt (85%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/operation/LongCompareToBOIF.kt (87%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/intrinsic/operation/binaryOperationIntrinsics.kt (90%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/operation/AssignmentTranslator.java (78%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/operation/BinaryOperationTranslator.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/operation/CompareToTranslator.java (83%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/operation/IncrementTranslator.java (83%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/operation/IntrinsicAssignmentTranslator.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/operation/IntrinsicIncrementTranslator.java (90%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/operation/OperatorTable.java (97%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/operation/OverloadedAssignmentTranslator.java (88%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/operation/OverloadedIncrementTranslator.java (87%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/operation/UnaryOperationTranslator.java (82%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/AbstractCallExpressionTranslator.java (87%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/AccessTranslationUtils.java (90%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/AccessTranslator.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/ArrayAccessTranslator.java (93%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/BackingFieldAccessTranslator.java (79%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/CachedAccessTranslator.java (84%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/CallArgumentTranslator.java (96%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/CallExpressionTranslator.java (93%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/CallableReferenceTranslator.kt (93%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/ClassObjectAccessTranslator.java (85%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/QualifiedExpressionTranslator.java (87%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/ReferenceAccessTranslator.java (80%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/ReferenceTranslator.java (90%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/reference/VariableAccessTranslator.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/test/CommonUnitTester.java (93%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/test/JSRhinoUnitTester.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/test/JSTestGenerator.java (88%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/test/JSTester.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/test/QUnitTester.java (91%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/BindingUtils.java (98%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/ErrorReportingUtils.java (95%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/FunctionBodyTranslator.java (86%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/InlineAnnotation.kt (88%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/JsAstUtils.java (98%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/JsDescriptorUtils.java (97%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/ManglingUtils.java (97%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/PsiUtils.java (98%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/TemporariesUtils.java (88%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/TranslationUtils.java (94%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/astUtils.kt (92%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/mutator/AssignToExpressionMutator.java (87%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/mutator/LastExpressionMutator.java (93%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/mutator/Mutator.java (88%) rename js/js.translator/src/org/jetbrains/{k2js => kotlin/js}/translate/utils/utils.kt (89%) 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 09e364f15c8..c894533f891 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java @@ -53,9 +53,11 @@ 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.*; -import org.jetbrains.k2js.facade.MainCallParameters; -import org.jetbrains.k2js.facade.Status; +import org.jetbrains.k2js.config.Config; +import org.jetbrains.k2js.config.EcmaVersion; +import org.jetbrains.k2js.config.LibrarySourcesConfig; +import org.jetbrains.kotlin.js.facade.MainCallParameters; +import org.jetbrains.kotlin.js.facade.Status; import java.io.File; import java.util.List; @@ -63,7 +65,7 @@ import java.util.List; import static org.jetbrains.jet.cli.common.ExitCode.COMPILATION_ERROR; import static org.jetbrains.jet.cli.common.ExitCode.OK; import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.k2js.facade.K2JSTranslator.translateWithMainCallParameters; +import static org.jetbrains.kotlin.js.facade.K2JSTranslator.translateWithMainCallParameters; public class K2JSCompiler extends CLICompiler { diff --git a/js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt b/js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt index b5fe9d3e80c..8d74e763bd2 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt +++ b/js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt @@ -16,10 +16,7 @@ package org.jetbrains.k2js.analyze -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.diagnostics.Errors -import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression import org.jetbrains.k2js.PredefinedAnnotation.* import org.jetbrains.jet.lang.diagnostics.Diagnostic import org.jetbrains.jet.lang.diagnostics.Severity @@ -59,4 +56,4 @@ public class SuppressWarningsFromExternalModules : DiagnosticsWithSuppression.Di return diagnostic.getSeverity() == Severity.WARNING && file is JetFile && file.getUserData(LibrarySourcesConfig.EXTERNAL_MODULE_NAME) != null } -} \ No newline at end of file +} diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java index 3ba32bcf903..6d060292a4e 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java @@ -28,11 +28,11 @@ import java.util.IdentityHashMap; import java.util.Set; import java.util.Stack; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.flattenStatement; import static org.jetbrains.kotlin.js.inline.FunctionInlineMutator.getInlineableCallReplacement; import static org.jetbrains.kotlin.js.inline.clean.CleanPackage.removeUnusedFunctionDefinitions; import static org.jetbrains.kotlin.js.inline.clean.CleanPackage.removeUnusedLocalFunctionDeclarations; import static org.jetbrains.kotlin.js.inline.util.UtilPackage.*; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.flattenStatement; public class JsInliner extends JsVisitorWithContextImpl { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeDefaultInitializers.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeDefaultInitializers.kt index b52be15b0aa..1c95d46128b 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeDefaultInitializers.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeDefaultInitializers.kt @@ -21,9 +21,9 @@ import com.google.dart.compiler.backend.js.ast.metadata.hasDefaultValue import org.jetbrains.kotlin.js.inline.util.toIdentitySet import org.jetbrains.kotlin.js.inline.util.zipWithDefault -import org.jetbrains.k2js.translate.context.Namer -import org.jetbrains.k2js.translate.context.Namer.isUndefined -import org.jetbrains.k2js.translate.utils.JsAstUtils.flattenStatement +import org.jetbrains.kotlin.js.translate.context.Namer +import org.jetbrains.kotlin.js.translate.context.Namer.isUndefined +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.flattenStatement /** * Removes initializers for default parameters with defined arguments given diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/NamingContext.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/NamingContext.kt index 78c24574fa4..781efd9e17f 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/NamingContext.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/NamingContext.kt @@ -21,7 +21,7 @@ import com.google.dart.compiler.backend.js.ast.* import java.util.ArrayList import java.util.IdentityHashMap -import org.jetbrains.k2js.translate.utils.JsAstUtils +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.inline.util.replaceNames class NamingContext( diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt index 040a7e3b134..27952db058b 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt @@ -21,7 +21,7 @@ import com.google.dart.compiler.backend.js.ast.JsName import com.google.dart.compiler.backend.js.ast.JsExpression import com.google.dart.compiler.backend.js.ast.JsNameRef import com.google.dart.compiler.backend.js.ast.JsFunction -import org.jetbrains.k2js.translate.context.Namer +import org.jetbrains.kotlin.js.translate.context.Namer import com.google.dart.compiler.backend.js.ast.HasName import com.google.dart.compiler.backend.js.ast.JsNode import com.google.dart.compiler.backend.js.ast.metadata.staticRef diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ReturnReplacingVisitor.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ReturnReplacingVisitor.kt index 95dd5c47323..c392140ed63 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ReturnReplacingVisitor.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ReturnReplacingVisitor.kt @@ -26,7 +26,7 @@ import com.google.dart.compiler.backend.js.ast.JsObjectLiteral import com.google.dart.compiler.backend.js.ast.JsReturn import com.google.dart.compiler.backend.js.ast.JsVisitorWithContextImpl import org.jetbrains.kotlin.js.inline.util.canHaveSideEffect -import org.jetbrains.k2js.translate.utils.JsAstUtils +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils class ReturnReplacingVisitor(private val resultRef: JsNameRef?, private val breakLabel: JsNameRef?) : JsVisitorWithContextImpl() { diff --git a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java index 7bda865a769..09ab91f1a77 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java @@ -44,11 +44,11 @@ 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.k2js.facade.Status; -import org.jetbrains.k2js.facade.MainCallParameters; import org.jetbrains.k2js.test.rhino.RhinoResultChecker; import org.jetbrains.k2js.test.utils.JsTestUtils; -import org.jetbrains.k2js.translate.context.Namer; +import org.jetbrains.kotlin.js.facade.MainCallParameters; +import org.jetbrains.kotlin.js.facade.Status; +import org.jetbrains.kotlin.js.translate.context.Namer; import java.io.File; import java.io.IOException; @@ -57,9 +57,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import static org.jetbrains.k2js.facade.K2JSTranslator.translateWithMainCallParameters; import static org.jetbrains.k2js.test.rhino.RhinoUtils.runRhinoTest; import static org.jetbrains.k2js.test.utils.JsTestUtils.convertFileNameToDotJsFile; +import static org.jetbrains.kotlin.js.facade.K2JSTranslator.translateWithMainCallParameters; public abstract class BasicTest extends KotlinTestWithEnvironment { // predictable order of ecma version in tests @@ -198,7 +198,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment { return false; } - protected boolean shouldGenerateSourcemap() { + protected boolean shouldGenerateSourceMap() { return false; } @@ -280,10 +280,10 @@ public abstract class BasicTest extends KotlinTestWithEnvironment { @NotNull private Config createConfig(@NotNull Project project, @NotNull String moduleId, @NotNull EcmaVersion ecmaVersion, @Nullable List libraries) { if (libraries == null) { - return new LibrarySourcesConfigWithCaching(project, moduleId, ecmaVersion, shouldGenerateSourcemap(), IS_INLINE_ENABLED, shouldBeTranslateAsUnitTestClass()); + return new LibrarySourcesConfigWithCaching(project, moduleId, ecmaVersion, shouldGenerateSourceMap(), IS_INLINE_ENABLED, shouldBeTranslateAsUnitTestClass()); } else { - return new LibrarySourcesConfig(project, moduleId, librariesWithJsStdlib(libraries), ecmaVersion, shouldGenerateSourcemap(), IS_INLINE_ENABLED); + return new LibrarySourcesConfig(project, moduleId, librariesWithJsStdlib(libraries), ecmaVersion, shouldGenerateSourceMap(), IS_INLINE_ENABLED); } } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/MultipleFilesTranslationTest.java b/js/js.tests/test/org/jetbrains/k2js/test/MultipleFilesTranslationTest.java index a18ee1a9d19..a8415b57ea9 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/MultipleFilesTranslationTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/MultipleFilesTranslationTest.java @@ -18,8 +18,8 @@ package org.jetbrains.k2js.test; import org.jetbrains.annotations.NotNull; import org.jetbrains.k2js.config.EcmaVersion; -import org.jetbrains.k2js.facade.MainCallParameters; import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker; +import org.jetbrains.kotlin.js.facade.MainCallParameters; import java.util.List; diff --git a/js/js.tests/test/org/jetbrains/k2js/test/MultipleModulesTranslationTest.kt b/js/js.tests/test/org/jetbrains/k2js/test/MultipleModulesTranslationTest.kt index 7280ead119a..6113bc7700c 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/MultipleModulesTranslationTest.kt +++ b/js/js.tests/test/org/jetbrains/k2js/test/MultipleModulesTranslationTest.kt @@ -17,17 +17,14 @@ package org.jetbrains.k2js.test import org.jetbrains.k2js.config.EcmaVersion -import org.jetbrains.k2js.facade.MainCallParameters -import org.jetbrains.k2js.test.BasicTest +import org.jetbrains.kotlin.js.facade.MainCallParameters import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker import java.io.File import java.util.ArrayList import org.jetbrains.k2js.test.utils.JsTestUtils.getAllFilesInDir -import java.util.HashMap import java.util.LinkedHashMap -import java.util.Collections public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(main) { diff --git a/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java b/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java index 9ebda383f0b..3631ef48c83 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java @@ -19,9 +19,9 @@ package org.jetbrains.k2js.test; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.k2js.config.EcmaVersion; -import org.jetbrains.k2js.facade.MainCallParameters; import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker; import org.jetbrains.k2js.test.rhino.RhinoSystemOutputChecker; +import org.jetbrains.kotlin.js.facade.MainCallParameters; import static org.jetbrains.k2js.test.utils.JsTestUtils.readFile; diff --git a/js/js.tests/test/org/jetbrains/k2js/test/SourceMapTest.java b/js/js.tests/test/org/jetbrains/k2js/test/SourceMapTest.java index 36e3992fea5..368270865ce 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/SourceMapTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/SourceMapTest.java @@ -32,7 +32,7 @@ public final class SourceMapTest extends SingleFileTranslationTest { } @Override - protected boolean shouldGenerateSourcemap() { + protected boolean shouldGenerateSourceMap() { return true; } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java index 2e9bd415433..75584496b2d 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java @@ -18,7 +18,7 @@ package org.jetbrains.k2js.test.rhino; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.k2js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.Namer; import org.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java index ea344a14f63..022e9602be5 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java @@ -17,7 +17,7 @@ package org.jetbrains.k2js.test.rhino; import org.jetbrains.annotations.NotNull; -import org.jetbrains.k2js.facade.K2JSTranslator; +import org.jetbrains.kotlin.js.facade.K2JSTranslator; import org.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java index 12a581a24d7..a0a9cae547c 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java @@ -22,7 +22,7 @@ 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.k2js.facade.K2JSTranslator; +import org.jetbrains.kotlin.js.facade.K2JSTranslator; import org.mozilla.javascript.*; import java.io.File; @@ -302,4 +302,4 @@ public final class RhinoUtils { return OPTIMIZATION_DEFAULT; } -} \ No newline at end of file +} diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CharTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/CharTest.java index ce34fc7b4ff..a9132d24718 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CharTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/CharTest.java @@ -16,9 +16,7 @@ package org.jetbrains.k2js.test.semantics; -import org.jetbrains.k2js.facade.exceptions.TranslationInternalException; import org.jetbrains.k2js.test.SingleFileTranslationTest; -import org.junit.Assert; public final class CharTest extends SingleFileTranslationTest { public CharTest() { diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java index b024a006420..180a5b6854d 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java @@ -19,7 +19,7 @@ package org.jetbrains.k2js.test.semantics; import junit.framework.Test; import org.jetbrains.annotations.NotNull; import org.jetbrains.k2js.test.SingleFileTranslationTest; -import org.jetbrains.k2js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.Namer; @SuppressWarnings("JUnitTestCaseWithNoTests") public final class ExamplesTest extends SingleFileTranslationTest { diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/JsUnitTestBase.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/JsUnitTestBase.java index f4a56589c5b..b621abf0947 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/JsUnitTestBase.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/JsUnitTestBase.java @@ -20,13 +20,16 @@ import com.google.common.collect.Lists; import junit.framework.Test; import org.jetbrains.annotations.NotNull; import org.jetbrains.k2js.config.EcmaVersion; -import org.jetbrains.k2js.facade.MainCallParameters; import org.jetbrains.k2js.test.MultipleFilesTranslationTest; -import org.jetbrains.k2js.test.utils.JsUnitTestReporter; import org.jetbrains.k2js.test.rhino.RhinoSystemOutputChecker; import org.jetbrains.k2js.test.rhino.RhinoUtils; +import org.jetbrains.k2js.test.utils.JsUnitTestReporter; +import org.jetbrains.kotlin.js.facade.MainCallParameters; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public abstract class JsUnitTestBase extends MultipleFilesTranslationTest { @@ -48,7 +51,7 @@ public abstract class JsUnitTestBase extends MultipleFilesTranslationTest { @NotNull @Override protected List additionalJsFiles(@NotNull EcmaVersion ecmaVersion) { - ArrayList result = Lists.newArrayList(super.additionalJsFiles(ecmaVersion)); + List result = Lists.newArrayList(super.additionalJsFiles(ecmaVersion)); result.add(JS_TESTS_JS); return result; } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java index 3b9f12a0110..01cd911589d 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java @@ -16,7 +16,7 @@ package org.jetbrains.k2js.test.semantics; -import org.jetbrains.k2js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.Namer; import org.mozilla.javascript.JavaScriptException; /** @@ -36,8 +36,7 @@ public final class MiscTest extends AbstractExpressionTest { fooBoxTest(); } - - public void testSafecallComputesExpressionOnlyOnce() throws Exception { + public void testSafeCallComputesExpressionOnlyOnce() throws Exception { fooBoxTest(); } @@ -171,6 +170,7 @@ public final class MiscTest extends AbstractExpressionTest { fail(); } catch (JavaScriptException e) { + // ignore } } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/NumberTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/NumberTest.java index e29d66881a3..c18deb40ebe 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/NumberTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/NumberTest.java @@ -16,8 +16,8 @@ package org.jetbrains.k2js.test.semantics; -import org.jetbrains.k2js.facade.exceptions.TranslationInternalException; import org.jetbrains.k2js.test.SingleFileTranslationTest; +import org.jetbrains.kotlin.js.facade.exceptions.TranslationInternalException; import org.junit.Assert; public final class NumberTest extends SingleFileTranslationTest { diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTest.java index 74ab9fd2fd1..46a9140af51 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTest.java @@ -18,9 +18,9 @@ package org.jetbrains.k2js.test.semantics; import org.jetbrains.annotations.NotNull; import org.jetbrains.k2js.config.EcmaVersion; -import org.jetbrains.k2js.facade.MainCallParameters; import org.jetbrains.k2js.test.SingleFileTranslationTest; import org.jetbrains.k2js.test.rhino.RhinoFunctionNativeObjectResultChecker; +import org.jetbrains.kotlin.js.facade.MainCallParameters; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java index 48382bc8440..7caa9c9c4d4 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java @@ -20,9 +20,9 @@ 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.k2js.facade.MainCallParameters; import org.jetbrains.k2js.test.SingleFileTranslationTest; import org.jetbrains.k2js.test.rhino.RhinoResultChecker; +import org.jetbrains.kotlin.js.facade.MainCallParameters; import java.io.File; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/LabelGenerator.java b/js/js.translator/src/org/jetbrains/k2js/translate/LabelGenerator.java deleted file mode 100644 index f49f3de70d1..00000000000 --- a/js/js.translator/src/org/jetbrains/k2js/translate/LabelGenerator.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2010-2013 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.k2js.translate; - -public final class LabelGenerator { - private int nameCounter; - private final char prefix; - - public LabelGenerator(char prefix) { - this.prefix = prefix; - } - - public String generate() { - return prefix + Integer.toString(nameCounter++, 36); - } -} diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/FacadeUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/FacadeUtils.java similarity index 93% rename from js/js.translator/src/org/jetbrains/k2js/facade/FacadeUtils.java rename to js/js.translator/src/org/jetbrains/kotlin/js/facade/FacadeUtils.java index 44a480b63e1..0bd3b3bd3c9 100644 --- a/js/js.translator/src/org/jetbrains/k2js/facade/FacadeUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/FacadeUtils.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.facade; +package org.jetbrains.kotlin.js.facade; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java similarity index 94% rename from js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java index e058d9a2b2e..cbc67c2654b 100644 --- a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.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.facade; +package org.jetbrains.kotlin.js.facade; import com.google.common.base.Predicates; import com.google.dart.compiler.backend.js.ast.JsNode; @@ -40,14 +40,14 @@ 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.js.compiler.JsSourceGenerationVisitor; -import org.jetbrains.js.compiler.sourcemap.SourceMap3Builder; -import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder; import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.k2js.config.Config; -import org.jetbrains.k2js.facade.exceptions.TranslationException; -import org.jetbrains.k2js.translate.general.Translation; +import org.jetbrains.kotlin.js.facade.exceptions.TranslationException; import org.jetbrains.kotlin.js.inline.JsInliner; +import org.jetbrains.kotlin.js.sourceMap.JsSourceGenerationVisitor; +import org.jetbrains.kotlin.js.sourceMap.SourceMap3Builder; +import org.jetbrains.kotlin.js.sourceMap.SourceMapBuilder; +import org.jetbrains.kotlin.js.translate.general.Translation; import java.io.File; import java.io.IOException; @@ -56,7 +56,7 @@ import java.util.List; import static org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.hasError; import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; -import static org.jetbrains.k2js.facade.FacadeUtils.parseString; +import static org.jetbrains.kotlin.js.facade.FacadeUtils.parseString; /** * An entry point of translator. diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/MainCallParameters.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/MainCallParameters.java similarity index 96% rename from js/js.translator/src/org/jetbrains/k2js/facade/MainCallParameters.java rename to js/js.translator/src/org/jetbrains/kotlin/js/facade/MainCallParameters.java index 93bcf9706cd..3cf2622b85e 100644 --- a/js/js.translator/src/org/jetbrains/k2js/facade/MainCallParameters.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/MainCallParameters.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.facade; +package org.jetbrains.kotlin.js.facade; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/SourceMapBuilderConsumer.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java rename to js/js.translator/src/org/jetbrains/kotlin/js/facade/SourceMapBuilderConsumer.java index 6e75a217cd9..5db76012fb9 100644 --- a/js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/SourceMapBuilderConsumer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2012 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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.k2js.facade; +package org.jetbrains.kotlin.js.facade; import com.intellij.openapi.editor.Document; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.util.PairConsumer; -import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder; +import org.jetbrains.kotlin.js.sourceMap.SourceMapBuilder; class SourceMapBuilderConsumer implements PairConsumer { @Override diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/Status.kt b/js/js.translator/src/org/jetbrains/kotlin/js/facade/Status.kt similarity index 93% rename from js/js.translator/src/org/jetbrains/k2js/facade/Status.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/facade/Status.kt index 2e4b4c5f9c6..520ef228a8c 100644 --- a/js/js.translator/src/org/jetbrains/k2js/facade/Status.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/Status.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.facade +package org.jetbrains.kotlin.js.facade import kotlin.platform.platformStatic @@ -39,4 +39,4 @@ public class Status private (private val _result: T, private val type: St Fail Success } -} \ No newline at end of file +} diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/exceptions/MainFunctionNotFoundException.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/MainFunctionNotFoundException.java similarity index 89% rename from js/js.translator/src/org/jetbrains/k2js/facade/exceptions/MainFunctionNotFoundException.java rename to js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/MainFunctionNotFoundException.java index 0a00cb2f7d2..7253024fbc6 100644 --- a/js/js.translator/src/org/jetbrains/k2js/facade/exceptions/MainFunctionNotFoundException.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/MainFunctionNotFoundException.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.facade.exceptions; +package org.jetbrains.kotlin.js.facade.exceptions; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/exceptions/TranslationException.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/TranslationException.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/facade/exceptions/TranslationException.java rename to js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/TranslationException.java index 4d951535df0..296386d15d1 100644 --- a/js/js.translator/src/org/jetbrains/k2js/facade/exceptions/TranslationException.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/TranslationException.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.facade.exceptions; +package org.jetbrains.kotlin.js.facade.exceptions; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/exceptions/TranslationInternalException.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/TranslationInternalException.java similarity index 89% rename from js/js.translator/src/org/jetbrains/k2js/facade/exceptions/TranslationInternalException.java rename to js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/TranslationInternalException.java index 7672fa65a12..b2809e66ac9 100644 --- a/js/js.translator/src/org/jetbrains/k2js/facade/exceptions/TranslationInternalException.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/TranslationInternalException.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.facade.exceptions; +package org.jetbrains.kotlin.js.facade.exceptions; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/exceptions/UnsupportedFeatureException.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/UnsupportedFeatureException.java similarity index 89% rename from js/js.translator/src/org/jetbrains/k2js/facade/exceptions/UnsupportedFeatureException.java rename to js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/UnsupportedFeatureException.java index 43f67ef9bcc..f107976013d 100644 --- a/js/js.translator/src/org/jetbrains/k2js/facade/exceptions/UnsupportedFeatureException.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/exceptions/UnsupportedFeatureException.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.facade.exceptions; +package org.jetbrains.kotlin.js.facade.exceptions; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/JsSourceGenerationVisitor.java similarity index 95% rename from js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java rename to js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/JsSourceGenerationVisitor.java index 6d4ac41cc8a..3de2602e08f 100644 --- a/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/JsSourceGenerationVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2012 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,14 +14,13 @@ * limitations under the License. */ -package org.jetbrains.js.compiler; +package org.jetbrains.kotlin.js.sourceMap; import com.google.dart.compiler.backend.js.JsToStringGenerationVisitor; import com.google.dart.compiler.backend.js.ast.*; import com.google.dart.compiler.util.TextOutput; import com.intellij.util.SmartList; import org.jetbrains.annotations.Nullable; -import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMap3Builder.java b/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMap3Builder.java similarity index 98% rename from js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMap3Builder.java rename to js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMap3Builder.java index 18fecc46b9a..b3745dba139 100644 --- a/js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMap3Builder.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMap3Builder.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.js.compiler.sourcemap; +package org.jetbrains.kotlin.js.sourceMap; import com.google.dart.compiler.common.SourceInfo; import com.google.dart.compiler.util.TextOutput; diff --git a/js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMapBuilder.java b/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMapBuilder.java similarity index 91% rename from js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMapBuilder.java rename to js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMapBuilder.java index 6814d186f20..9c5e93cb574 100644 --- a/js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMapBuilder.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMapBuilder.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.js.compiler.sourcemap; +package org.jetbrains.kotlin.js.sourceMap; import java.io.File; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/CallInfo.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt similarity index 89% rename from js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/CallInfo.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt index 8ae9b5231b7..40af737cd09 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/CallInfo.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt @@ -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,28 +14,20 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.callTranslator +package org.jetbrains.kotlin.js.translate.callTranslator import com.google.dart.compiler.backend.js.ast.JsExpression import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.k2js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue -import org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getReceiverParameterForReceiver +import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getReceiverParameterForReceiver import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.* -import org.jetbrains.k2js.translate.utils.AnnotationsUtils -import org.jetbrains.jet.lang.psi.JetSuperExpression -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.descriptors.VariableDescriptor -import com.google.dart.compiler.backend.js.ast.JsName import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils -import com.google.dart.compiler.backend.js.ast.JsNameRef -import org.jetbrains.k2js.translate.utils.JsAstUtils -import org.jetbrains.k2js.translate.context.Namer -import org.jetbrains.k2js.translate.reference.CallArgumentTranslator -import org.jetbrains.k2js.translate.utils.TranslationUtils +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils +import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils import com.google.dart.compiler.backend.js.ast.JsLiteral import com.google.dart.compiler.backend.js.ast.JsConditional import com.google.dart.compiler.backend.js.ast.JsBlock @@ -172,4 +164,4 @@ private fun TranslationContext.createCallInfo(resolvedCall: ResolvedCall): List { if (arguments.isEmpty()) diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/VarialbeCallCases.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt similarity index 96% rename from js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/VarialbeCallCases.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt index db248457df5..1a982aac0df 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/callTranslator/VarialbeCallCases.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt @@ -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.translate.callTranslator +package org.jetbrains.kotlin.js.translate.callTranslator import com.google.dart.compiler.backend.js.ast.JsExpression import com.google.dart.compiler.backend.js.ast.JsNameRef @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor import java.util.Collections import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure -import org.jetbrains.k2js.translate.context.Namer.getCapturedVarAccessor +import org.jetbrains.kotlin.js.translate.context.Namer.getCapturedVarAccessor object NativeVariableAccessCase : VariableAccessCase { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/AliasingContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java similarity index 98% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/AliasingContext.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java index 8e1cfc93d4a..49c498d2130 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/AliasingContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.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.translate.context; +package org.jetbrains.kotlin.js.translate.context; import com.google.dart.compiler.backend.js.ast.JsExpression; import gnu.trove.THashMap; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/DefinitionPlace.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DefinitionPlace.kt similarity index 94% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/DefinitionPlace.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DefinitionPlace.kt index e63c270849d..193fd6bff04 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/DefinitionPlace.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DefinitionPlace.kt @@ -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.translate.context +package org.jetbrains.kotlin.js.translate.context import com.google.dart.compiler.backend.js.ast.JsExpression import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DynamicContext.java similarity index 96% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DynamicContext.java index 7d41a3d3b92..99db190c06f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DynamicContext.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.translate.context; +package org.jetbrains.kotlin.js.translate.context; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; @@ -87,4 +87,4 @@ public final class DynamicContext { public JsBlock jsBlock() { return currentBlock; } -} \ No newline at end of file +} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java similarity index 98% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java index e1650bc8ae8..2f5a3a63258 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.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.translate.context; +package org.jetbrains.kotlin.js.translate.context; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; @@ -25,10 +25,10 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLanguage; import static com.google.dart.compiler.backend.js.ast.AstPackage.JsObjectScope; -import static org.jetbrains.k2js.translate.utils.ManglingUtils.getStableMangledNameForDescriptor; +import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getStableMangledNameForDescriptor; /** - * Encapuslates different types of constants and naming conventions. + * Encapsulates different types of constants and naming conventions. */ public final class Namer { public static final String KOTLIN_NAME = JetLanguage.NAME; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StandardClasses.java similarity index 97% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StandardClasses.java index d61c278a225..9759000b597 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StandardClasses.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.translate.context; +package org.jetbrains.kotlin.js.translate.context; import com.google.common.collect.Maps; import com.google.dart.compiler.backend.js.ast.JsName; @@ -32,7 +32,7 @@ import static com.google.dart.compiler.backend.js.ast.AstPackage.JsObjectScope; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; /** - * Provides a mechanism to bind some of the kotlin/java declations with library implementations. + * Provides a mechanism to bind some of the Kotlin/Java declarations with library implementations. * Makes sense only for those declaration that cannot be annotated. (Use library annotation in this case) */ public final class StandardClasses { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java similarity index 97% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java index f558a2c638c..715a5d4e8d7 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.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.translate.context; +package org.jetbrains.kotlin.js.translate.context; import com.google.common.collect.Maps; import com.google.dart.compiler.backend.js.ast.*; @@ -32,10 +32,10 @@ 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.k2js.translate.context.generator.Generator; -import org.jetbrains.k2js.translate.context.generator.Rule; -import org.jetbrains.k2js.translate.intrinsic.Intrinsics; -import org.jetbrains.k2js.translate.utils.JsAstUtils; +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; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import java.util.Map; @@ -43,9 +43,9 @@ import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorT 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.k2js.translate.utils.JsDescriptorUtils.*; -import static org.jetbrains.k2js.translate.utils.ManglingUtils.getMangledName; -import static org.jetbrains.k2js.translate.utils.ManglingUtils.getSuggestedName; +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; /** * Aggregates all the static parts of the context. diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/TemporaryConstVariable.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryConstVariable.java similarity index 92% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/TemporaryConstVariable.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryConstVariable.java index 46eb4af5838..d59bc98c29c 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/TemporaryConstVariable.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryConstVariable.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.translate.context; +package org.jetbrains.kotlin.js.translate.context; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsName; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/TemporaryVariable.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryVariable.java similarity index 92% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/TemporaryVariable.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryVariable.java index c30ee87d4ab..1db67c1435b 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/TemporaryVariable.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryVariable.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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.context; +package org.jetbrains.kotlin.js.translate.context; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsName; import com.google.dart.compiler.backend.js.ast.JsNameRef; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.k2js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; public class TemporaryVariable { @@ -54,4 +54,4 @@ public class TemporaryVariable { assert assignmentExpression != null; return assignmentExpression; } -} \ No newline at end of file +} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java similarity index 96% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java index aa168487405..f29da7583a9 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.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.translate.context; +package org.jetbrains.kotlin.js.translate.context; import com.google.dart.compiler.backend.js.ast.*; import com.intellij.psi.PsiElement; @@ -28,17 +28,16 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticSink; 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.BindingTraceContext; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.k2js.config.Config; -import org.jetbrains.k2js.translate.intrinsic.Intrinsics; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.intrinsic.Intrinsics; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import java.util.HashMap; import java.util.Map; -import static org.jetbrains.k2js.translate.context.ContextPackage.getNameForCapturedDescriptor; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForElement; +import static org.jetbrains.kotlin.js.translate.context.ContextPackage.getNameForCapturedDescriptor; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForElement; /** * All the info about the state of the translation process. diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt similarity index 96% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt index 12ce5bb782d..88cbe1c51f1 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.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,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.context +package org.jetbrains.kotlin.js.translate.context import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorUtils.isAncestor import com.google.dart.compiler.backend.js.ast.JsName -import org.jetbrains.k2js.translate.utils.ManglingUtils.getSuggestedName +import org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getSuggestedName import com.google.dart.compiler.backend.js.ast.JsFunctionScope private val CAPTURED_RECEIVER_NAME_PREFIX : String = "this$" diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/generator/Generator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Generator.java similarity index 94% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/generator/Generator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Generator.java index 8ef2233ad65..7db6af958cc 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/generator/Generator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Generator.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.translate.context.generator; +package org.jetbrains.kotlin.js.translate.context.generator; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/generator/Rule.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Rule.java similarity index 88% rename from js/js.translator/src/org/jetbrains/k2js/translate/context/generator/Rule.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Rule.java index 95a0142ea42..587777fb111 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/generator/Rule.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Rule.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,14 +14,13 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.context.generator; +package org.jetbrains.kotlin.js.translate.context.generator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; public interface Rule { - @Nullable V apply(@NotNull DeclarationDescriptor descriptor); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java similarity index 90% rename from js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java index 0c8a53a3598..00eb31c5f84 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.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.translate.declaration; +package org.jetbrains.kotlin.js.translate.declaration; import com.google.dart.compiler.backend.js.ast.*; import com.intellij.util.SmartList; @@ -29,27 +29,28 @@ import org.jetbrains.jet.lang.psi.JetParameter; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.k2js.translate.context.DefinitionPlace; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.declaration.propertyTranslator.PropertyTranslatorPackage; -import org.jetbrains.k2js.translate.expression.ExpressionPackage; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.initializer.ClassInitializerTranslator; -import org.jetbrains.k2js.translate.utils.JsAstUtils; -import org.jetbrains.k2js.translate.utils.UtilsPackage; +import org.jetbrains.kotlin.js.translate.context.DefinitionPlace; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.PropertyTranslatorPackage; +import org.jetbrains.kotlin.js.translate.expression.ExpressionPackage; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.initializer.ClassInitializerTranslator; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.UtilsPackage; import java.util.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; import static org.jetbrains.jet.lang.types.TypeUtils.topologicallySortSuperclassesAndRecordAllInstances; -import static org.jetbrains.k2js.translate.reference.ReferenceTranslator.translateAsFQReference; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getClassDescriptor; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptorForConstructorParameter; -import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.*; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getPrimaryConstructorParameters; -import static org.jetbrains.k2js.translate.utils.TranslationUtils.simpleReturnFunction; -import static org.jetbrains.k2js.translate.utils.UtilsPackage.*; +import static org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator.translateAsFQReference; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getClassDescriptor; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getPropertyDescriptorForConstructorParameter; +import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getReceiverParameterForDeclaration; +import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getSupertypesWithoutFakes; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getPrimaryConstructorParameters; +import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.simpleReturnFunction; +import static org.jetbrains.kotlin.js.translate.utils.UtilsPackage.generateDelegateCall; /** * Generates a definition of a single class. diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java similarity index 83% rename from js/js.translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java index 6ebc2a6ff82..e815df05280 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.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.translate.declaration; +package org.jetbrains.kotlin.js.translate.declaration; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsFunction; @@ -28,20 +28,20 @@ import org.jetbrains.jet.lang.descriptors.Modality; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.declaration.propertyTranslator.PropertyTranslatorPackage; -import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.general.TranslatorVisitor; -import org.jetbrains.k2js.translate.initializer.ClassInitializerTranslator; -import org.jetbrains.k2js.translate.utils.BindingUtils; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.PropertyTranslatorPackage; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.general.TranslatorVisitor; +import org.jetbrains.kotlin.js.translate.initializer.ClassInitializerTranslator; +import org.jetbrains.kotlin.js.translate.utils.BindingUtils; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import java.util.List; -import static org.jetbrains.k2js.translate.initializer.InitializerUtils.createClassObjectInitializer; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getClassDescriptor; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptor; -import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getSupertypesWithoutFakes; +import static org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.createClassObjectInitializer; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getClassDescriptor; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDescriptor; +import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getSupertypesWithoutFakes; public class DeclarationBodyVisitor extends TranslatorVisitor { @KotlinSignature("val result: MutableList") diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/DefineInvocation.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DefineInvocation.java similarity index 92% rename from js/js.translator/src/org/jetbrains/k2js/translate/declaration/DefineInvocation.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DefineInvocation.java index 17428d33ec9..529edd102ab 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/DefineInvocation.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DefineInvocation.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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.declaration; +package org.jetbrains.kotlin.js.translate.declaration; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import java.util.AbstractList; import java.util.List; @@ -75,6 +75,7 @@ public class DefineInvocation { @NotNull public List asList() { return new AbstractList() { // because initializer is mutable + @NotNull @Override public JsExpression get(int index) { switch (index) { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/DelegationTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/declaration/DelegationTranslator.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt index 5d92dd76511..fcf31f41fd0 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/DelegationTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.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,28 +14,26 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.declaration +package org.jetbrains.kotlin.js.translate.declaration import com.google.dart.compiler.backend.js.ast.* -import com.intellij.util.SmartList import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.psi.* -import org.jetbrains.k2js.translate.context.Namer -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.general.AbstractTranslator -import org.jetbrains.k2js.translate.general.Translation -import org.jetbrains.k2js.translate.utils.BindingUtils -import org.jetbrains.k2js.translate.utils.JsAstUtils -import org.jetbrains.k2js.translate.utils.JsDescriptorUtils -import org.jetbrains.k2js.translate.utils.TranslationUtils.* +import org.jetbrains.kotlin.js.translate.context.Namer +import org.jetbrains.kotlin.js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator +import org.jetbrains.kotlin.js.translate.general.Translation +import org.jetbrains.kotlin.js.translate.utils.BindingUtils +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.* import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.backend.common.CodegenUtil import java.util.HashMap -import org.jetbrains.k2js.translate.declaration.propertyTranslator.addGetterAndSetter -import org.jetbrains.k2js.translate.utils.ManglingUtils.getMangledMemberNameForExplicitDelegation -import org.jetbrains.k2js.translate.utils.generateDelegateCall +import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.addGetterAndSetter +import org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getMangledMemberNameForExplicitDelegation +import org.jetbrains.kotlin.js.translate.utils.generateDelegateCall import org.jetbrains.jet.backend.common.CodegenUtilKt public class DelegationTranslator( diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/FileDeclaration.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt similarity index 85% rename from js/js.translator/src/org/jetbrains/k2js/translate/declaration/FileDeclaration.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt index ffac261c168..bfe5cc56fd6 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/FileDeclaration.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt @@ -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. @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.k2js.translate.declaration +package org.jetbrains.kotlin.js.translate.declaration import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer -import org.jetbrains.k2js.translate.initializer.InitializerVisitor -import org.jetbrains.k2js.translate.utils.JsAstUtils -import org.jetbrains.k2js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.initializer.InitializerVisitor +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils +import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.jet.lang.psi.JetClassInitializer -import org.jetbrains.k2js.translate.general.Translation +import org.jetbrains.kotlin.js.translate.general.Translation import org.jetbrains.jet.lang.psi.JetProperty -import org.jetbrains.k2js.translate.initializer.InitializerUtils +import org.jetbrains.kotlin.js.translate.initializer.InitializerUtils import org.jetbrains.jet.lang.psi.JetObjectDeclaration import org.jetbrains.jet.lang.psi.JetClass import com.google.dart.compiler.backend.js.ast.JsFunction -import org.jetbrains.k2js.translate.utils.BindingUtils.* -import org.jetbrains.k2js.translate.initializer.InitializerUtils.* +import org.jetbrains.kotlin.js.translate.utils.BindingUtils.* +import org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.* import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import com.intellij.util.SmartList diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/JsDataClassGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java similarity index 97% rename from js/js.translator/src/org/jetbrains/k2js/translate/declaration/JsDataClassGenerator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java index bbeeaa2e056..427c8c77857 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/JsDataClassGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.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.declaration; +package org.jetbrains.kotlin.js.translate.declaration; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; @@ -23,9 +23,9 @@ import org.jetbrains.jet.backend.common.DataClassMethodGenerator; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetClassOrObject; import org.jetbrains.jet.lang.psi.JetParameter; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import java.util.ArrayList; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PackageDeclarationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java similarity index 92% rename from js/js.translator/src/org/jetbrains/k2js/translate/declaration/PackageDeclarationTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java index 8cb3bdba5fd..3f80d24f2a6 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PackageDeclarationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.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.translate.declaration; +package org.jetbrains.kotlin.js.translate.declaration; import com.google.dart.compiler.backend.js.ast.*; import gnu.trove.THashMap; @@ -24,9 +24,9 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import java.util.*; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PackageTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java similarity index 94% rename from js/js.translator/src/org/jetbrains/k2js/translate/declaration/PackageTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java index b1401183af1..386ba46e5e8 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PackageTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.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.translate.declaration; +package org.jetbrains.kotlin.js.translate.declaration; import com.google.dart.compiler.backend.js.ast.*; import com.intellij.util.SmartList; @@ -24,11 +24,11 @@ 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.context.DefinitionPlace; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; import org.jetbrains.k2js.translate.utils.AnnotationsUtils; -import org.jetbrains.k2js.translate.utils.BindingUtils; +import org.jetbrains.kotlin.js.translate.context.DefinitionPlace; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.utils.BindingUtils; import java.util.List; import java.util.Map; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt similarity index 93% rename from js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt index da32d14c570..6bc054e3490 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.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.translate.declaration.propertyTranslator +package org.jetbrains.kotlin.js.translate.declaration.propertyTranslator import com.google.dart.compiler.backend.js.ast.* import com.intellij.util.SmartList @@ -22,15 +22,14 @@ import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.psi.JetProperty import org.jetbrains.jet.lang.psi.JetPropertyAccessor import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.k2js.translate.callTranslator.CallTranslator -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.general.AbstractTranslator -import org.jetbrains.k2js.translate.general.Translation -import org.jetbrains.k2js.translate.utils.JsDescriptorUtils - -import org.jetbrains.k2js.translate.context.Namer.* -import org.jetbrains.k2js.translate.utils.ast.* -import org.jetbrains.k2js.translate.utils.TranslationUtils.* +import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator +import org.jetbrains.kotlin.js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator +import org.jetbrains.kotlin.js.translate.general.Translation +import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils +import org.jetbrains.kotlin.js.translate.context.Namer.* +import org.jetbrains.kotlin.js.translate.utils.ast.* +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.* import org.jetbrains.jet.lang.resolve.DescriptorUtils.isExtension import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/CatchTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt similarity index 86% rename from js/js.translator/src/org/jetbrains/k2js/translate/expression/CatchTranslator.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt index 145e1e6596d..ff7e0aa4f45 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/CatchTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.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,24 +14,22 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.expression +package org.jetbrains.kotlin.js.translate.expression import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.jet.lang.psi.JetCatchClause -import org.jetbrains.jet.lang.psi.JetExpression import org.jetbrains.jet.lang.psi.JetTypeReference import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.BindingContextUtils.getNotNull import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.general.AbstractTranslator -import org.jetbrains.k2js.translate.general.Translation.patternTranslator -import org.jetbrains.k2js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded -import org.jetbrains.k2js.translate.utils.JsAstUtils.convertToBlock -import org.jetbrains.k2js.translate.utils.TranslationUtils -import java.util.Collections -import org.jetbrains.k2js.translate.utils.JsAstUtils +import org.jetbrains.kotlin.js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator +import org.jetbrains.kotlin.js.translate.general.Translation.patternTranslator +import org.jetbrains.kotlin.js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToBlock +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils class CatchTranslator( val catches: List, @@ -122,4 +120,4 @@ class CatchTranslator( return jetTypeName == throwableClassName } -} \ No newline at end of file +} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java similarity index 92% rename from js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java index 48e9070be37..60e003da5bb 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.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.translate.expression; +package org.jetbrains.kotlin.js.translate.expression; import com.google.dart.compiler.backend.js.ast.*; import com.google.dart.compiler.backend.js.ast.metadata.MetadataPackage; @@ -33,31 +33,31 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.lang.InlineUtil; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.declaration.ClassTranslator; -import org.jetbrains.k2js.translate.expression.loopTranslator.LoopTranslatorPackage; -import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.general.TranslatorVisitor; -import org.jetbrains.k2js.translate.operation.BinaryOperationTranslator; -import org.jetbrains.k2js.translate.operation.UnaryOperationTranslator; -import org.jetbrains.k2js.translate.reference.*; -import org.jetbrains.k2js.translate.utils.JsAstUtils; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.declaration.ClassTranslator; +import org.jetbrains.kotlin.js.translate.expression.loopTranslator.LoopTranslatorPackage; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.general.TranslatorVisitor; +import org.jetbrains.kotlin.js.translate.operation.BinaryOperationTranslator; +import org.jetbrains.kotlin.js.translate.operation.UnaryOperationTranslator; +import org.jetbrains.kotlin.js.translate.reference.*; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import java.util.List; import static org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure; -import static org.jetbrains.k2js.translate.context.Namer.getCapturedVarAccessor; -import static org.jetbrains.k2js.translate.general.Translation.translateAsExpression; -import static org.jetbrains.k2js.translate.reference.CallExpressionTranslator.shouldBeInlined; -import static org.jetbrains.k2js.translate.reference.ReferenceTranslator.translateAsFQReference; -import static org.jetbrains.k2js.translate.utils.BindingUtils.*; -import static org.jetbrains.k2js.translate.utils.ErrorReportingUtils.message; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.convertToStatement; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.newVar; -import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getReceiverParameterForDeclaration; -import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateInitializerForProperty; +import static org.jetbrains.kotlin.js.translate.context.Namer.getCapturedVarAccessor; +import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsExpression; +import static org.jetbrains.kotlin.js.translate.reference.CallExpressionTranslator.shouldBeInlined; +import static org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator.translateAsFQReference; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.*; +import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToStatement; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.newVar; +import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getReceiverParameterForDeclaration; +import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.translateInitializerForProperty; public final class ExpressionVisitor extends TranslatorVisitor { @Override diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java similarity index 88% rename from js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java index 52e0ff3a84b..badcb2622c0 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.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.translate.expression; +package org.jetbrains.kotlin.js.translate.expression; import com.google.dart.compiler.backend.js.ast.JsFunction; @@ -32,19 +32,19 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.psi.JetDeclarationWithBody; import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.k2js.translate.context.AliasingContext; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.context.AliasingContext; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import java.util.Collections; import java.util.List; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptor; -import static org.jetbrains.k2js.translate.utils.ErrorReportingUtils.message; -import static org.jetbrains.k2js.translate.utils.FunctionBodyTranslator.translateFunctionBody; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.setParameters; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDescriptor; +import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; +import static org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.translateFunctionBody; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.setParameters; public final class FunctionTranslator extends AbstractTranslator { @NotNull diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/LiteralFunctionTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt similarity index 93% rename from js/js.translator/src/org/jetbrains/k2js/translate/expression/LiteralFunctionTranslator.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt index 3df2769487a..9d9ca4318dc 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/LiteralFunctionTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.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.translate.expression +package org.jetbrains.kotlin.js.translate.expression import com.google.dart.compiler.backend.js.ast.* import com.google.dart.compiler.backend.js.ast.metadata.staticRef @@ -22,14 +22,14 @@ import com.google.dart.compiler.backend.js.ast.metadata.isLocal import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor import org.jetbrains.jet.lang.psi.JetDeclarationWithBody -import org.jetbrains.k2js.translate.context.* -import org.jetbrains.k2js.translate.general.AbstractTranslator -import org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptor -import org.jetbrains.k2js.translate.utils.FunctionBodyTranslator.translateFunctionBody -import org.jetbrains.k2js.translate.utils.TranslationUtils.simpleReturnFunction +import org.jetbrains.kotlin.js.translate.context.* +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator +import org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDescriptor +import org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.translateFunctionBody +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.simpleReturnFunction import org.jetbrains.jet.lang.descriptors.MemberDescriptor import org.jetbrains.jet.lang.descriptors.Visibilities -import org.jetbrains.k2js.translate.utils.JsAstUtils +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.inline.util.getInnerFunction import org.jetbrains.jet.lang.types.lang.InlineUtil import org.jetbrains.jet.lang.descriptors.FunctionDescriptor diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/LoopTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt similarity index 92% rename from js/js.translator/src/org/jetbrains/k2js/translate/expression/LoopTranslator.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt index c49d69c39eb..a656ca3877e 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/LoopTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.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.translate.expression.loopTranslator +package org.jetbrains.kotlin.js.translate.expression.loopTranslator import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.jet.lang.descriptors.FunctionDescriptor @@ -22,17 +22,17 @@ import org.jetbrains.jet.lang.psi.* import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType import org.jetbrains.jet.lexer.JetTokens -import org.jetbrains.k2js.translate.callTranslator.CallTranslator -import org.jetbrains.k2js.translate.context.TemporaryVariable -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.expression.MultiDeclarationTranslator -import org.jetbrains.k2js.translate.general.Translation -import org.jetbrains.k2js.translate.intrinsic.functions.factories.CompositeFIF -import org.jetbrains.k2js.translate.utils.BindingUtils.* -import org.jetbrains.k2js.translate.utils.JsAstUtils.* -import org.jetbrains.k2js.translate.utils.PsiUtils.* -import org.jetbrains.k2js.translate.utils.TemporariesUtils.temporariesInitialization -import org.jetbrains.k2js.translate.utils.TranslationUtils +import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable +import org.jetbrains.kotlin.js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.expression.MultiDeclarationTranslator +import org.jetbrains.kotlin.js.translate.general.Translation +import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.CompositeFIF +import org.jetbrains.kotlin.js.translate.utils.BindingUtils.* +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.* +import org.jetbrains.kotlin.js.translate.utils.PsiUtils.* +import org.jetbrains.kotlin.js.translate.utils.TemporariesUtils.temporariesInitialization +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils public fun createWhile(doWhile: Boolean, expression: JetWhileExpressionBase, context: TranslationContext): JsNode { val conditionExpression = expression.getCondition() ?: @@ -238,4 +238,4 @@ public fun translateForExpression(expression: JetForExpression, context: Transla else -> translateForOverIterator() } -} \ No newline at end of file +} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/MultiDeclarationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/expression/MultiDeclarationTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java index f8a2ece2303..8ed69caab8f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/MultiDeclarationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.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.translate.expression; +package org.jetbrains.kotlin.js.translate.expression; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsName; @@ -29,9 +29,9 @@ import org.jetbrains.jet.lang.psi.JetMultiDeclarationEntry; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.k2js.translate.callTranslator.CallTranslator; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import java.util.ArrayList; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java similarity index 86% rename from js/js.translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java index 586227efca1..fc1dc3c1402 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.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.translate.expression; +package org.jetbrains.kotlin.js.translate.expression; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsInvocation; @@ -26,17 +26,17 @@ import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetIsExpression; import org.jetbrains.jet.lang.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate; -import org.jetbrains.k2js.translate.utils.BindingUtils; -import org.jetbrains.k2js.translate.utils.JsAstUtils; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate; +import org.jetbrains.kotlin.js.translate.utils.BindingUtils; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getTypeByReference; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.*; -import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getNameIfStandardType; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getTypeByReference; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.*; +import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getNameIfStandardType; public final class PatternTranslator extends AbstractTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/StringTemplateTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java similarity index 87% rename from js/js.translator/src/org/jetbrains/k2js/translate/expression/StringTemplateTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java index c8de21044d0..408ffe293ad 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/StringTemplateTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.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.translate.expression; +package org.jetbrains.kotlin.js.translate.expression; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsInvocation; @@ -26,17 +26,17 @@ import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.intrinsic.functions.factories.TopLevelFIF; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.TopLevelFIF; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate; import java.util.Collections; -import static org.jetbrains.k2js.translate.utils.ErrorReportingUtils.message; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.sum; -import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getNameIfStandardType; +import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.sum; +import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getNameIfStandardType; public final class StringTemplateTranslator extends AbstractTranslator { private final JetStringTemplateEntry[] expressionEntries; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/TryTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.kt similarity index 78% rename from js/js.translator/src/org/jetbrains/k2js/translate/expression/TryTranslator.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.kt index 48efcefe47d..0e2d00ce142 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/TryTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.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,16 +14,15 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.expression +package org.jetbrains.kotlin.js.translate.expression import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.jet.lang.psi.JetTryExpression import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.psi.JetCatchClause -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.general.AbstractTranslator -import org.jetbrains.k2js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded -import org.jetbrains.k2js.translate.utils.JsAstUtils.convertToBlock +import org.jetbrains.kotlin.js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator +import org.jetbrains.kotlin.js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToBlock public class TryTranslator( val expression: JetTryExpression, diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java similarity index 93% rename from js/js.translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java index 3ecb6b92088..bc290b0dd7b 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.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,20 +14,20 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.expression; +package org.jetbrains.kotlin.js.translate.expression; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.utils.JsAstUtils; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.negated; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.negated; public final class WhenTranslator extends AbstractTranslator { @Nullable diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/general/AbstractTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.java similarity index 88% rename from js/js.translator/src/org/jetbrains/k2js/translate/general/AbstractTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.java index 34073bb8864..82026b49d65 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/general/AbstractTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.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,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.general; +package org.jetbrains.kotlin.js.translate.general; import com.google.dart.compiler.backend.js.ast.JsProgram; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.k2js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; public abstract class AbstractTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/general/JetTestFunctionDetector.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java similarity index 96% rename from js/js.translator/src/org/jetbrains/k2js/translate/general/JetTestFunctionDetector.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java index 80ce2565079..c4499d71998 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/general/JetTestFunctionDetector.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.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.translate.general; +package org.jetbrains.kotlin.js.translate.general; import com.google.common.collect.Lists; import com.intellij.util.Function; @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.k2js.translate.utils.BindingUtils; +import org.jetbrains.kotlin.js.translate.utils.BindingUtils; import java.util.Collection; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java similarity index 83% rename from js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java index 36cce97a54b..68611ef70df 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.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.translate.general; +package org.jetbrains.kotlin.js.translate.general; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; @@ -29,32 +29,35 @@ 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.k2js.facade.MainCallParameters; -import org.jetbrains.k2js.facade.exceptions.*; -import org.jetbrains.k2js.translate.callTranslator.CallTranslator; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.StaticContext; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.declaration.PackageDeclarationTranslator; -import org.jetbrains.k2js.translate.expression.ExpressionVisitor; -import org.jetbrains.k2js.translate.expression.FunctionTranslator; -import org.jetbrains.k2js.translate.expression.PatternTranslator; -import org.jetbrains.k2js.translate.test.JSRhinoUnitTester; -import org.jetbrains.k2js.translate.test.JSTestGenerator; -import org.jetbrains.k2js.translate.test.JSTester; -import org.jetbrains.k2js.translate.test.QUnitTester; -import org.jetbrains.k2js.translate.utils.JsAstUtils; -import org.jetbrains.k2js.translate.utils.mutator.AssignToExpressionMutator; +import org.jetbrains.kotlin.js.facade.MainCallParameters; +import org.jetbrains.kotlin.js.facade.exceptions.MainFunctionNotFoundException; +import org.jetbrains.kotlin.js.facade.exceptions.TranslationException; +import org.jetbrains.kotlin.js.facade.exceptions.TranslationInternalException; +import org.jetbrains.kotlin.js.facade.exceptions.UnsupportedFeatureException; +import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.StaticContext; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.declaration.PackageDeclarationTranslator; +import org.jetbrains.kotlin.js.translate.expression.ExpressionVisitor; +import org.jetbrains.kotlin.js.translate.expression.FunctionTranslator; +import org.jetbrains.kotlin.js.translate.expression.PatternTranslator; +import org.jetbrains.kotlin.js.translate.test.JSRhinoUnitTester; +import org.jetbrains.kotlin.js.translate.test.JSTestGenerator; +import org.jetbrains.kotlin.js.translate.test.JSTester; +import org.jetbrains.kotlin.js.translate.test.QUnitTester; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.mutator.AssignToExpressionMutator; import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptor; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.convertToStatement; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.toStringLiteralList; -import static org.jetbrains.k2js.translate.utils.mutator.LastExpressionMutator.mutateLastExpression; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDescriptor; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToStatement; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.toStringLiteralList; +import static org.jetbrains.kotlin.js.translate.utils.mutator.LastExpressionMutator.mutateLastExpression; /** * This class provides a interface which all translators use to interact with each other. diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/general/TranslatorVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.java similarity index 77% rename from js/js.translator/src/org/jetbrains/k2js/translate/general/TranslatorVisitor.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.java index 04a0e34b87c..7f33f351590 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/general/TranslatorVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/TranslatorVisitor.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,11 +14,14 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.general; +package org.jetbrains.kotlin.js.translate.general; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.k2js.translate.context.TranslationContext; +import org.jetbrains.jet.lang.psi.JetDeclaration; +import org.jetbrains.jet.lang.psi.JetDeclarationContainer; +import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.jet.lang.psi.JetVisitor; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; /** * This class is a base class for all visitors. diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java index 585573deb81..096dc0ec310 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.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.translate.initializer; +package org.jetbrains.kotlin.js.translate.initializer; import com.google.dart.compiler.backend.js.ast.*; import com.intellij.util.SmartList; @@ -31,20 +31,20 @@ import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.declaration.DelegationTranslator; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.reference.CallArgumentTranslator; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.declaration.DelegationTranslator; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator; import java.util.ArrayList; import java.util.Collections; import java.util.List; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType; -import static org.jetbrains.k2js.translate.utils.BindingUtils.*; -import static org.jetbrains.k2js.translate.utils.FunctionBodyTranslator.setDefaultValueForArguments; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getPrimaryConstructorParameters; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.*; +import static org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.setDefaultValueForArguments; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getPrimaryConstructorParameters; public final class ClassInitializerTranslator extends AbstractTranslator { @NotNull diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java similarity index 77% rename from js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java index 46c41646e5e..f2c87ca5e8a 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.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,26 +14,27 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.initializer; +package org.jetbrains.kotlin.js.translate.initializer; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetObjectDeclaration; import org.jetbrains.jet.lang.psi.JetProperty; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.declaration.ClassTranslator; -import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.declaration.ClassTranslator; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import java.util.List; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getClassDescriptor; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.assignment; -import static org.jetbrains.k2js.translate.utils.TranslationUtils.assignmentToBackingField; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getClassDescriptor; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.assignment; +import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.assignmentToBackingField; public final class InitializerUtils { private InitializerUtils() { @@ -73,4 +74,4 @@ public final class InitializerUtils { JsStringLiteral classObjectInitStr = context.program().getStringLiteral(Namer.getNameForClassObjectInitializer()); return new JsPropertyInitializer(classObjectInitStr, value); } -} \ No newline at end of file +} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java similarity index 76% rename from js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java index e3cabe581d8..8a5a6f81efd 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.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,21 +14,21 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.initializer; +package org.jetbrains.kotlin.js.translate.initializer; import com.google.dart.compiler.backend.js.ast.JsStatement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.general.TranslatorVisitor; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.general.TranslatorVisitor; import java.util.List; -import static org.jetbrains.k2js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded; -import static org.jetbrains.k2js.translate.initializer.InitializerUtils.generateInitializerForDelegate; -import static org.jetbrains.k2js.translate.initializer.InitializerUtils.generateInitializerForProperty; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptor; +import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded; +import static org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.generateInitializerForDelegate; +import static org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.generateInitializerForProperty; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getPropertyDescriptor; public final class InitializerVisitor extends TranslatorVisitor { private final List result; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/Intrinsics.java similarity index 81% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/Intrinsics.java index c698fc96361..ac77d9591c8 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/Intrinsics.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,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic; +package org.jetbrains.kotlin.js.translate.intrinsic; import org.jetbrains.annotations.NotNull; -import org.jetbrains.k2js.translate.intrinsic.functions.FunctionIntrinsics; -import org.jetbrains.k2js.translate.intrinsic.operation.BinaryOperationIntrinsics; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.FunctionIntrinsics; +import org.jetbrains.kotlin.js.translate.intrinsic.operation.BinaryOperationIntrinsics; /** * Provides mechanism to substitute method calls /w native constructs directly. diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.java index 78f42f63a53..4945c966089 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic.functions; +package org.jetbrains.kotlin.js.translate.intrinsic.functions; import com.google.common.collect.Lists; import gnu.trove.THashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic; -import org.jetbrains.k2js.translate.intrinsic.functions.factories.*; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.*; import java.util.List; import java.util.Map; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.java similarity index 77% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.java index 5bd13defaf7..b489da0c452 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic.functions.basic; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.basic; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsInvocation; import com.google.dart.compiler.backend.js.ast.JsNameRef; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.k2js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; import java.util.List; @@ -36,9 +36,12 @@ public final class BuiltInFunctionIntrinsic extends FunctionIntrinsic { @NotNull @Override - public JsExpression apply(@Nullable JsExpression receiver, @NotNull List arguments, - @NotNull TranslationContext context) { + public JsExpression apply( + @Nullable JsExpression receiver, + @NotNull List arguments, + @NotNull TranslationContext context + ) { assert receiver != null; return new JsInvocation(new JsNameRef(functionName, receiver), arguments); } -} \ No newline at end of file +} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.java similarity index 88% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.java index ec08e01e16e..aeeafa40287 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic.functions.basic; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.basic; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsNameRef; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.k2js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; import java.util.List; @@ -42,4 +42,4 @@ public final class BuiltInPropertyIntrinsic extends FunctionIntrinsic { assert arguments.isEmpty() : "Properties can't have arguments."; return new JsNameRef(propertyName, receiver); } -} \ No newline at end of file +} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/FunctionIntrinsic.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/FunctionIntrinsic.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/FunctionIntrinsic.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/FunctionIntrinsic.java index 116465046ab..4af40bbb23a 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/FunctionIntrinsic.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/FunctionIntrinsic.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic.functions.basic; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.basic; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.k2js.translate.callTranslator.CallInfo; -import org.jetbrains.k2js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.callTranslator.CallInfo; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/ArrayFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.java similarity index 88% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/ArrayFIF.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.java index b5dfa13e7eb..6308b93c6f8 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/ArrayFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.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.translate.intrinsic.functions.factories; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.common.collect.Lists; import com.google.dart.compiler.backend.js.ast.JsArrayAccess; @@ -23,36 +23,24 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.lang.PrimitiveType; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.DescriptorPredicate; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate; import java.util.List; import static com.intellij.openapi.util.text.StringUtil.decapitalize; -import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.assignment; +import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.assignment; public final class ArrayFIF extends CompositeFIF { - - @NotNull private static final NamePredicate NUMBER_ARRAY; - - @NotNull private static final NamePredicate CHAR_ARRAY; - - @NotNull private static final NamePredicate BOOLEAN_ARRAY; - - @NotNull private static final NamePredicate LONG_ARRAY; - - @NotNull private static final NamePredicate ARRAYS; - - @NotNull private static final DescriptorPredicate ARRAY_FACTORY_METHODS; static { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/CompositeFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.java similarity index 85% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/CompositeFIF.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.java index a3f06e8c7bb..dfdda30defe 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/CompositeFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.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.translate.intrinsic.functions.factories; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.common.base.Predicate; import com.google.common.collect.Lists; @@ -24,10 +24,10 @@ import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.intrinsic.functions.basic.BuiltInPropertyIntrinsic; -import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic; -import org.jetbrains.k2js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.BuiltInPropertyIntrinsic; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/FunctionIntrinsicFactory.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/FunctionIntrinsicFactory.java similarity index 80% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/FunctionIntrinsicFactory.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/FunctionIntrinsicFactory.java index 21e96fffa83..fa6c76e3bdd 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/FunctionIntrinsicFactory.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/FunctionIntrinsicFactory.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,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic.functions.factories; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; public interface FunctionIntrinsicFactory { @Nullable diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java similarity index 79% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java index dd64f0ee04a..f41b41848fb 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.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,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic.functions.factories; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsInvocation; import com.google.dart.compiler.backend.js.ast.JsNameRef; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/LongOperationFIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/LongOperationFIF.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt index 2669de43274..71de197f814 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/LongOperationFIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic.functions.factories +package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.k2js.translate.context.Namer -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern -import org.jetbrains.k2js.translate.utils.ID -import org.jetbrains.k2js.translate.utils.JsAstUtils.* +import org.jetbrains.kotlin.js.translate.context.Namer +import org.jetbrains.kotlin.js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern +import org.jetbrains.kotlin.js.translate.utils.ID +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.* // TODO Move to FunctionCallCases public object LongOperationFIF : FunctionIntrinsicFactory { @@ -103,4 +103,4 @@ public object LongOperationFIF : FunctionIntrinsicFactory { null } } -} \ No newline at end of file +} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt similarity index 89% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt index eab6a3e9e01..0d328be6539 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.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,15 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic.functions.factories +package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories import com.google.common.base.Predicates import com.google.dart.compiler.backend.js.ast.JsExpression -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern -import org.jetbrains.k2js.translate.utils.ID -import org.jetbrains.k2js.translate.utils.JsAstUtils.* +import org.jetbrains.kotlin.js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern +import org.jetbrains.kotlin.js.translate.utils.ID +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.* public object NumberAndCharConversionFIF : CompositeFIF() { val USE_AS_IS = Predicates.or( diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java similarity index 93% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java index 17c4252dac1..9665d7df3f5 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.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.translate.intrinsic.functions.factories; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -28,17 +28,17 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.jet.lexer.JetToken; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.DescriptorPredicate; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate; -import org.jetbrains.k2js.translate.operation.OperatorTable; -import org.jetbrains.k2js.translate.utils.JsAstUtils; -import org.jetbrains.k2js.translate.utils.JsDescriptorUtils; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate; +import org.jetbrains.kotlin.js.translate.operation.OperatorTable; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils; import java.util.List; -import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern; +import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern; public enum PrimitiveBinaryOperationFIF implements FunctionIntrinsicFactory { INSTANCE; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java similarity index 89% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java index 91ec9f79982..4c28be32d71 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.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.translate.intrinsic.functions.factories; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -25,18 +25,18 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.jet.lexer.JetToken; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.DescriptorPredicate; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate; -import org.jetbrains.k2js.translate.operation.OperatorTable; -import org.jetbrains.k2js.translate.utils.JsAstUtils; -import org.jetbrains.k2js.translate.utils.JsDescriptorUtils; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate; +import org.jetbrains.kotlin.js.translate.operation.OperatorTable; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils; import java.util.List; -import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate.PRIMITIVE_NUMBERS; -import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern; +import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate.PRIMITIVE_NUMBERS; +import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern; public enum PrimitiveUnaryOperationFIF implements FunctionIntrinsicFactory { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/StringOperationFIF.java similarity index 82% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/StringOperationFIF.java index 296d0f5952a..9818fc3d292 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/StringOperationFIF.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,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic.functions.factories; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import org.jetbrains.annotations.NotNull; -import org.jetbrains.k2js.translate.intrinsic.functions.basic.BuiltInFunctionIntrinsic; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.BuiltInFunctionIntrinsic; -import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern; +import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern; public final class StringOperationFIF extends CompositeFIF { @NotNull diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java index 417d95a131e..fe8702f806d 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.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.translate.intrinsic.functions.factories; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; @@ -31,21 +31,21 @@ 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.callTranslator.CallInfo; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.DescriptorPredicate; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate; import org.jetbrains.k2js.translate.utils.AnnotationsUtils; -import org.jetbrains.k2js.translate.utils.BindingUtils; -import org.jetbrains.k2js.translate.utils.JsDescriptorUtils; +import org.jetbrains.kotlin.js.translate.callTranslator.CallInfo; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate; +import org.jetbrains.kotlin.js.translate.utils.BindingUtils; +import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils; import java.util.List; -import static org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic.CallParametersAwareFunctionIntrinsic; -import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern; -import static org.jetbrains.k2js.translate.utils.ManglingUtils.getStableMangledNameForDescriptor; +import static org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic.CallParametersAwareFunctionIntrinsic; +import static org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern; +import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getStableMangledNameForDescriptor; public final class TopLevelFIF extends CompositeFIF { public static final DescriptorPredicate EQUALS_IN_ANY = pattern("kotlin", "Any", "equals"); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/DescriptorPredicate.java similarity index 88% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/DescriptorPredicate.java index ab5024655c7..765f06d1c28 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/DescriptorPredicate.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.translate.intrinsic.functions.patterns; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns; import com.google.common.base.Predicate; import org.jetbrains.annotations.Nullable; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/NamePredicate.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/NamePredicate.java similarity index 96% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/NamePredicate.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/NamePredicate.java index a86e0dfdc3b..db0a49e436a 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/NamePredicate.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/NamePredicate.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.translate.intrinsic.functions.patterns; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns; import com.google.common.base.Predicate; import com.google.common.collect.Lists; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/PatternBuilder.java similarity index 97% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/PatternBuilder.java index 7568bf3c697..5fcf41c9799 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/PatternBuilder.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.translate.intrinsic.functions.patterns; +package org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; @@ -23,9 +23,9 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.utils.JsDescriptorUtils; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import java.util.Arrays; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/CompareToBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt similarity index 87% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/CompareToBOIF.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt index 1651b5b81b9..b00d7781e70 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/CompareToBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.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.translate.intrinsic.operation +package org.jetbrains.kotlin.js.translate.intrinsic.operation import com.google.common.collect.ImmutableSet import com.google.dart.compiler.backend.js.ast.* @@ -22,12 +22,12 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.psi.JetBinaryExpression import org.jetbrains.jet.lang.types.expressions.OperatorConventions import org.jetbrains.jet.lexer.JetToken -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern -import org.jetbrains.k2js.translate.operation.OperatorTable -import org.jetbrains.k2js.translate.utils.JsAstUtils -import org.jetbrains.k2js.translate.utils.JsDescriptorUtils -import org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken +import org.jetbrains.kotlin.js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern +import org.jetbrains.kotlin.js.translate.operation.OperatorTable +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils +import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils +import org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken import org.jetbrains.jet.lang.resolve.calls.tasks.isDynamic diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/EqualsBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt similarity index 85% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/EqualsBOIF.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt index 8cb3f784401..08de6fd0407 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/EqualsBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.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,26 +14,26 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic.operation +package org.jetbrains.kotlin.js.translate.intrinsic.operation import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.psi.JetBinaryExpression import org.jetbrains.jet.lang.types.expressions.OperatorConventions -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.intrinsic.functions.factories.TopLevelFIF -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.NamePredicate -import org.jetbrains.k2js.translate.utils.JsAstUtils -import org.jetbrains.k2js.translate.utils.JsDescriptorUtils -import org.jetbrains.k2js.translate.utils.TranslationUtils +import org.jetbrains.kotlin.js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.TopLevelFIF +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils +import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils import java.util.Arrays -import org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken +import org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken import org.jetbrains.jet.lexer.JetToken import org.jetbrains.jet.lexer.JetTokens import com.google.common.collect.ImmutableSet -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.lang.types.isDynamic diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/LongCompareToBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt similarity index 87% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/LongCompareToBOIF.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt index 1009f353863..3d01ef8c87a 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/LongCompareToBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.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.translate.intrinsic.operation +package org.jetbrains.kotlin.js.translate.intrinsic.operation import com.google.common.collect.ImmutableSet import com.google.dart.compiler.backend.js.ast.* @@ -22,14 +22,14 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.psi.JetBinaryExpression import org.jetbrains.jet.lang.types.expressions.OperatorConventions import org.jetbrains.jet.lexer.JetToken -import org.jetbrains.k2js.translate.context.Namer -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern -import org.jetbrains.k2js.translate.operation.OperatorTable -import org.jetbrains.k2js.translate.utils.ID -import org.jetbrains.k2js.translate.utils.JsAstUtils.* -import org.jetbrains.k2js.translate.utils.JsDescriptorUtils -import org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken +import org.jetbrains.kotlin.js.translate.context.Namer +import org.jetbrains.kotlin.js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern +import org.jetbrains.kotlin.js.translate.operation.OperatorTable +import org.jetbrains.kotlin.js.translate.utils.ID +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.* +import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils +import org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken public object LongCompareToBOIF : BinaryOperationIntrinsicFactory { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/binaryOperationIntrinsics.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt similarity index 90% rename from js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/binaryOperationIntrinsics.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt index 7e8da833ff5..e1df1ac873a 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/binaryOperationIntrinsics.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.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,15 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.intrinsic.operation +package org.jetbrains.kotlin.js.translate.intrinsic.operation import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.psi.JetBinaryExpression import org.jetbrains.jet.lexer.JetToken -import org.jetbrains.k2js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression -import org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken +import org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression +import org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken import gnu.trove.THashMap import com.google.dart.compiler.backend.js.ast.JsExpression import com.google.common.collect.ImmutableSet diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java similarity index 78% rename from js/js.translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java index 088ef95b296..c866f905efd 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.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.translate.operation; +package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsBlock; import com.google.dart.compiler.backend.js.ast.JsExpression; @@ -26,18 +26,18 @@ import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.jet.lexer.JetToken; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.reference.AccessTranslationUtils; -import org.jetbrains.k2js.translate.reference.AccessTranslator; -import org.jetbrains.k2js.translate.reference.BackingFieldAccessTranslator; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.reference.AccessTranslationUtils; +import org.jetbrains.kotlin.js.translate.reference.AccessTranslator; +import org.jetbrains.kotlin.js.translate.reference.BackingFieldAccessTranslator; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; -import static org.jetbrains.k2js.translate.utils.BindingUtils.isVariableReassignment; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getSimpleName; -import static org.jetbrains.k2js.translate.utils.PsiUtils.isAssignment; -import static org.jetbrains.k2js.translate.utils.TranslationUtils.hasCorrespondingFunctionIntrinsic; -import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateRightExpression; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.isVariableReassignment; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getSimpleName; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.isAssignment; +import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.hasCorrespondingFunctionIntrinsic; +import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.translateRightExpression; public abstract class AssignmentTranslator extends AbstractTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java index 824d3549ae5..7326861f4ab 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.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.translate.operation; +package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; @@ -28,21 +28,21 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.jet.lexer.JetToken; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.k2js.translate.callTranslator.CallTranslator; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.intrinsic.operation.BinaryOperationIntrinsic; -import org.jetbrains.k2js.translate.utils.JsAstUtils; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.intrinsic.operation.BinaryOperationIntrinsic; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; -import static org.jetbrains.k2js.translate.operation.AssignmentTranslator.isAssignmentOperator; -import static org.jetbrains.k2js.translate.operation.CompareToTranslator.isCompareToCall; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.not; -import static org.jetbrains.k2js.translate.utils.PsiUtils.*; +import static org.jetbrains.kotlin.js.translate.operation.AssignmentTranslator.isAssignmentOperator; +import static org.jetbrains.kotlin.js.translate.operation.CompareToTranslator.isCompareToCall; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.not; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.*; public final class BinaryOperationTranslator extends AbstractTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java similarity index 83% rename from js/js.translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java index f92d635f982..e136212a6ac 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.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.translate.operation; +package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsBinaryOperation; import com.google.dart.compiler.backend.js.ast.JsBinaryOperator; @@ -25,13 +25,13 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.psi.JetBinaryExpression; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.jet.lexer.JetToken; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; -import static org.jetbrains.k2js.translate.utils.ErrorReportingUtils.message; -import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.isCompareTo; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; +import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; +import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.isCompareTo; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken; public final class CompareToTranslator extends AbstractTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java similarity index 83% rename from js/js.translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java index 5550ac5fcc1..72d56a827a2 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.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.translate.operation; +package org.jetbrains.kotlin.js.translate.operation; import com.google.common.collect.Lists; import com.google.dart.compiler.backend.js.ast.JsBinaryOperation; @@ -28,20 +28,20 @@ import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetUnaryExpression; import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.reference.CachedAccessTranslator; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.reference.CachedAccessTranslator; import java.util.List; -import static org.jetbrains.k2js.translate.reference.AccessTranslationUtils.getCachedAccessTranslator; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.newSequence; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getBaseExpression; -import static org.jetbrains.k2js.translate.utils.PsiUtils.isPrefix; -import static org.jetbrains.k2js.translate.utils.TemporariesUtils.temporariesInitialization; -import static org.jetbrains.k2js.translate.utils.TranslationUtils.hasCorrespondingFunctionIntrinsic; +import static org.jetbrains.kotlin.js.translate.reference.AccessTranslationUtils.getCachedAccessTranslator; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.newSequence; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getBaseExpression; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.isPrefix; +import static org.jetbrains.kotlin.js.translate.utils.TemporariesUtils.temporariesInitialization; +import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.hasCorrespondingFunctionIntrinsic; // TODO: provide better increment translator logic public abstract class IncrementTranslator extends AbstractTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/IntrinsicAssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/operation/IntrinsicAssignmentTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java index 3a33564e723..6e14ecdd595 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/IntrinsicAssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.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.translate.operation; +package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsBinaryOperation; import com.google.dart.compiler.backend.js.ast.JsBinaryOperator; @@ -24,11 +24,10 @@ import org.jetbrains.jet.lang.psi.JetBinaryExpression; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.jet.lexer.JetToken; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken; -import static org.jetbrains.k2js.translate.utils.PsiUtils.isAssignment; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.isAssignment; public final class IntrinsicAssignmentTranslator extends AssignmentTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/IntrinsicIncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java similarity index 90% rename from js/js.translator/src/org/jetbrains/k2js/translate/operation/IntrinsicIncrementTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java index d753d84da7f..f4c7c2d3e80 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/IntrinsicIncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.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.translate.operation; +package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; @@ -22,10 +22,10 @@ import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.psi.JetUnaryExpression; import org.jetbrains.jet.lexer.JetToken; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.k2js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken; -import static org.jetbrains.k2js.translate.utils.PsiUtils.isPrefix; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.isPrefix; public final class IntrinsicIncrementTranslator extends IncrementTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OperatorTable.java similarity index 97% rename from js/js.translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OperatorTable.java index 5c1d0864997..8d763cdf27a 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OperatorTable.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.translate.operation; +package org.jetbrains.kotlin.js.translate.operation; import com.google.common.collect.ImmutableBiMap; import com.google.dart.compiler.backend.js.ast.JsBinaryOperator; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java similarity index 88% rename from js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java index be9e1e60ace..2c5f6f3bc6e 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.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.translate.operation; +package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; @@ -22,9 +22,8 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.psi.JetBinaryExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.k2js.translate.callTranslator.CallTranslator; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; public final class OverloadedAssignmentTranslator extends AssignmentTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java similarity index 87% rename from js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java index 5c34dd77957..412f53cf609 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.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.translate.operation; +package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; @@ -22,8 +22,8 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.psi.JetUnaryExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.k2js.translate.callTranslator.CallTranslator; -import org.jetbrains.k2js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; public final class OverloadedIncrementTranslator extends IncrementTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java similarity index 82% rename from js/js.translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java index d0c6d237d37..0b6b5aaaafb 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.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.translate.operation; +package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsBinaryOperation; import com.google.dart.compiler.backend.js.ast.JsExpression; @@ -30,18 +30,18 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.k2js.translate.callTranslator.CallTranslator; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.utils.JsAstUtils; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; -import static org.jetbrains.k2js.translate.general.Translation.translateAsExpression; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getCompileTimeValue; -import static org.jetbrains.k2js.translate.utils.ErrorReportingUtils.message; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getBaseExpression; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getOperationToken; -import static org.jetbrains.k2js.translate.utils.TranslationUtils.*; +import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsExpression; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCompileTimeValue; +import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getBaseExpression; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken; +import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.*; public final class UnaryOperationTranslator { private UnaryOperationTranslator() { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/AbstractCallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java similarity index 87% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/AbstractCallExpressionTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java index eef15dcf6df..d42603d7530 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/AbstractCallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.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.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; @@ -23,8 +23,8 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.psi.JetCallExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; public abstract class AbstractCallExpressionTranslator extends AbstractTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/AccessTranslationUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java similarity index 90% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/AccessTranslationUtils.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java index b9e2b720df7..c2ef466969e 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/AccessTranslationUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.utils.JsAstUtils; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import java.util.LinkedHashMap; import java.util.Map; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/AccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslator.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/AccessTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslator.java index 621924f601d..b1557d56a71 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/AccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslator.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.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java similarity index 93% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java index c68cfb132d8..563c0a27a04 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.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.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; @@ -26,12 +26,12 @@ import org.jetbrains.jet.lang.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.ExpressionValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument; -import org.jetbrains.k2js.translate.callTranslator.CallTranslator; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.utils.BindingUtils; +import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.utils.BindingUtils; import java.util.*; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/BackingFieldAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java similarity index 79% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/BackingFieldAccessTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java index 628a8818ae0..e6e2db360ea 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/BackingFieldAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.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,23 +14,23 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import java.util.Collections; import java.util.List; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; -import static org.jetbrains.k2js.translate.utils.TranslationUtils.assignmentToBackingField; -import static org.jetbrains.k2js.translate.utils.TranslationUtils.backingFieldReference; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; +import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.assignmentToBackingField; +import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.backingFieldReference; public final class BackingFieldAccessTranslator extends AbstractTranslator implements CachedAccessTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CachedAccessTranslator.java similarity index 84% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedAccessTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CachedAccessTranslator.java index 77a845700f1..f041e11ad25 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CachedAccessTranslator.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import org.jetbrains.annotations.NotNull; -import org.jetbrains.k2js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallArgumentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java similarity index 96% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/CallArgumentTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java index 36ebf281ed2..2fdc897019b 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallArgumentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.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.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.*; import com.intellij.util.SmartList; @@ -24,14 +24,14 @@ 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.context.TemporaryConstVariable; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.general.Translation; import org.jetbrains.k2js.translate.utils.AnnotationsUtils; -import org.jetbrains.k2js.translate.utils.JsAstUtils; -import org.jetbrains.k2js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.js.translate.context.TemporaryConstVariable; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java similarity index 93% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java index bbf3c9b8bc9..001d6d104e6 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.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,34 +14,36 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.*; import com.google.dart.compiler.backend.js.ast.metadata.MetadataPackage; import com.google.dart.compiler.common.SourceInfoImpl; +import com.google.gwt.dev.js.AbortParsingException; import com.google.gwt.dev.js.JsParser; import com.google.gwt.dev.js.JsParserException; -import com.google.gwt.dev.js.AbortParsingException; import com.google.gwt.dev.js.rhino.ErrorReporter; import com.google.gwt.dev.js.rhino.EvaluatorException; import com.intellij.openapi.util.TextRange; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory2; import org.jetbrains.jet.lang.diagnostics.ParametrizedDiagnostic; -import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.jet.lang.psi.JetCallExpression; +import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.jet.lang.psi.JetStringTemplateExpression; +import org.jetbrains.jet.lang.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; 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.translate.callTranslator.CallTranslator; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.DescriptorPredicate; -import org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder; import org.jetbrains.k2js.resolve.diagnostics.ErrorsJs; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +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; +import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder; import java.io.IOException; import java.io.StringReader; @@ -51,7 +53,7 @@ import java.util.List; import static com.google.gwt.dev.js.rhino.Utils.isEndOfLine; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getCompileTimeValue; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCompileTimeValue; public final class CallExpressionTranslator extends AbstractCallExpressionTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallableReferenceTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt similarity index 93% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/CallableReferenceTranslator.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt index 38d89c46a21..b69da155946 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallableReferenceTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.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.translate.reference +package org.jetbrains.kotlin.js.translate.reference import com.google.dart.compiler.backend.js.ast.JsExpression import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.utils.JsDescriptorUtils +import org.jetbrains.kotlin.js.translate.context.TranslationContext +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.jet.lang.psi.JetCallableReferenceExpression -import org.jetbrains.k2js.translate.utils.BindingUtils +import org.jetbrains.kotlin.js.translate.utils.BindingUtils import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor @@ -33,9 +33,6 @@ import com.google.dart.compiler.backend.js.ast.JsLiteral import java.util.ArrayList import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils -import com.google.dart.compiler.backend.js.ast.JsNameRef -import org.jetbrains.k2js.translate.context.Namer -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns object CallableReferenceTranslator { @@ -43,9 +40,9 @@ object CallableReferenceTranslator { val descriptor = BindingUtils.getDescriptorForReferenceExpression(context.bindingContext(), expression.getCallableReference()) return when (descriptor) { is PropertyDescriptor -> - translateForProperty(descriptor as PropertyDescriptor, context) + translateForProperty(descriptor, context) is FunctionDescriptor -> - translateForFunction(descriptor as FunctionDescriptor, context) + translateForFunction(descriptor, context) else -> throw IllegalArgumentException("Expected property or function: ${descriptor}, expression=${expression.getText()}") } @@ -155,4 +152,4 @@ object CallableReferenceTranslator { val funNameAsString = context.program().getStringLiteral(funName.toString()) return JsInvocation(context.namer().callableRefForMemberFunctionReference(), jsClassNameRef, funNameAsString) } -} \ No newline at end of file +} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ClassObjectAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java similarity index 85% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/ClassObjectAccessTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java index 947e64f3dfa..ac80f111d07 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ClassObjectAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.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.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; @@ -22,19 +22,19 @@ 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.context.Namer; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; import org.jetbrains.k2js.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; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import java.util.Collections; import java.util.List; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isObject; -import static org.jetbrains.k2js.translate.reference.ReferenceTranslator.translateAsFQReference; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; +import static org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator.translateAsFQReference; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; public class ClassObjectAccessTranslator extends AbstractTranslator implements CachedAccessTranslator { @NotNull diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/QualifiedExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java similarity index 87% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/QualifiedExpressionTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java index dc4042d2d1b..b0b9126b2e9 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/QualifiedExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.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.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsNode; @@ -24,16 +24,16 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.utils.ErrorReportingUtils; -import org.jetbrains.k2js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; -import static org.jetbrains.k2js.translate.general.Translation.translateAsExpression; -import static org.jetbrains.k2js.translate.reference.CallExpressionTranslator.shouldBeInlined; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getNotNullSimpleNameSelector; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getSelector; +import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsExpression; +import static org.jetbrains.kotlin.js.translate.reference.CallExpressionTranslator.shouldBeInlined; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getNotNullSimpleNameSelector; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getSelector; public final class QualifiedExpressionTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ReferenceAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java similarity index 80% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/ReferenceAccessTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java index 9dc395ca5b1..e4d5fab2709 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ReferenceAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.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,22 +14,22 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import java.util.Collections; import java.util.List; -import static org.jetbrains.k2js.translate.reference.ReferenceTranslator.translateAsLocalNameReference; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; +import static org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator.translateAsLocalNameReference; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; public final class ReferenceAccessTranslator extends AbstractTranslator implements CachedAccessTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java similarity index 90% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java index b7a8ab9b544..68bfb5039e8 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.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.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; @@ -23,14 +23,14 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetQualifiedExpression; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.utils.BindingUtils; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.utils.BindingUtils; import static org.jetbrains.jet.lang.psi.JetPsiUtil.isBackingFieldReference; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.setQualifier; -import static org.jetbrains.k2js.translate.utils.PsiUtils.getSelectorAsSimpleName; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.setQualifier; +import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getSelectorAsSimpleName; public final class ReferenceTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/VariableAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/reference/VariableAccessTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java index 2bf4102dedb..450026d1949 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/VariableAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.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.translate.reference; +package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; @@ -24,10 +24,10 @@ import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; -import org.jetbrains.k2js.translate.callTranslator.CallTranslator; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import java.util.Collections; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/test/CommonUnitTester.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/CommonUnitTester.java similarity index 93% rename from js/js.translator/src/org/jetbrains/k2js/translate/test/CommonUnitTester.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/test/CommonUnitTester.java index 9fbd92ebae5..9e70295dd27 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/test/CommonUnitTester.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/CommonUnitTester.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.translate.test; +package org.jetbrains.kotlin.js.translate.test; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/test/JSRhinoUnitTester.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSRhinoUnitTester.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/test/JSRhinoUnitTester.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSRhinoUnitTester.java index 6ea28e61da1..c89e50dc235 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/test/JSRhinoUnitTester.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSRhinoUnitTester.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.translate.test; +package org.jetbrains.kotlin.js.translate.test; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsNameRef; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/test/JSTestGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java similarity index 88% rename from js/js.translator/src/org/jetbrains/k2js/translate/test/JSTestGenerator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java index 3518051a57e..bb1193ef9ea 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/test/JSTestGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.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.translate.test; +package org.jetbrains.kotlin.js.translate.test; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsNew; @@ -24,10 +24,10 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.k2js.translate.callTranslator.CallTranslator; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.JetTestFunctionDetector; -import org.jetbrains.k2js.translate.reference.ReferenceTranslator; +import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.JetTestFunctionDetector; +import org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator; import java.util.Collection; import java.util.Collections; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/test/JSTester.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTester.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/test/JSTester.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTester.java index 4948d63c260..4bb7a73f761 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/test/JSTester.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTester.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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.test; +package org.jetbrains.kotlin.js.translate.test; import com.google.dart.compiler.backend.js.ast.JsBlock; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsStringLiteral; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.k2js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; public abstract class JSTester { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/test/QUnitTester.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/QUnitTester.java similarity index 91% rename from js/js.translator/src/org/jetbrains/k2js/translate/test/QUnitTester.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/test/QUnitTester.java index 324017cfa2c..3bc406f1cbb 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/test/QUnitTester.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/QUnitTester.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.translate.test; +package org.jetbrains.kotlin.js.translate.test; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsNameRef; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.java similarity index 98% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.java index 7f58adb73e5..a817ae74a1e 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.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.translate.utils; +package org.jetbrains.kotlin.js.translate.utils; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; @@ -35,7 +35,7 @@ import java.util.List; import static org.jetbrains.jet.lang.resolve.BindingContext.INDEXED_LVALUE_GET; import static org.jetbrains.jet.lang.resolve.BindingContext.INDEXED_LVALUE_SET; -import static org.jetbrains.k2js.translate.utils.ErrorReportingUtils.message; +import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; /** * This class contains some code related to BindingContext use. Intention is not to pollute other classes. diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/ErrorReportingUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java similarity index 95% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/ErrorReportingUtils.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java index 897f77e17b6..dcbae744139 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/ErrorReportingUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.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.translate.utils; +package org.jetbrains.kotlin.js.translate.utils; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/FunctionBodyTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java similarity index 86% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/FunctionBodyTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java index a6a3c5dbcfd..d87f1656a0a 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/FunctionBodyTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.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.translate.utils; +package org.jetbrains.kotlin.js.translate.utils; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; @@ -24,19 +24,17 @@ import org.jetbrains.jet.lang.psi.JetDeclarationWithBody; import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.AbstractTranslator; -import org.jetbrains.k2js.translate.general.Translation; -import org.jetbrains.k2js.translate.utils.mutator.Mutator; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.utils.mutator.Mutator; import java.util.ArrayList; import java.util.List; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getDefaultArgument; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.assignment; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.convertToBlock; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.equality; -import static org.jetbrains.k2js.translate.utils.mutator.LastExpressionMutator.mutateLastExpression; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDefaultArgument; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.*; +import static org.jetbrains.kotlin.js.translate.utils.mutator.LastExpressionMutator.mutateLastExpression; public final class FunctionBodyTranslator extends AbstractTranslator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/InlineAnnotation.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/InlineAnnotation.kt similarity index 88% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/InlineAnnotation.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/InlineAnnotation.kt index 0d4f7ce0565..2611129eb92 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/InlineAnnotation.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/InlineAnnotation.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,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.utils +package org.jetbrains.kotlin.js.translate.utils enum class InlineAnnotation(val fqName: String) { INLINE : InlineAnnotation("kotlin.inline") NO_INLINE : InlineAnnotation("kotlin.noinline") -} \ No newline at end of file +} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java similarity index 98% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java index 1ed72ff3d1f..c3293d82e22 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.utils; +package org.jetbrains.kotlin.js.translate.utils; import com.google.dart.compiler.backend.js.ast.*; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; -import org.jetbrains.k2js.translate.context.Namer; -import org.jetbrains.k2js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; import java.util.Arrays; import java.util.Collections; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java similarity index 97% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java index 79f16c9fcc4..a8782a6481e 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.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.translate.utils; +package org.jetbrains.kotlin.js.translate.utils; import com.intellij.openapi.util.Condition; import com.intellij.util.containers.ContainerUtil; @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.k2js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; import java.util.Collection; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/ManglingUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java similarity index 97% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/ManglingUtils.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java index b1b6c27791f..17700dc80cd 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/ManglingUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.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.openapi.util.text.StringUtil; import com.intellij.util.Function; @@ -27,11 +27,12 @@ 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 java.util.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; -import static org.jetbrains.k2js.translate.utils.TranslationUtils.getJetTypeFqName; +import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.getJetTypeFqName; public class ManglingUtils { private ManglingUtils() {} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/PsiUtils.java similarity index 98% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/PsiUtils.java index f224d8c0df2..dfca54244a9 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/PsiUtils.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.translate.utils; +package org.jetbrains.kotlin.js.translate.utils; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TemporariesUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TemporariesUtils.java similarity index 88% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/TemporariesUtils.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TemporariesUtils.java index 5be4e8f210f..222e1952919 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TemporariesUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TemporariesUtils.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,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.utils; +package org.jetbrains.kotlin.js.translate.utils; import com.google.common.collect.Lists; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; import java.util.List; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.newSequence; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.newSequence; //TODO: look for what should go there public final class TemporariesUtils { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java similarity index 94% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java index ef1d1e51041..a352b5e823f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.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.google.dart.compiler.backend.js.ast.*; import com.intellij.openapi.util.text.StringUtil; @@ -28,9 +28,9 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.k2js.translate.context.TemporaryConstVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; -import org.jetbrains.k2js.translate.general.Translation; +import org.jetbrains.kotlin.js.translate.context.TemporaryConstVariable; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.js.translate.general.Translation; import java.util.ArrayList; import java.util.Collections; @@ -39,11 +39,11 @@ import java.util.List; import static com.google.dart.compiler.backend.js.ast.JsBinaryOperator.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isAnonymousObject; -import static org.jetbrains.k2js.translate.context.Namer.getKotlinBackingFieldName; -import static org.jetbrains.k2js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.assignment; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.createDataDescriptor; -import static org.jetbrains.k2js.translate.utils.ManglingUtils.getMangledName; +import static org.jetbrains.kotlin.js.translate.context.Namer.getKotlinBackingFieldName; +import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.assignment; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.createDataDescriptor; +import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getMangledName; public final class TranslationUtils { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/astUtils.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt similarity index 92% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/astUtils.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt index eeb3a9af81f..bf52752e847 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/astUtils.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.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.translate.utils.ast +package org.jetbrains.kotlin.js.translate.utils.ast import com.google.dart.compiler.backend.js.ast.JsFunction import com.google.dart.compiler.backend.js.ast.JsStatement diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/mutator/AssignToExpressionMutator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/AssignToExpressionMutator.java similarity index 87% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/mutator/AssignToExpressionMutator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/AssignToExpressionMutator.java index 5656022c59f..754e2f21102 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/mutator/AssignToExpressionMutator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/AssignToExpressionMutator.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.utils.mutator; +package org.jetbrains.kotlin.js.translate.utils.mutator; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsNode; import org.jetbrains.annotations.NotNull; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.assignment; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.assignment; public final class AssignToExpressionMutator implements Mutator { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/mutator/LastExpressionMutator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/LastExpressionMutator.java similarity index 93% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/mutator/LastExpressionMutator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/LastExpressionMutator.java index 1af6d6e4ba0..f7fdd4a513b 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/mutator/LastExpressionMutator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/LastExpressionMutator.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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.k2js.translate.utils.mutator; +package org.jetbrains.kotlin.js.translate.utils.mutator; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import java.util.List; -import static org.jetbrains.k2js.translate.utils.JsAstUtils.convertToStatement; +import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToStatement; public final class LastExpressionMutator { public static JsStatement mutateLastExpression(@NotNull JsNode node, @NotNull Mutator mutator) { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/mutator/Mutator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/Mutator.java similarity index 88% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/mutator/Mutator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/Mutator.java index 95e311c5135..e7a4b683690 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/mutator/Mutator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/Mutator.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.translate.utils.mutator; +package org.jetbrains.kotlin.js.translate.utils.mutator; import com.google.dart.compiler.backend.js.ast.JsNode; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/utils.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt similarity index 89% rename from js/js.translator/src/org/jetbrains/k2js/translate/utils/utils.kt rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt index 9c346e61ac8..cb4deb630ca 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/utils.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.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.translate.utils +package org.jetbrains.kotlin.js.translate.utils import com.google.dart.compiler.backend.js.ast.JsExpression import com.google.dart.compiler.backend.js.ast.JsInvocation @@ -23,9 +23,9 @@ import com.google.dart.compiler.backend.js.ast.JsParameter import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer import com.intellij.util.SmartList import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.k2js.translate.context.Namer -import org.jetbrains.k2js.translate.context.TranslationContext -import org.jetbrains.k2js.translate.utils.TranslationUtils.simpleReturnFunction +import org.jetbrains.kotlin.js.translate.context.Namer +import org.jetbrains.kotlin.js.translate.context.TranslationContext +import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.simpleReturnFunction import org.jetbrains.jet.lang.resolve.DescriptorUtils public val ID: (T) -> T = { it }