make

Author: heyzec

src/commands/showPanel.tsx

@@ -12,6 +12,7 @@ import { setWebviewContent } from "../utils/webview";
 import config from "../utils/config";
 import { Editor } from "../utils/editor";
 import { FRONTEND_ELEMENT_ID } from "../constants";
+import { client } from "../extension";
 
 let panel: vscode.WebviewPanel | null = null;
 // This needs to be a reference to active
@@ -21,6 +22,8 @@ export let activeEditor: Editor | null = null;
 const messageQueue: MessageType[] = [];
 let handling = false;
 
+// TODO: Remove panel and handling message logic out of the commands/ directory
+
 async function handleMessage(
   context: vscode.ExtensionContext,
   message: MessageType,
@@ -60,6 +63,15 @@ async function handleMessage(
           message.assessmentName,
           message.questionId,
         );
+        activeEditor.uri;
+        const info = context.globalState.get("info") ?? {};
+        if (activeEditor.uri) {
+          // @ts-ignore
+          info[activeEditor.uri] = { chapter: message.chapter };
+          context.globalState.update("info", info);
+          client.sendNotification("source/publishInfo", info);
+        }
+
         panel?.reveal(vscode.ViewColumn.Two);
         console.log(
           `EXTENSION: NewEditor: activeEditor set to ${activeEditor.assessmentName}_${activeEditor.questionId}`,

src/extension.ts

@@ -6,6 +6,10 @@ import { setupTreeView } from "./view/test";
 import { setupStatusBar } from "./statusbar/status";
 import { registerAllCommands } from "./commands";
 import { activateLspClient, deactivateLspClient } from "./lsp/client";
+import { LanguageClient } from "vscode-languageclient/node";
+
+// TODO: Don't expose this object directly, create an interface via a wrapper class
+export let client: LanguageClient;
 
 // This method is called when your extension is activated
 // Your extension is activated the very first time the command is executed
@@ -16,7 +20,14 @@ export function activate(context: vscode.ExtensionContext) {
 
   context.subscriptions.push(setupStatusBar(context));
 
-  activateLspClient(context);
+  client = activateLspClient(context);
+
+  // const info = {
+  //   "file:///home/heyzec/.sourceacademy/playground_1.js": { chapter: 4 },
+  // };
+  const info = context.globalState.get("info") ?? {};
+
+  client.sendNotification("source/publishInfo", info);
 
   // TODO: Split this handler into subhandlers, and them its own folder in src/uriHandlers
   vscode.window.registerUriHandler({

src/utils/editor.ts

@@ -12,6 +12,7 @@ export class Editor {
   questionId: number;
   onChangeCallback?: (editor: Editor) => void;
   code: string | null = null;
+  uri: string | null = null;
 
   // For debugging purposes
   replaceTime: number = 0;
@@ -36,6 +37,7 @@ export class Editor {
     return this.editor?.document.getText();
   }
 
+  // TODO: This method is too loaded, it's not obvious it also shows the editor
   static async create(
     workspaceLocation: VscWorkspaceLocation,
     assessmentName: string,
@@ -57,26 +59,26 @@ export class Editor {
       workspaceFolder,
       `${assessmentName}_${questionId}.js`,
     );
+
+    const uri = vscode.Uri.file(filePath);
+    self.uri = uri.toString();
+
     await vscode.workspace.fs.readFile(vscode.Uri.file(filePath)).then(
       () => null,
       async () => {
         self.log(`Opening file failed, creating at ${filePath}`);
-        await vscode.workspace.fs.writeFile(
-          vscode.Uri.file(filePath),
-          new TextEncoder().encode(""),
-        );
+        await vscode.workspace.fs.writeFile(uri, new TextEncoder().encode(""));
       },
     );
 
-    const editor = await vscode.window.showTextDocument(
-      vscode.Uri.file(filePath),
-      {
-        preview: true,
-        viewColumn: vscode.ViewColumn.One,
-      },
-    );
+    // TODO: editor conflicts with the class Editor
+    const editor = await vscode.window.showTextDocument(uri, {
+      preview: true,
+      viewColumn: vscode.ViewColumn.One,
+    });
 
     self.editor = editor;
+    editor.document.uri.toString();
     // TODO: Restructure Editor-related code so that only active editor has listener
     vscode.workspace.onDidChangeTextDocument(() => {
       if (!self.onChangeCallback) {