From 374fbb462849483c6447bad8cb8f733512b380b3 Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Tue, 20 Feb 2024 09:04:11 +0400 Subject: [PATCH 1/6] Build vs 2023.3 --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3b62ebfd0f..ff515c3850 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,11 +17,11 @@ # https://www.jetbrains.com/intellij-repository/releases # https://www.jetbrains.com/intellij-repository/snapshots name="Perl5 Support (Camelcade)" -platformVersion=233 -platformBranch=.11799.196-EAP-SNAPSHOT +platformVersion=2023 +platformBranch=.3 platformBuild= pluginVersion=2023 -pluginBranch=.3 +pluginBranch= pluginBuild= pycharmVersion=192.4787.5-EAP-SNAPSHOT clionVersion=192.4787.12-EAP-SNAPSHOT From a41fb2760ed02d0ea7ab39f739ec83097f18767d Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Sat, 17 Feb 2024 11:49:24 +0400 Subject: [PATCH 2/6] Skip implicit compiling for the SonarLint --- gradle.properties | 2 +- settings.gradle.kts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ff515c3850..24077aacf7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,4 +37,4 @@ templating_lexer_skeleton=grammar/Perl5Templating.skeleton descriptionFile=parts/pluginDescription.html changesFile=parts/pluginChanges.html org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Xss10M -perl.test.version=5.38.0 +perl.test.version=5.38.0 \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index bfe4457aa0..f59e756a02 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -85,3 +85,4 @@ include("lang.mason.htmlmason") project(":lang.mason.htmlmason").projectDir = file("mason/htmlmason") include("lang.mason.htmlmason:core") project(":lang.mason.htmlmason:core").projectDir = file("mason/htmlmason/core") +System.setProperty("sonar.gradle.skipCompile", "true") \ No newline at end of file From 02b26cb273db99ea9680d0db92bfc75bf2bb4747 Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Sat, 17 Feb 2024 14:11:34 +0400 Subject: [PATCH 3/6] Do not mark poly-named elements twice Some DSL may produce several entities by a single identifier, e.g. mk_accessors may create getter and setter. We should avoid marking them twice as deprecated. --- .../perl/idea/inspections/PerlDeprecatedInspection.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugin/core/src/main/java/com/perl5/lang/perl/idea/inspections/PerlDeprecatedInspection.java b/plugin/core/src/main/java/com/perl5/lang/perl/idea/inspections/PerlDeprecatedInspection.java index fc3bc10f2f..8341123e84 100644 --- a/plugin/core/src/main/java/com/perl5/lang/perl/idea/inspections/PerlDeprecatedInspection.java +++ b/plugin/core/src/main/java/com/perl5/lang/perl/idea/inspections/PerlDeprecatedInspection.java @@ -25,6 +25,9 @@ import com.perl5.lang.perl.psi.utils.PerlResolveUtil; import org.jetbrains.annotations.NotNull; +import java.util.HashSet; +import java.util.Set; + /** * fixme butify this */ @@ -32,6 +35,8 @@ public class PerlDeprecatedInspection extends PerlInspection { @Override public @NotNull PsiElementVisitor buildVisitor(final @NotNull ProblemsHolder holder, boolean isOnTheFly) { return new PerlVisitor() { + private Set myMarkedElements = new HashSet<>(); + @Override public void visitSubNameElement(@NotNull PerlSubNameElement o) { PsiElement container = o.getParent(); @@ -93,7 +98,7 @@ public void visitNamespaceElement(@NotNull PerlNamespaceElement o) { public void visitPerlSubElement(@NotNull PerlSubElement o) { if (o.isDeprecated()) { PsiElement nameIdentifier = o.getNameIdentifier(); - if (nameIdentifier != null) { + if (nameIdentifier != null && myMarkedElements.add(nameIdentifier)) { markDeprecated(holder, nameIdentifier, PerlBundle.message("perl.deprecated.sub")); } } From 4a460d04944468204bd766296cd0ecbcdbab7e13 Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Sat, 17 Feb 2024 14:30:50 +0400 Subject: [PATCH 4/6] Do not bundle kotlin stdlib into plugin, provided by the platform --- gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 24077aacf7..776b66debf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,4 +37,5 @@ templating_lexer_skeleton=grammar/Perl5Templating.skeleton descriptionFile=parts/pluginDescription.html changesFile=parts/pluginChanges.html org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Xss10M -perl.test.version=5.38.0 \ No newline at end of file +perl.test.version=5.38.0 +kotlin.stdlib.default.dependency=false \ No newline at end of file From 728822bd0096be14d96f8c190859974a4b9c0efd Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Sat, 17 Feb 2024 14:36:25 +0400 Subject: [PATCH 5/6] Fixed form binding class --- .../idea/PerlDumbModuleConfigurable.form | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 plugin/idea/src/main/java/com/perl5/lang/perl/idea/configuration/module/idea/PerlDumbModuleConfigurable.form diff --git a/plugin/idea/src/main/java/com/perl5/lang/perl/idea/configuration/module/idea/PerlDumbModuleConfigurable.form b/plugin/idea/src/main/java/com/perl5/lang/perl/idea/configuration/module/idea/PerlDumbModuleConfigurable.form deleted file mode 100644 index 8cbf2b827e..0000000000 --- a/plugin/idea/src/main/java/com/perl5/lang/perl/idea/configuration/module/idea/PerlDumbModuleConfigurable.form +++ /dev/null @@ -1,27 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - -
From 599165c2df1ca6a4548616760b20ce29911971c7 Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Tue, 20 Feb 2024 09:09:29 +0400 Subject: [PATCH 6/6] Release 2023.3.1 --- .idea/encodings.xml | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 29d73a76b8..4e47717d50 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,6 @@ - + diff --git a/gradle.properties b/gradle.properties index 776b66debf..b95fc6f95b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ platformBranch=.3 platformBuild= pluginVersion=2023 pluginBranch= -pluginBuild= +pluginBuild=.1 pycharmVersion=192.4787.5-EAP-SNAPSHOT clionVersion=192.4787.12-EAP-SNAPSHOT psiViewerVersion=233.2