msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

add end position to warnings

Browse Source
pull/1250/head
James Birtles 8 years ago
parent 270e1d188b
commit d07721cd50
40 changed files with 234 additions and 35 deletions
Show Stats Download Patch File Download Diff File

33
src/validate/html/a11y.ts
Unescape View File

@ -33,7 +33,7 @@ export default function a11y(
if (name.startsWith('aria-')) {
if (invisibleElements.has(node.name)) {
// aria-unsupported-elements
validator.warn(`A11y: <${node.name}> should not have aria-* attributes`, attribute.start);
validator.warn(`A11y: <${node.name}> should not have aria-* attributes`, { start: attribute.start, end: attribute.end });
}
const type = name.slice(5);
@ -42,7 +42,7 @@ export default function a11y(
let message = `A11y: Unknown aria attribute 'aria-${type}'`;
if (match) message += ` (did you mean '${match}'?)`;
validator.warn(message, attribute.start);
validator.warn(message, { start: attribute.start, end: attribute.end });
}
}
@ -50,7 +50,7 @@ export default function a11y(
if (name === 'role') {
if (invisibleElements.has(node.name)) {
// aria-unsupported-elements
validator.warn(`A11y: <${node.name}> should not have role attribute`, attribute.start);
validator.warn(`A11y: <${node.name}> should not have role attribute`, { start: attribute.start, end: attribute.end });
}
const value = getStaticAttributeValue(node, 'role');
@ -59,30 +59,30 @@ export default function a11y(
let message = `A11y: Unknown role '${value}'`;
if (match) message += ` (did you mean '${match}'?)`;
validator.warn(message, attribute.start);
validator.warn(message, { start: attribute.start, end: attribute.end });
}
}
// no-access-key
if (name === 'accesskey') {
validator.warn(`A11y: Avoid using accesskey`, attribute.start);
validator.warn(`A11y: Avoid using accesskey`, { start: attribute.start, end: attribute.end });
}
// no-autofocus
if (name === 'autofocus') {
validator.warn(`A11y: Avoid using autofocus`, attribute.start);
validator.warn(`A11y: Avoid using autofocus`, { start: attribute.start, end: attribute.end });
}
// scope
if (name === 'scope' && node.name !== 'th') {
validator.warn(`A11y: The scope attribute should only be used with <th> elements`, attribute.start);
validator.warn(`A11y: The scope attribute should only be used with <th> elements`, { start: attribute.start, end: attribute.end });
}
// tabindex-no-positive
if (name === 'tabindex') {
const value = getStaticAttributeValue(node, 'tabindex');
if (!isNaN(value) && +value > 0) {
validator.warn(`A11y: avoid tabindex values above zero`, attribute.start);
validator.warn(`A11y: avoid tabindex values above zero`, { start: attribute.start, end: attribute.end });
}
}
@ -96,13 +96,13 @@ export default function a11y(
attributes.slice(0, -1).join(', ') + ` or ${attributes[attributes.length - 1]}` :
attributes[0];
validator.warn(`A11y: <${name}> element should have ${article} ${sequence} attribute`, node.start);
validator.warn(`A11y: <${name}> element should have ${article} ${sequence} attribute`, { start: node.start, end: node.end });
}
}
function shouldHaveContent() {
if (node.children.length === 0) {
validator.warn(`A11y: <${node.name}> element should have child content`, node.start);
validator.warn(`A11y: <${node.name}> element should have child content`, { start: node.start, end: node.end });
}
}
@ -110,7 +110,7 @@ export default function a11y(
const href = attributeMap.get(attribute);
const value = getStaticAttributeValue(node, attribute);
if (value === '' || value === '#') {
validator.warn(`A11y: '${value}' is not a valid ${attribute} attribute`, href.start);
validator.warn(`A11y: '${value}' is not a valid ${attribute} attribute`, { start: href.start, end: href.end });
}
}
@ -122,7 +122,7 @@ export default function a11y(
// anchor-in-svg-is-valid
shouldHaveValidHref('xlink:href')
} else {
validator.warn(`A11y: <a> element should have an href attribute`, node.start);
validator.warn(`A11y: <a> element should have an href attribute`, { start: node.start, end: node.end });
}
// anchor-has-content
@ -141,7 +141,8 @@ export default function a11y(
shouldHaveContent();
if (attributeMap.has('aria-hidden')) {
validator.warn(`A11y: <${node.name}> element should not be hidden`, attributeMap.get('aria-hidden').start);
const attr = attributeMap.get('aria-hidden');
validator.warn(`A11y: <${node.name}> element should not be hidden`, { start: attr.start, end: attr.end });
}
}
@ -157,14 +158,14 @@ export default function a11y(
// no-distracting-elements
if (node.name === 'marquee' || node.name === 'blink') {
validator.warn(`A11y: Avoid <${node.name}> elements`, node.start);
validator.warn(`A11y: Avoid <${node.name}> elements`, { start: node.start, end: node.end });
}
if (node.name === 'figcaption') {
const parent = elementStack[elementStack.length - 1];
if (parent) {
if (parent.name !== 'figure') {
validator.warn(`A11y: <figcaption> must be an immediate child of <figure>`, node.start);
validator.warn(`A11y: <figcaption> must be an immediate child of <figure>`, { start: node.start, end: node.end });
} else {
const children = parent.children.filter(node => {
if (node.type === 'Comment') return false;
@ -175,7 +176,7 @@ export default function a11y(
const index = children.indexOf(node);
if (index !== 0 && index !== children.length - 1) {
validator.warn(`A11y: <figcaption> must be first or last child of <figure>`, node.start);
validator.warn(`A11y: <figcaption> must be first or last child of <figure>`, { start: node.start, end: node.end });
}
}
}

6
src/validate/html/index.ts
Unescape View File

@ -52,7 +52,7 @@ export default function validateHtml(validator: Validator, html: Node) {
else if (node.type === 'EachBlock') {
if (validator.helpers.has(node.context)) {
let c = node.expression.end;
let c: number = node.expression.end;
// find start of context
while (/\s/.test(validator.source[c])) c += 1;
@ -61,13 +61,13 @@ export default function validateHtml(validator: Validator, html: Node) {
validator.warn(
`Context clashes with a helper. Rename one or the other to eliminate any ambiguity`,
c
{ start: c, end: c + node.context.length }
);
}
}
if (validator.options.dev && isEmptyBlock(node)) {
validator.warn('Empty block', node.start);
validator.warn('Empty block', { start: node.start, end: node.end });
}
if (node.children) {

4
src/validate/html/validateElement.ts
Unescape View File

@ -20,13 +20,13 @@ export default function validateElement(
if (!isComponent && /^[A-Z]/.test(node.name[0])) {
// TODO upgrade to validator.error in v2
validator.warn(`${node.name} component is not defined`, node.start);
validator.warn(`${node.name} component is not defined`, { start: node.start, end: node.end });
}
if (elementStack.length === 0 && validator.namespace !== namespaces.svg && svg.test(node.name)) {
validator.warn(
`<${node.name}> is an SVG element – did you forget to add { namespace: 'svg' } ?`,
node.start
{ start: node.start, end: node.end }
);
}

7
src/validate/html/validateEventHandler.ts
Unescape View File

@ -30,7 +30,10 @@ export default function validateEventHandlerCallee(
if (name === 'store' && attribute.expression.callee.type === 'MemberExpression') {
if (!validator.options.store) {
validator.warn('compile with `store: true` in order to call store methods', attribute.expression.start);
validator.warn(
'compile with `store: true` in order to call store methods',
{ start: attribute.expression.start, end: attribute.expression.end }
);
}
return;
}
@ -56,5 +59,5 @@ export default function validateEventHandlerCallee(
message += `. '${callee.name}' exists on 'helpers', did you put it in the wrong place?`;
}
validator.warn(message, start);
validator.warn(message, { start: attribute.expression.start, end: attribute.expression.end });
}

16
src/validate/index.ts
Unescape View File

@ -70,19 +70,21 @@ export class Validator {
throw new ValidationError(message, this.source, pos, this.filename);
}
warn(message: string, pos: number) {
warn(message: string, pos: { start: number, end: number }) {
if (!this.locator) this.locator = getLocator(this.source);
const { line, column } = this.locator(pos);
const start = this.locator(pos.start);
const end = this.locator(pos.end);
const frame = getCodeFrame(this.source, line, column);
const frame = getCodeFrame(this.source, start.line, start.column);
this.onwarn({
message,
frame,
loc: { line: line + 1, column },
pos,
loc: { line: start.line + 1, column: start.column },
end: { line: end.line + 1, column: end.column },
pos: pos.start,
filename: this.filename,
toString: () => `${message} (${line + 1}:${column})\n${frame}`,
toString: () => `${message} (${start.line + 1}:${start.column})\n${frame}`,
});
}
}
@ -148,7 +150,7 @@ export default function validate(
if (!validator.used[category].has(name)) {
validator.warn(
`The '${name}' ${categories[category]} is unused`,
prop.start
{ start: prop.start, end: prop.end }
);
}
});

2
src/validate/js/propValidators/components.ts
Unescape View File

@ -26,7 +26,7 @@ export default function components(validator: Validator, prop: Node) {
}
if (!/^[A-Z]/.test(name)) {
validator.warn(`Component names should be capitalised`, component.start);
validator.warn(`Component names should be capitalised`, { start: component.start, end: component.end });
}
});
}

2
src/validate/js/propValidators/helpers.ts
Unescape View File

@ -43,7 +43,7 @@ export default function helpers(validator: Validator, prop: Node) {
if (prop.value.params.length === 0 && !usesArguments) {
validator.warn(
`Helpers should be pure functions, with at least one argument`,
prop.start
{ start: prop.start, end: prop.end }
);
}
});

2
src/validate/js/propValidators/onrender.ts
Unescape View File

@ -5,7 +5,7 @@ import { Node } from '../../../interfaces';
export default function onrender(validator: Validator, prop: Node) {
validator.warn(
`'onrender' has been deprecated in favour of 'oncreate', and will cause an error in Svelte 2.x`,
prop.start
{ start: prop.start, end: prop.end }
);
oncreate(validator, prop);
}

2
src/validate/js/propValidators/onteardown.ts
Unescape View File

@ -5,7 +5,7 @@ import { Node } from '../../../interfaces';
export default function onteardown(validator: Validator, prop: Node) {
validator.warn(
`'onteardown' has been deprecated in favour of 'ondestroy', and will cause an error in Svelte 2.x`,
prop.start
{ start: prop.start, end: prop.end }
);
ondestroy(validator, prop);
}

3
test/validator/index.js
Unescape View File

@ -31,7 +31,8 @@ describe("validate", () => {
warnings.push({
message: warning.message,
pos: warning.pos,
loc: warning.loc
loc: warning.loc,
end: warning.end,
});
},
dev: config.dev

16
test/validator/samples/a11y-alt-text/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 19
},
"pos": 0
},
@ -14,6 +18,10 @@
"line": 4,
"column": 1
},
"end": {
"line": 4,
"column": 7
},
"pos": 28
},
@ -23,6 +31,10 @@
"line": 7,
"column": 0
},
"end": {
"line": 7,
"column": 17
},
"pos": 43
},
@ -32,6 +44,10 @@
"line": 9,
"column": 0
},
"end": {
"line": 9,
"column": 20
},
"pos": 62
}
]

