Merge pull request #965 from Neverbirth/minor_cleanup

Minor cleanup

Author: elsassph

External/Plugins/ASCompletion/Completion/ASComplete.cs

@@ -1784,10 +1784,6 @@ private static void ShowListeners(ScintillaControl Sci, int position, ClassModel
             CompletionList.Show(items, true, tail);
         }
 
-        int CompareEvents(Object a, Object b)
-        {
-            return 0;
-        }
         #endregion
 
         #region dot_completion
@@ -2879,44 +2875,6 @@ private static void InferVariableType(ASExpr local, MemberModel var)
             }
         }
 
-        private static void FindInPackage(string token, FileModel inFile, string pkg, ASResult result)
-        {
-            IASContext context = ASContext.Context;
-            int p = token.IndexOf('(');
-
-            FileModel inPackage = context.ResolvePackage(pkg, false);
-            if (inPackage != null)
-            {
-                int pLen = pkg != null ? pkg.Length : 0;
-                foreach (MemberModel friend in inPackage.Imports)
-                {
-                    if (friend.Name == token && (pLen == 0 || friend.Type.LastIndexOf(context.Features.dot) == pLen))
-                    {
-                        ClassModel friendClass = context.GetModel(inFile.Package, token, inFile.Package);
-                        if (!friendClass.IsVoid())
-                        {
-                            result.Type = friendClass;
-                            result.IsStatic = (p < 0);
-                            return;
-                        }
-                        break;
-                    }
-                }
-                foreach (MemberModel friend in inPackage.Members)
-                {
-                    if (friend.Name == token)
-                    {
-                        result.Member = friend;
-                        result.Type = (p < 0 && (friend.Flags & FlagType.Function) > 0)
-                            ? context.ResolveType("Function", null)
-                            : context.ResolveType(friend.Type, friend.InFile);
-                        return;
-                    }
-                }
-            }
-            return;
-        }
-
         /// <summary>
         /// Find package-level member
         /// </summary>
@@ -3510,19 +3468,13 @@ private static ComaExpression DisambiguateComa(ScintillaControl Sci, int positio
             int braceCount = 0;
             int sqCount = 0;
             char c = (char)Sci.CharAt(position);
-            bool wasPar = false;
-            //if (c == '{') { wasPar = true; position--; }
             while (position > minPos)
             {
                 c = (char)Sci.CharAt(position);
                 if (c == ';')
                 {
                     return ComaExpression.None;
                 }
-                else if ((c == ',' || c == '=') && wasPar)
-                {
-                    return ComaExpression.AnonymousObject;
-                }
                 // var declaration
                 else if (c == ':')
                 {
@@ -3543,7 +3495,6 @@ private static ComaExpression DisambiguateComa(ScintillaControl Sci, int positio
                 }
                 else if (c == ']')
                 {
-                    if (wasPar) return ComaExpression.None;
                     sqCount++;
                 }
                 // function declaration or parameter
@@ -3565,7 +3516,6 @@ private static ComaExpression DisambiguateComa(ScintillaControl Sci, int positio
                 }
                 else if (c == ')')
                 {
-                    if (wasPar) return ComaExpression.None;
                     parCount++;
                 }
                 // code block or anonymous object
@@ -3589,7 +3539,6 @@ private static ComaExpression DisambiguateComa(ScintillaControl Sci, int positio
                 }
                 else if (c == '}')
                 {
-                    if (wasPar) return ComaExpression.None;
                     braceCount++;
                 }
                 else if (c == '?') return ComaExpression.AnonymousObject;

External/Plugins/ASCompletion/Completion/ASGenerator.cs

@@ -863,8 +863,6 @@ private static bool GetLangIsValid()
 
         #region code generation
 
-        static private Regex reInsert = new Regex("\\s*([a-z])", RegexOptions.Compiled);
-
         static public void SetJobContext(String contextToken, String contextParam, MemberModel contextMember, Match contextMatch)
         {
             ASGenerator.contextToken = contextToken;
@@ -3253,22 +3251,6 @@ private static void GenerateVariable(MemberModel member, int position, bool deta
             InsertCode(position, result);
         }
 
-        private static string ReplaceAll(string template, string oldValue, string newValue)
-        {
-            if (template == null)
-                return null;
-
-            string result = "";
-            string[] a = template.Split(new string[] { oldValue }, StringSplitOptions.None);
-            for (int i = 0; i < a.Length; i++)
-            {
-                if (i > 0)
-                    result += newValue;
-                result += a[i];
-            }
-            return result;
-        }
-
         public static bool MakePrivate(ScintillaControl Sci, MemberModel member)
         {
             ContextFeatures features = ASContext.Context.Features;
@@ -3714,31 +3696,6 @@ static private MemberModel FindLatest(FlagType match, Visibility visi, ClassMode
                 fallback = null;
             return latest ?? fallback;
         }
-        
-        static private string GetDeclaration(MemberModel member)
-        {
-            return GetDeclaration(member, true);
-        }
-
-        static private string GetDeclaration(MemberModel member, bool addModifiers)
-        {
-            // modifiers
-            string modifiers = TemplateUtils.GetStaticExternOverride(member);
-            if (addModifiers) modifiers += TemplateUtils.GetModifiers(member);
-            
-            // signature
-            FlagType ft = member.Flags;
-            if ((ft & FlagType.Getter) > 0)
-                return String.Format("{0}function get {1}", modifiers, member.ToDeclarationString());
-            else if ((ft & FlagType.Setter) > 0)
-                return String.Format("{0}function set {1}", modifiers, member.ToDeclarationString());
-            else if (ft == FlagType.Function)
-                return String.Format("{0}function {1}", modifiers, member.ToDeclarationString());
-            else if (((ft & FlagType.Constant) > 0) && ASContext.Context.Settings.LanguageId != "AS2")
-                return String.Format("{0}const {1}", modifiers, member.ToDeclarationString());
-            else
-                return String.Format("{0}var {1}", modifiers, member.ToDeclarationString());
-        }
         #endregion
 
         #region override generator

External/Plugins/ASCompletion/Model/ASFileParser.cs

@@ -1030,29 +1030,6 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                             continue;
                         }
                     }
-                    else if (inValue && (inParams || inType || inConst)
-                        && c1 == '/' && valueLength == 0) // lookup native regex
-                    {
-                        int itemp = i;
-                        valueBuffer[valueLength++] = '/';
-                        while (valueLength < VALUE_BUFFER && i < len)
-                        {
-                            c1 = ba[i++];
-                            if (c1 == '\n' || c1 == '\r')
-                            {
-                                valueLength = 0;
-                                i = itemp;
-                                break;
-                            }
-                            valueBuffer[valueLength++] = c1;
-                            if (c1 == '\\' && i < len)
-                            {
-                                c1 = ba[i++];
-                                valueBuffer[valueLength++] = c1;
-                            }
-                            else if (c1 == '/') break;
-                        }
-                    }
                     else if ((c1 == ':' || c1 == ',') && paramBraceCount > 0) stopParser = true;
 
                     // end of value