Testfixes

IInspectable · IInspectable · commit b12133c58a7e · 2024-01-23T20:15:45.000+01:00
diff --git a/Nav.Language.Extensions.sln.DotSettings.user b/Nav.Language.Extensions.sln.DotSettings.user
@@ -35,7 +35,7 @@
   &lt;Assembly Path="C:\Users\mnhaenel\.nuget\packages\microsoft.visualstudio.languageservices\3.0.0\lib\net472\Microsoft.VisualStudio.LanguageServices.dll" /&gt;&#xD;
   &lt;Assembly Path="C:\Users\mnhaenel\.nuget\packages\microsoft.codeanalysis.workspaces.common\3.0.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll" /&gt;&#xD;
 &lt;/AssemblyExplorer&gt;</s:String>
-	<s:Int64 x:Key="/Default/Environment/Hierarchy/GeneratedFilesCacheKey/Timestamp/@EntryValue">61</s:Int64>
+	<s:Int64 x:Key="/Default/Environment/Hierarchy/GeneratedFilesCacheKey/Timestamp/@EntryValue">69</s:Int64>
 	<s:Int64 x:Key="/Default/Environment/SearchAndNavigation/DefaultOccurrencesGroupingIndex/@EntryValue">9</s:Int64>
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=feaddfeb_002Df637_002D4617_002D9064_002D9a3a39cea9ba/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="TestGeneratedPaths" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
   &lt;TestAncestor&gt;&#xD;
@@ -44,6 +44,8 @@
     &lt;TestId&gt;NUnit3x::6F82F651-4D21-467D-BD83-68C743BC8DF4::.NETFramework,Version=v4.7.2::Nav.Language.Tests.RegressionTests.TestCase&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;NUnit3x::6F82F651-4D21-467D-BD83-68C743BC8DF4::.NETFramework,Version=v4.7.2::Nav.Language.Tests.CodeGenTests&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;NUnit3x::6F82F651-4D21-467D-BD83-68C743BC8DF4::.NETFramework,Version=v4.7.2::Nav.Language.Tests.DiagnosticTests&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;NUnit3x::6F82F651-4D21-467D-BD83-68C743BC8DF4::.NETFramework,Version=v4.7.2::Nav.Language.Tests.SyntaxTreeTests.TestTransitionDefinitionBlock&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;NUnit3x::6F82F651-4D21-467D-BD83-68C743BC8DF4::.NETFramework,Version=v4.7.2::Nav.Language.Tests.DescendantNodesTests.CountSyntaxNodeTest1&lt;/TestId&gt;&#xD;
   &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
 	<s:String x:Key="/Default/Environment/UpdatesManger/LastUpdateCheck/@EntryValue">10/19/2022 09:50:12</s:String>