4
test/validator/samples/a11y-anchor-has-content/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 19
},
"pos": 0
}]

12
test/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 37
},
"pos": 11
},
{
@ -13,6 +17,10 @@
"line": 2,
"column": 14
},
"end": {
"line": 2,
"column": 27
},
"pos": 65
},
{
@ -21,6 +29,10 @@
"line": 3,
"column": 14
},
"end": {
"line": 3,
"column": 28
},
"pos": 130
}
]

12
test/validator/samples/a11y-anchor-is-valid/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 26
},
"pos": 0
},
{
@ -13,6 +17,10 @@
"line": 2,
"column": 3
},
"end": {
"line": 2,
"column": 10
},
"pos": 30
},
{
@ -21,6 +29,10 @@
"line": 3,
"column": 3
},
"end": {
"line": 3,
"column": 11
},
"pos": 53
}
]

8
test/validator/samples/a11y-aria-props/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 1,
"column": 20
},
"end": {
"line": 1,
"column": 40
},
"pos": 20
},
@ -14,6 +18,10 @@
"column": 0,
"line": 1
},
"end": {
"line": 1,
"column": 41
},
"pos": 0
}
]

4
test/validator/samples/a11y-aria-role/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 20
},
"pos": 5
}
]

8
test/validator/samples/a11y-aria-unsupported-element/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 1,
"column": 6
},
"end": {
"line": 1,
"column": 25
},
"pos": 6
},
@ -14,6 +18,10 @@
"line": 2,
"column": 6
},
"end": {
"line": 2,
"column": 20
},
"pos": 33
}
]

