diff --git a/evaluate.py b/evaluate.py index ba5000db..42999b29 100644 --- a/evaluate.py +++ b/evaluate.py @@ -195,6 +195,8 @@ def follow_statement(stmt, scope=None): if not isinstance(tok, str): # the string tokens are just operations (+, -, etc.) result += follow_call(scope, tok) + else: + debug.warning('dini mueter, found string:', tok) return result diff --git a/functions.py b/functions.py index 4e3846be..af0d293e 100644 --- a/functions.py +++ b/functions.py @@ -68,6 +68,7 @@ class FileWithCursor(modules.File): whitespace = [' ', '\n', '\r', '\\'] open_brackets = ['(', '[', '{'] close_brackets = [')', ']', '}'] + strings = ['"', '"""', "'", "'''"] is_word = lambda char: re.search('\w', char) name = '' force_point = False @@ -172,7 +173,6 @@ def complete(source, row, column, file_callback=None): debug.dbg(' ' * 62 + 'complete') debug.dbg('-' * 70) debug.dbg('complete_scope', scope) - debug.dbg('user_scope', f.parser.user_scope.get_simple_for_line(row)) try: path = f.get_row_path(column) @@ -181,7 +181,6 @@ def complete(source, row, column, file_callback=None): debug.dbg(e) result = [] - print path if path and path[0]: # just parse one statement r = parsing.PyFuzzyParser(".".join(path)) diff --git a/parsing.py b/parsing.py index 5be605eb..ed6ebca4 100644 --- a/parsing.py +++ b/parsing.py @@ -221,14 +221,6 @@ class Scope(Simple): """ return not (self.imports or self.subscopes or self.statements) - def get_simple_for_line(self, line): - """ Get the Simple objects, which are on the line. """ - simple = [] - for s in self.statements + self.imports: - if s.line_nr <= line <= s.line_end: - simple.append(s) - return simple - def __repr__(self): try: name = self.name