Merge branch 'master' into enovozhilov/fix-xcode-bazel-8

.github/workflows/issue-labeler.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Parse issue form
-        uses: stefanbuck/github-issue-parser@2d2ff50d4aae06ab58d26bf59468d98086605f11 # v3.2.1
+        uses: stefanbuck/github-issue-parser@2ea9b35a8c584529ed00891a8f7e41dc46d0441e # v3.2.1
         id: issue-parser
         with:
           template-path: .github/ISSUE_TEMPLATE/${{ matrix.template }}

CHANGELOG

@@ -1,3 +1,7 @@
+v2025.01.07
+===========
+* Allow to boost .ijwb over BSP and .idea folder. #7201
+
 v2024.12.17
 ===========
 Fixes:

MODULE.bazel

@@ -15,7 +15,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_python",
-    version = "0.40.0",
+    version = "1.0.0",
 )
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
@@ -51,7 +51,7 @@ use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools")
 
 bazel_dep(
     name = "rules_bazel_integration_test",
-    version = "0.27.0",
+    version = "0.31.0",
     dev_dependency = True,
 )
 

aspect/build_dependencies.bzl

@@ -11,7 +11,7 @@ load(
     _ide_kotlin_not_validated = "IDE_KOTLIN",
 )
 
-ALWAYS_BUILD_RULES = "java_proto_library,java_lite_proto_library,java_mutable_proto_library,kt_proto_library_helper,_java_grpc_library,_java_lite_grpc_library,kt_grpc_library_helper,java_stubby_library,kt_stubby_library_helper,aar_import,java_import"
+ALWAYS_BUILD_RULES = "java_proto_library,java_lite_proto_library,java_mutable_proto_library,kt_proto_library_helper,_java_grpc_library,_java_lite_grpc_library,kt_grpc_library_helper,java_stubby_library,kt_stubby_library_helper,aar_import,java_import, j2kt_native_import"
 
 PROTO_RULE_KINDS = [
     "java_proto_library",

base/src/META-INF/blaze-base.xml

@@ -412,6 +412,9 @@
     <registryKey defaultValue="true"
                  description="By default Bazel plugin takes control and opens project if .ijwb folder is present. This property can be used to disable this behavior to allow to open .idea or other project models if they are exists."
                  key="bazel.project.auto.open.if.present"/>
+    <registryKey defaultValue="false"
+                 description="Google plugin is not exclusive anymore, and we need to give a chance to BSP to chime in. Otherwise neither will import the project if .idea folder is present. This property can be used to give a priority to .ijwb or alike over .idea *and* BSP."
+                 key="bazel.project.prefer.google.plugin"/>
     <registryKey defaultValue="false"
                  description="The Bazel Plugin sometimes uses the --query_file option to pass the query via a file. By default, the file is deleted immediately after the query execution is finished. Set this flag to true to avoid file deletion"
                  key="bazel.sync.keep.query.files"/>
@@ -422,7 +425,7 @@
                  description="Causes the plugin to read external workspace data, enabling features such as code completion for external targets. This may incur the cost of an additional 'bazel mod' call, which could cause issues with older versions or setups."
                  key="bazel.read.external.workspace.data"/>
     <registryKey defaultValue="true"
-                 description="Enable basic syntax highliting in Query Sync's 'Analysis Disabled' mode"
+                 description="Enable basic syntax highlighting in Query Sync's 'Analysis Disabled' mode"
                  key="bazel.qsync.enable.basic.highlighting.in.non.analysis.mode"/>
     <editorNotificationProvider implementation="com.google.idea.blaze.base.wizard2.BazelNotificationProvider"/>
   </extensions>

base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java

@@ -21,7 +21,9 @@
 import com.intellij.ide.SaveAndSyncHandler;
 import com.intellij.ide.impl.OpenProjectTask;
 import com.intellij.ide.impl.ProjectUtil;
+import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.project.ex.ProjectManagerEx;
@@ -78,7 +80,8 @@ public Icon getIcon() {
 
   @Override
   public boolean isStrongProjectInfoHolder() {
-    return false;
+      return !PluginManagerCore.isPluginInstalled(PluginId.getId("org.jetbrains.bazel")) ||
+              Registry.is("bazel.project.prefer.google.plugin");
   }
 
   @Override

kotlin/src/com/google/idea/blaze/kotlin/KotlinBlazeRules.java

@@ -38,9 +38,11 @@ public enum RuleTypes {
     KT_JVM_LIBRARY_HELPER("kt_jvm_library_helper", LanguageClass.KOTLIN, RuleType.LIBRARY),
     // bazel only kotlin rules:
     KT_JVM_LIBRARY("kt_jvm_library", LanguageClass.KOTLIN, RuleType.LIBRARY),
+    KT_NATIVE_LIBRARY("kt_native_library", LanguageClass.KOTLIN, RuleType.LIBRARY),
     KT_JVM_BINARY("kt_jvm_binary", LanguageClass.KOTLIN, RuleType.BINARY),
     KT_JVM_TEST("kt_jvm_test", LanguageClass.KOTLIN, RuleType.TEST),
     KT_JVM_IMPORT("kt_jvm_import", LanguageClass.KOTLIN, RuleType.UNKNOWN),
+    J2KT_NATIVE_IMPORT("j2kt_native_import", LanguageClass.KOTLIN, RuleType.UNKNOWN),
     KOTLIN_STDLIB("kotlin_stdlib", LanguageClass.KOTLIN, RuleType.UNKNOWN);
 
     private final String name;
@@ -70,6 +72,7 @@ public Function<TargetIdeInfo, Kind> getTargetKindHeuristics() {
     return proto ->
         proto.getKindString().startsWith("kt_jvm_")
                 || proto.getKindString().startsWith("kt_android_")
+                || proto.getKindString().startsWith("kt_native_")
             ? Kind.Provider.create(proto.getKindString(), LanguageClass.KOTLIN, RuleType.UNKNOWN)
             : null;
   }

querysync/javatests/com/google/idea/blaze/qsync/query/QuerySpecTest.java

@@ -98,7 +98,7 @@ public void testGetQueryExpression_experimental_includes_and_excludes() {
     assertThat(qs.getQueryExpression())
       .hasValue(
         "let base = //some/included/path/...:* + //another/included/path/...:* - //some/included/path/excluded/...:* - //another/included/path/excluded/...:*\n" +
-        " in let known = kind(\"source file|android_library|android_binary|android_local_test|android_instrumentation_test|kt_android_library_helper|java_library|java_binary|kt_jvm_library|kt_jvm_binary|kt_jvm_library_helper|java_test|java_proto_library|java_lite_proto_library|java_mutable_proto_library|_java_grpc_library|_kotlin_library|_java_lite_grpc_library|_iml_module_|cc_library|cc_binary|cc_shared_library|cc_test|proto_library|py_library|py_binary|py_test\", $base) \n" +
+        " in let known = kind(\"source file|android_library|android_binary|android_local_test|android_instrumentation_test|kt_android_library_helper|java_library|java_binary|kt_jvm_library|kt_jvm_binary|kt_jvm_library_helper|kt_native_library|java_test|java_proto_library|java_lite_proto_library|java_mutable_proto_library|_java_grpc_library|_kotlin_library|_java_lite_grpc_library|_iml_module_|cc_library|cc_binary|cc_shared_library|cc_test|proto_library|py_library|py_binary|py_test\", $base) \n" +
         " in let unknown = $base except $known \n" +
         " in $known union ($base intersect allpaths($known, $unknown)) \n");
   }

shared/java/com/google/idea/blaze/common/RuleKinds.java

@@ -30,6 +30,7 @@ private RuleKinds() {}
           "kt_jvm_library",
           "kt_jvm_binary",
           "kt_jvm_library_helper",
+          "kt_native_library",
           "java_test",
           "java_proto_library",
           "java_lite_proto_library",

shared/java/com/google/idea/blaze/common/artifact/BuildArtifactCacheDirectory.java

@@ -404,7 +404,11 @@ private FileTime readAccessTime(Path entry) throws IOException {
   @Override
   public void clean(long maxTargetSizeBytes, Duration minKeepDuration) throws BuildException {
     // Ensure that no artifacts are added or read from the cache while we're cleaning:
-    long stamp = lock.writeLock();
+    long stamp = lock.tryWriteLock();
+    if (stamp == 0) {
+      logger.warning("Failed to clean the build cache at " + cacheDir + " Failed to obtain the write lock");
+      return; // Just exit. WE will clean the cache next time.
+    }
     try {
       needClean = false;
       clean(maxTargetSizeBytes, Instant.now().minus(minKeepDuration));
@@ -467,7 +471,11 @@ void clean(long maxTargetSize, Instant minAgeToDelete) throws IOException {
 
   public void purge() throws BuildException {
     // Ensure that no artifacts are added or read from the cache while we're cleaning:
-    long stamp = lock.writeLock();
+    long stamp = lock.tryWriteLock();
+    if (stamp == 0) {
+      // TODO: b/373957467 - Report this error to the user properly.
+      throw new BuildException("Failed to purge the build artifact cache. Cannot obtain the write lock.");
+    }
     try {
       MoreFiles.deleteDirectoryContents(cacheDir);
     } catch (IOException e) {