pando-ai 0.3.0 → 0.3.2

package/tools/csharp-indexer/CSharpIndexer.csproj

@@ -4,7 +4,11 @@
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="src/**/*.cs" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />

package/tools/csharp-indexer/src/Program.cs

@@ -29,6 +29,12 @@ namespace Pando.CSharpIndexer
         [JsonPropertyName("qualifiedName")] public string? QualifiedName { get; set; }
         [JsonPropertyName("scopeChain")] public List<string>? ScopeChain { get; set; }
         [JsonPropertyName("symbolKey")] public string? SymbolKey { get; set; }
+        [JsonPropertyName("parentIndex")] public int? ParentIndex { get; set; }
+        [JsonPropertyName("role")] public string? Role { get; set; }
+        [JsonPropertyName("indexInParent")] public int? IndexInParent { get; set; }
+        [JsonPropertyName("depth")] public int? Depth { get; set; }
+        [JsonPropertyName("bodyStart")] public int? BodyStart { get; set; }
+        [JsonPropertyName("bodyEnd")] public int? BodyEnd { get; set; }
         [JsonPropertyName("metadata")] public Dictionary<string, object?>? Metadata { get; set; }
     }
 
@@ -156,7 +162,8 @@ namespace Pando.CSharpIndexer
                     return resolved.Error == null ? 0 : 2;
                 }
 
-                var result = BuildParseResult(root, content);
+                var emitMode = parsed.TryGetValue("emitMode", out var mode) && !string.IsNullOrWhiteSpace(mode) ? mode! : "light";
+                var result = BuildParseResult(root, content, emitMode);
                 WriteOutput(parsed, result);
                 return 0;
             }
@@ -218,7 +225,8 @@ namespace Pando.CSharpIndexer
                                 }
                                 try
                                 {
-                                    var result = ParseFile(file!);
+                                    var emitMode = GetString(item, "emitMode") ?? "light";
+                                    var result = ParseFile(file!, emitMode);
                                     results.Add(new { file, ok = true, result });
                                 }
                                 catch (Exception ex)
@@ -237,7 +245,8 @@ namespace Pando.CSharpIndexer
                         }
                         try
                         {
-                            var result = ParseFile(singleFile!);
+                            var emitMode = GetString(root, "emitMode") ?? "light";
+                            var result = ParseFile(singleFile!, emitMode);
                             WriteServerResponse(new { id, ok = true, result }, options);
                         }
                         catch (Exception ex)
@@ -347,12 +356,12 @@ namespace Pando.CSharpIndexer
             return null;
         }
 
-        private static CliParseResult ParseFile(string file)
+        private static CliParseResult ParseFile(string file, string emitMode)
         {
             var content = File.ReadAllText(file);
             var tree = CSharpSyntaxTree.ParseText(content, path: file);
             var root = tree.GetCompilationUnitRoot();
-            return BuildParseResult(root, content);
+            return BuildParseResult(root, content, emitMode);
         }
 
         private static CliResolvedSpan ResolveFile(string file, string nodePath)
@@ -414,7 +423,7 @@ namespace Pando.CSharpIndexer
             }
         }
 
-        private static CliParseResult BuildParseResult(CompilationUnitSyntax root, string content)
+        private static CliParseResult BuildParseResult(CompilationUnitSyntax root, string content, string emitMode)
         {
             var result = new CliParseResult();
             var semanticModel = TryCreateSemanticModel(root);
@@ -529,12 +538,128 @@ namespace Pando.CSharpIndexer
                 }
             }
 
+            if (IsFullEmitMode(emitMode))
+            {
+                AddFullSyntaxNodes(result, root);
+                AddCommentTriviaNodes(result, root);
+            }
+
             EnrichNodeHierarchy(result.Nodes, root);
 
             result.ModulePublic = publicNames.ToList();
             return result;
         }
 
