handle non-valid project view file on reload (#7159)

stick to the existing project type if project view is not valid fixes #7155
bazelbuild · Dec 16, 2024 · b14a8b2 · b14a8b2
1 parent ddff24e
commit b14a8b2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/base/src/com/google/idea/blaze/base/settings/Blaze.java b/base/src/com/google/idea/blaze/base/settings/Blaze.java
@@ -98,6 +98,12 @@ public static ProjectType getUpToDateProjectTypeBeforeSync(@Nonnull Project proj
             context -> {
               return ProjectViewManager.getInstance(project).reloadProjectView(context);
             });
+
+    if (projectViewSet == null) {
+      // fallback existing type if project view file is not valid
+      return blazeImportSettings.getProjectType();
+    }
+
     Optional<Boolean> querySyncProjectView = projectViewSet.getScalarValue(UseQuerySyncSection.KEY);
     if (querySyncProjectView.isPresent()) {
       if (blazeImportSettings.getProjectType() == ProjectType.QUERY_SYNC && !querySyncProjectView.get()) {