Fix case when one content is multi-line.

Author: Junfeng Li

src/languageclient.rs

@@ -568,10 +568,8 @@ pub trait ILanguageClient: IVim {
  if self.get(|state| Ok(state.is_nvim))? {
  let bufnr: u64 = serde_json::from_value(self.call(None, "bufnr", bufname)?)?;
  self.notify(None, "nvim_buf_set_lines", json!([bufnr, 0, -1, 0, lines]))?;
- } else {
- if self.call(None, "setbufline", json!([bufname, 1, lines]))? != 0 {
- bail!("Failed to set preview buffer content!");
- }
+ } else if self.call(None, "setbufline", json!([bufname, 1, lines]))? != 0 {
+ bail!("Failed to set preview buffer content!");
  // TODO: removing existing bottom lines.
  }
 
@@ -705,7 +703,7 @@ pub trait ILanguageClient: IVim {
 
  let hover: Option<Hover> = serde_json::from_value(result.clone())?;
  if let Some(hover) = hover {
- if hover.len() <= 1 {
+ if hover.lines_len() <= 1 {
  self.echo(hover.to_string())?;
  } else {
  self.preview(&hover.to_display())?;

src/types.rs

@@ -465,12 +465,17 @@ impl ToString for lsp::MarkedString {
  fn to_string(&self) -> String {
  match *self {
  MarkedString::String(ref s) => s.clone(),
- // TODO: display language content properly.
  MarkedString::LanguageString(ref ls) => ls.value.clone(),
  }
  }
 }
 
+impl ToString for lsp::MarkupContent {
+ fn to_string(&self) -> String {
+ self.value.clone()
+ }
+}
+
 impl ToString for Hover {
  fn to_string(&self) -> String {
  match self.contents {
@@ -484,23 +489,47 @@ impl ToString for Hover {
  }
 }
 
+impl ToString for lsp::Documentation {
+ fn to_string(&self) -> String {
+ match *self {
+ lsp::Documentation::String(ref s) => s.to_owned(),
+ lsp::Documentation::MarkupContent(ref mc) => mc.to_string(),
+ }
+ }
+}
+
+impl ToString for NumberOrString {
+ fn to_string(&self) -> String {
+ match *self {
+ NumberOrString::Number(n) => format!("{}", n),
+ NumberOrString::String(ref s) => s.clone(),
+ }
+ }
+}
+
 pub trait ToDisplay {
  fn to_display(&self) -> Vec<String>;
 }
 
 impl ToDisplay for lsp::MarkedString {
  fn to_display(&self) -> Vec<String> {
  match *self {
- MarkedString::String(ref s) => vec![s.clone()],
+ MarkedString::String(ref s) => s.split('\n').map(|i| i.to_string()).collect(),
  MarkedString::LanguageString(ref ls) => vec![
  format!("```{}", ls.language),
- ls.value.clone(),
+ ls.value.split('\n').map(|i| i.to_string()).collect(),
  "```".to_string(),
  ],
  }
  }
 }
 
+impl ToDisplay for MarkupContent {
+ fn to_display(&self) -> Vec<String> {
+ self.value.split('\n').map(|i| i.to_string()).collect()
+ }
+}
+
 impl ToDisplay for Hover {
  fn to_display(&self) -> Vec<String> {
  match self.contents {
@@ -511,39 +540,31 @@ impl ToDisplay for Hover {
  }
 }
 
-pub trait Len {
- fn len(&self) -> usize;
+pub trait LinesLen {
+ fn lines_len(&self) -> usize;
 }
 
-impl Len for Hover {
- fn len(&self) -> usize {
- match self.contents {
- HoverContents::Scalar(_) | HoverContents::Markup(_) => 1,
- HoverContents::Array(ref arr) => arr.len(),
+impl LinesLen for lsp::MarkedString {
+ fn lines_len(&self) -> usize {
+ match *self {
+ MarkedString::String(ref s) => s.split('\n').count(),
+ MarkedString::LanguageString(ref ls) => ls.value.split('\n').count(),
  }
  }
 }
 
-impl ToString for lsp::MarkupContent {
- fn to_string(&self) -> String {
- self.value.clone()
- }
-}
-
-impl ToString for lsp::Documentation {
- fn to_string(&self) -> String {
- match *self {
- lsp::Documentation::String(ref s) => s.to_owned(),
- lsp::Documentation::MarkupContent(ref mc) => mc.to_string(),
- }
+impl LinesLen for MarkupContent {
+ fn lines_len(&self) -> usize {
+ self.value.split('\n').count()
  }
 }
 
-impl ToString for NumberOrString {
- fn to_string(&self) -> String {
- match *self {
- NumberOrString::Number(n) => format!("{}", n),
- NumberOrString::String(ref s) => s.clone(),
+impl LinesLen for Hover {
+ fn lines_len(&self) -> usize {
+ match self.contents {
+ HoverContents::Scalar(ref c) => c.lines_len(),
+ HoverContents::Array(ref arr) => arr.iter().map(|i| i.lines_len()).sum(),
+ HoverContents::Markup(ref c) => c.lines_len(),
  }
  }
 }