final codacity for day

MeasureAuthoringTool · Mar 25, 2021 · a0732a4 · a0732a4
1 parent 74a18b0
commit a0732a4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/antlr/AntlrUtils.ts b/src/antlr/AntlrUtils.ts
@@ -18,11 +18,9 @@ export class AntlrUtils {
 
             const foundChild = AntlrUtils.findChild(children, lexerType, occurrence);
 
-            if (!foundChild) {
-                return undefined;
+            if (foundChild) {
+                return AntlrUtils.findText(foundChild as ParserRuleContext);
             }
-
-            return AntlrUtils.findText(foundChild as ParserRuleContext)
         }
     }
 

diff --git a/src/antlr/CqlAntlrListener.ts b/src/antlr/CqlAntlrListener.ts
@@ -39,19 +39,17 @@ abstract class CreatorBase<T extends CqlText> {
     }
 
     buildLineInfo(token: Token | undefined): LineInfo | undefined {
-        if (!token) {
-            return undefined;
-        }
+        if (token) {
+            const lineInfo = {} as LineInfo;
+            lineInfo.line = token.line;
+            lineInfo.position = token.charPositionInLine;
 
-        const lineInfo = {} as LineInfo;
-        lineInfo.line = token.line;
-        lineInfo.position = token.charPositionInLine;
+            if (token.charPositionInLine !== 0) {
+                lineInfo.position += token.stopIndex - token.startIndex;
+            }
 
-        if (token.charPositionInLine !== 0) {
-            lineInfo.position += token.stopIndex - token.startIndex;
+            return lineInfo;
         }
-
-        return lineInfo;
     }
 
     protected findChildText(cqlLexerId: number, occurrence: number = 1): string | undefined {