Contextual Code Generation update 4

wise0704 · wise0704 · commit 17b3f23afc32 · 2015-12-12T14:55:23.000+13:00
ASCompletion doesn't listen for "ASCompletion.ContextualGenerator.AddOptions".
diff --git a/External/Plugins/ASCompletion/PluginMain.cs b/External/Plugins/ASCompletion/PluginMain.cs
@@ -210,7 +210,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                         de = e as DataEvent;
                         if (de.Action == "Completion.ShowHelp")
                         {
-                            ASComplete.HelpKeys = (Keys) de.Data;
+                            ASComplete.HelpKeys = (Keys)de.Data;
                             de.Handled = true;
                         }
                         return;
@@ -279,12 +279,12 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                                 if (info != null)
                                 {
                                     ContextSetupInfos setup = new ContextSetupInfos();
-                                    setup.Platform = (string) info["platform"];
-                                    setup.Lang = (string) info["lang"];
-                                    setup.Version = (string) info["version"];
-                                    setup.TargetBuild = (string) info["targetBuild"];
-                                    setup.Classpath = (string[]) info["classpath"];
-                                    setup.HiddenPaths = (string[]) info["hidden"];
+                                    setup.Platform = (string)info["platform"];
+                                    setup.Lang = (string)info["lang"];
+                                    setup.Version = (string)info["version"];
+                                    setup.TargetBuild = (string)info["targetBuild"];
+                                    setup.Classpath = (string[])info["classpath"];
+                                    setup.HiddenPaths = (string[])info["hidden"];
                                     ASContext.SetLanguageClassPath(setup);
                                     if (setup.AdditionalPaths != null) // report custom classpath
                                         info["additional"] = setup.AdditionalPaths.ToArray();
@@ -299,7 +299,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                                 if (info != null && info.ContainsKey("language"))
                                 {
                                     IASContext context = ASContext.GetLanguageContext(info["language"] as string);
-                                    if (context != null && context.Settings != null
+                                    if (context != null && context.Settings != null 
                                         && context.Settings.UserClasspath != null)
                                         info["cp"] = new List<string>(context.Settings.UserClasspath);
                                 }
@@ -347,7 +347,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                                 {
                                     case "AS2": name = "AS2Context"; break;
                                     case "AS3": name = "AS3Context"; break;
-                                    default:
+                                    default: 
                                         name = cmdData.Substring(0, 1).ToUpper() + cmdData.Substring(1) + "Context";
                                         break;
                                 }
@@ -533,6 +533,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                                         if (ASContext.HasContext && ASContext.Context.IsFileValid)
                                         {
                                             var options = new List<ICompletionListItem>();
+                                            ASGenerator.ContextualGenerator(ASContext.CurSciControl, options);
                                             EventManager.DispatchEvent(this, new DataEvent(EventType.Command, "ASCompletion.ContextualGenerator.AddOptions", options));
                                             if (options.Count == 0)
                                             {
@@ -541,10 +542,6 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                                             CompletionList.Show(options, false);
                                         }
                                         break;
-
-                                    case "ASCompletion.ContextualGenerator.AddOptions":
-                                        ASGenerator.ContextualGenerator(ASContext.CurSciControl, (List<ICompletionListItem>) de.Data);
-                                        break;
                                 }
                             }
                             return;
@@ -556,7 +553,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                     }
                 }
             }
-            catch (Exception ex)
+            catch(Exception ex)
             {
                 ErrorManager.ShowError(ex);
             }

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`210`	`210`	`de = e as DataEvent;`
`211`	`211`	`if (de.Action == "Completion.ShowHelp")`
`212`	`212`	`{`
`213`		`- ASComplete.HelpKeys = (Keys) de.Data;`
	`213`	`+ ASComplete.HelpKeys = (Keys)de.Data;`
`214`	`214`	`de.Handled = true;`
`215`	`215`	`}`
`216`	`216`	`return;`
`@@ -279,12 +279,12 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`279`	`279`	`if (info != null)`
`280`	`280`	`{`
`281`	`281`	`ContextSetupInfos setup = new ContextSetupInfos();`
`282`		`- setup.Platform = (string) info["platform"];`
`283`		`- setup.Lang = (string) info["lang"];`
`284`		`- setup.Version = (string) info["version"];`
`285`		`- setup.TargetBuild = (string) info["targetBuild"];`
`286`		`- setup.Classpath = (string[]) info["classpath"];`
`287`		`- setup.HiddenPaths = (string[]) info["hidden"];`
	`282`	`+ setup.Platform = (string)info["platform"];`
	`283`	`+ setup.Lang = (string)info["lang"];`
	`284`	`+ setup.Version = (string)info["version"];`
	`285`	`+ setup.TargetBuild = (string)info["targetBuild"];`
	`286`	`+ setup.Classpath = (string[])info["classpath"];`
	`287`	`+ setup.HiddenPaths = (string[])info["hidden"];`
`288`	`288`	`ASContext.SetLanguageClassPath(setup);`
`289`	`289`	`if (setup.AdditionalPaths != null) // report custom classpath`
`290`	`290`	`info["additional"] = setup.AdditionalPaths.ToArray();`
`@@ -299,7 +299,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`299`	`299`	`if (info != null && info.ContainsKey("language"))`
`300`	`300`	`{`
`301`	`301`	`IASContext context = ASContext.GetLanguageContext(info["language"] as string);`
`302`		`- if (context != null && context.Settings != null`
	`302`	`+ if (context != null && context.Settings != null`
`303`	`303`	`&& context.Settings.UserClasspath != null)`
`304`	`304`	`info["cp"] = new List<string>(context.Settings.UserClasspath);`
`305`	`305`	`}`
`@@ -347,7 +347,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`347`	`347`	`{`
`348`	`348`	`case "AS2": name = "AS2Context"; break;`
`349`	`349`	`case "AS3": name = "AS3Context"; break;`
`350`		`- default:`
	`350`	`+ default:`
`351`	`351`	`name = cmdData.Substring(0, 1).ToUpper() + cmdData.Substring(1) + "Context";`
`352`	`352`	`break;`
`353`	`353`	`}`
`@@ -533,6 +533,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`533`	`533`	`if (ASContext.HasContext && ASContext.Context.IsFileValid)`
`534`	`534`	`{`
`535`	`535`	`var options = new List<ICompletionListItem>();`
	`536`	`+ ASGenerator.ContextualGenerator(ASContext.CurSciControl, options);`
`536`	`537`	`EventManager.DispatchEvent(this, new DataEvent(EventType.Command, "ASCompletion.ContextualGenerator.AddOptions", options));`
`537`	`538`	`if (options.Count == 0)`
`538`	`539`	`{`
`@@ -541,10 +542,6 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`541`	`542`	`CompletionList.Show(options, false);`
`542`	`543`	`}`
`543`	`544`	`break;`
`544`		`-`
`545`		`- case "ASCompletion.ContextualGenerator.AddOptions":`
`546`		`- ASGenerator.ContextualGenerator(ASContext.CurSciControl, (List<ICompletionListItem>) de.Data);`
`547`		`- break;`
`548`	`545`	`}`
`549`	`546`	`}`
`550`	`547`	`return;`
`@@ -556,7 +553,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`556`	`553`	`}`
`557`	`554`	`}`
`558`	`555`	`}`
`559`		`- catch (Exception ex)`
	`556`	`+ catch(Exception ex)`
`560`	`557`	`{`
`561`	`558`	`ErrorManager.ShowError(ex);`
`562`	`559`	`}`