curent_word falls when if obj.attr obj not global

thomasballinger · thomasballinger · commit 8be8f739f667 · 2015-12-25T12:10:51.000-08:00
diff --git a/bpython/line.py b/bpython/line.py
@@ -10,9 +10,12 @@
 
 from bpython.lazyre import LazyReCompile
 
-current_word_re = LazyReCompile(r'[\w_][\w0-9._]*[(]?')
 LinePart = namedtuple('LinePart', ['start', 'stop', 'word'])
 
+current_word_re = LazyReCompile(
+        r'(?<![)\]\w_.])'
+        r'([\w_][\w0-9._]*[(]?)')
+
 
 def current_word(cursor_offset, line):
     """the object.attribute.attribute just before or under the cursor"""
@@ -22,10 +25,10 @@ def current_word(cursor_offset, line):
     end = pos
     word = None
     for m in matches:
-        if m.start() < pos and m.end() >= pos:
-            start = m.start()
-            end = m.end()
-            word = m.group()
+        if m.start(1) < pos and m.end(1) >= pos:
+            start = m.start(1)
+            end = m.end(1)
+            word = m.group(1)
     if word is None:
         return None
     return LinePart(start, end, word)
diff --git a/bpython/test/test_line_properties.py b/bpython/test/test_line_properties.py
@@ -5,7 +5,7 @@
     current_string, current_object, current_object_attribute, \
     current_from_import_from, current_from_import_import, current_import, \
     current_method_definition_name, current_single_word, \
-    current_expression_attribute
+    current_expression_attribute, current_dotted_attribute
 
 
 def cursor(s):
@@ -129,6 +129,15 @@ def test_dots(self):
         self.assertAccess('stuff[<asd|fg>]')
         self.assertAccess('stuff[asdf[<asd|fg>]')
 
+    def test_non_dots(self):
+        self.assertAccess('].asdf|')
+        self.assertAccess(').asdf|')
+        self.assertAccess('foo[0].asdf|')
+        self.assertAccess('foo().asdf|')
+        self.assertAccess('foo().|')
+        self.assertAccess('foo().asdf.|')
+        self.assertAccess('foo[0].asdf.|')
+
     def test_open_paren(self):
         self.assertAccess('<foo(|>')
         # documenting current behavior - TODO is this intended?
@@ -336,5 +345,16 @@ def test_strings(self):
         self.assertAccess('"hey".<|>')
 
 
+class TestCurrentDottedAttribute(LineTestCase):
+    def setUp(self):
+        self.func = current_dotted_attribute
+
+    def test_simple(self):
+        self.assertAccess('<obj.attr>|')
+        self.assertAccess('(<obj.attr>|')
+        self.assertAccess('[<obj.attr>|')
+        self.assertAccess('m.body[0].value|')
+        self.assertAccess('m.body[0].attr.value|')
+
 if __name__ == '__main__':
     unittest.main()
