Skip to content
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

Cs to vb trivia #517

Merged
merged 16 commits into from
Feb 3, 2020
Merged

Cs to vb trivia #517

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
106ea30
Integrate trivia conversion code from paul1956
GrahamTheCoder Feb 3, 2020
3c10acd
Remove unused
GrahamTheCoder Feb 3, 2020
4866950
Replace InvariantCulture with Ordinal
GrahamTheCoder Feb 3, 2020
da30d95
Clarify existing utils
GrahamTheCoder Feb 3, 2020
af8c1cf
Add slightly modified util from same repo
GrahamTheCoder Feb 3, 2020
f738f7e
Get code compiling
GrahamTheCoder Feb 3, 2020
12e9150
Attempt to integrate - lots of stackoverflowexception
GrahamTheCoder Feb 3, 2020
8948f5a
Extract method
GrahamTheCoder Feb 3, 2020
094faf8
Fix ordering bug where != wouldn't have worked
GrahamTheCoder Feb 3, 2020
29f6862
Remove unused
GrahamTheCoder Feb 3, 2020
8b540c0
Recharacterize
GrahamTheCoder Feb 3, 2020
f67fe79
Change comments to match new behaviour
GrahamTheCoder Feb 3, 2020
523cdd0
Box up ported methods to allow thread safety with depth parameter
GrahamTheCoder Feb 3, 2020
de6ac63
Consolidate code to avoid duplication
GrahamTheCoder Feb 3, 2020
773cbc5
Tidying up
GrahamTheCoder Feb 3, 2020
782ef61
Try to cut down inconsistent newline handling
GrahamTheCoder Feb 3, 2020
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
Prev Previous commit
Next Next commit
Replace InvariantCulture with Ordinal
  • Loading branch information
