bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir/src/display.rs')
-rw-r--r--crates/hir/src/display.rs150
1 files changed, 95 insertions, 55 deletions
diff --git a/crates/hir/src/display.rs b/crates/hir/src/display.rs
index 84f03d111f..c276e87786 100644
--- a/crates/hir/src/display.rs
+++ b/crates/hir/src/display.rs
@@ -188,28 +188,7 @@ impl HirDisplay for Struct {
StructKind::Record => {
let has_where_clause = write_where_clause(def_id, f)?;
if let Some(limit) = f.entity_limit {
- let fields = self.fields(f.db);
- let count = fields.len().min(limit);
- f.write_char(if !has_where_clause { ' ' } else { '\n' })?;
- if count == 0 {
- if fields.is_empty() {
- f.write_str("{}")?;
- } else {
- f.write_str("{ /* … */ }")?;
- }
- } else {
- f.write_str(" {\n")?;
- for field in &fields[..count] {
- f.write_str(" ")?;
- field.hir_fmt(f)?;
- f.write_str(",\n")?;
- }
-
- if fields.len() > count {
- f.write_str(" /* … */\n")?;
- }
- f.write_str("}")?;
- }
+ display_fields(&self.fields(f.db), has_where_clause, limit, false, f)?;
}
}
StructKind::Unit => _ = write_where_clause(def_id, f)?,
@@ -226,18 +205,10 @@ impl HirDisplay for Enum {
write!(f, "{}", self.name(f.db).display(f.db.upcast()))?;
let def_id = GenericDefId::AdtId(AdtId::EnumId(self.id));
write_generic_params(def_id, f)?;
- let has_where_clause = write_where_clause(def_id, f)?;
- let variants = self.variants(f.db);
- if !variants.is_empty() {
- f.write_char(if !has_where_clause { ' ' } else { '\n' })?;
- f.write_str("{\n")?;
- for variant in variants {
- f.write_str(" ")?;
- variant.hir_fmt(f)?;
- f.write_str(",\n")?;
- }
- f.write_str("}")?;
+ let has_where_clause = write_where_clause(def_id, f)?;
+ if let Some(limit) = f.entity_limit {
+ display_variants(&self.variants(f.db), has_where_clause, limit, f)?;
}
Ok(())
@@ -251,22 +222,102 @@ impl HirDisplay for Union {
write!(f, "{}", self.name(f.db).display(f.db.upcast()))?;
let def_id = GenericDefId::AdtId(AdtId::UnionId(self.id));
write_generic_params(def_id, f)?;
+
let has_where_clause = write_where_clause(def_id, f)?;
+ if let Some(limit) = f.entity_limit {
+ display_fields(&self.fields(f.db), has_where_clause, limit, false, f)?;
+ }
+ Ok(())
+ }
+}
+
+fn display_fields(
+ fields: &[Field],
+ has_where_clause: bool,
+ limit: usize,
+ in_line: bool,
+ f: &mut HirFormatter<'_>,
+) -> Result<(), HirDisplayError> {
+ let count = fields.len().min(limit);
+ let (indent, separator) = if in_line { ("", ' ') } else { (" ", '\n') };
+ f.write_char(if !has_where_clause { ' ' } else { separator })?;
+ if count == 0 {
+ if fields.is_empty() {
+ f.write_str("{}")?;
+ } else {
+ f.write_str("{ /* … */ }")?;
+ }
+ } else {
+ f.write_char('{')?;
- let fields = self.fields(f.db);
if !fields.is_empty() {
- f.write_char(if !has_where_clause { ' ' } else { '\n' })?;
- f.write_str("{\n")?;
- for field in self.fields(f.db) {
- f.write_str(" ")?;
+ f.write_char(separator)?;
+ for field in &fields[..count] {
+ f.write_str(indent)?;
field.hir_fmt(f)?;
- f.write_str(",\n")?;
+ f.write_char(',')?;
+ f.write_char(separator)?;
+ }
+
+ if fields.len() > count {
+ f.write_str(indent)?;
+ f.write_str("/* … */")?;
+ f.write_char(separator)?;
}
- f.write_str("}")?;
}
- Ok(())
+ f.write_str("}")?;
+ }
+
+ Ok(())
+}
+
+fn display_variants(
+ variants: &[Variant],
+ has_where_clause: bool,
+ limit: usize,
+ f: &mut HirFormatter<'_>,
+) -> Result<(), HirDisplayError> {
+ let count = variants.len().min(limit);
+ f.write_char(if !has_where_clause { ' ' } else { '\n' })?;
+ if count == 0 {
+ if variants.is_empty() {
+ f.write_str("{}")?;
+ } else {
+ f.write_str("{ /* … */ }")?;
+ }
+ } else {
+ f.write_str("{\n")?;
+ for variant in &variants[..count] {
+ f.write_str(" ")?;
+ write!(f, "{}", variant.name(f.db).display(f.db.upcast()))?;
+ match variant.kind(f.db) {
+ StructKind::Tuple => {
+ if variant.fields(f.db).is_empty() {
+ f.write_str("()")?;
+ } else {
+ f.write_str("( /* … */ )")?;
+ }
+ }
+ StructKind::Record => {
+ if variant.fields(f.db).is_empty() {
+ f.write_str(" {}")?;
+ } else {
+ f.write_str(" { /* … */ }")?;
+ }
+ }
+ StructKind::Unit => {}
+ }
+ f.write_str(",\n")?;
+ }
+
+ if variants.len() > count {
+ f.write_str(" /* … */\n")?;
+ }
+ f.write_str("}")?;
}
+
+ Ok(())
}
impl HirDisplay for Field {
@@ -304,21 +355,10 @@ impl HirDisplay for Variant {
}
f.write_char(')')?;
}
- VariantData::Record(fields) => {
- f.write_str(" {")?;
- let mut first = true;
- for (_, field) in fields.iter() {
- if first {
- first = false;
- f.write_char(' ')?;
- } else {
- f.write_str(", ")?;
- }
- // Enum variant fields must be pub.
- write!(f, "{}: ", field.name.display(f.db.upcast()))?;
- field.type_ref.hir_fmt(f)?;
+ VariantData::Record(_) => {
+ if let Some(limit) = f.entity_limit {
+ display_fields(&self.fields(f.db), false, limit, true, f)?;
}
- f.write_str(" }")?;
}
}
Ok(())