Skip to content

Commit

Permalink
showing json javascript lua and coffee all with error annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
thlorenz committed Apr 23, 2013
1 parent 6b3a0e2 commit b226203
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 3 deletions.
2 changes: 1 addition & 1 deletion example/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var browserify = require('browserify')
browserify()
.require(require.resolve('./javascript-editor'), { entry: true })
.require(require.resolve('./coffee-editor'), { entry: true })
.require(require.resolve('./css-editor'), { entry: true })
.require(require.resolve('./json-editor'), { entry: true })
.require(require.resolve('./lua-editor'), { entry: true })
.bundle({ debug: true })
.pipe(fs.createWriteStream(__dirname + '/bundle.js'));
9 changes: 9 additions & 0 deletions example/coffee-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,12 @@ require('brace/theme/vibrant_ink');
var editor = ace.edit('coffee-editor');
editor.setTheme('ace/theme/vibrant_ink');
editor.getSession().setMode('ace/mode/coffee');
editor.setValue([
'# Coffee'
, 'square = (x) -> x * x'
, ''
, '# below line has an error which is annotated'
, 'square = x -> x * '
].join('\n')
);
editor.clearSelection();
2 changes: 1 addition & 1 deletion example/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ div.editor {
bottom: 0;
}

#css-editor {
#json-editor {
top: 0;
left: 50%;
bottom: 0;
Expand Down
2 changes: 1 addition & 1 deletion example/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1>Ace Editors provided by brace</h1>
<div id="wrapper">
<div id="javascript-editor" class="editor"></div>
<div id="coffee-editor" class="editor"></div>
<div id="css-editor" class="editor"></div>
<div id="json-editor" class="editor"></div>
<div id="lua-editor" class="editor"></div><]
</div>
<script type="text/javascript" src="./bundle.js"></script>
Expand Down
9 changes: 9 additions & 0 deletions example/javascript-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,12 @@ require('brace/theme/monokai');
var editor = ace.edit('javascript-editor');
editor.getSession().setMode('ace/mode/javascript');
editor.setTheme('ace/theme/monokai');
editor.setValue([
'// JavaScript'
, 'var a = 3;'
, ''
, '// below line has an error which is annotated'
, 'var b ='
].join('\n')
);
editor.clearSelection();
16 changes: 16 additions & 0 deletions example/json-editor.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
var ace = require('brace');
require('brace/mode/json');
require('brace/theme/solarized_light');

var editor = ace.edit('json-editor');
editor.getSession().setMode('ace/mode/json');
editor.setTheme('ace/theme/solarized_light');
editor.setValue([
'{'
, ' "language": "JSON",'
, ' "foo": "bar",'
, ' "trailing": "comma",'
, '}'
].join('\n')
);
editor.clearSelection();
10 changes: 10 additions & 0 deletions example/lua-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,13 @@ require('brace/theme/solarized_dark');
var editor = ace.edit('lua-editor');
editor.setTheme('ace/theme/solarized_dark');
editor.getSession().setMode('ace/mode/lua');
editor.setValue([
'--- Lua'
, 'for i = 5, 11, 0.5 do'
, ' print(i)'
, 'end'
, '--- error below should be marked'
, 'for i ='
].join('\n')
);
editor.clearSelection();

0 comments on commit b226203

Please sign in to comment.