Send the correction as part of the diagnostic message in LSP

bwilkerson · commit-bot@chromium.org · commit eb057fe49543 · 2019-07-24T16:02:13.000Z
Change-Id: I894c90b7a895d36c3e9bee7623d1301c8c390b69 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109740 Commit-Queue: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Danny Tuppeny <dantup@google.com>
diff --git a/pkg/analysis_server/lib/src/lsp/mapping.dart b/pkg/analysis_server/lib/src/lsp/mapping.dart
@@ -644,12 +644,17 @@ lsp.Diagnostic toDiagnostic(
         .toList();
   }
 
+  String message = error.message;
+  if (error.correctionMessage != null) {
+    message = '$message\n${error.correctionMessage}';
+  }
+
   return new lsp.Diagnostic(
     toRange(result.lineInfo, error.offset, error.length),
     toDiagnosticSeverity(errorSeverity),
     errorCode.name.toLowerCase(),
     languageSourceName,
-    error.message,
+    message,
     relatedInformation,
   );
 }
diff --git a/pkg/analysis_server/test/lsp/diagnostic_test.dart b/pkg/analysis_server/test/lsp/diagnostic_test.dart
@@ -50,6 +50,21 @@ void f() {
     expect(diagnostic.relatedInformation, hasLength(1));
   }
 
+  test_correction() async {
+    newFile(mainFilePath, content: '''
+void f() {
+  x = 0;
+}
+''');
+
+    final diagnosticsUpdate = waitForDiagnostics(mainFileUri);
+    await initialize();
+    final diagnostics = await diagnosticsUpdate;
+    expect(diagnostics, hasLength(1));
+    final diagnostic = diagnostics.first;
+    expect(diagnostic.message, contains('\nTry'));
+  }
+
   test_deletedFile() async {
     newFile(mainFilePath, content: 'String a = 1;');
 
