Merge pull request #45624 from 333fred/vb-newline-fixes

VB Generator Fixes

src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/GreenNodes/GreenNodeWriter.vb

@@ -848,15 +848,15 @@ Friend Class GreenNodeWriter
         ' visit all children
         For i = 0 To allChildren.Count - 1
             If allChildren(i).IsList Then
-                _writer.WriteLine("            Dim {0} = VisitList(node.{1})" + vbCrLf +
+                _writer.WriteLine("            Dim {0} = VisitList(node.{1})" + Environment.NewLine +
                                   "            If node.{2} IsNot {0}.Node Then anyChanges = True",
                                   ChildNewVarName(allChildren(i)), ChildPropertyName(allChildren(i)), ChildVarName(allChildren(i)))
             ElseIf KindTypeStructure(allChildren(i).ChildKind).IsToken Then
-                _writer.WriteLine("            Dim {0} = DirectCast(Visit(node.{2}), {1})" + vbCrLf +
+                _writer.WriteLine("            Dim {0} = DirectCast(Visit(node.{2}), {1})" + Environment.NewLine +
                                   "            If node.{3} IsNot {0} Then anyChanges = True",
                                   ChildNewVarName(allChildren(i)), BaseTypeReference(allChildren(i)), ChildPropertyName(allChildren(i)), ChildVarName(allChildren(i)))
             Else
-                _writer.WriteLine("            Dim {0} = DirectCast(Visit(node.{2}), {1})" + vbCrLf +
+                _writer.WriteLine("            Dim {0} = DirectCast(Visit(node.{2}), {1})" + Environment.NewLine +
                                   "            If node.{2} IsNot {0} Then anyChanges = True",
                                   ChildNewVarName(allChildren(i)), ChildPropertyTypeRef(nodeStructure, allChildren(i)), ChildVarName(allChildren(i)))
             End If

src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/RedNodes/RedNodeWriter.vb

@@ -168,7 +168,7 @@ Friend Class RedNodeWriter
                 _writer.Write("            Case SyntaxKind." & kind.Name)
                 first = False
             Else
-                _writer.Write("," & vbCrLf)
+                _writer.Write("," & Environment.NewLine)
                 _writer.Write("                 SyntaxKind." & kind.Name)
 
             End If
@@ -1170,11 +1170,11 @@ Friend Class RedNodeWriter
                 End If
 
             ElseIf KindTypeStructure(child.ChildKind).IsToken Then
-                _writer.WriteLine("            Dim {0} = DirectCast(VisitToken(node.{2}).Node, {3})" + vbCrLf +
+                _writer.WriteLine("            Dim {0} = DirectCast(VisitToken(node.{2}).Node, {3})" + Environment.NewLine +
                                   "            If node.{2}.Node IsNot {0} Then anyChanges = True",
                                   ChildNewVarName(child), BaseTypeReference(child), ChildPropertyName(child), ChildConstructorTypeRef(child))
             Else
-                _writer.WriteLine("            Dim {0} = DirectCast(Visit(node.{2}), {1})" + vbCrLf +
+                _writer.WriteLine("            Dim {0} = DirectCast(Visit(node.{2}), {1})" + Environment.NewLine +
                                   "            If node.{2} IsNot {0} Then anyChanges = True",
                                   ChildNewVarName(child), ChildPropertyTypeRef(nodeStructure, child), ChildPropertyName(child))
             End If

src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/RedNodes/SyntaxFactsWriter.vb

@@ -86,6 +86,10 @@ Public Class SyntaxFactsWriter
                     tokenText = tokenText.Replace("""", """""")
                 End If
 
+                If tokenText IsNot Nothing AndAlso tokenText.Contains(vbCrLf) Then
+                    tokenText = tokenText.Replace(vbCrLf, Environment.NewLine)
+                End If
+
                 If tokenText <> Nothing Then
                     _writer.WriteLine("                Case SyntaxKind.{0}", kind.Name)