Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't show a source if diagnostic doesn't have a source #2119

Merged
merged 16 commits into from
Nov 26, 2022
Merged

Don't show a source if diagnostic doesn't have a source #2119

Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d790f98
Don't show a source if diagnostic doesn't have a source
Sainan Nov 18, 2022
ff01553
Fix exception in diagnostic_source_and_code when saving file with issues
Sainan Nov 20, 2022
b05d731
Fix empty space in diagnostics panel after diagnostic with no source
Sainan Nov 20, 2022
a4508fb
Move comment
Sainan Nov 20, 2022
5597017
Inline diagnostic_source as per rchl's request
Sainan Nov 20, 2022
1241dff
Also add zero-width space if code is present but not source
Sainan Nov 20, 2022
19d301a
Change diagnostics panel to use (code) instead of :code
Sainan Nov 20, 2022
6fb64ab
Change html overlay to use (code) instead of :code
Sainan Nov 20, 2022
40c96ce
Fix check always evaluating to true
Sainan Nov 20, 2022
c4f6a46
Simplify this
Sainan Nov 20, 2022
d562df9
Introduce needless overhead as per request
Sainan Nov 20, 2022
39e1184
Remove annotation as per request
Sainan Nov 20, 2022
485fb2e
Update panel link format as per request
Sainan Nov 20, 2022
aedad02
Remove _with_scope_color procedure as per request
Sainan Nov 20, 2022
f4cbabb
Remove explicit checks
Sainan Nov 20, 2022
dd17faa
Use `append` when not passing a list
Sainan Nov 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions plugin/core/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,8 +837,8 @@ def diagnostic_severity(diagnostic: Diagnostic) -> DiagnosticSeverity:
return diagnostic.get("severity", DiagnosticSeverity.Error)


def diagnostic_source(diagnostic: Diagnostic) -> str:
return diagnostic.get("source", "unknown-source")
def diagnostic_source(diagnostic: Diagnostic) -> Optional[str]:
return diagnostic.get("source")
Sainan marked this conversation as resolved.
Show resolved Hide resolved


def format_diagnostic_for_panel(diagnostic: Diagnostic) -> Tuple[str, Optional[int], Optional[str], Optional[str]]:
Expand All @@ -854,13 +854,14 @@ def format_diagnostic_for_panel(diagnostic: Diagnostic) -> Tuple[str, Optional[i
formatted, code, href = diagnostic_source_and_code(diagnostic)
lines = diagnostic["message"].splitlines() or [""]
# \u200B is the zero-width space
Sainan marked this conversation as resolved.
Show resolved Hide resolved
result = " {:>4}:{:<4}{:<8}{} \u200B{}".format(
result = " {:>4}:{:<4}{:<8}{}".format(
diagnostic["range"]["start"]["line"] + 1,
diagnostic["range"]["start"]["character"] + 1,
format_severity(diagnostic_severity(diagnostic)),
lines[0],
formatted
lines[0]
)
if formatted != "":
result += " \u200B{}".format(formatted)
offset = len(result) if href else None
for line in itertools.islice(lines, 1, None):
result += "\n" + 18 * " " + line
Expand All @@ -875,7 +876,10 @@ def format_diagnostic_source_and_code(diagnostic: Diagnostic) -> str:


def diagnostic_source_and_code(diagnostic: Diagnostic) -> Tuple[str, Optional[str], Optional[str]]:
formatted = [diagnostic_source(diagnostic)]
formatted = []
source = diagnostic_source(diagnostic)
if source is not None:
formatted = [source]
href = None
code = diagnostic.get("code")
if code is not None:
Expand Down Expand Up @@ -980,7 +984,8 @@ def format_diagnostic_for_html(
else:
code = None
source = diagnostic_source(diagnostic)
formatted.extend((" ", _with_color(source, "color(var(--foreground) alpha(0.6))")))
if source is not None:
formatted.extend((" ", _with_color(source, "color(var(--foreground) alpha(0.6))")))
if code:
formatted.extend((_with_scope_color(view, ":", "punctuation.separator.lsp"), code))
Sainan marked this conversation as resolved.
Show resolved Hide resolved
related_infos = diagnostic.get("relatedInformation")
Expand Down