diff --git a/Makefile.dryice.js b/Makefile.dryice.js index 3dbaa3de616..2d4596dee98 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -177,6 +177,8 @@ function ace() { for (var i = 0; i < 4; i++) { buildAce({compress: i & 2, noconflict: i & 1, check: true}); } + + copy.dirs(ACE_HOME + "/node_modules/ace-legacy-linters/build", BUILD_DIR, ["src", "src-min", "src-noconflict", "src-min-noconflict"]); } function correctDeclarationsForBuild(path, additionalDeclarations) { diff --git a/Readme.md b/Readme.md index da6f1a15a97..a4df9550500 100644 --- a/Readme.md +++ b/Readme.md @@ -26,6 +26,7 @@ Features * Code folding * Multiple cursors and selections * Live syntax checker (currently JavaScript/CoffeeScript/CSS/XQuery) +* Full language client support for many languages available via [ace-linters](https://github.com/mkslanc/ace-linters) * Cut, copy, and paste functionality Take Ace for a spin! diff --git a/demo/kitchen-sink/require.js b/demo/kitchen-sink/require.js index 5c5e56cfaae..31bf3893923 100644 --- a/demo/kitchen-sink/require.js +++ b/demo/kitchen-sink/require.js @@ -502,7 +502,7 @@ if (!/^\w+:/.test(path)) path = host + path; var onLoad = function(e, val) { if (e) return processLoadQueue({id: id, path: path}); - if (!/^(\s|\/\*([^*]|[*](?!\/))*\*\/|\/\/.*[\r]?\n)*define\s*\(\s*function\s*\(\s*require\b/.test(val) && !/define\(\[\],/.test(val)) + if (!/^(\s|\/\*([^*]|[*](?!\/))*\*\/|\/\/.*[\r]?\n)*define\s*\(\s*function\s*\(\s*require\b/.test(val) && !/define\(\[\],/.test(val) && !/ace\-legacy\-linters/.test(path)) val = "define(function(require, exports, module){" + val + "\n});" nextModule = {name: id}; /* eslint no-eval:0 */ diff --git a/index.html b/index.html index a7733c1e4a0..eb4575cab90 100644 --- a/index.html +++ b/index.html @@ -104,6 +104,7 @@