From 8a83cc35aaa1172a0fc82a036e6dbd4157c3d4ac Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 17 Aug 2021 11:25:55 +0200 Subject: [PATCH] remove config parameter --- apps/remix-ide/src/app/tabs/compile-tab.js | 8 +++++++ libs/remix-ui/renderer/src/lib/renderer.tsx | 7 +++--- .../src/lib/compiler-container.tsx | 24 +++++++++---------- .../src/lib/logic/compileTabLogic.ts | 2 +- .../src/lib/solidity-compiler.tsx | 12 +++++----- .../solidity-compiler/src/lib/types/index.ts | 6 ++--- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js index fe70d8f66e..0486159a1d 100644 --- a/apps/remix-ide/src/app/tabs/compile-tab.js +++ b/apps/remix-ide/src/app/tabs/compile-tab.js @@ -284,6 +284,14 @@ class CompileTab extends ViewPlugin { this.queryParams.update(params) } + getConfiguration (name) { + return this.config.get(name) + } + + setConfiguration (name, value) { + this.config.set(name, value) + } + onActivation () { this.call('manager', 'activatePlugin', 'solidity-logic') this.listenToEvents() diff --git a/libs/remix-ui/renderer/src/lib/renderer.tsx b/libs/remix-ui/renderer/src/lib/renderer.tsx index f909d06568..4dbce52da8 100644 --- a/libs/remix-ui/renderer/src/lib/renderer.tsx +++ b/libs/remix-ui/renderer/src/lib/renderer.tsx @@ -4,11 +4,10 @@ interface RendererProps { message: any; opt?: any, plugin: any, - config: any, fileManager: any } -export const Renderer = ({ message, opt = {}, config, fileManager, plugin }: RendererProps) => { +export const Renderer = ({ message, opt = {}, fileManager, plugin }: RendererProps) => { const [messageText, setMessageText] = useState(null) const [editorOptions, setEditorOptions] = useState({ useSpan: false, @@ -76,7 +75,7 @@ export const Renderer = ({ message, opt = {}, config, fileManager, plugin }: Ren } const addAnnotation = (file, error) => { - if (file === config.get('currentFile')) { + if (file === plugin.getConfiguration('currentFile')) { plugin.call('editor', 'addAnnotation', error, file) } } @@ -94,7 +93,7 @@ export const Renderer = ({ message, opt = {}, config, fileManager, plugin }: Ren } const _errorClick = (errFile, errLine, errCol) => { - if (errFile !== config.get('currentFile')) { + if (errFile !== plugin.getConfiguration('currentFile')) { // TODO: refactor with this._components.contextView.jumpTo const provider = fileManager.fileProviderOf(errFile) if (provider) { diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx index cf6ceba0dc..b63213d364 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx @@ -18,7 +18,7 @@ declare global { const _paq = window._paq = window._paq || [] //eslint-disable-line export const CompilerContainer = (props: CompilerContainerProps) => { - const { api, config, compileTabLogic, tooltip, modal, compiledFileName, setHardHatCompilation, updateCurrentVersion, isHardHatProject, configurationSettings } = props // eslint-disable-line + const { api, compileTabLogic, tooltip, modal, compiledFileName, setHardHatCompilation, updateCurrentVersion, isHardHatProject, configurationSettings } = props // eslint-disable-line const [state, setState] = useState({ hideWarnings: false, autoCompile: false, @@ -56,7 +56,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { _updateVersionSelector(selectedVersion) } }) - const currentFileName = config.get('currentFile') + const currentFileName = api.getConfiguration('currentFile') currentFile(currentFileName) listenToEvents(compileTabLogic)(dispatch) @@ -72,10 +72,10 @@ export const CompilerContainer = (props: CompilerContainerProps) => { return { ...prevState, - hideWarnings: config.get('hideWarnings') || false, - autoCompile: config.get('autoCompile') || false, - includeNightlies: config.get('includeNightlies') || false, - optimise: (optimize !== null) && (optimize !== undefined) ? optimize : config.get('optimise') || false, + hideWarnings: api.getConfiguration('hideWarnings') || false, + autoCompile: api.getConfiguration('autoCompile') || false, + includeNightlies: api.getConfiguration('includeNightlies') || false, + optimise: (optimize !== null) && (optimize !== undefined) ? optimize : api.getConfiguration('optimise') || false, runs: (runs !== null) && (runs !== 'null') && (runs !== undefined) && (runs !== 'undefined') ? runs : 200, evmVersion: (evmVersion !== null) && (evmVersion !== 'null') && (evmVersion !== undefined) && (evmVersion !== 'undefined') ? evmVersion : 'default' } @@ -228,7 +228,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { } const isSolFileSelected = (currentFile = '') => { - if (!currentFile) currentFile = config.get('currentFile') + if (!currentFile) currentFile = api.getConfiguration('currentFile') if (!currentFile) return false const extention = currentFile.substr(currentFile.length - 3, currentFile.length) return extention.toLowerCase() === 'sol' || extention.toLowerCase() === 'yul' @@ -297,7 +297,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { } const compile = () => { - const currentFile = config.get('currentFile') + const currentFile = api.getConfiguration('currentFile') if (!isSolFileSelected()) return @@ -406,7 +406,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { const handleAutoCompile = (e) => { const checked = e.target.checked - config.set('autoCompile', checked) + api.setConfiguration('autoCompile', checked) setState(prevState => { return { ...prevState, autoCompile: checked } }) @@ -415,7 +415,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { const handleOptimizeChange = (value) => { const checked = !!value - config.set('optimise', checked) + api.setConfiguration('optimise', checked) compileTabLogic.setOptimize(checked) if (compileTabLogic.optimize) { compileTabLogic.setRuns(parseInt(state.runs)) @@ -441,7 +441,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { const handleHideWarningsChange = (e) => { const checked = e.target.checked - config.set('hideWarnings', checked) + api.setConfiguration('hideWarnings', checked) state.autoCompile && compile() setState(prevState => { return { ...prevState, hideWarnings: checked } @@ -452,7 +452,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { const checked = e.target.checked if (!checked) handleLoadVersion(state.defaultVersion) - config.set('includeNightlies', checked) + api.setConfiguration('includeNightlies', checked) setState(prevState => { return { ...prevState, includeNightlies: checked } }) diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts index cded031940..764086b55b 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts @@ -124,7 +124,7 @@ export class CompileTab extends Plugin { } this.fileManager.saveCurrentFile() this.event.emit('removeAnnotations') - var currentFile = this.config.get('currentFile') + var currentFile = this.api.getConfiguration('currentFile') return this.compileFile(currentFile) } catch (err) { console.error(err) diff --git a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx index 35b96ee48e..9c2e2130c7 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx @@ -9,7 +9,7 @@ import { Renderer } from '@remix-ui/renderer' // eslint-disable-line import './css/style.css' export const SolidityCompiler = (props: SolidityCompilerProps) => { - const { plugin, plugin: { config, compileTabLogic, currentFile, fileProvider, fileManager, contractsDetails, contractMap, compileErrors, isHardHatProject, setHardHatCompilation, configurationSettings } } = props + const { plugin, plugin: { compileTabLogic, currentFile, fileProvider, fileManager, contractsDetails, contractMap, compileErrors, isHardHatProject, setHardHatCompilation, configurationSettings } } = props const [state, setState] = useState({ contractsDetails: {}, eventHandlers: {}, @@ -78,19 +78,19 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => { return ( <>
- +
- { compileErrors.error && } + { compileErrors.error && } { compileErrors.error && (compileErrors.error.mode === 'panic') && modal('Error', panicMessage(compileErrors.error.formattedMessage), 'Close', null) } { compileErrors.errors && compileErrors.errors.length && compileErrors.errors.map((err, index) => { - if (config.get('hideWarnings')) { + if (plugin.getConfiguration('hideWarnings')) { if (err.severity !== 'warning') { - return + return } } else { - return + return } }) }
diff --git a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts index f2701bc08c..b0fa52ba71 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts @@ -8,7 +8,6 @@ export interface SolidityCompilerProps { compileTabLogic: any, currentFile: string, contractsDetails: Record, - config: any, fileProvider: any, fileManager: any, contentImport: any, @@ -16,13 +15,14 @@ export interface SolidityCompilerProps { on: (...args) => void, setHardHatCompilation: (value: boolean) => void, setSelectedVersion: (value: string) => void, - configurationSettings: ConfigurationSettings + configurationSettings: ConfigurationSettings, + getConfiguration: (value: string) => string, + setConfiguration: (name: string, value: string) => void }, } export interface CompilerContainerProps { api: any, - config: any, compileTabLogic: any, tooltip: (message: string | JSX.Element) => void, modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,