Fixed code smells reported by SonarCloud

lvcabral · Dec 1, 2023 · a5ccf9f · a5ccf9f
1 parent 49f0b79
commit a5ccf9f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/src/brsTypes/components/RoAppMemoryMonitor.ts b/src/brsTypes/components/RoAppMemoryMonitor.ts
@@ -77,7 +77,7 @@ export class RoAppMemoryMonitor extends BrsComponent implements BrsValue {
             returns: ValueKind.Object,
         },
         impl: (_: Interpreter) => {
-            return this.port === undefined ? BrsInvalid.Instance : this.port;
+            return this.port ?? BrsInvalid.Instance;
         },
     });
 

diff --git a/src/brsTypes/components/RoAudioPlayer.ts b/src/brsTypes/components/RoAudioPlayer.ts
@@ -189,7 +189,7 @@ export class RoAudioPlayer extends BrsComponent implements BrsValue {
             returns: ValueKind.Object,
         },
         impl: (_: Interpreter) => {
-            return this.port === undefined ? BrsInvalid.Instance : this.port;
+            return this.port ?? BrsInvalid.Instance;
         },
     });
 

diff --git a/src/brsTypes/components/RoChannelStore.ts b/src/brsTypes/components/RoChannelStore.ts
@@ -303,7 +303,7 @@ export class RoChannelStore extends BrsComponent implements BrsValue {
             returns: ValueKind.Object,
         },
         impl: (_: Interpreter) => {
-            return this.port === undefined ? BrsInvalid.Instance : this.port;
+            return this.port ?? BrsInvalid.Instance;
         },
     });
 

diff --git a/src/brsTypes/components/RoDeviceInfo.ts b/src/brsTypes/components/RoDeviceInfo.ts
@@ -776,7 +776,7 @@ export class RoDeviceInfo extends BrsComponent implements BrsValue {
             returns: ValueKind.Object,
         },
         impl: (_: Interpreter) => {
-            return this.port === undefined ? BrsInvalid.Instance : this.port;
+            return this.port ?? BrsInvalid.Instance;
         },
     });
 

diff --git a/src/brsTypes/components/RoScreen.ts b/src/brsTypes/components/RoScreen.ts
@@ -489,7 +489,7 @@ export class RoScreen extends BrsComponent implements BrsValue {
             returns: ValueKind.Object,
         },
         impl: (_: Interpreter) => {
-            return this.port === undefined ? BrsInvalid.Instance : this.port;
+            return this.port ?? BrsInvalid.Instance;
         },
     });
 

diff --git a/src/parser/Parser.ts b/src/parser/Parser.ts
@@ -1561,15 +1561,16 @@ export class Parser {
                     return new Expr.Literal(previous().literal!, previous().location);
                 case match(Lexeme.Identifier):
                     return new Expr.Variable(previous() as Identifier);
-                case match(Lexeme.LeftParen):
+                case match(Lexeme.LeftParen): {
                     let left = previous();
                     let expr = expression();
                     let right = consume(
                         "Unmatched '(' - expected ')' after expression",
                         Lexeme.RightParen
                     );
                     return new Expr.Grouping({ left, right }, expr);
-                case match(Lexeme.LeftSquare):
+                }
+                case match(Lexeme.LeftSquare): {
                     let elements: Expression[] = [];
                     let openingSquare = previous();
 
@@ -1598,7 +1599,8 @@ export class Parser {
 
                     //consume("Expected newline or ':' after array literal", Lexeme.Newline, Lexeme.Colon, Lexeme.Eof);
                     return new Expr.ArrayLiteral(elements, openingSquare, closingSquare);
-                case match(Lexeme.LeftBrace):
+                }
+                case match(Lexeme.LeftBrace): {
                     let openingBrace = previous();
                     let members: Expr.AAMember[] = [];
 
@@ -1654,11 +1656,13 @@ export class Parser {
                     let closingBrace = previous();
 
                     return new Expr.AALiteral(members, openingBrace, closingBrace);
-                case match(Lexeme.Pos, Lexeme.Tab):
+                }
+                case match(Lexeme.Pos, Lexeme.Tab): {
                     let token = Object.assign(previous(), {
                         kind: Lexeme.Identifier,
                     }) as Identifier;
                     return new Expr.Variable(token);
+                }
                 case check(Lexeme.Function, Lexeme.Sub):
                     return anonymousFunction();
                 default:

diff --git a/src/stdlib/CreateObject.ts b/src/stdlib/CreateObject.ts
@@ -1,4 +1,3 @@
-import { BrsError } from "../Error";
 import { Callable, ValueKind, BrsInvalid, BrsString, BrsType, StdlibArgument } from "../brsTypes";
 import { BrsObjects } from "../brsTypes/components/BrsObjects";
 import { Interpreter } from "../interpreter";