Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
2b39ec17
Commit
2b39ec17
authored
Jul 01, 2021
by
ioedeveloper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed solidity import test
parent
7fc5e893
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
10 deletions
+33
-10
renderer.tsx
libs/remix-ui/renderer/src/lib/renderer.tsx
+30
-7
solidity-compiler.tsx
.../remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
+3
-3
No files found.
libs/remix-ui/renderer/src/lib/renderer.tsx
View file @
2b39ec17
...
@@ -4,14 +4,17 @@ interface RendererProps {
...
@@ -4,14 +4,17 @@ interface RendererProps {
message
:
any
;
message
:
any
;
opt
?:
any
,
opt
?:
any
,
plugin
:
any
,
plugin
:
any
,
config
:
any
editor
:
any
,
config
:
any
,
fileManager
:
any
}
}
export
const
Renderer
=
({
message
,
opt
=
{},
plugin
,
config
}:
RendererProps
)
=>
{
export
const
Renderer
=
({
message
,
opt
=
{},
editor
,
config
,
fileManager
,
plugin
}:
RendererProps
)
=>
{
const
[
messageText
,
setMessageText
]
=
useState
(
null
)
const
[
messageText
,
setMessageText
]
=
useState
(
null
)
const
[
editorOptions
,
setEditorOptions
]
=
useState
({
const
[
editorOptions
,
setEditorOptions
]
=
useState
({
useSpan
:
false
,
useSpan
:
false
,
type
:
''
type
:
''
,
errFile
:
''
})
})
const
[
classList
]
=
useState
(
opt
.
type
===
'error'
?
'alert alert-danger'
:
'alert alert-warning'
)
const
[
classList
]
=
useState
(
opt
.
type
===
'error'
?
'alert alert-danger'
:
'alert alert-warning'
)
const
[
close
,
setClose
]
=
useState
(
false
)
const
[
close
,
setClose
]
=
useState
(
false
)
...
@@ -79,20 +82,40 @@ export const Renderer = ({ message, opt = {}, plugin, config }: RendererProps) =
...
@@ -79,20 +82,40 @@ export const Renderer = ({ message, opt = {}, plugin, config }: RendererProps) =
}
}
}
}
const
handlePointToErrorOnClick
=
(
location
,
fileName
)
=>
{
const
handleErrorClick
=
(
opt
)
=>
{
plugin
.
call
(
'editor'
,
'discardHighlight'
)
if
(
opt
.
click
)
{
plugin
.
call
(
'editor'
,
'highlight'
,
location
,
fileName
)
opt
.
click
(
message
)
}
else
if
(
opt
.
errFile
!==
undefined
&&
opt
.
errLine
!==
undefined
&&
opt
.
errCol
!==
undefined
)
{
_errorClick
(
opt
.
errFile
,
opt
.
errLine
,
opt
.
errCol
)
}
}
}
const
handleClose
=
()
=>
{
const
handleClose
=
()
=>
{
setClose
(
true
)
setClose
(
true
)
}
}
const
_errorClick
=
(
errFile
,
errLine
,
errCol
)
=>
{
if
(
errFile
!==
config
.
get
(
'currentFile'
))
{
// TODO: refactor with this._components.contextView.jumpTo
const
provider
=
fileManager
.
fileProviderOf
(
errFile
)
if
(
provider
)
{
provider
.
exists
(
errFile
).
then
(()
=>
{
fileManager
.
open
(
errFile
)
editor
.
gotoLine
(
errLine
,
errCol
)
}).
catch
(
error
=>
{
if
(
error
)
return
console
.
log
(
error
)
})
}
}
else
{
editor
.
gotoLine
(
errLine
,
errCol
)
}
}
return
(
return
(
<>
<>
{
{
messageText
&&
!
close
&&
(
messageText
&&
!
close
&&
(
<
div
className=
{
`sol ${editorOptions.type} ${classList}`
}
data
-
id=
{
opt
.
errFile
}
onClick=
{
()
=>
handlePointToErrorOnClick
(
opt
.
location
,
opt
.
fileName
)
}
>
<
div
className=
{
`sol ${editorOptions.type} ${classList}`
}
data
-
id=
{
editorOptions
.
errFile
}
onClick=
{
()
=>
handleErrorClick
(
editorOptions
)
}
>
{
editorOptions
.
useSpan
?
<
span
>
{
messageText
}
</
span
>
:
<
pre
><
span
>
{
messageText
}
</
span
></
pre
>
}
{
editorOptions
.
useSpan
?
<
span
>
{
messageText
}
</
span
>
:
<
pre
><
span
>
{
messageText
}
</
span
></
pre
>
}
<
div
className=
"close"
data
-
id=
"renderer"
onClick=
{
handleClose
}
>
<
div
className=
"close"
data
-
id=
"renderer"
onClick=
{
handleClose
}
>
<
i
className=
"fas fa-times"
></
i
>
<
i
className=
"fas fa-times"
></
i
>
...
...
libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
View file @
2b39ec17
...
@@ -86,15 +86,15 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
...
@@ -86,15 +86,15 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
<
ContractSelection
contractMap=
{
contractMap
}
fileProvider=
{
fileProvider
}
fileManager=
{
fileManager
}
contractsDetails=
{
contractsDetails
}
modal=
{
modal
}
/>
<
ContractSelection
contractMap=
{
contractMap
}
fileProvider=
{
fileProvider
}
fileManager=
{
fileManager
}
contractsDetails=
{
contractsDetails
}
modal=
{
modal
}
/>
<
div
className=
"remixui_errorBlobs p-4"
data
-
id=
"compiledErrors"
>
<
div
className=
"remixui_errorBlobs p-4"
data
-
id=
"compiledErrors"
>
<
span
data
-
id=
{
`compilationFinishedWith_${currentVersion}`
}
></
span
>
<
span
data
-
id=
{
`compilationFinishedWith_${currentVersion}`
}
></
span
>
{
compileErrors
.
error
&&
<
Renderer
message=
{
compileErrors
.
error
.
formattedMessage
||
compileErrors
.
error
}
plugin=
{
plugin
}
opt=
{
{
type
:
compileErrors
.
error
.
severity
||
'error'
,
errorType
:
compileErrors
.
error
.
type
}
}
config=
{
config
}
/>
}
{
compileErrors
.
error
&&
<
Renderer
message=
{
compileErrors
.
error
.
formattedMessage
||
compileErrors
.
error
}
plugin=
{
plugin
}
opt=
{
{
type
:
compileErrors
.
error
.
severity
||
'error'
,
errorType
:
compileErrors
.
error
.
type
}
}
config=
{
config
}
editor=
{
editor
}
fileManager=
{
fileManager
}
/>
}
{
compileErrors
.
error
&&
(
compileErrors
.
error
.
mode
===
'panic'
)
&&
modal
(
'Error'
,
panicMessage
(
compileErrors
.
error
.
formattedMessage
),
'Close'
,
null
)
}
{
compileErrors
.
error
&&
(
compileErrors
.
error
.
mode
===
'panic'
)
&&
modal
(
'Error'
,
panicMessage
(
compileErrors
.
error
.
formattedMessage
),
'Close'
,
null
)
}
{
compileErrors
.
errors
&&
compileErrors
.
errors
.
length
&&
compileErrors
.
errors
.
map
((
err
,
index
)
=>
{
{
compileErrors
.
errors
&&
compileErrors
.
errors
.
length
&&
compileErrors
.
errors
.
map
((
err
,
index
)
=>
{
if
(
config
.
get
(
'hideWarnings'
))
{
if
(
config
.
get
(
'hideWarnings'
))
{
if
(
err
.
severity
!==
'warning'
)
{
if
(
err
.
severity
!==
'warning'
)
{
return
<
Renderer
key=
{
index
}
message=
{
err
.
formattedMessage
}
plugin=
{
plugin
}
opt=
{
{
type
:
err
.
severity
,
errorType
:
err
.
type
}
}
config=
{
config
}
/>
return
<
Renderer
key=
{
index
}
message=
{
err
.
formattedMessage
}
plugin=
{
plugin
}
opt=
{
{
type
:
err
.
severity
,
errorType
:
err
.
type
}
}
config=
{
config
}
editor=
{
editor
}
fileManager=
{
fileManager
}
/>
}
}
}
else
{
}
else
{
return
<
Renderer
key=
{
index
}
message=
{
err
.
formattedMessage
}
plugin=
{
plugin
}
opt=
{
{
type
:
err
.
severity
,
errorType
:
err
.
type
}
}
config=
{
config
}
/>
return
<
Renderer
key=
{
index
}
message=
{
err
.
formattedMessage
}
plugin=
{
plugin
}
opt=
{
{
type
:
err
.
severity
,
errorType
:
err
.
type
}
}
config=
{
config
}
editor=
{
editor
}
fileManager=
{
fileManager
}
/>
}
}
})
}
})
}
</
div
>
</
div
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment