Skip to content
This repository was archived by the owner on Aug 5, 2024. It is now read-only.

Commit 55e4faa

Browse files
abrams27Space Team
abrams27
authored and
Space Team
committed
[fix] canDebug flag is now set to true if target is runnable | #BAZEL-862 Done
e2e tests and tests! [fix] `canDebug` flag is now set to true if target is runnable Merge-request: BAZEL-MR-859 Merged-by: Marcin Abramowicz <[email protected]>
1 parent fb81f40 commit 55e4faa

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

‎e2e/src/main/kotlin/org/jetbrains/bsp/bazel/BazelBspKotlinProjectTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ object BazelBspKotlinProjectTest : BazelBspTestBaseScenario() {
6262
it.canCompile = true
6363
it.canTest = false
6464
it.canRun = true
65-
it.canDebug = false
65+
it.canDebug = true
6666
}
6767
)
6868
buildTarget.displayName = "@//kotlinc_test:Foo"

‎e2e/src/main/kotlin/org/jetbrains/bsp/bazel/BazelBspLocalJdkTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ object BazelBspLocalJdkTest : BazelBspTestBaseScenario() {
4545
it.canCompile = true
4646
it.canTest = false
4747
it.canRun = true
48-
it.canDebug = false
48+
it.canDebug = true
4949
}
5050
)
5151
exampleExampleBuildTarget.displayName = "$targetPrefix//example:example"

‎e2e/src/main/kotlin/org/jetbrains/bsp/bazel/BazelBspRemoteJdkTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object BazelBspRemoteJdkTest : BazelBspTestBaseScenario() {
4141
listOf("application"),
4242
listOf("java"),
4343
emptyList(),
44-
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = false }
44+
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = true }
4545
)
4646
exampleExampleBuildTarget.displayName = "$targetPrefix//example:example"
4747
exampleExampleBuildTarget.baseDirectory = "file://\$WORKSPACE/example/"

