diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java index 471221e5cfb..6dd79fdca3f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java @@ -103,6 +103,7 @@ public final class AnalyzerFacadeForJS { } } + @NotNull public static AnalyzeExhaust analyzeBodiesInFiles( @NotNull Predicate filesToAnalyzeCompletely, @NotNull Config config, diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java index 992ad3e26f2..64e1c6caade 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java @@ -39,19 +39,6 @@ import static org.jetbrains.k2js.translate.utils.PsiUtils.isBackingFieldReferenc */ public abstract class PropertyAccessTranslator extends AbstractTranslator implements AccessTranslator { - //TODO: is it really called? - @NotNull - private static PropertyAccessTranslator newInstance(@NotNull PropertyDescriptor descriptor, - @NotNull ResolvedCall resolvedCall, - @NotNull TranslationContext context) { - if (isNativeObject(descriptor)) { - return new NativePropertyAccessTranslator(descriptor, /*qualifier = */ null, context); - } - else { - return new KotlinPropertyAccessTranslator(descriptor, /*qualifier = */ null, resolvedCall, context); - } - } - @NotNull public static PropertyAccessTranslator newInstance(@NotNull JetSimpleNameExpression expression, @Nullable JsExpression qualifier, @@ -80,15 +67,6 @@ public abstract class PropertyAccessTranslator extends AbstractTranslator implem } - @NotNull - /*package*/ - static JsExpression translateAsPropertyGetterCall(@NotNull PropertyDescriptor descriptor, - @NotNull ResolvedCall resolvedCall, - @NotNull TranslationContext context) { - return (newInstance(descriptor, resolvedCall, context)) - .translateAsGet(); - } - @NotNull public static JsExpression translateAsPropertyGetterCall(@NotNull JetSimpleNameExpression expression, @Nullable JsExpression qualifier, diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousData.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousData.java index baa064c14fb..5d7cbea4036 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousData.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousData.java @@ -41,13 +41,13 @@ public class DangerousData { @NotNull public static DangerousData collect(@NotNull JetExpression expression, @NotNull TranslationContext context) { - if (cantContainDangerousElements(expression, context)) { + if (cantContainDangerousElements(expression)) { return emptyData(); } return doCollectData(expression, context); } - private static boolean cantContainDangerousElements(@NotNull JetElement element, @NotNull TranslationContext context) { + private static boolean cantContainDangerousElements(@NotNull JetElement element) { if (element instanceof JetBlockExpression) { return true; } @@ -105,11 +105,6 @@ public class DangerousData { return nodesToBeGeneratedBefore; } - @SuppressWarnings("NullableProblems") - public void setNodesToBeGeneratedBefore(@NotNull List nodesToBeGeneratedBefore) { - this.nodesToBeGeneratedBefore = nodesToBeGeneratedBefore; - } - public boolean exists() { return dangerousNode != null; }