[analytics] Split the other workspace types into Blaze, Gn and other

Change-Id: Ibf46f2dec665e2cbee88ee961d6a4b46b6617c6d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/459541
Commit-Queue: Keerti Parthasarathy <keertip@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>

Author: keertip

pkg/analysis_server/lib/src/analysis_server.dart

@@ -82,6 +82,9 @@ import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
 import 'package:analyzer/src/util/performance/operation_performance.dart';
 import 'package:analyzer/src/utilities/extensions/analysis_session.dart';
+import 'package:analyzer/src/workspace/basic.dart';
+import 'package:analyzer/src/workspace/blaze.dart';
+import 'package:analyzer/src/workspace/gn.dart';
 import 'package:analyzer/src/workspace/pub.dart';
 import 'package:analyzer_plugin/protocol/protocol.dart';
 import 'package:analyzer_plugin/src/protocol/protocol_internal.dart'
@@ -951,7 +954,7 @@ abstract class AnalysisServer {
     var transitiveFilePaths = <String>{};
     var transitiveFileUniqueLineCount = 0;
     var libraryCycles = <LibraryCycle>{};
-    var workspaceTypes = <int>[0, 0, 0];
+    var workspaceTypes = List<int>.filled(5, 0);
     var numberOfPackages = <int>[];
     var driverMap = contextManager.driverMap;
     for (var entry in driverMap.entries) {
@@ -962,17 +965,21 @@ abstract class AnalysisServer {
         var contextRoot = analysisContext.contextRoot;
         packagesFileMap[rootPath] = contextRoot.packagesFile;
         var workspace = contextRoot.workspace;
-        if (workspace is PackageConfigWorkspace) {
-          if (workspace.isPubWorkspace) {
-            // Pub workspace index = 2, Package workspace index = 1
-            workspaceTypes[2]++;
-            numberOfPackages.add(workspace.allPackages.length);
-          } else {
-            workspaceTypes[1]++;
-          }
-        } else {
-          // Blaze, GN or other workspace index  = 0
-          workspaceTypes[0]++;
+        switch (workspace) {
+          case PackageConfigWorkspace():
+            if (workspace.isPubWorkspace) {
+              // Pub workspace index = 2, Package workspace index = 1
+              workspaceTypes[2]++;
+              numberOfPackages.add(workspace.allPackages.length);
+            } else {
+              workspaceTypes[1]++;
+            }
+          case BlazeWorkspace():
+            workspaceTypes[3]++;
+          case GnWorkspace():
+            workspaceTypes[4]++;
+          case BasicWorkspace():
+            workspaceTypes[0]++;
         }
       }
       var fileSystemState = driver.fsState;

pkg/analysis_server/lib/src/analytics/context_structure.dart

@@ -48,9 +48,11 @@ class ContextStructure {
   final int transitiveFileUniqueLineCount;
 
   /// The type of the workspaces in all of the contexts. A list of 3 elements,
-  /// index 0 - number of Blaze/GN/Basic workspace
+  /// index 0 - number of Basic workspaces
   /// index 1 - number of workspaces with one package
   /// index 2 - number of Pub workspaces
+  /// index 3 - number of Blaze workspaces
+  /// index 4 - number of GN workspaces
   final List<int> contextWorkspaceType;
 
   /// The number of packages in the workspace. This value is calculated only
@@ -71,8 +73,8 @@ class ContextStructure {
     required this.transitiveFileUniqueLineCount,
     required List<int> libraryCycleLibraryCounts,
     required List<int> libraryCycleLineCounts,
-    this.contextWorkspaceType = const <int>[0, 0, 0],
-    List<int> numberOfPackagesInWorkspace = const <int>[],
+    required this.contextWorkspaceType,
+    required List<int> numberOfPackagesInWorkspace,
   }) : libraryCycleLibraryCounts = PercentileCalculator.from(
          libraryCycleLibraryCounts,
        ),