Updates

.github/workflows/build.yml

@@ -17,11 +17,11 @@ jobs:
     - name: Install node
       uses: actions/setup-node@v1
       with:
-       node-version: '10.x'
+       node-version: '20.x'
     - name: Install Python
       uses: actions/setup-python@v1
       with:
-        python-version: '3.7'
+        python-version: '3.12'
         architecture: 'x64'
     - name: Install dependencies
       run: python -m pip install jupyterlab
@@ -44,11 +44,11 @@ jobs:
     - name: Install node
       uses: actions/setup-node@v1
       with:
-       node-version: '10.x'
+       node-version: '20.x'
     - name: Install Python
       uses: actions/setup-python@v1
       with:
-        python-version: '3.7'
+        python-version: '3.12'
         architecture: 'x64'
     - name: Install dependencies
       run: python -m pip install jupyterlab

.gitignore

@@ -4,3 +4,6 @@ node_modules/
 *.egg-info/
 .ipynb_checkpoints
 *.tsbuildinfo
+
+.yarn/
+.yarnrc.yml

package.json

@@ -34,8 +34,8 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@jupyterlab/application": "^2.0.0",
-    "@jupyterlab/notebook": "^2.0.0"
+    "@jupyterlab/application": "^4.3.0",
+    "@jupyterlab/notebook": "^4.3.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^2.25.0",

src/index.ts

@@ -17,9 +17,7 @@ interface IFormatResponseContent {
 
 function scalafmtConf(notebookTracker: INotebookTracker): Record<string, any> {
   let conf: Record<string, any> = {};
-  const maybeConf = notebookTracker.currentWidget.model.metadata.get(
-    'scalafmt'
-  );
+  const maybeConf = notebookTracker.currentWidget.model.metadata['scalafmt'];
   if (maybeConf && maybeConf.constructor === {}.constructor) {
     conf = maybeConf as Record<string, any>;
   }
@@ -44,14 +42,14 @@ function getCells(
       return;
     }
 
-    const it = notebookModel.cells.iter();
+    const it = notebookModel.cells[Symbol.iterator]();
     let cellModel = it.next();
-    while (cellModel) {
-      const cellId = cellModel.id;
+    while (!cellModel.done) {
+      const cellId = cellModel.value.id;
       const initialCode = cellModel.value.text;
-      if (cellModel.type === 'code' && initialCode.length > 0) {
+      if (cellModel.value.type === 'code' && initialCode.length > 0) {
         requestCells[cellId] = initialCode;
-        cellDict[cellId] = cellModel;
+        cellDict[cellId] = cellModel.value;
       }
       cellModel = it.next();
     }
@@ -69,7 +67,7 @@ function getCells(
     }
 
     const cellId = cellModel.id;
-    const initialCode = cellModel.value.text;
+    const initialCode = cellModel.sharedModel.source;
 
     if (initialCode.length === 0) {
       console.log('nothing to format');
@@ -93,18 +91,13 @@ function handleResponse(
       if (response.key in cellDict && response.key in requestCells) {
         const cellModel = cellDict[response.key];
         const initialCode = requestCells[response.key];
-        const codeObservable = cellModel.value;
+        const codeObservable = cellModel.sharedModel;
         if (
           response.code &&
           response.initial_code === initialCode &&
-          codeObservable.text === initialCode
+          codeObservable.source === initialCode
         ) {
-          // FIXME Seems there's no way to set the content in one go
-          codeObservable.insert(0, response.code);
-          codeObservable.remove(
-            response.code.length,
-            codeObservable.text.length
-          );
+          codeObservable.setSource(response.code);
         } else {
           console.log(
             'Cell code changed, not updating it with stale formatted code'