Merge remote-tracking branch 'upstream/main'

ow3org · Nov 10, 2022 · 311081c · 311081c
2 parents 28c48af + f8014b7
commit 311081c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/eslint-plugin-ow3/src/rules/generic-spacing.test.ts b/packages/eslint-plugin-ow3/src/rules/generic-spacing.test.ts
@@ -20,6 +20,9 @@ type Foo<
   `interface Log {
   <T>(name: T): void
 }`,
+`interface Foo {
+  foo?: <T>(name: T) => void
+}`,
 ]
 const invalids = [
   ['type Foo<T=true> = T', 'type Foo<T = true> = T'],

diff --git a/packages/eslint-plugin-ow3/src/rules/generic-spacing.ts b/packages/eslint-plugin-ow3/src/rules/generic-spacing.ts
@@ -23,7 +23,7 @@ export default createEslintRule<Options, MessageIds>({
     const sourceCode = context.getSourceCode()
     return {
       TSTypeParameterDeclaration: (node) => {
-        if (!['TSCallSignatureDeclaration', 'ArrowFunctionExpression'].includes(node.parent.type)) {
+        if (!['TSCallSignatureDeclaration', 'ArrowFunctionExpression', 'TSFunctionType'].includes(node.parent.type)) {
           const pre = sourceCode.text.slice(0, node.range[0])
           const preSpace = pre.match(/(\s+)$/)?.[0]
           // strip space before <T>