Skip to content

Commit 6806d55

Browse files
IInspectableIInspectable
committed
Unbenutze identifierOrStringList aus identifierTargetNode Syntax entfernt.
1 parent b12133c commit 6806d55

File tree

14 files changed

+11
-159
lines changed

14 files changed

+11
-159
lines changed

‎Nav.Language.Extension2022/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="NavLanguageExtensions.IUnknown.679d829b-0b59-49b0-9984-16975abb7f9e" Version="5.9.0" Language="en-US" Publisher="Dipl.-Ing. Maximilian Hänel" />
4+
<Identity Id="NavLanguageExtensions.IUnknown.679d829b-0b59-49b0-9984-16975abb7f9e" Version="5.10.0" Language="en-US" Publisher="Dipl.-Ing. Maximilian Hänel" />
55
<DisplayName>Nav Language Extensions 2022</DisplayName>
66
<Description xml:space="preserve">Support for the Pharmatechnik Nav language like syntax highlighting and semantic analysis.</Description>
77
<MoreInfo>https://github.com/IInspectable/Nav.Language.Extensions</MoreInfo>

‎Nav.Language.Tests/Generated Tests/SyntaxTest.cs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -557,20 +557,6 @@ public void TestElseIfConditionClauseSyntax() {
557557
}
558558
}
559559

