Skip to content

[FEATURE] Add raw value of attribute (string) without interpolation and tranlsation #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PTKu merged 4 commits into from
Apr 2, 2025
Merged

[FEATURE] Add raw value of attribute (string) without interpolation and tranlsation #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d2ccec
Create draft PR for #400
PTKu Apr 2, 2025
ebfd213
Add raw property for direct field access in AstNode class
PTKu Apr 2, 2025
c475c95
Merge branch 'dev' into 400-feature-add-raw-value-of-attribute-string…
PTKu Apr 2, 2025
81d58c3
Fix missing brace in Identifier_raw getter method
PTKu Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...piler/src/AXSharp.Cs.Compiler/Pragmas/PragmaParser/Ast/AddedPropertyDeclarationAstNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ public override void AcceptVisitor(IAstVisitor visitor)
$"{AccessQualifier} {Type} Get{Identifier}(System.Globalization.CultureInfo culture)" +
$"{{"+
$"return this.Translate(_{Identifier}, culture).Interpolate(this);" +
$"}}";
$"}}\n"+
$"{AccessQualifier} {Type} {Identifier}_raw {{ get {{ return _{Identifier}; }} }}";
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/Cs/PragmasExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void should_get_attribute_source()
[Fact]
public void should_declare_property()
{
var expected = "private string _SomeField;\npublic string SomeField { get => string.IsNullOrEmpty(_SomeField) ? SymbolTail : _SomeField.Interpolate(this).CleanUpLocalizationTokens(); set => _SomeField = value; }public string GetSomeField(System.Globalization.CultureInfo culture){return this.Translate(_SomeField, culture).Interpolate(this);}";
var expected = "private string _SomeField;\npublic string SomeField { get => string.IsNullOrEmpty(_SomeField) ? SymbolTail : _SomeField.Interpolate(this).CleanUpLocalizationTokens(); set => _SomeField = value; }public string GetSomeField(System.Globalization.CultureInfo culture){return this.Translate(_SomeField, culture).Interpolate(this);}\npublic string SomeField_raw { get { return _SomeField; } }";
var field = NSubstitute.Substitute.For<ITypeDeclaration>();
field.Name.Returns("someField");
field.Pragmas.Returns(new ReadOnlyCollection<IPragma>(new IPragma[]
Expand Down
8 changes: 8 additions & 0 deletions ...rp.Compiler.CsTests/samples/units/expected/ax/.g/Onliners/types_with_name_attributes.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,14 @@ public string GetAttributeName(System.Globalization.CultureInfo culture)
return this.Translate(_AttributeName, culture).Interpolate(this);
}

public string AttributeName_raw
{
get
{
return _AttributeName;
}
}

public OnlinerString SomeClassVariable { get; }

partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
Expand Down
8 changes: 8 additions & 0 deletions ...ompiler.CsTests/samples/units/expected/ax/.g/Onliners/types_with_property_attributes.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ public string GetDescription(System.Globalization.CultureInfo culture)
return this.Translate(_Description, culture).Interpolate(this);
}

public string Description_raw
{
get
{
return _Description;
}
}

public OnlinerInt Counter { get; }

partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
Expand Down
4 changes: 2 additions & 2 deletions src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/ax/units.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AXSharp.Abstractions" Version="0.23.0-388-allow-multiline-pragmas.364" />
<PackageReference Include="AXSharp.Connector" Version="0.23.0-388-allow-multiline-pragmas.364" />
<PackageReference Include="AXSharp.Abstractions" Version="0.24.0-400-feature-add-raw-value-of-attribute-string-without-interpolation-and-tranlsation.392" />
<PackageReference Include="AXSharp.Connector" Version="0.24.0-400-feature-add-raw-value-of-attribute-string-without-interpolation-and-tranlsation.392" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions ...p.Compiler.CsTests/samples/units/expected/tia/.g/Onliners/types_with_name_attributes.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,14 @@ public string GetAttributeName(System.Globalization.CultureInfo culture)
return this.Translate(_AttributeName, culture).Interpolate(this);
}

public string AttributeName_raw
{
get
{
return _AttributeName;
}
}

public OnlinerString SomeClassVariable { get; }

partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
Expand Down
8 changes: 8 additions & 0 deletions ...mpiler.CsTests/samples/units/expected/tia/.g/Onliners/types_with_property_attributes.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ public string GetDescription(System.Globalization.CultureInfo culture)
return this.Translate(_Description, culture).Interpolate(this);
}

public string Description_raw
{
get
{
return _Description;
}
}

public OnlinerInt Counter { get; }

partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
Expand Down