fix issues with aspect templates not available in query sync mode

bazelbuild · Nov 25, 2024 · fc9a470 · fc9a470
1 parent 9d6681a
commit fc9a470
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/strategy/SyncAspectTemplateProvider.java b/base/src/com/google/idea/blaze/base/sync/aspects/strategy/SyncAspectTemplateProvider.java
@@ -56,6 +56,15 @@ public void onSyncStart(Project project, BlazeContext context, SyncMode syncMode
     prepareProjectAspect(project);
   }
 
+  @Override
+  public void onQuerySyncStart(Project project, BlazeContext context) {
+      try {
+          prepareProjectAspect(project);
+      } catch (SyncFailedException e) {
+          throw new RuntimeException(e);
+      }
+  }
+
   private void prepareProjectAspect(Project project) throws SyncFailedException {
     var manager = BlazeProjectDataManager.getInstance(project);
 
@@ -112,7 +121,7 @@ private void writeLanguageInfos(
           Path realizedAspectsPath,
           File templateAspects,
           Project project) throws SyncFailedException {
-    var templateLanguageStringMap = getLanguageStringMap(manager, project);
+    var templateLanguageStringMap = getLanguageStringMap(manager);
     writeLanguageInfo(manager, realizedAspectsPath, templateAspects, TEMPLATE_JAVA, REALIZED_JAVA, templateLanguageStringMap);
     writeLanguageInfo(manager, realizedAspectsPath, templateAspects, TEMPLATE_PYTHON, REALIZED_PYTHON, templateLanguageStringMap);
   }
@@ -131,16 +140,18 @@ private void writeLanguageInfo(
     }
   }
 
-  private static @NotNull Map<String, String> getLanguageStringMap(BlazeProjectDataManager manager, Project project) {
-    var projectData = Optional.ofNullable(manager.getBlazeProjectData()); // It can be empty on intial sync. Fall back to no lauguage support
-    var blazeProjectData = BlazeProjectDataManager.getInstance(project).getBlazeProjectData();
+  private static @NotNull Map<String, String> getLanguageStringMap(BlazeProjectDataManager manager) {
+    var projectData = Optional.ofNullable(manager.getBlazeProjectData()); // It can be empty on intial sync. Fall back to no language support
     var activeLanguages = projectData.map(it -> it.getWorkspaceLanguageSettings().getActiveLanguages()).orElse(ImmutableSet.of());
-    var isJavaEnabled = activeLanguages.contains(LanguageClass.JAVA)
-            && blazeProjectData != null
-            && blazeProjectData.getExternalWorkspaceData().getByRepoName("rules_java") != null;
-    var isPythonEnabled = activeLanguages.contains(LanguageClass.PYTHON)
-            && blazeProjectData != null
-            && blazeProjectData.getExternalWorkspaceData().getByRepoName("rules_python") != null;
+//    var externalWorkspaceData = projectData.map(BlazeProjectData::getExternalWorkspaceData).orElse(null);
+    var isJavaEnabled = activeLanguages.contains(LanguageClass.JAVA);
+    // TODO: need to cater for QS mode, where [getExternalWorkspaceData] is not available before uncommenting this part
+//            && externalWorkspaceData != null
+//            && externalWorkspaceData.getByRepoName("rules_java") != null;
+    var isPythonEnabled = activeLanguages.contains(LanguageClass.PYTHON);
+    // TODO: need to cater for QS mode, where [getExternalWorkspaceData] is not available before uncommenting this part
+//            && externalWorkspaceData != null
+//            && externalWorkspaceData.getByRepoName("rules_python") != null;
     var isAtLeastBazel8 = projectData.map(it -> it.getBlazeVersionData().bazelIsAtLeastVersion(8, 0, 0)).orElse(false);
     return Map.of(
             "bazel8OrAbove", isAtLeastBazel8 ? "true" : "false",