current_line is a property

thomasballinger · thomasballinger · commit c9c0cbf79dc9 · 2014-07-06T13:28:20.000-04:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -356,6 +356,13 @@ def __init__(self, scr, interp, statusbar, config, idle=None):
         if config.cli_suggestion_width <= 0 or config.cli_suggestion_width > 1:
             config.cli_suggestion_width = 0.8
 
+    def _get_cursor_offset(self):
+        return len(self.s) - self.cpos
+    def _set_cursor_offset(self, offset):
+        self.cpos = len(self.s) - offset
+    cursor_offset = property(_get_cursor_offset, _set_cursor_offset, None,
+                             "The cursor offset from the beginning of the line")
+
     def addstr(self, s):
         """Add a string to the current input line and figure out
         where it should go, depending on the cursor position."""
@@ -487,9 +494,12 @@ def clrtobol(self):
         self.scr.redrawwin()
         self.scr.refresh()
 
-    def current_line(self):
-        """Return the current line."""
+    def _get_current_line(self):
         return self.s
+    def _set_current_line(self, line):
+        self.s = line
+    current_line = property(_get_current_line, _set_current_line, None,
+                            "The characters of the current line")
 
     def cut_to_buffer(self):
         """Clear from cursor to end of line, placing into cut buffer"""
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -465,7 +465,7 @@ def startup(self):
 
     def current_string(self, concatenate=False):
         """If the line ends in a string get it, otherwise return ''"""
-        tokens = self.tokenize(self.current_line())
+        tokens = self.tokenize(self.current_line)
         string_tokens = list(takewhile(token_is_any_of([Token.String,
                                                         Token.Text]),
                                        reversed(tokens)))
@@ -515,7 +515,7 @@ def get_args(self):
         stack = [['', 0, '']]
         try:
             for (token, value) in PythonLexer().get_tokens(
-                self.current_line()):
+                self.current_line):
                 if token is Token.Punctuation:
                     if value in '([{':
                         stack.append(['', 0, value])
@@ -576,7 +576,7 @@ def get_source_of_current_name(self):
         try:
             obj = self.current_func
             if obj is None:
-                line = self.current_line()
+                line = self.current_line
                 if inspection.is_eval_safe_name(line):
                     obj = self.get_object(line)
             source = inspect.getsource(obj)
@@ -603,7 +603,7 @@ def set_docstring(self):
     def magic_method_completions(self, cw):
         if (self.config.complete_magic_methods and self.buffer and
             self.buffer[0].startswith("class ") and
-            self.current_line().lstrip().startswith("def ")):
+            self.current_line.lstrip().startswith("def ")):
             return [name for name in self.config.magic_methods
                     if name.startswith(cw)]
         else:
@@ -618,27 +618,22 @@ def complete(self, tab=False):
         self.set_docstring()
 
         matches, completer = autocomplete.get_completer(
-                len(self.current_line()) - self.cpos,
-                self.current_line(),
+                self.cursor_offset,
+                self.current_line,
                 self.interp.locals,
                 self.argspec,
                 self.config,
                 self.magic_method_completions)
 
-        if matches is None: # no completion is relevant
+        if (matches is None            # no completion is relevant
+                or len(matches) == 0): # some completion works, but no matches
             self.matches_iter.clear()
             return bool(self.argspec)
 
-        elif len(matches) == 0: # some completion works, but no matches
-            self.matches_iter.update(len(self.current_line()) - self.cpos,
-                                     self.current_line(),
-                                     matches, completer)
-            return bool(self.argspec)
+        self.matches_iter.update(self.cursor_offset,
+                                 self.current_line, matches, completer)
 
-        elif len(matches) == 1:
-                self.matches_iter.update(len(self.current_line()) - self.cpos,
-                                         self.current_line(),
-                                         matches, completer)
+        if len(matches) == 1:
                 self.matches_iter.next()
                 if tab: # if this complete is being run for a tab key press, tab() to do the swap
                     self.tab()
@@ -650,8 +645,6 @@ def complete(self, tab=False):
                 return True
 
         else:
-            self.matches_iter.update(len(self.current_line()) - self.cpos,
-                                     self.current_line(), matches, completer)
             return True
 
     def format_docstring(self, docstring, width, height):
