Renamed trimLeft and trimRight to trimStart and trimEnd

lib/Backend/JnHelperMethodList.h

@@ -484,8 +484,8 @@ HELPERCALL(String_ToLocaleUpperCase, Js::JavascriptString::EntryToLocaleUpperCas
 HELPERCALL(String_ToLowerCase, Js::JavascriptString::EntryToLowerCase, 0)
 HELPERCALL(String_ToUpperCase, Js::JavascriptString::EntryToUpperCase, 0)
 HELPERCALL(String_Trim, Js::JavascriptString::EntryTrim, 0)
-HELPERCALL(String_TrimLeft, Js::JavascriptString::EntryTrimLeft, 0)
-HELPERCALL(String_TrimRight, Js::JavascriptString::EntryTrimRight, 0)
+HELPERCALL(String_TrimLeft, Js::JavascriptString::EntryTrimStart, 0)
+HELPERCALL(String_TrimRight, Js::JavascriptString::EntryTrimEnd, 0)
 HELPERCALL(String_GetSz, Js::JavascriptString::GetSzHelper, 0)
 HELPERCALL(String_PadStart, Js::JavascriptString::EntryPadStart, 0)
 HELPERCALL(String_PadEnd, Js::JavascriptString::EntryPadEnd, 0)

lib/Runtime/Library/JavascriptBuiltInFunctionList.h

@@ -245,10 +245,10 @@ BUILTIN(JavascriptString, ToLowerCase, EntryToLowerCase, FunctionInfo::ErrorOnNe
 BUILTIN(JavascriptString, ToString, EntryToString, FunctionInfo::ErrorOnNew | FunctionInfo::HasNoSideEffect)
 BUILTIN(JavascriptString, ToUpperCase, EntryToUpperCase, FunctionInfo::ErrorOnNew)
 BUILTIN(JavascriptString, Trim, EntryTrim, FunctionInfo::ErrorOnNew)
-BUILTIN(JavascriptString, TrimLeft, EntryTrimLeft, FunctionInfo::ErrorOnNew)
-BUILTIN(JavascriptString, TrimStart, EntryTrimLeft, FunctionInfo::ErrorOnNew)
-BUILTIN(JavascriptString, TrimRight, EntryTrimRight, FunctionInfo::ErrorOnNew)
-BUILTIN(JavascriptString, TrimEnd, EntryTrimRight, FunctionInfo::ErrorOnNew)
+BUILTIN(JavascriptString, TrimLeft, EntryTrimStart, FunctionInfo::ErrorOnNew)
+BUILTIN(JavascriptString, TrimStart, EntryTrimStart, FunctionInfo::ErrorOnNew)
+BUILTIN(JavascriptString, TrimRight, EntryTrimEnd, FunctionInfo::ErrorOnNew)
+BUILTIN(JavascriptString, TrimEnd, EntryTrimEnd, FunctionInfo::ErrorOnNew)
 BUILTIN(JavascriptString, Repeat, EntryRepeat, FunctionInfo::ErrorOnNew)
 BUILTIN(JavascriptString, StartsWith, EntryStartsWith, FunctionInfo::ErrorOnNew)
 BUILTIN(JavascriptString, EndsWith, EntryEndsWith, FunctionInfo::ErrorOnNew)

lib/Runtime/Library/JavascriptLibrary.cpp

@@ -3405,8 +3405,8 @@ namespace Js
         case PropertyIds::trimLeft:
             return BuiltinFunction::JavascriptString_TrimLeft;
 
-		case PropertyIds::trimStart:
-			return BuiltinFunction::JavascriptString_TrimStart;
+        case PropertyIds::trimStart:
+            return BuiltinFunction::JavascriptString_TrimStart;
 
         case PropertyIds::trimRight:
             return BuiltinFunction::JavascriptString_TrimRight;
@@ -3999,16 +3999,12 @@ namespace Js
             /* No inlining                String_StartsWith    */ library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::startsWith,         &JavascriptString::EntryInfo::StartsWith,           1);
             /* No inlining                String_EndsWith      */ library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::endsWith,           &JavascriptString::EntryInfo::EndsWith,             1);
             /* No inlining                String_Includes      */ library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::includes,           &JavascriptString::EntryInfo::Includes,             1);
-            builtinFuncs[BuiltinFunction::JavascriptString_TrimLeft]      = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::trimLeft,           &JavascriptString::EntryInfo::TrimLeft,             0);
-			//builtinFuncs[BuiltinFunction::JavascriptString_TrimStart] = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::trimStart, &JavascriptString::EntryInfo::TrimStart, 0);
-            library->AddMember(stringPrototype, PropertyIds::trimStart, builtinFuncs[BuiltinFunction::JavascriptString_TrimLeft], PropertyBuiltInMethodDefaults);
-            builtinFuncs[BuiltinFunction::JavascriptString_TrimRight]     = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::trimRight,          &JavascriptString::EntryInfo::TrimRight,            0);
-            library->AddMember(stringPrototype, PropertyIds::trimEnd, builtinFuncs[BuiltinFunction::JavascriptString_TrimRight], PropertyBuiltInMethodDefaults);
+            builtinFuncs[BuiltinFunction::JavascriptString_TrimStart]      = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::trimStart,           &JavascriptString::EntryInfo::TrimStart,             0);
+            library->AddMember(stringPrototype, PropertyIds::trimLeft, builtinFuncs[BuiltinFunction::JavascriptString_TrimStart], PropertyBuiltInMethodDefaults);
+            builtinFuncs[BuiltinFunction::JavascriptString_TrimEnd]     = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::trimEnd,          &JavascriptString::EntryInfo::TrimEnd,            0);
+            library->AddMember(stringPrototype, PropertyIds::trimRight, builtinFuncs[BuiltinFunction::JavascriptString_TrimEnd], PropertyBuiltInMethodDefaults);
         }
 
