From 6073ac239e8027024d091e4e26955905b2774667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 24 Jul 2025 20:19:59 +0200 Subject: [PATCH 1/2] diagnostics: add hint to message, if present --- .../smithy/lsp/diagnostics/SmithyDiagnostics.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/software/amazon/smithy/lsp/diagnostics/SmithyDiagnostics.java b/src/main/java/software/amazon/smithy/lsp/diagnostics/SmithyDiagnostics.java index ce9c7652..5079b351 100644 --- a/src/main/java/software/amazon/smithy/lsp/diagnostics/SmithyDiagnostics.java +++ b/src/main/java/software/amazon/smithy/lsp/diagnostics/SmithyDiagnostics.java @@ -208,8 +208,19 @@ default Diagnostic toDiagnostic(ValidationEvent event) { default -> DiagnosticSeverity.Hint; }; var diagnosticRange = getDiagnosticRange(event); - var message = event.getId() + ": " + event.getMessage(); - return new Diagnostic(diagnosticRange, message, diagnosticSeverity, "Smithy"); + + var message = + new StringBuilder(event.getId()) + .append(": ") + .append(event.getMessage()); + + event.getHint().ifPresent(hint -> + message + .append("\n\nHint: ") + .append(hint) + ); + + return new Diagnostic(diagnosticRange, message.toString(), diagnosticSeverity, "Smithy"); } } From 96921caccc726f22cbdcdc469661e774879977c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 25 Aug 2025 11:50:57 +0200 Subject: [PATCH 2/2] Update src/main/java/software/amazon/smithy/lsp/diagnostics/SmithyDiagnostics.java Co-authored-by: Miles Ziemer <45497130+milesziemer@users.noreply.github.com> --- .../lsp/diagnostics/SmithyDiagnostics.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/software/amazon/smithy/lsp/diagnostics/SmithyDiagnostics.java b/src/main/java/software/amazon/smithy/lsp/diagnostics/SmithyDiagnostics.java index 5079b351..03c1cf6f 100644 --- a/src/main/java/software/amazon/smithy/lsp/diagnostics/SmithyDiagnostics.java +++ b/src/main/java/software/amazon/smithy/lsp/diagnostics/SmithyDiagnostics.java @@ -208,19 +208,19 @@ default Diagnostic toDiagnostic(ValidationEvent event) { default -> DiagnosticSeverity.Hint; }; var diagnosticRange = getDiagnosticRange(event); + var message = getMessage(event); + return new Diagnostic(diagnosticRange, message, diagnosticSeverity, "Smithy"); + } + + String HINT_PREFIX = System.lineSeparator() + System.lineSeparator() + "Hint: "; - var message = - new StringBuilder(event.getId()) - .append(": ") - .append(event.getMessage()); - - event.getHint().ifPresent(hint -> - message - .append("\n\nHint: ") - .append(hint) - ); + private static String getMessage(ValidationEvent event) { + var hint = event.getHint().orElse(null); + if (hint == null) { + return event.getId() + ": " + event.getMessage(); + } - return new Diagnostic(diagnosticRange, message.toString(), diagnosticSeverity, "Smithy"); + return event.getId() + ": " + event.getMessage() + HINT_PREFIX + hint; } }