Merge branch 'release/tip'

Author: Slava Buynov

PostfixCodeCompletion.Tests/Completion/PostfixGeneratorTests.cs

@@ -206,27 +206,31 @@ public IEnumerable<TestCaseData> Foreach
                         yield return
                             GetTestCaseFromArray("foreach")
                                 .Returns(ReadCode("AfterGenerateForeach_fromArray"))
-                                .SetName("foreach from array.|");
+                                .SetName("array.foreach|");
                         yield return
                             GetTestCaseFromArrayInitializer("foreach")
                                 .Returns(ReadCode("AfterGenerateForeach_fromArrayInitializer"))
-                                .SetName("foreach from [].|");
+                                .SetName("[].foreach|");
                         yield return
                             GetTestCaseFromObject("foreach")
                                 .Returns(ReadCode("AfterGenerateForeach_fromObject"))
-                                .SetName("foreach from object.|");
+                                .SetName("object.foreach|");
                         yield return
                             GetTestCaseFromObjectInitializer("foreach")
                                 .Returns(ReadCode("AfterGenerateForeach_fromObjectInitializer"))
-                                .SetName("foreach from {}.|");
+                                .SetName("{}.foreach|");
                         yield return
                             GetTestCaseFromDictionary("foreach")
                                 .Returns(ReadCode("AfterGenerateForeach_fromDictionary"))
-                                .SetName("foreach from dictionary.|");
+                                .SetName("dictionary.foreach|");
                         yield return
                             GetTestCaseFromVector("foreach")
                                 .Returns(ReadCode("AfterGenerateForeach_fromVector"))
-                                .SetName("foreach from vector.|");
+                                .SetName("vector.foreach|");
+                        yield return
+                            GetTestCaseFromString("foreach")
+                                .Returns(ReadCode("AfterGenerateString.foreach"))
+                                .SetName("'string'.foreach|");
                     }
                 }
 

PostfixCodeCompletion.Tests/PostfixCodeCompletion.Tests.csproj

@@ -50,7 +50,7 @@
   <ItemGroup>
     <Reference Include="NSubstitute, Version=2.0.3.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.2.0.3\lib\net40\NSubstitute.dll</HintPath>
-	  <Private>True</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
@@ -87,7 +87,6 @@
     <EmbeddedResource Include="Test Snippets\as3\postfixgenerators\var.fds" />
     <EmbeddedResource Include="Test Snippets\as3\postfixgenerators\while.fds" />
     <EmbeddedResource Include="Test Snippets\as3\postfixgenerators\trace.fds" />
-    <EmbeddedResource Include="Test Snippets\haxe\postfixgenerators\code.fds" />
     <EmbeddedResource Include="Test Snippets\haxe\postfixgenerators\dowhile.fds" />
     <EmbeddedResource Include="Test Snippets\haxe\postfixgenerators\else.fds" />
     <EmbeddedResource Include="Test Snippets\haxe\postfixgenerators\for.fds" />
@@ -173,13 +172,14 @@
     <EmbeddedResource Include="Test Files\generated\as3\AfterGenerateFor_fromVectorInitializer.as" />
     <EmbeddedResource Include="Test Files\generated\as3\AfterGenerateString.for.as" />
     <EmbeddedResource Include="Test Files\generated\as3\AfterGenerateString.forr.as" />
+    <EmbeddedResource Include="Test Files\generated\as3\AfterGenerateString.foreach.as" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\PluginCore\PluginCore.csproj">
       <Project>{61885F70-B4DC-4B44-852D-5D6D03F2A734}</Project>
       <Name>PluginCore</Name>
-	  <Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Tests\External\Plugins\ASCompletion.Tests\ASCompletion.Tests.csproj">
       <Project>{ABC71D26-295C-4C6C-B6DE-320AD49EEF79}</Project>
@@ -188,7 +188,7 @@
     <ProjectReference Include="..\..\ASCompletion\ASCompletion.csproj">
       <Project>{4EBF2653-9654-4E40-880E-0046B3D6210E}</Project>
       <Name>ASCompletion</Name>
-	  <Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\PostfixCodeCompletion\PostfixCodeCompletion.csproj">
       <Project>{e511b03b-81fd-4c39-b587-211f2a1603a1}</Project>