diff --git a/Nav.Language.Tests/DescendantNodesTests.cs b/Nav.Language.Tests/DescendantNodesTests.cs
@@ -68,7 +68,7 @@ public void CountTaskDefinitionSyntaxTest() {
     public void CountSyntaxNodeTest1() {
         Assert.That(
             _codegenerationUnitSyntax.DescendantNodes<SyntaxNode>().Count(),
-            Is.EqualTo(32)
+            Is.EqualTo(31)
         );
     }
 
diff --git a/Nav.Language.Tests/Diagnostics/Tests/Nav0026TriggerWithName0AlreadyDeclared.nav b/Nav.Language.Tests/Diagnostics/Tests/Nav0026TriggerWithName0AlreadyDeclared.nav
diff --git a/Nav.Language.Tests/Diagnostics/Tests/Nav0201SpontNotAllowedInSignalTrigger.nav b/Nav.Language.Tests/Diagnostics/Tests/Nav0201SpontNotAllowedInSignalTrigger.nav
diff --git a/Nav.Language.Tests/Diagnostics/Tests/Nav0201SpontaneousNotAllowedInSignalTrigger.nav b/Nav.Language.Tests/Diagnostics/Tests/Nav0201SpontaneousNotAllowedInSignalTrigger.nav
diff --git a/Nav.Language.Tests/Nav.Language.Tests.csproj b/Nav.Language.Tests/Nav.Language.Tests.csproj
@@ -81,7 +81,6 @@
     <Content Include="Diagnostics\Tests\Nav0024OutgoingEdgeForExit0AlreadyDeclared.nav" />
     <Content Include="Diagnostics\Tests\Nav0025NoOutgoingEdgeForExit0Declared_1Edges.nav" />
     <Content Include="Diagnostics\Tests\Nav0025NoOutgoingEdgeForExit0Declared_2Edges.nav" />
-    <Content Include="Diagnostics\Tests\Nav0026TriggerWithName0AlreadyDeclared.nav" />
     <Content Include="Diagnostics\Tests\Nav0100TaskNode0MustNotContainLeavingEdges.nav" />
     <Content Include="Diagnostics\Tests\Nav0101ExitNodeMustNotContainLeavingEdges.nav" />
     <Content Include="Diagnostics\Tests\Nav0103InitNodeMustNotContainIncomingEdges_ExitTransition.nav" />
@@ -111,8 +110,6 @@
     <Content Include="Diagnostics\Tests\Nav0116ViewNode0HasNoIncomingEdges_2Edges.nav" />
     <Content Include="Diagnostics\Tests\Nav0117ViewNode0HasNoOutgoingEdges_2Edges.nav" />
     <Content Include="Diagnostics\Tests\Nav0200SignalTriggerNotAllowedAfterInit.nav" />
-    <Content Include="Diagnostics\Tests\Nav0201SpontaneousNotAllowedInSignalTrigger.nav" />
-    <Content Include="Diagnostics\Tests\Nav0201SpontNotAllowedInSignalTrigger.nav" />
     <Content Include="Diagnostics\Tests\Nav0203TriggerNotAllowedAfterChoice.nav" />
     <Content Include="Diagnostics\Tests\Nav0220ConditionsAreOnlySupportedAfterInitAndChoiceNodesElse.nav" />
     <Content Include="Diagnostics\Tests\Nav0220ConditionsAreOnlySupportedAfterInitAndChoiceNodesIf.nav" />
diff --git a/Nav.Language.Tests/Resources/AllRules.nav b/Nav.Language.Tests/Resources/AllRules.nav
@@ -30,9 +30,9 @@ task T1 [code "code1"]
 	dialog D1;
 	view V1;
 
-	init --> Tx on "Something"  if "Condition" do "Action1";
+	init --> Tx on Something  if "Condition" do "Action1";
 
-	Tx:Exit o-> V1 if "Condition" do "Action2";
+	Tx:Exit o-> V1("Foo", "Bar") if "Condition" do "Action2";
 
 	C1 --> V4 if "X";
 	C1 --> V5 else if "Y";
diff --git a/Nav.Language.Tests/Resources/SingleFile.nav b/Nav.Language.Tests/Resources/SingleFile.nav
@@ -26,5 +26,5 @@ task ConfirmDialog 					[code "public enum ConfirmDialogResult { Yes, No };"]
     init --> ConfirmDialög;
 
     ConfirmDialög --> Yes on Yes_Clicked;
-    ConfirmDialög --> No  on No_Clicked, Close;
+    ConfirmDialög --> No  on No_Clicked;
 }
diff --git a/Nav.Language/Nav.Language.csproj b/Nav.Language/Nav.Language.csproj
@@ -57,6 +57,40 @@
       <CustomToolNamespace>Pharmatechnik.Nav.Language.Generated</CustomToolNamespace>
     </Antlr4>
   </ItemGroup>
+  <ItemGroup>
+    <None Update="Syntax\Generated\Syntax.Generated.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Syntax.Generated.cs</LastGenOutput>
+    </None>
+    <None Update="Syntax\Generated\SyntaxNodeVisitor.Generated.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>SyntaxNodeVisitor.Generated.cs</LastGenOutput>
+    </None>
+    <None Update="Syntax\Generated\SyntaxNodeWalker.Generated.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>SyntaxNodeWalker.Generated.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Syntax\Generated\Syntax.Generated.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Syntax.Generated.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Syntax\Generated\SyntaxNodeVisitor.Generated.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>SyntaxNodeVisitor.Generated.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Syntax\Generated\SyntaxNodeWalker.Generated.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>SyntaxNodeWalker.Generated.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
 
   <Import Project="..\JetBrains.Annotations\JetBrains.Annotations.projitems" Label="Shared" />
   <Import Project="CustomBuild.targets" />
diff --git a/Nav.Language/Syntax/Generated/Syntax.Generated.cs b/Nav.Language/Syntax/Generated/Syntax.Generated.cs
@@ -1,6 +1,6 @@
 ﻿ 
 //==================================================
