Limt; improve the action on unexpected arrays length difference on set

Author: krassowski

packages/jupyterlab-lsp/src/adapters/notebook/notebook.ts

@@ -148,36 +148,40 @@ export class NotebookAdapter extends WidgetAdapter<NotebookPanel> {
         let convertedToMarkdownOrRaw = [];
         let convertedToCode = [];
 
-        if (change.newValues.length !== change.oldValues.length) {
+        if (change.newValues.length === change.oldValues.length) {
           // during conversion the cells should not get deleted nor added
-          return;
-        }
-
-        for (let i = 0; i < change.newValues.length; i++) {
-          if (
-            change.oldValues[i].type === 'code' &&
-            change.newValues[i].type !== 'code'
-          ) {
-            convertedToMarkdownOrRaw.push(change.newValues[i]);
-          } else if (
-            change.oldValues[i].type !== 'code' &&
-            change.newValues[i].type === 'code'
-          ) {
-            convertedToCode.push(change.newValues[i]);
+          for (let i = 0; i < change.newValues.length; i++) {
+            if (
+              change.oldValues[i].type === 'code' &&
+              change.newValues[i].type !== 'code'
+            ) {
+              convertedToMarkdownOrRaw.push(change.newValues[i]);
+            } else if (
+              change.oldValues[i].type !== 'code' &&
+              change.newValues[i].type === 'code'
+            ) {
+              convertedToCode.push(change.newValues[i]);
+            }
           }
+          cellsAdded = convertedToCode;
+          cellsRemoved = convertedToMarkdownOrRaw;
         }
-        cellsAdded = convertedToCode;
-        cellsRemoved = convertedToMarkdownOrRaw;
-
       } else if (change.type == 'add') {
-        cellsAdded = change.newValues.filter((cellModel) => cellModel.type === 'code')
+        cellsAdded = change.newValues.filter(
+          cellModel => cellModel.type === 'code'
+        );
       }
       // note: editorRemoved is not emitted for removal of cells by change of type 'remove' (but only during cell type conversion)
       // because there is no easy way to get the widget associated with the removed cell(s) - because it is no
       // longer in the notebook widget list! It would need to be tracked on our side, but it is not necessary
       // as (except for a tiny memory leak) it should not impact the functionality in any way
 
-      if (cellsRemoved.length || cellsAdded.length || change.type === 'move' || change.type === 'remove') {
+      if (
+        cellsRemoved.length ||
+        cellsAdded.length ||
+        change.type === 'move' ||
+        change.type === 'remove'
+      ) {
         // in contrast to the file editor document which can be only changed by the modification of the editor content,
         // the notebook document cna also get modified by a change in the number or arrangement of editors themselves;
         // for this reason each change has to trigger documents update (so that LSP mirror is in sync).
@@ -188,7 +192,7 @@ export class NotebookAdapter extends WidgetAdapter<NotebookPanel> {
         let cellWidget = this.widget.content.widgets.find(
           cell => cell.model.id === cellModel.id
         );
-        this.known_editors_ids.delete(cellWidget.editor.uuid)
+        this.known_editors_ids.delete(cellWidget.editor.uuid);
 
         // for practical purposes this editor got removed from our consideration;
         // it might seem that we should instead look for the editor indicated by
@@ -203,13 +207,12 @@ export class NotebookAdapter extends WidgetAdapter<NotebookPanel> {
         let cellWidget = this.widget.content.widgets.find(
           cell => cell.model.id === cellModel.id
         );
-        this.known_editors_ids.add(cellWidget.editor.uuid)
+        this.known_editors_ids.add(cellWidget.editor.uuid);
 
         this.editorAdded.emit({
           editor: cellWidget.editor
         });
       }
-
     });
   }
 

packages/jupyterlab-lsp/src/editor_integration/testutils.ts

@@ -178,8 +178,7 @@ export namespace IFeatureTestEnvironment {
 type TestEnvironmentConstructor = new (...args: any[]) => ITestEnvironment;
 
 function FeatureSupport<TBase extends TestEnvironmentConstructor>(Base: TBase) {
-  return class FeatureTestEnvironment
-    extends Base
+  return class FeatureTestEnvironment extends Base
     implements IFeatureTestEnvironment {
     _connections: Map<CodeMirrorIntegration, LSPConnection>;
 

packages/jupyterlab-lsp/src/virtual/codemirror_editor.ts

@@ -519,8 +519,10 @@ export class CodeMirrorVirtualEditor
       callback(cm_editor);
     }
     if (monitor_for_new_blocks) {
-
-      let activation_callback = (adapter: WidgetAdapter<IDocumentWidget>, data: IEditorChangedData) => {
+      let activation_callback = (
+        adapter: WidgetAdapter<IDocumentWidget>,
+        data: IEditorChangedData
+      ) => {
         let { editor } = data;
         if (editor == null) {
           return;
@@ -529,9 +531,9 @@ export class CodeMirrorVirtualEditor
         if (!editors_with_handlers.has(cm_editor)) {
           callback(cm_editor);
         }
-      }
+      };
 
-      this.adapter.editorAdded.connect(activation_callback)
+      this.adapter.editorAdded.connect(activation_callback);
       this.adapter.editorRemoved.connect(
         (adapter, data: IEditorChangedData) => {
           let { editor } = data;