Attachment #239882 for bug #428040

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




	"eslint/rules/no-unused-vars",
	"eslint/rules/no-use-before-define",
	"eslint/rules/semi",
	"eslint/rules/no-semi",
	"eslint/rules/missing-doc"
], function(eqeqeq, no_redeclare, no_undef, no_unused_vars, no_use_before_define, semi, no_semi, missing_doc) {
	return function() {
		return {
			"eqeqeq": eqeqeq,

			"no-unused-vars": no_unused_vars,
			"no-use-before-define": no_use_before_define,
			"semi": semi,
			"no-semi": no_semi,
			"missing-func-decl-doc" : missing_doc,
			"missing-func-expr-doc" : missing_doc
		};




/*******************************************************************************
 * @license
 * Copyright (c) 2014 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials are made 
 * available under the terms of the Eclipse Public License v1.0 
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
 * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
 *
 * Contributors:
 *	 IBM Corporation - initial API and implementation
 *******************************************************************************/
/*global define module require exports */
(function(root, factory) {
	if(typeof exports === 'object') {
		module.exports = factory(require, exports, module);
	}
	else if(typeof define === 'function' && define.amd) {
		define(['require', 'exports', 'module'], factory);
	}
	else {
		var req = function(id) {return root[id];},
			exp = root,
			mod = {exports: exp};
		root.rules.noundef = factory(req, exp, mod);
	}
}(this, function(require, exports, module) {
	module.exports = function(context) {
		"use strict";
		
		/**
		 * @description Checks a set of tokens to see if we have an unnecessary semicolon
		 * @private
		 * @param {Object} node The AST node
		 */
		function report(node) {
			var tokens = context.getTokens(node);
			var t = tokens[tokens.length - 1];
			if (t && t.type === "Punctuator" && t.value === ";") {
				context.report(node, "Unnecessary semicolon.", null, t /* expose the bad token */);
			}
		}
		return {
			"EmptyStatement": report
		};
	};
	return module.exports;
}));




/*******************************************************************************
 * @license
 * Copyright (c) 2014 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials are made 
 * available under the terms of the Eclipse Public License v1.0 
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
 * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
/*global describe it module require*/

//------------------------------------------------------------------------------
// Requirements
//------------------------------------------------------------------------------

var assert = require("assert"),
	mocha = require("mocha"),
	eslint = require("../../../lib/eslint");

//------------------------------------------------------------------------------
// Constants
//------------------------------------------------------------------------------

var RULE_ID = "no-semi";

//------------------------------------------------------------------------------
// Tests
//------------------------------------------------------------------------------
describe(RULE_ID, function() {
	/**
	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=428040
	 */
	it("should flag statement multi", function() {
		var topic = "var a=1;;";

		var config = { rules: {} };
		config.rules[RULE_ID] = 1;

		var messages = eslint.verify(topic, config);
		assert.equal(messages.length, 1);
		assert.equal(messages[0].ruleId, RULE_ID);
		assert.equal(messages[0].message, "Unnecessary semicolon.");
		assert.equal(messages[0].node.type, "EmptyStatement");
	});
	/**
	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=428040
	 */
	it("should flag function expresson statement multi", function() {
		var topic = "var a = function() {};;";

		var config = { rules: {} };
		config.rules[RULE_ID] = 1;

		var messages = eslint.verify(topic, config);
		assert.equal(messages.length, 1);
		assert.equal(messages[0].ruleId, RULE_ID);
		assert.equal(messages[0].message, "Unnecessary semicolon.");
		assert.equal(messages[0].node.type, "EmptyStatement");
	});
	/**
	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=428040
	 */
	it("should flag function declaration", function() {
		var topic = "function a() {};";

		var config = { rules: {} };
		config.rules[RULE_ID] = 1;

		var messages = eslint.verify(topic, config);
		assert.equal(messages.length, 1);
		assert.equal(messages[0].ruleId, RULE_ID);
		assert.equal(messages[0].message, "Unnecessary semicolon.");
		assert.equal(messages[0].node.type, "EmptyStatement");
	});
	/**
	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=428040
	 */
	it("should flag empty line", function() {
		var topic = ";";

		var config = { rules: {} };
		config.rules[RULE_ID] = 1;

		var messages = eslint.verify(topic, config);
		assert.equal(messages.length, 1);
		assert.equal(messages[0].ruleId, RULE_ID);
		assert.equal(messages[0].message, "Unnecessary semicolon.");
		assert.equal(messages[0].node.type, "EmptyStatement");
	});
	
	//------------------------------------------------------------------------------
	// Should nots
	//------------------------------------------------------------------------------
	/**
	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=428040
	 */
	it("should not flag function expression", function() {
		var topic = "var a = function() {};";

		var config = { rules: {} };
		config.rules[RULE_ID] = 1;

		var messages = eslint.verify(topic, config);
		assert.equal(messages.length, 0);
	});
	/**
	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=428040
	 */
	it("should not flag expression", function() {
		var topic = "var a = 4;";

		var config = { rules: {} };
		config.rules[RULE_ID] = 1;

		var messages = eslint.verify(topic, config);
		assert.equal(messages.length, 0);
	});
	/**
	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=428040
	 */
	it("should not flag object expression", function() {
		var topic = "var a = {};";

		var config = { rules: {} };
		config.rules[RULE_ID] = 1;

		var messages = eslint.verify(topic, config);
		assert.equal(messages.length, 0);
	});
});

Lines 26-31 Link Here

(-)a/bundles/org.eclipse.orion.client.javascript/web/javascript/eslint/validator.js (+2 lines)
26	"no-unused-vars": 1, //$NON-NLS-0$	26	"no-unused-vars": 1, //$NON-NLS-0$
27	"no-use-before-define": 1, //$NON-NLS-0$	27	"no-use-before-define": 1, //$NON-NLS-0$
28	"semi": 1, //$NON-NLS-0$	28	"semi": 1, //$NON-NLS-0$
		29	"no-semi": 1, //$NON-NLS-0$
29	"missing-func-decl-doc": [0, 'decl'], //$NON-NLS-0$ //$NON-NLS-1$	30	"missing-func-decl-doc": [0, 'decl'], //$NON-NLS-0$ //$NON-NLS-1$
30	"missing-func-expr-doc": [0, 'expr'] //$NON-NLS-0$ //$NON-NLS-1$	31	"missing-func-expr-doc": [0, 'expr'] //$NON-NLS-0$ //$NON-NLS-1$
31	},	32	},
Lines 207-212 Link Here
207	config.setOption("no-unused-vars", properties.validate_no_unused_vars); //$NON-NLS-0$	208	config.setOption("no-unused-vars", properties.validate_no_unused_vars); //$NON-NLS-0$
208	config.setOption("no-use-before-define", properties.validate_use_before_define); //$NON-NLS-0$	209	config.setOption("no-use-before-define", properties.validate_use_before_define); //$NON-NLS-0$
209	config.setOption("semi", properties.validate_missing_semi); //$NON-NLS-0$	210	config.setOption("semi", properties.validate_missing_semi); //$NON-NLS-0$
		211	config.setOption("no-semi", properties.validate_unnecessary_semi); //$NON-NLS-0$
