Skip to content
This repository has been archived by the owner on Mar 23, 2024. It is now read-only.

Commit

Permalink
[Fix] Remove unused tokenBefore / noTokenBefore
Browse files Browse the repository at this point in the history
  • Loading branch information
mdevils committed Apr 12, 2016
1 parent 0e9f4fa commit d480c30
Showing 1 changed file with 0 additions and 93 deletions.
93 changes: 0 additions & 93 deletions lib/token-assert.js
Original file line number Diff line number Diff line change
Expand Up @@ -416,97 +416,4 @@ TokenAssert.prototype._augmentLineCount = function(options, lineCount) {
});
};

/**
* Requires specific token before given.
*
* @param {Object} options
* @param {Object} options.token
* @param {Object} options.expectedTokenBefore
* @param {String} [options.message]
*/
TokenAssert.prototype.tokenBefore = function(options) {
var token = options.token;
var actualTokenBefore = this._file.getPrevToken(token);
var expectedTokenBefore = options.expectedTokenBefore;

if (!actualTokenBefore) {
var loc = token.getLoc();
this.emit('error', {
message: expectedTokenBefore.value + ' was expected before ' + token.value + ' but document start found',
line: loc.start.line,
column: loc.start.column
});
return;
}

// Only attempt to remove or add lines if there are no comments between the two nodes
// as this prevents accidentally moving a valid token onto a line comment ed line
var fixed = this._file.getPrevToken(options.token, {includeComments: true}) === actualTokenBefore;

if (
actualTokenBefore.type !== expectedTokenBefore.type ||
actualTokenBefore.value !== expectedTokenBefore.value
) {

if (fixed) {
this._file.setWhitespaceBefore(token, expectedTokenBefore.value + this._file.getWhitespaceBefore(token));
}

var message = options.message;
if (!message) {
var showTypes = expectedTokenBefore.value === actualTokenBefore.value;
message =
expectedTokenBefore.value + (showTypes ? ' (' + expectedTokenBefore.type + ')' : '') +
' was expected before ' + token.value +
' but ' + actualTokenBefore.value + (showTypes ? ' (' + actualTokenBefore.type + ')' : '') + ' found';
}

var actualTokenBeforeLoc = actualTokenBefore.getLoc();
this.emit('error', {
message: message,
line: actualTokenBeforeLoc.end.line,
column: actualTokenBeforeLoc.end.column,
fixed: fixed
});
}
};
/**
* Disallows specific token before given.
*
* @param {Object} options
* @param {Object} options.token
* @param {Object} options.expectedTokenBefore
* @param {String} [options.message]
*/
TokenAssert.prototype.noTokenBefore = function(options) {
var token = options.token;
var actualTokenBefore = this._file.getPrevToken(token);
if (!actualTokenBefore) {
// document start
return;
}

var fixed = this._file.getPrevToken(options.token, {
includeComments: true
}) === actualTokenBefore;

var expectedTokenBefore = options.expectedTokenBefore;
if (actualTokenBefore.type === expectedTokenBefore.type &&
actualTokenBefore.value === expectedTokenBefore.value
) {

if (fixed) {
actualTokenBefore.value = '';
}

var loc = actualTokenBefore.getLoc();
this.emit('error', {
message: options.message || 'Illegal ' + expectedTokenBefore.value + ' was found before ' + token.value,
line: loc.end.line,
column: loc.end.column,
fixed: fixed
});
}
};

module.exports = TokenAssert;

0 comments on commit d480c30

Please sign in to comment.