diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt index d33529c1fc4..c3c4ddfc2e6 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.generators.tests -import com.google.dart.compiler.backend.js.ast.JsFunctionScope +import org.jetbrains.kotlin.js.backend.ast.JsFunctionScope import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.renderer.KeywordStringsGenerated diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/AbstractNode.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/AbstractNode.java deleted file mode 100644 index 80cae8a9a0c..00000000000 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/AbstractNode.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.google.dart.compiler.backend.js.ast; - -import com.google.dart.compiler.backend.js.JsToStringGenerationVisitor; -import com.google.dart.compiler.backend.js.ast.metadata.HasMetadata; -import com.google.dart.compiler.util.TextOutputImpl; - -abstract class AbstractNode extends HasMetadata implements JsNode { - @Override - public String toString() { - TextOutputImpl out = new TextOutputImpl(); - new JsToStringGenerationVisitor(out).accept(this); - return out.toString(); - } - - protected T withMetadataFrom(T other) { - this.copyMetadataFrom(other); - //noinspection unchecked - return (T) this; - } -} diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/RecursiveJsVisitor.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/RecursiveJsVisitor.java deleted file mode 100644 index 23f84dbd85f..00000000000 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/RecursiveJsVisitor.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.google.dart.compiler.backend.js.ast; - -import org.jetbrains.annotations.NotNull; - -public abstract class RecursiveJsVisitor extends JsVisitor { - @Override - protected void visitElement(@NotNull JsNode node) { - node.acceptChildren(this); - } -} diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/SourceInfoAwareJsNode.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/SourceInfoAwareJsNode.java deleted file mode 100644 index d263dd08433..00000000000 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/SourceInfoAwareJsNode.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.google.dart.compiler.backend.js.ast; - -public abstract class SourceInfoAwareJsNode extends AbstractNode { - private Object source; - - @Override - public Object getSource() { - return source; - } - - @Override - public void setSource(Object info) { - source = info; - } - - @Override - public void acceptChildren(JsVisitor visitor) { - } - - @Override - public JsNode source(Object info) { - source = info; - return this; - } -} \ No newline at end of file diff --git a/js/js.ast/src/com/google/dart/compiler/Source.java b/js/js.ast/src/org/jetbrains/kotlin/js/Source.java similarity index 97% rename from js/js.ast/src/com/google/dart/compiler/Source.java rename to js/js.ast/src/org/jetbrains/kotlin/js/Source.java index f0ff5797f73..3aa31da14be 100644 --- a/js/js.ast/src/com/google/dart/compiler/Source.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/Source.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler; +package org.jetbrains.kotlin.js; import java.io.IOException; import java.io.Reader; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/JsConstructExpressionVisitor.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsConstructExpressionVisitor.java similarity index 96% rename from js/js.ast/src/com/google/dart/compiler/backend/js/JsConstructExpressionVisitor.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/JsConstructExpressionVisitor.java index 6e2bd567fdf..53e5b5d6e75 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/JsConstructExpressionVisitor.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsConstructExpressionVisitor.java @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js; +package org.jetbrains.kotlin.js.backend; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.js.backend.ast.*; /** * Searches for method invocations in constructor expressions that would not diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/JsFirstExpressionVisitor.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsFirstExpressionVisitor.java similarity index 94% rename from js/js.ast/src/com/google/dart/compiler/backend/js/JsFirstExpressionVisitor.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/JsFirstExpressionVisitor.java index 633197db0aa..68a07ea7c49 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/JsFirstExpressionVisitor.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsFirstExpressionVisitor.java @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js; +package org.jetbrains.kotlin.js.backend; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.JsExpressionStatement; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.JsExpressionStatement; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/JsPrecedenceVisitor.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsPrecedenceVisitor.java similarity index 97% rename from js/js.ast/src/com/google/dart/compiler/backend/js/JsPrecedenceVisitor.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/JsPrecedenceVisitor.java index cf2c7f0d196..20217e0bb0b 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/JsPrecedenceVisitor.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsPrecedenceVisitor.java @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js; +package org.jetbrains.kotlin.js.backend; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.js.backend.ast.*; /** * Precedence indices from "JavaScript - The Definitive Guide" 4th Edition (page diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/JsRequiresSemiVisitor.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsRequiresSemiVisitor.java similarity index 95% rename from js/js.ast/src/com/google/dart/compiler/backend/js/JsRequiresSemiVisitor.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/JsRequiresSemiVisitor.java index 880cce0bb6c..9e2a156233b 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/JsRequiresSemiVisitor.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsRequiresSemiVisitor.java @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js; +package org.jetbrains.kotlin.js.backend; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.js.backend.ast.*; /** * Determines if a statement at the end of a block requires a semicolon. diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/JsReservedIdentifiers.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsReservedIdentifiers.java similarity index 99% rename from js/js.ast/src/com/google/dart/compiler/backend/js/JsReservedIdentifiers.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/JsReservedIdentifiers.java index da462ef29f4..0e138e4f0c1 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/JsReservedIdentifiers.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsReservedIdentifiers.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js; +package org.jetbrains.kotlin.js.backend; import gnu.trove.THashSet; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java similarity index 98% rename from js/js.ast/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java index 1df3fea69af..975a816639e 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java @@ -2,11 +2,13 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js; +package org.jetbrains.kotlin.js.backend; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.JsVars.JsVar; -import com.google.dart.compiler.util.TextOutput; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.JsNumberLiteral.JsDoubleLiteral; +import org.jetbrains.kotlin.js.backend.ast.JsNumberLiteral.JsIntLiteral; +import org.jetbrains.kotlin.js.backend.ast.JsVars.JsVar; +import org.jetbrains.kotlin.js.util.TextOutput; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; @@ -15,9 +17,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static com.google.dart.compiler.backend.js.ast.JsNumberLiteral.JsDoubleLiteral; -import static com.google.dart.compiler.backend.js.ast.JsNumberLiteral.JsIntLiteral; - /** * Produces text output from a JavaScript AST. */ diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/AbstractNode.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/AbstractNode.java new file mode 100644 index 00000000000..fe08e840677 --- /dev/null +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/AbstractNode.java @@ -0,0 +1,36 @@ +/* + * Copyright 2010-2017 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.kotlin.js.backend.ast; + +import org.jetbrains.kotlin.js.backend.JsToStringGenerationVisitor; +import org.jetbrains.kotlin.js.backend.ast.metadata.HasMetadata; +import org.jetbrains.kotlin.js.util.TextOutputImpl; + +abstract class AbstractNode extends HasMetadata implements JsNode { + @Override + public String toString() { + TextOutputImpl out = new TextOutputImpl(); + new JsToStringGenerationVisitor(out).accept(this); + return out.toString(); + } + + protected T withMetadataFrom(T other) { + this.copyMetadataFrom(other); + //noinspection unchecked + return (T) this; + } +} diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasArguments.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/HasArguments.java similarity index 88% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasArguments.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/HasArguments.java index 2cb67b4c3fd..b3fb27e6168 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasArguments.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/HasArguments.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import java.util.List; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasCondition.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/HasCondition.java similarity index 89% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasCondition.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/HasCondition.java index 082f4e15eb3..c5ef8c7d746 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasCondition.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/HasCondition.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; /** * Implemented by JavaScript objects with conditional execution. diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasName.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/HasName.java similarity index 79% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasName.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/HasName.java index 4aeb9aff8a1..f329afb4977 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasName.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/HasName.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.common.HasSymbol; +import org.jetbrains.kotlin.js.common.HasSymbol; /** * Implemented by JavaScript objects that have a name. diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsArrayAccess.java similarity index 95% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsArrayAccess.java index ec9971d8bb3..d3b22aaba78 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsArrayAccess.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsArrayLiteral.java similarity index 93% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsArrayLiteral.java index 9ac54a51333..bd28777db2b 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsArrayLiteral.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBinaryOperation.java similarity index 95% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBinaryOperation.java index 2aef8e1a89c..d7683dc44d4 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBinaryOperation.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperator.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBinaryOperator.java similarity index 98% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperator.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBinaryOperator.java index 54ed2b7ca97..fb96eb4dd3d 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperator.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBinaryOperator.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; /** * Represents the operator in a JavaScript binary operation. diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBlock.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBlock.java similarity index 94% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBlock.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBlock.java index fac9f4fdf54..0cd6f67c46c 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBlock.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBlock.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; import com.intellij.util.SmartList; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBreak.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBreak.java similarity index 91% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBreak.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBreak.java index a2cb25a28a6..95a606880f9 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBreak.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBreak.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCase.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCase.java similarity index 93% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCase.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCase.java index 05ec9a167b7..9bb4daf260f 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCase.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCase.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCatch.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCatch.java similarity index 96% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCatch.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCatch.java index 2c4092c25df..f55ecc25c5b 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCatch.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCatch.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCatchScope.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCatchScope.java similarity index 95% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCatchScope.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCatchScope.java index 337550f7b06..ca4e3075f89 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCatchScope.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCatchScope.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsConditional.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsConditional.java similarity index 96% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsConditional.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsConditional.java index b6618c154d1..a4b8ad94ddb 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsConditional.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsConditional.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; public final class JsConditional extends JsExpression { diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsContext.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsContext.java similarity index 95% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsContext.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsContext.java index a9755edb9e3..2ecd092d9c7 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsContext.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsContext.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import org.jetbrains.annotations.Nullable; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsContinue.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsContinue.java similarity index 93% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsContinue.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsContinue.java index d56d77a3a81..06d22af835d 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsContinue.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsContinue.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDebugger.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDebugger.java similarity index 94% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDebugger.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDebugger.java index 89b63ddde37..cfc1c00cd37 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDebugger.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDebugger.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDefault.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDefault.java similarity index 90% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDefault.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDefault.java index 75e169be591..d12fb53c786 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDefault.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDefault.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDoWhile.java similarity index 92% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDoWhile.java index 8277bf27eb3..c43674f21f2 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDoWhile.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDocComment.java similarity index 59% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDocComment.java index a5dde757efa..959af45bd9d 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsDocComment.java @@ -1,4 +1,20 @@ -package com.google.dart.compiler.backend.js.ast; +/* + * Copyright 2010-2017 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.kotlin.js.backend.ast; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsEmpty.kt b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsEmpty.kt similarity index 92% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsEmpty.kt rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsEmpty.kt index f457df8a999..6890ff87102 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsEmpty.kt +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsEmpty.kt @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast +package org.jetbrains.kotlin.js.backend.ast object JsEmpty : SourceInfoAwareJsNode(), JsStatement { diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsExpression.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsExpression.java similarity index 96% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsExpression.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsExpression.java index f3908b0ba6a..7c19c21f5b6 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsExpression.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsExpression.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsExpressionStatement.java similarity index 97% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsExpressionStatement.java index 74d78768e2b..b07f8f24b76 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsExpressionStatement.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsFor.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsFor.java similarity index 98% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsFor.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsFor.java index ca4c6daccda..fa9af8aebf8 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsFor.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsFor.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsForIn.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsForIn.java similarity index 96% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsForIn.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsForIn.java index 982fda96be0..5be526bacc4 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsForIn.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsForIn.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; public class JsForIn extends SourceInfoAwareJsNode implements JsStatement { diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsFunction.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsFunction.java similarity index 94% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsFunction.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsFunction.java index 0106994968c..181fc75e217 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsFunction.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsFunction.java @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.common.Symbol; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.common.Symbol; +import org.jetbrains.kotlin.js.util.AstUtil; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsGlobalBlock.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsGlobalBlock.java similarity index 89% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsGlobalBlock.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsGlobalBlock.java index 9c9fc0dfd25..6948fe1c52a 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsGlobalBlock.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsGlobalBlock.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; import java.util.List; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsIf.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsIf.java similarity index 96% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsIf.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsIf.java index 995f7feab22..c1f30f4bbf6 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsIf.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsIf.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsInvocation.java similarity index 95% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsInvocation.java index e76add545ad..e2bc5723760 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsInvocation.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsLabel.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsLabel.java similarity index 92% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsLabel.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsLabel.java index 4aca993b88e..f9acc11b77b 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsLabel.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsLabel.java @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.common.Symbol; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.common.Symbol; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsLiteral.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsLiteral.java similarity index 97% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsLiteral.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsLiteral.java index 078a6171b8f..cb859053ac0 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsLiteral.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsLiteral.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsName.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsName.java similarity index 88% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsName.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsName.java index dfaa7cbc1f1..de1143e8084 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsName.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsName.java @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.backend.js.ast.metadata.HasMetadata; -import com.google.dart.compiler.common.Symbol; +import org.jetbrains.kotlin.js.backend.ast.metadata.HasMetadata; +import org.jetbrains.kotlin.js.common.Symbol; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNameRef.java similarity index 94% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNameRef.java index 00bab0c1de6..8d0823c7bf0 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNameRef.java @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.common.Symbol; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.common.Symbol; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNew.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNew.java similarity index 95% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNew.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNew.java index 43ac4e29ceb..a3a8e8e32be 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNew.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNew.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNode.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNode.java similarity index 95% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNode.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNode.java index f6f6358c37e..1bc18a2c0f0 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNode.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNode.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNullLiteral.java similarity index 91% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNullLiteral.java index 8ae1b0ebed7..a562449f8e9 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNullLiteral.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; public final class JsNullLiteral extends JsLiteral.JsValueLiteral { JsNullLiteral() { diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNumberLiteral.java similarity index 96% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNumberLiteral.java index cc881eb6fb6..069f768fd50 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsNumberLiteral.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; public abstract class JsNumberLiteral extends JsLiteral.JsValueLiteral { public static final JsIntLiteral ZERO = new JsIntLiteral(0); diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsObjectLiteral.java similarity index 94% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsObjectLiteral.java index dea6c586e56..987ea27b9ba 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsObjectLiteral.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsOperator.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsOperator.java similarity index 92% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsOperator.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsOperator.java index 844805fcc73..4e05c3110f1 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsOperator.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsOperator.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; public interface JsOperator { int INFIX = 0x02; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsParameter.java similarity index 92% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsParameter.java index b6cdaa475a9..60a7af9b52b 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsParameter.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.common.Symbol; +import org.jetbrains.kotlin.js.common.Symbol; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsPostfixOperation.java similarity index 90% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsPostfixOperation.java index 03ade21976a..c1966d997f2 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsPostfixOperation.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; public final class JsPostfixOperation extends JsUnaryOperation { diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsPrefixOperation.java similarity index 90% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsPrefixOperation.java index 80863cbf4f6..09c64a5b6ce 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsPrefixOperation.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; public final class JsPrefixOperation extends JsUnaryOperation { diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsProgram.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgram.java similarity index 94% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsProgram.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgram.java index a818b423f4f..c15ad24c3ef 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsProgram.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgram.java @@ -2,18 +2,17 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import gnu.trove.TDoubleObjectHashMap; import gnu.trove.THashMap; import gnu.trove.TIntObjectHashMap; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.js.backend.ast.JsNumberLiteral.JsDoubleLiteral; +import org.jetbrains.kotlin.js.backend.ast.JsNumberLiteral.JsIntLiteral; import java.util.Map; -import static com.google.dart.compiler.backend.js.ast.JsNumberLiteral.JsDoubleLiteral; -import static com.google.dart.compiler.backend.js.ast.JsNumberLiteral.JsIntLiteral; - /** * A JavaScript program. */ diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgramFragment.java similarity index 95% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgramFragment.java index 32a0a8d5ea9..3e251368710 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgramFragment.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsPropertyInitializer.java similarity index 97% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsPropertyInitializer.java index b610b27f6ea..a65449ea5c6 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsPropertyInitializer.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsRegExp.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsRegExp.java similarity index 94% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsRegExp.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsRegExp.java index 822707919b3..937b37fd0f7 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsRegExp.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsRegExp.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; public final class JsRegExp extends JsLiteral.JsValueLiteral { private String flags; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsReturn.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsReturn.java similarity index 93% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsReturn.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsReturn.java index 8b459b0b906..1d53474ccd1 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsReturn.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsReturn.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsRootScope.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsRootScope.java similarity index 91% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsRootScope.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsRootScope.java index 4db5b5283b7..c05254279d9 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsRootScope.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsRootScope.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.backend.js.JsReservedIdentifiers; +import org.jetbrains.kotlin.js.backend.JsReservedIdentifiers; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsScope.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsScope.java similarity index 98% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsScope.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsScope.java index cbe5e1379d3..eeb98ca4afb 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsScope.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsScope.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.Maps; +import org.jetbrains.kotlin.js.util.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsStatement.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsStatement.java similarity index 88% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsStatement.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsStatement.java index a064c7f8c81..3b7579c89c2 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsStatement.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsStatement.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsStringLiteral.java similarity index 93% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsStringLiteral.java index 0a80d7d0ddb..7445be4dde2 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsStringLiteral.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; public final class JsStringLiteral extends JsLiteral.JsValueLiteral { diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsSwitch.java similarity index 94% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsSwitch.java index 4d27322bc02..0f1dc7de3c4 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsSwitch.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsSwitchMember.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsSwitchMember.java similarity index 94% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsSwitchMember.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsSwitchMember.java index 8d923fa9e4e..3293b40089a 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsSwitchMember.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsSwitchMember.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsThrow.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsThrow.java similarity index 92% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsThrow.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsThrow.java index cbd92101636..90dc3012cfc 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsThrow.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsThrow.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; public class JsThrow extends SourceInfoAwareJsNode implements JsStatement { diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsTry.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsTry.java similarity index 96% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsTry.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsTry.java index 4e904d0c298..4e34a9f34a5 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsTry.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsTry.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperation.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsUnaryOperation.java similarity index 96% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperation.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsUnaryOperation.java index ca9df83077d..09d90f58d26 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperation.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsUnaryOperation.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; public abstract class JsUnaryOperation extends JsExpression { diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperator.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsUnaryOperator.java similarity index 97% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperator.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsUnaryOperator.java index 2b854d8313e..f6fee7295ea 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperator.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsUnaryOperator.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; /** * A JavaScript unary operator. diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVars.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVars.java similarity index 96% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVars.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVars.java index ff69c0092e5..f65317c9b98 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVars.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVars.java @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.common.Symbol; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.common.Symbol; +import org.jetbrains.kotlin.js.util.AstUtil; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitor.kt b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVisitor.kt similarity index 97% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitor.kt rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVisitor.kt index f1fe38f6a29..37a6fda485e 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitor.kt +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVisitor.kt @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast +package org.jetbrains.kotlin.js.backend.ast -import com.google.dart.compiler.backend.js.ast.JsVars.JsVar +import org.jetbrains.kotlin.js.backend.ast.JsVars.JsVar abstract class JsVisitor { open fun accept(node: T) { diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContext.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVisitorWithContext.java similarity index 99% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContext.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVisitorWithContext.java index bd817120a65..7a7d1b9f6d0 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContext.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVisitorWithContext.java @@ -12,7 +12,7 @@ * the License. */ -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; /** * Taken from GWT project with modifications. diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContextImpl.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVisitorWithContextImpl.java similarity index 99% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContextImpl.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVisitorWithContextImpl.java index 99d77b5967b..4a9f639ba56 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContextImpl.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVisitorWithContextImpl.java @@ -12,7 +12,7 @@ * the License. */ -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; /** * Taken from GWT project with modifications. diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsWhile.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsWhile.java similarity index 94% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsWhile.java rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsWhile.java index ccc50a50922..91983b0815d 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsWhile.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsWhile.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.backend.js.ast; +package org.jetbrains.kotlin.js.backend.ast; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.util.AstUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/RecursiveJsVisitor.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/RecursiveJsVisitor.java new file mode 100644 index 00000000000..ae30ed1eaf8 --- /dev/null +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/RecursiveJsVisitor.java @@ -0,0 +1,26 @@ +/* + * Copyright 2010-2017 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.kotlin.js.backend.ast; + +import org.jetbrains.annotations.NotNull; + +public abstract class RecursiveJsVisitor extends JsVisitor { + @Override + protected void visitElement(@NotNull JsNode node) { + node.acceptChildren(this); + } +} diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/SourceInfoAwareJsNode.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/SourceInfoAwareJsNode.java new file mode 100644 index 00000000000..89de0351e15 --- /dev/null +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/SourceInfoAwareJsNode.java @@ -0,0 +1,41 @@ +/* + * Copyright 2010-2017 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.kotlin.js.backend.ast; + +public abstract class SourceInfoAwareJsNode extends AbstractNode { + private Object source; + + @Override + public Object getSource() { + return source; + } + + @Override + public void setSource(Object info) { + source = info; + } + + @Override + public void acceptChildren(JsVisitor visitor) { + } + + @Override + public JsNode source(Object info) { + source = info; + return this; + } +} \ No newline at end of file diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/jsScopes.kt similarity index 98% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/jsScopes.kt index 4248be75f49..e3d2bf3cda9 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/jsScopes.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2017 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 com.google.dart.compiler.backend.js.ast +package org.jetbrains.kotlin.js.backend.ast import java.util.Stack diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/HasMetadata.kt b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/HasMetadata.kt similarity index 91% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/HasMetadata.kt rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/HasMetadata.kt index 66571b4b30e..f9c5ab23262 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/HasMetadata.kt +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/HasMetadata.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2017 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 com.google.dart.compiler.backend.js.ast.metadata +package org.jetbrains.kotlin.js.backend.ast.metadata abstract class HasMetadata { private val metadata: MutableMap = hashMapOf() diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/MetadataProperty.kt b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/MetadataProperty.kt similarity index 90% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/MetadataProperty.kt rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/MetadataProperty.kt index 8afffeb78e1..1e1fc99b51c 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/MetadataProperty.kt +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/MetadataProperty.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2017 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 com.google.dart.compiler.backend.js.ast.metadata +package org.jetbrains.kotlin.js.backend.ast.metadata import kotlin.reflect.KProperty diff --git a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/metadataProperties.kt similarity index 96% rename from js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/metadataProperties.kt index 785914022d7..0052189f977 100644 --- a/js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/metadataProperties.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 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,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + @file:JvmName("MetadataProperties") -package com.google.dart.compiler.backend.js.ast.metadata +package org.jetbrains.kotlin.js.backend.ast.metadata -import com.google.dart.compiler.backend.js.ast.* import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.resolve.inline.InlineStrategy import org.jetbrains.kotlin.types.KotlinType diff --git a/js/js.ast/src/com/google/dart/compiler/common/HasSymbol.java b/js/js.ast/src/org/jetbrains/kotlin/js/common/HasSymbol.java similarity index 90% rename from js/js.ast/src/com/google/dart/compiler/common/HasSymbol.java rename to js/js.ast/src/org/jetbrains/kotlin/js/common/HasSymbol.java index ef7ed712f50..3fc1ac4b2ae 100644 --- a/js/js.ast/src/com/google/dart/compiler/common/HasSymbol.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/common/HasSymbol.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.common; +package org.jetbrains.kotlin.js.common; public interface HasSymbol { /** diff --git a/js/js.ast/src/com/google/dart/compiler/common/SourceInfo.java b/js/js.ast/src/org/jetbrains/kotlin/js/common/SourceInfo.java similarity index 95% rename from js/js.ast/src/com/google/dart/compiler/common/SourceInfo.java rename to js/js.ast/src/org/jetbrains/kotlin/js/common/SourceInfo.java index 6e0efc8e505..9e793a496fb 100644 --- a/js/js.ast/src/com/google/dart/compiler/common/SourceInfo.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/common/SourceInfo.java @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.common; +package org.jetbrains.kotlin.js.common; -import com.google.dart.compiler.Source; +import org.jetbrains.kotlin.js.Source; import java.io.Serializable; diff --git a/js/js.ast/src/com/google/dart/compiler/common/SourceInfoImpl.java b/js/js.ast/src/org/jetbrains/kotlin/js/common/SourceInfoImpl.java similarity index 54% rename from js/js.ast/src/com/google/dart/compiler/common/SourceInfoImpl.java rename to js/js.ast/src/org/jetbrains/kotlin/js/common/SourceInfoImpl.java index 450f873e3e5..fb5b76dfc7c 100644 --- a/js/js.ast/src/com/google/dart/compiler/common/SourceInfoImpl.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/common/SourceInfoImpl.java @@ -1,6 +1,22 @@ -package com.google.dart.compiler.common; +/* + * Copyright 2010-2017 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. + */ -import com.google.dart.compiler.Source; +package org.jetbrains.kotlin.js.common; + +import org.jetbrains.kotlin.js.Source; public class SourceInfoImpl implements SourceInfo { protected Source source = null; diff --git a/js/js.ast/src/com/google/dart/compiler/common/Symbol.java b/js/js.ast/src/org/jetbrains/kotlin/js/common/Symbol.java similarity index 85% rename from js/js.ast/src/com/google/dart/compiler/common/Symbol.java rename to js/js.ast/src/org/jetbrains/kotlin/js/common/Symbol.java index c74cb34f095..64ced218056 100644 --- a/js/js.ast/src/com/google/dart/compiler/common/Symbol.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/common/Symbol.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.common; +package org.jetbrains.kotlin.js.common; public interface Symbol { } diff --git a/js/js.ast/src/com/google/dart/compiler/util/AstUtil.java b/js/js.ast/src/org/jetbrains/kotlin/js/util/AstUtil.java similarity index 85% rename from js/js.ast/src/com/google/dart/compiler/util/AstUtil.java rename to js/js.ast/src/org/jetbrains/kotlin/js/util/AstUtil.java index f5935d59343..2dea15e36fc 100644 --- a/js/js.ast/src/com/google/dart/compiler/util/AstUtil.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/util/AstUtil.java @@ -2,12 +2,15 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.util; +package org.jetbrains.kotlin.js.util; -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.kotlin.js.backend.ast.JsBinaryOperation; +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperator; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsNode; import java.util.ArrayList; import java.util.List; diff --git a/js/js.ast/src/com/google/dart/compiler/util/Maps.java b/js/js.ast/src/org/jetbrains/kotlin/js/util/Maps.java similarity index 97% rename from js/js.ast/src/com/google/dart/compiler/util/Maps.java rename to js/js.ast/src/org/jetbrains/kotlin/js/util/Maps.java index 5ca74c3a370..d8078ceb8fc 100644 --- a/js/js.ast/src/com/google/dart/compiler/util/Maps.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/util/Maps.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.util; +package org.jetbrains.kotlin.js.util; import java.util.Collections; import java.util.HashMap; diff --git a/js/js.ast/src/com/google/dart/compiler/util/TextOutput.java b/js/js.ast/src/org/jetbrains/kotlin/js/util/TextOutput.java similarity index 95% rename from js/js.ast/src/com/google/dart/compiler/util/TextOutput.java rename to js/js.ast/src/org/jetbrains/kotlin/js/util/TextOutput.java index 9b6772551db..703304d73d9 100644 --- a/js/js.ast/src/com/google/dart/compiler/util/TextOutput.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/util/TextOutput.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.util; +package org.jetbrains.kotlin.js.util; /** * Interface used for printing text output. diff --git a/js/js.ast/src/com/google/dart/compiler/util/TextOutputImpl.java b/js/js.ast/src/org/jetbrains/kotlin/js/util/TextOutputImpl.java similarity index 99% rename from js/js.ast/src/com/google/dart/compiler/util/TextOutputImpl.java rename to js/js.ast/src/org/jetbrains/kotlin/js/util/TextOutputImpl.java index 2f1d041056f..6768967de14 100644 --- a/js/js.ast/src/com/google/dart/compiler/util/TextOutputImpl.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/util/TextOutputImpl.java @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -package com.google.dart.compiler.util; +package org.jetbrains.kotlin.js.util; import java.util.Arrays; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt index 600e206b441..a94923c1dd5 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.resolve.diagnostics -import com.google.dart.compiler.backend.js.ast.JsFunctionScope -import com.google.dart.compiler.backend.js.ast.JsProgram -import com.google.dart.compiler.backend.js.ast.JsRootScope +import org.jetbrains.kotlin.js.backend.ast.JsFunctionScope +import org.jetbrains.kotlin.js.backend.ast.JsProgram +import org.jetbrains.kotlin.js.backend.ast.JsRootScope import com.google.gwt.dev.js.parserExceptions.AbortParsingException import com.google.gwt.dev.js.rhino.CodePosition import com.google.gwt.dev.js.rhino.ErrorReporter diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineBlock.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineBlock.kt index d13fa4a43bb..0e8936fba5a 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineBlock.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineBlock.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.coroutine -import com.google.dart.compiler.backend.js.ast.JsBlock -import com.google.dart.compiler.backend.js.ast.JsStatement +import org.jetbrains.kotlin.js.backend.ast.JsBlock +import org.jetbrains.kotlin.js.backend.ast.JsStatement class CoroutineBlock { val statements = mutableListOf() diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineBodyTransformer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineBodyTransformer.kt index 295ba832802..fff4f47ec0b 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineBodyTransformer.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineBodyTransformer.kt @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.js.coroutine -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.* +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.* import org.jetbrains.kotlin.js.inline.util.collectBreakContinueTargets import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.utils.DFS -class CoroutineBodyTransformer(private val program: JsProgram,private val context: CoroutineTransformationContext) : RecursiveJsVisitor() { +class CoroutineBodyTransformer(private val program: JsProgram, private val context: CoroutineTransformationContext) : RecursiveJsVisitor() { private val entryBlock = context.entryBlock private val globalCatchBlock = context.globalCatchBlock private var currentBlock = entryBlock diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineFunctionTransformer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineFunctionTransformer.kt index da0b0289860..55f40d15bb7 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineFunctionTransformer.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineFunctionTransformer.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.coroutine -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.coroutineMetadata +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.coroutineMetadata import org.jetbrains.kotlin.js.inline.clean.FunctionPostProcessor import org.jetbrains.kotlin.js.inline.util.collectLocalVariables import org.jetbrains.kotlin.js.inline.util.getInnerFunction diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineMetadataProperties.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineMetadataProperties.kt index e429cf5206f..e44cc2de8ba 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineMetadataProperties.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineMetadataProperties.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.coroutine -import com.google.dart.compiler.backend.js.ast.JsDebugger -import com.google.dart.compiler.backend.js.ast.JsExpressionStatement -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperty +import org.jetbrains.kotlin.js.backend.ast.JsDebugger +import org.jetbrains.kotlin.js.backend.ast.JsExpressionStatement +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperty var JsDebugger.targetBlock: CoroutineBlock? by MetadataProperty(default = null) var JsDebugger.targetExceptionBlock: CoroutineBlock? by MetadataProperty(default = null) diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutinePasses.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutinePasses.kt index 9043c778700..399dc98ae0e 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutinePasses.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutinePasses.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.coroutine -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.* +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.* import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.utils.singletonOrEmptyList diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformationContext.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformationContext.kt index 2490780e151..12d139dccb8 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformationContext.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformationContext.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.coroutine -import com.google.dart.compiler.backend.js.ast.JsFunction -import com.google.dart.compiler.backend.js.ast.JsScope -import com.google.dart.compiler.backend.js.ast.metadata.coroutineMetadata +import org.jetbrains.kotlin.js.backend.ast.JsFunction +import org.jetbrains.kotlin.js.backend.ast.JsScope +import org.jetbrains.kotlin.js.backend.ast.metadata.coroutineMetadata class CoroutineTransformationContext(private val scope: JsScope, function: JsFunction) { val entryBlock = CoroutineBlock() diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformer.kt index 0ea978c8120..8b9dec9385d 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformer.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformer.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.coroutine -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.coroutineType +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.coroutineType class CoroutineTransformer(private val program: JsProgram) : JsVisitorWithContextImpl() { private val additionalStatements = mutableListOf() diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt index 50f5987e2d7..9a957daff2b 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt @@ -16,9 +16,12 @@ package org.jetbrains.kotlin.js.inline -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.* import com.intellij.util.SmartList +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind +import org.jetbrains.kotlin.js.backend.ast.metadata.sideEffects +import org.jetbrains.kotlin.js.backend.ast.metadata.staticRef +import org.jetbrains.kotlin.js.backend.ast.metadata.synthetic import org.jetbrains.kotlin.js.inline.util.IdentitySet import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.inline.util.rewriters.ContinueReplacingVisitor diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt index 8c727cdd231..a98e53db558 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.* +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.* import org.jetbrains.kotlin.js.inline.clean.removeDefaultInitializers import org.jetbrains.kotlin.js.inline.clean.removeFakeSuspend import org.jetbrains.kotlin.js.inline.context.InliningContext diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt index 8f975b6b2f7..e9a89640c38 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.js.inline -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.inlineStrategy +import org.jetbrains.kotlin.js.backend.ast.metadata.inlineStrategy import com.google.gwt.dev.js.ThrowExceptionOnErrorReporter import com.intellij.util.containers.SLRUCache import org.jetbrains.kotlin.builtins.isExtensionFunctionType import org.jetbrains.kotlin.builtins.isFunctionTypeOrSubtype import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.config.LibrarySourcesConfig import org.jetbrains.kotlin.js.inline.util.IdentitySet import org.jetbrains.kotlin.js.inline.util.isCallInvocation diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InlineableResult.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InlineableResult.kt index 8f2288cd186..27d95f13b7d 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InlineableResult.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InlineableResult.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline -import com.google.dart.compiler.backend.js.ast.JsStatement -import com.google.dart.compiler.backend.js.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsStatement +import org.jetbrains.kotlin.js.backend.ast.JsExpression class InlineableResult( val inlineableBody: JsStatement, 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 489758229de..ed671f66348 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 @@ -16,8 +16,6 @@ package org.jetbrains.kotlin.js.inline; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; import com.intellij.psi.PsiElement; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; @@ -27,6 +25,8 @@ import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor; import org.jetbrains.kotlin.descriptors.PropertySetterDescriptor; import org.jetbrains.kotlin.diagnostics.DiagnosticSink; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; import org.jetbrains.kotlin.js.inline.clean.FunctionPostProcessor; import org.jetbrains.kotlin.js.inline.clean.RemoveUnusedFunctionDefinitionsKt; import org.jetbrains.kotlin.js.inline.clean.RemoveUnusedLocalFunctionDeclarationsKt; diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/CoroutineStateElimination.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/CoroutineStateElimination.kt index 04c7cfa5e2e..22ad21f23b9 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/CoroutineStateElimination.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/CoroutineStateElimination.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.coroutine.finallyPath import org.jetbrains.kotlin.js.coroutine.targetBlock import org.jetbrains.kotlin.js.coroutine.targetExceptionBlock diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/DeadCodeElimination.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/DeadCodeElimination.kt index 6f049fab637..c7ee5f87b63 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/DeadCodeElimination.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/DeadCodeElimination.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.* internal class DeadCodeElimination(private val root: JsStatement) { var hasChanges = false diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/DoWhileGuardElimination.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/DoWhileGuardElimination.kt index f56a139bb5d..8e1490948bb 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/DoWhileGuardElimination.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/DoWhileGuardElimination.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.* /** * During inlining we can sometimes get the following representation for do..while statement: diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/FunctionPostProcessor.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/FunctionPostProcessor.kt index b0654694291..5a59d8f9b18 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/FunctionPostProcessor.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/FunctionPostProcessor.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.JsFunction +import org.jetbrains.kotlin.js.backend.ast.JsFunction class FunctionPostProcessor(root: JsFunction) { val optimizations = listOf( diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/IfStatementReduction.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/IfStatementReduction.kt index e0044e8f72b..52369a79808 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/IfStatementReduction.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/IfStatementReduction.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.synthetic +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.synthetic import org.jetbrains.kotlin.js.translate.utils.JsAstUtils class IfStatementReduction(private val root: JsStatement) { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/NodeRemover.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/NodeRemover.kt index 3d50d3aefc0..8380898bf35 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/NodeRemover.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/NodeRemover.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.JsContext -import com.google.dart.compiler.backend.js.ast.JsNode -import com.google.dart.compiler.backend.js.ast.JsVisitorWithContextImpl +import org.jetbrains.kotlin.js.backend.ast.JsContext +import org.jetbrains.kotlin.js.backend.ast.JsNode +import org.jetbrains.kotlin.js.backend.ast.JsVisitorWithContextImpl internal class NodeRemover(val klass: Class, val predicate: (T) -> Boolean): JsVisitorWithContextImpl() { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantBindElimination.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantBindElimination.kt index e5140b6aaf2..7b127fcbfb4 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantBindElimination.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantBindElimination.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.JsBlock -import com.google.dart.compiler.backend.js.ast.JsInvocation -import com.google.dart.compiler.backend.js.ast.JsNameRef -import com.google.dart.compiler.backend.js.ast.RecursiveJsVisitor +import org.jetbrains.kotlin.js.backend.ast.JsBlock +import org.jetbrains.kotlin.js.backend.ast.JsInvocation +import org.jetbrains.kotlin.js.backend.ast.JsNameRef +import org.jetbrains.kotlin.js.backend.ast.RecursiveJsVisitor // TODO: this optimization is a little unfair. It tries to recognize pattern like this a.bind(b)(args) and // replace it with b.a(args). However, we can't be completely sure that `a` is a Function. diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantLabelRemoval.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantLabelRemoval.kt index 96e8ff387e4..bed735fcbc6 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantLabelRemoval.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantLabelRemoval.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.synthetic +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.synthetic import org.jetbrains.kotlin.js.translate.utils.JsAstUtils internal class RedundantLabelRemoval(private val root: JsStatement) { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantStatementElimination.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantStatementElimination.kt index 2afa65f7f0e..5e0fd81bc07 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantStatementElimination.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantStatementElimination.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.SideEffectKind -import com.google.dart.compiler.backend.js.ast.metadata.sideEffects -import com.google.dart.compiler.backend.js.ast.metadata.synthetic +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind +import org.jetbrains.kotlin.js.backend.ast.metadata.sideEffects +import org.jetbrains.kotlin.js.backend.ast.metadata.synthetic import org.jetbrains.kotlin.js.inline.util.collectLocalVariables import org.jetbrains.kotlin.js.translate.utils.JsAstUtils diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantVariableDeclarationElimination.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantVariableDeclarationElimination.kt index bd83ec75e04..d560acc904e 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantVariableDeclarationElimination.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantVariableDeclarationElimination.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.synthetic +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.synthetic import org.jetbrains.kotlin.js.inline.util.collectFreeVariables internal class RedundantVariableDeclarationElimination(private val root: JsStatement) { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt index f725fc57f22..4ea0b3e5e40 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.JsNode +import org.jetbrains.kotlin.js.backend.ast.JsNode import org.jetbrains.kotlin.js.inline.util.IdentitySet import java.util.* diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt index 920a95141f5..9e641d855d9 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.synthetic +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.synthetic import org.jetbrains.kotlin.js.inline.util.canHaveSideEffect import org.jetbrains.kotlin.js.inline.util.collectDefinedNames import org.jetbrains.kotlin.js.inline.util.collectFreeVariables diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryVariableElimination.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryVariableElimination.kt index eff73272ee3..6647a946f6b 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryVariableElimination.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryVariableElimination.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.SideEffectKind -import com.google.dart.compiler.backend.js.ast.metadata.imported -import com.google.dart.compiler.backend.js.ast.metadata.sideEffects -import com.google.dart.compiler.backend.js.ast.metadata.synthetic +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind +import org.jetbrains.kotlin.js.backend.ast.metadata.imported +import org.jetbrains.kotlin.js.backend.ast.metadata.sideEffects +import org.jetbrains.kotlin.js.backend.ast.metadata.synthetic import org.jetbrains.kotlin.js.inline.util.collectFreeVariables import org.jetbrains.kotlin.js.inline.util.collectLocalVariables import org.jetbrains.kotlin.js.translate.utils.JsAstUtils diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/WhileConditionFolding.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/WhileConditionFolding.kt index 3605877e85e..0a0f3133749 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/WhileConditionFolding.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/WhileConditionFolding.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.utils.JsAstUtils class WhileConditionFolding(val body: JsBlock) { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/coroutines.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/coroutines.kt index 7e0d4f3fe34..155e8d3f22a 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/coroutines.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/coroutines.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.isFakeSuspend -import com.google.dart.compiler.backend.js.ast.metadata.isPreSuspend -import com.google.dart.compiler.backend.js.ast.metadata.isSuspend -import com.google.dart.compiler.backend.js.ast.metadata.synthetic +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.isFakeSuspend +import org.jetbrains.kotlin.js.backend.ast.metadata.isPreSuspend +import org.jetbrains.kotlin.js.backend.ast.metadata.isSuspend +import org.jetbrains.kotlin.js.backend.ast.metadata.synthetic import org.jetbrains.kotlin.js.translate.context.Namer fun T.removeFakeSuspend(): T { 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 0a30651653c..c416734ae12 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 @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.hasDefaultValue +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.hasDefaultValue import org.jetbrains.kotlin.js.inline.util.toIdentitySet import org.jetbrains.kotlin.js.inline.util.zipWithDefault diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedFunctionDefinitions.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedFunctionDefinitions.kt index f17d80c0b92..a7c2ef03a2d 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedFunctionDefinitions.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedFunctionDefinitions.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.staticRef -import com.google.dart.compiler.backend.js.ast.metadata.isLocal +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.staticRef +import org.jetbrains.kotlin.js.backend.ast.metadata.isLocal import org.jetbrains.kotlin.js.inline.util.IdentitySet import org.jetbrains.kotlin.js.inline.util.collectFunctionReferencesInside diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedImports.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedImports.kt index 313612cf965..9fe61908388 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedImports.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedImports.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.imported +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.imported fun removeUnusedImports(root: JsNode) { val collector = UsedImportsCollector() diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedLocalFunctionDeclarations.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedLocalFunctionDeclarations.kt index d66078289d8..d6f1981d31e 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedLocalFunctionDeclarations.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedLocalFunctionDeclarations.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.staticRef +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.staticRef import org.jetbrains.kotlin.js.inline.util.collectUsedNames import org.jetbrains.kotlin.js.inline.util.transitiveStaticRef diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/resolveTemporaryNames.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/resolveTemporaryNames.kt index d691b6f89bc..1e1fe51f85a 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/resolveTemporaryNames.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/resolveTemporaryNames.kt @@ -32,8 +32,8 @@ package org.jetbrains.kotlin.js.inline.clean -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.coroutineMetadata +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.coroutineMetadata import org.jetbrains.kotlin.js.inline.util.collectReferencedTemporaryNames fun JsNode.resolveTemporaryNames() { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt index 7de37c92534..f3e9830c2db 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.context -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.descriptor +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.descriptor import org.jetbrains.kotlin.js.inline.FunctionReader import org.jetbrains.kotlin.js.inline.util.* import org.jetbrains.kotlin.js.translate.context.Namer diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/InliningContext.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/InliningContext.kt index a4831e01507..5b48897a7f7 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/InliningContext.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/InliningContext.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.context -import com.google.dart.compiler.backend.js.ast.JsContext -import com.google.dart.compiler.backend.js.ast.JsStatement +import org.jetbrains.kotlin.js.backend.ast.JsContext +import org.jetbrains.kotlin.js.backend.ast.JsStatement interface InliningContext { val statementContext: JsContext 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 b448769fa0b..a0373b1441d 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 @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.context -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.synthetic +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.synthetic import java.util.ArrayList import java.util.IdentityHashMap diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt index 7784564f642..36f21e81920 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.util -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.staticRef +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.staticRef import org.jetbrains.kotlin.js.inline.util.collectors.InstanceCollector import org.jetbrains.kotlin.js.translate.expression.InlineMetadata import org.jetbrains.kotlin.js.translate.utils.JsAstUtils diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectors/InstanceCollector.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectors/InstanceCollector.kt index a07e533582f..d536fb8cb1c 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectors/InstanceCollector.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectors/InstanceCollector.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.inline.util.collectors -import com.google.dart.compiler.backend.js.ast.JsFunction -import com.google.dart.compiler.backend.js.ast.JsNode -import com.google.dart.compiler.backend.js.ast.JsObjectLiteral -import com.google.dart.compiler.backend.js.ast.RecursiveJsVisitor +import org.jetbrains.kotlin.js.backend.ast.JsFunction +import org.jetbrains.kotlin.js.backend.ast.JsNode +import org.jetbrains.kotlin.js.backend.ast.JsObjectLiteral +import org.jetbrains.kotlin.js.backend.ast.RecursiveJsVisitor import java.util.ArrayList class InstanceCollector(val klass: Class, val visitNestedDeclarations: Boolean) : RecursiveJsVisitor() { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/functionUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/functionUtils.kt index 3905362f6fe..9a84e89aac9 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/functionUtils.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/functionUtils.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.util -import com.google.dart.compiler.backend.js.ast.JsFunction -import com.google.dart.compiler.backend.js.ast.JsReturn +import org.jetbrains.kotlin.js.backend.ast.JsFunction +import org.jetbrains.kotlin.js.backend.ast.JsReturn fun isFunctionCreator(outer: JsFunction): Boolean = outer.getInnerFunction() != null 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 e75b1c46a01..8c2d03556f9 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 @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.util -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.staticRef +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.staticRef import org.jetbrains.kotlin.js.translate.context.Namer /** diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt index c2ff617030e..8395feac05b 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.util -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.staticRef +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.staticRef import org.jetbrains.kotlin.js.inline.context.NamingContext import org.jetbrains.kotlin.js.inline.util.rewriters.LabelNameRefreshingVisitor diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriteUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriteUtils.kt index 18eda89faa6..36040ee7fd6 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriteUtils.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriteUtils.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.inline.util -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.JsNode +import org.jetbrains.kotlin.js.backend.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsName +import org.jetbrains.kotlin.js.backend.ast.JsNode import org.jetbrains.kotlin.js.inline.util.rewriters.NameReplacingVisitor import org.jetbrains.kotlin.js.inline.util.rewriters.ThisReplacingVisitor diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ContinueReplacingVisitor.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ContinueReplacingVisitor.kt index 72ba6b374cd..312687c69f1 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ContinueReplacingVisitor.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ContinueReplacingVisitor.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.inline.util.rewriters -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.* class ContinueReplacingVisitor(val loopLabelName: JsName?, val guardLabelName: JsName) : JsVisitorWithContextImpl() { var loopNestingLevel = 0 diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/LabelNameRefreshingVisitor.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/LabelNameRefreshingVisitor.kt index c4cf50f292b..3b494ea0fa3 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/LabelNameRefreshingVisitor.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/LabelNameRefreshingVisitor.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.inline.util.rewriters -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.* import java.util.* class LabelNameRefreshingVisitor(val functionScope: JsFunctionScope) : JsVisitorWithContextImpl() { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/NameReplacingVisitor.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/NameReplacingVisitor.kt index 8e164d34774..1095b1fc6b1 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/NameReplacingVisitor.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/NameReplacingVisitor.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.inline.util.rewriters -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.* class NameReplacingVisitor(private val replaceMap: Map) : JsVisitorWithContextImpl() { 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 c33229f81d2..ceb55dd042f 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 @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.inline.util.rewriters -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.* +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.* import org.jetbrains.kotlin.js.translate.utils.JsAstUtils class ReturnReplacingVisitor( diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ThisReplacingVisitor.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ThisReplacingVisitor.kt index 79deda8b02b..fe49fa7e964 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ThisReplacingVisitor.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ThisReplacingVisitor.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.inline.util.rewriters -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.* class ThisReplacingVisitor(private val thisReplacement: JsExpression) : JsVisitorWithContextImpl() { override fun endVisit(x: JsLiteral.JsThisRef, ctx: JsContext) { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/sideEffectUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/sideEffectUtils.kt index bcd95404fe4..f659e4ccb34 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/sideEffectUtils.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/sideEffectUtils.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.inline.util -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.SideEffectKind -import com.google.dart.compiler.backend.js.ast.metadata.sideEffects +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind +import org.jetbrains.kotlin.js.backend.ast.metadata.sideEffects import org.jetbrains.kotlin.js.translate.utils.jsAstUtils.any fun JsExpression.canHaveSideEffect(localVars: Set) = diff --git a/js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java b/js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java index 7c9aeebe178..aafad5d3529 100644 --- a/js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java +++ b/js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java @@ -15,9 +15,9 @@ */ package com.google.gwt.dev.js; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.JsLiteral.JsBooleanLiteral; -import com.google.dart.compiler.backend.js.ast.metadata.HasMetadata; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.JsLiteral.JsBooleanLiteral; +import org.jetbrains.kotlin.js.backend.ast.metadata.HasMetadata; import com.google.gwt.dev.js.parserExceptions.JsParserException; import com.google.gwt.dev.js.rhino.*; import com.intellij.util.SmartList; diff --git a/js/js.parser/src/com/google/gwt/dev/js/ScopeContext.kt b/js/js.parser/src/com/google/gwt/dev/js/ScopeContext.kt index 113046937c5..76fc83b0315 100644 --- a/js/js.parser/src/com/google/gwt/dev/js/ScopeContext.kt +++ b/js/js.parser/src/com/google/gwt/dev/js/ScopeContext.kt @@ -16,7 +16,7 @@ package com.google.gwt.dev.js -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.* import java.util.Stack diff --git a/js/js.parser/src/org/jetbrains/kotlin/js/parser/parserUtils.kt b/js/js.parser/src/org/jetbrains/kotlin/js/parser/parserUtils.kt index 78078cf282e..6ceaa3f4d5e 100644 --- a/js/js.parser/src/org/jetbrains/kotlin/js/parser/parserUtils.kt +++ b/js/js.parser/src/org/jetbrains/kotlin/js/parser/parserUtils.kt @@ -16,12 +16,14 @@ package org.jetbrains.kotlin.js.parser -import com.google.dart.compiler.common.* -import com.google.dart.compiler.backend.js.ast.* import com.google.gwt.dev.js.* import com.google.gwt.dev.js.rhino.* -import com.intellij.util.* +import org.jetbrains.kotlin.js.backend.ast.JsFunction +import org.jetbrains.kotlin.js.backend.ast.JsFunctionScope +import org.jetbrains.kotlin.js.backend.ast.JsScope +import org.jetbrains.kotlin.js.backend.ast.JsStatement +import org.jetbrains.kotlin.js.common.SourceInfoImpl import java.io.* import java.util.* diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt index f6a3caa3a3a..ed49adbb93b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.test -import com.google.dart.compiler.backend.js.ast.JsProgram +import org.jetbrains.kotlin.js.backend.ast.JsProgram import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.vfs.StandardFileSystems diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java index 37ea810cefc..64223fb6bd8 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.js.test; import com.google.common.collect.Lists; -import com.google.dart.compiler.backend.js.ast.JsProgram; +import org.jetbrains.kotlin.js.backend.ast.JsProgram; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.StandardFileSystems; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ast/JsScopeTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ast/JsScopeTest.java index de1da452067..a3e994dcb32 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ast/JsScopeTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ast/JsScopeTest.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.test.ast; -import com.google.dart.compiler.backend.js.ast.JsName; -import com.google.dart.compiler.backend.js.ast.JsScope; +import org.jetbrains.kotlin.js.backend.ast.JsName; +import org.jetbrains.kotlin.js.backend.ast.JsScope; import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/optimizer/BasicOptimizerTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/optimizer/BasicOptimizerTest.kt index 41b162479fa..aa2e6806991 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/optimizer/BasicOptimizerTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/optimizer/BasicOptimizerTest.kt @@ -17,12 +17,12 @@ package org.jetbrains.kotlin.js.test.optimizer -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.synthetic -import com.google.dart.compiler.util.TextOutputImpl +import org.jetbrains.kotlin.js.backend.ast.metadata.synthetic +import org.jetbrains.kotlin.js.util.TextOutputImpl import com.google.gwt.dev.js.rhino.CodePosition import com.google.gwt.dev.js.rhino.ErrorReporter import com.intellij.openapi.util.io.FileUtil +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.inline.clean.FunctionPostProcessor import org.jetbrains.kotlin.js.parser.parse import org.jetbrains.kotlin.js.sourceMap.JsSourceGenerationVisitor diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/AstSearchUtil.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/AstSearchUtil.java index db9bcdfda4d..0b90e81b006 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/AstSearchUtil.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/AstSearchUtil.java @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.test.utils; -import com.google.dart.compiler.backend.js.ast.JsExpression; -import com.google.dart.compiler.backend.js.ast.JsFunction; -import com.google.dart.compiler.backend.js.ast.JsName; -import com.google.dart.compiler.backend.js.ast.JsNode; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsFunction; +import org.jetbrains.kotlin.js.backend.ast.JsName; +import org.jetbrains.kotlin.js.backend.ast.JsNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.js.inline.util.CollectUtilsKt; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/CallCounter.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/CallCounter.java index a2e303a2524..a316cff5715 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/CallCounter.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/CallCounter.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.test.utils; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.js.backend.ast.*; import java.util.*; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java index 248a26ff4cd..5042a1bbc3b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.test.utils; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.kotlin.js.translate.expression.InlineMetadata; import java.util.*; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/PropertyReferenceCollector.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/PropertyReferenceCollector.kt index 6220bebe886..e1371c72306 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/PropertyReferenceCollector.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/PropertyReferenceCollector.kt @@ -16,7 +16,10 @@ package org.jetbrains.kotlin.js.test.utils -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperation +import org.jetbrains.kotlin.js.backend.ast.JsNameRef +import org.jetbrains.kotlin.js.backend.ast.JsNode +import org.jetbrains.kotlin.js.backend.ast.RecursiveJsVisitor import org.jetbrains.kotlin.js.translate.utils.JsAstUtils class PropertyReferenceCollector : RecursiveJsVisitor() { diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/jsVerification.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/jsVerification.kt index e19439c04c7..1718a9c2fd9 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/jsVerification.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/jsVerification.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.test.utils -import com.google.dart.compiler.backend.js.ast.JsExpressionStatement -import com.google.dart.compiler.backend.js.ast.JsNullLiteral -import com.google.dart.compiler.backend.js.ast.JsProgram -import com.google.dart.compiler.backend.js.ast.RecursiveJsVisitor +import org.jetbrains.kotlin.js.backend.ast.JsExpressionStatement +import org.jetbrains.kotlin.js.backend.ast.JsNullLiteral +import org.jetbrains.kotlin.js.backend.ast.JsProgram +import org.jetbrains.kotlin.js.backend.ast.RecursiveJsVisitor import org.junit.Assert fun JsProgram.verifyAst() { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java index 3318f5b8bcd..36e3050937d 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.facade; -import com.google.dart.compiler.backend.js.ast.JsProgram; +import org.jetbrains.kotlin.js.backend.ast.JsProgram; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt b/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt index cfe4b338bfe..f8b1c091da0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.facade -import com.google.dart.compiler.backend.js.ast.JsProgram -import com.google.dart.compiler.util.TextOutput -import com.google.dart.compiler.util.TextOutputImpl +import org.jetbrains.kotlin.js.backend.ast.JsProgram +import org.jetbrains.kotlin.js.util.TextOutput +import org.jetbrains.kotlin.js.util.TextOutputImpl import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.vfs.VfsUtilCore import org.jetbrains.kotlin.backend.common.output.* diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/JsSourceGenerationVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/JsSourceGenerationVisitor.java index cfc6969d3b4..5b26414a5ec 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/JsSourceGenerationVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/JsSourceGenerationVisitor.java @@ -16,9 +16,9 @@ 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 org.jetbrains.kotlin.js.backend.JsToStringGenerationVisitor; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.util.TextOutput; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMap3Builder.java b/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMap3Builder.java index b3745dba139..9b3b93d3ab6 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMap3Builder.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/sourceMap/SourceMap3Builder.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.sourceMap; -import com.google.dart.compiler.common.SourceInfo; -import com.google.dart.compiler.util.TextOutput; +import org.jetbrains.kotlin.js.common.SourceInfo; +import org.jetbrains.kotlin.js.util.TextOutput; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.PairConsumer; import gnu.trove.TObjectIntHashMap; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt index 1a92ed4996b..b73c823e089 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.translate.callTranslator -import com.google.dart.compiler.backend.js.ast.JsBlock -import com.google.dart.compiler.backend.js.ast.JsConditional -import com.google.dart.compiler.backend.js.ast.JsExpression -import com.google.dart.compiler.backend.js.ast.JsLiteral +import org.jetbrains.kotlin.js.backend.ast.JsBlock +import org.jetbrains.kotlin.js.backend.ast.JsConditional +import org.jetbrains.kotlin.js.backend.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsLiteral import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.diagnostics.DiagnosticUtils diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt index 58df5585059..07a2de58c9a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.translate.callTranslator -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.metadata.SideEffectKind -import com.google.dart.compiler.backend.js.ast.metadata.sideEffects +import org.jetbrains.kotlin.js.backend.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsName +import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind +import org.jetbrains.kotlin.js.backend.ast.metadata.sideEffects import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt index 0fbbee24542..16b5638938d 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt @@ -16,14 +16,14 @@ package org.jetbrains.kotlin.js.translate.callTranslator -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.isFunctionTypeOrSubtype import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.* import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.general.Translation import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt index 8d9611b0c14..3b4c923f0e8 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.js.translate.callTranslator -import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.builtins.functions.FunctionInvokeDescriptor import org.jetbrains.kotlin.builtins.isExtensionFunctionType import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.js.PredefinedAnnotation +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.operation.OperatorTable diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VariableCallCases.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VariableCallCases.kt index f78f8ff9a04..cfa5a188b9a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VariableCallCases.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VariableCallCases.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.js.translate.callTranslator -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 com.google.dart.compiler.backend.js.ast.metadata.SideEffectKind -import com.google.dart.compiler.backend.js.ast.metadata.sideEffects +import org.jetbrains.kotlin.js.backend.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsInvocation +import org.jetbrains.kotlin.js.backend.ast.JsNameRef +import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind +import org.jetbrains.kotlin.js.backend.ast.metadata.sideEffects import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java index c83fbaaaf34..f8f20d740c2 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.context; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeclarationExporter.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeclarationExporter.kt index ba678752147..05ab81d8b1f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeclarationExporter.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeclarationExporter.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.translate.context -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.staticRef +import org.jetbrains.kotlin.js.backend.ast.metadata.staticRef import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils.isLibraryObject import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils.isNativeObject @@ -28,7 +28,6 @@ import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils import org.jetbrains.kotlin.js.translate.utils.TranslationUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyPublicApi internal class DeclarationExporter(val context: StaticContext) { private val objectLikeKinds = setOf(ClassKind.OBJECT, ClassKind.ENUM_ENTRY) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeferredCallSite.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeferredCallSite.kt index fec2651c7b4..94bc1f4c125 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeferredCallSite.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeferredCallSite.kt @@ -32,7 +32,7 @@ package org.jetbrains.kotlin.js.translate.context -import com.google.dart.compiler.backend.js.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsExpression import org.jetbrains.kotlin.descriptors.ConstructorDescriptor class DeferredCallSite( diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DynamicContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DynamicContext.java index 78623634238..566692db5d7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DynamicContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DynamicContext.java @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.js.translate.context; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; -import static com.google.dart.compiler.backend.js.ast.JsVars.JsVar; +import static org.jetbrains.kotlin.js.backend.ast.JsVars.JsVar; //TODO: consider renaming to scoping context public final class DynamicContext { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java index c4a708517a2..0c5004e3a66 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.translate.context; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; -import com.google.dart.compiler.backend.js.ast.metadata.SideEffectKind; -import com.google.dart.compiler.backend.js.ast.metadata.TypeCheck; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; +import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind; +import org.jetbrains.kotlin.js.backend.ast.metadata.TypeCheck; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java index b8045311c11..fd5eb779bda 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.js.translate.context; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; -import com.google.dart.compiler.backend.js.ast.metadata.SideEffectKind; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; +import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind; import com.intellij.openapi.util.Factory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.hash.LinkedHashMap; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryConstVariable.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryConstVariable.java index d59bc98c29c..c6ddc1a9f33 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryConstVariable.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryConstVariable.java @@ -16,8 +16,8 @@ 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 org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsName; import org.jetbrains.annotations.NotNull; public final class TemporaryConstVariable extends TemporaryVariable{ diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryVariable.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryVariable.java index 5d4c6b0056e..38f8b55718b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryVariable.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TemporaryVariable.java @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.translate.context; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; public class TemporaryVariable { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java index 2dcbefd803a..fb867b453b4 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java @@ -16,8 +16,6 @@ package org.jetbrains.kotlin.js.translate.context; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -25,6 +23,8 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; import org.jetbrains.kotlin.js.config.JsConfig; import org.jetbrains.kotlin.js.translate.intrinsic.Intrinsics; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt index 504fe90b7dd..294b0e49817 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.translate.context -import com.google.dart.compiler.backend.js.ast.JsName -import com.google.dart.compiler.backend.js.ast.JsScope +import org.jetbrains.kotlin.js.backend.ast.JsName +import org.jetbrains.kotlin.js.backend.ast.JsScope import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.js.descriptorUtils.isCoroutineLambda import org.jetbrains.kotlin.js.naming.NameSuggestion diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/AbstractDeclarationVisitor.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/AbstractDeclarationVisitor.kt index 96769e6dfd5..fc42bbc95c2 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/AbstractDeclarationVisitor.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/AbstractDeclarationVisitor.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.declaration -import com.google.dart.compiler.backend.js.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsExpression import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.Modality diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt index 31b35073033..d4664826877 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.js.translate.declaration -import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.backend.common.CodegenUtil import org.jetbrains.kotlin.backend.common.bridges.Bridge import org.jetbrains.kotlin.backend.common.bridges.generateBridgesForFunctionDescriptor import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.descriptorUtils.hasPrimaryConstructor import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator import org.jetbrains.kotlin.js.translate.context.* diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.kt index ddc3bc02e0e..82d456a3918 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.translate.declaration -import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.initializer.ClassInitializerTranslator diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt index 1cd1e695cca..99283e3be6e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.translate.declaration -import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.backend.common.CodegenUtil import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.naming.NameSuggestion import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.TranslationContext diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/EnumTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/EnumTranslator.kt index 20af34bfb57..b035126f0f9 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/EnumTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/EnumTranslator.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.translate.declaration -import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.general.AbstractTranslator diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclarationVisitor.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclarationVisitor.kt index 6990c743b45..09d1f0ec648 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclarationVisitor.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclarationVisitor.kt @@ -15,9 +15,9 @@ */ 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 -import com.google.dart.compiler.backend.js.ast.JsName +import org.jetbrains.kotlin.js.backend.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsFunction +import org.jetbrains.kotlin.js.backend.ast.JsName import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/InterfaceFunctionCopier.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/InterfaceFunctionCopier.kt index 7bf411dfd26..f19cb443cc6 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/InterfaceFunctionCopier.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/InterfaceFunctionCopier.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.translate.declaration -import com.google.dart.compiler.backend.js.ast.JsInvocation -import com.google.dart.compiler.backend.js.ast.JsName -import com.google.dart.compiler.backend.js.ast.JsNameRef +import org.jetbrains.kotlin.js.backend.ast.JsInvocation +import org.jetbrains.kotlin.js.backend.ast.JsName +import org.jetbrains.kotlin.js.backend.ast.JsNameRef import org.jetbrains.kotlin.backend.common.bridges.generateBridgesForFunctionDescriptor import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.js.translate.context.StaticContext diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java index cc1cf7f5dce..0b38a8c9042 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.translate.declaration; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt index cfe253f76c7..8b52b3e1a6e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.translate.declaration -import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.LocalVariableAccessorDescriptor +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.Namer.getDelegateNameRef diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt index 4f6af7023ce..b23d8f62ead 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt @@ -16,10 +16,7 @@ package org.jetbrains.kotlin.js.translate.expression -import com.google.dart.compiler.backend.js.ast.* -import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.js.descriptorUtils.getJetTypeFqName -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.js.backend.ast.* 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 diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/DestructuringDeclarationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/DestructuringDeclarationTranslator.java index 5b915187941..b4b2f938567 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/DestructuringDeclarationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/DestructuringDeclarationTranslator.java @@ -16,10 +16,10 @@ 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; -import com.google.dart.compiler.backend.js.ast.JsNameRef; -import com.google.dart.compiler.backend.js.ast.JsVars; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsName; +import org.jetbrains.kotlin.js.backend.ast.JsNameRef; +import org.jetbrains.kotlin.js.backend.ast.JsVars; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java index 10ee06235b8..2d41f778d8b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java @@ -16,8 +16,6 @@ package org.jetbrains.kotlin.js.translate.expression; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.SmartList; @@ -26,6 +24,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.descriptors.annotations.KotlinRetention; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.declaration.ClassTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java index 561c2463fd6..b48fd2dfb92 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.js.translate.expression; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; import org.jetbrains.kotlin.js.translate.context.AliasingContext; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt index dc756bd8787..8848c4387ea 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.translate.expression -import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.context.Namer private val METADATA_PROPERTIES_COUNT = 2 diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt index 6a543647954..8a912a08b8a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.js.translate.expression -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.* import org.jetbrains.kotlin.builtins.isBuiltinExtensionFunctionalType import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl import org.jetbrains.kotlin.incremental.components.NoLookupLocation +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.* import org.jetbrains.kotlin.js.descriptorUtils.isCoroutineLambda import org.jetbrains.kotlin.js.inline.util.getInnerFunction import org.jetbrains.kotlin.js.translate.context.TranslationContext diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt index 2ee1c7d4052..a89bcdba5d6 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.js.translate.expression -import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.general.Translation diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java index b0bcb1f83ae..e1cd15d847f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java @@ -16,7 +16,6 @@ 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.kotlin.KtNodeTypes; @@ -24,6 +23,10 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.js.backend.ast.JsConditional; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsInvocation; +import org.jetbrains.kotlin.js.backend.ast.JsLiteral; import org.jetbrains.kotlin.js.patterns.NamePredicate; import org.jetbrains.kotlin.js.patterns.typePredicates.TypePredicatesKt; import org.jetbrains.kotlin.js.translate.context.Namer; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java index 1e754c17c26..d9e4b32e732 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java @@ -16,10 +16,10 @@ 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; -import com.google.dart.compiler.backend.js.ast.JsNameRef; -import com.google.dart.compiler.backend.js.ast.JsNumberLiteral; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsInvocation; +import org.jetbrains.kotlin.js.backend.ast.JsNameRef; +import org.jetbrains.kotlin.js.backend.ast.JsNumberLiteral; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.kt index b207cc5a30c..1aecfe933fd 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/TryTranslator.kt @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.js.translate.expression -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.JsBlock +import org.jetbrains.kotlin.js.backend.ast.JsTry import org.jetbrains.kotlin.psi.KtTryExpression import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.js.translate.context.TranslationContext diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java index f594039b882..eef1c23b012 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java @@ -16,11 +16,11 @@ 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.kotlin.backend.common.CodegenUtil; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.java index ed65b65f9f7..be9181c8e6d 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.general; -import com.google.dart.compiler.backend.js.ast.JsProgram; +import org.jetbrains.kotlin.js.backend.ast.JsProgram; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/ModuleWrapperTranslation.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/ModuleWrapperTranslation.kt index d9e25a3764b..02b7619ee18 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/ModuleWrapperTranslation.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/ModuleWrapperTranslation.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.general -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.StaticContext import org.jetbrains.kotlin.js.translate.utils.JsAstUtils @@ -78,7 +78,7 @@ object ModuleWrapperTranslation { } private fun wrapAmd( - moduleId: String,function: JsExpression, + moduleId: String, function: JsExpression, importedModules: List, program: JsProgram ): List { val scope = program.scope diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java index 41371498cba..e845c0fbf55 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.js.translate.general; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.idea.MainFunctionDetector; +import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.kotlin.js.config.JSConfigurationKeys; import org.jetbrains.kotlin.js.config.JsConfig; import org.jetbrains.kotlin.js.facade.MainCallParameters; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java index 3259d1c9051..52ca342b565 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.translate.initializer; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor; +import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java index 97644bbb6eb..282816a6560 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.translate.initializer; -import com.google.dart.compiler.backend.js.ast.JsExpression; -import com.google.dart.compiler.backend.js.ast.JsStatement; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsStatement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java index bc041e35862..22db74a58e3 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.translate.initializer; -import com.google.dart.compiler.backend.js.ast.JsExpression; -import com.google.dart.compiler.backend.js.ast.JsStatement; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsStatement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.java index a4c16b22f66..2eb4b24d188 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInFunctionIntrinsic.java @@ -16,8 +16,8 @@ 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 org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsInvocation; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.java index e563f7137dc..b830997127e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/BuiltInPropertyIntrinsic.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.basic; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/FunctionIntrinsic.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/FunctionIntrinsic.java index 4af40bbb23a..8fd5f6f20eb 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/FunctionIntrinsic.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/FunctionIntrinsic.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.basic; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.js.translate.callTranslator.CallInfo; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/RangeToIntrinsic.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/RangeToIntrinsic.kt index 391bb4f87d8..00ac2aef161 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/RangeToIntrinsic.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/basic/RangeToIntrinsic.kt @@ -16,8 +16,8 @@ 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.JsNew +import org.jetbrains.kotlin.js.backend.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsNew import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.java index 78920a63faa..ebcbac6d669 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.common.collect.Lists; -import com.google.dart.compiler.backend.js.ast.JsArrayAccess; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsArrayAccess; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.java index 93f013adc3d..8e243d133fd 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.java @@ -18,16 +18,12 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.common.base.Predicate; import com.google.common.collect.Lists; -import com.google.dart.compiler.backend.js.ast.JsExpression; -import com.google.dart.compiler.backend.js.ast.JsNameRef; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; -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/kotlin/js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java index bea5ecec1be..a0e540512f6 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java @@ -16,8 +16,8 @@ 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 org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsInvocation; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.js.translate.context.Namer; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt index b68d51fdca1..f93bc26b27a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories -import com.google.dart.compiler.backend.js.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsExpression import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.js.patterns.PatternBuilder.pattern import org.jetbrains.kotlin.js.translate.context.Namer diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt index 2e1f3cebbb9..79f3636a69b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt @@ -17,7 +17,7 @@ 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.kotlin.js.backend.ast.JsExpression import org.jetbrains.kotlin.js.patterns.PatternBuilder.pattern import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java index 8e7fd5637f4..5956d3dff73 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.kotlin.js.patterns.DescriptorPredicate; import org.jetbrains.kotlin.js.patterns.NamePredicate; import org.jetbrains.kotlin.js.translate.context.Namer; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java index 78cdf227a8c..88723f2d227 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.kotlin.js.patterns.DescriptorPredicate; import org.jetbrains.kotlin.js.patterns.NamePredicate; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java index fbb08c9574a..1da8e9708fd 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java @@ -16,9 +16,9 @@ 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.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsInvocation; +import org.jetbrains.kotlin.js.backend.ast.JsNameRef; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt index d6e79a97e32..0bf23235113 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.translate.intrinsic.objects -import com.google.dart.compiler.backend.js.ast.JsExpression -import com.google.dart.compiler.backend.js.ast.JsName +import org.jetbrains.kotlin.js.backend.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsName import org.jetbrains.kotlin.builtins.CompanionObjectMapping import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt index 5720fb1651c..f8d015c7bd5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation -import com.google.dart.compiler.backend.js.ast.JsBinaryOperation -import com.google.dart.compiler.backend.js.ast.JsExpression -import com.google.dart.compiler.backend.js.ast.JsNumberLiteral +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperation +import org.jetbrains.kotlin.js.backend.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsNumberLiteral import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.js.patterns.PatternBuilder.pattern diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt index 2e8035bfee4..0149ef05521 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation -import com.google.dart.compiler.backend.js.ast.JsBinaryOperation -import com.google.dart.compiler.backend.js.ast.JsBinaryOperator -import com.google.dart.compiler.backend.js.ast.JsExpression -import com.google.dart.compiler.backend.js.ast.JsLiteral +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperation +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperator +import org.jetbrains.kotlin.js.backend.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsLiteral import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.js.patterns.NamePredicate diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt index 33b7024e874..db52d3e179a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation -import com.google.dart.compiler.backend.js.ast.JsBinaryOperation -import com.google.dart.compiler.backend.js.ast.JsExpression -import com.google.dart.compiler.backend.js.ast.JsNumberLiteral +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperation +import org.jetbrains.kotlin.js.backend.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsNumberLiteral import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.js.patterns.PatternBuilder.pattern diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt index 82552f3bd3d..613c20184d7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation import com.google.common.collect.ImmutableSet -import com.google.dart.compiler.backend.js.ast.JsExpression +import org.jetbrains.kotlin.js.backend.ast.JsExpression import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java index f063160c36a..cc4abee3b76 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.operation; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.ClassDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java index b4eb7673314..8e888476ce7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.js.translate.operation; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java index 30afbd8d786..a29736e01ba 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java @@ -16,9 +16,9 @@ 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; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperation; +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperator; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/DynamicIncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/DynamicIncrementTranslator.java index c0fc1a971a4..84aa5ac3096 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/DynamicIncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/DynamicIncrementTranslator.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.translate.operation; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.lexer.KtToken; import org.jetbrains.kotlin.lexer.KtTokens; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/InOperationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/InOperationTranslator.java index e4789e04b59..d868a88009d 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/InOperationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/InOperationTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.operation; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java index 217d806d3d6..c80b0adf793 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java @@ -16,11 +16,11 @@ 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; -import com.google.dart.compiler.backend.js.ast.JsExpression; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; -import com.google.dart.compiler.util.AstUtil; +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperation; +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperator; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; +import org.jetbrains.kotlin.js.util.AstUtil; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java index b522e30ca75..05ba0da8016 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java @@ -16,10 +16,10 @@ 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; -import com.google.dart.compiler.backend.js.ast.JsBlock; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperation; +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperator; +import org.jetbrains.kotlin.js.backend.ast.JsBlock; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.reference.AccessTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java index cfb70a09600..b06e261f09a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java @@ -16,24 +16,17 @@ package org.jetbrains.kotlin.js.translate.operation; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; -import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; -import org.jetbrains.kotlin.lexer.KtToken; -import org.jetbrains.kotlin.lexer.KtTokens; import org.jetbrains.kotlin.psi.KtUnaryExpression; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import java.util.Collections; -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 { @NotNull diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OperatorTable.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OperatorTable.java index 7d2f15ec2f9..aecc6d4b107 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OperatorTable.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OperatorTable.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.js.translate.operation; import com.google.common.collect.ImmutableBiMap; -import com.google.dart.compiler.backend.js.ast.JsBinaryOperator; -import com.google.dart.compiler.backend.js.ast.JsUnaryOperator; +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperator; +import org.jetbrains.kotlin.js.backend.ast.JsUnaryOperator; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.lexer.KtToken; import org.jetbrains.kotlin.lexer.KtTokens; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java index 265b331e308..0e82734bd66 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java @@ -16,8 +16,8 @@ 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; +import org.jetbrains.kotlin.js.backend.ast.JsBlock; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java index 3b246cc7238..f965546b432 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.operation; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java index 0e7664d5e1a..c1cf0931e31 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java @@ -16,8 +16,8 @@ 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; +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperation; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java index e012429cb4c..1ed603371d7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.reference; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java index 0df2dd3924e..323ba28e909 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.reference; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.Translation; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslator.java index e3f102af857..bd315f59ee9 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.reference; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; /** diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java index 5ba6ddbba1f..3c337433939 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.reference; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java index cff7ddd7eb7..a66964e286c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.reference; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptorKt; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt index b81adf0e7d8..0855b9f462f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.js.translate.reference -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.SideEffectKind -import com.google.dart.compiler.backend.js.ast.metadata.sideEffects +import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind +import org.jetbrains.kotlin.js.backend.ast.metadata.sideEffects import com.intellij.util.SmartList import org.jetbrains.kotlin.coroutines.isSuspendLambda import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.TemporaryConstVariable import org.jetbrains.kotlin.js.translate.context.TranslationContext diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java index 9639ec2a9e6..b9e9737d826 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.js.translate.reference; -import com.google.dart.compiler.backend.js.ast.*; import com.google.gwt.dev.js.ThrowExceptionOnErrorReporter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.config.CommonConfigurationKeys; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; +import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.kotlin.js.inline.util.CollectUtilsKt; import org.jetbrains.kotlin.js.inline.util.RewriteUtilsKt; import org.jetbrains.kotlin.js.parser.ParserUtilsKt; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt index f2be1fc580c..4782a398481 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.translate.reference -import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.general.Translation diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CompanionObjectIntrinsicAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CompanionObjectIntrinsicAccessTranslator.java index 00fae9c14b4..96fd1894027 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CompanionObjectIntrinsicAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CompanionObjectIntrinsicAccessTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.reference; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/DefaultAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/DefaultAccessTranslator.java index 40cca8f2db5..60943f40dd9 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/DefaultAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/DefaultAccessTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.reference; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.Translation; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java index ef34eb42312..cb0ae6a0532 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java @@ -16,8 +16,8 @@ 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; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java index afe122b2aa7..d60155558e3 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.reference; -import com.google.dart.compiler.backend.js.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java index bd950e94860..0977b141a98 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.js.translate.reference; -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.JsName; -import com.google.dart.compiler.backend.js.ast.JsNameRef; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; -import com.google.dart.compiler.backend.js.ast.metadata.SideEffectKind; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsInvocation; +import org.jetbrains.kotlin.js.backend.ast.JsName; +import org.jetbrains.kotlin.js.backend.ast.JsNameRef; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; +import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java index 54fe7145f66..3eaac3aec6b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.translate.reference; -import com.google.dart.compiler.backend.js.ast.JsBinaryOperation; -import com.google.dart.compiler.backend.js.ast.JsExpression; -import com.google.dart.compiler.backend.js.ast.JsNameRef; +import org.jetbrains.kotlin.js.backend.ast.JsBinaryOperation; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsNameRef; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/CommonUnitTester.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/CommonUnitTester.java index 9e70295dd27..0e8ddc48194 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/CommonUnitTester.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/CommonUnitTester.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.translate.test; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.js.backend.ast.*; public abstract class CommonUnitTester extends JSTester { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSRhinoUnitTester.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSRhinoUnitTester.java index c89e50dc235..e1285341320 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSRhinoUnitTester.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSRhinoUnitTester.java @@ -16,8 +16,8 @@ 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; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsNameRef; import org.jetbrains.annotations.NotNull; public final class JSRhinoUnitTester extends CommonUnitTester { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java index b0483812a41..348ab40c490 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java @@ -16,9 +16,9 @@ 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; -import com.google.dart.compiler.backend.js.ast.JsStringLiteral; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsNew; +import org.jetbrains.kotlin.js.backend.ast.JsStringLiteral; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTester.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTester.java index 4bb7a73f761..7beea25c87f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTester.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTester.java @@ -16,9 +16,9 @@ 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.kotlin.js.backend.ast.JsBlock; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsStringLiteral; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/QUnitTester.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/QUnitTester.java index 3bc406f1cbb..380a063d0cf 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/QUnitTester.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/QUnitTester.java @@ -16,8 +16,8 @@ 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; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsNameRef; import org.jetbrains.annotations.NotNull; public final class QUnitTester extends CommonUnitTester { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java index a2d1f2b456f..1f56772dbfa 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java @@ -16,14 +16,14 @@ package org.jetbrains.kotlin.js.translate.utils; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; import org.jetbrains.kotlin.js.naming.NameSuggestion; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java index 363e59e251e..9008e30a439 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.translate.utils; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; -import com.google.dart.compiler.backend.js.ast.metadata.SideEffectKind; +import org.jetbrains.kotlin.js.backend.ast.*; +import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; +import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind; import com.intellij.util.SmartList; import kotlin.Pair; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TemporariesUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TemporariesUtils.java index 222e1952919..229df5c78f6 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TemporariesUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TemporariesUtils.java @@ -17,7 +17,7 @@ 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.kotlin.js.backend.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java index de80c603092..ae23305c7a7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java @@ -16,8 +16,7 @@ package org.jetbrains.kotlin.js.translate.utils; -import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.backend.js.ast.JsBinaryOperator; +import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; @@ -45,7 +44,7 @@ import org.jetbrains.kotlin.types.KotlinType; import java.util.ArrayList; import java.util.List; -import static com.google.dart.compiler.backend.js.ast.JsBinaryOperator.*; +import static org.jetbrains.kotlin.js.backend.ast.JsBinaryOperator.*; 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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt index 9e5d7865b50..4aa50030199 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.utils.jsAstUtils -import com.google.dart.compiler.backend.js.ast.* +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.context.Namer fun JsFunction.addStatement(stmt: JsStatement) { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/expandIsCalls.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/expandIsCalls.kt index f54bba1743f..d652976064f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/expandIsCalls.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/expandIsCalls.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.translate.utils -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.TypeCheck -import com.google.dart.compiler.backend.js.ast.metadata.typeCheck +import org.jetbrains.kotlin.js.backend.ast.* +import org.jetbrains.kotlin.js.backend.ast.metadata.TypeCheck +import org.jetbrains.kotlin.js.backend.ast.metadata.typeCheck import org.jetbrains.kotlin.js.inline.util.IdentitySet import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.* diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/inlineUtils.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/inlineUtils.kt index 3b30a2b50af..192eeff1d56 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/inlineUtils.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/inlineUtils.kt @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.js.translate.utils -import com.google.dart.compiler.backend.js.ast.* -import com.google.dart.compiler.backend.js.ast.metadata.descriptor -import com.google.dart.compiler.backend.js.ast.metadata.inlineStrategy -import com.google.dart.compiler.backend.js.ast.metadata.psiElement +import org.jetbrains.kotlin.js.backend.ast.metadata.descriptor +import org.jetbrains.kotlin.js.backend.ast.metadata.inlineStrategy +import org.jetbrains.kotlin.js.backend.ast.metadata.psiElement import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.inline.util.isCallInvocation import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.reference.CallExpressionTranslator diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/AssignToExpressionMutator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/AssignToExpressionMutator.java index 754e2f21102..ea64d3b488b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/AssignToExpressionMutator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/AssignToExpressionMutator.java @@ -16,8 +16,8 @@ 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.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsNode; import org.jetbrains.annotations.NotNull; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.assignment; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/LastExpressionMutator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/LastExpressionMutator.java index f7fdd4a513b..bd42e9af6b2 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/LastExpressionMutator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/LastExpressionMutator.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.translate.utils.mutator; -import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.js.backend.ast.*; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/Mutator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/Mutator.java index e7a4b683690..aa078af5d77 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/Mutator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/mutator/Mutator.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.utils.mutator; -import com.google.dart.compiler.backend.js.ast.JsNode; +import org.jetbrains.kotlin.js.backend.ast.JsNode; import org.jetbrains.annotations.NotNull; public interface Mutator { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt index b5ac57ab54f..e47a7d5714c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.js.translate.utils -import com.google.dart.compiler.backend.js.ast.* import com.intellij.util.SmartList import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator