jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1082 from ajaxorg/worker

Browse source 
update jshint and csslint
This commit is contained in:
Mostafa Eweda 2012-11-06 15:18:37 -08:00
commit 48f06449f5
6 changed files with 4401 additions and 4623 deletions
Download patch file Download diff file Expand all files Collapse all files

4
demo/kitchen-sink/demo.js
View file

@ -54,10 +54,6 @@ var Renderer = require("ace/virtual_renderer").VirtualRenderer;
var Editor = require("ace/editor").Editor;
var MultiSelect = require("ace/multi_select").MultiSelect;
// workers do not work for file:
/* if (location.protocol == "file:")
EditSession.prototype.$useWorker = false; */
var doclist = require("./doclist");
var modelist = require("./modelist");
var layout = require("./layout");

441
lib/ace/mode/css/csslint.js
View file

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
/* Build time: 14-May-2012 10:24:48 */
/* Build time: 12-September-2012 01:46:26 */
/*!
Parser-Lib
@ -47,7 +47,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
/* Version v0.1.7, Build time: 4-May-2012 03:57:04 */
/* Version v0.1.9, Build time: 23-July-2012 10:52:31 */
var parserlib = {};
(function(){
@ -957,7 +957,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
/* Version v0.1.7, Build time: 4-May-2012 03:57:04 */
/* Version v0.1.9, Build time: 23-July-2012 10:52:31 */
(function(){
var EventTarget = parserlib.util.EventTarget,
TokenStreamBase = parserlib.util.TokenStreamBase,
@ -2741,7 +2741,7 @@ Parser.prototype = function(){
var tokenStream = this._tokenStream,
values = [],
//valueParts = [],
//valueParts = [],
value = null,
operator = null;
@ -3025,9 +3025,15 @@ Parser.prototype = function(){
var tokenStream = this._tokenStream,
token,
tt,
name;
name,
prefix = "";
tokenStream.mustMatch(Tokens.KEYFRAMES_SYM);
token = tokenStream.token();
if (/^@\-([^\-]+)\-/.test(token.value)) {
prefix = RegExp.$1;
}
this._readWhitespace();
name = this._keyframe_name();
@ -3037,8 +3043,9 @@ Parser.prototype = function(){
this.fire({
type: "startkeyframes",
name: name,
line: name.line,
col: name.col
prefix: prefix,
line: token.startLine,
col: token.startCol
});
this._readWhitespace();
@ -3054,8 +3061,9 @@ Parser.prototype = function(){
this.fire({
type: "endkeyframes",
name: name,
line: name.line,
col: name.col
prefix: prefix,
line: token.startLine,
col: token.startCol
});
this._readWhitespace();
@ -3837,6 +3845,7 @@ var Properties = {
"pitch" : 1,
"pitch-range" : 1,
"play-during" : 1,
"pointer-events" : "auto | none | visiblePainted | visibleFill | visibleStroke | visible | painted | fill | stroke | all | inherit",
"position" : "static | relative | absolute | fixed | inherit",
"presentation-level" : 1,
"punctuation-trim" : 1,
@ -5581,7 +5590,7 @@ var Tokens = [
//{ name: "ATKEYWORD"},
//CSS3 animations
{ name: "KEYFRAMES_SYM", text: [ "@keyframes", "@-webkit-keyframes", "@-moz-keyframes", "@-ms-keyframes" ] },
{ name: "KEYFRAMES_SYM", text: [ "@keyframes", "@-webkit-keyframes", "@-moz-keyframes", "@-o-keyframes" ] },
//important symbol
{ name: "IMPORTANT_SYM"},
@ -6333,7 +6342,7 @@ var CSSLint = (function(){
formatters = [],
api = new parserlib.util.EventTarget();
api.version = "0.9.8";
api.version = "0.9.9";
//-------------------------------------------------------------------------
// Rule Management
@ -6367,6 +6376,23 @@ var CSSLint = (function(){
return a.id > b.id ? 1 : 0;
});
};
/**
* Returns a ruleset configuration object with all current rules.
* @return A ruleset object.
* @method getRuleset
*/
api.getRuleset = function() {
var ruleset = {},
i = 0,
len = rules.length;
while (i < len){
ruleset[rules[i++].id] = 1; //by default, everything is a warning
}
return ruleset;
};
//-------------------------------------------------------------------------
// Formatters
@ -6447,13 +6473,11 @@ var CSSLint = (function(){
parser = new parserlib.css.Parser({ starHack: true, ieFilters: true,
underscoreHack: true, strict: false });
// normalize line endings
lines = text.replace(/\n\r?/g, "$split$").split('$split$');
if (!ruleset){
ruleset = {};
while (i < len){
ruleset[rules[i++].id] = 1; //by default, everything is a warning
}
ruleset = this.getRuleset();
}
reporter = new Reporter(lines, ruleset);
@ -6802,36 +6826,42 @@ CSSLint.addRule({
"padding-bottom": 1,
"padding-top": 1
},
properties;
properties,
boxSizing = false;
function startRule(){
properties = {};
boxSizing = false;
}
function endRule(){
var prop;
if (properties.height){
for (prop in heightProperties){
if (heightProperties.hasOwnProperty(prop) && properties[prop]){
//special case for padding
if (!(prop == "padding" && properties[prop].value.parts.length === 2 && properties[prop].value.parts[0].value === 0)){
reporter.report("Using height with " + prop + " can sometimes make elements larger than you expect.", properties[prop].line, properties[prop].col, rule);
var prop, value;
if (!boxSizing) {
if (properties.height){
for (prop in heightProperties){
if (heightProperties.hasOwnProperty(prop) && properties[prop]){
value = properties[prop].value;
//special case for padding
if (!(prop == "padding" && value.parts.length === 2 && value.parts[0].value === 0)){
reporter.report("Using height with " + prop + " can sometimes make elements larger than you expect.", properties[prop].line, properties[prop].col, rule);
}
}
}
}
}
if (properties.width){
for (prop in widthProperties){
if (widthProperties.hasOwnProperty(prop) && properties[prop]){
if (!(prop == "padding" && properties[prop].value.parts.length === 2 && properties[prop].value.parts[1].value === 0)){
reporter.report("Using width with " + prop + " can sometimes make elements larger than you expect.", properties[prop].line, properties[prop].col, rule);
if (properties.width){
for (prop in widthProperties){
if (widthProperties.hasOwnProperty(prop) && properties[prop]){
value = properties[prop].value;
if (!(prop == "padding" && value.parts.length === 2 && value.parts[1].value === 0)){
reporter.report("Using width with " + prop + " can sometimes make elements larger than you expect.", properties[prop].line, properties[prop].col, rule);
}
}
}
}
}
}
}
}
parser.addListener("startrule", startRule);
@ -6848,8 +6878,10 @@ CSSLint.addRule({
properties[name] = { line: event.property.line, col: event.property.col, value: event.value };
}
} else {
if (name == "width" || name == "height"){
if (/^(width|height)/i.test(name) && /^(length|percentage)/.test(event.value.parts[0].type)){
properties[name] = 1;
} else if (name == "box-sizing") {
boxSizing = true;
}
}
@ -6914,20 +6946,21 @@ CSSLint.addRule({
prefixed,
i,
len,
inKeyFrame = false,
arrayPush = Array.prototype.push,
applyTo = [];
// See http://peter.sh/experiments/vendor-prefixed-css-property-overview/ for details
compatiblePrefixes = {
"animation" : "webkit moz ms",
"animation-delay" : "webkit moz ms",
"animation-direction" : "webkit moz ms",
"animation-duration" : "webkit moz ms",
"animation-fill-mode" : "webkit moz ms",
"animation-iteration-count" : "webkit moz ms",
"animation-name" : "webkit moz ms",
"animation-play-state" : "webkit moz ms",
"animation-timing-function" : "webkit moz ms",
"animation" : "webkit moz",
"animation-delay" : "webkit moz",
"animation-direction" : "webkit moz",
"animation-duration" : "webkit moz",
"animation-fill-mode" : "webkit moz",
"animation-iteration-count" : "webkit moz",
"animation-name" : "webkit moz",
"animation-play-state" : "webkit moz",
"animation-timing-function" : "webkit moz",
"appearance" : "webkit moz",
"border-end" : "webkit moz",
"border-end-color" : "webkit moz",
@ -6967,11 +7000,11 @@ CSSLint.addRule({
"text-size-adjust" : "webkit ms",
"transform" : "webkit moz ms o",
"transform-origin" : "webkit moz ms o",
"transition" : "webkit moz o ms",
"transition-delay" : "webkit moz o ms",
"transition-duration" : "webkit moz o ms",
"transition-property" : "webkit moz o ms",
"transition-timing-function" : "webkit moz o ms",
"transition" : "webkit moz o",
"transition-delay" : "webkit moz o",
"transition-duration" : "webkit moz o",
"transition-property" : "webkit moz o",
"transition-timing-function" : "webkit moz o",
"user-modify" : "webkit moz",
"user-select" : "webkit moz ms",
"word-break" : "epub ms",
@ -6990,14 +7023,28 @@ CSSLint.addRule({
arrayPush.apply(applyTo, variations);
}
}
parser.addListener("startrule", function () {
properties = [];
});
parser.addListener("startkeyframes", function (event) {
inKeyFrame = event.prefix || true;
});
parser.addListener("endkeyframes", function (event) {
inKeyFrame = false;
});
parser.addListener("property", function (event) {
var name = event.property;
if (CSSLint.Util.indexOf(applyTo, name.text) > -1) {
properties.push(name);
// e.g., -moz-transform is okay to be alone in @-moz-keyframes
if (!inKeyFrame || typeof inKeyFrame != "string" ||
name.text.indexOf("-" + inKeyFrame + "-") !== 0) {
properties.push(name);
}
}
});
@ -7676,308 +7723,20 @@ CSSLint.addRule({
//rule information
id: "known-properties",
name: "Require use of known properties",
desc: "Properties should be known (listed in CSS specification) or be a vendor-prefixed property.",
desc: "Properties should be known (listed in CSS3 specification) or be a vendor-prefixed property.",
browsers: "All",
//initialization
init: function(parser, reporter){
var rule = this,
properties = {
"alignment-adjust": 1,
"alignment-baseline": 1,
"animation": 1,
"animation-delay": 1,
"animation-direction": 1,
"animation-duration": 1,
"animation-fill-mode": 1,
"animation-iteration-count": 1,
"animation-name": 1,
"animation-play-state": 1,
"animation-timing-function": 1,
"appearance": 1,
"azimuth": 1,
"backface-visibility": 1,
"background": 1,
"background-attachment": 1,
"background-break": 1,
"background-clip": 1,
"background-color": 1,
"background-image": 1,
"background-origin": 1,
"background-position": 1,
"background-repeat": 1,
"background-size": 1,
"baseline-shift": 1,
"binding": 1,
"bleed": 1,
"bookmark-label": 1,
"bookmark-level": 1,
"bookmark-state": 1,
"bookmark-target": 1,
"border": 1,
"border-bottom": 1,
"border-bottom-color": 1,
"border-bottom-left-radius": 1,
"border-bottom-right-radius": 1,
"border-bottom-style": 1,
"border-bottom-width": 1,
"border-collapse": 1,
"border-color": 1,
"border-image": 1,
"border-image-outset": 1,
"border-image-repeat": 1,
"border-image-slice": 1,
"border-image-source": 1,
"border-image-width": 1,
"border-left": 1,
"border-left-color": 1,
"border-left-style": 1,
"border-left-width": 1,
"border-radius": 1,
"border-right": 1,
"border-right-color": 1,
"border-right-style": 1,
"border-right-width": 1,
"border-spacing": 1,
"border-style": 1,
"border-top": 1,
"border-top-color": 1,
"border-top-left-radius": 1,
"border-top-right-radius": 1,
"border-top-style": 1,
"border-top-width": 1,
"border-width": 1,
"bottom": 1,
"box-align": 1,
"box-decoration-break": 1,
"box-direction": 1,
"box-flex": 1,
"box-flex-group": 1,
"box-lines": 1,
"box-ordinal-group": 1,
"box-orient": 1,
"box-pack": 1,
"box-shadow": 1,
"box-sizing": 1,
"break-after": 1,
"break-before": 1,
"break-inside": 1,
"caption-side": 1,
"clear": 1,
"clip": 1,
"color": 1,
"color-profile": 1,
"column-count": 1,
"column-fill": 1,
"column-gap": 1,
"column-rule": 1,
"column-rule-color": 1,
"column-rule-style": 1,
"column-rule-width": 1,
"column-span": 1,
"column-width": 1,
"columns": 1,
"content": 1,
"counter-increment": 1,
"counter-reset": 1,
"crop": 1,
"cue": 1,
"cue-after": 1,
"cue-before": 1,
"cursor": 1,
"direction": 1,
"display": 1,
"dominant-baseline": 1,
"drop-initial-after-adjust": 1,
"drop-initial-after-align": 1,
"drop-initial-before-adjust": 1,
"drop-initial-before-align": 1,
"drop-initial-size": 1,
"drop-initial-value": 1,
"elevation": 1,
"empty-cells": 1,
"fit": 1,
"fit-position": 1,
"float": 1,
"float-offset": 1,
"font": 1,
"font-family": 1,
"font-size": 1,
"font-size-adjust": 1,
"font-stretch": 1,
"font-style": 1,
"font-variant": 1,
"font-weight": 1,
"grid-columns": 1,
"grid-rows": 1,
"hanging-punctuation": 1,
"height": 1,
"hyphenate-after": 1,
"hyphenate-before": 1,
"hyphenate-character": 1,
"hyphenate-lines": 1,
"hyphenate-resource": 1,
"hyphens": 1,
"icon": 1,
"image-orientation": 1,
"image-rendering": 1,
"image-resolution": 1,
"inline-box-align": 1,
"left": 1,
"letter-spacing": 1,
"line-height": 1,
"line-stacking": 1,
"line-stacking-ruby": 1,
"line-stacking-shift": 1,
"line-stacking-strategy": 1,
"list-style": 1,
"list-style-image": 1,
"list-style-position": 1,
"list-style-type": 1,
"margin": 1,
"margin-bottom": 1,
"margin-left": 1,
"margin-right": 1,
"margin-top": 1,
"mark": 1,
"mark-after": 1,
"mark-before": 1,
"marks": 1,
"marquee-direction": 1,
"marquee-play-count": 1,
"marquee-speed": 1,
"marquee-style": 1,
"max-height": 1,
"max-width": 1,
"min-height": 1,
"min-width": 1,
"move-to": 1,
"nav-down": 1,
"nav-index": 1,
"nav-left": 1,
"nav-right": 1,
"nav-up": 1,
"opacity": 1,
"orphans": 1,
"outline": 1,
"outline-color": 1,
"outline-offset": 1,
"outline-style": 1,
"outline-width": 1,
"overflow": 1,
"overflow-style": 1,
"overflow-x": 1,
"overflow-y": 1,
"padding": 1,
"padding-bottom": 1,
"padding-left": 1,
"padding-right": 1,
"padding-top": 1,
"page": 1,
"page-break-after": 1,
"page-break-before": 1,
"page-break-inside": 1,
"page-policy": 1,
"pause": 1,
"pause-after": 1,
"pause-before": 1,
"perspective": 1,
"perspective-origin": 1,
"phonemes": 1,
"pitch": 1,
"pitch-range": 1,
"play-during": 1,
"position": 1,
"presentation-level": 1,
"punctuation-trim": 1,
"quotes": 1,
"rendering-intent": 1,
"resize": 1,
"rest": 1,
"rest-after": 1,
"rest-before": 1,
"richness": 1,
"right": 1,
"rotation": 1,
"rotation-point": 1,
"ruby-align": 1,
"ruby-overhang": 1,
"ruby-position": 1,
"ruby-span": 1,
"size": 1,
"speak": 1,
"speak-header": 1,
"speak-numeral": 1,
"speak-punctuation": 1,
"speech-rate": 1,
"stress": 1,
"string-set": 1,
"table-layout": 1,
"target": 1,
"target-name": 1,
"target-new": 1,
"target-position": 1,
"text-align": 1,
"text-align-last": 1,
"text-decoration": 1,
"text-emphasis": 1,
"text-height": 1,
"text-indent": 1,
"text-justify": 1,
"text-outline": 1,
"text-shadow": 1,
"text-transform": 1,
"text-wrap": 1,
"top": 1,
"transform": 1,
"transform-origin": 1,
"transform-style": 1,
"transition": 1,
"transition-delay": 1,
"transition-duration": 1,
"transition-property": 1,
"transition-timing-function": 1,
"unicode-bidi": 1,
"user-modify": 1,
"user-select": 1,
"vertical-align": 1,
"visibility": 1,
"voice-balance": 1,
"voice-duration": 1,
"voice-family": 1,
"voice-pitch": 1,
"voice-pitch-range": 1,
"voice-rate": 1,
"voice-stress": 1,
"voice-volume": 1,
"volume": 1,
"white-space": 1,
"white-space-collapse": 1,
"widows": 1,
"width": 1,
"word-break": 1,
"word-spacing": 1,
"word-wrap": 1,
"z-index": 1,
//IE
"filter": 1,
"zoom": 1,
//@font-face
"src": 1
};
var rule = this;
parser.addListener("property", function(event){
var name = event.property.text.toLowerCase();
// the check is handled entirely by the parser-lib (https://github.com/nzakas/parser-lib)
if (event.invalid) {
reporter.report(event.invalid.message, event.line, event.col, rule);
}
//if (!properties[name] && name.charAt(0) != "-"){
// reporter.error("Unknown property '" + event.property + "'.", event.line, event.col, rule);
//}
});
}
@ -8757,4 +8516,4 @@ CSSLint.addRule({
exports.CSSLint = CSSLint;
});
});

2
lib/ace/mode/css_worker.js
View file

@ -40,7 +40,7 @@ var Worker = exports.Worker = function(sender) {
Mirror.call(this, sender);
this.setTimeout(400);
this.ruleset = null;
this.setDisabledRules("");
this.setDisabledRules("ids");
this.setInfoRules("adjoining-classes|qualified-headings|zero-units|gradients|import|outline-none");
};

8572
lib/ace/mode/javascript/jshint.js
View file

File diff suppressed because it is too large Load diff

3
lib/ace/mode/javascript_worker.js
View file

@ -62,7 +62,8 @@ var infoRe = startRegex([
"Unexpected space",
"Missing radix parameter.",
"A leading decimal point can",
"\\['\\{a\\}'\\] is better written in dot notation."
"\\['{a}'\\] is better written in dot notation.",
"'{a}' used out of scope"
]);
var JavaScriptWorker = exports.JavaScriptWorker = function(sender) {

2
tool/update_deps.js
View file

@ -7,7 +7,7 @@ var rootDir = __dirname + "/../lib/ace/"
var deps = [{
path: "mode/javascript/jshint.js",
url: "https://raw.github.com/jshint/jshint/master/jshint.js",
url: "https://raw.github.com/jshint/jshint/master/src/stable/jshint.js",
needsFixup: true,
postProcess: function(t) {
return t.replace(