Skip to content

Commit f24fcb1

Browse files
sharmasuraj0123sharmasuraj0123
committed
Renamed trimLeft and trimRight to trimStart and trimEnd
1 parent a717ad3 commit f24fcb1

File tree

6 files changed

+45
-22
lines changed

6 files changed

+45
-22
lines changed

‎lib/Backend/JnHelperMethodList.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,8 @@ HELPERCALL(String_ToLocaleUpperCase, Js::JavascriptString::EntryToLocaleUpperCas
484484
HELPERCALL(String_ToLowerCase, Js::JavascriptString::EntryToLowerCase, 0)
485485
HELPERCALL(String_ToUpperCase, Js::JavascriptString::EntryToUpperCase, 0)
486486
HELPERCALL(String_Trim, Js::JavascriptString::EntryTrim, 0)
487-
HELPERCALL(String_TrimLeft, Js::JavascriptString::EntryTrimLeft, 0)
488-
HELPERCALL(String_TrimRight, Js::JavascriptString::EntryTrimRight, 0)
487+
HELPERCALL(String_TrimLeft, Js::JavascriptString::EntryTrimStart, 0)
488+
HELPERCALL(String_TrimRight, Js::JavascriptString::EntryTrimEnd, 0)
489489
HELPERCALL(String_GetSz, Js::JavascriptString::GetSzHelper, 0)
490490
HELPERCALL(String_PadStart, Js::JavascriptString::EntryPadStart, 0)
491491
HELPERCALL(String_PadEnd, Js::JavascriptString::EntryPadEnd, 0)

‎lib/Runtime/Library/JavascriptBuiltInFunctionList.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@ BUILTIN(JavascriptString, ToLowerCase, EntryToLowerCase, FunctionInfo::ErrorOnNe
245245
BUILTIN(JavascriptString, ToString, EntryToString, FunctionInfo::ErrorOnNew | FunctionInfo::HasNoSideEffect)
246246
BUILTIN(JavascriptString, ToUpperCase, EntryToUpperCase, FunctionInfo::ErrorOnNew)
247247
BUILTIN(JavascriptString, Trim, EntryTrim, FunctionInfo::ErrorOnNew)
248-
BUILTIN(JavascriptString, TrimLeft, EntryTrimLeft, FunctionInfo::ErrorOnNew)
249-
BUILTIN(JavascriptString, TrimStart, EntryTrimLeft, FunctionInfo::ErrorOnNew)
250-
BUILTIN(JavascriptString, TrimRight, EntryTrimRight, FunctionInfo::ErrorOnNew)
251-
BUILTIN(JavascriptString, TrimEnd, EntryTrimRight, FunctionInfo::ErrorOnNew)
248+
BUILTIN(JavascriptString, TrimLeft, EntryTrimStart, FunctionInfo::ErrorOnNew)
249+
BUILTIN(JavascriptString, TrimStart, EntryTrimStart, FunctionInfo::ErrorOnNew)
250+
BUILTIN(JavascriptString, TrimRight, EntryTrimEnd, FunctionInfo::ErrorOnNew)
251+
BUILTIN(JavascriptString, TrimEnd, EntryTrimEnd, FunctionInfo::ErrorOnNew)
252252
BUILTIN(JavascriptString, Repeat, EntryRepeat, FunctionInfo::ErrorOnNew)
253253
BUILTIN(JavascriptString, StartsWith, EntryStartsWith, FunctionInfo::ErrorOnNew)
254254
BUILTIN(JavascriptString, EndsWith, EntryEndsWith, FunctionInfo::ErrorOnNew)

‎lib/Runtime/Library/JavascriptLibrary.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3405,8 +3405,8 @@ namespace Js
34053405
case PropertyIds::trimLeft:
34063406
return BuiltinFunction::JavascriptString_TrimLeft;
34073407

3408-
case PropertyIds::trimStart:
3409-
return BuiltinFunction::JavascriptString_TrimStart;
3408+
case PropertyIds::trimStart:
3409+
return BuiltinFunction::JavascriptString_TrimStart;
34103410

34113411
case PropertyIds::trimRight:
34123412
return BuiltinFunction::JavascriptString_TrimRight;
@@ -3999,16 +3999,12 @@ namespace Js
39993999
/* No inlining String_StartsWith */ library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::startsWith, &JavascriptString::EntryInfo::StartsWith, 1);
40004000
/* No inlining String_EndsWith */ library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::endsWith, &JavascriptString::EntryInfo::EndsWith, 1);
40014001
/* No inlining String_Includes */ library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::includes, &JavascriptString::EntryInfo::Includes, 1);
4002-
builtinFuncs[BuiltinFunction::JavascriptString_TrimLeft] = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::trimLeft, &JavascriptString::EntryInfo::TrimLeft, 0);
4003-
//builtinFuncs[BuiltinFunction::JavascriptString_TrimStart] = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::trimStart, &JavascriptString::EntryInfo::TrimStart, 0);
4004-
library->AddMember(stringPrototype, PropertyIds::trimStart, builtinFuncs[BuiltinFunction::JavascriptString_TrimLeft], PropertyBuiltInMethodDefaults);
4005-
builtinFuncs[BuiltinFunction::JavascriptString_TrimRight] = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::trimRight, &JavascriptString::EntryInfo::TrimRight, 0);
4006-
library->AddMember(stringPrototype, PropertyIds::trimEnd, builtinFuncs[BuiltinFunction::JavascriptString_TrimRight], PropertyBuiltInMethodDefaults);
4002+
builtinFuncs[BuiltinFunction::JavascriptString_TrimStart] = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::trimStart, &JavascriptString::EntryInfo::TrimStart, 0);
4003+
library->AddMember(stringPrototype, PropertyIds::trimLeft, builtinFuncs[BuiltinFunction::JavascriptString_TrimStart], PropertyBuiltInMethodDefaults);
4004+
builtinFuncs[BuiltinFunction::JavascriptString_TrimEnd] = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::trimEnd, &JavascriptString::EntryInfo::TrimEnd, 0);
4005+
library->AddMember(stringPrototype, PropertyIds::trimRight, builtinFuncs[BuiltinFunction::JavascriptString_TrimEnd], PropertyBuiltInMethodDefaults);
40074006
}
40084007

