fix: parse expression with index path (#851)

* fix: parse expression with index path * resolved detekt warning
ZupIT · Aug 28, 2020 · 7be428d · 7be428d
1 parent f69e0e5
commit 7be428d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/android/beagle/src/main/java/br/com/zup/beagle/android/context/tokenizer/TokenInterpreter.kt b/android/beagle/src/main/java/br/com/zup/beagle/android/context/tokenizer/TokenInterpreter.kt
@@ -30,17 +30,17 @@ internal class TokenInterpreter(value: String) {
     }
 
     private fun readToken(): Token? {
-        return when {
-            lastChar == '\'' -> readString()
-            lastChar == '(' -> {
+        return when (lastChar) {
+            '\'' -> readString()
+            '(' -> {
                 resetLastChar()
                 tokenOpenBracket()
             }
-            lastChar == ')' -> {
+            ')' -> {
                 resetLastChar()
                 tokenOfCloseBracket()
             }
-            lastChar == ',' -> {
+            ',' -> {
                 resetLastChar()
                 tokenOfComma()
             }
@@ -79,7 +79,7 @@ internal class TokenInterpreter(value: String) {
 
     private fun readVariableOrFunction(): Token? {
         val sb = StringBuilder()
-        while (lastChar.isJavaIdentifierPart() || lastChar == '.') {
+        while (lastChar.isJavaIdentifierPart() || isExpressionCharacter()) {
             sb.append(lastChar)
             lastChar = reader.read().toChar()
         }
@@ -101,6 +101,8 @@ internal class TokenInterpreter(value: String) {
         }
     }
 
+    private fun isExpressionCharacter() = lastChar == '.' || lastChar == '[' || lastChar == ']'
+
     private fun resetLastChar() {
         lastChar = Char.MIN_VALUE
     }

diff --git a/android/beagle/src/test/java/br/com/zup/beagle/android/context/tokenizer/TokenParserTest.kt b/android/beagle/src/test/java/br/com/zup/beagle/android/context/tokenizer/TokenParserTest.kt
@@ -127,6 +127,19 @@ class TokenParserTest {
         assertEquals(expression, result.token.value)
     }
 
+    @Test
+    fun parse_should_return_binding_with_path_list() {
+        // Given
+        val expression = "bindingId.bindingValue[0]"
+
+        // When
+        val result = tokenParser.parse(expression)
+
+        // Then
+        assertTrue { result.token is TokenBinding }
+        assertEquals(expression, result.token.value)
+    }
+
     @Test
     fun parse_should_return_binding_with_number() {
         // Given