-// HINWEIS: Diese Datei wurde am 04.05.2018 21:36:14
+// HINWEIS: Diese Datei wurde am 23.01.2024 19:52:34
 //			automatisch generiert!
 //==================================================
 namespace Pharmatechnik.Nav.Language {
@@ -157,14 +157,14 @@ public static class Syntax {
 			return (CodeResultDeclarationSyntax)SyntaxTree.ParseText(text, parser => parser.codeResultDeclaration(), filePath, null, cancellationToken).Root;		
 		}
 
-		public static DialogNodeDeclarationSyntax ParseDialogNodeDeclaration(string text, string filePath = null, CancellationToken cancellationToken = default(CancellationToken)) {
-			return (DialogNodeDeclarationSyntax)SyntaxTree.ParseText(text, parser => parser.dialogNodeDeclaration(), filePath, null, cancellationToken).Root;		
-		}
-
 		public static ElseIfConditionClauseSyntax ParseElseIfConditionClause(string text, string filePath = null, CancellationToken cancellationToken = default(CancellationToken)) {
 			return (ElseIfConditionClauseSyntax)SyntaxTree.ParseText(text, parser => parser.elseIfConditionClause(), filePath, null, cancellationToken).Root;		
 		}
 
+		public static DialogNodeDeclarationSyntax ParseDialogNodeDeclaration(string text, string filePath = null, CancellationToken cancellationToken = default(CancellationToken)) {
+			return (DialogNodeDeclarationSyntax)SyntaxTree.ParseText(text, parser => parser.dialogNodeDeclaration(), filePath, null, cancellationToken).Root;		
+		}
+
 		public static IdentifierOrStringListSyntax ParseIdentifierOrStringList(string text, string filePath = null, CancellationToken cancellationToken = default(CancellationToken)) {
 			return (IdentifierOrStringListSyntax)SyntaxTree.ParseText(text, parser => parser.identifierOrStringList(), filePath, null, cancellationToken).Root;		
 		}
diff --git a/Nav.Language/Syntax/Generated/SyntaxNodeVisitor.Generated.cs b/Nav.Language/Syntax/Generated/SyntaxNodeVisitor.Generated.cs
@@ -1,6 +1,6 @@
 ﻿ 
 //==================================================
-// HINWEIS: Diese Datei wurde am 14.05.2017 14:16:42
+// HINWEIS: Diese Datei wurde am 23.01.2024 19:52:27
 //			automatisch generiert!
 //==================================================
 namespace Pharmatechnik.Nav.Language {
@@ -640,14 +640,14 @@ public virtual void VisitCodeResultDeclaration(CodeResultDeclarationSyntax codeR
 			DefaultVisit(codeResultDeclarationSyntax);
 		}
 
-		public virtual void VisitDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNodeDeclarationSyntax) {
-			DefaultVisit(dialogNodeDeclarationSyntax);
-		}
-
 		public virtual void VisitElseIfConditionClause(ElseIfConditionClauseSyntax elseIfConditionClauseSyntax) {
 			DefaultVisit(elseIfConditionClauseSyntax);
 		}
 
+		public virtual void VisitDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNodeDeclarationSyntax) {
+			DefaultVisit(dialogNodeDeclarationSyntax);
+		}
+
 		public virtual void VisitIdentifierOrStringList(IdentifierOrStringListSyntax identifierOrStringListSyntax) {
 			DefaultVisit(identifierOrStringListSyntax);
 		}
@@ -720,8 +720,8 @@ public interface ISyntaxNodeVisitor<T> {
 		T VisitChoiceNodeDeclaration(ChoiceNodeDeclarationSyntax choiceNodeDeclarationSyntax); 
 		T VisitCodeParamsDeclaration(CodeParamsDeclarationSyntax codeParamsDeclarationSyntax); 
 		T VisitCodeResultDeclaration(CodeResultDeclarationSyntax codeResultDeclarationSyntax); 
-		T VisitDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNodeDeclarationSyntax); 
 		T VisitElseIfConditionClause(ElseIfConditionClauseSyntax elseIfConditionClauseSyntax); 
+		T VisitDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNodeDeclarationSyntax); 
 		T VisitIdentifierOrStringList(IdentifierOrStringListSyntax identifierOrStringListSyntax); 
 		T VisitCodeNamespaceDeclaration(CodeNamespaceDeclarationSyntax codeNamespaceDeclarationSyntax); 
 		T VisitExitTransitionDefinition(ExitTransitionDefinitionSyntax exitTransitionDefinitionSyntax); 
