Merge pull request #91 from Rekkonnect/fix/89-empty-tree-details

Fix bugs
Rekkonnect · Dec 25, 2024 · 4a2aa25 · 4a2aa25
2 parents 891f0b7 + a125f57
commit 4a2aa25
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 24 deletions.
diff --git a/Syndiesis/Controls/LanguageVersionDropDownItems.axaml.cs b/Syndiesis/Controls/LanguageVersionDropDownItems.axaml.cs
@@ -9,9 +9,6 @@
 using System.Diagnostics;
 using System.Linq;
 
-using CSharpVersion = Microsoft.CodeAnalysis.CSharp.LanguageVersion;
-using VisualBasicVersion = Microsoft.CodeAnalysis.VisualBasic.LanguageVersion;
-
 namespace Syndiesis.Controls;
 
 public partial class LanguageVersionDropDownItems : UserControl

diff --git a/Syndiesis/Core/CSharpSingleTreeCompilationSource.cs b/Syndiesis/Core/CSharpSingleTreeCompilationSource.cs
@@ -15,7 +15,7 @@ protected override CSharpParseOptions CreateDefaultParseOptions()
     {
         return CSharpParseOptions.Default
             .WithLanguageVersion(
-                Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp12);
+                Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp13);
     }
 
     protected override void AdjustLanguageVersionCore(RoslynLanguageVersion version)

diff --git a/Syndiesis/Core/ConversionUnion.cs b/Syndiesis/Core/ConversionUnion.cs
@@ -1,9 +1,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Operations;
 
