worked on message timing and to events

etiennerichart · etiennerichart · commit 32f5c8d3b2c1 · 2020-08-17T17:15:15.000-04:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -251,8 +251,8 @@ def locate(self, current_offset, line):
     def format(self, word):
         return after_last_dot(word)
 
-    def try_to_complete(self, module):
-        return importcompletion.try_to_import(module)
+    def try_to_import(self, module_name):
+        return importcompletion.try_to_import(module_name)
 
 
 class FilenameCompletion(BaseCompletionType):
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -59,6 +59,9 @@ def __init__(self, config, locals_, banner, interp=None):
         self.request_undo = self.input_generator.event_trigger(
             bpythonevents.UndoEvent
         )
+        self.background_import_event = self.input_generator.event_trigger(
+            bpythonevents.BackgroundImportEvent
+        )
 
         with self.input_generator:
             pass  # temp hack to get .original_stty
diff --git a/bpython/curtsiesfrontend/events.py b/bpython/curtsiesfrontend/events.py
@@ -47,3 +47,10 @@ class UndoEvent(curtsies.events.Event):
 
     def __init__(self, n=1):
         self.n = n
+
+
+class BackgroundImportEvent(curtsies.events.Event):
+    """Background import for advanced auto complete."""
+
+    def __init__(self, module_name):
+        self.module_name = module_name
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -701,6 +701,11 @@ def process_control_event(self, e):
                     _("Reloaded at %s because %s modified.")
                     % (time.strftime("%X"), " & ".join(e.files_modified))
                 )
+        
+        elif isinstance(e, bpythonevents.BackgroundImportEvent):
+            #self.comleters[1] should match to autocomplete's ImportCompletion class
+            self.completers[1].try_to_import(e.module_name)
+            self.status_bar.pop_permanent_message("Imported module %s" % e.module_name)
 
         else:
             raise ValueError("Don't know how to handle event type: %r" % e)
@@ -882,6 +887,7 @@ def on_tab(self, back=False):
         2) complete the current word with characters common to all completions
         3) select the first or last match
         4) select the next or previous match if already have a match
+        5) if line is `from <module> import` and tab then import module and attr
         """
 
         def only_whitespace_left_of_cursor():
@@ -898,14 +904,19 @@ def only_whitespace_left_of_cursor():
                 self.add_normal_character(" ")
             return
         
-        # if line is `from a import` and tab then import module and attr
+        #5. if line is `from a import` and tab then import module and attr
         line = self.current_line.split()
         module_name = ""
         if "from" in line and "import" in line:
+            #returns <module> name if the line contains: "from <module> import"
             module_name = from_import_tab(self.current_line)
-        if module_name:
-            self.status_bar.message("Importing module %s" % module_name)
-            self.completers[1].try_to_complete(module_name)
+            print(module_name)
+            if module_name:
+                if module_name not in sys.modules:
+                    self.status_bar.push_permanent_message("Imported module %s" % module_name)
+                    self.background_import_event(module_name=module_name)
+                    
+
 
         # run complete() if we don't already have matches
         if len(self.matches_iter.matches) == 0:
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -101,16 +101,16 @@ def module_attr_matches(name):
 
 
 def try_to_import(module_name):
-    """If this hasn't been imported our goal is to add it to the set of modules and actually import it"""
-    if module_name not in sys.modules:
-        try:
-            module = __import__(module_name)
-            module_path = os.path.dirname(module.__file__)
-            for mod in find_modules(module_path):
-                modules.add("%s.%s" % (module_name, mod))
-            modules.add(module_name)
-        except ImportError:
-            pass
+    """Called by curtsiesfrontend repl on tab to import module 
+    in background for better auto completion: attr completion"""
+    try:
+        module = __import__(module_name)
+        module_path = os.path.dirname(module.__file__)
+        for mod in find_modules(module_path):
+            modules.add("%s.%s" % (module_name, mod))
+        modules.add(module_name)
+    except ImportError:
+        pass
 
 
 def complete(cursor_offset, line):

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ def __init__(self, config, locals_, banner, interp=None):`
`59`	`59`	`self.request_undo = self.input_generator.event_trigger(`
`60`	`60`	`bpythonevents.UndoEvent`
`61`	`61`	`)`
	`62`	`+ self.background_import_event = self.input_generator.event_trigger(`
	`63`	`+ bpythonevents.BackgroundImportEvent`
	`64`	`+ )`
`62`	`65`
`63`	`66`	`with self.input_generator:`
`64`	`67`	`pass # temp hack to get .original_stty`