@GrahamTheCoder
GrahamTheCoder committed Feb 3, 2020
commit 4866950edb884bbee15f406ccdf403e1e08dcea4
50 changes: 25 additions & 25 deletions ICSharpCode.CodeConverter/VB/Trivia/SyntaxNodeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,48 +176,48 @@ internal static List<SyntaxTrivia> ConvertDirectiveTrivia(this string OriginalTe
{
string Text = OriginalText.Trim(' ');
var ResultTrivia = new List<SyntaxTrivia>();
Debug.Assert(Text.StartsWith("#", StringComparison.InvariantCulture), "All directives must start with #");
Debug.Assert(Text.StartsWith("#", StringComparison.Ordinal), "All directives must start with #");

if (Text.StartsWith("#if", StringComparison.InvariantCulture) || Text.StartsWith("#elif", StringComparison.InvariantCulture))
if (Text.StartsWith("#if", StringComparison.Ordinal) || Text.StartsWith("#elif", StringComparison.Ordinal))
{
string Expression1 = Text.Replace("#if ", "", StringComparison.InvariantCulture).Replace("#elif ", "", StringComparison.InvariantCulture).Replace("!", "Not ", StringComparison.InvariantCulture).Replace("==", "=", StringComparison.InvariantCulture).Replace("!=", "<>", StringComparison.InvariantCulture).Replace("&&", "And", StringComparison.InvariantCulture).Replace("||", "Or", StringComparison.InvariantCulture).Replace(" ", " ", StringComparison.InvariantCulture).Replace("false", "False", StringComparison.InvariantCulture).Replace("true", "True", StringComparison.InvariantCulture).Replace("//", " ' ", StringComparison.InvariantCulture).Replace(" ", " ", StringComparison.InvariantCulture);
string Expression1 = Text.Replace("#if ", "", StringComparison.Ordinal).Replace("#elif ", "", StringComparison.Ordinal).Replace("!", "Not ", StringComparison.Ordinal).Replace("==", "=", StringComparison.Ordinal).Replace("!=", "<>", StringComparison.Ordinal).Replace("&&", "And", StringComparison.Ordinal).Replace("||", "Or", StringComparison.Ordinal).Replace(" ", " ", StringComparison.Ordinal).Replace("false", "False", StringComparison.Ordinal).Replace("true", "True", StringComparison.Ordinal).Replace("//", " ' ", StringComparison.Ordinal).Replace(" ", " ", StringComparison.Ordinal);

var Kind = Text.StartsWith("#if", StringComparison.InvariantCulture) ? VB.SyntaxKind.IfDirectiveTrivia : VB.SyntaxKind.ElseIfDirectiveTrivia;
var IfOrElseIfKeyword = Text.StartsWith("#if", StringComparison.InvariantCulture) ? global::VisualBasicSyntaxFactory.IfKeyword : global::VisualBasicSyntaxFactory.ElseIfKeyword;
var Kind = Text.StartsWith("#if", StringComparison.Ordinal) ? VB.SyntaxKind.IfDirectiveTrivia : VB.SyntaxKind.ElseIfDirectiveTrivia;
var IfOrElseIfKeyword = Text.StartsWith("#if", StringComparison.Ordinal) ? global::VisualBasicSyntaxFactory.IfKeyword : global::VisualBasicSyntaxFactory.ElseIfKeyword;
var Expr = VBFactory.ParseExpression(Expression1);
var IfDirectiveTrivia = VBFactory.IfDirectiveTrivia(IfOrElseIfKeyword, Expr);
ResultTrivia.Add(VBFactory.Trivia(IfDirectiveTrivia));
return ResultTrivia;
}
if (Text.StartsWith("#region", StringComparison.InvariantCulture) || Text.StartsWith("# region", StringComparison.InvariantCulture))
if (Text.StartsWith("#region", StringComparison.Ordinal) || Text.StartsWith("# region", StringComparison.Ordinal))
{
ResultTrivia.AddRange(CS.SyntaxFactory.ParseLeadingTrivia(Text).ConvertTrivia());
return ResultTrivia;
}
if (Text.StartsWith("#endregion", StringComparison.InvariantCulture))
if (Text.StartsWith("#endregion", StringComparison.Ordinal))
{
ResultTrivia.Add(VBFactory.Trivia(VBFactory.EndRegionDirectiveTrivia()));
Text = Text.Replace("#endregion", "", StringComparison.InvariantCulture);
Text = Text.Replace("#endregion", "", StringComparison.Ordinal);
if (Text.Length > 0)
{
Debugger.Break();
}
return ResultTrivia;
}
if (Text.StartsWith("#else", StringComparison.InvariantCulture))
if (Text.StartsWith("#else", StringComparison.Ordinal))
{
var ElseKeywordWithTrailingTrivia = global::VisualBasicSyntaxFactory.ElseKeyword.WithTrailingTrivia(CS.SyntaxFactory.ParseTrailingTrivia(Text.Replace("#else", "", StringComparison.InvariantCulture)).ConvertTrivia());
var ElseKeywordWithTrailingTrivia = global::VisualBasicSyntaxFactory.ElseKeyword.WithTrailingTrivia(CS.SyntaxFactory.ParseTrailingTrivia(Text.Replace("#else", "", StringComparison.Ordinal)).ConvertTrivia());
ResultTrivia.Add(VBFactory.Trivia(VBFactory.ElseDirectiveTrivia(global::VisualBasicSyntaxFactory.HashToken, ElseKeywordWithTrailingTrivia)));
return ResultTrivia;
}
if (Text.StartsWith("#endif", StringComparison.InvariantCulture))
if (Text.StartsWith("#endif", StringComparison.Ordinal))
{
Text = Text.Replace("#endif", "", StringComparison.InvariantCulture);
var IfKeywordWithTrailingTrivia = global::VisualBasicSyntaxFactory.IfKeyword.WithTrailingTrivia(CS.SyntaxFactory.ParseTrailingTrivia(Text.Replace("#endif", "", StringComparison.InvariantCulture)).ConvertTrivia());
Text = Text.Replace("#endif", "", StringComparison.Ordinal);
var IfKeywordWithTrailingTrivia = global::VisualBasicSyntaxFactory.IfKeyword.WithTrailingTrivia(CS.SyntaxFactory.ParseTrailingTrivia(Text.Replace("#endif", "", StringComparison.Ordinal)).ConvertTrivia());
ResultTrivia.Add(VBFactory.Trivia(VBFactory.EndIfDirectiveTrivia(global::VisualBasicSyntaxFactory.HashToken, global::VisualBasicSyntaxFactory.EndKeyword, IfKeywordWithTrailingTrivia)));
return ResultTrivia;
}
if (Text.StartsWith("#pragma warning", StringComparison.InvariantCulture))
if (Text.StartsWith("#pragma warning", StringComparison.Ordinal))
{
ResultTrivia.AddRange(CS.SyntaxFactory.ParseLeadingTrivia(Text).ConvertTrivia());
return ResultTrivia;
Expand Down Expand Up @@ -1041,7 +1041,7 @@ public static SyntaxTrivia ConvertTrivia(this SyntaxTrivia t)

case (int)CS.SyntaxKind.SingleLineCommentTrivia:
{
if (t.ToFullString().EndsWith("*/", StringComparison.InvariantCulture))
if (t.ToFullString().EndsWith("*/", StringComparison.Ordinal))
{
return VBFactory.CommentTrivia($"'{ReplaceLeadingSlashes(t.ToFullString().Substring(2, t.ToFullString().Length - 4))}");
}
Expand All @@ -1050,11 +1050,11 @@ public static SyntaxTrivia ConvertTrivia(this SyntaxTrivia t)

case (int)CS.SyntaxKind.MultiLineCommentTrivia:
{
if (t.ToFullString().EndsWith("*/", StringComparison.InvariantCulture))
if (t.ToFullString().EndsWith("*/", StringComparison.Ordinal))
{
return VBFactory.CommentTrivia($"'{ReplaceLeadingSlashes(t.ToFullString().Substring(2, t.ToFullString().Length - 4)).Replace(Constants.vbLf, "", StringComparison.InvariantCulture)}");
return VBFactory.CommentTrivia($"'{ReplaceLeadingSlashes(t.ToFullString().Substring(2, t.ToFullString().Length - 4)).Replace(Constants.vbLf, "", StringComparison.Ordinal)}");
}
return VBFactory.CommentTrivia($"'{ReplaceLeadingSlashes(t.ToFullString().Substring(2)).Replace(Constants.vbLf, "", StringComparison.InvariantCulture)}");
return VBFactory.CommentTrivia($"'{ReplaceLeadingSlashes(t.ToFullString().Substring(2)).Replace(Constants.vbLf, "", StringComparison.Ordinal)}");
}

case (int)CS.SyntaxKind.DocumentationCommentExteriorTrivia:
Expand All @@ -1068,7 +1068,7 @@ public static SyntaxTrivia ConvertTrivia(this SyntaxTrivia t)
{
return VBFactory.DisabledTextTrivia(t.ToString().WithoutNewLines(' '));
}
return VBFactory.DisabledTextTrivia(t.ToString().Replace(Constants.vbLf, Constants.vbCrLf, StringComparison.InvariantCulture));
return VBFactory.DisabledTextTrivia(t.ToString().Replace(Constants.vbLf, Constants.vbCrLf, StringComparison.Ordinal));
}

case (int)CS.SyntaxKind.PreprocessingMessageTrivia:
Expand Down Expand Up @@ -1136,7 +1136,7 @@ public static SyntaxTrivia ConvertTrivia(this SyntaxTrivia t)
global::RestuructureSeparatedLists.IgnoredIfDepth += 1;
}
CSS.IfDirectiveTriviaSyntax IfDirective = (CSS.IfDirectiveTriviaSyntax)StructuredTrivia;
string Expression1 = IfDirective.Condition.ToString().Replace("!", "Not ", StringComparison.InvariantCulture).Replace("==", "=", StringComparison.InvariantCulture).Replace("!=", "<>", StringComparison.InvariantCulture).Replace("&&", "And", StringComparison.InvariantCulture).Replace("||", "Or", StringComparison.InvariantCulture).Replace(" ", " ", StringComparison.InvariantCulture).Replace("false", "False", StringComparison.InvariantCulture).Replace("true", "True", StringComparison.InvariantCulture);
string Expression1 = IfDirective.Condition.ToString().Replace("!", "Not ", StringComparison.Ordinal).Replace("==", "=", StringComparison.Ordinal).Replace("!=", "<>", StringComparison.Ordinal).Replace("&&", "And", StringComparison.Ordinal).Replace("||", "Or", StringComparison.Ordinal).Replace(" ", " ", StringComparison.Ordinal).Replace("false", "False", StringComparison.Ordinal).Replace("true", "True", StringComparison.Ordinal);

return VBFactory.Trivia(VBFactory.IfDirectiveTrivia(global::VisualBasicSyntaxFactory.IfKeyword, VBFactory.ParseExpression(Expression1)).With(IfDirective.GetLeadingTrivia().ConvertTrivia(), IfDirective.Condition.GetTrailingTrivia().ConvertTrivia()).WithAppendedTriviaFromEndOfDirectiveToken(IfDirective.EndOfDirectiveToken));
}
Expand All @@ -1148,7 +1148,7 @@ public static SyntaxTrivia ConvertTrivia(this SyntaxTrivia t)
global::RestuructureSeparatedLists.IgnoredIfDepth += 1;
}
CSS.ElifDirectiveTriviaSyntax ELIfDirective = (CSS.ElifDirectiveTriviaSyntax)StructuredTrivia;
string Expression1 = ELIfDirective.Condition.ToString().Replace("!", "Not ", StringComparison.InvariantCulture).Replace("==", "=", StringComparison.InvariantCulture).Replace("!=", "<>", StringComparison.InvariantCulture).Replace("&&", "And", StringComparison.InvariantCulture).Replace("||", "Or", StringComparison.InvariantCulture).Replace(" ", " ", StringComparison.InvariantCulture).Replace("false", "False", StringComparison.InvariantCulture).Replace("true", "True", StringComparison.InvariantCulture);
string Expression1 = ELIfDirective.Condition.ToString().Replace("!", "Not ", StringComparison.Ordinal).Replace("==", "=", StringComparison.Ordinal).Replace("!=", "<>", StringComparison.Ordinal).Replace("&&", "And", StringComparison.Ordinal).Replace("||", "Or", StringComparison.Ordinal).Replace(" ", " ", StringComparison.Ordinal).Replace("false", "False", StringComparison.Ordinal).Replace("true", "True", StringComparison.Ordinal);

