Rename to ModeledAndModifiedMethodsChanged

Author: robertbrignull

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

@@ -529,8 +529,8 @@ interface SetMethodsMessage {
   methods: Method[];
 }
 
-interface SetModeledMethodsMessage {
-  t: "setModeledMethods";
+interface SetModeledAndModifiedMethodsMessage {
+  t: "setModeledAndModifiedMethods";
   methods: Record<string, ModeledMethod[]>;
   modifiedMethodSignatures: string[];
 }
@@ -648,7 +648,7 @@ interface SetModelEvaluationRunMessage {
 export type ToModelEditorMessage =
   | SetExtensionPackStateMessage
   | SetMethodsMessage
-  | SetModeledMethodsMessage
+  | SetModeledAndModifiedMethodsMessage
   | SetModifiedMethodsMessage
   | SetInProgressMethodsMessage
   | SetProcessedByAutoModelMethodsMessage

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

@@ -161,7 +161,7 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
 
   private registerToModelingEvents(): void {
     this.push(
-      this.modelingEvents.onModeledMethodsChanged(async (e) => {
+      this.modelingEvents.onModeledAndModifiedMethodsChanged(async (e) => {
         if (this.webviewView && e.isActiveDb && this.method) {
           const modeledMethods = e.modeledMethods[this.method.signature];
           if (modeledMethods) {

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

@@ -910,10 +910,10 @@ export class ModelEditorView extends AbstractWebview<
     );
 
     this.push(
-      this.modelingEvents.onModeledMethodsChanged(async (event) => {
+      this.modelingEvents.onModeledAndModifiedMethodsChanged(async (event) => {
         if (event.dbUri === this.databaseItem.databaseUri.toString()) {
           await this.postMessage({
-            t: "setModeledMethods",
+            t: "setModeledAndModifiedMethods",
             methods: event.modeledMethods,
             modifiedMethodSignatures: [...event.modifiedMethodSignatures],
           });

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

@@ -24,7 +24,7 @@ interface ModeChangedEvent {
   readonly isActiveDb: boolean;
 }
 
-interface ModeledMethodsChangedEvent {
+interface ModeledAndModifiedMethodsChangedEvent {
   readonly modeledMethods: Readonly<Record<string, ModeledMethod[]>>;
   readonly modifiedMethodSignatures: ReadonlySet<string>;
   readonly dbUri: string;
@@ -78,7 +78,7 @@ export class ModelingEvents extends DisposableObject {
   public readonly onMethodsChanged: AppEvent<MethodsChangedEvent>;
   public readonly onHideModeledMethodsChanged: AppEvent<HideModeledMethodsChangedEvent>;
   public readonly onModeChanged: AppEvent<ModeChangedEvent>;
-  public readonly onModeledMethodsChanged: AppEvent<ModeledMethodsChangedEvent>;
+  public readonly onModeledAndModifiedMethodsChanged: AppEvent<ModeledAndModifiedMethodsChangedEvent>;
   public readonly onModifiedMethodsChanged: AppEvent<ModifiedMethodsChangedEvent>;
   public readonly onSelectedMethodChanged: AppEvent<SelectedMethodChangedEvent>;
   public readonly onInProgressMethodsChanged: AppEvent<InProgressMethodsChangedEvent>;
@@ -93,7 +93,7 @@ export class ModelingEvents extends DisposableObject {
   private readonly onMethodsChangedEventEmitter: AppEventEmitter<MethodsChangedEvent>;
   private readonly onHideModeledMethodsChangedEventEmitter: AppEventEmitter<HideModeledMethodsChangedEvent>;
   private readonly onModeChangedEventEmitter: AppEventEmitter<ModeChangedEvent>;
-  private readonly onModeledMethodsChangedEventEmitter: AppEventEmitter<ModeledMethodsChangedEvent>;
+  private readonly onModeledAndModifiedMethodsChangedEventEmitter: AppEventEmitter<ModeledAndModifiedMethodsChangedEvent>;
   private readonly onModifiedMethodsChangedEventEmitter: AppEventEmitter<ModifiedMethodsChangedEvent>;
   private readonly onSelectedMethodChangedEventEmitter: AppEventEmitter<SelectedMethodChangedEvent>;
   private readonly onInProgressMethodsChangedEventEmitter: AppEventEmitter<InProgressMethodsChangedEvent>;
@@ -134,11 +134,11 @@ export class ModelingEvents extends DisposableObject {
     );
     this.onModeChanged = this.onModeChangedEventEmitter.event;
 
-    this.onModeledMethodsChangedEventEmitter = this.push(
-      app.createEventEmitter<ModeledMethodsChangedEvent>(),
+    this.onModeledAndModifiedMethodsChangedEventEmitter = this.push(
+      app.createEventEmitter<ModeledAndModifiedMethodsChangedEvent>(),
     );
-    this.onModeledMethodsChanged =
-      this.onModeledMethodsChangedEventEmitter.event;
+    this.onModeledAndModifiedMethodsChanged =
+      this.onModeledAndModifiedMethodsChangedEventEmitter.event;
 
     this.onModifiedMethodsChangedEventEmitter = this.push(
       app.createEventEmitter<ModifiedMethodsChangedEvent>(),
@@ -224,13 +224,13 @@ export class ModelingEvents extends DisposableObject {
     });
   }
 
-  public fireModeledMethodsChangedEvent(
+  public fireModeledAndModifiedMethodsChangedEvent(
     modeledMethods: Record<string, ModeledMethod[]>,
     modifiedMethodSignatures: ReadonlySet<string>,
     dbUri: string,
     isActiveDb: boolean,
   ) {
-    this.onModeledMethodsChangedEventEmitter.fire({
+    this.onModeledAndModifiedMethodsChangedEventEmitter.fire({
       modeledMethods,
       modifiedMethodSignatures,
       dbUri,

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

@@ -229,7 +229,7 @@ export class ModelingStore extends DisposableObject {
     methods: Record<string, ModeledMethod[]>,
     setModified: boolean,
   ) {
-    this.changeModeledMethods(dbItem, (state) => {
+    this.changeModeledAndModifiedMethods(dbItem, (state) => {
       const newModeledMethods = {
         ...methods,
         // Keep all methods that are already modeled in some form in the state
@@ -255,7 +255,7 @@ export class ModelingStore extends DisposableObject {
     dbItem: DatabaseItem,
     methods: Record<string, ModeledMethod[]>,
   ) {
-    this.changeModeledMethods(dbItem, (state) => {
+    this.changeModeledAndModifiedMethods(dbItem, (state) => {
       state.modeledMethods = { ...methods };
     });
   }
@@ -266,7 +266,7 @@ export class ModelingStore extends DisposableObject {
     modeledMethods: ModeledMethod[],
     setModified: boolean,
   ) {
-    this.changeModeledMethods(dbItem, (state) => {
+    this.changeModeledAndModifiedMethods(dbItem, (state) => {
       const newModeledMethods = { ...state.modeledMethods };
       newModeledMethods[signature] = modeledMethods;
       state.modeledMethods = newModeledMethods;
@@ -454,15 +454,15 @@ export class ModelingStore extends DisposableObject {
     );
   }
 
-  private changeModeledMethods(
+  private changeModeledAndModifiedMethods(
     dbItem: DatabaseItem,
     updateState: (state: InternalDbModelingState) => void,
   ) {
     const state = this.getState(dbItem);
 
     updateState(state);
 
-    this.modelingEvents.fireModeledMethodsChangedEvent(
+    this.modelingEvents.fireModeledAndModifiedMethodsChangedEvent(
       state.modeledMethods,
       state.modifiedMethodSignatures,
       dbItem.databaseUri.toString(),

extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx

@@ -198,7 +198,7 @@ export function ModelEditor({
           case "setMethods":
             setMethods(msg.methods);
             break;
-          case "setModeledMethods":
+          case "setModeledAndModifiedMethods":
             setModeledMethods(msg.methods);
             setModifiedSignatures(new Set(msg.modifiedMethodSignatures));
             break;

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

@@ -7,7 +7,8 @@ export function createMockModelingEvents({
   onMethodsChanged = jest.fn(),
   onHideModeledMethodsChanged = jest.fn(),
   onModeChanged = jest.fn(),
-  onModeledMethodsChanged = jest.fn(),
+  onModeledAndModifiedMethodsChanged:
+    onModeledAndModifiedMethodsChanged = jest.fn(),
   onModifiedMethodsChanged = jest.fn(),
   onInProgressMethodsChanged = jest.fn(),
   onProcessedByAutoModelMethodsChanged = jest.fn(),
@@ -20,7 +21,7 @@ export function createMockModelingEvents({
   onMethodsChanged?: ModelingEvents["onMethodsChanged"];
   onHideModeledMethodsChanged?: ModelingEvents["onHideModeledMethodsChanged"];
   onModeChanged?: ModelingEvents["onModeChanged"];
-  onModeledMethodsChanged?: ModelingEvents["onModeledMethodsChanged"];
+  onModeledAndModifiedMethodsChanged?: ModelingEvents["onModeledAndModifiedMethodsChanged"];
   onModifiedMethodsChanged?: ModelingEvents["onModifiedMethodsChanged"];
   onInProgressMethodsChanged?: ModelingEvents["onInProgressMethodsChanged"];
   onProcessedByAutoModelMethodsChanged?: ModelingEvents["onProcessedByAutoModelMethodsChanged"];
@@ -34,7 +35,7 @@ export function createMockModelingEvents({
     onMethodsChanged,
     onHideModeledMethodsChanged,
     onModeChanged,
-    onModeledMethodsChanged,
+    onModeledAndModifiedMethodsChanged,
     onModifiedMethodsChanged,
     onInProgressMethodsChanged,
     onProcessedByAutoModelMethodsChanged,