add string literal completion

thomasballinger · thomasballinger · commit 70efe4b74fd5 · 2014-07-11T14:15:22.000-04:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -69,8 +69,8 @@ def get_completer(cursor_offset, current_line, locals_, argspec, full_code, mode
               'mode':mode, 'complete_magic_methods':complete_magic_methods}
 
     # mutually exclusive matchers: if one returns [], don't go on
-    for completer in [ImportCompletion, FilenameCompletion,
-                      MagicMethodCompletion, GlobalCompletion]:
+    for completer in [StringLiteralAttrCompletion, ImportCompletion,
+            FilenameCompletion, MagicMethodCompletion, GlobalCompletion]:
         matches = completer.matches(cursor_offset, current_line, **kwargs)
         if matches is not None:
             return sorted(set(matches)), completer
@@ -315,6 +315,20 @@ def matches(cls, cursor_offset, line, argspec, **kwargs):
         return matches
     locate = staticmethod(lineparts.current_word)
 
+class StringLiteralAttrCompletion(BaseCompletionType):
+    locate = staticmethod(lineparts.current_string_literal_attr)
+    @classmethod
+    def matches(cls, cursor_offset, line, **kwargs):
+        r = cls.locate(cursor_offset, line)
+        if r is None:
+            return None
+        start, end, word = r
+        attrs = dir('')
+        matches = [att for att in attrs if att.startswith(word)]
+        if not word.startswith('_'):
+            return [match for match in matches if not match.startswith('_')]
+        return matches
+
 class SafeEvalFailed(Exception):
     """If this object is returned, safe_eval failed"""
     # Because every normal Python value is a possible return value of safe_eval
diff --git a/bpython/line.py b/bpython/line.py
@@ -149,4 +149,11 @@ def current_dotted_attribute(cursor_offset, line):
     start, end, word = match
     if '.' in word[1:]:
         return start, end, word
+
+def current_string_literal_attr(cursor_offset, line):
+    """The attribute following a string literal"""
+    matches = re.finditer("('''" + r'''|"""|'|")((?:(?=([^"'\\]+|\\.|(?!\1)["']))\3)*)\1[.]([a-zA-Z_]?[\w]*)''', line)
+    for m in matches:
+        if (m.start(4) <= cursor_offset and m.end(4) >= cursor_offset):
+            return m.start(4), m.end(4), m.group(4)
     return None
diff --git a/bpython/test/test_line_properties.py b/bpython/test/test_line_properties.py
@@ -1,8 +1,7 @@
 import unittest
 import re
 
-from bpython.line import current_word, current_dict_key, current_dict, current_string, current_object, current_object_attribute, current_from_import_from, current_from_import_import, current_import
-from bpython.line import current_word, current_dict_key, current_dict, current_string, current_object, current_object_attribute, current_from_import_from, current_from_import_import, current_import, current_method_definition_name, current_single_word
+from bpython.line import current_word, current_dict_key, current_dict, 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_string_literal_attr
 
 
 def cursor(s):
@@ -254,5 +253,16 @@ def test_simple(self):
         self.assertAccess('.foo|')
         self.assertAccess(' <foo|>')
 
+class TestCurrentStringLiteral(LineTestCase):
+    def setUp(self):
+        self.func = current_string_literal_attr
+    def test_simple(self):
+        self.assertAccess('"hey".<a|>')
+        self.assertAccess('"hey"|')
+        self.assertAccess('"hey"|.a')
+        self.assertAccess('"hey".<a|b>')
+        self.assertAccess('"hey".asdf d|')
+        self.assertAccess('"hey".<|>')
+
 if __name__ == '__main__':
     unittest.main()