4009-
4010-
4011-
40124008
library->AddFunctionToLibraryObjectWithName(stringPrototype, PropertyIds::_symbolIterator, PropertyIds::_RuntimeFunctionNameId_iterator, &JavascriptString::EntryInfo::SymbolIterator, 0);
40134009

40144010
builtinFuncs[BuiltinFunction::JavascriptString_PadStart] = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::padStart, &JavascriptString::EntryInfo::PadStart, 1);
@@ -7472,8 +7468,8 @@ namespace Js
74727468
REG_OBJECTS_LIB_FUNC(startsWith, JavascriptString::EntryStartsWith);
74737469
REG_OBJECTS_LIB_FUNC(endsWith, JavascriptString::EntryEndsWith);
74747470
REG_OBJECTS_LIB_FUNC(includes, JavascriptString::EntryIncludes);
7475-
REG_OBJECTS_LIB_FUNC(trimLeft, JavascriptString::EntryTrimLeft);
7476-
REG_OBJECTS_LIB_FUNC(trimRight, JavascriptString::EntryTrimRight);
7471+
REG_OBJECTS_LIB_FUNC(trimLeft, JavascriptString::EntryTrimStart);
7472+
REG_OBJECTS_LIB_FUNC(trimRight, JavascriptString::EntryTrimEnd);
74777473

74787474
}
74797475

‎lib/Runtime/Library/JavascriptString.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2384,7 +2384,7 @@ namespace Js
23842384
return TrimLeftRightHelper<true /*trimLeft*/, true /*trimRight*/>(pThis, scriptContext);
23852385
}
23862386

2387-
Var JavascriptString::EntryTrimLeft(RecyclableObject* function, CallInfo callInfo, ...)
2387+
Var JavascriptString::EntryTrimStart(RecyclableObject* function, CallInfo callInfo, ...)
23882388
{
23892389
PROBE_STACK(function->GetScriptContext(), Js::Constants::MinStackDefault);
23902390

@@ -2405,7 +2405,7 @@ namespace Js
24052405
return TrimLeftRightHelper< true /*trimLeft*/, false /*trimRight*/>(pThis, scriptContext);
24062406
}
24072407

2408-
Var JavascriptString::EntryTrimRight(RecyclableObject* function, CallInfo callInfo, ...)
2408+
Var JavascriptString::EntryTrimEnd(RecyclableObject* function, CallInfo callInfo, ...)
24092409
{
24102410
PROBE_STACK(function->GetScriptContext(), Js::Constants::MinStackDefault);
24112411

‎lib/Runtime/Library/JavascriptString.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ namespace Js
289289
static Var EntryToString(RecyclableObject* function, CallInfo callInfo, ...);
290290
static Var EntryToUpperCase(RecyclableObject* function, CallInfo callInfo, ...);
291291
static Var EntryTrim(RecyclableObject* function, CallInfo callInfo, ...);
292-
static Var EntryTrimLeft(RecyclableObject* function, CallInfo callInfo, ...);
293-
static Var EntryTrimRight(RecyclableObject* function, CallInfo callInfo, ...);
292+
static Var EntryTrimStart(RecyclableObject* function, CallInfo callInfo, ...);
293+
static Var EntryTrimEnd(RecyclableObject* function, CallInfo callInfo, ...);
294294
static Var EntryRepeat(RecyclableObject* function, CallInfo callInfo, ...);
295295
static Var EntryStartsWith(RecyclableObject* function, CallInfo callInfo, ...);
296296
static Var EntryEndsWith(RecyclableObject* function, CallInfo callInfo, ...);

‎test/Strings/trimStart_trimEnd.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,33 @@ const tests = [
1818
body: function () {
1919
assert.areEqual(String.prototype.trimRight, String.prototype.trimEnd, "Both trimRight and trimEnd should point to the same function");
2020
}
21+
},
22+
{
23+
name: "String.prototype.trimLeft.name is changed",
24+
body: function () {
25+
assert.areEqual(String.prototype.trimLeft.name, 'trimStart', "String.prototype.trimLeft.name should be named trimStart");
26+
}
27+
},
28+
{
29+
name: "String.prototype.trimRight.name is changed",
30+
body: function () {
31+
assert.areEqual(String.prototype.trimRight.name, 'trimEnd', "String.prototype.trimRight.name should be named trimEnd");
32+
33+
}
34+
},
35+
{
36+
name: "String.prototype.trimStart.name is consistent",
37+
body: function () {
38+
assert.areEqual(String.prototype.trimStart.name, 'trimStart', "String.prototype.trimLeft.name should be named trimStart");
39+
40+
}
41+
},
42+
{
43+
name: "String.prototype.trimEnd.name is changed",
44+
body: function () {
45+
assert.areEqual(String.prototype.trimEnd.name, 'trimEnd', "String.prototype.trimEnd.name should be named trimEnd");
46+
47+
}
2148
}
2249
];
2350

0 commit comments

Comments
 (0)