Commit cc5378ba authored by yann300's avatar yann300 Committed by Aniket

linting

parent 91932c2a
...@@ -79,19 +79,18 @@ module.exports = { ...@@ -79,19 +79,18 @@ module.exports = {
.testContracts('test_import_node_modules_with_github_import.sol', sources[4]['test_import_node_modules_with_github_import.sol'], ['ERC20', 'test11']) .testContracts('test_import_node_modules_with_github_import.sol', sources[4]['test_import_node_modules_with_github_import.sol'], ['ERC20', 'test11'])
}, },
'Static Analysis run with remixd': function (browser) { 'Static Analysis run with remixd': function (browser) {
browser.testContracts('Untitled.sol', sources[5]['test_static_analysis_with_remixd_and_hardhat'], ['test5']) browser.testContracts('test_static_analysis_with_remixd_and_hardhat.sol', sources[5]['test_static_analysis_with_remixd_and_hardhat.sol'], ['test5'])
.clickLaunchIcon('solidityStaticAnalysis') .clickLaunchIcon('solidityStaticAnalysis')
.click('#staticanalysisButton button') .click('#staticanalysisButton button')
.waitForElementPresent('#staticanalysisresult .warning', 2000, true, function () { .waitForElementPresent('#staticanalysisresult .warning', 2000, true, function () {
browser browser
.click('[data-id="staticAnalysisModuleMiscellaneous1"') .click('[data-id="staticAnalysisModuleMiscellaneous1"')
.click('[data-id="staticAnalysisModuleMiscellaneous1"') .getEditorValue((content) => {
.getEditorValue((content) => { browser.assert.ok(content.indexOf(
browser.assert.ok(content.indexOf( 'function _sendLogPayload(bytes memory payload) private view {') !== -1,
'function _sendLogPayload(bytes memory payload) private view {') !== -1, 'code has not been loaded')
'code has not been loaded') })
}) })
})
}, },
'Run git status': '' + function (browser) { 'Run git status': '' + function (browser) {
......
...@@ -545,29 +545,29 @@ class FileManager extends Plugin { ...@@ -545,29 +545,29 @@ class FileManager extends Plugin {
/** /**
* Try to resolve the given file path (the actual path in the file system) * Try to resolve the given file path (the actual path in the file system)
* e.g if it's specified a github link, npm library, or any external content, * e.g if it's specified a github link, npm library, or any external content,
* it returns the actual path where the content can be found. * it returns the actual path where the content can be found.
* @param {string} file url we are trying to resolve * @param {string} file url we are trying to resolve
* @returns {{ string, provider }} file path resolved and its provider. * @returns {{ string, provider }} file path resolved and its provider.
*/ */
getPathFromUrl (file) { getPathFromUrl (file) {
const provider = this.fileProviderOf(file) const provider = this.fileProviderOf(file)
if (!provider) throw new Error(`no provider for ${file}`) if (!provider) throw new Error(`no provider for ${file}`)
return { return {
file: provider.getPathFromUrl(file) || file, // in case an external URL is given as input, we resolve it to the right internal path file: provider.getPathFromUrl(file) || file, // in case an external URL is given as input, we resolve it to the right internal path
provider provider
} }
} }
/** /**
* Try to resolve the given file URl. opposite of getPathFromUrl * * Try to resolve the given file URl. opposite of getPathFromUrl
* @param {string} file path we are trying to resolve * @param {string} file path we are trying to resolve
* @returns {{ string, provider }} file url resolved and its provider. * @returns {{ string, provider }} file url resolved and its provider.
*/ */
getUrlFromPath (file) { getUrlFromPath (file) {
const provider = this.fileProviderOf(file) const provider = this.fileProviderOf(file)
if (!provider) throw new Error(`no provider for ${file}`) if (!provider) throw new Error(`no provider for ${file}`)
return { return {
file: provider.getUrlFromPath(file) || file, // in case an external URL is given as input, we resolve it to the right internal path file: provider.getUrlFromPath(file) || file, // in case an external URL is given as input, we resolve it to the right internal path
provider provider
} }
......
...@@ -40,7 +40,7 @@ class FileProvider { ...@@ -40,7 +40,7 @@ class FileProvider {
} }
getUrlFromPath (path) { getUrlFromPath (path) {
if (!path.startsWith(this.type)) path = this.type + '/' + path if (!path.startsWith(this.type)) path = this.type + '/' + path
return this.providerExternalsStorage.get(path) return this.providerExternalsStorage.get(path)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment