Change addModeledMethods and updateModeledMethods to also set methods as modified

Author: robertbrignull

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

@@ -124,10 +124,7 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
           this.databaseItem,
           msg.methodSignature,
           msg.modeledMethods,
-        );
-        this.modelingStore.addModifiedMethod(
-          this.databaseItem,
-          msg.methodSignature,
+          true,
         );
         break;
       }

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

@@ -889,11 +889,10 @@ export class ModelEditorView extends AbstractWebview<
   }
 
   private addModeledMethods(modeledMethods: Record<string, ModeledMethod[]>) {
-    this.modelingStore.addModeledMethods(this.databaseItem, modeledMethods);
-
-    this.modelingStore.addModifiedMethods(
+    this.modelingStore.addModeledMethods(
       this.databaseItem,
-      new Set(Object.keys(modeledMethods)),
+      modeledMethods,
+      true,
     );
   }
 
@@ -916,8 +915,8 @@ export class ModelEditorView extends AbstractWebview<
       this.databaseItem,
       signature,
       methods,
+      true,
     );
-    this.modelingStore.addModifiedMethod(this.databaseItem, signature);
   }
 
   private startModelEvaluation() {

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

@@ -214,6 +214,7 @@ export class ModelingStore extends DisposableObject {
   public addModeledMethods(
     dbItem: DatabaseItem,
     methods: Record<string, ModeledMethod[]>,
+    setModified: boolean,
   ) {
     this.changeModeledMethods(dbItem, (state) => {
       const newModeledMethods = {
@@ -227,6 +228,10 @@ export class ModelingStore extends DisposableObject {
       };
       state.modeledMethods = newModeledMethods;
     });
+
+    if (setModified) {
+      this.addModifiedMethods(dbItem, new Set(Object.keys(methods)));
+    }
   }
 
   public setModeledMethods(
@@ -242,12 +247,17 @@ export class ModelingStore extends DisposableObject {
     dbItem: DatabaseItem,
     signature: string,
     modeledMethods: ModeledMethod[],
+    setModified: boolean,
   ) {
     this.changeModeledMethods(dbItem, (state) => {
       const newModeledMethods = { ...state.modeledMethods };
       newModeledMethods[signature] = modeledMethods;
       state.modeledMethods = newModeledMethods;
     });
+
+    if (setModified) {
+      this.addModifiedMethods(dbItem, [signature]);
+    }
   }
 
   public addModifiedMethods(
@@ -263,10 +273,6 @@ export class ModelingStore extends DisposableObject {
     });
   }
 
-  public addModifiedMethod(dbItem: DatabaseItem, methodSignature: string) {
-    this.addModifiedMethods(dbItem, [methodSignature]);
-  }
-
   public removeModifiedMethods(
     dbItem: DatabaseItem,
     methodSignatures: string[],