8
test/validator/samples/a11y-figcaption-wrong-place/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 4,
"column": 1
},
"end": {
"line": 6,
"column": 14
},
"pos": 57
},
{
@ -13,6 +17,10 @@
"line": 15,
"column": 2
},
"end": {
"line": 17,
"column": 15
},
"pos": 252
}
]

8
test/validator/samples/a11y-heading-has-content/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 9
},
"pos": 0
},
@ -14,6 +18,10 @@
"line": 2,
"column": 4
},
"end": {
"line": 2,
"column": 15
},
"pos": 14
}
]

4
test/validator/samples/a11y-html-has-lang/warnings.json
Unescape View File

@ -4,6 +4,10 @@
"column": 0,
"line": 5
},
"end": {
"line": 5,
"column": 13
},
"message": "A11y: <html> element should have a lang attribute",
"pos": 84
}

4
test/validator/samples/a11y-iframe-has-title/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 31
},
"pos": 0
}
]

4
test/validator/samples/a11y-no-access-key/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 18
},
"pos": 5
}]

4
test/validator/samples/a11y-no-autofocus/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 14
},
"pos": 5
}]

8
test/validator/samples/a11y-no-distracting-elements/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 10
},
"pos": 0
},
@ -14,6 +18,10 @@
"line": 2,
"column": 0
},
"end": {
"line": 2,
"column": 8
},
"pos": 11
}
]