210	}	212	}
211	});	213	});
212		214




								{label: "Error", value:2}
							]
						},
						{	id: "validate_unnecessary_semi",
							name: "Unnecessary semicolons",
							type: "number",
							defaultValue: 1,
							options: [
								{label: "Ignore", value:0},
								{label: "Warning", value:1},
								{label: "Error", value:2}
							]
						},
						{	id: "validate_no_unused_vars",
							name: "Unused variables",
							type: "number",

Return to bug 428040

Lines 20-27 Link Here

(-)a/bundles/org.eclipse.orion.client.javascript/web/eslint/lib/load-rules-async.js (-1 / +3 lines)
20	"eslint/rules/no-unused-vars",	20	"eslint/rules/no-unused-vars",
21	"eslint/rules/no-use-before-define",	21	"eslint/rules/no-use-before-define",
22	"eslint/rules/semi",	22	"eslint/rules/semi",
		23	"eslint/rules/no-semi",
23	"eslint/rules/missing-doc"	24	"eslint/rules/missing-doc"
24	], function(eqeqeq, no_redeclare, no_undef, no_unused_vars, no_use_before_define, semi, missing_doc) {	25	], function(eqeqeq, no_redeclare, no_undef, no_unused_vars, no_use_before_define, semi, no_semi, missing_doc) {
25	return function() {	26	return function() {
26	return {	27	return {
27	"eqeqeq": eqeqeq,	28	"eqeqeq": eqeqeq,
Lines 30-35 Link Here
30	"no-unused-vars": no_unused_vars,	31	"no-unused-vars": no_unused_vars,
31	"no-use-before-define": no_use_before_define,	32	"no-use-before-define": no_use_before_define,
32	"semi": semi,	33	"semi": semi,
		34	"no-semi": no_semi,
33	"missing-func-decl-doc" : missing_doc,	35	"missing-func-decl-doc" : missing_doc,
34	"missing-func-expr-doc" : missing_doc	36	"missing-func-expr-doc" : missing_doc
35	};	37	};

Added Link Here

(-)a/bundles/org.eclipse.orion.client.javascript/web/eslint/lib/rules/no-semi.js (+47 lines)
1	/*******************************************************************************
2	* @license
3	* Copyright (c) 2014 IBM Corporation and others.
4	* All rights reserved. This program and the accompanying materials are made
5	* available under the terms of the Eclipse Public License v1.0
6	* (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
7	* License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html).
8	*
9	* Contributors:
10	* IBM Corporation - initial API and implementation
11	*******************************************************************************/
12	/global define module require exports /
13	(function(root, factory) {
14	if(typeof exports === 'object') {
15	module.exports = factory(require, exports, module);
16	}
17	else if(typeof define === 'function' && define.amd) {
18	define(['require', 'exports', 'module'], factory);
19	}
20	else {
21	var req = function(id) {return root[id];},
22	exp = root,
23	mod = {exports: exp};
24	root.rules.noundef = factory(req, exp, mod);
25	}
26	}(this, function(require, exports, module) {
27	module.exports = function(context) {
28	"use strict";
29
30	/**
31	* @description Checks a set of tokens to see if we have an unnecessary semicolon
32	* @private
33	* @param {Object} node The AST node
34	*/
35	function report(node) {
36	var tokens = context.getTokens(node);
37	var t = tokens[tokens.length - 1];
38	if (t && t.type === "Punctuator" && t.value === ";") {
39	context.report(node, "Unnecessary semicolon.", null, t /* expose the bad token */);
40	}
41	}
42	return {
43	"EmptyStatement": report
44	};
45	};
46	return module.exports;
47	}));

Lines 193-198 Link Here

(-)a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js (+10 lines)
193	{label: "Error", value:2}	193	{label: "Error", value:2}
194	]	194	]
195	},	195	},
		196	{ id: "validate_unnecessary_semi",
		197	name: "Unnecessary semicolons",
		198	type: "number",
		199	defaultValue: 1,
		200	options: [
		201	{label: "Ignore", value:0},
		202	{label: "Warning", value:1},
		203	{label: "Error", value:2}
		204	]
		205	},
196	{ id: "validate_no_unused_vars",	206	{ id: "validate_no_unused_vars",
197	name: "Unused variables",	207	name: "Unused variables",
198	type: "number",	208	type: "number",