Save and prepend fix

src/commands/showPanel.tsx

@@ -73,10 +73,8 @@ async function handleMessage(
         );
         activeEditor.onChange((editor) => {
           const workspaceLocation = editor.workspaceLocation;
-          const code = editor.getText();
-          if (!code) {
-            return;
-          }
+          const code = editor.getActualCode();
+
           if (editor !== activeEditor) {
             console.log(
               `EXTENSION: Editor ${editor.assessmentName}_${editor.questionId} is no longer active, skipping onChange`,
@@ -161,6 +159,17 @@ export async function showPanel(
   );
 
   panel.iconPath = SOURCE_ACADEMY_ICON_URI;
+
+  vscode.workspace.onDidSaveTextDocument((e: vscode.TextDocument) => {
+    if (e.uri.toString() === activeEditor?.uri) {
+      const message = Messages.AssessmentAnswer(
+        activeEditor.questionId,
+        activeEditor.getActualCode()
+      );
+
+      sendToFrontend(panel, message);
+    }
+  })
 }
 
 // TODO: Move this to a util file

src/utils/editor.ts

@@ -14,6 +14,7 @@ export class Editor {
   onChangeCallback?: (editor: Editor) => void;
   code: string | null = null;
   uri: string | null = null;
+  num_prepend_lines: number = 0;
 
   // For debugging purposes
   replaceTime: number = 0;
@@ -38,6 +39,10 @@ export class Editor {
     return this.editor?.document.getText();
   }
 
+  getActualCode(): string {
+    return this.code ? this.code.split("\n").slice(this.num_prepend_lines).join("\n") : ""
+  }
+
   // TODO: This method is too loaded, it's not obvious it also shows the editor
   static async create(
     workspaceLocation: VscWorkspaceLocation,
@@ -69,6 +74,9 @@ export class Editor {
             initialCode,
           ].join("\n")
         : initialCode;
+    if (prepend !== "") {
+      self.num_prepend_lines = prepend.split("\n").length+2
+    }
 
     await vscode.workspace.fs.readFile(vscode.Uri.file(filePath)).then(
       (value) => {
@@ -142,8 +150,8 @@ export class Editor {
           return;
         }
         self.log(`EXTENSION: Editor's code changed!`);
-        self.onChangeCallback(self);
         self.code = text;
+        self.onChangeCallback(self);
       },
     );
     return self;

src/utils/messages.ts

@@ -58,6 +58,10 @@ const Messages = createMessages({
   Navigate: (route: string) => ({
     route,
   }),
+  AssessmentAnswer: (questionId: number, answer: string) => ({
+    questionId,
+    answer
+  }),
 });
 
 export default Messages;