Remove dedicated modified methods event

Author: robertbrignull

extensions/ql-vscode/src/model-editor/method-modeling/method-modeling-view-provider.ts

@@ -180,18 +180,6 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
       }),
     );
 
-    this.push(
-      this.modelingEvents.onModifiedMethodsChanged(async (e) => {
-        if (this.webviewView && e.isActiveDb && this.method) {
-          const isModified = e.modifiedMethods.has(this.method.signature);
-          await this.postMessage({
-            t: "setMethodModified",
-            isModified,
-          });
-        }
-      }),
-    );
-
     this.push(
       this.modelingEvents.onSelectedMethodChanged(async (e) => {
         if (this.webviewView) {

extensions/ql-vscode/src/model-editor/methods-usage/methods-usage-panel.ts

@@ -102,7 +102,7 @@ export class MethodsUsagePanel extends DisposableObject {
     );
 
     this.push(
-      this.modelingEvents.onModifiedMethodsChanged(async (event) => {
+      this.modelingEvents.onModeledAndModifiedMethodsChanged(async (event) => {
         if (event.isActiveDb) {
           await this.handleStateChangeEvent();
         }

extensions/ql-vscode/src/model-editor/model-editor-view.ts

@@ -921,17 +921,6 @@ export class ModelEditorView extends AbstractWebview<
       }),
     );
 
-    this.push(
-      this.modelingEvents.onModifiedMethodsChanged(async (event) => {
-        if (event.dbUri === this.databaseItem.databaseUri.toString()) {
-          await this.postMessage({
-            t: "setModifiedMethods",
-            methodSignatures: [...event.modifiedMethods],
-          });
-        }
-      }),
-    );
-
     this.push(
       this.modelingEvents.onInProgressMethodsChanged(async (event) => {
         if (event.dbUri === this.databaseItem.databaseUri.toString()) {

extensions/ql-vscode/src/model-editor/modeling-events.ts

@@ -31,12 +31,6 @@ interface ModeledAndModifiedMethodsChangedEvent {
   readonly isActiveDb: boolean;
 }
 
-interface ModifiedMethodsChangedEvent {
-  readonly modifiedMethods: ReadonlySet<string>;
-  readonly dbUri: string;
-  readonly isActiveDb: boolean;
-}
-
 interface SelectedMethodChangedEvent {
   readonly databaseItem: DatabaseItem;
   readonly method: Method;
@@ -79,7 +73,6 @@ export class ModelingEvents extends DisposableObject {
   public readonly onHideModeledMethodsChanged: AppEvent<HideModeledMethodsChangedEvent>;
   public readonly onModeChanged: AppEvent<ModeChangedEvent>;
   public readonly onModeledAndModifiedMethodsChanged: AppEvent<ModeledAndModifiedMethodsChangedEvent>;
-  public readonly onModifiedMethodsChanged: AppEvent<ModifiedMethodsChangedEvent>;
   public readonly onSelectedMethodChanged: AppEvent<SelectedMethodChangedEvent>;
   public readonly onInProgressMethodsChanged: AppEvent<InProgressMethodsChangedEvent>;
   public readonly onProcessedByAutoModelMethodsChanged: AppEvent<ProcessedByAutoModelMethodsChangedEvent>;
@@ -94,7 +87,6 @@ export class ModelingEvents extends DisposableObject {
   private readonly onHideModeledMethodsChangedEventEmitter: AppEventEmitter<HideModeledMethodsChangedEvent>;
   private readonly onModeChangedEventEmitter: AppEventEmitter<ModeChangedEvent>;
   private readonly onModeledAndModifiedMethodsChangedEventEmitter: AppEventEmitter<ModeledAndModifiedMethodsChangedEvent>;
-  private readonly onModifiedMethodsChangedEventEmitter: AppEventEmitter<ModifiedMethodsChangedEvent>;
   private readonly onSelectedMethodChangedEventEmitter: AppEventEmitter<SelectedMethodChangedEvent>;
   private readonly onInProgressMethodsChangedEventEmitter: AppEventEmitter<InProgressMethodsChangedEvent>;
   private readonly onProcessedByAutoModelMethodsChangedEventEmitter: AppEventEmitter<ProcessedByAutoModelMethodsChangedEvent>;
@@ -140,12 +132,6 @@ export class ModelingEvents extends DisposableObject {
     this.onModeledAndModifiedMethodsChanged =
       this.onModeledAndModifiedMethodsChangedEventEmitter.event;
 
-    this.onModifiedMethodsChangedEventEmitter = this.push(
-      app.createEventEmitter<ModifiedMethodsChangedEvent>(),
-    );
-    this.onModifiedMethodsChanged =
-      this.onModifiedMethodsChangedEventEmitter.event;
-
     this.onSelectedMethodChangedEventEmitter = this.push(
       app.createEventEmitter<SelectedMethodChangedEvent>(),
     );
@@ -238,18 +224,6 @@ export class ModelingEvents extends DisposableObject {
     });
   }
 
-  public fireModifiedMethodsChangedEvent(
-    modifiedMethods: ReadonlySet<string>,
-    dbUri: string,
-    isActiveDb: boolean,
-  ) {
-    this.onModifiedMethodsChangedEventEmitter.fire({
-      modifiedMethods,
-      dbUri,
-      isActiveDb,
-    });
-  }
-
   public fireSelectedMethodChangedEvent(
     databaseItem: DatabaseItem,
     method: Method,

extensions/ql-vscode/src/model-editor/modeling-store.ts

@@ -285,7 +285,7 @@ export class ModelingStore extends DisposableObject {
     dbItem: DatabaseItem,
     methodSignatures: string[],
   ) {
-    this.changeModifiedMethods(dbItem, (state) => {
+    this.changeModeledAndModifiedMethods(dbItem, (state) => {
       const newModifiedMethods = Array.from(
         state.modifiedMethodSignatures,
       ).filter((s) => !methodSignatures.includes(s));
@@ -439,21 +439,6 @@ export class ModelingStore extends DisposableObject {
     );
   }
 
-  private changeModifiedMethods(
-    dbItem: DatabaseItem,
-    updateState: (state: InternalDbModelingState) => void,
-  ) {
-    const state = this.getState(dbItem);
-
-    updateState(state);
-
-    this.modelingEvents.fireModifiedMethodsChangedEvent(
-      state.modifiedMethodSignatures,
-      dbItem.databaseUri.toString(),
-      dbItem.databaseUri.toString() === this.activeDb,
-    );
-  }
-
   private changeModeledAndModifiedMethods(
     dbItem: DatabaseItem,
     updateState: (state: InternalDbModelingState) => void,

extensions/ql-vscode/test/__mocks__/model-editor/modelingEventsMock.ts

@@ -9,7 +9,6 @@ export function createMockModelingEvents({
   onModeChanged = jest.fn(),
   onModeledAndModifiedMethodsChanged:
     onModeledAndModifiedMethodsChanged = jest.fn(),
-  onModifiedMethodsChanged = jest.fn(),
   onInProgressMethodsChanged = jest.fn(),
   onProcessedByAutoModelMethodsChanged = jest.fn(),
   onRevealInModelEditor = jest.fn(),
@@ -22,7 +21,6 @@ export function createMockModelingEvents({
   onHideModeledMethodsChanged?: ModelingEvents["onHideModeledMethodsChanged"];
   onModeChanged?: ModelingEvents["onModeChanged"];
   onModeledAndModifiedMethodsChanged?: ModelingEvents["onModeledAndModifiedMethodsChanged"];
-  onModifiedMethodsChanged?: ModelingEvents["onModifiedMethodsChanged"];
   onInProgressMethodsChanged?: ModelingEvents["onInProgressMethodsChanged"];
   onProcessedByAutoModelMethodsChanged?: ModelingEvents["onProcessedByAutoModelMethodsChanged"];
   onRevealInModelEditor?: ModelingEvents["onRevealInModelEditor"];
@@ -36,7 +34,6 @@ export function createMockModelingEvents({
     onHideModeledMethodsChanged,
     onModeChanged,
     onModeledAndModifiedMethodsChanged,
-    onModifiedMethodsChanged,
     onInProgressMethodsChanged,
     onProcessedByAutoModelMethodsChanged,
     onRevealInModelEditor,