Revert "Added code to clean up the temp directory that pyright create…

…s when determining whether the file system is case sensitive. This addresses #4142." This reverts commit c5d1cfc.
microsoft · Nov 5, 2022 · 8daeee2 · 8daeee2
1 parent c5d1cfc
commit 8daeee2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 34 deletions.
diff --git a/packages/pyright-internal/src/common/fileSystem.ts b/packages/pyright-internal/src/common/fileSystem.ts
@@ -53,7 +53,6 @@ export interface TmpfileOptions {
 export interface FileSystem {
     existsSync(path: string): boolean;
     mkdirSync(path: string, options?: MkDirOptions): void;
-    rmdirSync(path: string): void;
     chdir(path: string): void;
     readdirEntriesSync(path: string): fs.Dirent[];
     readdirSync(path: string): string[];

diff --git a/packages/pyright-internal/src/common/pathUtils.ts b/packages/pyright-internal/src/common/pathUtils.ts
@@ -940,18 +940,15 @@ export function isFileSystemCaseSensitive(fs: FileSystem) {
 }
 
 export function isFileSystemCaseSensitiveInternal(fs: FileSystem) {
-    let filePath: string | undefined;
-    let tempDirPath: string | undefined;
-
+    let filePath: string | undefined = undefined;
     try {
         // Make unique file name.
         let name: string;
         let mangledFilePath: string;
         do {
             name = `${randomBytesHex(21)}-a`;
-            tempDirPath = fs.tmpdir();
-            filePath = path.join(tempDirPath, name);
-            mangledFilePath = path.join(tempDirPath, name.toUpperCase());
+            filePath = path.join(fs.tmpdir(), name);
+            mangledFilePath = path.join(fs.tmpdir(), name.toUpperCase());
         } while (fs.existsSync(filePath) || fs.existsSync(mangledFilePath));
 
         fs.writeFileSync(filePath, '', 'utf8');
@@ -962,21 +959,8 @@ export function isFileSystemCaseSensitiveInternal(fs: FileSystem) {
         return false;
     } finally {
         if (filePath) {
-            try {
-                // Remove temp file.
-                fs.unlinkSync(filePath);
-            } catch (e: any) {
-                // Ignore exception.
-            }
-        }
-
-        if (tempDirPath) {
-            try {
-                // Remove temp directory.
-                fs.rmdirSync(tempDirPath);
-            } catch (e: any) {
-                // Ignore exception.
-            }
+            // remove temp file created
+            fs.unlinkSync(filePath);
         }
     }
 }

diff --git a/packages/pyright-internal/src/common/realFileSystem.ts b/packages/pyright-internal/src/common/realFileSystem.ts
@@ -222,10 +222,6 @@ class RealFileSystem implements FileSystem {
         yarnFS.mkdirSync(path, options);
     }
 
-    rmdirSync(path: string) {
-        yarnFS.rmdirSync(path);
-    }
-
     chdir(path: string) {
         process.chdir(path);
     }

diff --git a/packages/pyright-internal/src/pyrightFileSystem.ts b/packages/pyright-internal/src/pyrightFileSystem.ts
@@ -69,10 +69,6 @@ export class PyrightFileSystem
         this._realFS.mkdirSync(path, options);
     }
 
-    override rmdirSync(path: string): void {
-        this._realFS.rmdirSync(path);
-    }
-
     override chdir(path: string): void {
         this._realFS.chdir(path);
     }

diff --git a/packages/pyright-internal/src/readonlyAugmentedFileSystem.ts b/packages/pyright-internal/src/readonlyAugmentedFileSystem.ts
@@ -46,10 +46,6 @@ export class ReadOnlyAugmentedFileSystem implements FileSystem {
         throw new Error('Operation is not allowed.');
     }
 
-    rmdirSync(path: string): void {
-        throw new Error('Operation is not allowed.');
-    }
-
     chdir(path: string): void {
         throw new Error('Operation is not allowed.');
     }