Skip to content

Commit eaf1ae2

Browse files
PTKuPTKu
authored
Merge branch 'dev' into 398-bug-the-shadow-value-is-not-set-by-onlinerrealshadowcontrolview
2 parents 68702c8 + 8918413 commit eaf1ae2

19 files changed

Lines changed: 131 additions & 88 deletions

File tree

‎src/AXSharp.compiler/src/AXSharp.Compiler/Core/IxNodeVisitor.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,11 @@ void ISemanticNodeVisitor<ICombinedThreeVisitor>.Visit(IMethodDeclaration method
122122
throw new NotSupportedException();
123123
}
124124

125+
public void Visit(IClassMethodDeclaration methodDeclaration, ICombinedThreeVisitor data)
126+
{
127+
throw new NotSupportedException();
128+
}
129+
125130
void ISemanticNodeVisitor<ICombinedThreeVisitor>.Visit(IMethodPrototypeDeclaration methodPrototypeDeclaration,
126131
ICombinedThreeVisitor data)
127132
{

‎src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaParser/Ast/AddedPropertyDeclarationAstNode.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public override void AcceptVisitor(IAstVisitor visitor)
3838
$"{AccessQualifier} {Type} Get{Identifier}(System.Globalization.CultureInfo culture)" +
3939
$"{{"+
4040
$"return this.Translate(_{Identifier}, culture).Interpolate(this);" +
41-
$"}}";
41+
$"}}\n"+
42+
$"{AccessQualifier} {Type} {Identifier}_raw {{ get {{ return _{Identifier}; }} }}";
4243
}
4344
else
4445
{

‎src/AXSharp.compiler/src/ixd/Mapper/CodeToYamlMapper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public Item PopulateItem(IMethodDeclaration methodDeclaration)
117117
var item = PopulateItem((IDeclaration)methodDeclaration);
118118
item.Uid = Helpers.Helpers.GetBaseUid(methodDeclaration);
119119
item.Id = Helpers.Helpers.GetBaseUid(methodDeclaration);
120-
item.Parent = methodDeclaration.ContainingClass.FullyQualifiedName;
120+
item.Parent = methodDeclaration.ContainingStructuredType.FullyQualifiedName;
121121
item.Type = "Method";
122122
item.Syntax = new Syntax
123123
{

‎src/AXSharp.compiler/src/ixd/Visitors/MyNodeVisitor.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ public void Visit(IMethodDeclaration methodDeclaration, IYamlBuiderVisitor data)
112112
data.CreateMethodYaml(methodDeclaration, this);
113113
}
114114

115+
public void Visit(IClassMethodDeclaration methodDeclaration, IYamlBuiderVisitor data)
116+
{
117+
data.CreateMethodYaml(methodDeclaration, this);
118+
}
119+
115120
public void Visit(IMethodPrototypeDeclaration methodPrototypeDeclaration, IYamlBuiderVisitor data)
116121
{
117122
data.CreateMethodPrototypeYaml(methodPrototypeDeclaration, this);

‎src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/Cs/PragmasExtensionsTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void should_get_attribute_source()
4949
[Fact]
5050
public void should_declare_property()
5151
{
52-
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);}";
52+
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; } }";
5353
var field = NSubstitute.Substitute.For<ITypeDeclaration>();
5454
field.Name.Returns("someField");
5555
field.Pragmas.Returns(new ReadOnlyCollection<IPragma>(new IPragma[]

‎src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/ax/.g/Onliners/types_with_name_attributes.g.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,14 @@ public string GetAttributeName(System.Globalization.CultureInfo culture)
458458
return this.Translate(_AttributeName, culture).Interpolate(this);
459459
}
460460

461+
public string AttributeName_raw
462+
{
463+
get
464+
{
465+
return _AttributeName;
466+
}
467+
}
468+
461469
public OnlinerString SomeClassVariable { get; }
462470

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

‎src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/ax/.g/Onliners/types_with_property_attributes.g.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ public string GetDescription(System.Globalization.CultureInfo culture)
1717
return this.Translate(_Description, culture).Interpolate(this);
1818
}
1919

20+
public string Description_raw
21+
{
22+
get
23+
{
24+
return _Description;
25+
}
26+
}
27+
2028
public OnlinerInt Counter { get; }
2129

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

‎src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/ax/units.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

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

1313
<ItemGroup>

‎src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/tia/.g/Onliners/types_with_name_attributes.g.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,14 @@ public string GetAttributeName(System.Globalization.CultureInfo culture)
458458
return this.Translate(_AttributeName, culture).Interpolate(this);
459459
}
460460

461+
public string AttributeName_raw
462+
{
463+
get
464+
{
465+
return _AttributeName;
466+
}
467+
}
468+
461469
public OnlinerString SomeClassVariable { get; }
462470

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

‎src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/tia/.g/Onliners/types_with_property_attributes.g.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ public string GetDescription(System.Globalization.CultureInfo culture)
1717
return this.Translate(_Description, culture).Interpolate(this);
1818
}
1919

20+
public string Description_raw
21+
{
22+
get
23+
{
24+
return _Description;
25+
}
26+
}
27+
2028
public OnlinerInt Counter { get; }
2129

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

0 commit comments

Comments
 (0)