‎e2e/src/main/kotlin/org/jetbrains/bsp/bazel/BazelBspSampleRepoTest.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ object BazelBspSampleRepoTest : BazelBspTestBaseScenario() {
10381038
listOf("application"),
10391039
listOf("java"),
10401040
emptyList(),
1041-
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = false }
1041+
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = true }
10421042
)
10431043
javaTargetsJavaBinary.displayName = "$targetPrefix//java_targets:java_binary"
10441044
javaTargetsJavaBinary.baseDirectory = "file://\$WORKSPACE/java_targets/"
@@ -1050,7 +1050,7 @@ object BazelBspSampleRepoTest : BazelBspTestBaseScenario() {
10501050
listOf("application"),
10511051
listOf("java"),
10521052
emptyList(),
1053-
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = false }
1053+
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = true }
10541054
)
10551055
javaTargetsJavaBinaryWithFlag.displayName = "$targetPrefix//java_targets:java_binary_with_flag"
10561056
javaTargetsJavaBinaryWithFlag.baseDirectory = "file://\$WORKSPACE/java_targets/"
@@ -1079,7 +1079,7 @@ object BazelBspSampleRepoTest : BazelBspTestBaseScenario() {
10791079
BuildTargetIdentifier("scala-library-2.12.14.jar"),
10801080
BuildTargetIdentifier("scala-reflect-2.12.14.jar"),
10811081
),
1082-
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = false }
1082+
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = true }
10831083
)
10841084
scalaTargetsScalaBinary.displayName = "$targetPrefix//scala_targets:scala_binary"
10851085
scalaTargetsScalaBinary.baseDirectory = "file://\$WORKSPACE/scala_targets/"
@@ -1119,7 +1119,7 @@ object BazelBspSampleRepoTest : BazelBspTestBaseScenario() {
11191119
BuildTargetIdentifier("scala-library-2.12.14.jar"),
11201120
BuildTargetIdentifier("scala-reflect-2.12.14.jar"),
11211121
),
1122-
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = false }
1122+
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = true }
11231123
)
11241124
targetWithoutJvmFlagsBinary.displayName = "$targetPrefix//target_without_jvm_flags:binary"
11251125
targetWithoutJvmFlagsBinary.baseDirectory = "file://\$WORKSPACE/target_without_jvm_flags/"
@@ -1151,7 +1151,7 @@ object BazelBspSampleRepoTest : BazelBspTestBaseScenario() {
11511151
BuildTargetIdentifier("scala-library-2.12.14.jar"),
11521152
BuildTargetIdentifier("scala-reflect-2.12.14.jar"),
11531153
),
1154-
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = false }
1154+
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = true }
11551155
)
11561156
targetWithoutArgsBinary.displayName = "$targetPrefix//target_without_args:binary"
11571157
targetWithoutArgsBinary.baseDirectory = "file://\$WORKSPACE/target_without_args/"
@@ -1167,7 +1167,7 @@ object BazelBspSampleRepoTest : BazelBspTestBaseScenario() {
11671167
BuildTargetIdentifier("@guava//:guava"),
11681168
BuildTargetIdentifier("$targetPrefix//java_targets/subpackage:java_library")
11691169
),
1170-
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = false }
1170+
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = true }
11711171
)
11721172
targetWithDependencyJavaBinary.displayName = "$targetPrefix//target_with_dependency:java_binary"
11731173
targetWithDependencyJavaBinary.baseDirectory = "file://\$WORKSPACE/target_with_dependency/"
@@ -1183,7 +1183,7 @@ object BazelBspSampleRepoTest : BazelBspTestBaseScenario() {
11831183
BuildTargetIdentifier("scala-library-2.12.14.jar"),
11841184
BuildTargetIdentifier("scala-reflect-2.12.14.jar"),
11851185
),
1186-
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = true; it.canRun = false; it.canDebug = false }
1186+
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = true; it.canRun = false; it.canDebug = true }
11871187
)
11881188
scalaTargetsScalaTest.displayName = "$targetPrefix//scala_targets:scala_test"
11891189
scalaTargetsScalaTest.baseDirectory = "file://\$WORKSPACE/scala_targets/"
@@ -1195,7 +1195,7 @@ object BazelBspSampleRepoTest : BazelBspTestBaseScenario() {
11951195
listOf("application"),
11961196
listOf("java"),
11971197
emptyList(),
1198-
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = false }
1198+
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = true }
11991199
)
12001200
targetWithResourcesJavaBinary.displayName = "$targetPrefix//target_with_resources:java_binary"
12011201
targetWithResourcesJavaBinary.baseDirectory = "file://\$WORKSPACE/target_with_resources/"
@@ -1301,7 +1301,7 @@ object BazelBspSampleRepoTest : BazelBspTestBaseScenario() {
13011301
listOf("application"),
13021302
listOf("java"),
13031303
emptyList(),
1304-
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = false }
1304+
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = false; it.canRun = true; it.canDebug = true }
13051305
)
13061306
environmentVariablesJavaLibrary.displayName = "$targetPrefix//environment_variables:java_binary"
13071307
environmentVariablesJavaLibrary.baseDirectory = "file://\$WORKSPACE/environment_variables/"
@@ -1313,7 +1313,7 @@ object BazelBspSampleRepoTest : BazelBspTestBaseScenario() {
13131313
listOf("test"),
13141314
listOf("java"),
13151315
emptyList(),
1316-
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = true; it.canRun = false; it.canDebug = false }
1316+
BuildTargetCapabilities().also { it.canCompile = true; it.canTest = true; it.canRun = false; it.canDebug = true }
13171317
)
13181318
environmentVariablesJavaTest.displayName = "$targetPrefix//environment_variables:java_test"
13191319
environmentVariablesJavaTest.baseDirectory = "file://\$WORKSPACE/environment_variables/"

‎server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BspProjectMapper.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ class BspProjectMapper(
187187
val canCompile = !module.tags.contains(Tag.NO_BUILD) && isBuildableIfManual(module)
188188
val canTest = module.tags.contains(Tag.TEST) && !module.tags.contains(Tag.MANUAL)
189189
val canRun = module.tags.contains(Tag.APPLICATION) && !module.tags.contains(Tag.MANUAL)
190-
return BuildTargetCapabilities().also { it.canCompile = canCompile; it.canTest = canTest; it.canRun = canRun; it.canDebug = false }
190+
val canDebug = canRun || canTest // runnable and testable targets should be debuggable
191+
return BuildTargetCapabilities().also { it.canCompile = canCompile; it.canTest = canTest; it.canRun = canRun; it.canDebug = canDebug }
191192
}
192193

193194
private fun isBuildableIfManual(module: Module): Boolean =

0 commit comments

Comments
 (0)