Add support for interfaces to objects (#39)

Closes #30
Roald87 · Jul 11, 2020 · 846613b · 846613b
1 parent c822eaa
commit 846613b
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 6 deletions.
diff --git a/src/TcBlack/CompositeCode.cs b/src/TcBlack/CompositeCode.cs
@@ -92,7 +92,8 @@ public CompositeCode Tokenize()
                 else if (
                     line.StartsWith("FUNCTION") 
                     || line.StartsWith("METHOD") 
-                    || line.StartsWith("PROPERTY"))
+                    || line.StartsWith("PROPERTY")
+                    || line.StartsWith("INTERFACE"))
                 {
                     Add(new ObjectDefinition(
                         unformattedCode: line,

diff --git a/src/TcBlack/ObjectDefinition.cs b/src/TcBlack/ObjectDefinition.cs
@@ -78,12 +78,42 @@ private TcObject Tokenize()
             {
                 return TokenizeFunctionBlock();
             }
+            else if (_unformattedCode.Contains("INTERFACE"))
+            {
+                return TokenizeInterface();
+            }
             else
             {
                 return TokenizeMethodOrProperty();
             }
         }
 
+        private TcObject TokenizeInterface()
+        {
+            string pattern = @"INTERFACE\s+(\w+)\s*(?:EXTENDS((?:[\s,]+[\w\.]+)+))?";
+
+            MatchCollection matches = Regex.Matches(
+                _unformattedCode, pattern, RegexOptions.IgnoreCase
+            );
+            if (matches.Count > 0)
+            {
+                Match match = matches[0];
+                string[] parents = Regex.Split(match.Groups[2].Value, @"[\s,]+");
+                return new TcObject(
+                    objectType: "INTERFACE",
+                    accessModifier: "",
+                    name: match.Groups[1].Value,
+                    dataType: "",
+                    extends: string.Join(", ", parents.Skip(1)),
+                    implements: ""
+                );
+            }
+            else
+            {
+                return new TcObject("", "", "", "", "", "");
+            }
+        }
+
         private TcObject TokenizeFunctionBlock()
         {
             string[] splitDefinition = Regex

diff --git a/src/TcBlack/Program.cs b/src/TcBlack/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using System.Linq;
 using CommandLine;
 
@@ -14,7 +15,7 @@ class Program
         class Options
         {
             [Option(
-                HelpText = "TcPOU file(s) to format.",
+                HelpText = "TcPOU/TcIO file(s) to format.",
                 SetName = "FilesToFormat"
             )]
             public IEnumerable<string> Filenames { get; set; }
@@ -92,11 +93,11 @@ static string[] FilesToFormat(Options options)
         {
             if (options.Project.Length > 0)
             {
+                Regex extensions = new Regex(@"(TcPOU|TcIO)$");
                 string projectDirectory = Path.GetDirectoryName(options.Project);
-
-                return Directory.GetFiles(
-                    projectDirectory, "*.TcPOU", SearchOption.AllDirectories
-                );
+                return Directory.EnumerateFiles(
+                    projectDirectory, "*.*", SearchOption.AllDirectories
+                ).Where(f => extensions.IsMatch(f)).ToArray();
             }
             else
             {

diff --git a/src/TcBlackTests/ObjectDefinitionTests.cs b/src/TcBlackTests/ObjectDefinitionTests.cs
@@ -162,5 +162,40 @@ public void MethodsWithReturnTypesWithFullPath(
             Assert.Equal(expectedCode, var.Format(ref indents));
         }
 
+        [Theory]
+        [InlineData(
+            "INTERFACE    ITF_1",
+            "INTERFACE ITF_1"
+        )]
+        [InlineData(
+            "INTERFACE    ITF_1   EXTENDS    I_TcArguments",
+            "INTERFACE ITF_1 EXTENDS I_TcArguments"
+        )]
+        [InlineData(
+            "INTERFACE    ITF_1   EXTENDS    I_TcArguments   ,   I_Number2",
+            "INTERFACE ITF_1 EXTENDS I_TcArguments, I_Number2"
+        )]
+        [InlineData(
+            "INTERFACE    ITF_1   EXTENDS    I_TcArguments   ,   I_Number2, I_A",
+            "INTERFACE ITF_1 EXTENDS I_TcArguments, I_Number2, I_A"
+        )]
+        [InlineData(
+            "INTERFACE ITF_1 EXTENDS I_TcArguments,I_Number2,I_A",
+            "INTERFACE ITF_1 EXTENDS I_TcArguments, I_Number2, I_A"
+        )]
+        [InlineData(
+            "INTERFACE I_Test EXTENDS __SYSTEM.IQueryInterface",
+            "INTERFACE I_Test EXTENDS __SYSTEM.IQueryInterface"
+        )]
+        public void FormatInterfaces(
+            string originalCode, string expectedCode
+        )
+        {
+            ObjectDefinition var =
+                new ObjectDefinition(originalCode, "    ", "\n");
+            uint indents = 0;
+            Assert.Equal(expectedCode, var.Format(ref indents));
+        }
+
     }
 }