[NEW-FEATURE] When an added property of string contains localization …

…attributes it should use translator (#97) * Create draft PR for #96 * [connector] temporarily removes localization tags from string attributes --------- Co-authored-by: PTKu <[email protected]>
Inxton · Feb 25, 2023 · ab88f3b · ab88f3b
1 parent 4eca14f
commit ab88f3b
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 7 deletions.
diff --git a/...x.compiler/src/IX.Cs.Compiler/Pragmas/PragmaParser/Ast/AddedPropertyDeclarationAstNode.cs b/...x.compiler/src/IX.Cs.Compiler/Pragmas/PragmaParser/Ast/AddedPropertyDeclarationAstNode.cs
@@ -26,6 +26,27 @@ public override void Init(AstContext context, ParseTreeNode treeNode)
 
     public override void AcceptVisitor(IAstVisitor visitor)
     {
-        if (visitor is PragmaVisitor v) v.Product = $"{AccessQualifier} {Type} {Identifier} {{ get; set; }}";
+        if (visitor is PragmaVisitor v)
+        {
+            if (Type.ToUpperInvariant() == "STRING")
+            {
+                v.Product = $"private {Type} _{Identifier};" +
+                            $"\n{AccessQualifier} {Type} {Identifier} " +
+                            $"{{ " +
+                            $"get" +
+                            $"{{ " +
+                            $"return Ix.Localizations.LocalizationHelper.CleanUpLocalizationTokens(_{Identifier}); " +
+                            $"}} " +
+                            $"set; " +
+                            $"{{_{Identifier} = value;" +
+                            $"}} " +
+                            $"}}";
+            }
+            else
+            {
+                v.Product = $"{AccessQualifier} {Type} {Identifier} {{ get; set; }}";
+            }
+
+        }
     }
 }
diff --git a/src/ix.compiler/src/IX.Cs.Compiler/Pragmas/PragmaParser/Ast/AddedPropertySetterAstNode.cs b/src/ix.compiler/src/IX.Cs.Compiler/Pragmas/PragmaParser/Ast/AddedPropertySetterAstNode.cs
@@ -30,6 +30,7 @@ public override void Init(AstContext context, ParseTreeNode treeNode)
 
     public override void AcceptVisitor(IAstVisitor visitor)
     {
+
         if (visitor is PragmaVisitor v)
             v.Product = MemberName != null
                 ? $"{MemberName}.{PropertyName} = {InitValue};"

diff --git a/...Parser/Ast/DeclarationAttributeAstNode.cs → ...Parser/Ast/AttributeDeclarationAstNode.cs b/...Parser/Ast/DeclarationAttributeAstNode.cs → ...Parser/Ast/AttributeDeclarationAstNode.cs
@@ -11,7 +11,7 @@
 
 namespace Ix.Compiler.Cs.Pragmas.PragmaParser;
 
-internal class DeclarationAttributeAstNode : AstNode
+internal class AttributeDeclarationAstNode : AstNode
 {
     public string? AttributeLiteral { get; set; }
 

diff --git a/src/ix.compiler/src/IX.Cs.Compiler/Pragmas/PragmaParser/PragmaGrammar.cs b/src/ix.compiler/src/IX.Cs.Compiler/Pragmas/PragmaParser/PragmaGrammar.cs
@@ -34,7 +34,7 @@ internal class PragmaGrammar : Grammar
     public readonly NonTerminal AddedPropertySetter = new(nameof(AddedPropertySetter), typeof(AddedPropertySetterAstNode));
     public readonly Terminal assing = new(nameof(assing));
 
-    public readonly NonTerminal DeclarationAttribute = new(nameof(DeclarationAttribute), typeof(DeclarationAttributeAstNode));
+    public readonly NonTerminal DeclarationAttribute = new(nameof(DeclarationAttribute), typeof(AttributeDeclarationAstNode));
     public readonly NonTerminal ClrAttribute = new(nameof(ClrAttribute));
 
     public readonly FreeTextLiteral ClrAttributeContent =

diff --git a/src/ix.compiler/tests/Ix.Compiler.CsTests/Cs/PragmasExtensionsTests.cs b/src/ix.compiler/tests/Ix.Compiler.CsTests/Cs/PragmasExtensionsTests.cs
@@ -58,7 +58,7 @@ public void should_get_attribute_source()
     [Fact]
     public void should_declare_property()
     {
-        var expected = "public string AttributeName { get; set; }";
+        var expected = "private string _AttributeName;\npublic string AttributeName { get{ return Ix.Localizations.LocalizationHelper.CleanUpLocalizationTokens(_AttributeName); } set; {_AttributeName = value;} }";
         var field = new TypeMock("someField",
             new ReadOnlyCollection<IPragma>(new IPragma[]
             {

diff --git a/...ts/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_name_attributes.g.cs b/...ts/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_name_attributes.g.cs
@@ -258,7 +258,19 @@ public Ix.Connector.ITwinObject GetParent()
 
     public partial class NoAccessModifierClass : Ix.Connector.ITwinObject
     {
-        public string AttributeName { get; set; }
+        private string _AttributeName;
+        public string AttributeName
+        {
+            get
+            {
+                return Ix.Localizations.LocalizationHelper.CleanUpLocalizationTokens(_AttributeName);
+            }
+
+            set;
+            {
+                _AttributeName = value;
+            }
+        }
 
         public OnlinerString SomeClassVariable { get; }
 

diff --git a/...x.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_property_attributes.g.cs b/...x.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_property_attributes.g.cs
@@ -7,7 +7,19 @@ namespace TypesWithPropertyAttributes
 {
     public partial class SomeAddedProperties : Ix.Connector.ITwinObject
     {
-        public string Description { get; set; }
+        private string _Description;
+        public string Description
+        {
+            get
+            {
+                return Ix.Localizations.LocalizationHelper.CleanUpLocalizationTokens(_Description);
+            }
+
+            set;
+            {
+                _Description = value;
+            }
+        }
 
         public OnlinerInt Counter { get; }
 

diff --git a/src/ix.connectors/src/Ix.Connector/Localizations/LocalizationHelper.cs b/src/ix.connectors/src/Ix.Connector/Localizations/LocalizationHelper.cs
@@ -81,7 +81,7 @@ internal static IEnumerable<LocalizableItem> GetTranslatable(string input,
         return localizables;
     }
 
-    internal static string CleanUpLocalizationTokens(string localized)
+    public static string CleanUpLocalizationTokens(this string localized)
     {
         if (localized != null) return localized.Replace("<#", string.Empty).Replace("#>", string.Empty);