diff --git a/plugins/env-files-support/build.gradle b/plugins/env-files-support/build.gradle index be2b766217e0..05de62bbcaac 100644 --- a/plugins/env-files-support/build.gradle +++ b/plugins/env-files-support/build.gradle @@ -21,7 +21,7 @@ sourceSets { } test { java.srcDirs 'src/test/java' - //resources.srcDirs 'src/test/resources' + resources.srcDirs 'src/test/resources' } } @@ -49,6 +49,7 @@ intellij { patchPluginXml { sinceBuild '191' + untilBuild '192.*' } group 'ru.adelf' diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/api/EnvironmentVariablesApi.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/api/EnvironmentVariablesApi.java index 0b9dcd8efdcb..caf98843a965 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/api/EnvironmentVariablesApi.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/api/EnvironmentVariablesApi.java @@ -6,11 +6,12 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.search.PsiSearchHelper; +import com.intellij.util.Processor; import com.intellij.util.indexing.FileBasedIndex; import org.jetbrains.annotations.NotNull; import ru.adelf.idea.dotenv.indexing.DotEnvKeyValuesIndex; import ru.adelf.idea.dotenv.indexing.DotEnvKeysIndex; -import ru.adelf.idea.dotenv.indexing.DotEnvUsagesIndex; import ru.adelf.idea.dotenv.models.EnvironmentKeyValue; import ru.adelf.idea.dotenv.util.EnvironmentVariablesProviderUtil; import ru.adelf.idea.dotenv.util.EnvironmentVariablesUtil; @@ -101,20 +102,18 @@ public class EnvironmentVariablesApi { public static PsiElement[] getKeyUsages(Project project, String key) { List targets = new ArrayList<>(); - FileBasedIndex.getInstance().getFilesWithKey(DotEnvUsagesIndex.KEY, new HashSet<>(Collections.singletonList(key)), virtualFile -> { - PsiFile psiFileTarget = PsiManager.getInstance(project).findFile(virtualFile); - if(psiFileTarget == null) { - return true; - } + PsiSearchHelper searchHelper = PsiSearchHelper.getInstance(project); - for(EnvironmentVariablesUsagesProvider provider : EnvironmentVariablesProviderUtil.USAGES_PROVIDERS) { - if(provider.acceptFile(virtualFile)) { - targets.addAll(EnvironmentVariablesUtil.getUsagesElementsByKey(key, provider.getUsages(psiFileTarget))); - } + Processor psiFileProcessor = psiFile -> { + for (EnvironmentVariablesUsagesProvider provider : EnvironmentVariablesProviderUtil.USAGES_PROVIDERS) { + targets.addAll(EnvironmentVariablesUtil.getUsagesElementsByKey(key, provider.getUsages(psiFile))); } return true; - }, GlobalSearchScope.allScope(project)); + }; + + searchHelper.processAllFilesWithWord(key, GlobalSearchScope.allScope(project), psiFileProcessor, true); + searchHelper.processAllFilesWithWordInLiterals(key, GlobalSearchScope.allScope(project), psiFileProcessor); return targets.toArray(PsiElement.EMPTY_ARRAY); } 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 02bfb2519982..fb1c75e4847f 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 @@ -18,7 +18,6 @@ public class DockerComposeKeyGotoHandler implements GotoDeclarationHandler { @Nullable @Override public PsiElement[] getGotoDeclarationTargets(@Nullable PsiElement psiElement, int i, Editor editor) { - if(psiElement == null) { return PsiElement.EMPTY_ARRAY; } diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/extension/DotEnvKeyGotoHandler.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/extension/DotEnvKeyGotoHandler.java index 5fd67fc9dcb6..7e6a0156321b 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/extension/DotEnvKeyGotoHandler.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/extension/DotEnvKeyGotoHandler.java @@ -14,7 +14,6 @@ public class DotEnvKeyGotoHandler implements GotoDeclarationHandler { @Nullable @Override public PsiElement[] getGotoDeclarationTargets(@Nullable PsiElement psiElement, int i, Editor editor) { - if(psiElement == null || psiElement.getParent() == null) { return PsiElement.EMPTY_ARRAY; } diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvironmentCallsVisitor.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvironmentCallsVisitor.java new file mode 100644 index 000000000000..2946097ce364 --- /dev/null +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvironmentCallsVisitor.java @@ -0,0 +1,37 @@ +package ru.adelf.idea.dotenv.go; + +import com.goide.psi.GoCallExpr; +import com.goide.psi.GoStringLiteral; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiRecursiveElementVisitor; +import com.intellij.psi.PsiRecursiveElementWalkingVisitor; +import org.jetbrains.annotations.NotNull; +import ru.adelf.idea.dotenv.models.KeyUsagePsiElement; + +import java.util.Collection; +import java.util.HashSet; + +class GoEnvironmentCallsVisitor extends PsiRecursiveElementWalkingVisitor { + final private Collection collectedItems = new HashSet<>(); + + @Override + public void visitElement(PsiElement element) { + if(element instanceof GoCallExpr) { + this.visitCall((GoCallExpr) element); + } + + super.visitElement(element); + } + + private void visitCall(GoCallExpr expression) { + GoStringLiteral stringLiteral = GoPsiHelper.getEnvironmentGoLiteral(expression); + if(stringLiteral != null) { + collectedItems.add(new KeyUsagePsiElement(stringLiteral.getDecodedText(), stringLiteral)); + } + } + + @NotNull + Collection getCollectedItems() { + return collectedItems; + } +} diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvironmentVariablesUsagesProvider.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvironmentVariablesUsagesProvider.java new file mode 100644 index 000000000000..d5eaf2c13b99 --- /dev/null +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvironmentVariablesUsagesProvider.java @@ -0,0 +1,32 @@ +package ru.adelf.idea.dotenv.go; + +import com.goide.GoFileType; +import com.goide.psi.GoFile; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; +import ru.adelf.idea.dotenv.api.EnvironmentVariablesUsagesProvider; +import ru.adelf.idea.dotenv.models.KeyUsagePsiElement; + +import java.util.Collection; +import java.util.Collections; + +public class GoEnvironmentVariablesUsagesProvider implements EnvironmentVariablesUsagesProvider { + @Override + public boolean acceptFile(VirtualFile file) { + return file.getFileType().equals(GoFileType.INSTANCE); + } + + @NotNull + @Override + public Collection getUsages(PsiFile psiFile) { + if(psiFile instanceof GoFile) { + GoEnvironmentCallsVisitor visitor = new GoEnvironmentCallsVisitor(); + psiFile.acceptChildren(visitor); + + return visitor.getCollectedItems(); + } + + return Collections.emptyList(); + } +} diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/indexing/DotEnvUsagesIndex.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/indexing/DotEnvUsagesIndex.java deleted file mode 100644 index bccc448480c0..000000000000 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/indexing/DotEnvUsagesIndex.java +++ /dev/null @@ -1,76 +0,0 @@ -package ru.adelf.idea.dotenv.indexing; - -import com.intellij.util.indexing.*; -import com.intellij.util.io.DataExternalizer; -import com.intellij.util.io.EnumeratorStringDescriptor; -import com.intellij.util.io.KeyDescriptor; -import com.intellij.util.io.VoidDataExternalizer; -import org.jetbrains.annotations.NotNull; -import ru.adelf.idea.dotenv.api.EnvironmentVariablesUsagesProvider; -import ru.adelf.idea.dotenv.models.KeyUsagePsiElement; -import ru.adelf.idea.dotenv.util.EnvironmentVariablesProviderUtil; - -import java.util.HashMap; -import java.util.Map; - -public class DotEnvUsagesIndex extends FileBasedIndexExtension { - - public static final ID KEY = ID.create("ru.adelf.idea.php.dotenv.usages"); - private final KeyDescriptor myKeyDescriptor = new EnumeratorStringDescriptor(); - - @NotNull - @Override - public ID getName() { - return KEY; - } - - @NotNull - @Override - public DataIndexer getIndexer() { - return fileContent -> { - final Map map = new HashMap<>(); - - for(EnvironmentVariablesUsagesProvider provider : EnvironmentVariablesProviderUtil.USAGES_PROVIDERS) { - for(KeyUsagePsiElement keyUsagePsiElement : provider.getUsages(fileContent.getPsiFile())) { - map.put(keyUsagePsiElement.getKey(), null); - } - } - - return map; - }; - } - - @NotNull - @Override - public KeyDescriptor getKeyDescriptor() { - return this.myKeyDescriptor; - } - - @NotNull - @Override - public DataExternalizer getValueExternalizer() { - return VoidDataExternalizer.INSTANCE; - } - - @NotNull - @Override - public FileBasedIndex.InputFilter getInputFilter() { - return file -> { - for(EnvironmentVariablesUsagesProvider provider : EnvironmentVariablesProviderUtil.USAGES_PROVIDERS) { - if(provider.acceptFile(file)) return true; - } - - return false; - }; - } - - @Override - public boolean dependsOnFileContent() { - return true; - } - - @Override - public int getVersion() { - return 2; - } -} diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvReferenceContributor.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvReferenceContributor.java deleted file mode 100644 index 4c0b7f5b496e..000000000000 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvReferenceContributor.java +++ /dev/null @@ -1,32 +0,0 @@ -package ru.adelf.idea.dotenv.js; - -import com.intellij.lang.javascript.psi.JSReferenceExpression; -import com.intellij.openapi.util.TextRange; -import com.intellij.patterns.PlatformPatterns; -import com.intellij.psi.*; -import com.intellij.util.ProcessingContext; -import org.jetbrains.annotations.NotNull; -import ru.adelf.idea.dotenv.extension.DotEnvReference; - -public class JsEnvReferenceContributor extends PsiReferenceContributor { - @Override - public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { - registrar.registerReferenceProvider(PlatformPatterns.psiElement(JSReferenceExpression.class), - new PsiReferenceProvider() { - @NotNull - @Override - public PsiReference[] getReferencesByElement(@NotNull PsiElement element, - @NotNull ProcessingContext context) { - JSReferenceExpression reference = (JSReferenceExpression) element; - - if (!reference.getCanonicalText().startsWith("process.env.")) { - return PsiReference.EMPTY_ARRAY; - } - - String value = reference.getCanonicalText(); - - return new PsiReference[]{new DotEnvReference(element, new TextRange(0, value.length()), value.substring(12))}; - } - }); - } -} \ No newline at end of file diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpEnvReferenceContributor.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpEnvReferenceContributor.java deleted file mode 100644 index 5d32840b5d3d..000000000000 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpEnvReferenceContributor.java +++ /dev/null @@ -1,32 +0,0 @@ -package ru.adelf.idea.dotenv.php; - -import com.intellij.openapi.util.TextRange; -import com.intellij.patterns.PlatformPatterns; -import com.jetbrains.php.lang.psi.elements.StringLiteralExpression; -import com.intellij.psi.*; -import com.intellij.util.ProcessingContext; -import org.jetbrains.annotations.NotNull; -import ru.adelf.idea.dotenv.extension.DotEnvReference; - -public class PhpEnvReferenceContributor extends PsiReferenceContributor { - @Override - public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { - registrar.registerReferenceProvider(PlatformPatterns.psiElement(StringLiteralExpression.class), - new PsiReferenceProvider() { - @NotNull - @Override - public PsiReference[] getReferencesByElement(@NotNull PsiElement element, - @NotNull ProcessingContext context) { - StringLiteralExpression literal = (StringLiteralExpression) element; - - if (!PhpPsiHelper.isEnvFunctionParameter(literal)) { - return PsiReference.EMPTY_ARRAY; - } - - String value = literal.getContents(); - - return new PsiReference[]{new DotEnvReference(element, new TextRange(1, value.length() + 1))}; - } - }); - } -} \ No newline at end of file diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/ruby/RubyEnvReferenceContributor.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/ruby/RubyEnvReferenceContributor.java deleted file mode 100644 index 6c0487f90d10..000000000000 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/ruby/RubyEnvReferenceContributor.java +++ /dev/null @@ -1,54 +0,0 @@ -package ru.adelf.idea.dotenv.ruby; - -import com.intellij.openapi.util.TextRange; -import com.intellij.patterns.PlatformPatterns; -import com.intellij.psi.*; -import com.intellij.util.ProcessingContext; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.ruby.ruby.lang.psi.basicTypes.stringLiterals.RStringLiteral; -import org.jetbrains.plugins.ruby.ruby.lang.psi.expressions.RArrayIndexing; -import org.jetbrains.plugins.ruby.ruby.lang.psi.variables.RConstant; -import ru.adelf.idea.dotenv.extension.DotEnvReference; - -import java.util.Objects; - -public class RubyEnvReferenceContributor extends PsiReferenceContributor { - @Override - public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { - registrar.registerReferenceProvider(PlatformPatterns.psiElement(RStringLiteral.class), - new PsiReferenceProvider() { - @NotNull - @Override - public PsiReference[] getReferencesByElement(@NotNull PsiElement element, - @NotNull ProcessingContext context) { - RStringLiteral literal = (RStringLiteral) element; - - if (literal.getParent() == null) { - return PsiReference.EMPTY_ARRAY; - } - - PsiElement array = literal.getParent().getParent(); - - if (!(array instanceof RArrayIndexing)) { - return PsiReference.EMPTY_ARRAY; - } - - PsiElement receiver = ((RArrayIndexing) array).getReceiver(); - - if (!(receiver instanceof RConstant)) { - return PsiReference.EMPTY_ARRAY; - } - - if (receiver.getFirstChild() == null) { - return PsiReference.EMPTY_ARRAY; - } - - if (!Objects.equals(receiver.getFirstChild().getText(), "ENV")) { - return PsiReference.EMPTY_ARRAY; - } - - return new PsiReference[]{new DotEnvReference(literal, new TextRange(1, literal.getTextLength() + 1))}; - } - }); - } -} \ No newline at end of file diff --git a/plugins/env-files-support/src/main/resources/META-INF/go.xml b/plugins/env-files-support/src/main/resources/META-INF/go.xml index 589095a78fe7..bdc3e06f72c9 100644 --- a/plugins/env-files-support/src/main/resources/META-INF/go.xml +++ b/plugins/env-files-support/src/main/resources/META-INF/go.xml @@ -3,4 +3,8 @@ + + + + \ No newline at end of file diff --git a/plugins/env-files-support/src/main/resources/META-INF/js.xml b/plugins/env-files-support/src/main/resources/META-INF/js.xml index 1c80609abb6f..00f69db3d732 100644 --- a/plugins/env-files-support/src/main/resources/META-INF/js.xml +++ b/plugins/env-files-support/src/main/resources/META-INF/js.xml @@ -2,7 +2,6 @@ - diff --git a/plugins/env-files-support/src/main/resources/META-INF/php.xml b/plugins/env-files-support/src/main/resources/META-INF/php.xml index 0b244a1d3fce..defc0e368f27 100644 --- a/plugins/env-files-support/src/main/resources/META-INF/php.xml +++ b/plugins/env-files-support/src/main/resources/META-INF/php.xml @@ -2,11 +2,9 @@ - - + \ No newline at end of file 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 4eaba26c3e90..74f27f340503 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 @@ -12,21 +12,19 @@
  • Environment variables completion for PHP, JavaScript, Python, Go and Ruby languages
  • Dockerfile and docker-compose.yml files support.
  • Go to declaration(in .env file) and usages(in code), by Ctrl(Cmd)+click or hot key(Ctrl(Cmd)-B, etc.)
    • -
  • .env file commenter
    • +
  • .env file syntax highlighter
    • ]]> -
  • .env syntax highlighting
    • -
  • Go support
    • -
  • .env.* files support
    • -
  • Javascript indexing optimization(remove /node_modules from index)
    • +
  • Improved performance by removing additional indexing
    • +
  • .env syntax fix
    • ]]>     - + @@ -49,14 +47,10 @@ - - -     diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/DotEnvLightCodeInsightFixtureTestCase.java b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/DotEnvLightCodeInsightFixtureTestCase.java index 3a0df0db79a5..57eba2c05f7b 100644 --- a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/DotEnvLightCodeInsightFixtureTestCase.java +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/DotEnvLightCodeInsightFixtureTestCase.java @@ -1,11 +1,13 @@ package ru.adelf.idea.dotenv.tests; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.PsiElement; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.util.indexing.FileBasedIndexImpl; import com.intellij.util.indexing.ID; import org.jetbrains.annotations.NotNull; +import ru.adelf.idea.dotenv.api.EnvironmentVariablesApi; import java.util.ArrayList; import java.util.Collection; @@ -43,4 +45,13 @@ public abstract class DotEnvLightCodeInsightFixtureTestCase extends LightCodeIns } } } + + protected void assertUsagesContains(@NotNull String... keys) { + for (String key : keys) { + PsiElement[] usages = EnvironmentVariablesApi.getKeyUsages(this.myFixture.getProject(), key); + if(usages.length == 0) { + fail(String.format("Fail that usages contains '%s'", key)); + } + } + } } diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/GoUsagesTest.java b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/GoUsagesTest.java new file mode 100644 index 000000000000..75bb307314af --- /dev/null +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/GoUsagesTest.java @@ -0,0 +1,20 @@ +package ru.adelf.idea.dotenv.tests.usages; + +import ru.adelf.idea.dotenv.tests.DotEnvLightCodeInsightFixtureTestCase; + +public class GoUsagesTest extends DotEnvLightCodeInsightFixtureTestCase { + + @Override + public void setUp() throws Exception { + super.setUp(); + myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("usages.go")); + } + + protected String getTestDataPath() { + return basePath + "usages/fixtures"; + } + + public void testUsages() { + assertUsagesContains("GO_TEST", "GO_TEST2"); + } +} diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/JsUsagesTest.java b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/JsUsagesTest.java index 477ee09f8719..a7d00c5d5ec9 100644 --- a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/JsUsagesTest.java +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/JsUsagesTest.java @@ -1,6 +1,5 @@ package ru.adelf.idea.dotenv.tests.usages; -import ru.adelf.idea.dotenv.indexing.DotEnvUsagesIndex; import ru.adelf.idea.dotenv.tests.DotEnvLightCodeInsightFixtureTestCase; public class JsUsagesTest extends DotEnvLightCodeInsightFixtureTestCase { @@ -16,6 +15,6 @@ public class JsUsagesTest extends DotEnvLightCodeInsightFixtureTestCase { } public void testUsages() { - assertIndexContains(DotEnvUsagesIndex.KEY,"JS_TEST"); + assertUsagesContains("JS_TEST"); } } diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/PhpUsagesTest.java b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/PhpUsagesTest.java index 3ad407256ca6..0e5c3cf5e07f 100644 --- a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/PhpUsagesTest.java +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/PhpUsagesTest.java @@ -1,6 +1,5 @@ package ru.adelf.idea.dotenv.tests.usages; -import ru.adelf.idea.dotenv.indexing.DotEnvUsagesIndex; import ru.adelf.idea.dotenv.tests.DotEnvLightCodeInsightFixtureTestCase; public class PhpUsagesTest extends DotEnvLightCodeInsightFixtureTestCase { @@ -16,6 +15,6 @@ public class PhpUsagesTest extends DotEnvLightCodeInsightFixtureTestCase { } public void testUsages() { - assertIndexContains(DotEnvUsagesIndex.KEY,"PHP_TEST", "PHP_TEST2"); + assertUsagesContains("PHP_TEST", "PHP_TEST2"); } } diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/PythonUsagesTest.java b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/PythonUsagesTest.java index d670e9ebc5a9..8a47a1722543 100644 --- a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/PythonUsagesTest.java +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/PythonUsagesTest.java @@ -1,6 +1,5 @@ package ru.adelf.idea.dotenv.tests.usages; -import ru.adelf.idea.dotenv.indexing.DotEnvUsagesIndex; import ru.adelf.idea.dotenv.tests.DotEnvLightCodeInsightFixtureTestCase; public class PythonUsagesTest extends DotEnvLightCodeInsightFixtureTestCase { @@ -16,6 +15,6 @@ public class PythonUsagesTest extends DotEnvLightCodeInsightFixtureTestCase { } public void testUsages() { - assertIndexContains(DotEnvUsagesIndex.KEY,"PYTHON_TEST", "PYTHON_TEST2"); + assertUsagesContains("PYTHON_TEST", "PYTHON_TEST2"); } } diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/RubyUsagesTest.java b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/RubyUsagesTest.java index c2f2103875eb..414494e764eb 100644 --- a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/RubyUsagesTest.java +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/RubyUsagesTest.java @@ -1,6 +1,5 @@ package ru.adelf.idea.dotenv.tests.usages; -import ru.adelf.idea.dotenv.indexing.DotEnvUsagesIndex; import ru.adelf.idea.dotenv.tests.DotEnvLightCodeInsightFixtureTestCase; public class RubyUsagesTest extends DotEnvLightCodeInsightFixtureTestCase { @@ -16,6 +15,6 @@ public class RubyUsagesTest extends DotEnvLightCodeInsightFixtureTestCase { } public void testUsages() { - assertIndexContains(DotEnvUsagesIndex.KEY,"RUBY_TEST"); + assertUsagesContains("RUBY_TEST"); } } diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/fixtures/usages.go b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/fixtures/usages.go new file mode 100644 index 000000000000..db0b9d645292 --- /dev/null +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/fixtures/usages.go @@ -0,0 +1,8 @@ +package fixtures + +import "os" + +func main() { + os.Getenv("GO_TEST") + os.Setenv("GO_TEST2", "1") +}