Skip to content

Commit

Permalink
Merge pull request #71 from melix/upgrade/IJ-2023.2
Browse files Browse the repository at this point in the history
support for IJ 2023.2
  • Loading branch information
musketyr authored Jul 31, 2023
2 parents 9db2410 + 7175512 commit 567cb81
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/beta_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
distribution: zulu
- uses: gradle/gradle-build-action@v2
with:
arguments: publishPlugin -PpublishPluginChannels=beta -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2023.1 -PpluginVersion=6.1.0-${{ env.SNAPSHOT_SUFFIX }}
arguments: publishPlugin -PpublishPluginChannels=beta -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2023.2 -PpluginVersion=6.2.0-${{ env.SNAPSHOT_SUFFIX }}
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
matrix:
version:
- "-PideVersion=IC-2022.3"
- "-PideVersion=IC-2023.1"
- "-PideVersion=IC-2023.2"
steps:
- uses: actions/checkout@v1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
distribution: zulu
- uses: gradle/gradle-build-action@v2
with:
arguments: publishPlugin -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2023.1 -PpluginVersion=${{ steps.version.outputs.tag }}
arguments: publishPlugin -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2023.2 -PpluginVersion=${{ steps.version.outputs.tag }}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'org.jetbrains.intellij' version '1.13.3'
id 'org.jetbrains.intellij' version '1.15.0'
id 'java'
id 'idea'
id 'groovy'
Expand All @@ -8,7 +8,7 @@ plugins {

if (!project.hasProperty('publishPluginChannels')) ext.publishPluginChannels = ''
if (!project.hasProperty('publishPluginToken')) ext.publishPluginToken = '**UNDEFINED**'
if (!project.hasProperty('ideVersion')) ext.ideVersion = 'IC-2022.3'
if (!project.hasProperty('ideVersion')) ext.ideVersion = 'IC-2023.2'

wrapper {
gradleVersion = '8.0.2'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package org.codenarc.idea.inspections.design;

import com.intellij.codeInsight.daemon.impl.quickfix.AddDefaultConstructorFix;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiModifier;
import com.intellij.util.containers.JBIterable;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import javax.annotation.Generated;
Expand Down Expand Up @@ -70,9 +68,8 @@ public boolean isEnhancedMode() {
if (theClass == null) {
return Collections.singletonList(new GrRemoveModifierFix(PsiModifier.ABSTRACT));
}
return Arrays.asList(
new GrModifierFix(theClass, PsiModifier.ABSTRACT, true, false, GrModifierFix.MODIFIER_LIST_CHILD),
new AddDefaultConstructorFix(theClass, PsiModifier.PROTECTED)
return Collections.singleton(
new GrModifierFix(theClass, PsiModifier.ABSTRACT, true, false, GrModifierFix.MODIFIER_LIST_CHILD)
);
}

Expand Down

0 comments on commit 567cb81

Please sign in to comment.