diff --git a/.gitignore b/.gitignore index dca7572..db75df4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ out/ /.idea /.gradle /build +.intellijPlatform diff --git a/build.gradle.kts b/build.gradle.kts index d2ba084..0ae915a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,13 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile fun properties(key: String) = project.findProperty(key).toString() plugins { id("java") - id("org.jetbrains.kotlin.jvm") version "2.0.0" - id("org.jetbrains.intellij.platform") version "2.4.0" + id("org.jetbrains.kotlin.jvm") version "2.2.0" + id("org.jetbrains.intellij.platform") version "2.10.5" id("org.jetbrains.changelog") version "1.3.1" id("org.jetbrains.qodana") version "0.1.13" } @@ -27,7 +28,9 @@ dependencies { intellijPlatform { val version = providers.gradleProperty("platformVersion") val type = providers.gradleProperty("platformType") - create(type, version, useInstaller = false) + create(type, version) { + useInstaller = false + } bundledPlugins(properties("platformBundledPlugins").split(',').map(String::trim).filter(String::isNotEmpty)) plugins(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty)) @@ -39,6 +42,7 @@ dependencies { testImplementation("junit:junit:4.13.2") testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.8.2") + testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.8.2") } // Configure Gradle IntelliJ Plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin @@ -72,7 +76,7 @@ tasks { targetCompatibility = it } withType { - kotlinOptions.jvmTarget = it + compilerOptions.jvmTarget.set(JvmTarget.fromTarget(it)) } } diff --git a/src/main/java/de/espend/idea/php/toolbox/PhpToolboxApplicationService.java b/src/main/java/de/espend/idea/php/toolbox/PhpToolboxApplicationService.java index 8c16d98..620a090 100644 --- a/src/main/java/de/espend/idea/php/toolbox/PhpToolboxApplicationService.java +++ b/src/main/java/de/espend/idea/php/toolbox/PhpToolboxApplicationService.java @@ -14,7 +14,7 @@ * @author Daniel Espendiller */ @Service -@State(name = "PHP Toolbox", storages = @Storage(file = "$APP_CONFIG$/php-toolbox.xml")) +@State(name = "PHP Toolbox", storages = @Storage("$APP_CONFIG$/php-toolbox.xml")) public class PhpToolboxApplicationService implements PersistentStateComponent { final public static Logger LOG = Logger.getInstance("Toolbox-Plugin"); diff --git a/src/main/java/de/espend/idea/php/toolbox/gotoCompletion/PhpGotoDeclarationHandler.java b/src/main/java/de/espend/idea/php/toolbox/gotoCompletion/PhpGotoDeclarationHandler.java index 0a7421e..a557280 100644 --- a/src/main/java/de/espend/idea/php/toolbox/gotoCompletion/PhpGotoDeclarationHandler.java +++ b/src/main/java/de/espend/idea/php/toolbox/gotoCompletion/PhpGotoDeclarationHandler.java @@ -21,14 +21,14 @@ */ public class PhpGotoDeclarationHandler extends CompletionContributor implements GotoDeclarationHandler { - private static GotoCompletionContributor[] CONTRIBUTORS = new GotoCompletionContributor[] { + private static final GotoCompletionContributor[] CONTRIBUTORS = new GotoCompletionContributor[] { new PhpArrayCallbackGotoCompletion(), new GlobalStringClassGoto(), new PhpDocTagGotoCompletionContributor(), }; public PhpGotoDeclarationHandler() { - for (final GotoCompletionContributor contributor : CONTRIBUTORS) { + for (final GotoCompletionContributor contributor : CONTRIBUTORS) { extend(CompletionType.BASIC, contributor.getPattern(), new CompletionProvider() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, @NotNull ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { @@ -46,7 +46,7 @@ public PsiElement[] getGotoDeclarationTargets(@Nullable PsiElement psiElement, i } Set psiElements = new HashSet<>(); - for (final GotoCompletionContributor contributor : CONTRIBUTORS) { + for (final GotoCompletionContributor contributor : CONTRIBUTORS) { if(!contributor.getPattern().accepts(psiElement)) { continue; } diff --git a/src/main/java/de/espend/idea/php/toolbox/matcher/php/docTag/PhpDocTagGotoCompletionContributor.java b/src/main/java/de/espend/idea/php/toolbox/matcher/php/docTag/PhpDocTagGotoCompletionContributor.java index a9912f0..f08b70d 100644 --- a/src/main/java/de/espend/idea/php/toolbox/matcher/php/docTag/PhpDocTagGotoCompletionContributor.java +++ b/src/main/java/de/espend/idea/php/toolbox/matcher/php/docTag/PhpDocTagGotoCompletionContributor.java @@ -17,7 +17,7 @@ import de.espend.idea.php.toolbox.gotoCompletion.GotoCompletionContributor; import de.espend.idea.php.toolbox.navigation.dict.PhpToolboxDeclarationHandlerParameter; import de.espend.idea.php.toolbox.utils.ExtensionProviderUtil; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/espend/idea/php/toolbox/refactoring/TypeHintSuggestionProvider.java b/src/main/java/de/espend/idea/php/toolbox/refactoring/TypeHintSuggestionProvider.java index 3e0fcfe..f236b8f 100644 --- a/src/main/java/de/espend/idea/php/toolbox/refactoring/TypeHintSuggestionProvider.java +++ b/src/main/java/de/espend/idea/php/toolbox/refactoring/TypeHintSuggestionProvider.java @@ -8,7 +8,6 @@ import com.jetbrains.php.lang.psi.elements.Parameter; import com.jetbrains.php.refactoring.PhpNameSuggestionUtil; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang.WordUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -52,7 +51,7 @@ public SuggestedNameInfo getSuggestedNames(@NotNull PsiElement psiElement, PsiEl // remove starting if(item.toLowerCase().startsWith(end)) { - item = WordUtils.uncapitalize(item.substring(end.length())); + item = StringUtils.uncapitalize(item.substring(end.length())); } } diff --git a/src/main/java/de/espend/idea/php/toolbox/symfony/Symfony2InterfacesUtil.java b/src/main/java/de/espend/idea/php/toolbox/symfony/Symfony2InterfacesUtil.java index feef736..9009969 100644 --- a/src/main/java/de/espend/idea/php/toolbox/symfony/Symfony2InterfacesUtil.java +++ b/src/main/java/de/espend/idea/php/toolbox/symfony/Symfony2InterfacesUtil.java @@ -306,6 +306,7 @@ public boolean isCallTo(MethodReference e, String ClassInterfaceName, String met /** * @deprecated isCallTo with MethodReference */ + @Deprecated public boolean isCallTo(PsiElement e, String ClassInterfaceName, String methodName) { // we need a full fqn name