From 90369b34dcee3b13c25140d1767fcd6b3340edc4 Mon Sep 17 00:00:00 2001 From: marcelhillesheim Date: Fri, 15 Oct 2021 16:27:46 +0200 Subject: [PATCH 1/4] Added tests for existing inspections GitOrigin-RevId: a296390121a24397e7568709f2bdd8aa47bcc716 --- .../inspections/DuplicateKeyInspection.java | 8 ++++ .../SpaceInsideNonQuotedInspection.java | 7 +++ .../src/main/resources/META-INF/plugin.xml | 2 + .../dotenv/tests/dotenv/InspectionsTest.java | 44 +++++++++++++++++++ .../tests/dotenv/fixtures/inspections.env | 4 ++ 5 files changed, 65 insertions(+) create mode 100644 plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/InspectionsTest.java create mode 100644 plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/DuplicateKeyInspection.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/DuplicateKeyInspection.java index 5acc7753ee2e..0faead0b4c81 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/DuplicateKeyInspection.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/DuplicateKeyInspection.java @@ -15,6 +15,14 @@ import ru.adelf.idea.dotenv.psi.DotEnvFile; import java.util.*; public class DuplicateKeyInspection extends LocalInspectionTool { + // Change the display name within the plugin.xml + // This needs to be here as otherwise the tests will throw errors. + @NotNull + @Override + public String getDisplayName() { + return "Duplicate Key"; + } + @Override public boolean runForWholeFile() { return true; diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/SpaceInsideNonQuotedInspection.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/SpaceInsideNonQuotedInspection.java index 65d37553e128..bfaae7f21ba3 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/SpaceInsideNonQuotedInspection.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/SpaceInsideNonQuotedInspection.java @@ -16,6 +16,13 @@ import ru.adelf.idea.dotenv.psi.DotEnvTypes; import ru.adelf.idea.dotenv.psi.DotEnvValue; public class SpaceInsideNonQuotedInspection extends LocalInspectionTool { + // Change the display name within the plugin.xml + // This needs to be here as otherwise the tests will throw errors. + @NotNull + @Override + public String getDisplayName() { + return "Space inside non-quoted value"; + } private AddQuotesQuickFix addQuotesQuickFix = new AddQuotesQuickFix(); 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..f7b45129b415 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 @@ -86,6 +86,7 @@ + + expectedHighlightedText) { + myFixture.enableInspections(entry); + + List highlightInfoList = myFixture.doHighlighting(); + List actualHighlightedText = new ArrayList<>(); + + highlightInfoList.forEach( highlightInfo -> actualHighlightedText.add(highlightInfo.getText())); + + assertEquals(actualHighlightedText, expectedHighlightedText); + } +} diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env new file mode 100644 index 000000000000..fd56b7ffbec4 --- /dev/null +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env @@ -0,0 +1,4 @@ +DUPLICATE_KEY=test +DUPLICATE_KEY=test2 + +SPACE_INSIDE_NON_QUOTED=spaces without quotes From ea1946cbea9595a03e1cd91d8bc4250ade00dead Mon Sep 17 00:00:00 2001 From: marcelhillesheim Date: Sat, 16 Oct 2021 01:46:41 +0200 Subject: [PATCH 2/4] added inspection for extra blank lines GitOrigin-RevId: c47a72a5a323ee2f1d274e0b46ef388c5bea5b6d --- .../inspections/ExtraBlankLineInspection.java | 60 +++++++++++++++++++ .../src/main/resources/META-INF/plugin.xml | 10 +++- .../DotEnvExtraBlankLineInspection.html | 5 ++ .../dotenv/tests/dotenv/InspectionsTest.java | 7 ++- .../tests/dotenv/fixtures/inspections.env | 5 ++ 5 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/ExtraBlankLineInspection.java create mode 100644 plugins/env-files-support/src/main/resources/inspectionDescriptions/DotEnvExtraBlankLineInspection.html diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/ExtraBlankLineInspection.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/ExtraBlankLineInspection.java new file mode 100644 index 000000000000..bedc9810445b --- /dev/null +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/ExtraBlankLineInspection.java @@ -0,0 +1,60 @@ +package ru.adelf.idea.dotenv.inspections; + +import com.intellij.codeInspection.InspectionManager; +import com.intellij.codeInspection.LocalInspectionTool; +import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.codeInspection.ProblemsHolder; +import com.intellij.psi.PsiFile; +import com.intellij.psi.impl.source.tree.PsiWhiteSpaceImpl; +import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import ru.adelf.idea.dotenv.psi.DotEnvFile; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class ExtraBlankLineInspection extends LocalInspectionTool { + // Change the display name within the plugin.xml + // This needs to be here as otherwise the tests will throw errors. + @NotNull + @Override + public String getDisplayName() { + return "Extra blank line"; + } + + @Override + public boolean runForWholeFile() { + return true; + } + + @Nullable + @Override + public ProblemDescriptor[] checkFile(@NotNull PsiFile file, @NotNull InspectionManager manager, boolean isOnTheFly) { + if (!(file instanceof DotEnvFile)) { + return null; + } + + return analyzeFile(file, manager, isOnTheFly).getResultsArray(); + } + + @NotNull + private ProblemsHolder analyzeFile(@NotNull PsiFile file, @NotNull InspectionManager manager, boolean isOnTheFly) { + ProblemsHolder problemsHolder = new ProblemsHolder(manager, file, isOnTheFly); + + PsiTreeUtil.findChildrenOfType(file, PsiWhiteSpaceImpl.class).forEach(whiteSpace -> { + Pattern pattern = Pattern.compile("\r\n|\r|\n"); + Matcher matcher = pattern.matcher(whiteSpace.getText()); + + int count = 0; + while (matcher.find()) + count++; + + if (count > 2) { + problemsHolder.registerProblem(whiteSpace, "Only one extra line allowed between properties"); + } + }); + + return problemsHolder; + } +} 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 f7b45129b415..a58afc4c5eb9 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 @@ -86,7 +86,6 @@ - - + + diff --git a/plugins/env-files-support/src/main/resources/inspectionDescriptions/DotEnvExtraBlankLineInspection.html b/plugins/env-files-support/src/main/resources/inspectionDescriptions/DotEnvExtraBlankLineInspection.html new file mode 100644 index 000000000000..3fc8ddc59ca5 --- /dev/null +++ b/plugins/env-files-support/src/main/resources/inspectionDescriptions/DotEnvExtraBlankLineInspection.html @@ -0,0 +1,5 @@ + + +Reports extra blank lines in .env files. + + \ No newline at end of file diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/InspectionsTest.java b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/InspectionsTest.java index fe5366cad342..7ccfa7eb93f7 100644 --- a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/InspectionsTest.java +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/InspectionsTest.java @@ -3,6 +3,7 @@ package ru.adelf.idea.dotenv.tests.dotenv; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInspection.InspectionProfileEntry; import ru.adelf.idea.dotenv.inspections.DuplicateKeyInspection; +import ru.adelf.idea.dotenv.inspections.ExtraBlankLineInspection; import ru.adelf.idea.dotenv.inspections.SpaceInsideNonQuotedInspection; import ru.adelf.idea.dotenv.tests.DotEnvLightCodeInsightFixtureTestCase; @@ -31,6 +32,10 @@ public class InspectionsTest extends DotEnvLightCodeInsightFixtureTestCase { doInspectionTest(new SpaceInsideNonQuotedInspection(), Collections.singletonList("spaces without quotes")); } + public void testExtraBlankLine() { + doInspectionTest(new ExtraBlankLineInspection(), Collections.singletonList("\n\n\n")); + } + private void doInspectionTest(InspectionProfileEntry entry, List expectedHighlightedText) { myFixture.enableInspections(entry); @@ -39,6 +44,6 @@ public class InspectionsTest extends DotEnvLightCodeInsightFixtureTestCase { highlightInfoList.forEach( highlightInfo -> actualHighlightedText.add(highlightInfo.getText())); - assertEquals(actualHighlightedText, expectedHighlightedText); + assertEquals(expectedHighlightedText, actualHighlightedText); } } diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env index fd56b7ffbec4..e6ca7d14ef30 100644 --- a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env @@ -2,3 +2,8 @@ DUPLICATE_KEY=test DUPLICATE_KEY=test2 SPACE_INSIDE_NON_QUOTED=spaces without quotes + +# extra blank lines test START + + +# extra blank lines test END \ No newline at end of file From 0514fad120bfe6d8d8dac872467fac50e3388be7 Mon Sep 17 00:00:00 2001 From: marcelhillesheim Date: Sat, 16 Oct 2021 02:38:01 +0200 Subject: [PATCH 3/4] added inspection and quickfix for incorrect delimiter GitOrigin-RevId: b249d0ee825f1f5e832655bb0e68305c9512f25e --- .../IncorrectDelimiterInspection.java | 80 +++++++++++++++++++ .../src/main/resources/META-INF/plugin.xml | 8 ++ .../DotEnvIncorrectDelimiterInspection.html | 5 ++ .../dotenv/tests/dotenv/InspectionsTest.java | 20 +++++ .../tests/dotenv/fixtures/inspections.env | 4 +- .../dotenv/tests/dotenv/fixtures/quickFix.env | 11 +++ 6 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/IncorrectDelimiterInspection.java create mode 100644 plugins/env-files-support/src/main/resources/inspectionDescriptions/DotEnvIncorrectDelimiterInspection.html create mode 100644 plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/quickFix.env diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/IncorrectDelimiterInspection.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/IncorrectDelimiterInspection.java new file mode 100644 index 000000000000..11d5f17c832e --- /dev/null +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/IncorrectDelimiterInspection.java @@ -0,0 +1,80 @@ +package ru.adelf.idea.dotenv.inspections; + +import com.intellij.codeInspection.*; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import ru.adelf.idea.dotenv.DotEnvFactory; +import ru.adelf.idea.dotenv.psi.DotEnvFile; +import ru.adelf.idea.dotenv.psi.DotEnvTypes; +import ru.adelf.idea.dotenv.psi.impl.DotEnvKeyImpl; + +public class IncorrectDelimiterInspection extends LocalInspectionTool { + // Change the display name within the plugin.xml + // This needs to be here as otherwise the tests will throw errors. + @NotNull + @Override + public String getDisplayName() { + return "Incorrect delimiter"; + } + + @Override + public boolean runForWholeFile() { + return true; + } + + @Nullable + @Override + public ProblemDescriptor[] checkFile(@NotNull PsiFile file, @NotNull InspectionManager manager, boolean isOnTheFly) { + if (!(file instanceof DotEnvFile)) { + return null; + } + + return analyzeFile(file, manager, isOnTheFly).getResultsArray(); + } + + @NotNull + private ProblemsHolder analyzeFile(@NotNull PsiFile file, @NotNull InspectionManager manager, boolean isOnTheFly) { + ProblemsHolder problemsHolder = new ProblemsHolder(manager, file, isOnTheFly); + + PsiTreeUtil.findChildrenOfType(file, DotEnvKeyImpl.class).forEach(key -> { + if (key.getText().contains("-")) { + problemsHolder.registerProblem(key, "Expected: '_' Found: '-'", new ReplaceDelimiterQuickFix()); + } + }); + + return problemsHolder; + } + + private static class ReplaceDelimiterQuickFix implements LocalQuickFix { + + @NotNull + @Override + public String getName() { + return "Replace delimiter"; + } + + public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { + try { + PsiElement psiElement = descriptor.getPsiElement(); + + PsiElement newPsiElement = DotEnvFactory.createFromText(project, DotEnvTypes.KEY, + psiElement.getText().replace("-","_")+"=dummy"); + + psiElement.replace(newPsiElement); + } catch (IncorrectOperationException e) { + Logger.getInstance(IncorrectDelimiterInspection.class).error(e); + } + } + + @NotNull + public String getFamilyName() { + return getName(); + } + } +} 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 a58afc4c5eb9..2b1bde9afe89 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 @@ -110,6 +110,14 @@ level="WARNING" implementationClass="ru.adelf.idea.dotenv.inspections.ExtraBlankLineInspection"/> + + diff --git a/plugins/env-files-support/src/main/resources/inspectionDescriptions/DotEnvIncorrectDelimiterInspection.html b/plugins/env-files-support/src/main/resources/inspectionDescriptions/DotEnvIncorrectDelimiterInspection.html new file mode 100644 index 000000000000..656e6688896f --- /dev/null +++ b/plugins/env-files-support/src/main/resources/inspectionDescriptions/DotEnvIncorrectDelimiterInspection.html @@ -0,0 +1,5 @@ + + +Reports incorrect delimiter in .env files ('-' instead of'_'). + + \ No newline at end of file diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/InspectionsTest.java b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/InspectionsTest.java index 7ccfa7eb93f7..8d55be221140 100644 --- a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/InspectionsTest.java +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/InspectionsTest.java @@ -1,9 +1,11 @@ package ru.adelf.idea.dotenv.tests.dotenv; import com.intellij.codeInsight.daemon.impl.HighlightInfo; +import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInspection.InspectionProfileEntry; import ru.adelf.idea.dotenv.inspections.DuplicateKeyInspection; import ru.adelf.idea.dotenv.inspections.ExtraBlankLineInspection; +import ru.adelf.idea.dotenv.inspections.IncorrectDelimiterInspection; import ru.adelf.idea.dotenv.inspections.SpaceInsideNonQuotedInspection; import ru.adelf.idea.dotenv.tests.DotEnvLightCodeInsightFixtureTestCase; @@ -24,6 +26,8 @@ public class InspectionsTest extends DotEnvLightCodeInsightFixtureTestCase { return basePath + "dotenv/fixtures"; } + // Test for each Inspection + public void testDuplicateKey() { doInspectionTest(new DuplicateKeyInspection(), Arrays.asList("DUPLICATE_KEY=test", "DUPLICATE_KEY=test2")); } @@ -36,6 +40,22 @@ public class InspectionsTest extends DotEnvLightCodeInsightFixtureTestCase { doInspectionTest(new ExtraBlankLineInspection(), Collections.singletonList("\n\n\n")); } + public void testIncorrectDelimiterInspection() { + doInspectionTest(new IncorrectDelimiterInspection(), Collections.singletonList("INCORRECT-DELIMITER")); + } + + // Every available quickfix from every inspection is getting applied + public void testQuickFixes() { + myFixture.enableInspections(new SpaceInsideNonQuotedInspection()); + myFixture.enableInspections(new ExtraBlankLineInspection()); + myFixture.enableInspections(new IncorrectDelimiterInspection()); + + myFixture.doHighlighting(); + List intentionActions = myFixture.getAllQuickFixes(); + intentionActions.forEach(intentionAction -> myFixture.launchAction(intentionAction)); + myFixture.checkResultByFile("quickFix.env"); + } + private void doInspectionTest(InspectionProfileEntry entry, List expectedHighlightedText) { myFixture.enableInspections(entry); diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env index e6ca7d14ef30..46a4f60baff3 100644 --- a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/inspections.env @@ -6,4 +6,6 @@ SPACE_INSIDE_NON_QUOTED=spaces without quotes # extra blank lines test START -# extra blank lines test END \ No newline at end of file +# extra blank lines test END + +INCORRECT-DELIMITER=test-test \ No newline at end of file diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/quickFix.env b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/quickFix.env new file mode 100644 index 000000000000..0b354b2ca67e --- /dev/null +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/quickFix.env @@ -0,0 +1,11 @@ +DUPLICATE_KEY=test +DUPLICATE_KEY=test2 + +SPACE_INSIDE_NON_QUOTED="spaces without quotes" + +# extra blank lines test START + + +# extra blank lines test END + +INCORRECT_DELIMITER=test-test \ No newline at end of file From b9fe1bd7dbdb19d823359953559b6391ef8a33df Mon Sep 17 00:00:00 2001 From: marcelhillesheim Date: Sat, 16 Oct 2021 02:52:05 +0200 Subject: [PATCH 4/4] Added quickfix for extra blank lines GitOrigin-RevId: 2d47cff0785b089a5419d6547eed1d69342cbd0c --- .../inspections/ExtraBlankLineInspection.java | 41 ++++++++++++++++--- .../dotenv/tests/dotenv/fixtures/quickFix.env | 1 - 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/ExtraBlankLineInspection.java b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/ExtraBlankLineInspection.java index bedc9810445b..d32690be0222 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/ExtraBlankLineInspection.java +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/inspections/ExtraBlankLineInspection.java @@ -1,14 +1,17 @@ package ru.adelf.idea.dotenv.inspections; -import com.intellij.codeInspection.InspectionManager; -import com.intellij.codeInspection.LocalInspectionTool; -import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.codeInspection.ProblemsHolder; +import com.intellij.codeInspection.*; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; +import com.intellij.psi.impl.source.tree.ElementType; import com.intellij.psi.impl.source.tree.PsiWhiteSpaceImpl; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import ru.adelf.idea.dotenv.DotEnvFactory; import ru.adelf.idea.dotenv.psi.DotEnvFile; import java.util.regex.Matcher; @@ -51,10 +54,38 @@ public class ExtraBlankLineInspection extends LocalInspectionTool { count++; if (count > 2) { - problemsHolder.registerProblem(whiteSpace, "Only one extra line allowed between properties"); + problemsHolder.registerProblem(whiteSpace, + "Only one extra line allowed between properties", + new RemoveExtraBlankLineQuickFix()); } }); return problemsHolder; } + + private static class RemoveExtraBlankLineQuickFix implements LocalQuickFix { + + @NotNull + @Override + public String getName() { + return "Remove extra blank line"; + } + + public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { + try { + PsiElement psiElement = descriptor.getPsiElement(); + + PsiElement newPsiElement = DotEnvFactory.createFromText(project, ElementType.WHITE_SPACE, "\n\n"); + + psiElement.replace(newPsiElement); + } catch (IncorrectOperationException e) { + Logger.getInstance(ExtraBlankLineInspection.class).error(e); + } + } + + @NotNull + public String getFamilyName() { + return getName(); + } + } } diff --git a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/quickFix.env b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/quickFix.env index 0b354b2ca67e..d7b46e610019 100644 --- a/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/quickFix.env +++ b/plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/fixtures/quickFix.env @@ -5,7 +5,6 @@ SPACE_INSIDE_NON_QUOTED="spaces without quotes" # extra blank lines test START - # extra blank lines test END INCORRECT_DELIMITER=test-test \ No newline at end of file