Opening file with same name but different folder appends a suffix to …

…the filename (fix #143414)
microsoft · Mar 2, 2022 · 6f906f3 · 6f906f3
1 parent eca9017
commit 6f906f3
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/vs/platform/files/browser/htmlFileSystemProvider.ts b/src/vs/platform/files/browser/htmlFileSystemProvider.ts
@@ -10,7 +10,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { Event } from 'vs/base/common/event';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
-import { normalize } from 'vs/base/common/path';
+import { basename, extname, normalize } from 'vs/base/common/path';
 import { isLinux } from 'vs/base/common/platform';
 import { extUri, extUriIgnorePathCase } from 'vs/base/common/resources';
 import { newWriteableStream, ReadableStreamEvents } from 'vs/base/common/stream';
@@ -314,9 +314,12 @@ export class HTMLFileSystemProvider implements IFileSystemProviderWithFileReadWr
 
 		// Compute a valid handle ID in case this exists already
 		if (map.has(handleId) && !await map.get(handleId)?.isSameEntry(handle)) {
-			let handleIdCounter = 2;
+			const fileExt = extname(handle.name);
+			const fileName = basename(handle.name, fileExt);
+
+			let handleIdCounter = 1;
 			do {
-				handleId = `/${handle.name}-${handleIdCounter++}`;
+				handleId = `/${fileName}-${handleIdCounter++}${fileExt}`;
 			} while (map.has(handleId) && !await map.get(handleId)?.isSameEntry(handle));
 		}