Skip to content

Commit 8399ce0

Browse files
Lightning00BladeDevtools-frontend LUCI CQ
authored and
Devtools-frontend LUCI CQ
committed
[eslint] Fix rule excluded on windows
Missed part while moving the rule to TS Bug: 397586315 Change-Id: Ie5589cd59e8a6c61c1e6d7e37ca8eb223414be05 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6455643 Auto-Submit: Nikolay Vitkov <nvitkov@chromium.org> Reviewed-by: Paul Irish <paulirish@chromium.org> Commit-Queue: Paul Irish <paulirish@chromium.org> Commit-Queue: Nikolay Vitkov <nvitkov@chromium.org>
1 parent d90efb8 commit 8399ce0

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

scripts/eslint_rules/lib/l10n-no-uistrings-export.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default createRule({
3131
},
3232
defaultOptions: [],
3333
create: function(context) {
34-
const filename = context.filename;
34+
const filename = context.filename.replaceAll('\\', '/');
3535
const sourceCode = context.sourceCode;
3636

3737
function removeExportKeywordFromUIStrings(

scripts/eslint_rules/lib/l10n-no-unused-message.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ export default createRule({
5252
defaultOptions: [],
5353
create: function(context) {
5454
// ESLint provides the filename with normalized separators.
55-
const filename = context.filename;
55+
const filename = context.filename.replaceAll(
56+
'\\',
57+
'/',
58+
);
59+
5660
const sourceCode = context.sourceCode;
5761
// Store the Property node itself to report errors and apply fixes
5862
const declaredUIStringsKeys = new Map<string, Property>();
@@ -110,11 +114,8 @@ export default createRule({
110114

111115
return {
112116
VariableDeclarator(node) {
113-
if (MODULE_UI_STRINGS_FILENAME_REGEX.test(filename)) {
114-
return;
115-
}
116-
117-
if (TRACE_INSIGHTS_UI_STRINGS_FILENAME_REGEX.test(filename)) {
117+
if (MODULE_UI_STRINGS_FILENAME_REGEX.test(filename) ||
118+
TRACE_INSIGHTS_UI_STRINGS_FILENAME_REGEX.test(filename)) {
118119
return;
119120
}
120121

scripts/eslint_rules/tests/l10n-no-uistrings-export.test.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ new RuleTester().run('l10n-no-uistrings-export', rule, {
2020
code: 'export const UIStrings = {} as const;',
2121
filename: 'front_end/module/ModuleUIStrings.js',
2222
},
23+
{
24+
code: 'export const UIStrings = {} as const;',
25+
// Emulate Windows path
26+
filename: 'front_end\\module\\ModuleUIStrings.js',
27+
},
2328
],
2429
invalid: [
2530
{

scripts/eslint_rules/tests/l10n-no-unused-message.test.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ new RuleTester().run('l10n-no-unused-message', rule, {
7070
code: 'const UIStrings = {foo: \'bar\' } as const; let someVariable = UIStrings.foo;',
7171
filename: 'front_end/module/test.ts',
7272
},
73+
{
74+
code: 'const UIStrings = {foo: \'bar\' } as const;',
75+
// Emulate Window path
76+
filename: 'front_end\\models\\trace\\insights\\Cache.ts',
77+
},
7378
],
7479
invalid: [
7580
{

0 commit comments

Comments
 (0)