From 9d4ecc4f41bf37c471860cdd4ce40a993262d230 Mon Sep 17 00:00:00 2001 From: lianahus Date: Wed, 21 Jul 2021 14:57:08 +0200 Subject: [PATCH] sending info about folder content --- apps/remix-ide/src/app/files/fileManager.js | 17 ----------- apps/remix-ide/src/app/files/fileProvider.js | 3 -- .../remix-ide/src/app/files/remixDProvider.js | 1 - apps/remix-ide/src/app/panels/tab-proxy.js | 2 -- .../solidity-compiler/src/lib/css/style.css | 1 - libs/remixd/src/services/remixdClient.ts | 30 ++++++++++++++----- 6 files changed, 22 insertions(+), 32 deletions(-) diff --git a/apps/remix-ide/src/app/files/fileManager.js b/apps/remix-ide/src/app/files/fileManager.js index fe8cd8b220..f2d83d3915 100644 --- a/apps/remix-ide/src/app/files/fileManager.js +++ b/apps/remix-ide/src/app/files/fileManager.js @@ -360,11 +360,8 @@ class FileManager extends Plugin { async remove (path) { try { path = this.limitPluginScope(path) - console.log('remove fileManager,js ', path) await this._handleExists(path, `Cannot remove file or directory ${path}`) const provider = this.fileProviderOf(path) - - // this.emit('folderRemoved', path) return await provider.remove(path) } catch (e) { throw new Error(e) @@ -385,7 +382,6 @@ class FileManager extends Plugin { this._deps.browserExplorer.event.on('fileRemoved', (path) => { this.fileRemovedEvent(path) }) this._deps.browserExplorer.event.on('fileAdded', (path) => { this.fileAddedEvent(path) }) this._deps.localhostExplorer.event.on('fileRemoved', (path) => { this.fileRemovedEvent(path) }) - this._deps.localhostExplorer.event.on('folderRemoved', (path) => { this.removeTabsOfPath(path) }) this._deps.localhostExplorer.event.on('errored', (event) => { this.removeTabsOf(this._deps.localhostExplorer) }) this._deps.localhostExplorer.event.on('closed', (event) => { this.removeTabsOf(this._deps.localhostExplorer) }) this._deps.workspaceExplorer.event.on('fileChanged', (path) => { this.fileChangedEvent(path) }) @@ -550,19 +546,6 @@ class FileManager extends Plugin { } } - removeTabsOfPath (path) { - for (const tab in this.openedFiles) { - if (tab.substring(0, path.length) === path) { - console.log('removeTabsOfPath ', path) - if (path === this._deps.config.get('currentFile')) { - this._deps.config.set('currentFile', '') - } - this.editor.discard(path) - delete this.openedFiles[path] - } - } - } - fileRemovedEvent (path) { if (path === this._deps.config.get('currentFile')) { this._deps.config.set('currentFile', '') diff --git a/apps/remix-ide/src/app/files/fileProvider.js b/apps/remix-ide/src/app/files/fileProvider.js index cc837a5efe..c789635160 100644 --- a/apps/remix-ide/src/app/files/fileProvider.js +++ b/apps/remix-ide/src/app/files/fileProvider.js @@ -185,7 +185,6 @@ class FileProvider { window.remixFileSystem.rmdirSync(path, console.log) } this.event.emit('fileRemoved', this._normalizePath(path)) - console.log('file provider remove remove ', path) } } catch (e) { console.log(e) @@ -251,8 +250,6 @@ class FileProvider { if (window.remixFileSystem.existsSync(path) && !window.remixFileSystem.statSync(path).isDirectory()) { window.remixFileSystem.unlinkSync(path, console.log) this.event.emit('fileRemoved', this._normalizePath(path)) - console.log('file provider removefile remove ', path) - return true } else return false } diff --git a/apps/remix-ide/src/app/files/remixDProvider.js b/apps/remix-ide/src/app/files/remixDProvider.js index aab388da37..04b0217df1 100644 --- a/apps/remix-ide/src/app/files/remixDProvider.js +++ b/apps/remix-ide/src/app/files/remixDProvider.js @@ -35,7 +35,6 @@ module.exports = class RemixDProvider extends FileProvider { this._appManager.on('remixd', 'fileRemoved', (path) => { this.event.emit('fileRemoved', path) - console.log('remixd appmanager listener remove ', path) }) this._appManager.on('remixd', 'fileRenamed', (oldPath, newPath) => { diff --git a/apps/remix-ide/src/app/panels/tab-proxy.js b/apps/remix-ide/src/app/panels/tab-proxy.js index ecc6c02022..dba54aef61 100644 --- a/apps/remix-ide/src/app/panels/tab-proxy.js +++ b/apps/remix-ide/src/app/panels/tab-proxy.js @@ -44,8 +44,6 @@ export class TabProxy extends Plugin { fileManager.events.on('fileRemoved', (name) => { const workspace = this.fileManager.currentWorkspace() - console.log('wotk= ', workspace) - console.log('mode= ', this.fileManager.mode) workspace ? this.removeTab(workspace + '/' + name) : this.removeTab(this.fileManager.mode + '/' + name) }) diff --git a/libs/remix-ui/solidity-compiler/src/lib/css/style.css b/libs/remix-ui/solidity-compiler/src/lib/css/style.css index 3846ca0f0f..d2bbe9e606 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/css/style.css +++ b/libs/remix-ui/solidity-compiler/src/lib/css/style.css @@ -103,7 +103,6 @@ } .remixui_container { margin: 0; - margin-bottom: 2%; } .remixui_optimizeContainer { display: flex; diff --git a/libs/remixd/src/services/remixdClient.ts b/libs/remixd/src/services/remixdClient.ts index b65f0fbdb2..7d24c2aae1 100644 --- a/libs/remixd/src/services/remixdClient.ts +++ b/libs/remixd/src/services/remixdClient.ts @@ -180,19 +180,34 @@ export class RemixdClient extends PluginClient { if (!fs.existsSync(path)) return reject(new Error('File not found ' + path)) if (!isRealPath(path)) return - - if (this._isFile(path)) { - this.emit('fileRemoved', path) - console.log('isfile ', path) - } else { - this.emit('folderRemoved', path) - console.log('isFolder ', path) + // Saving the content of the item{folder} before removing it + const ls = [] + try { + const resolveList = (path) => { + if (!this._isFile(path)) { + const list = utils.resolveDirectory(path, this.currentSharedFolder) + Object.keys(list).forEach(itemPath => { + if (list[itemPath].isDirectory) { + resolveList(`${this.currentSharedFolder}${itemPath}`) + } + ls.push(itemPath) + }) + } + } + resolveList(path) + ls.push(args.path) + } catch (e) { + throw new Error(e) } return fs.remove(path, (error: Error) => { if (error) { console.log(error) return reject(new Error('Failed to remove file/directory: ' + error)) } + for (const file in ls) { + this.emit('fileRemoved', ls[file]) + } + resolve(true) }) }) @@ -203,7 +218,6 @@ export class RemixdClient extends PluginClient { _isFile (path: string): boolean { try { - console.log('isfile inside ', path) return fs.statSync(path).isFile() } catch (error) { throw new Error(error)