From 28a7cae657bf4c7603db57cbc6856931239b6900 Mon Sep 17 00:00:00 2001
From: Evgenii Novozhilov <evgenii.novozhilov@jetbrains.com>
Date: Wed, 11 Dec 2024 17:42:46 +0200
Subject: [PATCH] handle non-valid project view file on reload

stick to the existing project type if project view
is not valid

fixes #7155
---
 base/src/com/google/idea/blaze/base/settings/Blaze.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/base/src/com/google/idea/blaze/base/settings/Blaze.java b/base/src/com/google/idea/blaze/base/settings/Blaze.java
index d6534006bc6..5ba950873e7 100644
--- 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()) {