From 605d747a2e73e1e96c6dd7a59fc46ca74577d216 Mon Sep 17 00:00:00 2001 From: JohnHake Date: Mon, 10 Feb 2020 09:15:27 -0800 Subject: [PATCH] Incorporate Review --- .idea/modules.xml | 2 - .../simple_language_plugin/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../sdk/language/SimpleAnnotator.java | 46 +++++++++---------- .../language/SimpleCompletionContributor.java | 3 -- .../sdk/language/SimpleFoldingBuilder.java | 5 +- .../SimpleRefactoringSupportProvider.java | 5 -- .../language/SimpleReferenceContributor.java | 34 +++++++------- .../language/SimpleStructureViewElement.java | 39 ++++++++-------- .../com/intellij/sdk/language/SimpleUtil.java | 2 +- .../intellij/sdk/language/psi/SimpleFile.java | 5 -- .../src/main/resources/META-INF/plugin.xml | 3 +- .../sdk/language/SimpleCodeInsightTest.java | 2 +- .../sdk/language/SimpleParsingTest.java | 2 +- .../AnnotatorTestData.java | 0 .../CompleteTestData.java | 0 .../DefaultTestData.simple | 0 .../FindUsagesTestData.java | 0 .../FindUsagesTestData.simple | 0 .../FoldingTestData.java | 0 .../FormatterTestData.simple | 0 .../ParsingTestData.simple | 0 .../ParsingTestData.txt | 0 .../ReferenceTestData.java | 0 .../RenameTestData.java | 0 .../RenameTestData.simple | 0 .../RenameTestDataAfter.simple | 0 27 files changed, 69 insertions(+), 85 deletions(-) rename code_samples/simple_language_plugin/src/test/{testData => resources}/AnnotatorTestData.java (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/CompleteTestData.java (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/DefaultTestData.simple (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/FindUsagesTestData.java (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/FindUsagesTestData.simple (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/FoldingTestData.java (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/FormatterTestData.simple (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/ParsingTestData.simple (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/ParsingTestData.txt (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/ReferenceTestData.java (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/RenameTestData.java (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/RenameTestData.simple (100%) rename code_samples/simple_language_plugin/src/test/{testData => resources}/RenameTestDataAfter.simple (100%) diff --git a/.idea/modules.xml b/.idea/modules.xml index 465285e72..2393f4057 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,6 @@ - - diff --git a/code_samples/simple_language_plugin/build.gradle b/code_samples/simple_language_plugin/build.gradle index 34c2bd394..b48a5b20b 100644 --- a/code_samples/simple_language_plugin/build.gradle +++ b/code_samples/simple_language_plugin/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.jetbrains.intellij' version '0.4.15' + id 'org.jetbrains.intellij' version '0.4.16' } group 'com.intellij.sdk' @@ -13,6 +13,7 @@ repositories { } test { + // This path value is machine-specific placeholder text. // Set idea.home.path to the absolute path to the intellij-community source // on your local machine. systemProperty "idea.home.path", "/Users/jhake/Documents/source/comm" @@ -28,7 +29,6 @@ dependencies { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { version '2019.3.2' - type = 'IC' plugins 'java' updateSinceUntilBuild = false } diff --git a/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties b/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties index 94920145f..1b16c34a7 100644 --- a/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties +++ b/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleAnnotator.java b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleAnnotator.java index 2ab72f2b4..caef97733 100644 --- a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleAnnotator.java +++ b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleAnnotator.java @@ -15,45 +15,45 @@ public class SimpleAnnotator implements Annotator { // Define strings for the Simple language prefix - used for annotations, line markers, etc. public static final String SIMPLE_PREFIX_STR = "simple"; public static final String SIMPLE_SEPARATOR_STR = ":"; - + @Override public void annotate(@NotNull final PsiElement element, @NotNull AnnotationHolder holder) { - // Ensure the Psi element is an expression - if ( !( element instanceof PsiLiteralExpression ) ) return; - + // Ensure the Psi Element is an expression + if (!(element instanceof PsiLiteralExpression)) return; + // Ensure the Psi element contains a string that starts with the key and separator PsiLiteralExpression literalExpression = (PsiLiteralExpression) element; String value = literalExpression.getValue() instanceof String ? (String) literalExpression.getValue() : null; - if ( ( value == null ) || !value.startsWith( SIMPLE_PREFIX_STR + SIMPLE_SEPARATOR_STR ) ) return; - + if ((value == null) || !value.startsWith(SIMPLE_PREFIX_STR + SIMPLE_SEPARATOR_STR)) return; + // Define the text ranges (start is inclusive, end is exclusive) // "simple:key" // 01234567890 - TextRange prefixRange = TextRange.from( element.getTextRange().getStartOffset(), SIMPLE_PREFIX_STR.length() + 1 ); - TextRange separatorRange = TextRange.from( prefixRange.getEndOffset(), SIMPLE_SEPARATOR_STR.length() ); - TextRange keyRange = new TextRange( separatorRange.getEndOffset(), element.getTextRange().getEndOffset() - 1 ); - + TextRange prefixRange = TextRange.from(element.getTextRange().getStartOffset(), SIMPLE_PREFIX_STR.length() + 1); + TextRange separatorRange = TextRange.from(prefixRange.getEndOffset(), SIMPLE_SEPARATOR_STR.length()); + TextRange keyRange = new TextRange(separatorRange.getEndOffset(), element.getTextRange().getEndOffset() - 1); + // Get the list of properties from the Project - String possibleProperties = value.substring( SIMPLE_PREFIX_STR.length() + SIMPLE_SEPARATOR_STR.length() ); + String possibleProperties = value.substring(SIMPLE_PREFIX_STR.length() + SIMPLE_SEPARATOR_STR.length()); Project project = element.getProject(); - List< SimpleProperty > properties = SimpleUtil.findProperties( project, possibleProperties ); - + List properties = SimpleUtil.findProperties(project, possibleProperties); + // Set the annotations using the text ranges. - Annotation keyAnnotation = holder.createInfoAnnotation( prefixRange, null ); - keyAnnotation.setTextAttributes( DefaultLanguageHighlighterColors.KEYWORD ); - Annotation separatorAnnotation = holder.createInfoAnnotation( separatorRange, null ); - separatorAnnotation.setTextAttributes( SimpleSyntaxHighlighter.SEPARATOR ); - if ( properties.isEmpty() ) { + Annotation keyAnnotation = holder.createInfoAnnotation(prefixRange, null); + keyAnnotation.setTextAttributes(DefaultLanguageHighlighterColors.KEYWORD); + Annotation separatorAnnotation = holder.createInfoAnnotation(separatorRange, null); + separatorAnnotation.setTextAttributes(SimpleSyntaxHighlighter.SEPARATOR); + if (properties.isEmpty()) { // No well-formed property found following the key-separator - Annotation badProperty = holder.createErrorAnnotation( keyRange, "Unresolved property" ); - badProperty.setTextAttributes( SimpleSyntaxHighlighter.BAD_CHARACTER ); + Annotation badProperty = holder.createErrorAnnotation(keyRange, "Unresolved property"); + badProperty.setTextAttributes(SimpleSyntaxHighlighter.BAD_CHARACTER); // ** Tutorial step 18.3 - Add a quick fix for the string containing possible properties badProperty.registerFix(new SimpleCreatePropertyQuickFix(possibleProperties)); } else { // Found at least one property - Annotation annotation = holder.createInfoAnnotation( keyRange, null ); - annotation.setTextAttributes( SimpleSyntaxHighlighter.VALUE ); + Annotation annotation = holder.createInfoAnnotation(keyRange, null); + annotation.setTextAttributes(SimpleSyntaxHighlighter.VALUE); } } - + } diff --git a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCompletionContributor.java b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCompletionContributor.java index ec29657ef..4db1b4182 100644 --- a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCompletionContributor.java +++ b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCompletionContributor.java @@ -11,15 +11,12 @@ import org.jetbrains.annotations.NotNull; public class SimpleCompletionContributor extends CompletionContributor { public SimpleCompletionContributor() { - // Register the completion providers extend( CompletionType.BASIC, PlatformPatterns.psiElement(SimpleTypes.VALUE).withLanguage(SimpleLanguage.INSTANCE), new CompletionProvider() { - // Define candidate completions public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) { - // Create a completion independent of context for Simple language resultSet.addElement(LookupElementBuilder.create("Hello")); } } diff --git a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFoldingBuilder.java b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFoldingBuilder.java index 457f835bd..f08168d60 100644 --- a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFoldingBuilder.java +++ b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFoldingBuilder.java @@ -27,13 +27,13 @@ public class SimpleFoldingBuilder extends FoldingBuilderEx implements DumbAware // Get a collection of the literal expressions in the document below root Collection< PsiLiteralExpression > literalExpressions = PsiTreeUtil.findChildrenOfType(root, PsiLiteralExpression.class); - // Evaluate the collection, using only Simple language literalExpressions + // Evaluate the collection for ( final PsiLiteralExpression literalExpression : literalExpressions ) { String value = literalExpression.getValue() instanceof String ? (String) literalExpression.getValue() : null; if ( value != null && value.startsWith(SIMPLE_PREFIX_STR + SIMPLE_SEPARATOR_STR) ) { Project project = literalExpression.getProject(); String key = value.substring(SIMPLE_PREFIX_STR.length() + SIMPLE_SEPARATOR_STR.length()); - // Get a list of properties for the project + // Get a list of all properties for a given key in the project final List< SimpleProperty > properties = SimpleUtil.findProperties(project, key); if ( properties.size() == 1 ) { // Add a folding descriptor for the literal expression at this node. @@ -52,7 +52,6 @@ public class SimpleFoldingBuilder extends FoldingBuilderEx implements DumbAware * @param node Node corresponding to PsiLiteralExpression containing a string in the format * SIMPLE_PREFIX_STR + SIMPLE_SEPARATOR_STR + Key, where Key is * defined by the Simple language file. - * @return String corresponding to the "website" key. */ @Nullable @Override diff --git a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleRefactoringSupportProvider.java b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleRefactoringSupportProvider.java index 95da8b291..f54b4253b 100644 --- a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleRefactoringSupportProvider.java +++ b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleRefactoringSupportProvider.java @@ -13,8 +13,3 @@ public class SimpleRefactoringSupportProvider extends RefactoringSupportProvider return (elementToRename instanceof SimpleProperty); } } - -/* -2020-01-10 21:59:36,392 [ 74521] WARN - name.RenamePsiElementProcessor - org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinTypeParameterProcessor overrides deprecated findReferences(..). -Override findReferences(PsiElement, SearchScope, boolean) instead. -*/ \ No newline at end of file diff --git a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleReferenceContributor.java b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleReferenceContributor.java index 886111cfa..66f11f782 100644 --- a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleReferenceContributor.java +++ b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleReferenceContributor.java @@ -13,22 +13,22 @@ import static com.intellij.sdk.language.SimpleAnnotator.*; public class SimpleReferenceContributor extends PsiReferenceContributor { @Override public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { - registrar.registerReferenceProvider( PlatformPatterns.psiElement( PsiLiteralExpression.class ), - new PsiReferenceProvider() { - @NotNull - @Override - public PsiReference[] getReferencesByElement(@NotNull PsiElement element, - @NotNull ProcessingContext context) { - PsiLiteralExpression literalExpression = (PsiLiteralExpression) element; - String value = literalExpression.getValue() instanceof String ? - (String) literalExpression.getValue() : null; - if ( ( value != null && value.startsWith( SIMPLE_PREFIX_STR + SIMPLE_SEPARATOR_STR ) ) ) { - TextRange property = new TextRange( SIMPLE_PREFIX_STR.length() + SIMPLE_SEPARATOR_STR.length() + 1, - value.length() + 1 ); - return new PsiReference[]{ new SimpleReference( element, property ) }; - } - return PsiReference.EMPTY_ARRAY; - } - } ); + registrar.registerReferenceProvider(PlatformPatterns.psiElement(PsiLiteralExpression.class), + new PsiReferenceProvider() { + @NotNull + @Override + public PsiReference[] getReferencesByElement(@NotNull PsiElement element, + @NotNull ProcessingContext context) { + PsiLiteralExpression literalExpression = (PsiLiteralExpression) element; + String value = literalExpression.getValue() instanceof String ? + (String) literalExpression.getValue() : null; + if ((value != null && value.startsWith(SIMPLE_PREFIX_STR + SIMPLE_SEPARATOR_STR))) { + TextRange property = new TextRange(SIMPLE_PREFIX_STR.length() + SIMPLE_SEPARATOR_STR.length() + 1, + value.length() + 1); + return new PsiReference[]{new SimpleReference(element, property)}; + } + return PsiReference.EMPTY_ARRAY; + } + }); } } diff --git a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewElement.java b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewElement.java index 8d3629202..2e5efc95f 100644 --- a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewElement.java +++ b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewElement.java @@ -18,57 +18,56 @@ import java.util.ArrayList; import java.util.List; public class SimpleStructureViewElement implements StructureViewTreeElement, SortableTreeElement { - private NavigatablePsiElement element; - + private NavigatablePsiElement myElement; + public SimpleStructureViewElement(NavigatablePsiElement element) { - this.element = element; + this.myElement = element; } - + @Override public Object getValue() { - return element; + return myElement; } - + @Override public void navigate(boolean requestFocus) { - element.navigate(requestFocus); + myElement.navigate(requestFocus); } - + @Override public boolean canNavigate() { - return element.canNavigate(); + return myElement.canNavigate(); } - + @Override public boolean canNavigateToSource() { - return element.canNavigateToSource(); + return myElement.canNavigateToSource(); } - + @NotNull @Override public String getAlphaSortKey() { - String name = element.getName(); + String name = myElement.getName(); return name != null ? name : ""; } - + @NotNull @Override public ItemPresentation getPresentation() { - ItemPresentation presentation = element.getPresentation(); + ItemPresentation presentation = myElement.getPresentation(); return presentation != null ? presentation : new PresentationData(); } - + @Override public TreeElement[] getChildren() { - if (element instanceof SimpleFile) { - SimpleProperty[] properties = PsiTreeUtil.getChildrenOfType(element, SimpleProperty.class); + if (myElement instanceof SimpleFile) { + SimpleProperty[] properties = PsiTreeUtil.getChildrenOfType(myElement, SimpleProperty.class); List treeElements = new ArrayList(properties.length); for (SimpleProperty property : properties) { treeElements.add(new SimpleStructureViewElement((SimplePropertyImpl) property)); } return treeElements.toArray(new TreeElement[treeElements.size()]); - } else { - return EMPTY_ARRAY; } + return EMPTY_ARRAY; } } \ No newline at end of file diff --git a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleUtil.java b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleUtil.java index 3511323d0..4666fa6b3 100644 --- a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleUtil.java +++ b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleUtil.java @@ -12,7 +12,7 @@ import java.util.*; public class SimpleUtil { - // Searches the entire project for Simple language files with instances of the Simple property + // Searches the entire project for Simple language files with instances of the Simple property with the given key public static List findProperties(Project project, String key) { List result = null; Collection virtualFiles = diff --git a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleFile.java b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleFile.java index 3d012cd5a..95cf389c3 100644 --- a/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleFile.java +++ b/code_samples/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleFile.java @@ -23,9 +23,4 @@ public class SimpleFile extends PsiFileBase { public String toString() { return "Simple File"; } - - @Override - public Icon getIcon(int flags) { - return super.getIcon(flags); - } } \ No newline at end of file diff --git a/code_samples/simple_language_plugin/src/main/resources/META-INF/plugin.xml b/code_samples/simple_language_plugin/src/main/resources/META-INF/plugin.xml index d822c4b6f..f09d17ce4 100644 --- a/code_samples/simple_language_plugin/src/main/resources/META-INF/plugin.xml +++ b/code_samples/simple_language_plugin/src/main/resources/META-INF/plugin.xml @@ -12,7 +12,7 @@ 2.0.0 @@ -43,6 +43,7 @@ diff --git a/code_samples/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleCodeInsightTest.java b/code_samples/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleCodeInsightTest.java index 1dc8048b0..bcfd58774 100644 --- a/code_samples/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleCodeInsightTest.java +++ b/code_samples/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleCodeInsightTest.java @@ -23,7 +23,7 @@ public class SimpleCodeInsightTest extends LightJavaCodeInsightFixtureTestCase { */ @Override protected String getTestDataPath() { - return "src/test/testData"; + return "src/test/resources"; } public void testCompletion() { diff --git a/code_samples/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleParsingTest.java b/code_samples/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleParsingTest.java index 98a3b9d11..b0a96d281 100644 --- a/code_samples/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleParsingTest.java +++ b/code_samples/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleParsingTest.java @@ -17,7 +17,7 @@ public class SimpleParsingTest extends ParsingTestCase { */ @Override protected String getTestDataPath() { - return "src/test/testData"; + return "src/test/resources"; } @Override diff --git a/code_samples/simple_language_plugin/src/test/testData/AnnotatorTestData.java b/code_samples/simple_language_plugin/src/test/resources/AnnotatorTestData.java similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/AnnotatorTestData.java rename to code_samples/simple_language_plugin/src/test/resources/AnnotatorTestData.java diff --git a/code_samples/simple_language_plugin/src/test/testData/CompleteTestData.java b/code_samples/simple_language_plugin/src/test/resources/CompleteTestData.java similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/CompleteTestData.java rename to code_samples/simple_language_plugin/src/test/resources/CompleteTestData.java diff --git a/code_samples/simple_language_plugin/src/test/testData/DefaultTestData.simple b/code_samples/simple_language_plugin/src/test/resources/DefaultTestData.simple similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/DefaultTestData.simple rename to code_samples/simple_language_plugin/src/test/resources/DefaultTestData.simple diff --git a/code_samples/simple_language_plugin/src/test/testData/FindUsagesTestData.java b/code_samples/simple_language_plugin/src/test/resources/FindUsagesTestData.java similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/FindUsagesTestData.java rename to code_samples/simple_language_plugin/src/test/resources/FindUsagesTestData.java diff --git a/code_samples/simple_language_plugin/src/test/testData/FindUsagesTestData.simple b/code_samples/simple_language_plugin/src/test/resources/FindUsagesTestData.simple similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/FindUsagesTestData.simple rename to code_samples/simple_language_plugin/src/test/resources/FindUsagesTestData.simple diff --git a/code_samples/simple_language_plugin/src/test/testData/FoldingTestData.java b/code_samples/simple_language_plugin/src/test/resources/FoldingTestData.java similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/FoldingTestData.java rename to code_samples/simple_language_plugin/src/test/resources/FoldingTestData.java diff --git a/code_samples/simple_language_plugin/src/test/testData/FormatterTestData.simple b/code_samples/simple_language_plugin/src/test/resources/FormatterTestData.simple similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/FormatterTestData.simple rename to code_samples/simple_language_plugin/src/test/resources/FormatterTestData.simple diff --git a/code_samples/simple_language_plugin/src/test/testData/ParsingTestData.simple b/code_samples/simple_language_plugin/src/test/resources/ParsingTestData.simple similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/ParsingTestData.simple rename to code_samples/simple_language_plugin/src/test/resources/ParsingTestData.simple diff --git a/code_samples/simple_language_plugin/src/test/testData/ParsingTestData.txt b/code_samples/simple_language_plugin/src/test/resources/ParsingTestData.txt similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/ParsingTestData.txt rename to code_samples/simple_language_plugin/src/test/resources/ParsingTestData.txt diff --git a/code_samples/simple_language_plugin/src/test/testData/ReferenceTestData.java b/code_samples/simple_language_plugin/src/test/resources/ReferenceTestData.java similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/ReferenceTestData.java rename to code_samples/simple_language_plugin/src/test/resources/ReferenceTestData.java diff --git a/code_samples/simple_language_plugin/src/test/testData/RenameTestData.java b/code_samples/simple_language_plugin/src/test/resources/RenameTestData.java similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/RenameTestData.java rename to code_samples/simple_language_plugin/src/test/resources/RenameTestData.java diff --git a/code_samples/simple_language_plugin/src/test/testData/RenameTestData.simple b/code_samples/simple_language_plugin/src/test/resources/RenameTestData.simple similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/RenameTestData.simple rename to code_samples/simple_language_plugin/src/test/resources/RenameTestData.simple diff --git a/code_samples/simple_language_plugin/src/test/testData/RenameTestDataAfter.simple b/code_samples/simple_language_plugin/src/test/resources/RenameTestDataAfter.simple similarity index 100% rename from code_samples/simple_language_plugin/src/test/testData/RenameTestDataAfter.simple rename to code_samples/simple_language_plugin/src/test/resources/RenameTestDataAfter.simple