PostfixCodeCompletion.Tests/Test Files/generated/as3/AfterGenerateString.foreach.as

@@ -0,0 +1,10 @@
+package {
+	public class Main {
+		public function Main() {
+			for (var i:int = 0; i < "".length; i++) {
+				var char:String = "".charAt(i);
+				
+			}
+		}
+	}
+}

PostfixCodeCompletion.Tests/Test Snippets/as3/postfixgenerators/foreach.fds

@@ -1,3 +1,8 @@
 for each (var item:$(CollectionItemType) in $(PCCCollection|PCCHash)) $(CSLB){
 	$(EntryPoint)
+}
+#pcc:PCCString
+for (var $(ItmUniqueVar):int = 0; $(ItmUniqueVar) < $(PCCString).length; $(ItmUniqueVar)++) $(CSLB){
+	var char:String = $(PCCString).charAt($(ItmUniqueVar));
+	$(EntryPoint)
 }

PostfixCodeCompletion.Tests/Test Snippets/haxe/postfixgenerators/code.fds

@@ -1,3 +1,8 @@
 for (it in $(PCCCollection|PCCHash)) $(CSLB){
 	$(EntryPoint)
 }
+#pcc:PCCString
+for ($(ItmUniqueVar) in 0...$(PCCString).length) $(CSLB){
+	var char = $(PCCString).charAt($(EntryPoint));
+	$(EntryPoint)
+}

PostfixCodeCompletion.Tests/Test Snippets/haxe/postfixgenerators/foreach.fds

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -54,11 +53,11 @@ internal static void Stop()
 
         internal static bool OnCharAdded(int value) => current?.OnCharAdded(value) ?? false;
 
-        internal static void UpdateCompletionList() => current?.UpdateCompletionList();
+        internal static void UpdateCompletionList(IList<ICompletionListItem> options) => current?.UpdateCompletionList(options);
 
-        internal static void UpdateCompletionList(ASResult expr) => current?.UpdateCompletionList(expr);
+        internal static void UpdateCompletionList(ASResult expr, IList<ICompletionListItem> options) => current?.UpdateCompletionList(expr, options);
 
-        internal static void UpdateCompletionList(MemberModel target, ASResult expr) => current?.UpdateCompletionList(target, expr);
+        internal static void UpdateCompletionList(MemberModel target, ASResult expr, IList<ICompletionListItem> options) => current?.UpdateCompletionList(target, expr, options);
     }
 
     public interface IPCCComplete
@@ -67,9 +66,9 @@ public interface IPCCComplete
         void Stop();
         bool OnShortcut(Keys keys);
         bool OnCharAdded(int value);
-        void UpdateCompletionList();
-        bool UpdateCompletionList(ASResult expr);
-        void UpdateCompletionList(MemberModel target, ASResult expr);
+        void UpdateCompletionList(IList<ICompletionListItem> options);
+        bool UpdateCompletionList(ASResult expr, IList<ICompletionListItem> options);
+        void UpdateCompletionList(MemberModel target, ASResult expr, IList<ICompletionListItem> options);
     }
 
     public class PCCComplete : IPCCComplete
@@ -86,122 +85,89 @@ public virtual void Stop()
 
         public virtual bool OnCharAdded(int value) => false;
 
-        public virtual void UpdateCompletionList() => UpdateCompletionList(CompleteHelper.GetCurrentExpressionType());
+        public virtual void UpdateCompletionList(IList<ICompletionListItem> options) => UpdateCompletionList(CompleteHelper.GetCurrentExpressionType(), options);
 
-        public virtual bool UpdateCompletionList(ASResult expr) => false;
+        public virtual bool UpdateCompletionList(ASResult expr, IList<ICompletionListItem> options) => false;
 
-        public virtual void UpdateCompletionList(MemberModel target, ASResult expr)
+        public virtual void UpdateCompletionList(MemberModel target, ASResult expr, IList<ICompletionListItem> options)
         {
         }
     }
 