-using CSharpConversion = Microsoft.CodeAnalysis.CSharp.Conversion;
-using VisualBasicConversion = Microsoft.CodeAnalysis.VisualBasic.Conversion;
-
 namespace Syndiesis.Core;
 
 public sealed record ConversionUnion(

diff --git a/Syndiesis/Core/DisplayAnalysis/BaseSyntaxAnalysisNodeCreator.cs b/Syndiesis/Core/DisplayAnalysis/BaseSyntaxAnalysisNodeCreator.cs
@@ -103,7 +103,7 @@ public abstract AnalysisTreeListNode CreateRootNodeList<TDisplayValueSource>(
         ;
 
     public abstract AnalysisTreeListNode CreateRootTokenList<TDisplayValueSource>(
-        SyntaxTokenList list, TDisplayValueSource? valueSource, bool includeChildren = true)
+        IReadOnlyList<SyntaxToken> list, TDisplayValueSource? valueSource, bool includeChildren = true)
         where TDisplayValueSource : IDisplayValueSource
         ;
 

diff --git a/Syndiesis/Core/DisplayAnalysis/CSharpSyntaxAnalysisNodeCreator.cs b/Syndiesis/Core/DisplayAnalysis/CSharpSyntaxAnalysisNodeCreator.cs
@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.Contracts;
 using System.Linq;
 
 namespace Syndiesis.Core.DisplayAnalysis;
@@ -20,6 +21,7 @@ namespace Syndiesis.Core.DisplayAnalysis;
 using ComplexGroupedRunInline = ComplexGroupedRunInline.Builder;
 
 using ReadOnlySyntaxNodeList = IReadOnlyList<SyntaxNode>;
+using SyntaxTokenList = IReadOnlyList<SyntaxToken>;
 
 public sealed partial class CSharpSyntaxAnalysisNodeCreator : BaseSyntaxAnalysisNodeCreator
 {
@@ -947,9 +949,7 @@ private static string EndOfLineTriviaText(SyntaxTrivia trivia)
 
         private static string DisabledTextTriviaText(SyntaxTrivia trivia)
         {
-            // https://github.com/dotnet/roslyn/issues/76441
-            if (trivia.SyntaxTree is null)
-                return "[Unknown line bounds]";
+            Contract.Assert(trivia.SyntaxTree is not null);
 
             var span = trivia.Span;
             var lineSpan = trivia.SyntaxTree.GetLineSpan(span).Span;

diff --git a/Syndiesis/Core/DisplayAnalysis/SemanticModelAnalysisNodeCreator.cs b/Syndiesis/Core/DisplayAnalysis/SemanticModelAnalysisNodeCreator.cs
@@ -7,8 +7,6 @@
 
 namespace Syndiesis.Core.DisplayAnalysis;
 
-using CSharpConversion = Microsoft.CodeAnalysis.CSharp.Conversion;
-using VisualBasicConversion = Microsoft.CodeAnalysis.VisualBasic.Conversion;
 using AnalysisTreeListNode = UIBuilder.AnalysisTreeListNode;
 using AnalysisTreeListNodeLine = UIBuilder.AnalysisTreeListNodeLine;
 using SingleRunInline = SingleRunInline.Builder;

diff --git a/Syndiesis/Core/DisplayAnalysis/VisualBasicSyntaxAnalysisNodeCreator.cs b/Syndiesis/Core/DisplayAnalysis/VisualBasicSyntaxAnalysisNodeCreator.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Linq;
 using Garyon.Reflection;
+using System.Diagnostics.Contracts;
 
 namespace Syndiesis.Core.DisplayAnalysis;
 
@@ -20,6 +21,7 @@ namespace Syndiesis.Core.DisplayAnalysis;
 using ComplexGroupedRunInline = ComplexGroupedRunInline.Builder;
 
 using ReadOnlySyntaxNodeList = IReadOnlyList<SyntaxNode>;
+using SyntaxTokenList = IReadOnlyList<SyntaxToken>;
 
 public sealed partial class VisualBasicSyntaxAnalysisNodeCreator : BaseSyntaxAnalysisNodeCreator
 {
@@ -953,9 +955,7 @@ private static string EndOfLineTriviaText(SyntaxTrivia trivia)
 
         private static string DisabledTextTriviaText(SyntaxTrivia trivia)
         {
-            // https://github.com/dotnet/roslyn/issues/76441
-            if (trivia.SyntaxTree is null)
-                return "[Unknown line bounds]";
+            Contract.Assert(trivia.SyntaxTree is not null);
 
             var span = trivia.Span;
             var lineSpan = trivia.SyntaxTree.GetLineSpan(span).Span;

diff --git a/Syndiesis/Core/HybridSingleTreeCompilationSource.cs b/Syndiesis/Core/HybridSingleTreeCompilationSource.cs
@@ -7,9 +7,6 @@
 using System.Linq;
 using System.Threading;
 
-using CSharpSyntaxKind = Microsoft.CodeAnalysis.CSharp.SyntaxKind;
-using VisualBasicSyntaxKind = Microsoft.CodeAnalysis.VisualBasic.SyntaxKind;
-
 namespace Syndiesis.Core;
 
 public sealed class HybridSingleTreeCompilationSource

diff --git a/Syndiesis/Core/NodeViewAnalysisExecution.cs b/Syndiesis/Core/NodeViewAnalysisExecution.cs
@@ -236,7 +236,7 @@ private static ComplexDisplayValueSource ConstructSemanticModelValueSource(
             return null;
         return
             _container.SyntaxCreator.CreateRootTokenList(
-                new SyntaxTokenList(_node?.ChildTokens() ?? []),
+                _node?.ChildTokens().ToList() ?? [],
                 _childTokensValueSource);
     }
 

diff --git a/Syndiesis/Core/NodeViewAnalysisHelpers.cs b/Syndiesis/Core/NodeViewAnalysisHelpers.cs
@@ -1,5 +1,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
+using System.Diagnostics.Contracts;
+using System.Linq;
 
 namespace Syndiesis.Core;
 
@@ -32,6 +34,11 @@ public static class NodeViewAnalysisHelpers
         SyntaxTree syntaxTree,
         TextSpan span)
     {
+        if (syntaxTree.Length is 0)
+        {
+            return GetNodeViewAnalysisRootForEmptySyntaxTree(syntaxTree);
+        }
+
         var rootNode = syntaxTree.SyntaxNodeAtSpanIncludingStructuredTrivia(span);
         if (rootNode is null)
             return null;
@@ -40,4 +47,15 @@ public static class NodeViewAnalysisHelpers
         var trivia = rootNode.DeepestTriviaContainingSpan(span);
         return new(syntaxTree, rootNode, token, trivia);
     }
+
+    private static NodeViewAnalysisRoot? GetNodeViewAnalysisRootForEmptySyntaxTree(
+        SyntaxTree syntaxTree)
+    {
+        Contract.Assert(syntaxTree.Length is 0);
+
+        var rootNode = syntaxTree.GetRoot();
+        var token = rootNode.GetFirstToken();
+        var trivia = rootNode.GetTrailingTrivia().FirstOrDefault();
+        return new(syntaxTree, rootNode, token, trivia);
+    }
 }
diff --git a/Syndiesis/Core/RoslynExtensions.cs b/Syndiesis/Core/RoslynExtensions.cs
@@ -275,7 +275,8 @@ public static SyntaxNodeOrToken ChildThatContainsSpan(this SyntaxNode node, Text
         this SyntaxTree tree, TextSpan span)
     {
         var root = tree.GetRoot();
-        var start = Math.Clamp(span.Start, 0, root.FullSpan.End - 1);
+        int lastIndex = Math.Max(0, root.FullSpan.End - 1);
+        var start = Math.Clamp(span.Start, 0, lastIndex);
         var end = Math.Clamp(span.End, 0, root.FullSpan.End);
         var clampedSpan = TextSpan.FromBounds(start, end);
         return root.DeepestNodeContainingSpanIncludingStructuredTrivia(clampedSpan);

diff --git a/Syndiesis/Core/RoslynLanguageVersion.cs b/Syndiesis/Core/RoslynLanguageVersion.cs
@@ -1,8 +1,5 @@
 using Microsoft.CodeAnalysis;
 
-using CSharpVersion = Microsoft.CodeAnalysis.CSharp.LanguageVersion;
-using VisualBasicVersion = Microsoft.CodeAnalysis.VisualBasic.LanguageVersion;
-
 namespace Syndiesis.Core;
 
 public readonly record struct RoslynLanguageVersion(string LanguageName, int RawVersionValue)

diff --git a/Syndiesis/_GlobalUsings.cs b/Syndiesis/_GlobalUsings.cs
@@ -0,0 +1,8 @@
+global using CSharpVersion = Microsoft.CodeAnalysis.CSharp.LanguageVersion;
+global using VisualBasicVersion = Microsoft.CodeAnalysis.VisualBasic.LanguageVersion;
+
+global using CSharpSyntaxKind = Microsoft.CodeAnalysis.CSharp.SyntaxKind;
+global using VisualBasicSyntaxKind = Microsoft.CodeAnalysis.VisualBasic.SyntaxKind;
+
+global using CSharpConversion = Microsoft.CodeAnalysis.CSharp.Conversion;
+global using VisualBasicConversion = Microsoft.CodeAnalysis.VisualBasic.Conversion;