From dd647416f8aaa93046fdb4b3093d7913c87f2b5a Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 17 Dec 2014 14:49:20 +0300 Subject: [PATCH] Find Usages: Change .text extension to .txt in test data --- ...sUsedInPlainText.1.text => classUsedInPlainText.1.txt} | 0 ...edInPlainText.1.text => functionUsedInPlainText.1.txt} | 0 .../jet/findUsages/AbstractJetFindUsagesTest.java | 8 ++++++-- 3 files changed, 6 insertions(+), 2 deletions(-) rename idea/testData/findUsages/kotlin/findClassUsages/{classUsedInPlainText.1.text => classUsedInPlainText.1.txt} (100%) rename idea/testData/findUsages/kotlin/findFunctionUsages/{functionUsedInPlainText.1.text => functionUsedInPlainText.1.txt} (100%) diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.1.text b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.1.txt similarity index 100% rename from idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.1.text rename to idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.1.txt diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.1.text b/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.1.txt similarity index 100% rename from idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.1.text rename to idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.1.txt diff --git a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java index 7bbe3f7e81e..da6b1e48ed1 100644 --- a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java +++ b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java @@ -28,6 +28,7 @@ import com.intellij.find.impl.FindManagerImpl; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.PsiPackage; @@ -308,8 +309,11 @@ public abstract class AbstractJetFindUsagesTest extends JetLightCodeInsightFixtu public boolean accept(@NotNull File dir, @NotNull String name) { if (!name.startsWith(prefix) || name.equals(mainFileName)) return false; - String ext = name.substring(name.lastIndexOf('.') + 1); - return ext.equals("kt") || ext.equals("java") || ext.equals("xml") || ext.equals("text"); + String ext = FileUtilRt.getExtension(name); + return ext.equals("kt") + || ext.equals("java") + || ext.equals("xml") + || (ext.equals("txt") && !name.endsWith(".results.txt")); } } );