remove support for different projectview files

Author: LeFrosch

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

@@ -449,7 +449,13 @@
   </extensions>
 
   <extensions defaultExtensionNs="com.intellij">
-    <fileTypeFactory implementation="com.google.idea.blaze.base.lang.projectview.language.ProjectViewFileTypeFactory"/>
+    <fileType
+      language="projectview"
+      name="projectview"
+      implementationClass="com.google.idea.blaze.base.lang.projectview.language.ProjectViewFileType"
+      fieldName="INSTANCE"
+      extensions="bazelproject"/>
+
     <lang.parserDefinition language="projectview" implementationClass="com.google.idea.blaze.base.lang.projectview.parser.ProjectViewParserDefinition"/>
     <lang.commenter language="projectview" implementationClass="com.google.idea.blaze.base.lang.projectview.formatting.ProjectViewCommenter"/>
     <lang.foldingBuilder language="projectview" implementationClass="com.google.idea.blaze.base.lang.projectview.formatting.ProjectViewFoldingBuilder"/>

base/src/com/google/idea/blaze/base/lang/projectview/language/ProjectViewFileTypeFactory.java

@@ -31,40 +31,22 @@
  */
 public abstract class ProjectViewStorageManager {
 
-  private static final String BLAZE_EXTENSION = "blazeproject";
-  private static final String BAZEL_EXTENSION = "bazelproject";
-  private static final String LEGACY_EXTENSION = "asproject";
-
-  public static final ImmutableList<String> VALID_EXTENSIONS =
-      ImmutableList.of(BLAZE_EXTENSION, BAZEL_EXTENSION, LEGACY_EXTENSION);
+  public static final String EXTENSION = "bazelproject";
 
   public static boolean isProjectViewFile(@NotNull File file) {
     return isProjectViewFile(file.getName());
   }
 
   public static boolean isProjectViewFile(String fileName) {
-    for (String ext : VALID_EXTENSIONS) {
-      if (fileName.endsWith("." + ext)) {
-        return true;
-      }
-    }
-    return false;
+    return fileName.endsWith("." + EXTENSION);
   }
 
-  public static String getProjectViewFileName(BuildSystemName buildSystemName) {
-    switch (buildSystemName) {
-      case Blaze:
-        return "." + BLAZE_EXTENSION;
-      case Bazel:
-        return "." + BAZEL_EXTENSION;
-      default:
-        throw new IllegalArgumentException("Unrecognized build system type: " + buildSystemName);
-    }
+  public static String getProjectViewFileName() {
+    return "." + EXTENSION;
   }
 
-  public static File getLocalProjectViewFileName(
-      BuildSystemName buildSystemName, File projectDataDirectory) {
-    return new File(projectDataDirectory, getProjectViewFileName(buildSystemName));
+  public static File getLocalProjectViewFileName(File projectDataDirectory) {
+    return new File(projectDataDirectory, getProjectViewFileName());
   }
 
   public static ProjectViewStorageManager getInstance() {

base/src/com/google/idea/blaze/base/projectview/ProjectViewStorageManager.java

@@ -88,7 +88,11 @@ public static ProjectType getUpToDateProjectTypeBeforeSync(@Nonnull Project proj
   /**
    * Returns the build system associated with this project, or falls back to the default blaze build
    * system if the project is null or not a blaze project.
+   *
+   * @deprecated Since we do not support Blaze anymore, this check is redundant and can be removed in
+   * the future.
    */
+  @Deprecated
   public static BuildSystemName getBuildSystemName(@Nullable Project project) {
     BlazeImportSettings importSettings =
         project == null

base/src/com/google/idea/blaze/base/settings/Blaze.java

@@ -587,9 +587,7 @@ public void updateBuilder(BlazeNewProjectBuilder builder) {
     String projectName = projectNameField.getText().trim();
     File projectDataDir = getProjectDataDir();
     String projectDataDirectory = projectDataDir.getPath();
-    File localProjectViewFile =
-        ProjectViewStorageManager.getLocalProjectViewFileName(
-            builder.getBuildSystem(), new File(projectDataDirectory));
+    File localProjectViewFile = ProjectViewStorageManager.getLocalProjectViewFileName(new File(projectDataDirectory));
 
     BlazeSelectProjectViewOption selectProjectViewOption = builder.getProjectViewOption();
     boolean useSharedProjectView = projectViewUi.getUseSharedProjectView();

base/src/com/google/idea/blaze/base/wizard2/ui/BlazeEditProjectViewControl.java

@@ -64,8 +64,7 @@ public void commit() {
   }
 
   private static String getTitle(BlazeNewProjectBuilder builder) {
-    String projectViewString =
-        ProjectViewStorageManager.getProjectViewFileName(builder.getBuildSystem());
+    String projectViewString = ProjectViewStorageManager.getProjectViewFileName();
     return String.format("Select project view (%s file)", projectViewString);
   }
 }