Skip to content

Commit

Permalink
refactor(composer): Inline parseScope()
Browse files Browse the repository at this point in the history
The function is only used once, and its parameter list is almost as
long as the code itself.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
  • Loading branch information
fviernau committed Aug 26, 2024
1 parent 26a0401 commit 7ecf85d
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions plugins/package-managers/composer/src/main/kotlin/Composer.kt
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ class Composer(
val virtualPackages = parseVirtualPackageNames(packages, projectPackageInfo, lockfile)

val scopes = ALL_SCOPE_NAMES.mapTo(mutableSetOf()) { scopeName ->
parseScope(scopeName, projectPackageInfo, lockfile, packages, virtualPackages)
val requiredPackages = projectPackageInfo.getScopeDependencies(scopeName)
val dependencies = buildDependencyTree(requiredPackages, lockfile, packages, virtualPackages)
Scope(scopeName, dependencies)
}

val project = parseProject(definitionFile, scopes)
Expand All @@ -165,18 +167,6 @@ class Composer(
return listOf(result)
}

private fun parseScope(
scopeName: String,
projectPackageInfo: PackageInfo,
lockfile: Lockfile,
packages: Map<String, Package>,
virtualPackages: Set<String>
): Scope {
val requiredPackages = projectPackageInfo.getScopeDependencies(scopeName)
val dependencies = buildDependencyTree(requiredPackages, lockfile, packages, virtualPackages)
return Scope(scopeName, dependencies)
}

private fun buildDependencyTree(
dependencies: Set<String>,
lockfile: Lockfile,
Expand Down

0 comments on commit 7ecf85d

Please sign in to comment.