Merge branch 'development' of https://github.com/fdorg/flashdevelop into development

Author: Meychi

External/Plugins/ASClassWizard/PluginMain.cs

@@ -361,7 +361,8 @@ private string ProcessFileTemplate(string args)
                                 foreach (MemberModel param in member.Parameters)
                                 {
                                     if (param.Name.StartsWith(".")) break;
-                                    superConstructor += (index > 0 ? ", " : "") + param.Name;
+                                    var pname = TemplateUtils.GetParamName(param);
+                                    superConstructor += (index > 0 ? ", " : "") + pname;
                                     index++;
                                 }
                                 superConstructor += ");\n" + (lastFileOptions.Language == "as3" ? "\t\t\t" : "\t\t");

External/Plugins/ASCompletion/Completion/ASGenerator.cs

@@ -4207,7 +4207,7 @@ private static string GetSuperCall(MemberModel member, List<string> typesUsed, C
                 foreach (MemberModel param in member.Parameters)
                 {
                     if (param.Name.StartsWith(".")) break;
-                    args += ", " + param.Name;
+                    args += ", " + TemplateUtils.GetParamName(param);
                     addTypeOnce(typesUsed, getQualifiedType(param.Type, aType));
                 }
 

External/Plugins/ASCompletion/Completion/TemplateUtils.cs

@@ -143,7 +143,8 @@ public static string CallParametersString(MemberModel member)
                     else
                         one = ReplaceTemplateVariable(one, "PComma", null);
 
-                    one = ReplaceTemplateVariable(one, "PName", param.Name);
+                    var pname = GetParamName(param);
+                    one = ReplaceTemplateVariable(one, "PName", pname);
 
                     one = ReplaceTemplateVariable(one, "PType", null);
                     one = ReplaceTemplateVariable(one, "PDefaultValue", null);
@@ -265,5 +266,10 @@ public static string GetBoundary(string name)
             }
             return content;
         }
+
+        public static string GetParamName(MemberModel param)
+        {
+            return (param.Name ?? "").Replace("?", ""); // '?' is a marker for optional arguments
+        }
     }
 }

External/Plugins/ASCompletion/Context/ASContext.cs

@@ -987,6 +987,7 @@ protected virtual ASFileParser GetCodeParser()
         protected virtual void GetCurrentFileModel(string fileName)
         {
             cFile = GetCachedFileModel(fileName);
+            cFile.FileName = fileName; // fix casing changes
             if (cFile.Context == null || cFile.Context != this)
             {
                 cFile.Context = this;