Merge pull request #977 from Gama11/UsageCompletion

Implement usage completion, closes #701

Author: elsassph

External/Plugins/HaXeContext/Completion/HaxeComplete.cs

@@ -41,7 +41,7 @@ internal class HaxeComplete
         public HaxeCompleteStatus Status;
         public string Errors;
         private HaxeCompleteResult result;
-        private HaxePositionCompleteResult positionResult;
+        private List<HaxePositionResult> positionResults;
 
         readonly IHaxeCompletionHandler handler;
         readonly string FileName;
@@ -62,23 +62,27 @@ public HaxeComplete(ScintillaControl sci, ASExpr expr, bool autoHide, IHaxeCompl
 
         public void GetList(HaxeCompleteResultHandler<HaxeCompleteResult> callback)
         {
-            PluginBase.MainForm.CallCommand("Save", null);
+            StartThread(callback, () => result);
+        }
 
-            ThreadPool.QueueUserWorkItem(_ =>
-            {
-                Status = ParseLines(handler.GetCompletion(BuildHxmlArgs()));
-                Notify(callback, result);
-            });
+        public void GetPosition(HaxeCompleteResultHandler<HaxePositionResult> callback)
+        {
+            StartThread(callback, () => positionResults.Count > 0 ? positionResults[0] : null);
         }
 
-        public void GetPosition(HaxeCompleteResultHandler<HaxePositionCompleteResult> callback)
+        public void GetUsages(HaxeCompleteResultHandler<List<HaxePositionResult>> callback)
+        {
+            StartThread(callback, () => positionResults);
+        }
+
+        private void StartThread<T>(HaxeCompleteResultHandler<T> callback, Func<T> resultFunc)
         {
             PluginBase.MainForm.CallCommand("Save", null);
 
             ThreadPool.QueueUserWorkItem(_ =>
             {
                 Status = ParseLines(handler.GetCompletion(BuildHxmlArgs()));
-                Notify(callback, positionResult);
+                Notify(callback, resultFunc());
             });
         }
 
@@ -113,8 +117,7 @@ string[] BuildHxmlArgs()
             QuotePath(hxmlArgs);
             EscapeMacros(hxmlArgs);
 
-            String mode = (CompilerService == HaxeCompilerService.COMPLETION) ? "" : "@position";
-            hxmlArgs.Insert(0, String.Format("--display \"{0}\"@{1}{2}", FileName, pos, mode));
+            hxmlArgs.Insert(0, String.Format("--display \"{0}\"@{1}{2}", FileName, pos, GetMode()));
             hxmlArgs.Insert(1, "-D use_rtti_doc");
             hxmlArgs.Insert(2, "-D display-details");
 
@@ -123,6 +126,20 @@ string[] BuildHxmlArgs()
             return hxmlArgs.ToArray();
         }
 
+        private string GetMode()
+        {
+            switch (CompilerService)
+            {
+                case HaxeCompilerService.POSITION:
+                    return "@position";
+
+                case HaxeCompilerService.USAGE:
+                    return "@usage";
+            }
+
+            return "";
+        }
+
         private void RemoveComments(List<string> hxmlArgs)
         {
             for (int i = 0; i < hxmlArgs.Count; i++)
@@ -189,6 +206,7 @@ int GetDisplayPosition()
                     break;
 
                 case HaxeCompilerService.POSITION:
+                case HaxeCompilerService.USAGE:
                     pos = Sci.WordEndPosition(Sci.CurrentPos, true) + 1;
                     break;
             }
