This repository has been archived by the owner on Mar 23, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 515
Add validateQuoteMarks rule, closes #106 #118
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
var assert = require('assert'); | ||
|
||
module.exports = function() {}; | ||
|
||
module.exports.prototype = { | ||
|
||
configure: function(allowedQuoteMark) { | ||
assert( | ||
allowedQuoteMark === '"' || allowedQuoteMark === '\'' || allowedQuoteMark === true, | ||
'validateQuoteMarks option requires \'"\', "\'", or boolean true' | ||
); | ||
|
||
this._allowedQuoteMark = allowedQuoteMark; | ||
}, | ||
|
||
getOptionName: function () { | ||
return 'validateQuoteMarks'; | ||
}, | ||
|
||
check: function(file, errors) { | ||
var tokens = file.getTokens(); | ||
var allowedQuoteMark = this._allowedQuoteMark; | ||
|
||
for (var i = 0, l = tokens.length; i < l; i++) { | ||
var token = tokens[i]; | ||
if (token.type === 'String') { | ||
if (allowedQuoteMark === true) { | ||
allowedQuoteMark = token.value[0]; | ||
} | ||
|
||
if (token.value[0] !== allowedQuoteMark) { | ||
errors.add( | ||
'Invalid quote mark found', | ||
token.loc.start.line, | ||
token.loc.start.column | ||
); | ||
} | ||
} | ||
} | ||
} | ||
|
||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
var Checker = require('../lib/checker'); | ||
var assert = require('assert'); | ||
|
||
describe('rules/validate-quote-marks', function() { | ||
var checker; | ||
|
||
beforeEach(function() { | ||
checker = new Checker(); | ||
checker.registerDefaultRules(); | ||
}); | ||
|
||
describe('option value \' ', function() { | ||
beforeEach(function() { | ||
checker.configure({ validateQuoteMarks: '\'' }); | ||
}); | ||
|
||
it('should report double quotes in strings', function() { | ||
assert(checker.checkString('var x = "x";').getErrorCount() === 1); | ||
}); | ||
|
||
it('should not report single quotes in strings', function() { | ||
assert(checker.checkString('var x = \'x\';').isEmpty()); | ||
}); | ||
|
||
it('should not report double quotes values in single quotes strings', function() { | ||
assert(checker.checkString('var x = \'"x"\';').isEmpty()); | ||
}); | ||
|
||
it('should not report double quotes in comments', function() { | ||
assert(checker.checkString('var x = \'x\'; /*"y"*/').isEmpty()); | ||
}); | ||
}); | ||
|
||
describe('option value " ', function() { | ||
beforeEach(function() { | ||
checker.configure({ validateQuoteMarks: '"' }); | ||
}); | ||
|
||
it('should report single quotes in strings', function() { | ||
assert(checker.checkString('var x = \'x\';').getErrorCount() === 1); | ||
}); | ||
|
||
it('should not report double quotes in strings', function() { | ||
assert(checker.checkString('var x = "x";').isEmpty()); | ||
}); | ||
|
||
it('should not report single quotes values in double quotes strings', function() { | ||
assert(checker.checkString('var x = "\'x\'";').isEmpty()); | ||
}); | ||
|
||
it('should not report single quotes in comments', function() { | ||
assert(checker.checkString('var x = "x"; /*\'y\'*/').isEmpty()); | ||
}); | ||
}); | ||
|
||
describe('option value true ', function() { | ||
beforeEach(function() { | ||
checker.configure({ validateQuoteMarks: true }); | ||
}); | ||
|
||
it('should report inconsistent quotes in strings', function() { | ||
assert(checker.checkString('var x = \'x\', y = "y";').getErrorCount() === 1); | ||
}); | ||
|
||
it('should not report consistent single quotes in strings', function() { | ||
assert(checker.checkString('var x = \'x\', y = \'y\';').isEmpty()); | ||
}); | ||
|
||
it('should not report consistent double quotes in strings', function() { | ||
assert(checker.checkString('var x = "x", y = "y";').isEmpty()); | ||
}); | ||
|
||
it('should not report inconsistent quotes in comments', function() { | ||
assert(checker.checkString('var x = "x", y = "y"; /*\'y\'*/').isEmpty()); | ||
}); | ||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mikesherov IMO there should be tests checking for
'
inside"
& vice versa, like:with
validateQuoteMarks: '"'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done, see https://github.com/mdevils/node-jscs/pull/118/files#diff-5534590ed977560001e0429459f5b777R25