From e46a38be438acfc777337e77a408d5b46c31d096 Mon Sep 17 00:00:00 2001 From: adelf Date: Fri, 11 Jun 2021 13:39:27 +0300 Subject: [PATCH] ugly fixes for 2021.2 version: js, docker and yaml dependencies removed GitOrigin-RevId: d8e5d85c45ea778c7f9418849e1a33b4d4e926d2 --- plugins/env-files-support/build.gradle | 27 ++++++++++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ru/adelf/idea/dotenv/DotEnvSettings.java | 3 +-- .../docker/DockerComposeKeyGotoHandler.java | 2 ++ .../DockerComposeYamlPsiElementsVisitor.java | 14 +++++++--- .../DockerComposeYamlVariablesProvider.java | 2 ++ .../docker/DockerfileKeyGotoHandler.java | 4 ++- .../docker/DockerfilePsiElementsVisitor.java | 4 ++- .../docker/DockerfileVariablesProvider.java | 2 ++ .../dotenv/js/JsEnvCompletionProvider.java | 3 ++- .../dotenv/js/JsEnvironmentCallsVisitor.java | 2 ++ .../JsEnvironmentVariablesUsagesProvider.java | 2 ++ .../ru/adelf/idea/dotenv/js/JsPsiHelper.java | 11 ++------ .../src/main/resources/META-INF/plugin.xml | 6 ++--- 14 files changed, 52 insertions(+), 32 deletions(-) diff --git a/plugins/env-files-support/build.gradle b/plugins/env-files-support/build.gradle index 10a47045d247..f05095c12f59 100644 --- a/plugins/env-files-support/build.gradle +++ b/plugins/env-files-support/build.gradle @@ -5,7 +5,13 @@ buildscript { } plugins { - id "org.jetbrains.intellij" version "0.4.9" + id "org.jetbrains.intellij" version "0.7.3" +} + +repositories { + maven { + url "https://plugins.gradle.org/m2/" + } } sourceSets { @@ -24,15 +30,15 @@ apply plugin: 'org.jetbrains.intellij' apply plugin: 'java' intellij { - version 'IU-193.6015.39' + version 'IU-212.4037.9-EAP-SNAPSHOT' plugins = [ - 'com.jetbrains.php:193.6015.48', - 'JavaScriptLanguage', + 'com.jetbrains.php:212.4037.57', + //'JavaScriptLanguage', 'yaml', - 'org.jetbrains.plugins.go:193.5662.53.103', + 'org.jetbrains.plugins.go:212.4037.9', 'Docker', - 'pythonid:193.6015.28', - 'org.jetbrains.plugins.ruby:193.6015.9', + 'pythonid:212.4037.9', + 'org.jetbrains.plugins.ruby:212.4037.9', 'Kotlin', 'coverage', 'CSS', @@ -44,7 +50,7 @@ intellij { } patchPluginXml { - sinceBuild '193' + sinceBuild '212' untilBuild '212.*' } @@ -53,5 +59,6 @@ buildSearchableOptions { } group 'ru.adelf' -version '2021.2' // Plugin version -sourceCompatibility = 1.8 \ No newline at end of file +version '2021.2.212' // Plugin version +sourceCompatibility = 11 +targetCompatibility = 11 \ 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 6f546d358b9e..63665d50595a 100644 --- a/plugins/env-files-support/gradle/wrapper/gradle-wrapper.properties +++ b/plugins/env-files-support/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/DotEnvSettings.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/DotEnvSettings.java index 446237253a50..8e9f5dd95eba 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/DotEnvSettings.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/DotEnvSettings.java @@ -1,7 +1,6 @@ package ru.adelf.idea.dotenv; import com.intellij.openapi.components.PersistentStateComponent; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.project.Project; @@ -26,6 +25,6 @@ public class DotEnvSettings implements PersistentStateComponent } public static DotEnvSettings getInstance(Project project) { - return ServiceManager.getService(project, DotEnvSettings.class); + return project.getService(DotEnvSettings.class); } } diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeKeyGotoHandler.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeKeyGotoHandler.java index fb1c75e4847f..d84d45073553 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeKeyGotoHandler.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeKeyGotoHandler.java @@ -1,3 +1,4 @@ +/* package ru.adelf.idea.dotenv.docker; import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler; @@ -77,3 +78,4 @@ public class DockerComposeKeyGotoHandler implements GotoDeclarationHandler { return null; } } +*/ diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlPsiElementsVisitor.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlPsiElementsVisitor.java index b1fdc63bf6b8..7713d8e2161f 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlPsiElementsVisitor.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlPsiElementsVisitor.java @@ -1,3 +1,4 @@ +/* package ru.adelf.idea.dotenv.docker; import com.intellij.psi.PsiElement; @@ -48,12 +49,14 @@ class DockerComposeYamlPsiElementsVisitor extends PsiRecursiveElementVisitor { } } - /** + */ +/** * FOO: * - foobar *

* FOO: [foobar] - */ + *//* + @NotNull private Collection getSequenceItems(@NotNull YAMLKeyValue yamlKeyValue) { PsiElement yamlSequence = yamlKeyValue.getLastChild(); @@ -65,10 +68,12 @@ class DockerComposeYamlPsiElementsVisitor extends PsiRecursiveElementVisitor { return Collections.emptyList(); } - /** + */ +/** * FOO: * bar: true - */ + *//* + @NotNull private Collection getMappingItems(@NotNull YAMLKeyValue yamlKeyValue) { PsiElement yamlMapping = yamlKeyValue.getLastChild(); @@ -80,3 +85,4 @@ class DockerComposeYamlPsiElementsVisitor extends PsiRecursiveElementVisitor { return Collections.emptyList(); } } +*/ diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlVariablesProvider.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlVariablesProvider.java index b512b26ef318..ec66495b6562 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlVariablesProvider.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlVariablesProvider.java @@ -1,3 +1,4 @@ +/* package ru.adelf.idea.dotenv.docker; import com.intellij.openapi.vfs.VirtualFile; @@ -37,3 +38,4 @@ public class DockerComposeYamlVariablesProvider implements EnvironmentVariablesP return Collections.emptyList(); } } +*/ diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileKeyGotoHandler.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileKeyGotoHandler.java index 6c05e3a19270..798173fdfc58 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileKeyGotoHandler.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileKeyGotoHandler.java @@ -1,9 +1,10 @@ +/* package ru.adelf.idea.dotenv.docker; import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler; +import com.intellij.docker.dockerFile.parser.psi.DockerFileEnvRegularDeclaration; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.editor.Editor; -import com.intellij.plugins.docker.dockerFile.parser.psi.DockerFileEnvRegularDeclaration; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -39,3 +40,4 @@ public class DockerfileKeyGotoHandler implements GotoDeclarationHandler { return null; } } +*/ diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfilePsiElementsVisitor.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfilePsiElementsVisitor.java index 35ca75db5375..34649e54112f 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfilePsiElementsVisitor.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfilePsiElementsVisitor.java @@ -1,6 +1,7 @@ +/* package ru.adelf.idea.dotenv.docker; -import com.intellij.plugins.docker.dockerFile.parser.psi.DockerFileEnvRegularDeclaration; +import com.intellij.docker.dockerFile.parser.psi.DockerFileEnvRegularDeclaration; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiRecursiveElementVisitor; import org.apache.commons.lang.StringUtils; @@ -34,3 +35,4 @@ class DockerfilePsiElementsVisitor extends PsiRecursiveElementVisitor { return collectedItems; } } +*/ diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileVariablesProvider.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileVariablesProvider.java index 7ff6892d9b0d..550eeddc8557 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileVariablesProvider.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileVariablesProvider.java @@ -1,3 +1,4 @@ +/* package ru.adelf.idea.dotenv.docker; import com.intellij.docker.dockerFile.DockerFileType; @@ -32,3 +33,4 @@ public class DockerfileVariablesProvider implements EnvironmentVariablesProvider return Collections.emptyList(); } } +*/ diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvCompletionProvider.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvCompletionProvider.java index 5eae17a400cb..a532fceccab3 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvCompletionProvider.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvCompletionProvider.java @@ -1,3 +1,4 @@ +/* package ru.adelf.idea.dotenv.js; import com.intellij.codeInsight.completion.CompletionParameters; @@ -57,4 +58,4 @@ public class JsEnvCompletionProvider extends BaseEnvCompletionProvider implement public String getActionText(@NotNull DataContext dataContext) { return null; } -} \ No newline at end of file +}*/ diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvironmentCallsVisitor.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvironmentCallsVisitor.java index 01e82a6c5a9d..21f7d4b95910 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvironmentCallsVisitor.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvironmentCallsVisitor.java @@ -1,3 +1,4 @@ +/* package ru.adelf.idea.dotenv.js; import com.intellij.lang.javascript.psi.JSReferenceExpression; @@ -31,3 +32,4 @@ class JsEnvironmentCallsVisitor extends PsiRecursiveElementVisitor { return collectedItems; } } +*/ diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvironmentVariablesUsagesProvider.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvironmentVariablesUsagesProvider.java index 9fca54a120c9..c5f43e3edfb9 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvironmentVariablesUsagesProvider.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvironmentVariablesUsagesProvider.java @@ -1,3 +1,4 @@ +/* package ru.adelf.idea.dotenv.js; import com.intellij.lang.javascript.JavaScriptFileType; @@ -32,3 +33,4 @@ public class JsEnvironmentVariablesUsagesProvider implements EnvironmentVariable return Collections.emptyList(); } } +*/ diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsPsiHelper.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsPsiHelper.java index e85c9bd674ae..5860d01ed3b1 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsPsiHelper.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsPsiHelper.java @@ -1,3 +1,4 @@ +/* package ru.adelf.idea.dotenv.js; import com.intellij.lang.javascript.psi.JSReferenceExpression; @@ -9,10 +10,6 @@ import org.jetbrains.annotations.Nullable; class JsPsiHelper { - /** - * @param psiElement checking element - * @return true if this is process.env.*** variable - */ static boolean checkPsiElement(@NotNull PsiElement psiElement) { if(!(psiElement instanceof LeafPsiElement)) { return false; @@ -31,11 +28,6 @@ class JsPsiHelper { return ((JSReferenceExpression) parent).getCanonicalText().startsWith("process.env"); } - /** - * Checks whole process.env.SOME_KEY reference element - * @param referenceExpression checking expression - * @return null or Environment key - */ @Nullable static String checkReferenceExpression(@NotNull JSReferenceExpression referenceExpression) { String text = referenceExpression.getCanonicalText(); @@ -47,3 +39,4 @@ class JsPsiHelper { return text.substring(12); } } +*/ diff --git a/plugins/env-files-support/src/main/resources/META-INF/plugin.xml b/plugins/env-files-support/src/main/resources/META-INF/plugin.xml index c7cdbcc721ec..976a477b0bb0 100644 --- a/plugins/env-files-support/src/main/resources/META-INF/plugin.xml +++ b/plugins/env-files-support/src/main/resources/META-INF/plugin.xml @@ -69,11 +69,11 @@ com.jetbrains.php com.intellij.modules.ruby com.intellij.modules.python - JavaScript + org.jetbrains.plugins.go - Docker - org.jetbrains.plugins.yaml + +