From 70e1970f401286fe4581546f76945a0d6065548a Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Sun, 9 Mar 2014 12:27:03 +0100
Subject: [PATCH] plus on numbers is now basically working

---
 jedi/evaluate/precedence.py  | 35 +++++++++++++++++++++++++++--------
 test/completion/operators.py |  8 ++++----
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/jedi/evaluate/precedence.py b/jedi/evaluate/precedence.py
index 31872d33..44d2a302 100644
--- a/jedi/evaluate/precedence.py
+++ b/jedi/evaluate/precedence.py
@@ -6,7 +6,7 @@ from jedi._compatibility import unicode
 from jedi.parser import representation as pr
 from jedi import debug
 from jedi.common import PushBackIterator
-from jedi.evaluate.compiled import CompiledObject
+from jedi.evaluate.compiled import CompiledObject, create
 from jedi.evaluate import iterable
 
 
@@ -175,12 +175,31 @@ def _check_operator(iterator, priority=PythonGrammar.LOWEST_PRIORITY):
     return left
 
 
-def calculate(left, operator, right):
+def calculate(left_result, operator, right_result):
+    if not left_result or not right_result:
+        return left_result + right_result
+
+    result = []
+    for left in left_result:
+        for right in right_result:
+            result += _element_calculate(left, operator, right)
+    return result
+
+
+def _element_calculate(left, operator, right):
+    def is_string(obj):
+        return isinstance(obj, CompiledObject) \
+            and isinstance(obj.obj, (str, unicode))
+
+    def is_number(obj):
+        return isinstance(obj, CompiledObject) \
+            and isinstance(obj.obj, (int, float))
 
     if operator == '*':
-        if [l for l in left if isinstance(l, iterable.Array)
-                or isinstance(l, CompiledObject)
-                and isinstance(l.obj, (str, unicode))]:
-            # if it is an iterable, ignore * operations
-            return left
-    return left + right
+        # for iterables, ignore * operations
+        if isinstance(left, iterable.Array) or is_string(left):
+            return [left]
+    elif operator == '+':
+        if is_number(left) and is_number(right):
+            return [create(left.obj + right.obj)]
+    return [left, right]
diff --git a/test/completion/operators.py b/test/completion/operators.py
index 3389a2f1..94987c2b 100644
--- a/test/completion/operators.py
+++ b/test/completion/operators.py
@@ -7,12 +7,12 @@ x = [1, 'a', 1.0]
 #? int() str() float()
 x[12]
 
-#? str()
+#? float()
 x[1 + 1]
 
-index = 0 + 2
+index = 0 + 1
 
-#? float()
+#? str()
 x[index]
 
 
@@ -22,4 +22,4 @@ def calculate(number):
 constant = 1
 
 #? float()
-x[calculate(2)]
+x[calculate(1)]