diff --git a/RegExpSupport/test/org/intellij/lang/regexp/RegExpParsingTest.java b/RegExpSupport/test/org/intellij/lang/regexp/RegExpParsingTest.java index a826679a3929..096f85672470 100644 --- a/RegExpSupport/test/org/intellij/lang/regexp/RegExpParsingTest.java +++ b/RegExpSupport/test/org/intellij/lang/regexp/RegExpParsingTest.java @@ -2,7 +2,7 @@ package org.intellij.lang.regexp; import com.intellij.mock.MockSmartPointerManager; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.psi.PsiComment; import com.intellij.psi.SmartPointerManager; import com.intellij.psi.SmartPsiElementPointer; @@ -32,7 +32,7 @@ public class RegExpParsingTest extends ParsingTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/RegExpSupport/testData"; + return PathManagerEx.getCommunityHomePath() + "/RegExpSupport/testData"; } public void testSimple1() throws IOException { doCodeTest("|"); } diff --git a/RegExpSupport/test/org/intellij/lang/regexp/ecmascript/EcmaScriptRegExpParsingTest.java b/RegExpSupport/test/org/intellij/lang/regexp/ecmascript/EcmaScriptRegExpParsingTest.java index 105459586576..da1187e04276 100644 --- a/RegExpSupport/test/org/intellij/lang/regexp/ecmascript/EcmaScriptRegExpParsingTest.java +++ b/RegExpSupport/test/org/intellij/lang/regexp/ecmascript/EcmaScriptRegExpParsingTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.intellij.lang.regexp.ecmascript; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.testFramework.ParsingTestCase; import org.intellij.lang.regexp.RegExpParserDefinition; @@ -18,7 +18,7 @@ public class EcmaScriptRegExpParsingTest extends ParsingTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/RegExpSupport/testData"; + return PathManagerEx.getCommunityHomePath() + "/RegExpSupport/testData"; } public void testDanglingMetaCharacter1() throws IOException { diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsManagerTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsManagerTest.java index 2e63cef1a04a..a7de235a9b07 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsManagerTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsManagerTest.java @@ -6,6 +6,7 @@ import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.codeInsight.ExternalAnnotationsManagerImpl; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl; import com.intellij.openapi.roots.OrderRootType; @@ -58,7 +59,7 @@ public class ExternalAnnotationsManagerTest extends IdeaTestCase { } public void testBundledAnnotationXmlSyntax() { - String root = PathManager.getCommunityHomePath() + "/java/jdkAnnotations"; + String root = PathManagerEx.getCommunityHomePath() + "/java/jdkAnnotations"; findAnnotationsXmlAndCheckSyntax(root); } @@ -78,7 +79,7 @@ public class ExternalAnnotationsManagerTest extends IdeaTestCase { // some android classes are missing in IDEA, e.g. android.support.annotation.NonNull public void _testAndroidAnnotationsXml() { - VirtualFile lib = LocalFileSystem.getInstance().findFileByPath(PathManager.getCommunityHomePath() + "/android/android/lib"); + VirtualFile lib = LocalFileSystem.getInstance().findFileByPath(PathManagerEx.getCommunityHomePath() + "/android/android/lib"); VirtualFile[] androidJars = Arrays.stream(lib.getChildren()) .map(file -> file.getName().endsWith(".jar") ? JarFileSystem.getInstance().getJarRootForLocalFile(file) : @@ -88,7 +89,7 @@ public class ExternalAnnotationsManagerTest extends IdeaTestCase { ApplicationManager.getApplication().runWriteAction(() -> ProjectRootManager.getInstance(getProject()) .setProjectSdk(PsiTestUtil.addRootsToJdk(getTestProjectJdk(), OrderRootType.CLASSES, androidJars))); - String root = PathManager.getCommunityHomePath() + "/android/android/annotations"; + String root = PathManagerEx.getCommunityHomePath() + "/android/android/annotations"; findAnnotationsXmlAndCheckSyntax(root); } diff --git a/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java b/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java index fa0aa843858c..6a467a0157e5 100644 --- a/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java +++ b/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java @@ -7,7 +7,7 @@ import com.intellij.codeInsight.daemon.HighlightDisplayKey; import com.intellij.codeInspection.InspectionProfileEntry; import com.intellij.codeInspection.ex.InspectionProfileImpl; import com.intellij.codeInspection.ex.InspectionToolWrapper; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.AnnotationOrderRootType; @@ -138,7 +138,7 @@ class LightTestMigration { '"'; } else { - Path basePath = Paths.get(PathManager.getCommunityHomePath()); + Path basePath = Paths.get(PathManagerEx.getCommunityHomePath()); if (myBaseDir.startsWith(basePath)) { Path relativePath = basePath.relativize(myBaseDir); String pathText = '/' + relativePath.toString().replace('\\', '/'); diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java index 4837f398dae4..c5fceb6655da 100644 --- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java +++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java @@ -1,9 +1,9 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.jvm.analysis; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; public final class JvmAnalysisTestsUtil { public static final String TEST_DATA_PROJECT_RELATIVE_BASE_PATH = - PathManager.getCommunityHomePath() + "/jvm/jvm-analysis-java-tests/testData"; + PathManagerEx.getCommunityHomePath() + "/jvm/jvm-analysis-java-tests/testData"; } diff --git a/platform/configuration-store-impl/testSrc/DefaultProjectStoreTest.kt b/platform/configuration-store-impl/testSrc/DefaultProjectStoreTest.kt index 04f414b12734..ae003de27e46 100644 --- a/platform/configuration-store-impl/testSrc/DefaultProjectStoreTest.kt +++ b/platform/configuration-store-impl/testSrc/DefaultProjectStoreTest.kt @@ -4,8 +4,8 @@ package com.intellij.configurationStore import com.intellij.externalDependencies.DependencyOnPlugin import com.intellij.externalDependencies.ExternalDependenciesManager import com.intellij.externalDependencies.ProjectExternalDependency -import com.intellij.openapi.application.PathManager import com.intellij.openapi.application.ex.ApplicationManagerEx +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.components.* import com.intellij.openapi.project.ProjectManager @@ -117,7 +117,7 @@ internal class DefaultProjectStoreTest { } @Test fun `new project from default - remove workspace component configuration`() { - val testData = Paths.get(PathManager.getCommunityHomePath(), "platform/configuration-store-impl/testData") + val testData = Paths.get(PathManagerEx.getCommunityHomePath(), "platform/configuration-store-impl/testData") val element = loadElement(testData.resolve("testData1.xml")) val tempDir = fsRule.fs.getPath("") @@ -129,7 +129,7 @@ internal class DefaultProjectStoreTest { } @Test fun `new IPR project from default - remove workspace component configuration`() { - val testData = Paths.get(PathManager.getCommunityHomePath(), "platform/configuration-store-impl/testData") + val testData = Paths.get(PathManagerEx.getCommunityHomePath(), "platform/configuration-store-impl/testData") val element = loadElement(testData.resolve("testData1.xml")) val tempDir = fsRule.fs.getPath("") diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java index 3e092d43de63..5771472b3985 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java @@ -4,8 +4,8 @@ package com.intellij.openapi.vfs.encoding; import com.intellij.ide.impl.ProjectUtil; import com.intellij.lang.Language; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.WriteAction; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.command.undo.UndoManager; @@ -213,7 +213,7 @@ public class FileEncodingTest extends PlatformTestCase implements TestDialog { } private static VirtualFile getTestRoot() { - final File testRoot = new File(PathManager.getCommunityHomePath(), "platform/platform-tests/testData/vfs/encoding"); + final File testRoot = new File(PathManagerEx.getCommunityHomePath(), "platform/platform-tests/testData/vfs/encoding"); return LocalFileSystem.getInstance().findFileByIoFile(testRoot); } diff --git a/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt b/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt index 867c43285e27..2d8aa685c106 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt +++ b/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt @@ -2,7 +2,7 @@ package com.intellij.ui import com.intellij.icons.AllIcons -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.util.IconLoader import com.intellij.openapi.util.SystemInfoRt import com.intellij.openapi.util.io.FileUtilRt @@ -104,7 +104,7 @@ internal class SvgRenderer(val svgFileDir: Path, private val deviceConfiguration "intellij.platform.ide.impl" to "platform/platform-impl/src")) { val index = outputPath.indexOf(moduleName) if (index > 0) { - val iconPath = Paths.get(PathManager.getCommunityHomePath(), relativePath, outputPath.substring(index + moduleName.length + 1 /* slash */)) + val iconPath = Paths.get(PathManagerEx.getCommunityHomePath(), relativePath, outputPath.substring(index + moduleName.length + 1 /* slash */)) assertThat(iconPath).exists() return FileUtilRt.toSystemIndependentName(svgFileDir.relativize(iconPath).toString()) } diff --git a/platform/testFramework/src/com/intellij/openapi/application/ex/PathManagerEx.java b/platform/testFramework/src/com/intellij/openapi/application/ex/PathManagerEx.java index e8fa2e5ef710..198f75eefebd 100644 --- a/platform/testFramework/src/com/intellij/openapi/application/ex/PathManagerEx.java +++ b/platform/testFramework/src/com/intellij/openapi/application/ex/PathManagerEx.java @@ -16,6 +16,7 @@ import junit.framework.TestCase; import org.jdom.Element; import org.jdom.JDOMException; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.model.serialization.JDomSerializationUtil; @@ -148,6 +149,14 @@ public class PathManagerEx { return getTestDataPath(strategy); } + /** + * @return path to 'community' project home irrespective of current project + */ + @NotNull + public static String getCommunityHomePath() { + return PathManager.getCommunityHomePath(); + } + /** * @return path to 'community' project home if {@code testClass} is located in the community project and path to 'ultimate' project otherwise */ diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestUtil.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestUtil.kt index 3ff540e0203f..080009135d58 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestUtil.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestUtil.kt @@ -8,7 +8,7 @@ import com.intellij.openapi.actionSystem.ActionManager import com.intellij.openapi.application.ApplicationBundle import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationNamesInfo -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.application.impl.ApplicationInfoImpl import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.progress.ProgressManager @@ -103,7 +103,7 @@ object GuiTestUtil { val testDataDirEnvVar = getSystemPropertyOrEnvironmentVariable(TEST_DATA_DIR) if (testDataDirEnvVar != null) return File(testDataDirEnvVar) - var testDataPath = PathManager.getCommunityHomePath() + "/platform/testGuiFramework/testData" + var testDataPath = PathManagerEx.getCommunityHomePath() + "/platform/testGuiFramework/testData" assertNotNull(testDataPath) assertThat(testDataPath).isNotEmpty testDataPath = toCanonicalPath(toSystemDependentName(testDataPath)) diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/IgnoreClassFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/IgnoreClassFixTest.java index 5562b89cf174..62644d6d574b 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/IgnoreClassFixTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/IgnoreClassFixTest.java @@ -3,7 +3,7 @@ package com.siyeh.ig.fixes; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; import com.intellij.codeInspection.LocalInspectionTool; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.siyeh.ig.LightInspectionTestCase; import com.siyeh.ig.bugs.ResultOfObjectAllocationIgnoredInspection; import com.siyeh.ig.imports.StaticImportInspection; @@ -35,6 +35,6 @@ public class IgnoreClassFixTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + LightInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH; + return PathManagerEx.getCommunityHomePath() + LightInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH; } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/SuspiciousToArrayCallFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/SuspiciousToArrayCallFixTest.java index fff554cdd0d8..11fa38ed227c 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/SuspiciousToArrayCallFixTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/SuspiciousToArrayCallFixTest.java @@ -3,7 +3,7 @@ package com.siyeh.ig.fixes.bugs; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; import com.intellij.codeInspection.LocalInspectionTool; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.siyeh.ig.LightInspectionTestCase; import com.siyeh.ig.bugs.SuspiciousToArrayCallInspection; import org.jetbrains.annotations.NotNull; @@ -23,6 +23,6 @@ public class SuspiciousToArrayCallFixTest extends LightQuickFixParameterizedTest @NotNull @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + LightInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH; + return PathManagerEx.getCommunityHomePath() + LightInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH; } } diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/controlflow/CreateMissingSwitchBranchesFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/controlflow/CreateMissingSwitchBranchesFixTest.java index 345484c37312..84e64f690d7e 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/controlflow/CreateMissingSwitchBranchesFixTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/controlflow/CreateMissingSwitchBranchesFixTest.java @@ -3,7 +3,7 @@ package com.siyeh.ig.fixes.controlflow; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; import com.intellij.codeInspection.LocalInspectionTool; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.siyeh.ig.LightInspectionTestCase; import com.siyeh.ig.controlflow.EnumSwitchStatementWhichMissesCasesInspection; import org.jetbrains.annotations.NotNull; @@ -23,6 +23,6 @@ public class CreateMissingSwitchBranchesFixTest extends LightQuickFixParameteriz @NotNull @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + LightInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH; + return PathManagerEx.getCommunityHomePath() + LightInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH; } } diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/performance/ListRemoveInLoopFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/performance/ListRemoveInLoopFixTest.java index cca4678ac636..b3c05d3b5498 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/performance/ListRemoveInLoopFixTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/performance/ListRemoveInLoopFixTest.java @@ -17,7 +17,7 @@ package com.siyeh.ig.fixes.performance; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; import com.intellij.codeInspection.LocalInspectionTool; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.siyeh.ig.LightInspectionTestCase; import com.siyeh.ig.performance.ListRemoveInLoopInspection; import org.jetbrains.annotations.NotNull; @@ -38,6 +38,6 @@ public class ListRemoveInLoopFixTest extends LightQuickFixParameterizedTestCase @NotNull @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + LightInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH; + return PathManagerEx.getCommunityHomePath() + LightInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH; } } diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/imports/UnusedImportGlobalInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/imports/UnusedImportGlobalInspectionTest.java index faa72a479bde..dfe42794e535 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/imports/UnusedImportGlobalInspectionTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/imports/UnusedImportGlobalInspectionTest.java @@ -5,7 +5,7 @@ import com.intellij.analysis.AnalysisScope; import com.intellij.codeInspection.ex.GlobalInspectionToolWrapper; import com.intellij.codeInspection.ex.InspectionToolWrapper; import com.intellij.codeInspection.unusedImport.UnusedImportInspection; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.testFramework.InspectionTestUtil; import com.intellij.testFramework.InspectionsKt; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; @@ -17,7 +17,7 @@ import java.util.Collections; public class UnusedImportGlobalInspectionTest extends LightCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/InspectionGadgets/test/com/siyeh/igtest/imports/globalInspection"; + return PathManagerEx.getCommunityHomePath() + "/plugins/InspectionGadgets/test/com/siyeh/igtest/imports/globalInspection"; } public void testInnerClassImport() { diff --git a/plugins/editorconfig/test/org/editorconfig/language/EditorConfigCommenterTest.kt b/plugins/editorconfig/test/org/editorconfig/language/EditorConfigCommenterTest.kt index b4497eb83497..b8dd50d1fca7 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/EditorConfigCommenterTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/EditorConfigCommenterTest.kt @@ -2,12 +2,12 @@ package org.editorconfig.language import com.intellij.codeInsight.generation.actions.CommentByLineCommentAction -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase class EditorConfigCommenterTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/commenter/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/commenter/" fun testComment() = doTest() fun testUncomment() = doTest() diff --git a/plugins/editorconfig/test/org/editorconfig/language/EditorConfigFormattingTest.kt b/plugins/editorconfig/test/org/editorconfig/language/EditorConfigFormattingTest.kt index 4aea28cb1f43..ba8f1b9acfa2 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/EditorConfigFormattingTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/EditorConfigFormattingTest.kt @@ -2,14 +2,14 @@ package org.editorconfig.language import com.intellij.application.options.CodeStyle -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.command.WriteCommandAction import com.intellij.psi.codeStyle.CodeStyleManager import com.intellij.psi.codeStyle.CommonCodeStyleSettings import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase class EditorConfigFormattingTest : LightPlatformCodeInsightFixtureTestCase() { - override fun getTestDataPath() = "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/formatting" + override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/formatting" private fun doTestWithSettings(settings: CommonCodeStyleSettings.() -> Unit) { val file = myFixture.configureByFile("${getTestName(true)}/before/.editorconfig") diff --git a/plugins/editorconfig/test/org/editorconfig/language/EditorConfigLexerTest.kt b/plugins/editorconfig/test/org/editorconfig/language/EditorConfigLexerTest.kt index b16dddcb5528..91cf0096a205 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/EditorConfigLexerTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/EditorConfigLexerTest.kt @@ -13,7 +13,7 @@ class EditorConfigLexerTest : LexerTestCase() { override fun createLexer(): Lexer = EditorConfigLexerAdapter() override fun getDirPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/lexer/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/lexer/" .substring(PathManager.getHomePath().length) fun testEmpty() = doTest() diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigCompletionTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigCompletionTest.kt index 41852b51e8a2..d5a8b535058b 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigCompletionTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigCompletionTest.kt @@ -2,7 +2,7 @@ package org.editorconfig.language.codeinsight import com.intellij.codeInsight.lookup.LookupElement -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.util.registry.Registry import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.editorconfig.EditorConfigRegistry @@ -10,7 +10,7 @@ import org.editorconfig.language.assertIterableEquals class EditorConfigCompletionTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/completion/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/completion/" init { // calling this from setUp() turns out to be too late diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigFoldingBuilderTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigFoldingBuilderTest.kt index b1a2ae72e69b..867d7f7827f9 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigFoldingBuilderTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigFoldingBuilderTest.kt @@ -1,12 +1,12 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.editorconfig.language.codeinsight -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase class EditorConfigFoldingBuilderTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/folding/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/folding/" fun testSection() = doTest() fun testSimpleComment() = doTest() diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigHighlightUsagesTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigHighlightUsagesTest.kt index c8c797895a07..8c619ad565a9 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigHighlightUsagesTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigHighlightUsagesTest.kt @@ -1,19 +1,17 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. import com.intellij.codeInsight.daemon.impl.HighlightInfoType.ELEMENT_UNDER_CARET_READ import com.intellij.codeInsight.daemon.impl.HighlightInfoType.ELEMENT_UNDER_CARET_WRITE import com.intellij.codeInsight.daemon.impl.IdentifierHighlighterPassFactory.doWithHighlightingEnabled import com.intellij.codeInsight.daemon.impl.SeveritiesProvider -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.PlatformTestUtil.registerExtension import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase class EditorConfigHighlightUsagesTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/highlightUsages/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/highlightUsages/" fun testParentlessOption() = doTest() fun testSubcaseParentOption() = doTest() diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigInspectionsTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigInspectionsTest.kt index a028a7e30e88..b0186493c817 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigInspectionsTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigInspectionsTest.kt @@ -2,14 +2,14 @@ package org.editorconfig.language.codeinsight import com.intellij.codeInspection.LocalInspectionTool -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.editorconfig.language.codeinsight.inspections.* import kotlin.reflect.KClass class EditorConfigInspectionsTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/inspections" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/inspections" // Inspections diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigQuickfixesTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigQuickfixesTest.kt index 747db82865f3..ab7ad0ce419a 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigQuickfixesTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigQuickfixesTest.kt @@ -3,7 +3,7 @@ package org.editorconfig.language.codeinsight import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInspection.LocalInspectionTool -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.editorconfig.language.codeinsight.inspections.* import org.editorconfig.language.messages.EditorConfigBundle @@ -12,7 +12,7 @@ import kotlin.reflect.KClass class EditorConfigQuickfixesTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/quickfixes/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/quickfixes/" fun testCleanupValueList() = doTest(EditorConfigUnexpectedCommaInspection::class, diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigRefactoringTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigRefactoringTest.kt index 93a3df707eae..a84ee13eaaab 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigRefactoringTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigRefactoringTest.kt @@ -1,14 +1,14 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.editorconfig.language.codeinsight -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.CodeInsightTestUtil import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.editorconfig.language.codeinsight.refactoring.EditorConfigRenameHandler class EditorConfigRefactoringTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/refactoring/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/refactoring/" fun testRenameDeclarations() = doInplaceTest("my_rule") fun testRenameReferenceAndDeclarations() = doInplaceTest("my_symbols") diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigResolveTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigResolveTest.kt index 08c58a94e47b..231e876051b9 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigResolveTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigResolveTest.kt @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.editorconfig.language.codeinsight -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.psi.PsiElement import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiFile @@ -13,7 +13,7 @@ import java.util.* class EditorConfigResolveTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/resolve/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/resolve/" fun testSubcaseHeader() = doTest() fun testSiblingHeader() = doTest() diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EditorConfigIntentionTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EditorConfigIntentionTest.kt index 2f014251acc9..217fabf61cd1 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EditorConfigIntentionTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EditorConfigIntentionTest.kt @@ -2,14 +2,14 @@ package org.editorconfig.language.codeinsight.actions import com.intellij.codeInsight.intention.IntentionAction -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.editorconfig.language.messages.EditorConfigBundle import org.jetbrains.annotations.PropertyKey class EditorConfigIntentionTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/actions/intention/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/actions/intention/" fun testInvertBooleanValue() = doTest("intention.invert-option-value") fun testInvertSpaceValue() = doTest("intention.invert-option-value") diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EnterInEditorConfigFileHandlerTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EnterInEditorConfigFileHandlerTest.kt index 9d12d8ff4ec1..ec224b3c5783 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EnterInEditorConfigFileHandlerTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EnterInEditorConfigFileHandlerTest.kt @@ -1,12 +1,12 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.editorconfig.language.codeinsight.actions -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase class EnterInEditorConfigFileHandlerTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/actions/enter/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/codeinsight/actions/enter/" fun testEnterInsideOfWordInComment() = doTest() fun testEnterBeforeSpaceInComment() = doTest() diff --git a/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigGlobUtilTest.kt b/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigGlobUtilTest.kt index 02e8be9fd990..02a88f8a2d65 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigGlobUtilTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigGlobUtilTest.kt @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.editorconfig.language.headers -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.editorconfig.language.services.EditorConfigElementFactory import org.editorconfig.language.util.isSubcaseOf @@ -9,7 +9,7 @@ import org.junit.Test class EditorConfigGlobUtilTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/globs/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/globs/" // ---- ---- complex tests ---- ---- diff --git a/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigHeaderHierarchyTest.kt b/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigHeaderHierarchyTest.kt index 90862e3c5cb0..3deebe76ca66 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigHeaderHierarchyTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigHeaderHierarchyTest.kt @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.editorconfig.language.headers -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.editorconfig.language.assertIterableEquals import org.editorconfig.language.psi.EditorConfigPsiFile @@ -12,7 +12,7 @@ import org.editorconfig.language.util.headers.EditorConfigOverridingHeaderSearch class EditorConfigHeaderHierarchyTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/headers/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/headers/" fun testSimple() { testOverriding(0 to listOf(), 1 to listOf(0)) diff --git a/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigErrorHighlightingTest.kt b/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigErrorHighlightingTest.kt index 6f4df9462bb9..a7a5fbd42eaf 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigErrorHighlightingTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigErrorHighlightingTest.kt @@ -1,12 +1,12 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.editorconfig.language.highlighting -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase class EditorConfigErrorHighlightingTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/highlighting/error/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/highlighting/error/" fun testDanglingDot() = doTest() fun testDanglingKey() = doTest() diff --git a/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigInfoHighlightingTest.kt b/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigInfoHighlightingTest.kt index 961c99b90101..95a4b1ffecdf 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigInfoHighlightingTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigInfoHighlightingTest.kt @@ -1,12 +1,12 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.editorconfig.language.highlighting -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase class EditorConfigInfoHighlightingTest : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/highlighting/info/" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/highlighting/info/" fun testRootDeclaration() = doTest() fun testSimpleHeader() = doTest() diff --git a/plugins/editorconfig/test/org/editorconfig/language/parser/EditorConfigParsingTestBase.kt b/plugins/editorconfig/test/org/editorconfig/language/parser/EditorConfigParsingTestBase.kt index cac75d9292dd..2f5097faceda 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/parser/EditorConfigParsingTestBase.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/parser/EditorConfigParsingTestBase.kt @@ -1,12 +1,12 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.editorconfig.language.parser -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.ParsingTestCase abstract class EditorConfigParsingTestBase(dataPath: String) : ParsingTestCase(dataPath, "editorconfig", true, EditorConfigParserDefinition()) { override fun getTestDataPath() = - "${PathManager.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/parser" + "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/parser" protected fun doTest() = doTest(true) } diff --git a/plugins/groovy/groovy-uast-tests/test/org/jetbrains/plugins/groovy/uast/AbstractGroovyUastTest.kt b/plugins/groovy/groovy-uast-tests/test/org/jetbrains/plugins/groovy/uast/AbstractGroovyUastTest.kt index 1ad30b61008f..6ea2ccf795c5 100644 --- a/plugins/groovy/groovy-uast-tests/test/org/jetbrains/plugins/groovy/uast/AbstractGroovyUastTest.kt +++ b/plugins/groovy/groovy-uast-tests/test/org/jetbrains/plugins/groovy/uast/AbstractGroovyUastTest.kt @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.groovy.uast -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.uast.test.common.RenderLogTestBase @@ -10,7 +10,7 @@ import java.io.File abstract class AbstractGroovyUastTest : AbstractUastFixtureTest() { protected companion object { - val TEST_GROOVY_MODEL_DIR = File(PathManager.getCommunityHomePath(), "plugins/groovy/groovy-uast-tests/testData") + val TEST_GROOVY_MODEL_DIR = File(PathManagerEx.getCommunityHomePath(), "plugins/groovy/groovy-uast-tests/testData") } override fun getVirtualFile(testName: String): VirtualFile { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/breadcrumbs/YAMLBreadcrumbsTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/breadcrumbs/YAMLBreadcrumbsTest.java index 7bc23ffb5579..cab965ff74c7 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/breadcrumbs/YAMLBreadcrumbsTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/breadcrumbs/YAMLBreadcrumbsTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.breadcrumbs; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.editor.Caret; import com.intellij.openapi.editor.CaretModel; import com.intellij.openapi.ide.CopyPasteManager; @@ -24,7 +24,7 @@ public class YAMLBreadcrumbsTest extends LightPlatformCodeInsightFixtureTestCase @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/breadcrumbs/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/breadcrumbs/data/"; } public void testText() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLInteractiveLexingTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLInteractiveLexingTest.java index 7de5e7cf3fc7..eb4522be520e 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLInteractiveLexingTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLInteractiveLexingTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.editing; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.editor.highlighter.EditorHighlighter; @@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull; public class YAMLInteractiveLexingTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/editing/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/editing/data/"; } public void testChangeOfBlockScalarValueInInlineMap() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLTypingTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLTypingTest.java index f7b2f9dfa4cc..ab86bf613253 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLTypingTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLTypingTest.java @@ -3,7 +3,7 @@ package org.jetbrains.yaml.editing; import com.intellij.application.options.CodeStyle; import com.intellij.openapi.actionSystem.IdeActions; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import com.intellij.util.ObjectUtils; @@ -13,7 +13,7 @@ import org.jetbrains.yaml.formatter.YAMLCodeStyleSettings; public class YAMLTypingTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/editing/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/editing/data/"; } public void testEmptyValue() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/folding/YAMLFoldingTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/folding/YAMLFoldingTest.java index 9cc421b1e8ff..1835860f3085 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/folding/YAMLFoldingTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/folding/YAMLFoldingTest.java @@ -1,13 +1,13 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.folding; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; public class YAMLFoldingTest extends LightPlatformCodeInsightFixtureTestCase { public static final String RELATIVE_TEST_DATA_PATH = "/plugins/yaml/testSrc/org/jetbrains/yaml/"; - public static final String TEST_DATA_PATH = PathManager.getCommunityHomePath() + RELATIVE_TEST_DATA_PATH; + public static final String TEST_DATA_PATH = PathManagerEx.getCommunityHomePath() + RELATIVE_TEST_DATA_PATH; public void testFolding() { defaultTest(); diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/formatting/YAMLFormattingTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/formatting/YAMLFormattingTest.java index 0f2f5afc2d70..42afef51fda5 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/formatting/YAMLFormattingTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/formatting/YAMLFormattingTest.java @@ -2,7 +2,7 @@ package org.jetbrains.yaml.formatting; import com.intellij.application.options.CodeStyle; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.LogicalPosition; @@ -23,7 +23,7 @@ import java.util.function.Consumer; public class YAMLFormattingTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/formatting/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/formatting/data/"; } public void testSample_default() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/highlighting/YAMLHighlightingTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/highlighting/YAMLHighlightingTest.java index 4202d0003c1c..c3a7540c6604 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/highlighting/YAMLHighlightingTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/highlighting/YAMLHighlightingTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.highlighting; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import org.jetbrains.yaml.inspections.YAMLDuplicatedKeysInspection; import org.jetbrains.yaml.inspections.YAMLRecursiveAliasInspection; @@ -11,7 +11,7 @@ import org.jetbrains.yaml.inspections.YAMLUnusedAnchorInspection; public class YAMLHighlightingTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/highlighting/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/highlighting/data/"; } public void testBlockScalarHeaderError() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/intention/YAMLIntentionTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/intention/YAMLIntentionTest.java index 8934288a0d34..a45373005341 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/intention/YAMLIntentionTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/intention/YAMLIntentionTest.java @@ -2,7 +2,7 @@ package org.jetbrains.yaml.intention; import com.intellij.codeInsight.intention.IntentionAction; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.yaml.inspections.YAMLDuplicatedKeysInspection; @@ -14,7 +14,7 @@ import java.util.Optional; public class YAMLIntentionTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/intention/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/intention/data/"; } public void testDeleteDuplicatedKey() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/lexer/YAMLLexerTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/lexer/YAMLLexerTest.java index bcb55484b260..087799df59c6 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/lexer/YAMLLexerTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/lexer/YAMLLexerTest.java @@ -3,6 +3,7 @@ package org.jetbrains.yaml.lexer; import com.intellij.lexer.Lexer; import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.testFramework.LexerTestCase; public class YAMLLexerTest extends LexerTestCase { @@ -13,7 +14,7 @@ public class YAMLLexerTest extends LexerTestCase { @Override protected String getDirPath() { - return (PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/lexer/data/") + return (PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/lexer/data/") .substring(PathManager.getHomePath().length()); } diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/navigation/YAMLCopyReferenceTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/navigation/YAMLCopyReferenceTest.java index 931b128bc5e6..91f527529425 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/navigation/YAMLCopyReferenceTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/navigation/YAMLCopyReferenceTest.java @@ -3,7 +3,7 @@ package org.jetbrains.yaml.navigation; import com.intellij.ide.actions.CopyReferenceAction; import com.intellij.openapi.actionSystem.IdeActions; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; @@ -18,7 +18,7 @@ import java.io.IOException; public class YAMLCopyReferenceTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/navigation/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/navigation/data/"; } public void testSimpleConfig() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/parser/YAMLParserTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/parser/YAMLParserTest.java index e9315f8a7e81..bdf55f09e52e 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/parser/YAMLParserTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/parser/YAMLParserTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.parser; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.testFramework.ParsingTestCase; import org.jetbrains.yaml.YAMLParserDefinition; @@ -18,7 +18,7 @@ public class YAMLParserTest extends ParsingTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/parser/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/parser/data/"; } public void test2docs() throws Throwable { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java index 0736219e6365..99008e5c0e55 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java @@ -2,7 +2,7 @@ package org.jetbrains.yaml.paste; import com.intellij.openapi.actionSystem.IdeActions; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; @@ -19,7 +19,7 @@ import java.awt.datatransfer.StringSelection; public class YAMLKeyPasteTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/paste/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/paste/data/"; } public void testPasteKeysInStart1() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLPasteTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLPasteTest.java index 4dc4b3a60791..d053b36ef06c 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLPasteTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLPasteTest.java @@ -3,7 +3,7 @@ package org.jetbrains.yaml.paste; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.openapi.actionSystem.IdeActions; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; @@ -55,7 +55,7 @@ public abstract class YAMLPasteTest extends LightPlatformCodeInsightFixtureTestC @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/paste/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/paste/data/"; } public void testOneLinePaste() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java index ee4ef9de8507..201e35771639 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.psi; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; @@ -10,7 +10,7 @@ import org.jetbrains.yaml.YAMLParserDefinition; public class YAMLScalarContentTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/"; } @Override diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarLiteralEscaperTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarLiteralEscaperTest.java index 3a7b862572f4..c11f0dd999d9 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarLiteralEscaperTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarLiteralEscaperTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.psi; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.util.TextRange; import com.intellij.psi.LiteralTextEscaper; import com.intellij.psi.PsiElement; @@ -15,7 +15,7 @@ import java.util.Arrays; public class YAMLScalarLiteralEscaperTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/"; } @Override diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/psiModification/YAMLMappingModificationTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/psiModification/YAMLMappingModificationTest.java index 6588bfa3b008..92317dc2403d 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/psiModification/YAMLMappingModificationTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/psiModification/YAMLMappingModificationTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.psiModification; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; @@ -15,7 +15,7 @@ import org.jetbrains.yaml.psi.YAMLMapping; public class YAMLMappingModificationTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/psiModification/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/psiModification/data/"; } // TODO make diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLRenameTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLRenameTest.java index a6c82561c55f..5c0ff95ae90d 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLRenameTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLRenameTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.resolve; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.util.io.FileUtil; import com.intellij.refactoring.BaseRefactoringProcessor; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; @@ -13,7 +13,7 @@ import java.io.IOException; public class YAMLRenameTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; } public void testAnchorsAndAliases() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLResolveTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLResolveTest.java index 83055d0a9292..af7d39aecfe8 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLResolveTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLResolveTest.java @@ -2,7 +2,7 @@ package org.jetbrains.yaml.resolve; import com.intellij.lang.ASTNode; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; @@ -15,7 +15,7 @@ import java.util.*; public class YAMLResolveTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; } public void testAnchorsAndAliases() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsageViewTreeTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsageViewTreeTest.java index ad55dddc556e..b2c0957c1810 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsageViewTreeTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsageViewTreeTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.resolve; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; @@ -17,7 +17,7 @@ import java.util.stream.Collectors; public class YAMLUsageViewTreeTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; } public void testAnchorsAndAliases() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsagesHighlighterTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsagesHighlighterTest.java index e292e5db4a4e..35e5ddc3719b 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsagesHighlighterTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsagesHighlighterTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.resolve; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.RangeMarker; import com.intellij.openapi.editor.colors.EditorColors; @@ -18,7 +18,7 @@ import java.util.*; public class YAMLUsagesHighlighterTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; } public void testAnchorsAndAliases() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/scalarConversion/YAMLScalarConversionTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/scalarConversion/YAMLScalarConversionTest.java index de49a88d9e67..36bd1ccb8c03 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/scalarConversion/YAMLScalarConversionTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/scalarConversion/YAMLScalarConversionTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.scalarConversion; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.io.FileUtil; @@ -22,7 +22,7 @@ public class YAMLScalarConversionTest extends LightPlatformCodeInsightFixtureTes @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/scalarConversion/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/scalarConversion/data/"; } @Override diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaDocumentationTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaDocumentationTest.java index 49239fafc911..1f4d9a70d373 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaDocumentationTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaDocumentationTest.java @@ -1,13 +1,13 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.schema; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.jetbrains.jsonSchema.JsonBySchemaDocumentationBaseTest; public class YamlByJsonSchemaDocumentationTest extends JsonBySchemaDocumentationBaseTest { @Override public String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/schema/data"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/schema/data"; } @Override diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaHeavyCompletionTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaHeavyCompletionTest.java index 90976bb21f75..a91280b83762 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaHeavyCompletionTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaHeavyCompletionTest.java @@ -6,8 +6,8 @@ import com.intellij.json.psi.JsonFile; import com.intellij.json.psi.JsonObject; import com.intellij.json.psi.JsonStringLiteral; import com.intellij.json.psi.JsonValue; -import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.WriteAction; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFileFactory; @@ -18,7 +18,7 @@ import org.junit.Assert; public class YamlByJsonSchemaHeavyCompletionTest extends JsonBySchemaHeavyCompletionTest { @Override public String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/schema/data/completion"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/schema/data/completion"; } @Override diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaHighlightingTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaHighlightingTest.java index bc3e0d464835..6fbb17a325c3 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaHighlightingTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/schema/YamlByJsonSchemaHighlightingTest.java @@ -2,7 +2,7 @@ package org.jetbrains.yaml.schema; import com.intellij.codeInspection.InspectionProfileEntry; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; @@ -19,7 +19,7 @@ import java.util.List; public class YamlByJsonSchemaHighlightingTest extends JsonSchemaHighlightingTestBase { @Override public String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/schema/data/highlighting"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/schema/data/highlighting"; } @Override diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/search/YAMLSearchEverywhereTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/search/YAMLSearchEverywhereTest.java index cbcc5d9fe625..cabf48223a7e 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/search/YAMLSearchEverywhereTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/search/YAMLSearchEverywhereTest.java @@ -4,7 +4,7 @@ package org.jetbrains.yaml.search; import com.intellij.ide.actions.searcheverywhere.ContributorSearchResult; import com.intellij.mock.MockProgressIndicator; import com.intellij.navigation.NavigationItem; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.DumbServiceImpl; import com.intellij.openapi.util.io.FileUtil; @@ -21,7 +21,7 @@ import java.util.List; public class YAMLSearchEverywhereTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/search/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/search/data/"; } public void testSearch() throws IOException { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/structure/YAMLStructureTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/structure/YAMLStructureTest.java index d52b7b31518e..7a8bccaae9b2 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/structure/YAMLStructureTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/structure/YAMLStructureTest.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.yaml.structure; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import com.intellij.util.ui.tree.TreeUtil; @@ -12,7 +12,7 @@ import javax.swing.tree.TreePath; public class YAMLStructureTest extends LightPlatformCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/structure/data/"; + return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/structure/data/"; } diff --git a/uast/uast-tests/test/org/jetbrains/uast/test/java/AbstractJavaUastTest.kt b/uast/uast-tests/test/org/jetbrains/uast/test/java/AbstractJavaUastTest.kt index d0da2bbc61d6..3ec01473ffbd 100644 --- a/uast/uast-tests/test/org/jetbrains/uast/test/java/AbstractJavaUastTest.kt +++ b/uast/uast-tests/test/org/jetbrains/uast/test/java/AbstractJavaUastTest.kt @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.uast.test.java -import com.intellij.openapi.application.PathManager +import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.uast.test.env.AbstractUastFixtureTest @@ -9,7 +9,7 @@ import java.io.File abstract class AbstractJavaUastTest : AbstractUastFixtureTest() { protected companion object { - val TEST_JAVA_MODEL_DIR = File(PathManager.getCommunityHomePath(), "uast/uast-tests/java") + val TEST_JAVA_MODEL_DIR = File(PathManagerEx.getCommunityHomePath(), "uast/uast-tests/java") } override fun getVirtualFile(testName: String): VirtualFile { diff --git a/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestBase.java b/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestBase.java index 54321d5c3e33..d3bc787be12e 100644 --- a/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestBase.java +++ b/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestBase.java @@ -2,7 +2,7 @@ package com.intellij.psi.formatter; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.util.TextRange; import com.intellij.psi.impl.source.xml.XmlFileImpl; @@ -25,6 +25,6 @@ public abstract class XmlFormatterTestBase extends FormatterTestCase { @Override protected String getTestDataPath() { - return PathManager.getCommunityHomePath() + "/xml/tests/testData"; + return PathManagerEx.getCommunityHomePath() + "/xml/tests/testData"; } }