fix: opens closed file not the folder in drag/drop

Author: tarikutk

client/src/components/ContentNavigator/ContentDataProvider.ts

@@ -667,20 +667,129 @@ class ContentDataProvider
     if (!targetUri) {
       return false;
     }
-
     const closing = closeFileIfOpen(item);
-    if (!(await closing)) {
+    const closedFiles = await closing;
+    if (!closedFiles) {
       return false;
     }
 
     const newUri = await this.model.moveTo(item, targetUri);
-    if (closing !== true) {
-      commands.executeCommand("vscode.open", newUri);
+    if (Array.isArray(closedFiles) && closedFiles.length > 0) {
+      // Reopen only the files that were closed
+      for (const closedFileUri of closedFiles) {
+        // Calculate the new URI for each closed file
+        const newFileUri = this.calculateNewFileUri(
+          closedFileUri,
+          item,
+          newUri,
+        );
+        if (newFileUri) {
+          commands.executeCommand("vscode.open", newFileUri);
+        }
+      }
     }
 
     return !!newUri;
   }
 
+  private calculateNewFileUri(
+    closedFileUri: Uri,
+    movedItem: ContentItem,
+    newItemUri: boolean | Uri,
+  ): Uri | null {
+    if (typeof newItemUri === "boolean" || !newItemUri) {
+      return null;
+    }
+
+    const isFolder = getIsContainer(movedItem);
+
+    // If the moved item is a file and matches the closed file, return the new URI
+    if (
+      !isFolder &&
+      closedFileUri.toString() === movedItem.vscUri?.toString()
+    ) {
+      return newItemUri;
+    }
+
+    // If the moved item is a folder, calculate the new path for files within it
+    if (isFolder && movedItem.vscUri) {
+      // Extract the actual file system path from the URI query parameters
+      const extractPathFromUri = (uri: string): string => {
+        try {
+          // The URI has double-encoded query parameters, need to decode first
+          const queryStart = uri.indexOf("?");
+          if (queryStart === -1) {
+            return "";
+          }
+
+          const queryString = uri.substring(queryStart + 1);
+
+          // Decode the query string first (it's URL encoded)
+          const decodedQuery = decodeURIComponent(queryString);
+
+          // Now parse the decoded query for id=
+          const idMatch = decodedQuery.match(/id=(.+)/);
+
+          if (idMatch && idMatch[1]) {
+            const idValue = idMatch[1];
+
+            const filesIndex = idValue.indexOf("/files/");
+
+            if (filesIndex !== -1) {
+              const path = idValue.substring(filesIndex + 7); // +7 to skip '/files/'
+              return path;
+            }
+          }
+
+          return "";
+        } catch {
+          return "";
+        }
+      };
+
+      const oldBasePath = extractPathFromUri(movedItem.vscUri.toString());
+      const closedFilePath = extractPathFromUri(closedFileUri.toString());
+
+      // Check if the closed file was inside the moved folder
+      if (
+        oldBasePath &&
+        closedFilePath &&
+        closedFilePath.startsWith(oldBasePath + "~fs~")
+      ) {
+        const relativePath = closedFilePath.substring(oldBasePath.length);
+        const newUriStr = newItemUri.toString();
+
+        try {
+          // Use the working folder URI and just modify the path to include the file
+          const newFolderUri = newUriStr;
+          const filename = relativePath.replace(/^~fs~/, ""); // Remove leading ~fs~
+
+          // Create a URI that matches the original working format exactly
+          const folderQueryMatch = newFolderUri.match(/\?(.+)$/);
+          const folderQuery = folderQueryMatch
+            ? decodeURIComponent(folderQueryMatch[1])
+            : "";
+
+          // Append filename to the files path in the query
+          const newQuery = folderQuery.replace(
+            /(\/files\/[^&]*)/,
+            `$1~fs~${filename}`,
+          );
+
+          // Use the original working format with filename in path
+          const newFileUri = `sasServer:/${filename}?${encodeURIComponent(newQuery)}`;
+
+          const reconstructedUri = Uri.parse(newFileUri);
+          return reconstructedUri;
+        } catch {
+          return null;
+        }
+      }
+    }
+
+    return null;
+  }
+
   private async handleContentItemDrop(
     target: ContentItem,
     item: ContentItem,