Mar 1, 2022 · Feb 22, 2022 · Feb 27, 2022 · Feb 27, 2022 · Mar 1, 2022 · Mar 1, 2022
diff --git a/packages/eslint-plugin/src/rules/naming-convention-utils/validator.ts b/packages/eslint-plugin/src/rules/naming-convention-utils/validator.ts
        return;
      }

      if (!validatePredefinedFormat(config, name, node, originalName)) {
      if (
        !validatePredefinedFormat(config, name, node, originalName, modifiers)
      ) {
        // fail
        return;
      }
    name: string,
    node: TSESTree.Identifier | TSESTree.PrivateIdentifier | TSESTree.Literal,
    originalName: string,
    modifiers: Set<Modifiers>,
  ): boolean {
    const formats = config.format;
    if (formats === null || formats.length === 0) {
      return true;
    }

    for (const format of formats) {
      const checker = PredefinedFormatToCheckFunction[format];
      if (checker(name)) {
        return true;
    if (!modifiers.has(Modifiers.requiresQuotes)) {
      for (const format of formats) {
        const checker = PredefinedFormatToCheckFunction[format];
        if (checker(name)) {
          return true;
        }
      }
    }

diff --git a/packages/eslint-plugin/tests/rules/naming-convention.test.ts b/packages/eslint-plugin/tests/rules/naming-convention.test.ts
  Selector,
  selectorTypeToMessageString,
 } from '../../src/rules/naming-convention-utils';
 import { getFixturesRootDir, RuleTester } from '../RuleTester';
 import { getFixturesRootDir,noFormat,RuleTester } from '../RuleTester';

 const ruleTester = new RuleTester({
  parser: '@typescript-eslint/parser',
      ],
      errors: Array(13).fill({ messageId: 'doesNotMatchFormat' }),
    },
    {
      code: noFormat`
        type Foo = {
          'foo     Bar': string;
          '': string;
          '0': string;
          'foo': string;
          'foo-bar': string;
          '#foo-bar': string;
        };

        interface Bar {
          'boo-----foo': string;
        }
      `,
      // 6, not 7 because 'foo' is valid
      errors: Array(6).fill({ messageId: 'doesNotMatchFormat' }),
    },
  ],
 });
Original file line number	Diff line number	Diff line change
Expand Up		@@ -127,7 +127,9 @@ function createValidator(
		return;
		}

		if (!validatePredefinedFormat(config, name, node, originalName)) {
		if (
		!validatePredefinedFormat(config, name, node, originalName, modifiers)
		) {
		// fail
		return;
		}
Expand DownExpand Up		@@ -376,16 +378,19 @@ function createValidator(
		name: string,
		node: TSESTree.Identifier \| TSESTree.PrivateIdentifier \| TSESTree.Literal,
		originalName: string,
		modifiers: Set<Modifiers>,
		): boolean {
		const formats = config.format;
		if (formats === null \|\| formats.length === 0) {
		return true;
		}

		for (const format of formats) {
		const checker = PredefinedFormatToCheckFunction[format];
		if (checker(name)) {
		return true;
		if (!modifiers.has(Modifiers.requiresQuotes)) {
		for (const format of formats) {
		const checker = PredefinedFormatToCheckFunction[format];
		if (checker(name)) {
		return true;
		}
		}
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,7 @@ import {
		Selector,
		selectorTypeToMessageString,
		} from '../../src/rules/naming-convention-utils';
		import { getFixturesRootDir, RuleTester } from '../RuleTester';
		import { getFixturesRootDir,noFormat,RuleTester } from '../RuleTester';

		const ruleTester = new RuleTester({
		parser: '@typescript-eslint/parser',
Expand DownExpand Up		@@ -2224,5 +2224,23 @@ ruleTester.run('naming-convention', rule, {
		],
		errors: Array(13).fill({ messageId: 'doesNotMatchFormat' }),
		},
		{
		code: noFormat`
		type Foo = {
		'foo Bar': string;
lonyele marked this conversation as resolved. Show resolvedHide resolved
		'': string;
		'0': string;
		'foo': string;
		'foo-bar': string;
		'#foo-bar': string;
		};

		interface Bar {
		'boo-----foo': string;
		}
		`,
		// 6, not 7 because 'foo' is valid
		errors: Array(6).fill({ messageId: 'doesNotMatchFormat' }),
bradzacher marked this conversation as resolved. Show resolvedHide resolved
		},
		],
		});