SyntaxToken IfOrElseIfKeyword;
if (t.IsKind(CS.SyntaxKind.ElifDirectiveTrivia))
Expand Down Expand Up @@ -1208,7 +1208,7 @@ public static SyntaxTrivia ConvertTrivia(this SyntaxTrivia t)
{
CSS.RegionDirectiveTriviaSyntax RegionDirective = (CSS.RegionDirectiveTriviaSyntax)StructuredTrivia;
var EndOfDirectiveToken = RegionDirective.EndOfDirectiveToken;
string NameString = $"\"{EndOfDirectiveToken.LeadingTrivia.ToString().Replace("\"", "", StringComparison.InvariantCulture)}\"";
string NameString = $"\"{EndOfDirectiveToken.LeadingTrivia.ToString().Replace("\"", "", StringComparison.Ordinal)}\"";
var RegionDirectiveTriviaNode = VBFactory.RegionDirectiveTrivia(global::VisualBasicSyntaxFactory.HashToken, global::VisualBasicSyntaxFactory.RegionKeyword, VBFactory.StringLiteralToken(NameString, NameString)
).WithConvertedTrailingTriviaFrom(EndOfDirectiveToken);
return VBFactory.Trivia(RegionDirectiveTriviaNode.WithTrailingEOL());
Expand Down Expand Up @@ -1330,10 +1330,10 @@ public static IEnumerable<SyntaxTrivia> ConvertTrivia(this IReadOnlyCollection<S
var Lines = Trivia.ToFullString().Substring(2).Split(Conversions.ToChar(Constants.vbLf));
foreach (string line in Lines)
{
if (line.EndsWith("*/", StringComparison.InvariantCulture))
if (line.EndsWith("*/", StringComparison.Ordinal))
{
TriviaList.Add(VBFactory.CommentTrivia($"' {RemoveLeadingSpacesStar(line.Substring(0, line.Length - 2))}"));
if (Trivia.ToFullString().EndsWith(Constants.vbLf, StringComparison.InvariantCulture))
if (Trivia.ToFullString().EndsWith(Constants.vbLf, StringComparison.Ordinal))
{
TriviaList.Add(global::VisualBasicSyntaxFactory.VBEOLTrivia);
}
Expand Down Expand Up @@ -1370,7 +1370,7 @@ public static IEnumerable<SyntaxTrivia> ConvertTrivia(this IReadOnlyCollection<S
var Lines = t1.ToFullString().Split(Conversions.ToChar(Constants.vbLf));
foreach (string line in Lines)
{
if (line.StartsWith("/*", StringComparison.InvariantCulture))
if (line.StartsWith("/*", StringComparison.Ordinal))
{
TriviaList.Add(VBFactory.CommentTrivia($"' {RemoveLeadingSpacesStar(line.Substring(1, line.Length - 1))}"));
TriviaList.Add(global::VisualBasicSyntaxFactory.VBEOLTrivia);
Expand Down
4 changes: 2 additions & 2 deletions ICSharpCode.CodeConverter/VB/Trivia/SyntaxTriviaExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ public static List<SyntaxTrivia> DirectiveNotAllowedHere(SyntaxTrivia Trivia)
foreach (var TriviaAsString in TextStrings)
{
NewTriviaList.AddRange(LeadingTriviaList);
NewTriviaList.Add(VBFactory.CommentTrivia($" ' {TriviaAsString}".Replace(" ", " ", StringComparison.InvariantCulture).TrimEnd()));
NewTriviaList.Add(VBFactory.CommentTrivia($" ' {TriviaAsString}".Replace(" ", " ", StringComparison.Ordinal).TrimEnd()));
NewTriviaList.Add(global::VisualBasicSyntaxFactory.VBEOLTrivia);
}
if (NewTriviaList.Last().IsKind(VB.SyntaxKind.EndOfLineTrivia))
Expand Down Expand Up @@ -382,7 +382,7 @@ public static List<SyntaxTrivia> DirectiveNotAllowedHere(SyntaxTrivia Trivia)
global::VisualBasicSyntaxFactory.SpaceTrivia,
global::VisualBasicSyntaxFactory.LineContinuation,
global::VisualBasicSyntaxFactory.SpaceTrivia,
VBFactory.CommentTrivia($"{Msg}{TriviaAsString}".Replace(" ", " ", StringComparison.InvariantCulture).TrimEnd())
VBFactory.CommentTrivia($"{Msg}{TriviaAsString}".Replace(" ", " ").TrimEnd())
};
return NewTriviaList;
}
Expand Down