Be explicit about which language things are from but tweak global usings for brevity in this one case

Author: GrahamTheCoder

CodeConverter/CSharp/CommentConvertingVisitorWrapper.cs

@@ -1,28 +1,26 @@
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.CodeAnalysis.VisualBasic;
+using Microsoft.CodeAnalysis.Text;
 
 namespace ICSharpCode.CodeConverter.CSharp;
 
 [System.Diagnostics.DebuggerStepThrough]
 internal class CommentConvertingVisitorWrapper
 {
-    private readonly VBasic.VisualBasicSyntaxVisitor<Task<CS.CSharpSyntaxNode>> _wrappedVisitor;
+    private readonly VBasic.VisualBasicSyntaxVisitor<Task<CSharpSyntaxNode>> _wrappedVisitor;
     private readonly SyntaxTree _syntaxTree;
     private static readonly CSSyntax.LiteralExpressionSyntax _dummyLiteral = ValidSyntaxFactory.DefaultExpression;
     private static readonly CSSyntax.StatementSyntax _dummyStatement = CS.SyntaxFactory.EmptyStatement();
     private static readonly CSSyntax.CompilationUnitSyntax _dummyCompilationUnit = CS.SyntaxFactory.CompilationUnit();
 
-    public CommentConvertingVisitorWrapper(VisualBasicSyntaxVisitor<Task<CSharpSyntaxNode>> wrappedVisitor, SyntaxTree syntaxTree)
+    public CommentConvertingVisitorWrapper(VBasic.VisualBasicSyntaxVisitor<Task<CSharpSyntaxNode>> wrappedVisitor, SyntaxTree syntaxTree)
     {
         _wrappedVisitor = wrappedVisitor;
         _syntaxTree = syntaxTree;
     }
 
-    public async Task<T> AcceptAsync<T>(VisualBasicSyntaxNode vbNode, SourceTriviaMapKind sourceTriviaMap) where T : CS.CSharpSyntaxNode =>
+    public async Task<T> AcceptAsync<T>(VisualBasicSyntaxNode vbNode, SourceTriviaMapKind sourceTriviaMap) where T : CSharpSyntaxNode =>
         await ConvertHandledAsync<T>(vbNode, sourceTriviaMap);
 
-    public async Task<SeparatedSyntaxList<TOut>> AcceptAsync<TIn, TOut>(SeparatedSyntaxList<TIn> vbNodes, SourceTriviaMapKind sourceTriviaMap) where TIn : VBasic.VisualBasicSyntaxNode where TOut : CS.CSharpSyntaxNode
+    public async Task<SeparatedSyntaxList<TOut>> AcceptAsync<TIn, TOut>(SeparatedSyntaxList<TIn> vbNodes, SourceTriviaMapKind sourceTriviaMap) where TIn : VisualBasicSyntaxNode where TOut : CSharpSyntaxNode
     {
         var convertedNodes = await vbNodes.SelectAsync(n => ConvertHandledAsync<TOut>(n, sourceTriviaMap));
         var convertedSeparators = vbNodes.GetSeparators().Select(s =>
@@ -33,7 +31,7 @@ public async Task<SeparatedSyntaxList<TOut>> AcceptAsync<TIn, TOut>(SeparatedSyn
         return CS.SyntaxFactory.SeparatedList(convertedNodes, convertedSeparators);
     }
 
-    private async Task<T> ConvertHandledAsync<T>(VisualBasicSyntaxNode vbNode, SourceTriviaMapKind sourceTriviaMap) where T : CS.CSharpSyntaxNode
+    private async Task<T> ConvertHandledAsync<T>(VisualBasicSyntaxNode vbNode, SourceTriviaMapKind sourceTriviaMap) where T : CSharpSyntaxNode
     {
         try {
             var converted = (T)await _wrappedVisitor.Visit(vbNode);
@@ -56,7 +54,7 @@ private async Task<T> ConvertHandledAsync<T>(VisualBasicSyntaxNode vbNode, Sourc
     /// <remarks>
     /// If lots of special cases, move to wrapping the wrappedVisitor in another visitor, but I'd rather use a simple switch here initially.
     /// </remarks>
-    private static T WithSourceMapping<T>(SyntaxNode vbNode, T converted) where T : CS.CSharpSyntaxNode
+    private static T WithSourceMapping<T>(SyntaxNode vbNode, T converted) where T : CSharpSyntaxNode
     {
         converted = vbNode.CopyAnnotationsTo(converted);
         switch (vbNode) {

CodeConverter/GlobalUsings.cs

@@ -1,7 +1,13 @@
-global using VBasic = Microsoft.CodeAnalysis.VisualBasic;
+global using Microsoft.CodeAnalysis;
+global using ICSharpCode.CodeConverter.Util;
+global using ICSharpCode.CodeConverter.Common;
+
+// Since so many names clash between CS and VB, it's best to use these aliases to be clear which one is meant
+global using VBasic = Microsoft.CodeAnalysis.VisualBasic;
 global using CS = Microsoft.CodeAnalysis.CSharp;
 global using VBSyntax = Microsoft.CodeAnalysis.VisualBasic.Syntax;
 global using CSSyntax = Microsoft.CodeAnalysis.CSharp.Syntax;
-global using ICSharpCode.CodeConverter.Common;
-global using Microsoft.CodeAnalysis;
-global using ICSharpCode.CodeConverter.Util;
+
+// For common unambiguous names, no need to qualify
+global using VisualBasicSyntaxNode = Microsoft.CodeAnalysis.VisualBasic.VisualBasicSyntaxNode;
+global using CSharpSyntaxNode = Microsoft.CodeAnalysis.CSharp.CSharpSyntaxNode;