From 4b6b55cc78315288cab5166bcc747fba5258e441 Mon Sep 17 00:00:00 2001
From: wojciechkepka <wojtek.kepka@protonmail.com>
Date: Sun, 20 Jun 2021 06:13:44 +0200
Subject: [PATCH 1/3] Make completion window move to top when cursor is below
 half

---
 helix-term/src/ui/completion.rs | 13 +++++++++++--
 helix-term/src/ui/markdown.rs   |  1 -
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 88a715340fd5..f4d882de4034 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -238,6 +238,9 @@ impl Component for Completion {
                 .language()
                 .and_then(|scope| scope.strip_prefix("source."))
                 .unwrap_or("");
+            let cursor_pos = doc.selection(view.id).cursor();
+            let cursor_pos =
+                helix_core::coords_at_pos(doc.text().slice(..), cursor_pos).row - view.first_line;
 
             let doc = match &option.documentation {
                 Some(lsp::Documentation::String(contents))
@@ -289,8 +292,14 @@ impl Component for Completion {
 
             let half = area.height / 2;
             let height = 15.min(half);
-            // -2 to subtract command line + statusline. a bit of a hack, because of splits.
-            let area = Rect::new(0, area.height - height - 2, area.width, height);
+            let y = if cursor_pos > half as usize {
+                0
+            } else {
+                // -2 to subtract command line + statusline. a bit of a hack, because of splits.
+                area.height.saturating_sub(height).saturating_sub(2)
+            };
+
+            let area = Rect::new(0, y, area.width, height);
 
             // clear area
             let background = cx.editor.theme.get("ui.popup");
diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index 91086f7b14f1..75e2f4b4c351 100644
--- a/helix-term/src/ui/markdown.rs
+++ b/helix-term/src/ui/markdown.rs
@@ -162,7 +162,6 @@ fn parse<'a>(
                 }
             }
             Event::Code(text) | Event::Html(text) => {
-                log::warn!("code {:?}", text);
                 let mut span = to_span(text);
                 span.style = code_style;
                 spans.push(span);

From 781adde5119f8540539ac51fbd3f0d79be2d5e44 Mon Sep 17 00:00:00 2001
From: wojciechkepka <wojtek.kepka@protonmail.com>
Date: Sun, 20 Jun 2021 07:15:08 +0200
Subject: [PATCH 2/3] Use full screen size

---
 helix-term/src/ui/completion.rs | 8 +++++---
 helix-view/src/tree.rs          | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index f4d882de4034..256d8f7d4dde 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -239,8 +239,8 @@ impl Component for Completion {
                 .and_then(|scope| scope.strip_prefix("source."))
                 .unwrap_or("");
             let cursor_pos = doc.selection(view.id).cursor();
-            let cursor_pos =
-                helix_core::coords_at_pos(doc.text().slice(..), cursor_pos).row - view.first_line;
+            let cursor_pos = (helix_core::coords_at_pos(doc.text().slice(..), cursor_pos).row
+                - view.first_line) as u16;
 
             let doc = match &option.documentation {
                 Some(lsp::Documentation::String(contents))
@@ -292,7 +292,9 @@ impl Component for Completion {
 
             let half = area.height / 2;
             let height = 15.min(half);
-            let y = if cursor_pos > half as usize {
+            let y = if cursor_pos + view.area.y
+                >= (cx.editor.tree.area().height - height - 1/* statusline */)
+            {
                 0
             } else {
                 // -2 to subtract command line + statusline. a bit of a hack, because of splits.
diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs
index a0c466d90f43..f7d6c1f2457c 100644
--- a/helix-view/src/tree.rs
+++ b/helix-view/src/tree.rs
@@ -434,6 +434,10 @@ impl Tree {
             self.focus = key;
         }
     }
+
+    pub fn area(&self) -> Rect {
+        self.area
+    }
 }
 
 #[derive(Debug)]

From 37147c02c663416110e4c14d54381761f9ffa973 Mon Sep 17 00:00:00 2001
From: wojciechkepka <wojtek.kepka@protonmail.com>
Date: Sun, 20 Jun 2021 12:35:12 +0200
Subject: [PATCH 3/3] Add comment, statusline + commandline = 2

---
 helix-term/src/ui/completion.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 256d8f7d4dde..80f7d590203e 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -292,8 +292,9 @@ impl Component for Completion {
 
             let half = area.height / 2;
             let height = 15.min(half);
+            // we want to make sure the cursor is visible (not hidden behind the documentation)
             let y = if cursor_pos + view.area.y
-                >= (cx.editor.tree.area().height - height - 1/* statusline */)
+                >= (cx.editor.tree.area().height - height - 2/* statusline + commandline */)
             {
                 0
             } else {