From 2b60d80eaf1f5bf6f0d5860565f46b4dd4ae448e Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Tue, 21 Dec 2021 15:04:19 +0100
Subject: [PATCH] Simplify const rendering, remove constructor structs

---
 crates/ide_completion/src/render/const_.rs | 53 +++++++---------------
 1 file changed, 16 insertions(+), 37 deletions(-)

diff --git a/crates/ide_completion/src/render/const_.rs b/crates/ide_completion/src/render/const_.rs
index c40490ac0b..65c9d1d63e 100644
--- a/crates/ide_completion/src/render/const_.rs
+++ b/crates/ide_completion/src/render/const_.rs
@@ -2,53 +2,32 @@
 
 use hir::{AsAssocItem, HasSource};
 use ide_db::SymbolKind;
-use syntax::{ast::Const, display::const_label};
+use syntax::display::const_label;
 
 use crate::{item::CompletionItem, render::RenderContext};
 
 pub(crate) fn render_const(ctx: RenderContext<'_>, const_: hir::Const) -> Option<CompletionItem> {
     let _p = profile::span("render_const");
-    ConstRender::new(ctx, const_)?.render()
+    render(ctx, const_)
 }
 
-#[derive(Debug)]
-struct ConstRender<'a> {
-    ctx: RenderContext<'a>,
-    const_: hir::Const,
-    ast_node: Const,
-}
+fn render(ctx: RenderContext<'_>, const_: hir::Const) -> Option<CompletionItem> {
+    let db = ctx.db();
+    let name = const_.name(db)?.to_smol_str();
+    // FIXME: This is parsing files!
+    let detail = const_label(&const_.source(db)?.value);
 
-impl<'a> ConstRender<'a> {
-    fn new(ctx: RenderContext<'a>, const_: hir::Const) -> Option<ConstRender<'a>> {
-        let ast_node = const_.source(ctx.db())?.value;
-        Some(ConstRender { ctx, const_, ast_node })
-    }
+    let mut item = CompletionItem::new(SymbolKind::Const, ctx.source_range(), name.clone());
+    item.set_documentation(ctx.docs(const_))
+        .set_deprecated(ctx.is_deprecated(const_) || ctx.is_deprecated_assoc_item(const_))
+        .detail(detail);
 
-    fn render(self) -> Option<CompletionItem> {
-        let name = self.const_.name(self.ctx.db())?.to_smol_str();
-        let detail = self.detail();
-
-        let mut item =
-            CompletionItem::new(SymbolKind::Const, self.ctx.source_range(), name.clone());
-        item.set_documentation(self.ctx.docs(self.const_))
-            .set_deprecated(
-                self.ctx.is_deprecated(self.const_)
-                    || self.ctx.is_deprecated_assoc_item(self.const_),
-            )
-            .detail(detail);
-
-        let db = self.ctx.db();
-        if let Some(actm) = self.const_.as_assoc_item(db) {
-            if let Some(trt) = actm.containing_trait_or_trait_impl(db) {
-                item.trait_name(trt.name(db).to_smol_str());
-                item.insert_text(name);
-            }
+    if let Some(actm) = const_.as_assoc_item(db) {
+        if let Some(trt) = actm.containing_trait_or_trait_impl(db) {
+            item.trait_name(trt.name(db).to_smol_str());
+            item.insert_text(name);
         }
-
-        Some(item.build())
     }
 
-    fn detail(&self) -> String {
-        const_label(&self.ast_node)
-    }
+    Some(item.build())
 }