diff --git a/plugins/env-files-support/build.gradle.kts b/plugins/env-files-support/build.gradle.kts index 709c3adaf60f..3ecb2241c8d8 100644 --- a/plugins/env-files-support/build.gradle.kts +++ b/plugins/env-files-support/build.gradle.kts @@ -1,9 +1,9 @@ plugins { - id("org.jetbrains.intellij") version "1.2.0" + id("org.jetbrains.intellij") version "1.5.3" } group = "ru.adelf" -version = "2022.1" +version = "2022.2" repositories { mavenCentral() @@ -32,15 +32,15 @@ sourceSets { } intellij { - version.set("IU-221.4501.155-EAP-SNAPSHOT") + version.set("IU-222.2270.31-EAP-SNAPSHOT") plugins.set( listOf( - "com.jetbrains.php:221.4501.163", + "com.jetbrains.php:222.2270.31", "yaml", - "org.jetbrains.plugins.go:221.4501.155", + "org.jetbrains.plugins.go:222.2270.31", "Docker", - "pythonid:221.4501.155", - "org.jetbrains.plugins.ruby:221.4501.155", + "pythonid:222.2270.35", + "org.jetbrains.plugins.ruby:222.2270.31", "Kotlin", "coverage", "CSS", @@ -55,7 +55,7 @@ intellij { tasks { patchPluginXml { sinceBuild.set("212") - untilBuild.set("221.*") + untilBuild.set("222.*") } buildSearchableOptions { @@ -65,4 +65,8 @@ tasks { runPluginVerifier { ideVersions.set(listOf("IU-213.3714.440")) } +} + +tasks.withType { + duplicatesStrategy = DuplicatesStrategy.INCLUDE } \ No newline at end of file diff --git a/plugins/env-files-support/gradle/wrapper/gradle-wrapper.properties b/plugins/env-files-support/gradle/wrapper/gradle-wrapper.properties index bca17f36566b..92f06b50fd65 100644 --- a/plugins/env-files-support/gradle/wrapper/gradle-wrapper.properties +++ b/plugins/env-files-support/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoPsiHelper.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoPsiHelper.java index dc4dbe459cd1..a670441e3317 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoPsiHelper.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoPsiHelper.java @@ -1,19 +1,20 @@ package ru.adelf.idea.dotenv.go; -import com.goide.psi.*; +import com.goide.psi.GoCallExpr; +import com.goide.psi.GoExpression; +import com.goide.psi.GoReferenceExpression; +import com.goide.psi.GoStringLiteral; import com.goide.psi.impl.GoPsiUtil; -import com.intellij.openapi.util.Pair; -import com.intellij.util.containers.ContainerUtil; import java.util.Map; class GoPsiHelper { - private static final Map ENV_FUNCTIONS = ContainerUtil.newHashMap( - Pair.pair("os.getenv", 0), - Pair.pair("os.setenv", 0), - Pair.pair("os.lookupenv", 0), - Pair.pair("os.unsetenv", 0) + private static final Map ENV_FUNCTIONS = Map.of( + "os.getenv", 0, + "os.setenv", 0, + "os.lookupenv", 0, + "os.unsetenv", 0 ); /** @@ -42,7 +43,7 @@ class GoPsiHelper { if (callExpression.getArgumentList().getExpressionList().size() < position + 1) return null; GoExpression expr = callExpression.getArgumentList().getExpressionList().get(position); - if(!(expr instanceof GoStringLiteral)) return null; + if (!(expr instanceof GoStringLiteral)) return null; return (GoStringLiteral) expr; }