Skip to content

Commit 45d4381

Browse files
Fixup of assignment order
1 parent 0dd3152 commit 45d4381

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

CodeConverter/CSharp/DeclarationNodeVisitor.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ public DeclarationNodeVisitor(Document document, Compilation compilation, Semant
5656
var typeConversionAnalyzer = new TypeConversionAnalyzer(semanticModel, csCompilation, _extraUsingDirectives, _csSyntaxGenerator, expressionEvaluator, nullableExpressionsConverter);
5757
CommonConversions = new CommonConversions(document, semanticModel, typeConversionAnalyzer, csSyntaxGenerator, compilation, csCompilation, _typeContext, _visualBasicEqualityComparison);
5858
var expressionNodeVisitor = new ExpressionNodeVisitor(semanticModel, _visualBasicEqualityComparison, _typeContext, CommonConversions, _extraUsingDirectives, _xmlImportContext, nullableExpressionsConverter);
59-
_triviaConvertingExpressionVisitor = expressionNodeVisitor.TriviaConvertingExpressionVisitor;
59+
_triviaConvertingExpressionVisitor = CommonConversions.TriviaConvertingExpressionVisitor;
6060
_convertMethodBodyStatementsAsync = expressionNodeVisitor.ConvertMethodBodyStatementsAsync;
61-
CommonConversions.TriviaConvertingExpressionVisitor = _triviaConvertingExpressionVisitor;
6261
nullableExpressionsConverter.QueryTracker = _triviaConvertingExpressionVisitor;
6362
_visualBasicEqualityComparison.QueryTracker = _triviaConvertingExpressionVisitor;
6463
}

CodeConverter/CSharp/ExpressionNodeVisitor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace ICSharpCode.CodeConverter.CSharp;
1515
internal partial class ExpressionNodeVisitor : VBasic.VisualBasicSyntaxVisitor<Task<CSharpSyntaxNode>>
1616
{
1717
private static readonly Type ConvertType = typeof(Conversions);
18-
public CommentConvertingVisitorWrapper TriviaConvertingExpressionVisitor { get; }
18+
private CommentConvertingVisitorWrapper TriviaConvertingExpressionVisitor => CommonConversions.TriviaConvertingExpressionVisitor;
1919
private readonly SemanticModel _semanticModel;
2020
private readonly HashSet<string> _extraUsingDirectives;
2121
private readonly IOperatorConverter _operatorConverter;
@@ -36,10 +36,10 @@ public ExpressionNodeVisitor(SemanticModel semanticModel,
3636
HashSet<string> extraUsingDirectives, XmlImportContext xmlImportContext, VisualBasicNullableExpressionsConverter visualBasicNullableTypesConverter)
3737
{
3838
_semanticModel = semanticModel;
39-
CommonConversions = commonConversions;;
39+
CommonConversions = commonConversions;
40+
commonConversions.TriviaConvertingExpressionVisitor = new CommentConvertingVisitorWrapper(this, _semanticModel.SyntaxTree);
4041
_lambdaConverter = new LambdaConverter(commonConversions, semanticModel);
4142
_visualBasicEqualityComparison = visualBasicEqualityComparison;
42-
TriviaConvertingExpressionVisitor = new CommentConvertingVisitorWrapper(this, _semanticModel.SyntaxTree);
4343
_queryConverter = new QueryConverter(commonConversions, _semanticModel, TriviaConvertingExpressionVisitor);
4444
_typeContext = typeContext;
4545
_extraUsingDirectives = extraUsingDirectives;

0 commit comments

Comments
 (0)