@@ -258,6 +276,7 @@ HaxeCompleteStatus ProcessList(XmlTextReader reader)
         {
             result = new HaxeCompleteResult();
             result.Members = new MemberList();
+            positionResults = new List<HaxePositionResult>();
             MemberModel member = null;
 
             while (reader.Read())
@@ -267,8 +286,20 @@ HaxeCompleteStatus ProcessList(XmlTextReader reader)
                     switch (reader.Name)
                     {
                         case "list":
-                            result.Members.Sort();
-                            return HaxeCompleteStatus.MEMBERS;
+                            switch (CompilerService)
+                            {
+                                case HaxeCompilerService.COMPLETION:
+                                    result.Members.Sort();
+                                    return HaxeCompleteStatus.MEMBERS;
+
+                                case HaxeCompilerService.POSITION:
+                                    return HaxeCompleteStatus.POSITION;
+
+                                case HaxeCompilerService.USAGE:
+                                    return HaxeCompleteStatus.USAGE;
+                            }
+                            break;
+
                         case "i":
                             member = null;
                             break;
@@ -297,18 +328,18 @@ HaxeCompleteStatus ProcessList(XmlTextReader reader)
                         break;
 
                     case "pos":
-                        positionResult = ExtractPos(reader);
-                        return HaxeCompleteStatus.POSITION;
+                        positionResults.Add(ExtractPos(reader));
+                        break;
                 }
             }
 
             result.Members.Sort();
             return HaxeCompleteStatus.MEMBERS;
         }
 
-        HaxePositionCompleteResult ExtractPos(XmlTextReader reader)
+        HaxePositionResult ExtractPos(XmlTextReader reader)
         {
-            var result = new HaxePositionCompleteResult();
+            var result = new HaxePositionResult();
 
             string value = ReadValue(reader);
             Match match = rePosition.Match(value);
@@ -414,13 +445,15 @@ enum HaxeCompleteStatus: int
         ERROR = 2,
         TYPE = 3,
         MEMBERS = 4,
-        POSITION = 5
+        POSITION = 5,
+        USAGE = 6
     }
 
     enum HaxeCompilerService
     {
         COMPLETION,
-        POSITION
+        POSITION,
+        USAGE
     }
 
     class HaxeCompleteResult
@@ -429,7 +462,7 @@ class HaxeCompleteResult
         public MemberList Members;
     }
 
-    class HaxePositionCompleteResult
+    class HaxePositionResult
     {
         public string Path;
         public HaxePositionCompleteRangeType RangeType;

External/Plugins/HaXeContext/Context.cs

@@ -1408,23 +1408,23 @@ public override bool HandleGotoDeclaration(ScintillaControl sci, ASExpr expressi
                 return false;
 
             var hc = new HaxeComplete(sci, expression, false, completionModeHandler, HaxeCompilerService.POSITION);
-            hc.GetPosition(OnPositionCompletionResult);
+            hc.GetPosition(OnPositionResult);
             return true;
         }
 
-        internal void OnPositionCompletionResult(HaxeComplete hc, HaxePositionCompleteResult result, HaxeCompleteStatus status)
+        internal void OnPositionResult(HaxeComplete hc, HaxePositionResult result, HaxeCompleteStatus status)
         {
             if (hc.Sci.InvokeRequired)
             {
                 hc.Sci.BeginInvoke((MethodInvoker)delegate
                 {
-                    HandlePositionCompletionResult(hc, result, status); 
+                    HandlePositionResult(hc, result, status); 
                 });
             }
-            else HandlePositionCompletionResult(hc, result, status); 
+            else HandlePositionResult(hc, result, status); 
         }
 
-        private void HandlePositionCompletionResult(HaxeComplete hc, HaxePositionCompleteResult result, HaxeCompleteStatus status)
+        private void HandlePositionResult(HaxeComplete hc, HaxePositionResult result, HaxeCompleteStatus status)
         {
             switch (status)
             {
@@ -1433,6 +1433,8 @@ private void HandlePositionCompletionResult(HaxeComplete hc, HaxePositionComplet
                     break;
 
                 case HaxeCompleteStatus.POSITION:
+                    if (result == null) return;
+
                     ASComplete.SaveLastLookupPosition(hc.Sci);
 
                     PluginBase.MainForm.OpenEditableDocument(result.Path, false);