async await

pull/1622/head
filip mertens 3 years ago
parent 613395f79d
commit d31fff14f2
  1. 2
      apps/remix-ide/src/app.js
  2. 10
      apps/remix-ide/src/app/files/fileManager.js
  3. 4
      apps/remix-ide/src/app/panels/main-view.js

@ -256,7 +256,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
// ----------------- editor service ---------------------------- // ----------------- editor service ----------------------------
const editor = new Editor({}, themeModule) // wrapper around ace editor const editor = new Editor({}, themeModule) // wrapper around ace editor
registry.put({ api: editor, name: 'editor' }) registry.put({ api: editor, name: 'editor' })
editor.event.register('requiringToSaveCurrentfile', () => fileManager.saveCurrentFile()) editor.event.register('requiringToSaveCurrentfile', async () => await fileManager.saveCurrentFile())
// ----------------- fileManager service ---------------------------- // ----------------- fileManager service ----------------------------
const fileManager = new FileManager(editor, appManager) const fileManager = new FileManager(editor, appManager)

@ -601,8 +601,8 @@ class FileManager extends Plugin {
this.openFile() this.openFile()
} }
unselectCurrentFile () { async unselectCurrentFile () {
this.saveCurrentFile() await this.saveCurrentFile()
this._deps.config.set('currentFile', '') this._deps.config.set('currentFile', '')
// TODO: Only keep `this.emit` (issue#2210) // TODO: Only keep `this.emit` (issue#2210)
this.emit('noFileSelected') this.emit('noFileSelected')
@ -614,7 +614,7 @@ class FileManager extends Plugin {
this.emit('noFileSelected') this.emit('noFileSelected')
this.events.emit('noFileSelected') this.events.emit('noFileSelected')
} else { } else {
this.saveCurrentFile() await this.saveCurrentFile()
const resolved = this.getPathFromUrl(file) const resolved = this.getPathFromUrl(file)
file = resolved.file file = resolved.file
const provider = resolved.provider const provider = resolved.provider
@ -707,14 +707,14 @@ class FileManager extends Plugin {
return this.appManager.isActive('remixd') return this.appManager.isActive('remixd')
} }
saveCurrentFile () { async saveCurrentFile () {
var currentFile = this._deps.config.get('currentFile') var currentFile = this._deps.config.get('currentFile')
if (currentFile && this.editor.current()) { if (currentFile && this.editor.current()) {
var input = this.editor.get(currentFile) var input = this.editor.get(currentFile)
if ((input !== null) && (input !== undefined)) { if ((input !== null) && (input !== undefined)) {
var provider = this.fileProviderOf(currentFile) var provider = this.fileProviderOf(currentFile)
if (provider) { if (provider) {
provider.set(currentFile, input) await provider.set(currentFile, input)
this.emit('fileSaved', currentFile) this.emit('fileSaved', currentFile)
} else { } else {
console.log('cannot save ' + currentFile + '. Does not belong to any explorer') console.log('cannot save ' + currentFile + '. Does not belong to any explorer')

@ -35,8 +35,8 @@ export class MainView {
this.init() this.init()
} }
showApp (name) { async showApp (name) {
this.fileManager.unselectCurrentFile() await this.fileManager.unselectCurrentFile()
this.mainPanel.showContent(name) this.mainPanel.showContent(name)
this._view.editor.style.display = 'none' this._view.editor.style.display = 'none'
this._components.contextView.hide() this._components.contextView.hide()

Loading…
Cancel
Save