Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes location reporting in simple-unless rule #2940

Merged
merged 1 commit into from
Jul 18, 2023
Merged

Fixes location reporting in simple-unless rule #2940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 7 additions & 15 deletions lib/rules/simple-unless.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,29 +105,26 @@ export default class SimpleUnless extends Rule {
return;
}
let node = block.program;
let loc = node.loc.end;
let actual = '{{else}}';

this._logMessage(node, messages.followingElseBlock, loc.line, loc.column, actual, true);
this._logMessage(node, messages.followingElseBlock, actual, true);
}

_followingElseIfBlock(block) {
let inverse = block.inverse;
let node = block.program;
let loc = node.loc.end;
let parameter = inverse.body[0].params[0].original;
let actual = `{{else if ${parameter}}}`;

this._logMessage(node, messages.followingElseBlock, loc.line, loc.column, actual);
this._logMessage(node, messages.followingElseBlock, actual);
}

_asElseUnlessBlock(block) {
let inverse = block.inverse;
let node = inverse.body[0];
let loc = node.loc.start;
let actual = '{{else unless ...';

this._logMessage(node, messages.asElseUnlessBlock, loc.line, loc.column, actual);
this._logMessage(node, messages.asElseUnlessBlock, actual);
}

_withHelper(node, fixMode) {
Expand All @@ -145,33 +142,30 @@ export default class SimpleUnless extends Rule {
for (const param of params) {
if (param.type === 'SubExpression') {
if (++helperCount > maxHelpers && maxHelpers > -1) {
let loc = param.loc.start;
let actual = `{{unless ${helperCount > 1 ? '(... ' : ''}(${param.path.original} ...`;
let message = `${messages.withHelper} MaxHelpers: ${maxHelpers}`;

this._logMessage(param, message, loc.line, loc.column, actual, true);
this._logMessage(param, message, actual, true);
shouldFix = true;
}

if (allowlist.length > 0 && !allowlist.includes(param.path.original)) {
let loc = param.loc.start;
let actual = `{{unless ${helperCount > 1 ? '(... ' : ''}(${param.path.original} ...`;
let message = `${messages.withHelper} Allowed helper${
allowlist.length > 1 ? 's' : ''
}: ${allowlist.toString()}`;

this._logMessage(param, message, loc.line, loc.column, actual, true);
this._logMessage(param, message, actual, true);
shouldFix = true;
}

if (denylist.length > 0 && denylist.includes(param.path.original)) {
let loc = param.loc.start;
let actual = `{{unless ${helperCount > 1 ? '(... ' : ''}(${param.path.original} ...`;
let message = `${messages.withHelper} Restricted helper${
denylist.length > 1 ? 's' : ''
}: ${denylist.toString()}`;

this._logMessage(param, message, loc.line, loc.column, actual, true);
this._logMessage(param, message, actual, true);
shouldFix = true;
}

Expand Down Expand Up @@ -209,12 +203,10 @@ export default class SimpleUnless extends Rule {
);
}

_logMessage(node, message, line, column, source, isFixable = false) {
_logMessage(node, message, source, isFixable = false) {
return this.log({
message,
node,
line,
column,
source,
isFixable,
});
Expand Down
28 changes: 14 additions & 14 deletions test/unit/rules/simple-unless-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,12 @@ generateRuleTests({
expect(results).toMatchInlineSnapshot(`
[
{
"column": 0,
"column": 23,
"endColumn": 0,
"endLine": 3,
"filePath": "layout.hbs",
"isFixable": true,
"line": 3,
"line": 1,
"message": "Using an {{else}} block with {{unless}} should be avoided.",
"rule": "simple-unless",
"severity": 2,
Expand All @@ -181,12 +181,12 @@ generateRuleTests({
expect(results).toMatchInlineSnapshot(`
[
{
"column": 0,
"column": 23,
"endColumn": 0,
"endLine": 3,
"filePath": "layout.hbs",
"isFixable": true,
"line": 3,
"line": 1,
"message": "Using an {{else}} block with {{unless}} should be avoided.",
"rule": "simple-unless",
"severity": 2,
Expand Down Expand Up @@ -216,12 +216,12 @@ generateRuleTests({
expect(results).toMatchInlineSnapshot(`
[
{
"column": 0,
"column": 23,
"endColumn": 0,
"endLine": 2,
"filePath": "layout.hbs",
"isFixable": true,
"line": 2,
"line": 1,
"message": "Using an {{else}} block with {{unless}} should be avoided.",
"rule": "simple-unless",
"severity": 2,
Expand All @@ -244,12 +244,12 @@ generateRuleTests({
expect(results).toMatchInlineSnapshot(`
[
{
"column": 0,
"column": 23,
"endColumn": 0,
"endLine": 3,
"filePath": "layout.hbs",
"isFixable": false,
"line": 3,
"line": 1,
"message": "Using an {{else}} block with {{unless}} should be avoided.",
"rule": "simple-unless",
"severity": 2,
Expand All @@ -274,12 +274,12 @@ generateRuleTests({
expect(results).toMatchInlineSnapshot(`
[
{
"column": 0,
"column": 23,
"endColumn": 0,
"endLine": 3,
"filePath": "layout.hbs",
"isFixable": false,
"line": 3,
"line": 1,
"message": "Using an {{else}} block with {{unless}} should be avoided.",
"rule": "simple-unless",
"severity": 2,
Expand All @@ -304,12 +304,12 @@ generateRuleTests({
expect(results).toMatchInlineSnapshot(`
[
{
"column": 0,
"column": 23,
"endColumn": 0,
"endLine": 3,
"filePath": "layout.hbs",
"isFixable": false,
"line": 3,
"line": 1,
"message": "Using an {{else}} block with {{unless}} should be avoided.",
"rule": "simple-unless",
"severity": 2,
Expand Down Expand Up @@ -494,12 +494,12 @@ generateRuleTests({
expect(results).toMatchInlineSnapshot(`
[
{
"column": 0,
"column": 20,
"endColumn": 0,
"endLine": 3,
"filePath": "layout.hbs",
"isFixable": true,
"line": 3,
"line": 1,
"message": "Using an {{else}} block with {{unless}} should be avoided.",
"rule": "simple-unless",
"severity": 2,
Expand Down