Highlight hover code blocks as LSP's own language by default

The elixir LSP does not include a language name on its elixir code blocks.

crates/editor/src/hover_popover.rs

@@ -221,6 +221,7 @@ fn show_hover(
                     project: project.clone(),
                     symbol_range: range,
                     blocks: hover_result.contents,
+                    language: hover_result.language,
                     rendered_content: None,
                 })
             });
@@ -253,6 +254,7 @@ fn render_blocks(
     theme_id: usize,
     blocks: &[HoverBlock],
     language_registry: &Arc<LanguageRegistry>,
+    language: Option<&Arc<Language>>,
     style: &EditorStyle,
 ) -> RenderedInfo {
     let mut text = String::new();
@@ -351,11 +353,13 @@ fn render_blocks(
                             }
                             Tag::CodeBlock(kind) => {
                                 new_paragraph(&mut text, &mut list_stack);
-                                if let CodeBlockKind::Fenced(language) = kind {
+                                current_language = if let CodeBlockKind::Fenced(language) = kind {
-                                    current_language = language_registry
+                                    language_registry
                                         .language_for_name(language.as_ref())
                                         .now_or_never()
-                                        .and_then(Result::ok);
+                                        .and_then(Result::ok)
+                                } else {
+                                    language.cloned()
                                 }
                             }
                             Tag::Emphasis => italic_depth += 1,
@@ -414,10 +418,6 @@ fn render_blocks(
         }
     }
 
-    if !text.is_empty() && !text.ends_with('\n') {
-        text.push('\n');
-    }
-
     RenderedInfo {
         theme_id,
         text,
@@ -524,6 +524,7 @@ pub struct InfoPopover {
     pub project: ModelHandle<Project>,
     pub symbol_range: Range<Anchor>,
     pub blocks: Vec<HoverBlock>,
+    language: Option<Arc<Language>>,
     rendered_content: Option<RenderedInfo>,
 }
 
@@ -559,6 +560,7 @@ impl InfoPopover {
                 style.theme_id,
                 &self.blocks,
                 self.project.read(cx).languages(),
+                self.language.as_ref(),
                 style,
             )
         });
@@ -903,7 +905,7 @@ mod tests {
                         text: "one **two** three".to_string(),
                         kind: HoverBlockKind::Markdown,
                     }],
-                    expected_marked_text: "one «two» three\n".to_string(),
+                    expected_marked_text: "one «two» three".to_string(),
                     expected_styles: vec![HighlightStyle {
                         weight: Some(Weight::BOLD),
                         ..Default::default()
@@ -915,7 +917,7 @@ mod tests {
                         text: "one [two](the-url) three".to_string(),
                         kind: HoverBlockKind::Markdown,
                     }],
-                    expected_marked_text: "one «two» three\n".to_string(),
+                    expected_marked_text: "one «two» three".to_string(),
                     expected_styles: vec![HighlightStyle {
                         underline: Some(Underline {
                             thickness: 1.0.into(),
@@ -934,8 +936,7 @@ mod tests {
                                 - b
                             * two
                                 - [c](the-url)
-                                - d
+                                - d"
-                        "
                         .unindent(),
                         kind: HoverBlockKind::Markdown,
                     }],
@@ -946,8 +947,7 @@ mod tests {
                           - b
                         - two
                           - «c»
-                          - d
+                          - d"
-                    "
                     .unindent(),
                     expected_styles: vec![HighlightStyle {
                         underline: Some(Underline {
@@ -970,8 +970,7 @@ mod tests {
 
                                   nine
                                 * ten
-                            * six
+                            * six"
-                        "
                             .unindent(),
                         kind: HoverBlockKind::Markdown,
                     }],
@@ -982,8 +981,7 @@ mod tests {
 
                             nine
                           - ten
-                        - six
+                        - six"
-                    "
                         .unindent(),
                     expected_styles: vec![HighlightStyle {
                         underline: Some(Underline {
@@ -1001,7 +999,7 @@ mod tests {
                 expected_styles,
             } in &rows[0..]
             {
-                let rendered = render_blocks(0, &blocks, &Default::default(), &style);
+                let rendered = render_blocks(0, &blocks, &Default::default(), None, &style);
 
                 let (expected_text, ranges) = marked_text_ranges(expected_marked_text, false);
                 let expected_highlights = ranges

crates/project/src/lsp_command.rs

@@ -1111,14 +1111,18 @@ impl LspCommand for GetHover {
         cx: AsyncAppContext,
     ) -> Result<Self::Response> {
         Ok(message.and_then(|hover| {
-            let range = hover.range.map(|range| {
+            let (language, range) = cx.read(|cx| {
-                cx.read(|cx| {
                 let buffer = buffer.read(cx);
+                (
+                    buffer.language().cloned(),
+                    hover.range.map(|range| {
                         let token_start =
                             buffer.clip_point_utf16(point_from_lsp(range.start), Bias::Left);
-                    let token_end = buffer.clip_point_utf16(point_from_lsp(range.end), Bias::Left);
+                        let token_end =
+                            buffer.clip_point_utf16(point_from_lsp(range.end), Bias::Left);
                         buffer.anchor_after(token_start)..buffer.anchor_before(token_end)
-                })
+                    }),
+                )
             });
 
             fn hover_blocks_from_marked_string(
@@ -1163,7 +1167,11 @@ impl LspCommand for GetHover {
                 }],
             });
 
-            Some(Hover { contents, range })
+            Some(Hover {
+                contents,
+                range,
+                language,
+            })
         }))
     }
 
@@ -1247,16 +1255,9 @@ impl LspCommand for GetHover {
         self,
         message: proto::GetHoverResponse,
         _: ModelHandle<Project>,
-        _: ModelHandle<Buffer>,
+        buffer: ModelHandle<Buffer>,
-        _: AsyncAppContext,
+        cx: AsyncAppContext,
     ) -> Result<Self::Response> {
-        let range = if let (Some(start), Some(end)) = (message.start, message.end) {
-            language::proto::deserialize_anchor(start)
-                .and_then(|start| language::proto::deserialize_anchor(end).map(|end| start..end))
-        } else {
-            None
-        };
-
         let contents: Vec<_> = message
             .contents
             .into_iter()
@@ -1271,12 +1272,23 @@ impl LspCommand for GetHover {
                 },
             })
             .collect();
+        if contents.is_empty() {
+            return Ok(None);
+        }
 
-        Ok(if contents.is_empty() {
+        let language = buffer.read_with(&cx, |buffer, _| buffer.language().cloned());
-            None
+        let range = if let (Some(start), Some(end)) = (message.start, message.end) {
+            language::proto::deserialize_anchor(start)
+                .and_then(|start| language::proto::deserialize_anchor(end).map(|end| start..end))
         } else {
-            Some(Hover { contents, range })
+            None
-        })
+        };
+
+        Ok(Some(Hover {
+            contents,
+            range,
+            language,
+        }))
     }
 
     fn buffer_id_from_proto(message: &Self::ProtoRequest) -> u64 {

crates/project/src/project.rs

@@ -359,6 +359,7 @@ pub enum HoverBlockKind {
 pub struct Hover {
     pub contents: Vec<HoverBlock>,
     pub range: Option<Range<language::Anchor>>,
+    pub language: Option<Arc<Language>>,
 }
 
 #[derive(Default)]