From 89d35a20238f691b200d02c69f7e27a76f61cae0 Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Wed, 16 Mar 2022 15:23:39 +0100
Subject: [PATCH] Move isSubDirectory function to fileProvider class.

---
 apps/remix-ide/src/app/files/fileProvider.js          | 9 +++++++++
 apps/remix-ide/src/app/files/remixDProvider.js        | 9 ---------
 apps/remix-ide/src/app/files/workspaceFileProvider.js | 8 --------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/apps/remix-ide/src/app/files/fileProvider.js b/apps/remix-ide/src/app/files/fileProvider.js
index 2176bc53b8..61e751ee62 100644
--- a/apps/remix-ide/src/app/files/fileProvider.js
+++ b/apps/remix-ide/src/app/files/fileProvider.js
@@ -3,6 +3,7 @@
 import { CompilerImports } from '@remix-project/core-plugin'
 const EventManager = require('events')
 const remixLib = require('@remix-project/remix-lib')
+const pathModule = require('path')
 const Storage = remixLib.Storage
 
 class FileProvider {
@@ -308,6 +309,14 @@ class FileProvider {
   _normalizePath (path) {
     return this.type + path
   }
+
+  isSubDirectory (parent, child) {
+    if (!parent) return false
+    if (parent === child) return true
+    const relative = pathModule.relative(parent, child)
+
+    return !!relative && relative.split(pathModule.sep)[0] !== '..'
+  }
 }
 
 module.exports = FileProvider
diff --git a/apps/remix-ide/src/app/files/remixDProvider.js b/apps/remix-ide/src/app/files/remixDProvider.js
index 27e4534263..c52055e04f 100644
--- a/apps/remix-ide/src/app/files/remixDProvider.js
+++ b/apps/remix-ide/src/app/files/remixDProvider.js
@@ -1,6 +1,5 @@
 'use strict'
 const FileProvider = require('./fileProvider')
-const pathModule = require('path')
 
 module.exports = class RemixDProvider extends FileProvider {
   constructor (appManager) {
@@ -208,12 +207,4 @@ module.exports = class RemixDProvider extends FileProvider {
     if (!this._isReady) throw new Error('provider not ready')
     return await this._appManager.call('remixd', 'isFile', { path: unprefixedpath })
   }
-
-  isSubDirectory (parent, child) {
-    if (!parent) return false
-    if (parent === child) return true
-    const relative = pathModule.relative(parent, child)
-
-    return !!relative && relative.split(pathModule.sep)[0] !== '..'
-  }
 }
diff --git a/apps/remix-ide/src/app/files/workspaceFileProvider.js b/apps/remix-ide/src/app/files/workspaceFileProvider.js
index 505be72b8c..3fcd635fcf 100644
--- a/apps/remix-ide/src/app/files/workspaceFileProvider.js
+++ b/apps/remix-ide/src/app/files/workspaceFileProvider.js
@@ -49,14 +49,6 @@ class WorkspaceFileProvider extends FileProvider {
     return ret
   }
 
-  isSubDirectory (parent, child) {
-    if (!parent) return false
-    if (parent === child) return true
-    const relative = pathModule.relative(parent, child)
-
-    return !!relative && relative.split(pathModule.sep)[0] !== '..'
-  }
-
   resolveDirectory (path, callback) {
     super.resolveDirectory(path, (error, files) => {
       if (error) return callback(error)