Collect common messages

extensions/ql-vscode/src/pure/interface-types.ts

@@ -183,15 +183,13 @@ export type IntoResultsViewMsg =
  * A message sent from the results view.
  */
 export type FromResultsViewMsg =
+  | CommonFromViewMessages
   | ViewSourceFileMsg
   | ToggleDiagnostics
   | ChangeRawResultsSortMsg
   | ChangeInterpretedResultsSortMsg
-  | ViewLoadedMsg
   | ChangePage
-  | OpenFileMsg
-  | TelemetryMessage
-  | UnhandledErrorMessage;
+  | OpenFileMsg;
 
 /**
  * Message from the results view to open a database source
@@ -233,6 +231,21 @@ interface ViewLoadedMsg {
   viewName: string;
 }
 
+interface TelemetryMessage {
+  t: "telemetry";
+  action: string;
+}
+
+interface UnhandledErrorMessage {
+  t: "unhandledError";
+  error: ErrorLike;
+}
+
+type CommonFromViewMessages =
+  | ViewLoadedMsg
+  | TelemetryMessage
+  | UnhandledErrorMessage;
+
 /**
  * Message from the results view to signal a request to change the
  * page.
@@ -289,12 +302,10 @@ interface ChangeInterpretedResultsSortMsg {
  * Message from the compare view to the extension.
  */
 export type FromCompareViewMessage =
-  | ViewLoadedMsg
+  | CommonFromViewMessages
   | ChangeCompareMessage
   | ViewSourceFileMsg
-  | OpenQueryMessage
-  | TelemetryMessage
-  | UnhandledErrorMessage;
+  | OpenQueryMessage;
 
 /**
  * Message from the compare view to request opening a query.
@@ -437,29 +448,17 @@ export interface CancelVariantAnalysisMessage {
   t: "cancelVariantAnalysis";
 }
 
-export interface TelemetryMessage {
-  t: "telemetry";
-  action: string;
-}
-
-export interface UnhandledErrorMessage {
-  t: "unhandledError";
-  error: ErrorLike;
-}
-
 export type ToVariantAnalysisMessage =
   | SetVariantAnalysisMessage
   | SetRepoResultsMessage
   | SetRepoStatesMessage;
 
 export type FromVariantAnalysisMessage =
-  | ViewLoadedMsg
+  | CommonFromViewMessages
   | RequestRepositoryResultsMessage
   | OpenQueryFileMessage
   | OpenQueryTextMessage
   | CopyRepositoryListMessage
   | ExportResultsMessage
   | OpenLogsMessage
-  | CancelVariantAnalysisMessage
-  | TelemetryMessage
-  | UnhandledErrorMessage;
+  | CancelVariantAnalysisMessage;