Merge pull request #1360 from ethereum/bunsenstraat-patch-1-1

prevent recreating directories after deleting a file in a deleted directory

Merge pull request #1360 from ethereum/bunsenstraat-patch-1-1
b9f73858 · bunsenstraat · GitHub · 02427032 · d95a0404 · b9f73858
Unverified Commit b9f73858 authored Jul 06, 2021 by bunsenstraat Committed by GitHub Jul 06, 2021
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

fileSystem.ts libs/remix-ui/file-explorer/src/lib/reducers/fileSystem.ts +3 -2

No files found.
--- a/libs/remix-ui/file-explorer/src/lib/reducers/fileSystem.ts
+++ b/libs/remix-ui/file-explorer/src/lib/reducers/fileSystem.ts
@@ -266,8 +266,8 @@ const removePath = (root, path: string, pathName, files) => {
    return Array.isArray(cur) ? [...acc, ...cur] : [...acc, cur]
  }, [])
  const prevFiles = _.get(files, _path)
-
-  prevFiles && prevFiles.child && prevFiles.child[pathName] && delete prevFiles.child[pathName]
+  if (prevFiles) {
+    prevFiles.child && prevFiles.child[pathName] && delete prevFiles.child[pathName]
    files = _.set(files, _path, {
      isDirectory: true,
      path,
@@ -275,6 +275,7 @@ const removePath = (root, path: string, pathName, files) => {
      type: extractNameFromKey(path).indexOf('gist-') === 0 ? 'gist' : 'folder',
      child: prevFiles ? prevFiles.child : {}
    })
+  }

  return files
 }