4
test/validator/samples/a11y-not-on-components/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"column": 8,
"line": 2
},
"end": {
"line": 2,
"column": 17
},
"pos": 29
}
]

4
test/validator/samples/a11y-scope/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 10
},
"pos": 5
}
]

4
test/validator/samples/a11y-tabindex-no-positive/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 3,
"column": 5
},
"end": {
"line": 3,
"column": 17
},
"pos": 46
}
]

8
test/validator/samples/empty-block-dev/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 9
},
"pos": 0
},
{
@ -13,6 +17,10 @@
"line": 5,
"column": 0
},
"end": {
"line": 5,
"column": 34
},
"pos": 38
}
]

4
test/validator/samples/helper-clash-context/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"line": 1,
"column": 18
},
"end": {
"line": 1,
"column": 23
},
"pos": 18
}]

4
test/validator/samples/helper-purity-check-needs-arguments/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"loc": {
"line": 6,
"column": 3
},
"end": {
"line": 8,
"column": 4
}
}]

4
test/validator/samples/method-nonexistent-helper/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"loc": {
"line": 1,
"column": 18
},
"end": {
"line": 1,
"column": 23
}
}]

4
test/validator/samples/method-nonexistent/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"loc": {
"line": 1,
"column": 18
},
"end": {
"line": 1,
"column": 23
}
}]

4
test/validator/samples/missing-component/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"line": 2,
"column": 1
},
"end": {
"line": 2,
"column": 10
},
"pos": 7
}]

4
test/validator/samples/properties-components-should-be-capitalised/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"line": 6,
"column": 3
},
"end": {
"line": 6,
"column": 6
},
"pos": 59
}]

4
test/validator/samples/store-unexpected/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"line": 1,
"column": 18
},
"end": {
"line": 1,
"column": 29
},
"pos": 18
}]

20
test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
Unescape View File

@ -4,6 +4,10 @@
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 65
},
"pos": 0
},
{
@ -12,6 +16,10 @@
"column": 1,
"line": 5
},
"end": {
"line": 5,
"column": 66
},
"pos": 90
},
{
@ -20,6 +28,10 @@
"column": 2,
"line": 10
},
"end": {
"line": 10,
"column": 67
},
"pos": 191
},
{
@ -28,6 +40,10 @@
"column": 2,
"line": 20
},
"end": {
"line": 20,
"column": 67
},
"pos": 333
},
{
@ -36,5 +52,9 @@
"column": 2,
"line": 26
},
"end": {
"line": 26,
"column": 67
},
"pos": 445
}]

8
test/validator/samples/unused-components/warnings.json
Unescape View File

@ -5,6 +5,10 @@
"line": 7,
"column": 3
},
"end": {
"line": 7,
"column": 6
},
"pos": 109
},
{
@ -13,6 +17,10 @@
"line": 8,
"column": 3
},
"end": {
"line": 8,
"column": 6
},
"pos": 117
}
]

4
test/validator/samples/unused-event/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"line": 4,
"column": 3
},
"end": {
"line": 6,
"column": 4
},
"pos": 42
}]

4
test/validator/samples/unused-transition/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"line": 4,
"column": 3
},
"end": {
"line": 6,
"column": 4
},
"pos": 47
}]

4
test/validator/samples/window-event-invalid/warnings.json
Unescape View File

@ -4,5 +4,9 @@
"line": 1,
"column": 20
},
"end": {
"line": 1,
"column": 28
},
"pos": 20
}]

Write Preview
Loading…
Cancel
Save