From 72e461e2d59e6b899fc8b2dbce28d6ad8af823b2 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 24 Dec 2016 02:25:53 +0300 Subject: [PATCH] Allow test invocations like Kotlin.isType or Kotlin.throwCCE with CHECK_NOT_CALLED_IN_SCOPE directive. --- .../org/jetbrains/kotlin/js/test/utils/CallCounter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 bab14d5c2ac..a2e303a2524 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 @@ -81,8 +81,8 @@ public class CallCounter extends RecursiveJsVisitor { int count = 0; for (JsNameRef callNameRef : callsNameRefs) { - JsName name = callNameRef.getName(); - if (name != null && name.getIdent().equals(expectedName)) { + String name = callNameRef.getIdent(); + if (name.equals(expectedName)) { count++; } } @@ -134,8 +134,8 @@ public class CallCounter extends RecursiveJsVisitor { } JsNameRef currentNameRef = (JsNameRef) currentQualifier; - JsName name = currentNameRef.getName(); - if (name == null || !name.getIdent().equals(expectedQualifier)) { + String name = currentNameRef.getIdent(); + if (!name.equals(expectedQualifier)) { return false; }