From f350133372caa5802727bc373004a72c9a22d00e Mon Sep 17 00:00:00 2001
From: Georgii Novoselov <georgii@vaticle.com>
Date: Wed, 28 Feb 2024 11:40:32 +0000
Subject: [PATCH] Fix changelog work for the newest release

---
 .github/workflows/release.yml | 21 ++++++++++++++++++---
 CHANGELOG.md                  | 24 +++++++++++++-----------
 build.gradle.kts              |  2 +-
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 58f037a..9c1ac4e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,12 +25,27 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
+      # Set environment variables
+      - name: Export Properties
+        id: properties
+        shell: bash
+        run: |
+          CHANGELOG="$(cat << 'EOM' | sed -e 's/^[[:space:]]*$//g' -e '/./,$!d'
+          ${{ github.event.release.body }}
+          EOM
+          )"
+          
+          echo "changelog<<EOF" >> $GITHUB_OUTPUT
+          echo "$CHANGELOG" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
       # Update Unreleased section with the current release note
       - name: Patch Changelog
+        if: ${{ steps.properties.outputs.changelog != '' }}
+        env:
+          CHANGELOG: ${{ steps.properties.outputs.changelog }}
         run: |
-          ./gradlew patchChangelog --release-note="`cat << EOM
-          ${{ github.event.release.body }}
-          EOM`"
+          ./gradlew patchChangelog --release-note="$CHANGELOG"
 
       - run: ./gradlew buildPlugin
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1227f35..2d44f35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,17 +2,19 @@
 
 # typeql-plugin-jetbrains Changelog
 
-## Unreleased
+## [Unreleased]
+### Added
+- `.typeql` to supported extensions.
+- TypeDB Studio's color schemes available for import (check out the [official GitHub repo](https://github.com/typedb-osi/typeql-plugin-jetbrains)).
 
-## 0.2.0 - 2024-02-28
-- Add .typeql to supported extensions.
-- Update TypeQL grammar based on the recent official releases.
-- Improve syntax highlighting, coloring, and referencing.
-- Add TypeDB Studio's color schemes available for import (check out the [official GitHub repo](https://github.com/typedb-osi/typeql-plugin-jetbrains)).
-- Fix incorrect syntax error highlighting.
-- Enhance referencing, including override constraints like owns as, plays as, relates as.
-- Improve Go To Declaration and Find Usages features work.
-- Fix Rename feature and a set of errors connected to it.
+### Fixed
+- Updated TypeQL grammar based on the recent official releases.
+- Improved syntax highlighting, coloring, and referencing.
+- Fixed incorrect syntax error highlighting.
+- Enhanced referencing, including override constraints like owns as, plays as, relates as.
+- Improved Go To Declaration and Find Usages features work.
+- Stabilized Rename feature and a set of errors connected to it.
 
 ## 0.1.1
-- Add basic TypeQL support for `.tql` files.
+### Added
+- Basic TypeQL support
diff --git a/build.gradle.kts b/build.gradle.kts
index 5311f43..55a80a8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     // Gradle IntelliJ Plugin
     id("org.jetbrains.intellij") version "1.15.0"
     // Gradle Changelog Plugin
-    id("org.jetbrains.changelog") version "2.1.2"
+    id("org.jetbrains.changelog") version "2.2.0"
     // Gradle Qodana Plugin
     id("org.jetbrains.qodana") version "0.1.13"
 }