[analysis_server] Combine the containing class + library into a single line in LSP hovers

Change-Id: I21a285eddcf855cf0ebfd59e6d6178ee6bfa1c59
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433481
Auto-Submit: Danny Tuppeny <[email protected]>
Commit-Queue: Kallen Tu <[email protected]>
Reviewed-by: Kallen Tu <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: DanTup

pkg/analysis_server/lib/src/lsp/handlers/handler_hover.dart

@@ -87,19 +87,23 @@ class HoverHandler
         ..writeln();
     }
 
-    var containingClassDescription = hover.containingClassDescription;
-    if (containingClassDescription != null &&
-        containingClassDescription.isNotEmpty) {
-      content
-        ..writeln('Declared in: `$containingClassDescription`')
-        ..writeln();
+    var declaredInDescription = StringBuffer();
+    if (hover.containingClassDescription?.isNotEmpty ?? false) {
+      declaredInDescription
+        ..write(' in `')
+        ..write(hover.containingClassDescription)
+        ..write('`');
+    }
+    if (hover.containingLibraryName?.isNotEmpty ?? false) {
+      declaredInDescription
+        ..write(' in _')
+        ..write(hover.containingLibraryName)
+        ..write('_');
     }
 
-    // Source library.
-    var containingLibraryName = hover.containingLibraryName;
-    if (containingLibraryName != null && containingLibraryName.isNotEmpty) {
+    if (declaredInDescription.isNotEmpty) {
       content
-        ..writeln('*$containingLibraryName*')
+        ..writeln('Declared$declaredInDescription.')
         ..writeln();
     }
 

pkg/analysis_server/test/integration/lsp/handle_test.dart

@@ -94,7 +94,7 @@ class [!A^aa!] {}
 ```dart
 class Aaa
 ```
-*package:test/main.dart*
+Declared in _package:test/main.dart_.
 
 ---
 This is my class.
@@ -116,7 +116,7 @@ class [!A^aa!] {}
 ```dart
 class Aaa
 ```
-*package:test/main.dart*
+Declared in _package:test/main.dart_.
 
 ---
 This is my class.''';