Merge branch 'main' into mcq-ui

Author: shirsho-12

scripts/lsp.js

@@ -22,7 +22,7 @@ async function main() {
 
 async function downloadLsp() {
   const outputFolder = getOutputDir();
-  const version = "0.1.4";
+  const version = "0.1.8";
   const lspFilename = "source-lsp.js";
   const url = `https://github.com/source-academy/source-lsp/releases/download/v${version}/${lspFilename}`;
   // const url = `https://github.com/source-academy/source-lsp/releases/latest/download/${lspFilename}`;

src/commands/showPanel.tsx

@@ -95,9 +95,10 @@ async function handleMessage(
           // @ts-ignore
           _.set(info, `["${activeEditor.uri}"].chapter`, message.chapter ?? 1);
           // TODO: message.prepend can be undefined in runtime, investigate
-          const nPrependLines = message.prepend
-            ? message.prepend.split("\n").length
-            : 0;
+          const nPrependLines =
+            message.prepend && message.prepend !== ""
+              ? message.prepend.split("\n").length + 2 // account for start/end markers
+              : 0;
           _.set(info, `["${activeEditor.uri}"].prepend`, nPrependLines);
           context.globalState.update("info", info);
           client.sendRequest("source/publishInfo", info);

src/utils/editor.ts

@@ -67,12 +67,15 @@ export class Editor {
     const uri = vscode.Uri.file(filePath);
     self.uri = uri.toString();
 
-    const contents = [
-      "// PREPEND -- DO NOT EDIT",
-      prepend,
-      "// END PREPEND",
-      initialCode,
-    ].join("\n");
+    const contents =
+      prepend !== ""
+        ? [
+            "// PREPEND -- DO NOT EDIT",
+            prepend,
+            "// END PREPEND",
+            initialCode,
+          ].join("\n")
+        : initialCode;
 
     await vscode.workspace.fs.readFile(vscode.Uri.file(filePath)).then(
       () => null,