fix notebook generate bug

Author: Sorosliu1029

jupyterlab_leetcode/utils/notebook_generator.py

@@ -20,7 +20,7 @@ def __init__(self):
             "notebook.template.json",
         )
         with open(template_path, "rt") as f:
-            self.template = json.load(f)
+            self.__template = json.load(f)
 
         self.typing_regex = re.compile(
             "|".join(
@@ -180,24 +180,18 @@ def __populate_run(self, q, snippet):
 
         idx, run_cell = run_cell_with_idx
         cases = q["exampleTestcaseList"] or [q["sampleTestCase"]]
-        run_cells = []
 
         def fill_case(case):
-            return f"Solution().{func_name}({case.replace('\n', ', ')})"
+            return f"s.{func_name}({case.replace('\n', ', ')})"
 
         for i, case in enumerate(cases):
             if i == 0:
-                run_cell["source"] = [fill_case(case)]
-                run_cells.append(run_cell)
+                run_cell["source"] = [f"s = Solution()\n{fill_case(case)}"]
             else:
                 copied = copy.deepcopy(run_cell)
                 copied["metadata"]["id"] = f"run_{i}"
                 copied["source"] = [fill_case(case)]
-                run_cells.append(copied)
-
-        if run_cells:
-            # FIXME: accumulation ?
-            self.template["cells"][idx : idx + 1] = run_cells
+                self.template["cells"].insert(idx + i, copied)
 
     def __dump(self, q):
         qid = q["questionFrontendId"]
@@ -212,6 +206,7 @@ def __dump(self, q):
         return file_path
 
     def generate(self, q):
+        self.template = copy.deepcopy(self.__template)
         self.__populate_metadata(q)
         self.__populate_title(q)
         self.__populate_content(q)

src/components/LeetCode.tsx

@@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react';
 import { IDocumentManager } from '@jupyterlab/docmanager';
 import { IDocumentWidget } from '@jupyterlab/docregistry';
 import { JupyterFrontEnd, LabShell } from '@jupyterlab/application';
-import { NotebookPanel, NotebookActions } from '@jupyterlab/notebook';
 import { getProfile } from '../services/leetcode';
 import { LeetCodeProfile } from '../types/leetcode';
 import Profile from './Profile';
@@ -44,22 +43,7 @@ const LeetCode: React.FC<{
   }, []);
 
   const openNoteBook = (path: string) => {
-    const docWidget = docManager.openOrReveal(path);
-    if (docWidget && docWidget instanceof NotebookPanel) {
-      docWidget.revealed.then(() => {
-        let idx = 0;
-        for (const cell of docWidget.content.model?.cells ?? []) {
-          if (cell.metadata['id'] === 'pre_code') {
-            docWidget.content.activeCellIndex = idx;
-            docWidget.context.ready.then(() => {
-              // FIXME: not running..., dont know why
-              NotebookActions.run(docWidget.content);
-            });
-          }
-          idx++;
-        }
-      });
-    }
+    docManager.openOrReveal(path);
   };
 
   return profile ? (

src/index.ts

@@ -82,7 +82,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
         widget.revealed.then(() => {
           if (widget.model?.metadata?.leetcode_question_info) {
             const toolbarItem = new LeetCodeToolbarWidget(widget);
-            widget.toolbar.insertBefore('spacer', 'leetcode', toolbarItem);
+            widget.toolbar.insertAfter('cellType', 'leetcode', toolbarItem);
           }
         });
       }