Skip to content

Commit 6c4a462

Browse files
committed
refactor(build): rename psiFile to buildFilePsi for clarity
The parameter name `psiFile` in dependency collection methods was renamed to `buildFilePsi` to better indicate that it specifically refers to build-related files (e.g., `build.gradle`, `pom.xml`, `package.json`). This improves code readability and maintainability.
1 parent 9365da3 commit 6c4a462

File tree

5 files changed

+10
-17
lines changed

5 files changed

+10
-17
lines changed

core/src/main/kotlin/cc/unitmesh/devti/provider/BuildSystemProvider.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ abstract class BuildSystemProvider : LazyExtensionInstance<BuildSystemProvider>(
1818

1919
/**
2020
* For PsiFile only for resolve in Sketch and Bridge mode
21+
* the BuildFilePsiFile means `build.gradle`, `pom.xml`, `build.sbt`, `package.json` etc.
2122
*/
22-
open fun collectDependencies(project: Project, psiFile: PsiFile): List<DevPackage> {
23+
open fun collectDependencies(project: Project, buildFilePsi: PsiFile): List<DevPackage> {
2324
return emptyList()
2425
}
2526

goland/src/main/kotlin/cc/unitmesh/go/provider/GoBuildSystemProvider.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class GoBuildSystemProvider : BuildSystemProvider() {
2222

2323
override fun collectDependencies(
2424
project: Project,
25-
psiFile: PsiFile
25+
buildFilePsi: PsiFile
2626
): List<DevPackage> {
27-
return getDependencies(psiFile)
27+
return getDependencies(buildFilePsi)
2828
.mapNotNull { vgoModuleSpec -> toPackage(vgoModuleSpec) }
2929
.toList()
3030
}

java/src/main/kotlin/cc/unitmesh/idea/provider/JavaBuildSystemProvider.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@ import cc.unitmesh.devti.provider.BuildSystemProvider
44
import cc.unitmesh.devti.provider.DevPackage
55
import cc.unitmesh.devti.template.context.DockerfileContext
66
import cc.unitmesh.idea.detectLanguageLevel
7-
import com.intellij.openapi.externalSystem.model.ProjectKeys
8-
import com.intellij.openapi.externalSystem.model.project.LibraryDependencyData
97
import com.intellij.openapi.externalSystem.service.project.ProjectDataManager
108
import com.intellij.openapi.externalSystem.service.ui.completion.TextCompletionInfo
11-
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
12-
import com.intellij.openapi.module.ModuleUtilCore
139
import com.intellij.openapi.progress.ProgressManager
1410
import com.intellij.openapi.project.Project
1511
import com.intellij.openapi.project.guessProjectDir
1612
import com.intellij.psi.PsiFile
1713
import org.jetbrains.idea.maven.project.MavenProjectsManager
18-
import org.jetbrains.plugins.gradle.execution.build.CachedModuleDataFinder
1914
import org.jetbrains.plugins.gradle.service.project.GradleTasksIndices
2015
import org.jetbrains.plugins.gradle.util.GradleConstants
2116

@@ -62,9 +57,9 @@ open class JavaBuildSystemProvider : BuildSystemProvider() {
6257

6358
override fun collectDependencies(
6459
project: Project,
65-
psiFile: PsiFile
60+
buildFilePsi: PsiFile
6661
): List<DevPackage> {
67-
val mavenProject = MavenProjectsManager.getInstance(project).findProject(psiFile.virtualFile)
62+
val mavenProject = MavenProjectsManager.getInstance(project).findProject(buildFilePsi.virtualFile)
6863
var results = mutableListOf<DevPackage>()
6964
if (mavenProject != null) {
7065
results += mavenProject.dependencies

javascript/src/main/kotlin/cc/unitmesh/ide/javascript/provider/JavaScriptBuildSystemProvider.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import cc.unitmesh.devti.provider.DevPackage
55
import cc.unitmesh.devti.template.context.DockerfileContext
66
import cc.unitmesh.ide.javascript.JsDependenciesSnapshot
77
import com.intellij.javascript.nodejs.PackageJsonData
8-
import com.intellij.javascript.nodejs.packageJson.NodeInstalledPackageFinder
98
import com.intellij.json.psi.JsonFile
109
import com.intellij.json.psi.JsonStringLiteral
1110
import com.intellij.lang.javascript.buildTools.npm.NpmScriptsUtil
@@ -88,8 +87,8 @@ class JavaScriptBuildSystemProvider : BuildSystemProvider() {
8887
)
8988
}
9089

91-
override fun collectDependencies(project: Project, psiFile: PsiFile): List<DevPackage> {
92-
val packageJson = psiFile as? JsonFile ?: return emptyList()
90+
override fun collectDependencies(project: Project, buildFilePsi: PsiFile): List<DevPackage> {
91+
val packageJson = buildFilePsi as? JsonFile ?: return emptyList()
9392
return PackageJsonUtil.getDependencies(packageJson, PackageJsonUtil.PROD_DEV_DEPENDENCIES)
9493
.mapNotNull { jsonProperty ->
9594
val packageName = jsonProperty.name

pycharm/src/main/kotlin/cc/unitmesh/python/provider/PythonBuildSystemProvider.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ import com.jetbrains.python.packaging.PyRequirementParser
1111
class PythonBuildSystemProvider : BuildSystemProvider() {
1212
override fun collect(project: Project): DockerfileContext? = null
1313

14-
override fun collectDependencies(project: Project, psiFile: PsiFile): List<DevPackage> {
15-
if (psiFile.language.id != "Python") return emptyList()
16-
17-
val reqs: List<PyRequirement> = PyRequirementParser.fromFile(psiFile.virtualFile)
14+
override fun collectDependencies(project: Project, buildFilePsi: PsiFile): List<DevPackage> {
15+
val reqs: List<PyRequirement> = PyRequirementParser.fromFile(buildFilePsi.virtualFile)
1816

1917
return reqs.map {
2018
DevPackage(

0 commit comments

Comments
 (0)