Fix #90 round 2

Rekkonnect · Dec 25, 2024 · 5f85138 · 5f85138
1 parent 891f0b7
commit 5f85138
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
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/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/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);
     }