560-
[Test]
561-
[Description("Syntax: 'Identifier, \"StringLiteral\"'\r\n")]
562-
public void TestIdentifierOrStringListSyntax() {
563-
var identifierOrStringListSyntax =Syntax.ParseIdentifierOrStringList(SampleSyntax.Of<IdentifierOrStringListSyntax>());
564-
565-
foreach(var diagnostic in identifierOrStringListSyntax.SyntaxTree.Diagnostics) {
566-
Assert.Fail("Die Beispiels-Syntax führt zu Syntaxfehlern:\r\n{0}", diagnostic);
567-
}
568-
Assert.That(identifierOrStringListSyntax.SyntaxTree.Diagnostics.Length, Is.EqualTo(0));
569-
foreach (var token in identifierOrStringListSyntax.ChildTokens()) {
570-
Assert.That(token.IsMissing, Is.False, "Ein Token ist als 'fehlend' gekennzeichnet:\r\n{0}", token);
571-
}
572-
}
573-
574560
[Test]
575561
[Description("Syntax: '[namespaceprefix Namespace]'\r\n")]
576562
public void TestCodeNamespaceDeclarationSyntax() {

‎Nav.Language.Tests/Generated Tests/SyntaxWalkerTests.cs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -325,14 +325,6 @@ public override bool WalkElseIfConditionClause(ElseIfConditionClauseSyntax elseI
325325
public override void PostWalkElseIfConditionClause(ElseIfConditionClauseSyntax elseIfConditionClauseSyntax) {
326326
MethodsCalled["PostWalkElseIfConditionClause"] = true;
327327
}
328-
// IdentifierOrStringListSyntax
329-
public override bool WalkIdentifierOrStringList(IdentifierOrStringListSyntax identifierOrStringListSyntax) {
330-
MethodsCalled["WalkIdentifierOrStringList"] = true;
331-
return true;
332-
}
333-
public override void PostWalkIdentifierOrStringList(IdentifierOrStringListSyntax identifierOrStringListSyntax) {
334-
MethodsCalled["PostWalkIdentifierOrStringList"] = true;
335-
}
336328
// CodeNamespaceDeclarationSyntax
337329
public override bool WalkCodeNamespaceDeclaration(CodeNamespaceDeclarationSyntax codeNamespaceDeclarationSyntax) {
338330
MethodsCalled["WalkCodeNamespaceDeclaration"] = true;
@@ -639,12 +631,6 @@ public void TestWalkElseIfConditionClause() {
639631
Assert.That(MethodsCalled.ContainsKey("WalkElseIfConditionClause"), Is.True, "WalkElseIfConditionClause not called.");
640632
Assert.That(MethodsCalled.ContainsKey("PostWalkElseIfConditionClause"), Is.True, "PostWalkElseIfConditionClause not called.");
641633
}
642-
// IdentifierOrStringList
643-
[Test]
644-
public void TestWalkIdentifierOrStringList() {
645-
Assert.That(MethodsCalled.ContainsKey("WalkIdentifierOrStringList"), Is.True, "WalkIdentifierOrStringList not called.");
646-
Assert.That(MethodsCalled.ContainsKey("PostWalkIdentifierOrStringList"), Is.True, "PostWalkIdentifierOrStringList not called.");
647-
}
648634
// CodeNamespaceDeclaration
649635
[Test]
650636
public void TestWalkCodeNamespaceDeclaration() {

‎Nav.Language.Tests/Generated Tests/TokenPropertyNameTests.cs‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -756,25 +756,6 @@ public void TestElseIfConditionClauseSyntax() {
756756
}
757757
}
758758

759-
// IdentifierOrStringListSyntax
760-
[Test]
761-
public void TestIdentifierOrStringListSyntax() {
762-
763-
var tokenProps = typeof(IdentifierOrStringListSyntax).GetProperties(BindingFlags.Public | BindingFlags.Instance)
764-
.Where(m => m.PropertyType ==typeof(SyntaxToken)).ToList();
765-
if(!tokenProps.Any()) {
766-
return;
767-
}
768-
var syntax =Syntax.ParseIdentifierOrStringList(SampleSyntax.Of<IdentifierOrStringListSyntax>());
769-
foreach (var prop in tokenProps) {
770-
if(Attribute.IsDefined(prop, typeof(SuppressCodeSanityCheckAttribute))) {
771-
continue;
772-
}
773-
var tokenType = ((SyntaxToken)prop.GetValue(syntax, null)).Type;
774-
Assert.That(prop.Name, Is.EqualTo(tokenType.ToString()), "Der Name der Eigenschaft '{0}' sollte '{1}' lauten", prop.Name, tokenType);
775-
}
776-
}
777-
778759
// CodeNamespaceDeclarationSyntax
779760
[Test]
780761
public void TestCodeNamespaceDeclarationSyntax() {

‎Nav.Language.Tests/Resources/AllRules.nav‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ task T1 [code "code1"]
3232

3333
init --> Tx on Something if "Condition" do "Action1";
3434

35-
Tx:Exit o-> V1("Foo", "Bar") if "Condition" do "Action2";
35+
Tx:Exit o-> V1 if "Condition" do "Action2";
3636

3737
C1 --> V4 if "X";
3838
C1 --> V5 else if "Y";

‎Nav.Language.Tests/SyntaxTreeAllRulesTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void TestAllSyntaxesPresent() {
2727

2828
// Die Anzahl kann/darf sich über die Zeit auch ändern.
2929
// Blöd wäre nur, wenn hier keine Syntaxen gefunden würden ;-)
30-
Assert.That(nodeTypes.Count, Is.EqualTo(47));
30+
Assert.That(nodeTypes.Count, Is.EqualTo(46));
3131

3232
foreach (var nodeType in nodeTypes) {
3333

‎Nav.Language/Grammar/NavGrammar.g4‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ endTargetNode
148148
;
149149

150150
identifierTargetNode
151-
: Identifier (OpenParen identifierOrStringList CloseParen)?
151+
: Identifier
152152
;
153153

154154
conditionClause
@@ -187,10 +187,6 @@ signalTrigger
187187
: OnKeyword identifier
188188
;
189189

190-
identifierOrStringList
191-
: identifierOrString (Comma identifierOrString)*
192-
;
193-
194190
identifierOrString
195191
: identifier
196192
| stringLiteral

‎Nav.Language/Internal/NavGrammarVisitor.cs‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -466,16 +466,10 @@ public override SyntaxNode VisitEndTargetNode(NavGrammar.EndTargetNodeContext co
466466
public override SyntaxNode VisitIdentifierTargetNode(NavGrammar.IdentifierTargetNodeContext context) {
467467
var node = new IdentifierTargetNodeSyntax(
468468
extent:
469-
CreateExtent(context),
470-
identifierOrStringList:
471-
context.identifierOrStringList()
472-
.Optional(VisitIdentifierOrStringList)
473-
.OfSyntaxType<IdentifierOrStringListSyntax>()
469+
CreateExtent(context)
474470
);
475471

476472
CreateToken(node, context.Identifier(), TextClassification.Identifier);
477-
CreateToken(node, context.OpenParen(), TextClassification.Punctuation);
478-
CreateToken(node, context.CloseParen(), TextClassification.Punctuation);
479473

480474
return node;
481475
}
@@ -933,21 +927,7 @@ public override SyntaxNode VisitGenericType(NavGrammar.GenericTypeContext contex
933927
#endregion
934928

935929
#region IdentifierOrString
936-
937-
public override SyntaxNode VisitIdentifierOrStringList(NavGrammar.IdentifierOrStringListContext context) {
938-
939-
var node = new IdentifierOrStringListSyntax(CreateExtent(context),
940-
identifierOrStrings:
941-
context.identifierOrString()
942-
.ZeroOrMore(VisitIdentifierOrString)
943-
.OfSyntaxType<IdentifierOrStringSyntax>()
944-
.ToReadOnlyList(expectedCapacity: context.identifierOrString().Length)
945-
);
946-
947-
CreateTokens(node, context.Comma(), TextClassification.Punctuation);
948-
949-
return node;
950-
}
930+
951931

952932
public override SyntaxNode VisitIdentifierOrString(NavGrammar.IdentifierOrStringContext context) {
953933
if (context.identifier() != null) {

‎Nav.Language/Syntax/Generated/Syntax.Generated.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
//==================================================
3-
// HINWEIS: Diese Datei wurde am 23.01.2024 19:52:34
3+
// HINWEIS: Diese Datei wurde am 23.01.2024 20:55:41
44
// automatisch generiert!
55
//==================================================
66
namespace Pharmatechnik.Nav.Language {
@@ -165,10 +165,6 @@ public static class Syntax {
165165
return (DialogNodeDeclarationSyntax)SyntaxTree.ParseText(text, parser => parser.dialogNodeDeclaration(), filePath, null, cancellationToken).Root;
166166
}
167167

168-
public static IdentifierOrStringListSyntax ParseIdentifierOrStringList(string text, string filePath = null, CancellationToken cancellationToken = default(CancellationToken)) {
169-
return (IdentifierOrStringListSyntax)SyntaxTree.ParseText(text, parser => parser.identifierOrStringList(), filePath, null, cancellationToken).Root;
170-
}
171-
172168
public static CodeNamespaceDeclarationSyntax ParseCodeNamespaceDeclaration(string text, string filePath = null, CancellationToken cancellationToken = default(CancellationToken)) {
173169
return (CodeNamespaceDeclarationSyntax)SyntaxTree.ParseText(text, parser => parser.codeNamespaceDeclaration(), filePath, null, cancellationToken).Root;
174170
}

‎Nav.Language/Syntax/Generated/SyntaxNodeVisitor.Generated.cs‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
//==================================================
3-
// HINWEIS: Diese Datei wurde am 23.01.2024 19:52:27
3+
// HINWEIS: Diese Datei wurde am 23.01.2024 20:55:46
44
// automatisch generiert!
55
//==================================================
66
namespace Pharmatechnik.Nav.Language {
@@ -226,15 +226,6 @@ internal override T Accept<T>(ISyntaxNodeVisitor<T> visitor) {
226226
}
227227
}
228228

229-
partial class IdentifierOrStringListSyntax {
230-
internal override void Accept(ISyntaxNodeVisitor visitor) {
231-
visitor.VisitIdentifierOrStringList(this);
232-
}
233-
internal override T Accept<T>(ISyntaxNodeVisitor<T> visitor) {
234-
return visitor.VisitIdentifierOrStringList(this);
235-
}
236-
}
237-
238229
partial class IdentifierSourceNodeSyntax {
239230
internal override void Accept(ISyntaxNodeVisitor visitor) {
240231
visitor.VisitIdentifierSourceNode(this);
@@ -458,7 +449,6 @@ public interface ISyntaxNodeVisitor {
458449
void VisitExitTransitionDefinition(ExitTransitionDefinitionSyntax exitTransitionDefinitionSyntax);
459450
void VisitGenericType(GenericTypeSyntax genericTypeSyntax);
460451
void VisitGoToEdge(GoToEdgeSyntax goToEdgeSyntax);
461-
void VisitIdentifierOrStringList(IdentifierOrStringListSyntax identifierOrStringListSyntax);
462452
void VisitIdentifierSourceNode(IdentifierSourceNodeSyntax identifierSourceNodeSyntax);
463453
void VisitIdentifier(IdentifierSyntax identifierSyntax);
464454
void VisitIdentifierTargetNode(IdentifierTargetNodeSyntax identifierTargetNodeSyntax);
@@ -648,10 +638,6 @@ public virtual void VisitDialogNodeDeclaration(DialogNodeDeclarationSyntax dialo
648638
DefaultVisit(dialogNodeDeclarationSyntax);
649639
}
650640

651-
public virtual void VisitIdentifierOrStringList(IdentifierOrStringListSyntax identifierOrStringListSyntax) {
652-
DefaultVisit(identifierOrStringListSyntax);
653-
}
654-
655641
public virtual void VisitCodeNamespaceDeclaration(CodeNamespaceDeclarationSyntax codeNamespaceDeclarationSyntax) {
656642
DefaultVisit(codeNamespaceDeclarationSyntax);
657643
}
@@ -722,7 +708,6 @@ public interface ISyntaxNodeVisitor<T> {
722708
T VisitCodeResultDeclaration(CodeResultDeclarationSyntax codeResultDeclarationSyntax);
723709
T VisitElseIfConditionClause(ElseIfConditionClauseSyntax elseIfConditionClauseSyntax);
724710
T VisitDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNodeDeclarationSyntax);
725-
T VisitIdentifierOrStringList(IdentifierOrStringListSyntax identifierOrStringListSyntax);
726711
T VisitCodeNamespaceDeclaration(CodeNamespaceDeclarationSyntax codeNamespaceDeclarationSyntax);
727712
T VisitExitTransitionDefinition(ExitTransitionDefinitionSyntax exitTransitionDefinitionSyntax);
728713
T VisitCodeGenerateToDeclaration(CodeGenerateToDeclarationSyntax codeGenerateToDeclarationSyntax);
@@ -898,10 +883,6 @@ public virtual T VisitDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNo
898883
return DefaultVisit(dialogNodeDeclarationSyntax);
899884
}
900885

901-
public virtual T VisitIdentifierOrStringList(IdentifierOrStringListSyntax identifierOrStringListSyntax) {
902-
return DefaultVisit(identifierOrStringListSyntax);
903-
}
904-
905886
public virtual T VisitCodeNamespaceDeclaration(CodeNamespaceDeclarationSyntax codeNamespaceDeclarationSyntax) {
906887
return DefaultVisit(codeNamespaceDeclarationSyntax);
907888
}

0 commit comments

Comments
 (0)