Fixed prettier and replaced deprecated substr() method

rokucommunity · Sep 7, 2023 · a223c2a · a223c2a
1 parent 94304cd
commit a223c2a
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/stdlib/String.ts b/src/stdlib/String.ts
@@ -1,8 +1,14 @@
-import { BrsType, Callable, ValueKind, BrsString, Int32, Float, StdlibArgument, BrsInvalid } from "../brsTypes";
-import * as Expr from "../parser/Expression";
+import {
+    Callable,
+    ValueKind,
+    BrsString,
+    Int32,
+    Float,
+    StdlibArgument,
+    BrsInvalid,
+} from "../brsTypes";
 import { Interpreter } from "../interpreter";
 import { BrsNumber } from "../brsTypes/BrsNumber";
-import { Lexeme } from "../lexer";
 
 /** Converts the string to all uppercase. */
 export const UCase = new Callable("UCase", {
@@ -61,7 +67,7 @@ export const Left = new Callable("Left", {
         returns: ValueKind.String,
     },
     impl: (interpreter: Interpreter, s: BrsString, n: Int32) =>
-        new BrsString(s.value.substr(0, n.getValue())),
+        new BrsString(s.value.slice(0, n.getValue())),
 });
 
 /**
@@ -73,12 +79,8 @@ export const Right = new Callable("Right", {
         returns: ValueKind.String,
     },
     impl: (interpreter: Interpreter, s: BrsString, n: Int32) => {
-        let end = s.value.length - 1;
-        let start = end - (n.getValue() - 1);
-
         if (n.getValue() <= 0) return new BrsString("");
-        else if (start < 0) return new BrsString(s.value);
-        return new BrsString(s.value.substr(start, end));
+        return new BrsString(s.value.slice(-n.getValue()));
     },
 });