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
e35278c0
Commit
e35278c0
authored
Jun 27, 2018
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
renderer
parent
d47f748f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
27 deletions
+38
-27
app.js
src/app.js
+1
-23
renderer.js
src/app/ui/renderer.js
+37
-4
No files found.
src/app.js
View file @
e35278c0
...
@@ -569,29 +569,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
...
@@ -569,29 +569,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
}
}
// ----------------- Renderer -----------------
// ----------------- Renderer -----------------
var
rendererAPI
=
{
var
renderer
=
new
Renderer
()
error
:
(
file
,
error
)
=>
{
if
(
file
===
config
.
get
(
'currentFile'
))
{
editor
.
addAnnotation
(
error
)
}
},
errorClick
:
(
errFile
,
errLine
,
errCol
)
=>
{
if
(
errFile
!==
config
.
get
(
'currentFile'
))
{
// TODO: refactor with this._components.contextView.jumpTo
var
provider
=
fileManager
.
fileProviderOf
(
errFile
)
if
(
provider
)
{
provider
.
exists
(
errFile
,
(
error
,
exist
)
=>
{
if
(
error
)
return
console
.
log
(
error
)
fileManager
.
switchFile
(
errFile
)
editor
.
gotoLine
(
errLine
,
errCol
)
})
}
}
else
{
editor
.
gotoLine
(
errLine
,
errCol
)
}
}
}
var
renderer
=
new
Renderer
(
rendererAPI
)
registry
.
put
({
api
:
renderer
,
name
:
'renderer'
})
registry
.
put
({
api
:
renderer
,
name
:
'renderer'
})
// ----------------- StaticAnalysis -----------------
// ----------------- StaticAnalysis -----------------
...
...
src/app/ui/renderer.js
View file @
e35278c0
...
@@ -3,19 +3,52 @@
...
@@ -3,19 +3,52 @@
var
$
=
require
(
'jquery'
)
var
$
=
require
(
'jquery'
)
var
yo
=
require
(
'yo-yo'
)
var
yo
=
require
(
'yo-yo'
)
var
css
=
require
(
'./styles/renderer-styles'
)
var
css
=
require
(
'./styles/renderer-styles'
)
var
globlalRegistry
=
require
(
'../../global/registry'
)
/**
/**
* After refactor, the renderer is only used to render error/warning
* After refactor, the renderer is only used to render error/warning
* TODO: This don't need to be an object anymore. Simplify and just export the renderError function.
* TODO: This don't need to be an object anymore. Simplify and just export the renderError function.
*
*
*/
*/
function
Renderer
(
appAPI
)
{
function
Renderer
(
localRegistry
)
{
this
.
appAPI
=
appAPI
const
self
=
this
self
.
_components
=
{}
self
.
_components
.
registry
=
localRegistry
||
globlalRegistry
// dependencies
self
.
_deps
=
{
editor
:
self
.
_components
.
registry
.
get
(
'editor'
).
api
,
fileManager
:
self
.
_components
.
registry
.
get
(
'filemanager'
).
api
,
config
:
self
.
_components
.
registry
.
get
(
'config'
).
api
}
if
(
document
&&
document
.
head
)
{
if
(
document
&&
document
.
head
)
{
document
.
head
.
appendChild
(
css
)
document
.
head
.
appendChild
(
css
)
}
}
}
}
Renderer
.
prototype
.
_error
=
function
(
file
,
error
)
{
const
self
=
this
if
(
file
===
self
.
_deps
.
config
.
get
(
'currentFile'
))
{
self
.
_deps
.
editor
.
addAnnotation
(
error
)
}
}
Renderer
.
prototype
.
_errorClick
=
function
(
errFile
,
errLine
,
errCol
)
{
const
self
=
this
if
(
errFile
!==
self
.
_deps
.
config
.
get
(
'currentFile'
))
{
// TODO: refactor with this._components.contextView.jumpTo
var
provider
=
self
.
_deps
.
fileManager
.
fileProviderOf
(
errFile
)
if
(
provider
)
{
provider
.
exists
(
errFile
,
(
error
,
exist
)
=>
{
if
(
error
)
return
console
.
log
(
error
)
self
.
_deps
.
fileManager
.
switchFile
(
errFile
)
self
.
_deps
.
editor
.
gotoLine
(
errLine
,
errCol
)
})
}
}
else
{
self
.
_deps
.
editor
.
gotoLine
(
errLine
,
errCol
)
}
}
/**
/**
* format msg like error or warning,
* format msg like error or warning,
*
*
...
@@ -45,7 +78,7 @@ Renderer.prototype.error = function (message, container, opt) {
...
@@ -45,7 +78,7 @@ Renderer.prototype.error = function (message, container, opt) {
}
}
if
(
!
opt
.
noAnnotations
&&
errLocation
)
{
if
(
!
opt
.
noAnnotations
&&
errLocation
)
{
this
.
appAPI
.
error
(
errLocation
.
errFile
,
{
this
.
_
error
(
errLocation
.
errFile
,
{
row
:
errLocation
.
errLine
,
row
:
errLocation
.
errLine
,
column
:
errLocation
.
errCol
,
column
:
errLocation
.
errCol
,
text
:
text
,
text
:
text
,
...
@@ -60,7 +93,7 @@ Renderer.prototype.error = function (message, container, opt) {
...
@@ -60,7 +93,7 @@ Renderer.prototype.error = function (message, container, opt) {
$error
.
click
((
ev
)
=>
{
$error
.
click
((
ev
)
=>
{
if
(
opt
.
errFile
&&
opt
.
errLine
)
{
if
(
opt
.
errFile
&&
opt
.
errLine
)
{
this
.
appAPI
.
errorClick
(
opt
.
errFile
,
opt
.
errLine
,
opt
.
errCol
)
this
.
_
errorClick
(
opt
.
errFile
,
opt
.
errLine
,
opt
.
errCol
)
}
else
if
(
opt
.
click
)
{
}
else
if
(
opt
.
click
)
{
opt
.
click
(
message
)
opt
.
click
(
message
)
}
}
...
...
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