From 9fb24aba78d6aea3d12c3fc12fbc3afd2b3f7afe Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Tue, 31 Jul 2018 20:51:52 -0700
Subject: [PATCH] Complete items which are followed by arguments

---
 src/langserver/macros.rs | 4 ++--
 src/langserver/main.rs   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/langserver/macros.rs b/src/langserver/macros.rs
index f983a795..78e0c820 100644
--- a/src/langserver/macros.rs
+++ b/src/langserver/macros.rs
@@ -102,10 +102,10 @@ macro_rules! if_annotation {
 }
 
 macro_rules! match_annotation {
-    ($a:expr; $($p:pat => $b:block,)*) => {
+    ($a:expr; $($($p:pat)|* => $b:block,)*) => {
         for (_, thing) in $a.clone() {
             match thing {
-                $($p => $b,)*
+                $($($p)|* => $b,)*
                 _ => {}
             }
         }
diff --git a/src/langserver/main.rs b/src/langserver/main.rs
index c4c39504..6c7d2bdf 100644
--- a/src/langserver/main.rs
+++ b/src/langserver/main.rs
@@ -951,6 +951,7 @@ handle_method_call! {
                     _ => {}
                 }
             },
+            Annotation::UnscopedCall(query) |
             Annotation::UnscopedVar(query) => {
                 let (ty, proc_name) = self.find_type_context(&iter);
 
@@ -1003,6 +1004,7 @@ handle_method_call! {
                     next = ty.parent_type();
                 }
             },
+            Annotation::ScopedCall(priors, query) |
             Annotation::ScopedVar(priors, query) => {
                 let mut next = self.find_scoped_type(&iter, priors);
                 skip.clear();