Merge branch 'main' into fuzzing

Draco-lang · Sep 20, 2024 · e63b3dd · e63b3dd
2 parents 0063164 + 374782c
commit e63b3dd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -5,16 +5,16 @@ on:
     inputs:
       deploy-sdk:
         type: boolean
-        description: Deploy components of the SDK (Compiler, Toolset, Sdk, ProjectTemplates)
+        description: Deploy components of the SDK (Compiler, Chr, Toolset, Sdk, ProjectTemplates)
       deploy-repl:
         type: boolean
-        description: Deploy components of the REPL (Compiler, Repl)
+        description: Deploy components of the REPL (Compiler, Chr, Repl)
       deploy-coverage-tool:
         type: boolean
         description: Deploy the coverage tool (Coverage, Coverage.MSBuild)
       deploy-langserver:
         type: boolean
-        description: Deploy the language server (Compiler, LanguageServer, Lsp)
+        description: Deploy the language server (Compiler, Chr, LanguageServer, Lsp)
       deploy-debugadapter:
         type: boolean
         description: Deploy the debug adapter (DebugAdapter, Dap)
@@ -63,11 +63,11 @@ jobs:
     - name: Package .NET portion
       run: |
         cd src
-        
-        $sdkProjects = "Compiler", "Compiler.Toolset", "Sdk", "ProjectTemplates"
-        $replProjects = "Compiler", "Repl"
+
+        $sdkProjects = "Compiler", "Chr", "Compiler.Toolset", "Sdk", "ProjectTemplates"
+        $replProjects = "Compiler", "Chr", "Repl"
         $coverageToolProjects = "Coverage", "Coverage.MSBuild"
-        $langserverProjects = "Compiler", "LanguageServer", "Lsp", "JsonRpc"
+        $langserverProjects = "Compiler", "Chr", "LanguageServer", "Lsp", "JsonRpc"
         $debugadapterProjects = "DebugAdapter", "Dap", "JsonRpc"
         
         $projects = @()

diff --git a/src/Draco.Compiler/Api/Syntax/SeparatedSyntaxList.cs b/src/Draco.Compiler/Api/Syntax/SeparatedSyntaxList.cs
@@ -75,7 +75,7 @@ private SyntaxNode GetNodeAt(int index)
             var prevWidth = this.GreenList
                 .Take(index)
                 .Sum(g => g.FullWidth);
-            return this.GreenList[index].ToRedNode(this.Tree, this.Parent, this.FullPosition + prevWidth);
+            return this.GreenList[index].ToRedNode(this.Tree, this, this.FullPosition + prevWidth);
         });
         return existing;
     }

diff --git a/src/Draco.Compiler/Api/Syntax/SyntaxList.cs b/src/Draco.Compiler/Api/Syntax/SyntaxList.cs
@@ -41,7 +41,7 @@ public TNode this[int index]
                 var prevWidth = this.GreenList
                     .Take(index)
                     .Sum(g => g.FullWidth);
-                return this.GreenList[index].ToRedNode(this.Tree, this.Parent, this.FullPosition + prevWidth);
+                return this.GreenList[index].ToRedNode(this.Tree, this, this.FullPosition + prevWidth);
             });
             return (TNode)existing;
         }