This commit is contained in:
Mikhail Glukhikh
2021-02-01 17:25:47 +03:00
parent 593fb8770b
commit 1f62fee4f9
@@ -219,7 +219,7 @@ class ModuleStructureExtractorImpl(
return true return true
} }
private fun splitRawModuleStringToNameAndDependencies(moduleDirectiveString: String): ModuleNameAndDependeciens { private fun splitRawModuleStringToNameAndDependencies(moduleDirectiveString: String): ModuleNameAndDependencies {
val matchResult = moduleDirectiveRegex.matchEntire(moduleDirectiveString) val matchResult = moduleDirectiveRegex.matchEntire(moduleDirectiveString)
?: error("\"$moduleDirectiveString\" doesn't matches with pattern \"moduleName(dep1, dep2)\"") ?: error("\"$moduleDirectiveString\" doesn't matches with pattern \"moduleName(dep1, dep2)\"")
val (name, _, dependencies, _, friends) = matchResult.destructured val (name, _, dependencies, _, friends) = matchResult.destructured
@@ -234,7 +234,7 @@ class ModuleStructureExtractorImpl(
dependenciesNames = dependenciesNames.filter { it != "support" } dependenciesNames = dependenciesNames.filter { it != "support" }
} }
} }
return ModuleNameAndDependeciens( return ModuleNameAndDependencies(
name, name,
dependenciesNames, dependenciesNames,
friends.takeIf { it.isNotBlank() }?.split(" ") ?: emptyList(), friends.takeIf { it.isNotBlank() }?.split(" ") ?: emptyList(),
@@ -393,7 +393,7 @@ class ModuleStructureExtractorImpl(
} }
} }
private data class ModuleNameAndDependeciens( private data class ModuleNameAndDependencies(
val name: String, val name: String,
val dependencies: List<String>, val dependencies: List<String>,
val friends: List<String> val friends: List<String>