From 38e6147117eb8b89c2fe98a0cef565d4c435fb46 Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Wed, 24 Jul 2024 23:48:43 +0200 Subject: [PATCH] tweak error messages --- .../svelte/messages/compile-errors/style.md | 18 +++++----- packages/svelte/src/compiler/errors.js | 36 +++++++++---------- .../css-global-block-combinator-2/_config.js | 2 +- .../css-global-block-combinator/_config.js | 2 +- .../css-global-block-declaration/_config.js | 2 +- .../css-global-block-multiple/_config.js | 2 +- .../css-global-modifier-start-1/_config.js | 2 +- .../css-global-modifier-start-2/_config.js | 2 +- .../samples/css-global-modifier/_config.js | 2 +- .../errors.json | 2 +- .../errors.json | 2 +- .../errors.json | 2 +- .../errors.json | 2 +- .../errors.json | 2 +- .../css-invalid-global-placement/errors.json | 2 +- .../css-invalid-global-selector-2/errors.json | 2 +- .../css-invalid-global-selector-3/errors.json | 2 +- .../css-invalid-global-selector-4/errors.json | 2 +- .../css-invalid-global-selector-5/errors.json | 2 +- .../css-invalid-global-selector-6/errors.json | 2 +- .../errors.json | 2 +- .../css-invalid-global-selector/errors.json | 2 +- .../errors.json | 2 +- 23 files changed, 48 insertions(+), 48 deletions(-) diff --git a/packages/svelte/messages/compile-errors/style.md b/packages/svelte/messages/compile-errors/style.md index 1bced94218..c151fa534a 100644 --- a/packages/svelte/messages/compile-errors/style.md +++ b/packages/svelte/messages/compile-errors/style.md @@ -8,35 +8,35 @@ ## css_global_block_invalid_combinator -> A :global {...} block cannot follow a %name% combinator +> A `:global` selector cannot follow a `%name%` combinator ## css_global_block_invalid_declaration -> A :global {...} block can only contain rules, not declarations +> A `:global {...}` block can only contain rules, not declarations ## css_global_block_invalid_list -> A :global {...} block cannot be part of a selector list with more than one item +> A `:global` selector cannot be part of a selector list with more than one item ## css_global_block_invalid_modifier -> A :global {...} block cannot modify an existing selector +> A `:global` selector cannot modify an existing selector ## css_global_block_invalid_modifier_start -> A :global {...} block at the very beginning cannot be modified by other selectors +> A `:global` selector at the very beginning cannot be modified by other selectors ## css_global_invalid_placement -> :global(...) can be at the start or end of a selector sequence, but not in the middle +> `:global(...)` can be at the start or end of a selector sequence, but not in the middle ## css_global_invalid_selector -> :global(...) must contain exactly one selector +> `:global(...)` must contain exactly one selector ## css_global_invalid_selector_list -> :global(...) must not contain type or universal selectors when used in a compound selector +> `:global(...)` must not contain type or universal selectors when used in a compound selector ## css_nesting_selector_invalid_placement @@ -48,4 +48,4 @@ ## css_type_selector_invalid_placement -> :global(...) must not be followed with a type selector +> `:global(...)` must not be followed with a type selector diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js index 6ba38f37ea..4e86980061 100644 --- a/packages/svelte/src/compiler/errors.js +++ b/packages/svelte/src/compiler/errors.js @@ -434,76 +434,76 @@ export function css_expected_identifier(node) { } /** - * A :global {...} block cannot follow a %name% combinator + * A `:global` selector cannot follow a `%name%` combinator * @param {null | number | NodeLike} node * @param {string} name * @returns {never} */ export function css_global_block_invalid_combinator(node, name) { - e(node, "css_global_block_invalid_combinator", `A :global {...} block cannot follow a ${name} combinator`); + e(node, "css_global_block_invalid_combinator", `A \`:global\` selector cannot follow a \`${name}\` combinator`); } /** - * A :global {...} block can only contain rules, not declarations + * A `:global {...}` block can only contain rules, not declarations * @param {null | number | NodeLike} node * @returns {never} */ export function css_global_block_invalid_declaration(node) { - e(node, "css_global_block_invalid_declaration", "A :global {...} block can only contain rules, not declarations"); + e(node, "css_global_block_invalid_declaration", "A `:global {...}` block can only contain rules, not declarations"); } /** - * A :global {...} block cannot be part of a selector list with more than one item + * A `:global` selector cannot be part of a selector list with more than one item * @param {null | number | NodeLike} node * @returns {never} */ export function css_global_block_invalid_list(node) { - e(node, "css_global_block_invalid_list", "A :global {...} block cannot be part of a selector list with more than one item"); + e(node, "css_global_block_invalid_list", "A `:global` selector cannot be part of a selector list with more than one item"); } /** - * A :global {...} block cannot modify an existing selector + * A `:global` selector cannot modify an existing selector * @param {null | number | NodeLike} node * @returns {never} */ export function css_global_block_invalid_modifier(node) { - e(node, "css_global_block_invalid_modifier", "A :global {...} block cannot modify an existing selector"); + e(node, "css_global_block_invalid_modifier", "A `:global` selector cannot modify an existing selector"); } /** - * A :global {...} block at the very beginning cannot be modified by other selectors + * A `:global` selector at the very beginning cannot be modified by other selectors * @param {null | number | NodeLike} node * @returns {never} */ export function css_global_block_invalid_modifier_start(node) { - e(node, "css_global_block_invalid_modifier_start", "A :global {...} block at the very beginning cannot be modified by other selectors"); + e(node, "css_global_block_invalid_modifier_start", "A `:global` selector at the very beginning cannot be modified by other selectors"); } /** - * :global(...) can be at the start or end of a selector sequence, but not in the middle + * `:global(...)` can be at the start or end of a selector sequence, but not in the middle * @param {null | number | NodeLike} node * @returns {never} */ export function css_global_invalid_placement(node) { - e(node, "css_global_invalid_placement", ":global(...) can be at the start or end of a selector sequence, but not in the middle"); + e(node, "css_global_invalid_placement", "`:global(...)` can be at the start or end of a selector sequence, but not in the middle"); } /** - * :global(...) must contain exactly one selector + * `:global(...)` must contain exactly one selector * @param {null | number | NodeLike} node * @returns {never} */ export function css_global_invalid_selector(node) { - e(node, "css_global_invalid_selector", ":global(...) must contain exactly one selector"); + e(node, "css_global_invalid_selector", "`:global(...)` must contain exactly one selector"); } /** - * :global(...) must not contain type or universal selectors when used in a compound selector + * `:global(...)` must not contain type or universal selectors when used in a compound selector * @param {null | number | NodeLike} node * @returns {never} */ export function css_global_invalid_selector_list(node) { - e(node, "css_global_invalid_selector_list", ":global(...) must not contain type or universal selectors when used in a compound selector"); + e(node, "css_global_invalid_selector_list", "`:global(...)` must not contain type or universal selectors when used in a compound selector"); } /** @@ -525,12 +525,12 @@ export function css_selector_invalid(node) { } /** - * :global(...) must not be followed with a type selector + * `:global(...)` must not be followed with a type selector * @param {null | number | NodeLike} node * @returns {never} */ export function css_type_selector_invalid_placement(node) { - e(node, "css_type_selector_invalid_placement", ":global(...) must not be followed with a type selector"); + e(node, "css_type_selector_invalid_placement", "`:global(...)` must not be followed with a type selector"); } /** diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator-2/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator-2/_config.js index 317bd554d7..2c22b248d3 100644 --- a/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator-2/_config.js +++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator-2/_config.js @@ -3,7 +3,7 @@ import { test } from '../../test'; export default test({ error: { code: 'css_global_block_invalid_combinator', - message: 'A :global {...} block cannot follow a > combinator', + message: 'A `:global` selector cannot follow a `>` combinator', position: [79, 88] } }); diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js index f5e0f08b44..3d701e10b7 100644 --- a/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js +++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-combinator/_config.js @@ -3,7 +3,7 @@ import { test } from '../../test'; export default test({ error: { code: 'css_global_block_invalid_combinator', - message: 'A :global {...} block cannot follow a > combinator', + message: 'A `:global` selector cannot follow a `>` combinator', position: [54, 63] } }); diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js index 37ac580e0a..e3b11f44eb 100644 --- a/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js +++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-declaration/_config.js @@ -3,7 +3,7 @@ import { test } from '../../test'; export default test({ error: { code: 'css_global_block_invalid_declaration', - message: 'A :global {...} block can only contain rules, not declarations', + message: 'A `:global {...}` block can only contain rules, not declarations', position: [109, 119] } }); diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js index 9f06599f7a..9ae4e758c4 100644 --- a/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js +++ b/packages/svelte/tests/compiler-errors/samples/css-global-block-multiple/_config.js @@ -3,7 +3,7 @@ import { test } from '../../test'; export default test({ error: { code: 'css_global_block_invalid_list', - message: 'A :global {...} block cannot be part of a selector list with more than one item', + message: 'A `:global` selector cannot be part of a selector list with more than one item', position: [9, 31] } }); diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-modifier-start-1/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-modifier-start-1/_config.js index fbbb82cc17..be8a7aae24 100644 --- a/packages/svelte/tests/compiler-errors/samples/css-global-modifier-start-1/_config.js +++ b/packages/svelte/tests/compiler-errors/samples/css-global-modifier-start-1/_config.js @@ -3,7 +3,7 @@ import { test } from '../../test'; export default test({ error: { code: 'css_global_block_invalid_modifier_start', - message: 'A :global {...} block at the very beginning cannot be modified by other selectors', + message: 'A `:global` selector at the very beginning cannot be modified by other selectors', position: [75, 77] } }); diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-modifier-start-2/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-modifier-start-2/_config.js index 40ac5a108d..9129962c09 100644 --- a/packages/svelte/tests/compiler-errors/samples/css-global-modifier-start-2/_config.js +++ b/packages/svelte/tests/compiler-errors/samples/css-global-modifier-start-2/_config.js @@ -3,7 +3,7 @@ import { test } from '../../test'; export default test({ error: { code: 'css_global_block_invalid_modifier_start', - message: 'A :global {...} block at the very beginning cannot be modified by other selectors', + message: 'A `:global` selector at the very beginning cannot be modified by other selectors', position: [147, 148] } }); diff --git a/packages/svelte/tests/compiler-errors/samples/css-global-modifier/_config.js b/packages/svelte/tests/compiler-errors/samples/css-global-modifier/_config.js index 200967d90f..3659ac1d44 100644 --- a/packages/svelte/tests/compiler-errors/samples/css-global-modifier/_config.js +++ b/packages/svelte/tests/compiler-errors/samples/css-global-modifier/_config.js @@ -3,7 +3,7 @@ import { test } from '../../test'; export default test({ error: { code: 'css_global_block_invalid_modifier', - message: 'A :global {...} block cannot modify an existing selector', + message: 'A `:global` selector cannot modify an existing selector', position: [70, 77] } }); diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json index cf556bf4c4..bab7b8a9e9 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-2/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_placement", - "message": ":global(...) can be at the start or end of a selector sequence, but not in the middle", + "message": "`:global(...)` can be at the start or end of a selector sequence, but not in the middle", "start": { "line": 8, "column": 6 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json index 164daa5796..8ca06aa625 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-3/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_placement", - "message": ":global(...) can be at the start or end of a selector sequence, but not in the middle", + "message": "`:global(...)` can be at the start or end of a selector sequence, but not in the middle", "start": { "line": 5, "column": 6 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json index 7b63fe4d7a..bf3dce8b7f 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-4/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_selector_list", - "message": ":global(...) must not contain type or universal selectors when used in a compound selector", + "message": "`:global(...)` must not contain type or universal selectors when used in a compound selector", "start": { "line": 2, "column": 5 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json index fcc75beb5c..6260b09743 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-5/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_selector_list", - "message": ":global(...) must not contain type or universal selectors when used in a compound selector", + "message": "`:global(...)` must not contain type or universal selectors when used in a compound selector", "start": { "line": 2, "column": 5 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json index e1bc38e0f1..1af01bce50 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement-6/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_selector_list", - "message": ":global(...) must not contain type or universal selectors when used in a compound selector", + "message": "`:global(...)` must not contain type or universal selectors when used in a compound selector", "start": { "line": 5, "column": 5 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json index 0b641f2115..484319ef06 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-placement/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_placement", - "message": ":global(...) can be at the start or end of a selector sequence, but not in the middle", + "message": "`:global(...)` can be at the start or end of a selector sequence, but not in the middle", "start": { "line": 2, "column": 6 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json index d0be529197..d61411ee96 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-2/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_selector", - "message": ":global(...) must contain exactly one selector", + "message": "`:global(...)` must contain exactly one selector", "start": { "line": 11, "column": 5 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json index d37ff8d5d1..722e8be23f 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-3/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_selector", - "message": ":global(...) must contain exactly one selector", + "message": "`:global(...)` must contain exactly one selector", "start": { "line": 5, "column": 5 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json index c05bb647ad..9a20737c5d 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-4/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_selector", - "message": ":global(...) must contain exactly one selector", + "message": "`:global(...)` must contain exactly one selector", "start": { "line": 2, "column": 5 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json index b1d79c25b8..5317179d5b 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-5/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_selector", - "message": ":global(...) must contain exactly one selector", + "message": "`:global(...)` must contain exactly one selector", "start": { "line": 5, "column": 1 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json index b1d79c25b8..5317179d5b 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-6/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_selector", - "message": ":global(...) must contain exactly one selector", + "message": "`:global(...)` must contain exactly one selector", "start": { "line": 5, "column": 1 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json index e9261e5e1c..406fd6129c 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector-list/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_selector_list", - "message": ":global(...) must not contain type or universal selectors when used in a compound selector", + "message": "`:global(...)` must not contain type or universal selectors when used in a compound selector", "start": { "line": 20, "column": 6 diff --git a/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json b/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json index 3d96fbc1ff..3d8ae68ec0 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-global-selector/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_global_invalid_selector", - "message": ":global(...) must contain exactly one selector", + "message": "`:global(...)` must contain exactly one selector", "start": { "line": 11, "column": 5 diff --git a/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json b/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json index e7c461b699..b15c8d623c 100644 --- a/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json +++ b/packages/svelte/tests/validator/samples/css-invalid-type-selector-placement/errors.json @@ -1,7 +1,7 @@ [ { "code": "css_type_selector_invalid_placement", - "message": ":global(...) must not be followed with a type selector", + "message": "`:global(...)` must not be followed with a type selector", "start": { "line": 17, "column": 14