-  
-        
-
         library->AddFunctionToLibraryObjectWithName(stringPrototype, PropertyIds::_symbolIterator, PropertyIds::_RuntimeFunctionNameId_iterator, &JavascriptString::EntryInfo::SymbolIterator, 0);
 
             builtinFuncs[BuiltinFunction::JavascriptString_PadStart] = library->AddFunctionToLibraryObject(stringPrototype, PropertyIds::padStart, &JavascriptString::EntryInfo::PadStart, 1);
@@ -7472,8 +7468,8 @@ namespace Js
             REG_OBJECTS_LIB_FUNC(startsWith, JavascriptString::EntryStartsWith);
             REG_OBJECTS_LIB_FUNC(endsWith, JavascriptString::EntryEndsWith);
             REG_OBJECTS_LIB_FUNC(includes, JavascriptString::EntryIncludes);
-            REG_OBJECTS_LIB_FUNC(trimLeft, JavascriptString::EntryTrimLeft);
-            REG_OBJECTS_LIB_FUNC(trimRight, JavascriptString::EntryTrimRight);
+            REG_OBJECTS_LIB_FUNC(trimLeft, JavascriptString::EntryTrimStart);
+            REG_OBJECTS_LIB_FUNC(trimRight, JavascriptString::EntryTrimEnd);
 
         }
 

lib/Runtime/Library/JavascriptString.cpp

@@ -2384,7 +2384,7 @@ case_2:
         return TrimLeftRightHelper<true /*trimLeft*/, true /*trimRight*/>(pThis, scriptContext);
     }
 
-    Var JavascriptString::EntryTrimLeft(RecyclableObject* function, CallInfo callInfo, ...)
+    Var JavascriptString::EntryTrimStart(RecyclableObject* function, CallInfo callInfo, ...)
     {
         PROBE_STACK(function->GetScriptContext(), Js::Constants::MinStackDefault);
 
@@ -2405,7 +2405,7 @@ case_2:
         return TrimLeftRightHelper< true /*trimLeft*/, false /*trimRight*/>(pThis, scriptContext);
     }
 
-    Var JavascriptString::EntryTrimRight(RecyclableObject* function, CallInfo callInfo, ...)
+    Var JavascriptString::EntryTrimEnd(RecyclableObject* function, CallInfo callInfo, ...)
     {
         PROBE_STACK(function->GetScriptContext(), Js::Constants::MinStackDefault);
 

lib/Runtime/Library/JavascriptString.h

@@ -289,8 +289,8 @@ namespace Js
         static Var EntryToString(RecyclableObject* function, CallInfo callInfo, ...);
         static Var EntryToUpperCase(RecyclableObject* function, CallInfo callInfo, ...);
         static Var EntryTrim(RecyclableObject* function, CallInfo callInfo, ...);
-        static Var EntryTrimLeft(RecyclableObject* function, CallInfo callInfo, ...);
-        static Var EntryTrimRight(RecyclableObject* function, CallInfo callInfo, ...);
+        static Var EntryTrimStart(RecyclableObject* function, CallInfo callInfo, ...);
+        static Var EntryTrimEnd(RecyclableObject* function, CallInfo callInfo, ...);
         static Var EntryRepeat(RecyclableObject* function, CallInfo callInfo, ...);
         static Var EntryStartsWith(RecyclableObject* function, CallInfo callInfo, ...);
         static Var EntryEndsWith(RecyclableObject* function, CallInfo callInfo, ...);

test/Strings/trimStart_trimEnd.js

@@ -18,6 +18,33 @@ const tests = [
         body: function () {
             assert.areEqual(String.prototype.trimRight, String.prototype.trimEnd,  "Both trimRight and trimEnd should point to the same function");
         }
+    },
+    {
+        name: "String.prototype.trimLeft.name is changed",
+        body: function () {
+            assert.areEqual(String.prototype.trimLeft.name, 'trimStart', "String.prototype.trimLeft.name should be named trimStart");
+        }
+    },
+    {
+        name: "String.prototype.trimRight.name is changed",
+        body: function () {
+            assert.areEqual(String.prototype.trimRight.name, 'trimEnd', "String.prototype.trimRight.name should be named trimEnd");
+
+        }
+    },
+    {
+        name: "String.prototype.trimStart.name is consistent",
+        body: function () {
+            assert.areEqual(String.prototype.trimStart.name, 'trimStart', "String.prototype.trimLeft.name should be named trimStart");
+
+        }
+    },
+    {
+        name: "String.prototype.trimEnd.name is changed",
+        body: function () {
+            assert.areEqual(String.prototype.trimEnd.name, 'trimEnd', "String.prototype.trimEnd.name should be named trimEnd");
+
+        }
     }
 ];