azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: replace some usages of (old) package facade with new package parts

Browse Source
This commit is contained in:
Zalim Bashorov
2015-09-09 17:40:22 +03:00
parent 6850e9180e
commit 7036b36a94
76 changed files with 213 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsScope.java
+1 -1
View File
@@ -14,7 +14,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.google.dart.compiler.backend.js.ast.AstPackage.JsObjectScope;
import static com.google.dart.compiler.backend.js.ast.JsScopesKt.JsObjectScope;
/**
* A scope is a factory for creating and allocating
js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt
+2 -1
View File
@@ -13,6 +13,7 @@
* 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
@@ -39,4 +40,4 @@ public var JsInvocation.typeCheck: TypeCheck? by MetadataProperty(default = null
public enum class TypeCheck {
TYPEOF,
INSTANCEOF
}
}
js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java
+5 -5
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.js.inline;
import com.google.dart.compiler.backend.js.ast.*;
import com.google.dart.compiler.backend.js.ast.metadata.MetadataPackage;
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;
@@ -231,14 +231,14 @@ public class JsInliner extends JsVisitorWithContextImpl {
}
private void reportInlineCycle(@NotNull JsInvocation call, @NotNull JsFunction calledFunction) {
MetadataPackage.setInlineStrategy(call, InlineStrategy.NOT_INLINE);
MetadataProperties.setInlineStrategy(call, InlineStrategy.NOT_INLINE);
Iterator<JsCallInfo> it = inlineCallInfos.descendingIterator();
while (it.hasNext()) {
JsCallInfo callInfo = it.next();
PsiElement psiElement = MetadataPackage.getPsiElement(callInfo.call);
PsiElement psiElement = MetadataProperties.getPsiElement(callInfo.call);
CallableDescriptor descriptor = MetadataPackage.getDescriptor(callInfo.call);
CallableDescriptor descriptor = MetadataProperties.getDescriptor(callInfo.call);
if (psiElement != null && descriptor != null) {
trace.report(Errors.INLINE_CALL_CYCLE.on(psiElement, descriptor));
}
@@ -250,7 +250,7 @@ public class JsInliner extends JsVisitorWithContextImpl {
}
public boolean hasToBeInlined(@NotNull JsInvocation call) {
InlineStrategy strategy = MetadataPackage.getInlineStrategy(call);
InlineStrategy strategy = MetadataProperties.getInlineStrategy(call);
if (strategy == null || !strategy.isInline()) return false;
return getFunctionContext().hasFunctionDefinition(call);
js/js.tests/test/org/jetbrains/kotlin/js/test/utils/AstSearchUtil.java
+2 -2
View File
@@ -25,8 +25,8 @@ import org.jetbrains.annotations.Nullable;
import java.util.Map;
import static org.jetbrains.kotlin.js.inline.util.UtilPackage.collectNamedFunctions;
import static org.jetbrains.kotlin.js.inline.util.UtilPackage.collectJsProperties;
import static org.jetbrains.kotlin.js.inline.util.CollectUtilsKt.collectNamedFunctions;
import static org.jetbrains.kotlin.js.inline.util.CollectUtilsKt.collectJsProperties;
public class AstSearchUtil {
@NotNull
js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.js.translate.expression.InlineMetadata;
import java.util.*;
import static org.jetbrains.kotlin.js.inline.util.UtilPackage.collectInstances;
import static org.jetbrains.kotlin.js.inline.util.CollectUtilsKt.collectInstances;
import static org.jetbrains.kotlin.test.InTextDirectivesUtils.findLinesWithPrefixesRemoved;
import static org.junit.Assert.*;
js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java
+1 -1
View File
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics;
import java.util.List;
import static org.jetbrains.kotlin.diagnostics.DiagnosticUtils.hasError;
import static org.jetbrains.kotlin.js.translate.utils.UtilsPackage.expandIsCalls;
import static org.jetbrains.kotlin.js.translate.utils.ExpandIsCallsKt.expandIsCalls;
/**
* An entry point of translator.
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java
+4 -4
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.js.translate.context;
import com.google.dart.compiler.backend.js.ast.*;
import com.google.dart.compiler.backend.js.ast.metadata.MetadataPackage;
import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties;
import com.google.dart.compiler.backend.js.ast.metadata.TypeCheck;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils;
import java.util.Arrays;
import static com.google.dart.compiler.backend.js.ast.AstPackage.JsObjectScope;
import static com.google.dart.compiler.backend.js.ast.JsScopesKt.JsObjectScope;
import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getModuleName;
import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getStableMangledNameForDescriptor;
import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getSuggestedName;
@@ -396,14 +396,14 @@ public final class Namer {
@NotNull
public JsExpression isTypeOf(@NotNull JsExpression type) {
JsInvocation invocation = new JsInvocation(kotlin("isTypeOf"), type);
MetadataPackage.setTypeCheck(invocation, TypeCheck.TYPEOF);
MetadataProperties.setTypeCheck(invocation, TypeCheck.TYPEOF);
return invocation;
}
@NotNull
public JsExpression isInstanceOf(@NotNull JsExpression type) {
JsInvocation invocation = new JsInvocation(kotlin("isInstanceOf"), type);
MetadataPackage.setTypeCheck(invocation, TypeCheck.INSTANCEOF);
MetadataProperties.setTypeCheck(invocation, TypeCheck.INSTANCEOF);
return invocation;
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StandardClasses.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.name.Name;
import java.util.Map;
import static com.google.dart.compiler.backend.js.ast.AstPackage.JsObjectScope;
import static com.google.dart.compiler.backend.js.ast.JsScopesKt.JsObjectScope;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName;
/**
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java
+2 -2
View File
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.BindingTrace;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage;
import java.util.Map;
@@ -44,6 +43,7 @@ import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.*;
import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getMangledName;
import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getSuggestedName;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.isExtension;
import static org.jetbrains.kotlin.resolve.calls.tasks.DynamicCallsKt.isDynamic;
/**
* Aggregates all the static parts of the context.
@@ -237,7 +237,7 @@ public final class StaticContext {
@Override
@Nullable
public JsName apply(@NotNull DeclarationDescriptor descriptor) {
if (TasksPackage.isDynamic(descriptor)) {
if (isDynamic(descriptor)) {
String name = descriptor.getName().asString();
return JsDynamicScope.INSTANCE$.declareName(name);
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.resolve.BindingTrace;
import java.util.HashMap;
import java.util.Map;
import static org.jetbrains.kotlin.js.translate.context.ContextPackage.getNameForCapturedDescriptor;
import static org.jetbrains.kotlin.js.translate.context.UsageTrackerKt.getNameForCapturedDescriptor;
import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForElement;
/**
js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
import org.jetbrains.kotlin.descriptors.Modality;
import org.jetbrains.kotlin.descriptors.PropertyDescriptor;
import org.jetbrains.kotlin.js.translate.context.TranslationContext;
import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.PropertyTranslatorPackage;
import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.PropertyTranslatorKt;
import org.jetbrains.kotlin.js.translate.general.Translation;
import org.jetbrains.kotlin.js.translate.general.TranslatorVisitor;
import org.jetbrains.kotlin.js.translate.initializer.ClassInitializerTranslator;
@@ -117,7 +117,7 @@ public class DeclarationBodyVisitor extends TranslatorVisitor<Void> {
@Override
public Void visitProperty(@NotNull JetProperty expression, TranslationContext context) {
PropertyDescriptor propertyDescriptor = BindingUtils.getPropertyDescriptor(context.bindingContext(), expression);
PropertyTranslatorPackage.translateAccessors(propertyDescriptor, expression, result, context);
PropertyTranslatorKt.translateAccessors(propertyDescriptor, expression, result, context);
return null;
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java
+7 -6
View File
@@ -17,7 +17,8 @@
package org.jetbrains.kotlin.js.translate.expression;
import com.google.dart.compiler.backend.js.ast.*;
import com.google.dart.compiler.backend.js.ast.metadata.MetadataPackage;
import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties;
import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperty;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -27,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor;
import org.jetbrains.kotlin.js.translate.context.Namer;
import org.jetbrains.kotlin.js.translate.context.TranslationContext;
import org.jetbrains.kotlin.js.translate.declaration.ClassTranslator;
import org.jetbrains.kotlin.js.translate.expression.loopTranslator.LoopTranslatorPackage;
import org.jetbrains.kotlin.js.translate.expression.loopTranslator.LoopTranslator;
import org.jetbrains.kotlin.js.translate.general.Translation;
import org.jetbrains.kotlin.js.translate.general.TranslatorVisitor;
import org.jetbrains.kotlin.js.translate.operation.BinaryOperationTranslator;
@@ -244,13 +245,13 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
@Override
@NotNull
public JsNode visitWhileExpression(@NotNull JetWhileExpression expression, @NotNull TranslationContext context) {
return LoopTranslatorPackage.createWhile(false, expression, context);
return LoopTranslator.createWhile(false, expression, context);
}
@Override
@NotNull
public JsNode visitDoWhileExpression(@NotNull JetDoWhileExpression expression, @NotNull TranslationContext context) {
return LoopTranslatorPackage.createWhile(true, expression, context);
return LoopTranslator.createWhile(true, expression, context);
}
@Override
@@ -421,7 +422,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
FunctionDescriptor descriptor = getFunctionDescriptor(context.bindingContext(), expression);
JsName name = context.getNameForDescriptor(descriptor);
if (InlineUtil.isInline(descriptor)) {
MetadataPackage.setStaticRef(name, alias);
MetadataProperties.setStaticRef(name, alias);
}
boolean isExpression = BindingContextUtilPackage.isUsedAsExpression(expression, context.bindingContext());
@@ -459,7 +460,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
@NotNull
public JsNode visitForExpression(@NotNull JetForExpression expression,
@NotNull TranslationContext context) {
return LoopTranslatorPackage.translateForExpression(expression, context).source(expression);
return LoopTranslator.translateForExpression(expression, context).source(expression);
}
@Override
js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.expression;
import com.google.dart.compiler.backend.js.ast.*;
import com.google.dart.compiler.backend.js.ast.metadata.MetadataPackage;
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;
@@ -149,7 +149,7 @@ public final class FunctionTranslator extends AbstractTranslator {
public static void addParameters(List<JsParameter> list, FunctionDescriptor descriptor, TranslationContext context) {
for (ValueParameterDescriptor valueParameter : descriptor.getValueParameters()) {
JsParameter jsParameter = new JsParameter(context.getNameForDescriptor(valueParameter));
MetadataPackage.setHasDefaultValue(jsParameter, DescriptorUtilPackage.hasDefaultValue(valueParameter));
MetadataProperties.setHasDefaultValue(jsParameter, DescriptorUtilPackage.hasDefaultValue(valueParameter));
list.add(jsParameter);
}
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt
+2
View File
@@ -14,6 +14,8 @@
* limitations under the License.
*/
@file:JvmName("LoopTranslator")
package org.jetbrains.kotlin.js.translate.expression.loopTranslator
import com.google.dart.compiler.backend.js.ast.*
js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java
+1 -1
View File
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import java.util.ArrayList;
import java.util.List;
import static org.jetbrains.kotlin.js.translate.utils.UtilsPackage.setInlineCallMetadata;
import static org.jetbrains.kotlin.js.translate.utils.InlineUtils.setInlineCallMetadata;
public class MultiDeclarationTranslator extends AbstractTranslator {
js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java
+1 -1
View File
@@ -35,7 +35,7 @@ import java.util.List;
import static org.jetbrains.kotlin.js.resolve.diagnostics.JsCallChecker.isJsCall;
import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getFunctionDescriptor;
import static org.jetbrains.kotlin.js.translate.utils.UtilsPackage.setInlineCallMetadata;
import static org.jetbrains.kotlin.js.translate.utils.InlineUtils.setInlineCallMetadata;
import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert;
import static org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator.getConstant;
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/inlineUtils.kt
+2
View File
@@ -14,6 +14,8 @@
* limitations under the License.
*/
@file:JvmName("InlineUtils")
package org.jetbrains.kotlin.js.translate.utils
import com.google.dart.compiler.backend.js.ast.*