+        private static bool IsFullEmitMode(string? emitMode)
+        {
+            return string.Equals(emitMode, "full", StringComparison.OrdinalIgnoreCase);
+        }
+
+        private static void AddFullSyntaxNodes(CliParseResult result, CompilationUnitSyntax root)
+        {
+            var emittedKeys = result.Nodes
+                .Select(n => NodeKey(n.Start, n.End, n.RawKind ?? n.Kind))
+                .ToHashSet(StringComparer.Ordinal);
+
+            foreach (var node in EnumerateSyntaxNodesIncludingRoot(root))
+            {
+                var rawKind = node.Kind().ToString();
+                var start = NodeStart(node);
+                var end = NodeEnd(node);
+                var key = NodeKey(start, end, rawKind);
+                if (emittedKeys.Contains(key)) { continue; }
+                result.Nodes.Add(new CliNode
+                {
+                    Name = null,
+                    Kind = rawKind,
+                    RawKind = rawKind,
+                    RawKindSource = "roslyn",
+                    SemanticKind = InferSemanticKind(node),
+                    Start = start,
+                    End = end,
+                    IsExported = 0,
+                    ContainerKind = null,
+                    ContainerRawKind = null,
+                    ContainerRawKindSource = null,
+                    ParamCount = null,
+                    Metadata = null,
+                });
+                emittedKeys.Add(key);
+            }
+        }
+
+        private static void AddCommentTriviaNodes(CliParseResult result, CompilationUnitSyntax root)
+        {
+            var emittedKeys = result.Nodes
+                .Select(n => NodeKey(n.Start, n.End, n.RawKind ?? n.Kind))
+                .ToHashSet(StringComparer.Ordinal);
+            var rootIndex = result.Nodes.FindIndex(n =>
+                n.Start == NodeStart(root)
+                && n.End == NodeEnd(root)
+                && string.Equals(n.RawKind ?? n.Kind, root.Kind().ToString(), StringComparison.Ordinal));
+            var commentOrdinal = 0;
+
+            foreach (var trivia in root.DescendantTrivia(descendIntoTrivia: true))
+            {
+                if (!IsCommentTrivia(trivia)) { continue; }
+                var rawKind = trivia.Kind().ToString();
+                var start = trivia.Span.Start;
+                var end = trivia.Span.End;
+                var key = NodeKey(start, end, rawKind);
+                if (emittedKeys.Contains(key)) { continue; }
+                result.Nodes.Add(new CliNode
+                {
+                    Name = null,
+                    Kind = rawKind,
+                    RawKind = rawKind,
+                    RawKindSource = "roslyn-trivia",
+                    SemanticKind = "comment",
+                    Start = start,
+                    End = end,
+                    IsExported = 0,
+                    ContainerKind = null,
+                    ContainerRawKind = root.Kind().ToString(),
+                    ContainerRawKindSource = "roslyn",
+                    ParamCount = null,
+                    ParentIndex = rootIndex >= 0 ? rootIndex : null,
+                    Role = "comment",
+                    IndexInParent = commentOrdinal,
+                    Depth = rootIndex >= 0 ? 1 : 0,
+                    Metadata = null,
+                });
+                emittedKeys.Add(key);
+                commentOrdinal++;
+            }
+        }
+
+        private static IEnumerable<SyntaxNode> EnumerateSyntaxNodesIncludingRoot(CompilationUnitSyntax root)
+        {
+            yield return root;
+            foreach (var node in root.DescendantNodes())
+            {
+                yield return node;
+            }
+        }
+
+        private static bool IsCommentTrivia(SyntaxTrivia trivia)
+        {
+            return trivia.IsKind(SyntaxKind.SingleLineCommentTrivia)
+                || trivia.IsKind(SyntaxKind.MultiLineCommentTrivia)
+                || trivia.IsKind(SyntaxKind.SingleLineDocumentationCommentTrivia)
+                || trivia.IsKind(SyntaxKind.MultiLineDocumentationCommentTrivia)
+                || trivia.IsKind(SyntaxKind.DocumentationCommentExteriorTrivia);
+        }
+
+        private static int NodeStart(SyntaxNode node)
+        {
+            return node is CompilationUnitSyntax ? node.FullSpan.Start : node.Span.Start;
+        }
+
+        private static int NodeEnd(SyntaxNode node)
+        {
+            return node is CompilationUnitSyntax ? node.FullSpan.End : node.Span.End;
+        }
+
         private static string NormalizeQualifiedName(string? qualifiedName)
         {
             if (string.IsNullOrWhiteSpace(qualifiedName)) { return string.Empty; }
@@ -1327,7 +1452,7 @@ namespace Pando.CSharpIndexer
             metadata["isStatic"] = node.Modifiers.Any(SyntaxKind.StaticKeyword);
             metadata["returnType"] = node.Type.ToString();
 
-            var kind = node.ImplicitOrExplicitKeyword.Kind() == SyntaxKind.ImplicitKeyword ? "implicit" : "explicit";
+            var kind = node.ImplicitOrExplicitKeyword.IsKind(SyntaxKind.ImplicitKeyword) ? "implicit" : "explicit";
             result.Nodes.Add(new CliNode
             {
                 Name = $"{kind} operator {node.Type}",
@@ -1436,12 +1561,21 @@ namespace Pando.CSharpIndexer
 
         private static void EnrichNodeHierarchy(List<CliNode> nodes, CompilationUnitSyntax root)
         {
-            var syntaxByKey = root.DescendantNodes()
-                .GroupBy(n => NodeKey(n.Span.Start, n.Span.End, n.Kind().ToString()))
+            var syntaxByKey = EnumerateSyntaxNodesIncludingRoot(root)
+                .GroupBy(n => NodeKey(NodeStart(n), NodeEnd(n), n.Kind().ToString()))
                 .ToDictionary(g => g.Key, g => g.First(), StringComparer.Ordinal);
             var nodeByKey = nodes
                 .GroupBy(n => NodeKey(n.Start, n.End, n.RawKind ?? n.Kind), StringComparer.Ordinal)
                 .ToDictionary(g => g.Key, g => g.First(), StringComparer.Ordinal);
+            var nodeIndexByKey = new Dictionary<string, int>(StringComparer.Ordinal);
+            for (var i = 0; i < nodes.Count; i++)
+            {
+                var key = NodeKey(nodes[i].Start, nodes[i].End, nodes[i].RawKind ?? nodes[i].Kind);
+                if (!nodeIndexByKey.ContainsKey(key))
+                {
+                    nodeIndexByKey[key] = i;
+                }
+            }
             var emittedKeys = new HashSet<string>(nodeByKey.Keys, StringComparer.Ordinal);
             var childrenByParent = new Dictionary<string, List<CliNode>>(StringComparer.Ordinal);
 
@@ -1453,17 +1587,25 @@ namespace Pando.CSharpIndexer
                 var body = GetBodySpan(syntax);
                 if (body != null)
                 {
+                    cliNode.BodyStart = body.Value.start;
+                    cliNode.BodyEnd = body.Value.end;
                     metadata["bodyStart"] = body.Value.start;
                     metadata["bodyEnd"] = body.Value.end;
                 }
-                metadata["role"] = InferNodeRole(syntax);
+                var role = InferNodeRole(syntax);
+                cliNode.Role = role;
+                metadata["role"] = role;
 
                 var parent = syntax.Parent;
                 while (parent != null)
                 {
-                    var parentKey = NodeKey(parent.Span.Start, parent.Span.End, parent.Kind().ToString());
+                    var parentKey = NodeKey(NodeStart(parent), NodeEnd(parent), parent.Kind().ToString());
                     if (emittedKeys.Contains(parentKey))
                     {
+                        if (nodeIndexByKey.TryGetValue(parentKey, out var parentIndex))
+                        {
+                            cliNode.ParentIndex = parentIndex;
+                        }
                         metadata["parentStart"] = parent.Span.Start;
                         metadata["parentEnd"] = parent.Span.End;
                         metadata["parentKind"] = parent.Kind().ToString();
@@ -1501,6 +1643,7 @@ namespace Pando.CSharpIndexer
                 for (var i = 0; i < ordered.Count; i++)
                 {
                     var metadata = ordered[i].Metadata ??= new Dictionary<string, object?>();
+                    ordered[i].IndexInParent = i;
                     metadata["indexInParent"] = i;
                 }
             }
@@ -1508,17 +1651,14 @@ namespace Pando.CSharpIndexer
             foreach (var cliNode in nodes)
             {
                 var depth = 0;
-                var metadata = cliNode.Metadata;
-                while (metadata != null
-                    && metadata.TryGetValue("parentStart", out var start)
-                    && metadata.TryGetValue("parentEnd", out var end)
-                    && metadata.TryGetValue("parentKind", out var kind))
+                var parentIndex = cliNode.ParentIndex;
+                var visited = new HashSet<int>();
+                while (parentIndex != null && parentIndex >= 0 && parentIndex < nodes.Count && visited.Add(parentIndex.Value))
                 {
-                    var parentKey = NodeKey(Convert.ToInt32(start), Convert.ToInt32(end), Convert.ToString(kind) ?? "");
-                    if (!nodeByKey.TryGetValue(parentKey, out var parent)) { break; }
                     depth++;
-                    metadata = parent.Metadata;
+                    parentIndex = nodes[parentIndex.Value].ParentIndex;
                 }
+                cliNode.Depth = depth;
                 cliNode.Metadata ??= new Dictionary<string, object?>();
                 cliNode.Metadata["depth"] = depth;
             }