[Automatic Type Popup] fix + remove type prefixes

text_commands.py

@@ -37,8 +37,9 @@ def run(self,edit):
     def _handle_response(self,response):
         type_spans = list(parse_exp_types(response))
         if type_spans:
-            _type = next(filter_enclosing(self.view, self.view.sel()[0], type_spans), None)
-            if not _type is None:
+            type_span = next(filter_enclosing(self.view, self.view.sel()[0], type_spans), None)
+            if type_span is not None:
+                _type, span = type_span
                 self.view.show_popup(_type)
 
 

utility.py

@@ -70,7 +70,18 @@ def within(smaller, larger):
     return smaller.begin() >= larger.begin() and smaller.end() <= larger.end()
 
 def filter_enclosing(view, region, span_pairs):
-    return (item for item, span in span_pairs if within(region, view_region_from_span(view, span)))
+    return ((item, span) for item, span in span_pairs if within(region, view_region_from_span(view, span)))
+
+def shorten_module_prefixes(type_with_prefixes):
+    words = type_with_prefixes.replace("(", " ( ").replace("[", " [ ").split(' ')
+    return (" ".join(map(shorten_module_prefix, words)).replace(" ( ","(").replace(" [ ","["))
+
+def shorten_module_prefix(prefixed_type):
+    words = prefixed_type.split('.')
+    if (len(words) > 1):
+        return ("_" + words[-1])
+    else:
+        return prefixed_type
 
 def is_haskell_view(view):
     return view.match_selector(view.sel()[0].begin(), "source.haskell")

win.py

@@ -5,7 +5,7 @@
     import sublime
 except ImportError:
     from test.stubs import sublime
-from utility import first_folder, view_region_from_span
+from utility import first_folder, view_region_from_span, filter_enclosing, shorten_module_prefixes
 from response import parse_source_errors, parse_exp_types
 
 class Win:
@@ -40,21 +40,22 @@ def highlight_type(self, exp_types):
         most specific one for now, but it gives us the types all the way out to the topmost
         expression.
         """
-        types = list(parse_exp_types(exp_types))
-        if types:
-            # Display the first type in a region and in the status bar
+        type_spans = list(parse_exp_types(exp_types))
+        if type_spans:
             view = self.window.active_view()
-            (type, span) = types[0]
-            if span:
-                if Win.show_popup:
-                    view.show_popup(type)
-                view.set_status("type_at_cursor", type)
+            type_span = next(filter_enclosing(view, view.sel()[0], type_spans), None)
+            if type_span is not None:
+                (_type, span) = type_span
+                view.set_status("type_at_cursor", _type)
                 view.add_regions("type_at_cursor", [view_region_from_span(view, span)], "storage.type", "", sublime.DRAW_OUTLINED)
-        else:
-            # Clear type-at-cursor display
-            for view in self.window.views():
-                view.set_status("type_at_cursor", "")
-                view.add_regions("type_at_cursor", [], "storage.type", "", sublime.DRAW_OUTLINED)
+                if Win.show_popup:
+                    view.show_popup(shorten_module_prefixes(_type))
+                return
+
+        # Clear type-at-cursor display     
+        for view in self.window.views():       
+            view.set_status("type_at_cursor", "")      
+            view.add_regions("type_at_cursor", [], "storage.type", "", sublime.DRAW_OUTLINED)
 
 
     def handle_source_errors(self, source_errors):
@@ -136,5 +137,3 @@ def highlight_errors(self, errors):
         for view in self.window.views():
             view.add_regions("errors", error_regions_by_view_id.get(view.id(), []), "invalid", "dot", sublime.DRAW_OUTLINED)
             view.add_regions("warnings", warning_regions_by_view_id.get(view.id(), []), "comment", "dot", sublime.DRAW_OUTLINED)
-
-