diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/StringOperationFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/StringOperationFIF.java index d0ffd1c4251..a21360ce832 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/StringOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/StringOperationFIF.java @@ -28,7 +28,7 @@ public final class StringOperationFIF extends CompositeFIF { private StringOperationFIF() { add(pattern("kotlin", "String", "get"), new BuiltInFunctionIntrinsic("charAt")); // This intrinsic is needed because charAt is a public function taking one parameter and thus its name would be mangled otherwise - add(pattern("kotlin", "CharSequence", "charAt").checkOverridden(), new BuiltInFunctionIntrinsic("charAt")); + add(pattern("kotlin", "CharSequence", "get").checkOverridden(), new BuiltInFunctionIntrinsic("charAt")); add(pattern("kotlin", "CharSequence", "length").checkOverridden(), LENGTH_PROPERTY_INTRINSIC); add(pattern("kotlin", "CharSequence", "subSequence").checkOverridden(), new BuiltInFunctionIntrinsic("substring")); } diff --git a/js/js.translator/testData/kotlin_lib.js b/js/js.translator/testData/kotlin_lib.js index fbae61037c6..f41a771ff53 100644 --- a/js/js.translator/testData/kotlin_lib.js +++ b/js/js.translator/testData/kotlin_lib.js @@ -474,7 +474,7 @@ remove_za3rmp$: function (o) { var index = this.indexOf_za3rmp$(o); if (index !== -1) { - this.remove_za3lpa$(index); + this.removeAt_za3lpa$(index); return true; } return false; @@ -546,9 +546,9 @@ } this.list.add_vux3hl$(index + this.offset, element); }, - remove_za3lpa$: function (index) { + removeAt_za3lpa$: function (index) { this.checkRange(index); - var result = this.list.remove_za3lpa$(index + this.offset); + var result = this.list.removeAt_za3lpa$(index + this.offset); this._size--; return result; @@ -597,7 +597,7 @@ this.array[i++] = it.next(); } }, - remove_za3lpa$: function (index) { + removeAt_za3lpa$: function (index) { this.checkRange(index); return this.array.splice(index, 1)[0]; },