From 84c2a844dcc0a7be20c7b3d9062fe3e1ce2e186c Mon Sep 17 00:00:00 2001
From: Cristiano Calcagno <ccrisccris@gmail.com>
Date: Mon, 26 Apr 2021 20:20:33 +0200
Subject: [PATCH 1/2] Add test cases for completion of react.component

See https://github.com/rescript-lang/rescript-vscode/issues/152
---
 analysis/tests/src/Complete.res              |  5 ++++-
 analysis/tests/src/expected/Complete.res.txt | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/analysis/tests/src/Complete.res b/analysis/tests/src/Complete.res
index 7b03e4705..a139acce4 100644
--- a/analysis/tests/src/Complete.res
+++ b/analysis/tests/src/Complete.res
@@ -53,5 +53,8 @@ let zzz = 11
 
 //^com let comp = <O.Comp z
 
+//^doc
 
-//^doc
\ No newline at end of file
+//^com @reac
+
+//^com @react.
\ No newline at end of file
diff --git a/analysis/tests/src/expected/Complete.res.txt b/analysis/tests/src/expected/Complete.res.txt
index 796dcb92c..4cdb5b63a 100644
--- a/analysis/tests/src/expected/Complete.res.txt
+++ b/analysis/tests/src/expected/Complete.res.txt
@@ -538,3 +538,21 @@ DocumentSymbol tests/src/Complete.res
 }
 ]
 
+Complete tests/src/Complete.res 56:2
+[{
+    "label": "react.component",
+    "kind": 4,
+    "tags": [],
+    "detail": "",
+    "documentation": null
+  }]
+
+Complete tests/src/Complete.res 58:2
+[{
+    "label": "react.component",
+    "kind": 4,
+    "tags": [],
+    "detail": "",
+    "documentation": null
+  }]
+

From cb1da3089801b69052da00fb7ce534867d75abcf Mon Sep 17 00:00:00 2001
From: Cristiano Calcagno <ccrisccris@gmail.com>
Date: Mon, 26 Apr 2021 20:37:02 +0200
Subject: [PATCH 2/2] Fix autocomplete of @react. as
 @react.component.component.

---
 analysis/src/NewCompletions.ml               | 9 +++++++++
 analysis/tests/src/Complete.res              | 2 +-
 analysis/tests/src/expected/Complete.res.txt | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/analysis/src/NewCompletions.ml b/analysis/src/NewCompletions.ml
index 9fc60cbd5..d42d84a08 100644
--- a/analysis/src/NewCompletions.ml
+++ b/analysis/src/NewCompletions.ml
@@ -602,6 +602,15 @@ let processCompletable ~findItems ~package ~rawOpens
       "variadic";
     ]
     |> List.filter (fun decorator -> Utils.startsWith decorator prefix)
+    |> List.map (fun decorator ->
+           let parts = String.split_on_char '.' prefix in
+           let len = String.length prefix in
+           let dec2 =
+             if List.length parts > 1 then
+               String.sub decorator len (String.length decorator - len)
+             else decorator
+           in
+           dec2)
     |> List.map mkDecorator
   | Clabel (funPath, prefix) ->
     let labels =
diff --git a/analysis/tests/src/Complete.res b/analysis/tests/src/Complete.res
index a139acce4..36cc8989e 100644
--- a/analysis/tests/src/Complete.res
+++ b/analysis/tests/src/Complete.res
@@ -57,4 +57,4 @@ let zzz = 11
 
 //^com @reac
 
-//^com @react.
\ No newline at end of file
+//^com @react.
diff --git a/analysis/tests/src/expected/Complete.res.txt b/analysis/tests/src/expected/Complete.res.txt
index 4cdb5b63a..458da5d31 100644
--- a/analysis/tests/src/expected/Complete.res.txt
+++ b/analysis/tests/src/expected/Complete.res.txt
@@ -549,7 +549,7 @@ Complete tests/src/Complete.res 56:2
 
 Complete tests/src/Complete.res 58:2
 [{
-    "label": "react.component",
+    "label": "component",
     "kind": 4,
     "tags": [],
     "detail": "",