From 615a5a5690def5657dd5d368aed9dac15ee7bbe6 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Wed, 7 Jul 2021 13:14:43 +0200
Subject: [PATCH] drop support for 2020.2 and remove usage of deprecated
interface
---
gradle.properties | 8 ++++----
.../tooling/grammar/GrammarFormattingModelBuilder.java | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 1946002..1705ba3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,19 +3,19 @@
pluginGroup = org.jetbrains.plugins.template
pluginName = IntelliJ Platform Plugin Template
-pluginVersion = 0.10.1
+pluginVersion = 0.10.2
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 202
+pluginSinceBuild = 203
pluginUntilBuild = 211.*
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
# See https://jb.gg/intellij-platform-builds-list for available build versions.
-pluginVerifierIdeVersions = 2020.2.4, 2020.3.4, 2021.1.1
+pluginVerifierIdeVersions = 2020.3.4, 2021.1.1, 2021.1.2, 2021.1.3
platformType = IC
-platformVersion = 2020.2.4
+platformVersion = 2020.3.4
platformDownloadSources = true
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
diff --git a/src/main/java/org/jastadd/tooling/grammar/GrammarFormattingModelBuilder.java b/src/main/java/org/jastadd/tooling/grammar/GrammarFormattingModelBuilder.java
index 1b5ec38..40cde98 100644
--- a/src/main/java/org/jastadd/tooling/grammar/GrammarFormattingModelBuilder.java
+++ b/src/main/java/org/jastadd/tooling/grammar/GrammarFormattingModelBuilder.java
@@ -39,14 +39,14 @@ public class GrammarFormattingModelBuilder implements FormattingModelBuilder {
}
@Override
- public @NotNull FormattingModel createModel(PsiElement element, CodeStyleSettings settings) {
+ public @NotNull FormattingModel createModel(@NotNull FormattingContext formattingContext) {
return FormattingModelProvider
- .createFormattingModelForPsiFile(element.getContainingFile(),
- new GrammarBlock(element.getNode(),
+ .createFormattingModelForPsiFile(formattingContext.getContainingFile(),
+ new GrammarBlock(formattingContext.getNode(),
Wrap.createWrap(WrapType.NONE, false),
Alignment.createAlignment(),
- createSpaceBuilder(settings)),
- settings);
+ createSpaceBuilder(formattingContext.getCodeStyleSettings())),
+ formattingContext.getCodeStyleSettings());
}
@Nullable
--
GitLab