From d2eae35c8c81425911e0b044323b292b35c6e34e Mon Sep 17 00:00:00 2001 From: lucyelle <35396043+lucyelle@users.noreply.github.com> Date: Fri, 20 Sep 2024 17:17:53 +0200 Subject: [PATCH 1/3] Fixed child-parent reation of SyntaxList elements (#484) --- src/Draco.Compiler/Api/Syntax/SeparatedSyntaxList.cs | 2 +- src/Draco.Compiler/Api/Syntax/SyntaxList.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Draco.Compiler/Api/Syntax/SeparatedSyntaxList.cs b/src/Draco.Compiler/Api/Syntax/SeparatedSyntaxList.cs index 3f7223902..b2e2dcd54 100644 --- 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 index 33c16bf85..8d70112ad 100644 --- 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; } From c3168d189373a3252c1660e3af39cc6d54e04304 Mon Sep 17 00:00:00 2001 From: lucyelle <35396043+lucyelle@users.noreply.github.com> Date: Fri, 20 Sep 2024 18:59:38 +0200 Subject: [PATCH 2/3] Update publish.yaml (#483) --- .github/workflows/publish.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3201cb82f..5a7815a19 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -5,13 +5,13 @@ 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-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) @@ -60,9 +60,9 @@ jobs: - name: Package .NET portion run: | cd src - $sdkProjects = "Compiler", "Compiler.Toolset", "Sdk", "ProjectTemplates" - $replProjects = "Compiler", "Repl" - $langserverProjects = "Compiler", "LanguageServer", "Lsp", "JsonRpc" + $sdkProjects = "Compiler", "Compiler.Chr", "Compiler.Toolset", "Sdk", "ProjectTemplates" + $replProjects = "Compiler", "Compiler.Chr", "Repl" + $langserverProjects = "Compiler", "Compiler.Chr", "LanguageServer", "Lsp", "JsonRpc" $debugadapterProjects = "DebugAdapter", "Dap", "JsonRpc" $projects = @() From 374782c58a35775dab23aaa9fb51e239e092a1fc Mon Sep 17 00:00:00 2001 From: LPeter1997 Date: Fri, 20 Sep 2024 19:13:56 +0200 Subject: [PATCH 3/3] Update publish.yaml (#485) --- .github/workflows/publish.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 5a7815a19..332c85428 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -60,9 +60,9 @@ jobs: - name: Package .NET portion run: | cd src - $sdkProjects = "Compiler", "Compiler.Chr", "Compiler.Toolset", "Sdk", "ProjectTemplates" - $replProjects = "Compiler", "Compiler.Chr", "Repl" - $langserverProjects = "Compiler", "Compiler.Chr", "LanguageServer", "Lsp", "JsonRpc" + $sdkProjects = "Compiler", "Chr", "Compiler.Toolset", "Sdk", "ProjectTemplates" + $replProjects = "Compiler", "Chr", "Repl" + $langserverProjects = "Compiler", "Chr", "LanguageServer", "Lsp", "JsonRpc" $debugadapterProjects = "DebugAdapter", "Dap", "JsonRpc" $projects = @()