Merge 9554706 into 25e63ba

sublimelsp · Oct 2, 2018 · 114e600 · 114e600
2 parents 25e63ba + 9554706
commit 114e600
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 21 deletions.
diff --git a/plugin/core/popups.py b/plugin/core/popups.py
@@ -30,5 +30,19 @@
         margin-bottom: 0.5rem;
         padding: 0.5rem;
     }
+    .lsp_popup .info {
+        border-width: 0;
+        background-color: color(var(--bluish) alpha(0.25));
+        color: var(--whitish);
+        margin-bottom: 0.5rem;
+        padding: 0.5rem;
+    }
+    .lsp_popup .hints {
+        border-width: 0;
+        background-color: color(var(--bluish) alpha(0.25));
+        color: var(--whitish);
+        margin-bottom: 0.5rem;
+        padding: 0.5rem;
+    }
 
 '''
diff --git a/plugin/hover.py b/plugin/hover.py
@@ -4,8 +4,8 @@
 import webbrowser
 from html import escape
 try:
-    from typing import List, Optional, Any
-    assert List and Optional and Any
+    from typing import List, Optional, Any, Dict
+    assert List and Optional and Any and Dict
 except ImportError:
     pass
 
@@ -38,6 +38,14 @@ def on_hover(self, point, hover_zone):
 _test_contents = []  # type: List[str]
 
 
+class_for_severity = {
+    DiagnosticSeverity.Error: 'errors',
+    DiagnosticSeverity.Warning: 'warnings',
+    DiagnosticSeverity.Information: 'info',
+    DiagnosticSeverity.Hint: 'hints'
+}
+
+
 class LspHoverCommand(LspTextCommand):
     def __init__(self, view):
         super().__init__(view)
@@ -95,26 +103,13 @@ def format_diagnostic(self, diagnostic):
             return "<pre>{}</pre>".format(escape(diagnostic.message, False))
 
     def diagnostics_content(self, diagnostics):
-        formatted_errors = list(
-            self.format_diagnostic(diagnostic)
-            for diagnostic in diagnostics
-            if diagnostic.severity == DiagnosticSeverity.Error)
+        by_severity = {}  # type: Dict[int, List[str]]
+        for diagnostic in diagnostics:
+            by_severity.setdefault(diagnostic.severity, []).append(self.format_diagnostic(diagnostic))
         formatted = []
-        if len(formatted_errors) > 0:
-            formatted.append("<div class='errors'>")
-            formatted.extend(formatted_errors)
-            formatted.append("<a href='{}'>{}</a>".format('code-actions',
-                                                          'Code Actions'))
-            formatted.append("</div>")
-
-        formatted_warnings = list(
-            self.format_diagnostic(diagnostic)
-            for diagnostic in diagnostics
-            if diagnostic.severity == DiagnosticSeverity.Warning)
-
-        if len(formatted_warnings) > 0:
-            formatted.append("<div class='warnings'>")
-            formatted.extend(formatted_warnings)
+        for severity, items in by_severity.items():
+            formatted.append("<div class='{}'>".format(class_for_severity[severity]))
+            formatted.extend(items)
             formatted.append("<a href='{}'>{}</a>".format('code-actions',
                                                           'Code Actions'))
             formatted.append("</div>")