-    public class PCCASComplete : PCCComplete
+    public class PCCASComplete : PCCComplete, IEventHandler
     {
-        static int completionListItemCount;
+        public override void Start() => EventManager.AddEventHandler(this, EventType.Command);
 
-        public override void Start()
-        {
-            var completionList = Reflector.CompletionList.CompletionList;
-            completionList.VisibleChanged -= OnCompletionListVisibleChanged;
-            completionList.VisibleChanged += OnCompletionListVisibleChanged;
-        }
-
-        public override void Stop()
-        {
-            var completionList = Reflector.CompletionList.CompletionList;
-            completionList.VisibleChanged -= OnCompletionListVisibleChanged;
-            completionList.SelectedValueChanged -= OnCompletionListSelectedValueChanged;
-        }
+        public override void Stop() => EventManager.RemoveEventHandler(this);
 
         public override bool OnShortcut(Keys keys)
         {
-            if (keys != (Keys.Control | Keys.Space)) return false;
-            var completionList = Reflector.CompletionList.CompletionList;
-            if (CompletionList.Active) return false;
+            if (CompletionList.Active || keys != (Keys.Control | Keys.Space)) return false;
             var expr = CompleteHelper.GetCurrentExpressionType();
             if (expr == null || expr.IsNull()) return false;
             var result = ASComplete.OnShortcut(keys, PluginBase.MainForm.CurrentDocument.SciControl);
-            completionList.VisibleChanged -= OnCompletionListVisibleChanged;
-            UpdateCompletionList(expr);
-            completionList.VisibleChanged += OnCompletionListVisibleChanged;
+            UpdateCompletionList(expr, new List<ICompletionListItem>());
             return result;
         }
 
         public override bool OnCharAdded(int value)
         {
+            if (CompletionList.Active) return false;
             if ((char) value != '.' || !TemplateUtils.GetHasTemplates()) return false;
             var sci = PluginBase.MainForm.CurrentDocument.SciControl;
             if (sci.PositionIsOnComment(sci.CurrentPos)) return false;
-            if (ASComplete.OnChar(sci, value, false))
-            {
-                if (Reflector.CompletionList.CompletionList.Visible) UpdateCompletionList();
-                return false;
-            }
-            if (!Reflector.ASComplete.HandleDotCompletion(sci, true) || CompletionList.Active) return false;
+            if (ASComplete.OnChar(sci, value, false) || Reflector.ASComplete.HandleDotCompletion(sci, true)) return false;
             var expr = CompleteHelper.GetCurrentExpressionType();
             if (expr == null || expr.IsNull()) return false;
-            Reflector.CompletionList.CompletionList.VisibleChanged -= OnCompletionListVisibleChanged;
-            UpdateCompletionList(expr);
-            Reflector.CompletionList.CompletionList.VisibleChanged += OnCompletionListVisibleChanged;
+            UpdateCompletionList(expr, new List<ICompletionListItem>());
             return true;
         }
 
-        public override bool UpdateCompletionList(ASResult expr)
+        public override bool UpdateCompletionList(ASResult expr, IList<ICompletionListItem> options)
         {
             if (expr == null || expr.IsNull()) return false;
             var target = CompleteHelper.GetCompletionTarget(expr);
             if (target == null) return false;
-            UpdateCompletionList(target, expr);
+            UpdateCompletionList(target, expr, options);
             return true;
         }
 
-        public override void UpdateCompletionList(MemberModel target, ASResult expr)
+        public override void UpdateCompletionList(MemberModel target, ASResult expr, IList<ICompletionListItem> options)
         {
             if (target == null || !TemplateUtils.GetHasTemplates()) return;
+            var labels = new HashSet<string>();
+            foreach (var item in options)
+            {
+                if (item is PostfixCompletionItem) labels.Add(item.Label);
+            }
             var items = CompleteHelper.GetCompletionItems(target, expr);
-            var allItems = Reflector.CompletionList.AllItems;
-            if (allItems != null)
+            foreach (var item in items)
             {
-                var labels = new HashSet<string>();
-                foreach (var item in allItems)
-                {
-                    if (item is PostfixCompletionItem) labels.Add(item.Label);
-                }
-                foreach (var item in items)
-                {
-                    if (!labels.Contains(item.Label)) allItems.Add(item);
-                }
-                items = allItems;
+                if (!labels.Contains(item.Label)) options.Add(item);
             }
+            if (CompletionList.Active) return;
             var sci = PluginBase.MainForm.CurrentDocument.SciControl;
             var word = sci.GetWordLeft(sci.CurrentPos - 1, false);
             if (!string.IsNullOrEmpty(word))
             {
-                items = items.FindAll(it =>
+                options = options.Where(it =>
                 {
                     var score = CompletionList.SmartMatch(it.Label, word, word.Length);
                     return score > 0 && score < 6;
-                });
+                }).ToList();
             }
-            CompletionList.Show(items, false, word);
-            var list = Reflector.CompletionList.CompletionList;
-            completionListItemCount = list.Items.Count;
-            list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;
-            list.SelectedValueChanged += OnCompletionListSelectedValueChanged;
-        }
-
-        protected void OnCompletionListVisibleChanged(object o, EventArgs args)
-        {
-            var list = Reflector.CompletionList.CompletionList;
-            if (list.Visible) UpdateCompletionList();
-            else list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;
+            CompletionList.Show((List<ICompletionListItem>) options, false, word);
         }
 
