Merge pull request #10 from dynasist/AddRangeAndProperties

Add range and properties

Author: martonsagi

ALObjectParser.Library/Models/ALObjectParts/ALMethod.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 
 namespace ALObjectParser.Library
@@ -22,5 +23,6 @@ public ALMethod()
         public ALMethodBody MethodBody { get; set; }
         public ICollection<ALAttribute> Attributes { get; set; }
         public IEnumerable<ALComment> Comments { get; set; }
+        public Range MethodRange { get; set; }
     }
 }

ALObjectParser.Library/Readers/ALObjectReaderBase.cs

@@ -93,6 +93,7 @@ public IALObject Read(IEnumerable<string> Lines)
             GetObjectProperties(Lines, Target);
             GetGlobalVariables(Lines, Target);
             GetSections(Lines, Target);
+            GetRange(Lines, Target);
             Target.ProcessSections();
             IALObject NewTarget;
             OnRead(Lines, Target, out NewTarget);
@@ -248,7 +249,7 @@ public virtual void OnGetObjectProperty(string Line, IALSection Target, string p
         /// <param name="Target">Current ALObject instance</param>
         public void GetMethods(IEnumerable<string> Lines, IALSection Target)
         {
-            var pattern = @"^\s{0,4}(local|procedure|trigger)\s+(.*?)\((.*?)\)\:?(.*)";
+            var pattern = @"^\s{0,4}(local procedure|procedure|trigger)\s+(.*?)\((.*?)\)\:?(.*)";
             var procedures = Lines
                 .Where(w => Regex.IsMatch(w, pattern))
                 .ToList();
@@ -333,15 +334,15 @@ public void GetMethods(IEnumerable<string> Lines, IALSection Target)
 
                 // Check for Attributes
                 end = txtLines.IndexOf(s) - 1;
-                    start = txtLines.IndexOf(s) - 1;
-                    var testMethod = Lines.ElementAt(start);
-                while (testMethod.Trim() != String.Empty && 
+                start = txtLines.IndexOf(s) - 1;
+                var testMethod = Lines.ElementAt(start);
+                while (testMethod.Trim() != String.Empty &&
                        !testMethod.ToLower().Contains("end;") &&
                        !testMethod.ToLower().Contains("{"))
+                {
+                    if (testMethod.ToLower().Contains("[test"))
                     {
-                        if (testMethod.ToLower().Contains("[test"))
-                        {
-                            method.TestMethod = true;
+                        method.TestMethod = true;
                         //break;
                     }
 
@@ -355,23 +356,23 @@ public void GetMethods(IEnumerable<string> Lines, IALSection Target)
                         };
                         attr.IsEvent = attr.Name.ToLower().Contains("event");
                         method.Attributes.Add(attr);
-                        }
+                    }
 
-                        start -= 1;
-                        if (start < 0)
-                        {
-                            break;
-                        }
-                        testMethod = Lines.ElementAt(start);
+                    start -= 1;
+                    if (start < 0)
+                    {
+                        break;
                     }
+                    testMethod = Lines.ElementAt(start);
+                }
 
                 start += 1;
                 end += 1;
                 var linesAboveMethod = txtLines
                     .GetRange(start, end - start)
                     .Select(s => s.Trim())
                     .Where(w => !w.StartsWith("["));
-                    //.Where(w => w.StartsWith("//") || w.StartsWith("/*") || w.EndsWith("*/"));
+                //.Where(w => w.StartsWith("//") || w.StartsWith("/*") || w.EndsWith("*/"));
                 var txtAboveMethod = string.Join("\r\n", linesAboveMethod);
                 txtAboveMethod = txtAboveMethod
                     .Replace("///", "")
@@ -427,6 +428,25 @@ public ICollection<ALComment> GetComments(IEnumerable<string> Lines)
 
             return comments;
         }
+        public void GetRange(IEnumerable<string> Lines, IALObject Target)
+        {
+            string contents = String.Join("__", Lines);
+            foreach (ALMethod method in Target.Methods)
+            {
+                Match match = Regex.Match(contents, $"(.*)(local)? (procedure|trigger) {method.Name}\\(", RegexOptions.IgnoreCase);
+                if (!match.Success)
+                    continue;
+                string textBeforeProcedure = contents.Substring(0, match.Groups[1].Length);
+                int startLineNo = (textBeforeProcedure.Length - textBeforeProcedure.Replace("__", "").Length) / 2;
+                string pattern = ".{" + textBeforeProcedure.Length + "}.+?__    end;";
+                match = Regex.Match(contents, pattern, RegexOptions.IgnoreCase);
+                if (!match.Success)
+                    continue;
+                string textUntilEndOfProcedure = contents.Substring(0, match.Groups[0].Length);
+                int endLineNo = (textUntilEndOfProcedure.Length - textUntilEndOfProcedure.Replace("__", "").Length) / 2;
+                method.MethodRange = new Range(startLineNo, endLineNo);
+            }
+        }
 
         public void GetSections(IEnumerable<string> Lines, IALSection Target)
         {

ALObjectParser.Library/Writers/ALObjectWriterBase.cs

@@ -65,6 +65,7 @@ public virtual string OnWrite(IALObject Target)
                 using (var writer = new IndentedTextWriter(stringWriter))
                 {
                     OnWriteObjectHeader(writer, Target);
+                    OnWriteObjectProperties(writer, Target);
                     Target.Write(writer);
                     OnWriteObjectMethods(writer, Target);
                     OnWriteObjectFooter(writer, Target);
@@ -81,6 +82,13 @@ public virtual void OnWriteObjectHeader(IndentedTextWriter writer, IALObject Tar
             writer.WriteLine($"{Target.Type} {Target.Id} {(Target.Name.Contains(' ') ? $"\"{Target.Name}\"" : Target.Name)}");
             writer.WriteLine("{");
         }
+        
+        private void OnWriteObjectProperties(IndentedTextWriter writer, IALObject target)
+        {
+            foreach (ALProperty aLProperty in target.Properties)
+                writer.WriteLine(aLProperty.Name + " = " + aLProperty.Value + ";");
+        }
+
 
         public virtual void OnWriteObjectMethods(IndentedTextWriter writer, IALObject Target)
         {