@@ -890,14 +890,14 @@ public virtual T VisitCodeResultDeclaration(CodeResultDeclarationSyntax codeResu
 			return DefaultVisit(codeResultDeclarationSyntax);
 		}
 
-		public virtual T VisitDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNodeDeclarationSyntax) {
-			return DefaultVisit(dialogNodeDeclarationSyntax);
-		}
-
 		public virtual T VisitElseIfConditionClause(ElseIfConditionClauseSyntax elseIfConditionClauseSyntax) {
 			return DefaultVisit(elseIfConditionClauseSyntax);
 		}
 
+		public virtual T VisitDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNodeDeclarationSyntax) {
+			return DefaultVisit(dialogNodeDeclarationSyntax);
+		}
+
 		public virtual T VisitIdentifierOrStringList(IdentifierOrStringListSyntax identifierOrStringListSyntax) {
 			return DefaultVisit(identifierOrStringListSyntax);
 		}
diff --git a/Nav.Language/Syntax/Generated/SyntaxNodeWalker.Generated.cs b/Nav.Language/Syntax/Generated/SyntaxNodeWalker.Generated.cs
@@ -1,6 +1,6 @@
 ﻿ 
 //==================================================
-// HINWEIS: Diese Datei wurde am 14.05.2017 14:16:42
+// HINWEIS: Diese Datei wurde am 23.01.2024 19:52:21
 //			automatisch generiert!
 //==================================================
 namespace Pharmatechnik.Nav.Language {
@@ -735,14 +735,14 @@ public virtual void PostWalkCodeParamsDeclaration(CodeParamsDeclarationSyntax co
 		public virtual bool WalkCodeResultDeclaration(CodeResultDeclarationSyntax codeResultDeclarationSyntax) { return DefaultWalk(codeResultDeclarationSyntax); }
 		public virtual void PostWalkCodeResultDeclaration(CodeResultDeclarationSyntax codeResultDeclarationSyntax) { }
 
-		// DialogNodeDeclarationSyntax
-		public virtual bool WalkDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNodeDeclarationSyntax) { return DefaultWalk(dialogNodeDeclarationSyntax); }
-		public virtual void PostWalkDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNodeDeclarationSyntax) { }
-
 		// ElseIfConditionClauseSyntax
 		public virtual bool WalkElseIfConditionClause(ElseIfConditionClauseSyntax elseIfConditionClauseSyntax) { return DefaultWalk(elseIfConditionClauseSyntax); }
 		public virtual void PostWalkElseIfConditionClause(ElseIfConditionClauseSyntax elseIfConditionClauseSyntax) { }
 
+		// DialogNodeDeclarationSyntax
+		public virtual bool WalkDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNodeDeclarationSyntax) { return DefaultWalk(dialogNodeDeclarationSyntax); }
+		public virtual void PostWalkDialogNodeDeclaration(DialogNodeDeclarationSyntax dialogNodeDeclarationSyntax) { }
+
 		// IdentifierOrStringListSyntax
 		public virtual bool WalkIdentifierOrStringList(IdentifierOrStringListSyntax identifierOrStringListSyntax) { return DefaultWalk(identifierOrStringListSyntax); }
 		public virtual void PostWalkIdentifierOrStringList(IdentifierOrStringListSyntax identifierOrStringListSyntax) { }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void CountTaskDefinitionSyntaxTest() {`
`68`	`68`	`public void CountSyntaxNodeTest1() {`
`69`	`69`	`Assert.That(`
`70`	`70`	`_codegenerationUnitSyntax.DescendantNodes<SyntaxNode>().Count(),`
`71`		`- Is.EqualTo(32)`
	`71`	`+ Is.EqualTo(31)`
`72`	`72`	`);`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,5 @@ task ConfirmDialog [code "public enum ConfirmDialogResult { Yes, No };"]`
`26`	`26`	`init --> ConfirmDialög;`
`27`	`27`
`28`	`28`	`ConfirmDialög --> Yes on Yes_Clicked;`
`29`		`- ConfirmDialög --> No on No_Clicked, Close;`
	`29`	`+ ConfirmDialög --> No on No_Clicked;`
`30`	`30`	`}`