Merge branch 'development' into 64bits

Conflicts:
	PluginCore/ScintillaNet/ScintillaControl.cs

Author: Neverbirth

External/Plugins/AS3Context/Context.cs

@@ -334,23 +334,14 @@ public override void BuildClassPath()
             }
 
             // intrinsics (deprecated, excepted for FP10 Vector.<T>)
-            string fp9cp = as3settings.AS3ClassPath + S + "FP9";
-            AddPath(PathHelper.ResolvePath(fp9cp));
-            if (majorVersion > 9)
+            // add from the highest version number (FP11 > FP10 > FP9)
+            string fp = as3settings.AS3ClassPath + S + "FP";
+            for (int i = majorVersion; i >= 9; i--)
             {
-                for (int i = 10; i <= majorVersion; i++)
-                {
-                    string fp10cp = as3settings.AS3ClassPath + S + "FP" + i;
-                    AddPath(PathHelper.ResolvePath(fp10cp));
-                    for (int j = 1; j <= minorVersion; j++)
-                    {
-                        string fp101cp = as3settings.AS3ClassPath + S + "FP" + majorVersion + "." + minorVersion;
-                        AddPath(PathHelper.ResolvePath(fp101cp));
-                    }
-                }
+                AddPath(PathHelper.ResolvePath(fp + i));
             }
 
-            // add external pathes
+            // add external paths
             List<PathModel> initCP = classPath;
             classPath = new List<PathModel>();
             if (contextSetup.Classpath != null)
@@ -361,20 +352,20 @@ public override void BuildClassPath()
 
             // add library
             AddPath(PathHelper.LibraryDir + S + "AS3" + S + "classes");
-            // add user pathes from settings
+            // add user paths from settings
             if (settings.UserClasspath != null && settings.UserClasspath.Length > 0)
             {
                 foreach (string cpath in settings.UserClasspath) AddPath(cpath.Trim());
             }
 
-            // add initial pathes
+            // add initial paths
             foreach (PathModel mpath in initCP) AddPath(mpath);
 
             // parse top-level elements
             InitTopLevelElements();
             if (cFile != null) UpdateTopLevelElements();
 
-            // add current temporaty path
+            // add current temporary path
             if (temporaryPath != null)
             {
                 string tempPath = temporaryPath;

External/Plugins/AS3Context/PluginMain.cs

@@ -265,23 +265,25 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                     else if (inMXML)
                     {
                         DataEvent de = e as DataEvent;
-                        switch (de.Action)
+                        if (de.Action == "XMLCompletion.Element")
                         {
-                            case "XMLCompletion.Element":
-                                de.Handled = MxmlComplete.HandleElement(de.Data);
-                                break;
-                            case "XMLCompletion.Namespace":
-                                de.Handled = MxmlComplete.HandleNamespace(de.Data);
-                                break;
-                            case "XMLCompletion.CloseElement":
-                                de.Handled = MxmlComplete.HandleElementClose(de.Data);
-                                break;
-                            case "XMLCompletion.Attribute":
-                                de.Handled = MxmlComplete.HandleAttribute(de.Data);
-                                break;
-                            case "XMLCompletion.AttributeValue":
-                                de.Handled = MxmlComplete.HandleAttributeValue(de.Data);
-                                break;
+                            de.Handled = MxmlComplete.HandleElement(de.Data);
+                        }
+                        if (de.Action == "XMLCompletion.Namespace")
+                        {
+                            de.Handled = MxmlComplete.HandleNamespace(de.Data);
+                        }
+                        else if (de.Action == "XMLCompletion.CloseElement")
+                        {
+                            de.Handled = MxmlComplete.HandleElementClose(de.Data);
+                        }
+                        else if (de.Action == "XMLCompletion.Attribute")
+                        {
+                            de.Handled = MxmlComplete.HandleAttribute(de.Data);
+                        }
+                        else if (de.Action == "XMLCompletion.AttributeValue")
+                        {
+                            de.Handled = MxmlComplete.HandleAttributeValue(de.Data);
                         }
                     }
                 }

External/Plugins/ASCompletion/Completion/ASComplete.cs

@@ -1920,7 +1920,7 @@ static private bool HandleDotCompletion(ScintillaControl Sci, bool autoHide)
                 result = new ASResult();
                 if (expr.Separator == '"')
                 {
-                    tmpClass = ctx.ResolveType("String", null);
+                    tmpClass = ctx.ResolveType(ctx.Features.stringKey, null);
                     result.Type = tmpClass;
                     dotIndex = 1;
                 }
@@ -2513,7 +2513,7 @@ static private ASResult EvalExpression(string expression, ASExpr context, FileMo
             else if (token == "\"") // literal string
             {
                 head = new ASResult();
-                head.Type = ASContext.Context.ResolveType("String", null);
+                head.Type = ASContext.Context.ResolveType(ASContext.Context.Features.stringKey, null);
             }
             else head = EvalVariable(token, context, inFile, inClass); // regular eval