From 531e29a585bbee98dd5bc11a580dea334e6223f9 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Mon, 12 Jun 2023 12:04:29 +0200
Subject: [PATCH] fix changelog
---
CHANGELOG.md | 47 +++++++++++++++-----------
build.gradle.kts | 8 ++++-
gradle.properties | 1 +
src/main/resources/META-INF/plugin.xml | 7 ++--
4 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eda253c..214d3bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,8 @@
# Changelog
-## [0.3.1]
+## [Unreleased]
### Added
-- Reference support for type names within aspect files.
- - Usages are now highlighted.
-- Refactoring of type names now also works in aspects.
- - Note that although it works in the Java embeddings within aspects, it does *not* work in "real" Java classes.
- - Please use this feature with caution. As with most refactoring tools, it is quite fragile and won't give correct
- results in all cases.
-- Folding support for aspect files.
- - Aspects and most blocks now can be folded.
-- Structure view for aspect files.
- - Attributes and inter-type declarations are shown sorted by aspect.
- - There are toggle buttons to show or hide attributes, inter-type declarations and rewrites.
- - Note that things outside aspects, equations and some other elements are not yet included.
-- Support for IntelliJ IDEA 2022.3 and 2023.1.
### Changed
@@ -23,22 +10,42 @@
### Removed
+### Fixed
+
+## [0.3.1]
+
+### Added
+- Usages are now highlighted.
+- Note that although it works in the Java embeddings within aspects, it does *not* work in "real" Java classes.
+ Please use this feature with caution. As with most refactoring tools, it is quite fragile and won't give correct
+ results in all cases.
+- Aspects and most blocks now can be folded.
+- Attributes and inter-type declarations are shown sorted by aspect.
+- There are toggle buttons to show or hide attributes, inter-type declarations and rewrites.
+- Note that things outside aspects, equations and some other elements are not yet included.
+- Support for IntelliJ IDEA 2022.3 and 2023.1.
+
### Fixed
- A bug for type name refactoring in grammar files which prevented the actual definition from being renamed.
- Wrong inspection messages related to names in wrappers of injected java code ("x", "m", "X").
- A bug that required a visibility modifier in refined constructors.
+### Removed
+- Support for all IntelliJ IDEA version prior to 2022.3.
+
## [0.2.0]
### Added
- Support for IntelliJ IDEA 2021.2.3.
-- Initial support for JastAdd aspect files.
- - syntax highlighter and color settings
- - two file types for jrag and jadd
- - embedded java for attribute equation blocks
-- Annotations for JastAdd usages in Java.
- - configurable highlighters for attribute and api usages
+- syntax highlighter and color settings
+ two file types for jrag and jadd
+ embedded java for attribute equation blocks
+- configurable highlighters for attribute and api usages
- Dark mode icon which is a bit less colourful.
### Removed
- Support for IntelliJ IDEA 2020.2.4. Minimal version now is 2021.1.1.
+
+[Unreleased]: https://git-st.inf.tu-dresden.de/jastadd/jetbrains-plugin//compare/v0.3.1...HEAD
+[0.3.1]: https://git-st.inf.tu-dresden.de/jastadd/jetbrains-plugin//compare/v0.2.0...v0.3.1
+[0.2.0]: https://git-st.inf.tu-dresden.de/jastadd/jetbrains-plugin//commits/v0.2.0
diff --git a/build.gradle.kts b/build.gradle.kts
index df6137f..732777a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,5 @@
import io.gitlab.arturbosch.detekt.Detekt
+import org.jetbrains.changelog.Changelog
import org.jetbrains.changelog.markdownToHTML
import org.jetbrains.grammarkit.tasks.GenerateLexerTask
import org.jetbrains.grammarkit.tasks.GenerateParserTask
@@ -68,6 +69,7 @@ sourceSets {
changelog {
version.set(properties("pluginVersion"))
groups.set(listOf("Added", "Changed", "Deprecated", "Removed", "Fixed"))
+ repositoryUrl.set(properties("pluginRepositoryUrl"))
}
// Configure detekt plugin.
@@ -149,7 +151,11 @@ tasks {
)
// Get the latest available change notes from the changelog file
- changeNotes.set(provider { changelog.getLatest().toHTML() })
+ changeNotes.set(provider { changelog.renderItem(changelog.get(properties("pluginVersion")), Changelog.OutputType.HTML) })
+ }
+
+ jar {
+ dependsOn("patchChangelog")
}
publishPlugin {
diff --git a/gradle.properties b/gradle.properties
index 8bdd4c7..90c64ca 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,6 +4,7 @@
pluginGroup = org.jastadd
pluginName = JastAdd
pluginVersion = 0.3.1
+pluginRepositoryUrl = https://git-st.inf.tu-dresden.de/jastadd/jetbrains-plugin/
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index d84dd36..f029537 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -1,8 +1,7 @@
<idea-plugin>
<id>org.jastadd.JastAddGrammar</id>
<name>JastAdd Grammar Language</name>
- <vendor email="johannes.mey@tu-dresden.de" url="jastadd.org">The JastAdd Team</vendor>
-
+ <vendor email="johannes.mey@tu-dresden.de" url="jastadd.org">Johannes Mey</vendor>
<!-- please see https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
on how to target different products -->
@@ -32,7 +31,7 @@
<completion.contributor language="JastAddGrammar"
implementationClass="org.jastadd.tooling.grammar.GrammarCompletionContributor"/>
- <psi.referenceContributor implementation="org.jastadd.tooling.grammar.GrammarReferenceContributor"/>
+ <psi.referenceContributor language="JastAddGrammar" implementation="org.jastadd.tooling.grammar.GrammarReferenceContributor"/>
<lang.refactoringSupport language="JastAddGrammar"
@@ -80,7 +79,7 @@
<colorSettingsPage implementation="org.jastadd.tooling.java.JavaColorSettingsPage"/>
- <psi.referenceContributor implementation="org.jastadd.tooling.aspect.AspectReferenceContributor"/>
+ <psi.referenceContributor language="JastAddAspect" implementation="org.jastadd.tooling.aspect.AspectReferenceContributor"/>
<lang.elementManipulator forClass="org.jastadd.tooling.aspect.psi.JastAddAspectAstTypeName"
implementationClass="org.jastadd.tooling.aspect.psi.JastAddAspectAstTypeNameManipulator"/>
--
GitLab