fix OOB change after IB move, thanks @3coins

Author: dlqqq

jupyter_server_documents/rooms/yroom_file_api.py

@@ -155,7 +155,6 @@ def load_ydoc_content(self) -> None:
         if self._ydoc_content_loaded.is_set() or self._ydoc_content_loading:
             return
 
-        self.log.info(f"Loading content for room ID '{self.room_id}'.")
         self._ydoc_content_loading = True
         self._loop.create_task(self._load_ydoc_content())
 
@@ -168,6 +167,7 @@ async def _load_ydoc_content(self) -> None:
         self._last_path = path
 
         # Load the content of the file from the path
+        self.log.info(f"Loading content for room ID '{self.room_id}', found at path: '{path}'.")
         file_data = await ensure_async(self._contents_manager.get(
             path,
             type=self.file_type,

src/docprovider/yprovider.ts

@@ -140,16 +140,49 @@ export class WebSocketProvider implements IDocumentProvider {
     this._connect();
   }
 
+  /**
+   * Gets the file ID for this path. This should only be called once when the
+   * provider connects for the first time, because any future in-band moves may
+   * cause `this._path` to not refer to the correct file.
+   */
+  private async _getFileId(): Promise<string | null> {
+    let fileId: string | null = null;
+    try {
+      const resp = await requestAPI(`api/fileid/index?path=${this._path}`, {
+        method: 'POST'
+      });
+      if (resp && 'id' in resp && typeof resp['id'] === 'string') {
+        fileId = resp['id'];
+      }
+    } catch (e) {
+      console.error(`Could not get file ID for path '${this._path}'.`);
+      return null;
+    }
+    return fileId;
+  }
+
   private async _connect(): Promise<void> {
-    // Fetch file ID from the file ID service.
-    const resp = await requestAPI(`api/fileid/index?path=${this._path}`, {
-      method: 'POST'
-    });
-    const fileId: string = resp['id'];
+    // Fetch file ID from the file ID service, if not cached
+    if (!this._fileId) {
+      this._fileId = await this._getFileId();
+    }
+
+    // If file ID could not be retrieved, show an error dialog asking for a bug
+    // report, as this error is irrecoverable.
+    if (!this._fileId) {
+      showErrorMessage(
+        this._trans.__('File ID error'),
+        `The file '${this._path}' cannot be opened because its file ID could not be retrieved. Please report this issue on GitHub.`,
+        [Dialog.okButton()]
+      );
+      return;
+    }
 
+    // Otherwise, initialize the `YWebsocketProvider` to connect
+    console.log({ fileId: this._fileId });
     this._yWebsocketProvider = new YWebsocketProvider(
       this._serverUrl,
-      `${this._format}:${this._contentType}:${fileId}`,
+      `${this._format}:${this._contentType}:${this._fileId}`,
       this._sharedModel.ydoc,
       {
         disableBc: true,
@@ -305,6 +338,7 @@ export class WebSocketProvider implements IDocumentProvider {
   private _sharedModel: YDocument<DocumentChange>;
   private _yWebsocketProvider: YWebsocketProvider | null;
   private _trans: TranslationBundle;
+  private _fileId: string | null = null;
 }
 
 /**