Update diagnostics gutter icons and change default to "sign" (#2086)

sublimelsp · Oct 14, 2022 · fbbfa5a · fbbfa5a
1 parent 6aa77ff
commit fbbfa5a
Show file tree

Hide file tree

Showing 24 changed files with 44 additions and 434 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,6 +2,8 @@
 .style.yapf export-ignore
 codecov.yml export-ignore
 docs/ export-ignore
+icons/convert.bat export-ignore
+icons/*.svg export-ignore
 mypy.ini export-ignore
 stubs/ export-ignore
 tests/ export-ignore

diff --git a/LSP.sublime-settings b/LSP.sublime-settings
@@ -112,7 +112,7 @@
 
   // Gutter marker for code diagnostics.
   // Valid values are "dot", "circle", "bookmark", "sign" or ""
-  "diagnostics_gutter_marker": "dot",
+  "diagnostics_gutter_marker": "sign",
 
   // Highlight style of links to internal or external resources, like another text document
   // or a web site. Link navigation is implemented via the popup on mouse hover.

diff --git a/icons/COPYRIGHT_NOTICE.md b/icons/COPYRIGHT_NOTICE.md
diff --git a/icons/LICENSE b/icons/LICENSE
diff --git a/icons/convert.bat b/icons/convert.bat
@@ -0,0 +1,12 @@
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 16 -h 16 --export-filename=error.png error.svg
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 32 -h 32 --export-filename=error@2x.png error.svg
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 48 -h 48 --export-filename=error@3x.png error.svg
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 16 -h 16 --export-filename=info.png info.svg
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 32 -h 32 --export-filename=info@2x.png info.svg
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 48 -h 48 --export-filename=info@3x.png info.svg
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 16 -h 16 --export-filename=lightbulb.png lightbulb.svg
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 32 -h 32 --export-filename=lightbulb@2x.png lightbulb.svg
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 48 -h 48 --export-filename=lightbulb@3x.png lightbulb.svg
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 16 -h 16 --export-filename=warning.png warning.svg
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 32 -h 32 --export-filename=warning@2x.png warning.svg
+inkscape --export-type=png --export-area=-1.23:-1.23:18.46:18.46 -w 48 -h 48 --export-filename=warning@3x.png warning.svg
diff --git a/icons/error.png b/icons/error.png
diff --git a/icons/error.svg b/icons/error.svg
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/info.png b/icons/info.png
diff --git a/icons/info.svg b/icons/info.svg
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/lightbulb.png b/icons/lightbulb.png
diff --git a/icons/lightbulb.svg b/icons/lightbulb.svg
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/warning.png b/icons/warning.png
diff --git a/icons/warning.svg b/icons/warning.svg
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/plugin/core/views.py b/plugin/core/views.py
@@ -55,7 +55,7 @@
     ("error",   "errors",   "region.redish markup.error.lsp",      "Packages/LSP/icons/error.png",   _baseflags | sublime.DRAW_SQUIGGLY_UNDERLINE, sublime.DRAW_NO_FILL),  # noqa: E501
     ("warning", "warnings", "region.yellowish markup.warning.lsp", "Packages/LSP/icons/warning.png", _baseflags | sublime.DRAW_SQUIGGLY_UNDERLINE, sublime.DRAW_NO_FILL),  # noqa: E501
     ("info",    "info",     "region.bluish markup.info.lsp",       "Packages/LSP/icons/info.png",    _baseflags | sublime.DRAW_STIPPLED_UNDERLINE, sublime.DRAW_NO_FILL),  # noqa: E501
-    ("hint",    "hints",    "region.bluish markup.info.hint.lsp",  "Packages/LSP/icons/info.png",    _baseflags | sublime.DRAW_STIPPLED_UNDERLINE, sublime.DRAW_NO_FILL),  # noqa: E501
+    ("hint",    "hints",    "region.bluish markup.info.hint.lsp",  "",                               _baseflags | sublime.DRAW_STIPPLED_UNDERLINE, sublime.DRAW_NO_FILL),  # noqa: E501
 ]  # type: List[Tuple[str, str, str, str, int, int]]
 
 # sublime.Kind tuples for sublime.CompletionItem, sublime.QuickPanelItem, sublime.ListInputItem

diff --git a/plugin/session_buffer.py b/plugin/session_buffer.py
@@ -2,6 +2,7 @@
 from .core.panels import PanelName
 from .core.protocol import ColorInformation
 from .core.protocol import Diagnostic
+from .core.protocol import DiagnosticSeverity
 from .core.protocol import DocumentLink
 from .core.protocol import DocumentUri
 from .core.protocol import InlayHint
@@ -68,7 +69,7 @@ def __init__(self, severity: int) -> None:
         self.annotations = []  # type: List[str]
         _, _, self.scope, self.icon, _, _ = DIAGNOSTIC_SEVERITY[severity - 1]
         if userprefs().diagnostics_gutter_marker != "sign":
-            self.icon = userprefs().diagnostics_gutter_marker
+            self.icon = "" if severity == DiagnosticSeverity.Hint else userprefs().diagnostics_gutter_marker
 
 
 class SemanticTokensData:

diff --git a/sublime-package.json b/sublime-package.json
@@ -529,7 +529,7 @@
                 "sign",
                 ""
               ],
-              "default": "dot",
+              "default": "sign",
               "markdownDescription": "Gutter marker for code diagnostics."
             },
             "link_highlight_style": {