Better events generator when using Haxe not for Flash. eg. DOM addEventListener shouldn't import Event or even suggest to generate a DataEvent handler.

Author: elsassph

External/Plugins/ASCompletion/Completion/ASGenerator.cs

@@ -801,15 +801,22 @@ private static void ShowEventList(FoundDeclaration found, List<ICompletionListIt
             string labelEvent = String.Format(tmp, "Event");
             string labelDataEvent = String.Format(tmp, "DataEvent");
             string labelContext = String.Format(tmp, contextParam);
-            string[] choices = (contextParam != "Event") ?
-                new string[] { labelContext, labelEvent } :
-                new string[] { labelEvent, labelDataEvent };
+            string[] choices;
+            if (contextParam != "Event") choices = new string[] { labelContext, labelEvent };
+            else if (HasDataEvent()) choices = new string[] { labelEvent, labelDataEvent };
+            else choices = new string[] { labelEvent };
+
             for (int i = 0; i < choices.Length; i++)
             {
                 options.Add(new GeneratorItem(choices[i],
                     choices[i] == labelContext ? GeneratorJobType.ComplexEvent : GeneratorJobType.BasicEvent,
                     found.member, found.inClass));
             }
+        }
+
+        private static bool HasDataEvent()
+        {
+            return !ASContext.Context.ResolveType("flash.events.DataEvent", ASContext.Context.CurrentModel).IsVoid();
         }
 
         private static void ShowGetSetList(FoundDeclaration found, List<ICompletionListItem> options)
@@ -3569,22 +3576,12 @@ private static void GenerateEventHandler(string name, string type, MemberModel a
                 ClassModel eventClass = ASContext.Context.ResolveType(type, ASContext.Context.CurrentModel);
                 if (eventClass.IsVoid())
                 {
-                    if (type == "Event")
-                    {
-                        List<string> typesUsed = new List<string>();
-                        typesUsed.Add("flash.events.Event");
-                        delta = AddImportsByName(typesUsed, sci.LineFromPosition(position));
-                        position += delta;
-                        sci.SetSel(position, position);
-                    }
-                    else if (type == "DataEvent")
-                    {
-                        List<string> typesUsed = new List<string>();
-                        typesUsed.Add("flash.events.DataEvent");
-                        delta = AddImportsByName(typesUsed, sci.LineFromPosition(position));
-                        position += delta;
-                        sci.SetSel(position, position);
-                    }
+                    if (TryImportType("flash.events." + type, ref delta, sci.LineFromPosition(position)))
+                    {
+                        position += delta;
+                        sci.SetSel(position, position);
+                    }
+                    else type = null;
                 }
                 lookupPosition += delta;
                 string acc = GetPrivateAccessor(afterMethod, inClass);
@@ -3608,6 +3605,18 @@ private static void GenerateEventHandler(string name, string type, MemberModel a
             {
                 sci.EndUndoAction();
             }
+        }
+
+        private static bool TryImportType(string type, ref int delta, int atLine)
+        {
+            ClassModel eventClass = ASContext.Context.ResolveType(type, ASContext.Context.CurrentModel);
+            if (eventClass.IsVoid())
+                return false;
+            
+            List<string> typesUsed = new List<string>();
+            typesUsed.Add(type);
+            delta += AddImportsByName(typesUsed, atLine);
+            return true;
         }
 
         static private string AddRemoveEvent(string eventName)

FlashDevelop/Bin/Debug/Snippets/as2/generators/EventHandler.fds

@@ -1,3 +1,3 @@
-$(Modifiers) function $(Name)(e:$(Type)):$(Void) $(CSLB){
+$(Modifiers) function $(Name)(e<<:$(Type)>>):$(Void) $(CSLB){
 	$(EntryPoint)
 }

FlashDevelop/Bin/Debug/Snippets/as3/generators/EventHandler.fds

@@ -1,4 +1,4 @@
 
-$(Modifiers) function $(Name)(e:$(Type)):$(Void) $(CSLB){
+$(Modifiers) function $(Name)(e<<:$(Type)>>):$(Void) $(CSLB){
 	$(EntryPoint)
 }

FlashDevelop/Bin/Debug/Snippets/haxe/generators/EventHandler.fds

@@ -1,4 +1,4 @@
 
-<<$(Modifiers) >>function $(Name)(e:$(Type)):$(Void) $(CSLB){
+<<$(Modifiers) >>function $(Name)(e<<:$(Type)>>)<<:$(Void)>> $(CSLB){
 	$(EntryPoint)
 }