-        protected void OnCompletionListSelectedValueChanged(object sender, EventArgs args)
+        public void HandleEvent(object sender, NotifyEvent e, HandlingPriority priority)
         {
-            var list = Reflector.CompletionList.CompletionList;
-            list.SelectedValueChanged -= OnCompletionListSelectedValueChanged;
-            if (completionListItemCount != list.Items.Count) UpdateCompletionList();
+            switch (e.Type)
+            {
+                case EventType.Command:
+                    var de = (DataEvent)e;
+                    if (de.Action == "ASCompletion.DotCompletion") UpdateCompletionList((IList<ICompletionListItem>) de.Data);
+                    break;
+            }
         }
     }
 
@@ -227,9 +193,9 @@ public override void Stop()
             completionModeHandler = null;
         }
 
-        public override bool UpdateCompletionList(ASResult expr)
+        public override bool UpdateCompletionList(ASResult expr, IList<ICompletionListItem> options)
         {
-            var result = base.UpdateCompletionList(expr);
+            var result = base.UpdateCompletionList(expr, options);
             if (result) return true;
             if (expr == null || expr.IsNull() || expr.Context == null || completionModeHandler == null) return false;
             var sci = PluginBase.MainForm.CurrentDocument.SciControl;
@@ -285,22 +251,19 @@ void OnFunctionTypeResult(HaxeComplete hc, HaxeCompleteResult result, HaxeComple
                     if (hc.AutoHide) CompletionList.Hide();
                     break;
                 case HaxeCompleteStatus.Type:
-                    var list = Reflector.CompletionList.CompletionList;
-                    list.VisibleChanged -= OnCompletionListVisibleChanged;
                     var expr = hc.Expr;
                     if (result.Type is ClassModel)
                     {
                         expr.Type = (ClassModel) result.Type;
                         expr.Member = null;
-                        UpdateCompletionList(expr.Type, expr);
+                        UpdateCompletionList(expr.Type, expr, Reflector.CompletionList.AllItems);
                     }
                     else
                     {
                         expr.Type = ASContext.Context.ResolveType(result.Type.Type, result.Type.InFile);
                         expr.Member = result.Type;
-                        UpdateCompletionList(expr.Member, expr);
+                        UpdateCompletionList(expr.Member, expr, Reflector.CompletionList.AllItems);
                     }
-                    list.VisibleChanged += OnCompletionListVisibleChanged;
                     break;
             }
         }

PostfixCodeCompletion/Completion/Complete.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
-using System.Windows.Forms;
 using ASCompletion.Completion;
 using ASCompletion.Context;
 using ASCompletion.Model;
@@ -20,16 +19,6 @@ internal static class Reflector
 
     internal class CompletionListReflector
     {
-        internal ListBox CompletionList
-        {
-            get
-            {
-                var fieldInfo = typeof(CompletionList).GetField("completionList", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static);
-                Debug.Assert(fieldInfo != null, "fieldInfo is null");
-                return (ListBox) fieldInfo.GetValue(typeof(ListBox));
-            }
-        }
-
         internal List<ICompletionListItem> AllItems
         {
             get