From 287826713a71432185fa876e87f9fbd411142de0 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 23 Jan 2018 12:41:52 +0300 Subject: [PATCH] project configuration: improved 'Find/Replace Module Names' action Handle more specific cases. --- .../src/actions/MigrateModuleNamesInSourcesAction.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/devkit/src/actions/MigrateModuleNamesInSourcesAction.kt b/plugins/devkit/src/actions/MigrateModuleNamesInSourcesAction.kt index 6bac2d845c32..9338798b8816 100644 --- a/plugins/devkit/src/actions/MigrateModuleNamesInSourcesAction.kt +++ b/plugins/devkit/src/actions/MigrateModuleNamesInSourcesAction.kt @@ -146,7 +146,7 @@ class MigrateModuleNamesInSourcesAction : AnAction("Find/Update Module Names in } fun processCodeUsages(moduleName: String, quotedString: String, groovyOnly: Boolean) { - val ignoredMethods = listOf("getPluginHomePath(", "getPluginHome(", "getPluginHomePathRelative(") + val ignoredMethods = listOf("getPluginHomePath(", "getPluginHome(", "getPluginHomePathRelative(", "dir(", "withProjectLibrary(", "directoryName = ") val quotedOccurrencesProcessor = TextOccurenceProcessor { element, offset -> if (element.text != quotedString) return@TextOccurenceProcessor true if (ignoredMethods.any { @@ -181,8 +181,10 @@ class MigrateModuleNamesInSourcesAction : AnAction("Find/Update Module Names in progress.text2 = "Searching for \"$moduleName\"" processCodeUsages(moduleName, "\"$moduleName\"", groovyOnly = false) processCodeUsages(moduleName, "'$moduleName'", groovyOnly = true) - processUsagesInStrings(moduleName, "production/$moduleName") - processUsagesInStrings(moduleName, "test/$moduleName") + if (moduleName != "resources") { + processUsagesInStrings(moduleName, "production/$moduleName") + processUsagesInStrings(moduleName, "test/$moduleName") + } val plainOccurrencesProcessor = TextOccurenceProcessor { element, offset -> val endOffset = offset + moduleName.length