Fix: missing visitor-keys (#554)

- typeParameters in TSInterfaceDeclaration - decorators in Identifier - parameters in TSFunctionType
eslint · Nov 20, 2018 · ae7c4e6 · ae7c4e6
1 parent 9ed21cb
commit ae7c4e6
Show file tree

Hide file tree

Showing 5 changed files with 334 additions and 3 deletions.
diff --git a/analyze-scope.js b/analyze-scope.js
@@ -69,20 +69,29 @@ class EnumScope extends Scope {
 class PatternVisitor extends OriginalPatternVisitor {
     Identifier(node) {
         super.Identifier(node);
+        if (node.decorators) {
+            this.rightHandNodes.push(...node.decorators);
+        }
         if (node.typeAnnotation) {
             this.rightHandNodes.push(node.typeAnnotation);
         }
     }
 
     ArrayPattern(node) {
         node.elements.forEach(this.visit, this);
+        if (node.decorators) {
+            this.rightHandNodes.push(...node.decorators);
+        }
         if (node.typeAnnotation) {
             this.rightHandNodes.push(node.typeAnnotation);
         }
     }
 
     ObjectPattern(node) {
         node.properties.forEach(this.visit, this);
+        if (node.decorators) {
+            this.rightHandNodes.push(...node.decorators);
+        }
         if (node.typeAnnotation) {
             this.rightHandNodes.push(node.typeAnnotation);
         }
@@ -216,9 +225,12 @@ class Referencer extends OriginalReferencer {
      * @returns {void}
      */
     Identifier(node) {
+        this.visitDecorators(node.decorators);
+
         if (!this.typeMode) {
             super.Identifier(node);
         }
+
         this.visit(node.typeAnnotation);
     }
 

diff --git a/tests/fixtures/scope-analysis/identifier-decorators.ts b/tests/fixtures/scope-analysis/identifier-decorators.ts
@@ -0,0 +1,4 @@
+export class Test {
+    constructor(@Decorator config) {
+    }
+}
diff --git a/tests/fixtures/scope-analysis/interface-type.ts b/tests/fixtures/scope-analysis/interface-type.ts
@@ -0,0 +1,7 @@
+interface C<T = any> {
+
+}
+
+interface R<T extends C> {
+    foo: C
+}
diff --git a/tests/lib/__snapshots__/scope-analysis.js.snap b/tests/lib/__snapshots__/scope-analysis.js.snap
@@ -2927,6 +2927,289 @@ Object {
 }
 `;
 
+exports[`TypeScript scope analysis tests/fixtures/scope-analysis/identifier-decorators.ts 1`] = `
+Object {
+  "$id": 8,
+  "block": Object {
+    "range": Array [
+      0,
+      65,
+    ],
+    "type": "Program",
+  },
+  "childScopes": Array [
+    Object {
+      "$id": 7,
+      "block": Object {
+        "range": Array [
+          0,
+          65,
+        ],
+        "type": "Program",
+      },
+      "childScopes": Array [
+        Object {
+          "$id": 6,
+          "block": Object {
+            "range": Array [
+              7,
+              64,
+            ],
+            "type": "ClassDeclaration",
+          },
+          "childScopes": Array [
+            Object {
+              "$id": 5,
+              "block": Object {
+                "range": Array [
+                  35,
+                  62,
+                ],
+                "type": "FunctionExpression",
+              },
+              "childScopes": Array [],
+              "functionExpressionScope": false,
+              "isStrict": true,
+              "references": Array [
+                Object {
+                  "$id": 4,
+                  "from": Object {
+                    "$ref": 5,
+                  },
+                  "identifier": Object {
+                    "name": "Decorator",
+                    "range": Array [
+                      37,
+                      46,
+                    ],
+                    "type": "Identifier",
+                  },
+                  "kind": "r",
+                  "resolved": null,
+                  "writeExpr": undefined,
+                },
+              ],
+              "throughReferences": Array [
+                Object {
+                  "$ref": 4,
+                },
+              ],
+              "type": "function",
+              "upperScope": Object {
+                "$ref": 6,
+              },
+              "variableMap": Object {
+                "arguments": Object {
+                  "$ref": 2,
+                },
+                "config": Object {
+                  "$ref": 3,
+                },
+              },
+              "variableScope": Object {
+                "$ref": 5,
+              },
+              "variables": Array [
+                Object {
+                  "$id": 2,
+                  "defs": Array [],
+                  "eslintUsed": undefined,
+                  "identifiers": Array [],
+                  "name": "arguments",
+                  "references": Array [],
+                  "scope": Object {
+                    "$ref": 5,
+                  },
+                },
+                Object {
+                  "$id": 3,
+                  "defs": Array [
+                    Object {
+                      "name": Object {
+                        "name": "config",
+                        "range": Array [
+                          47,
+                          53,
+                        ],
+                        "type": "Identifier",
+                      },
+                      "node": Object {
+                        "range": Array [
+                          35,
+                          62,
+                        ],
+                        "type": "FunctionExpression",
+                      },
+                      "parent": null,
+                      "type": "Parameter",
+                    },
+                  ],
+                  "eslintUsed": undefined,
+                  "identifiers": Array [
+                    Object {
+                      "name": "config",
+                      "range": Array [
+                        47,
+                        53,
+                      ],
+                      "type": "Identifier",
+                    },
+                  ],
+                  "name": "config",
+                  "references": Array [],
+                  "scope": Object {
+                    "$ref": 5,
+                  },
+                },
+              ],
+            },
+          ],
+          "functionExpressionScope": false,
+          "isStrict": true,
+          "references": Array [],
+          "throughReferences": Array [
+            Object {
+              "$ref": 4,
+            },
+          ],
+          "type": "class",
+          "upperScope": Object {
+            "$ref": 7,
+          },
+          "variableMap": Object {
+            "Test": Object {
+              "$ref": 1,
+            },
+          },
+          "variableScope": Object {
+            "$ref": 7,
+          },
+          "variables": Array [
+            Object {
+              "$id": 1,
+              "defs": Array [
+                Object {
+                  "name": Object {
+                    "name": "Test",
+                    "range": Array [
+                      13,
+                      17,
+                    ],
+                    "type": "Identifier",
+                  },
+                  "node": Object {
+                    "range": Array [
+                      7,
+                      64,
+                    ],
+                    "type": "ClassDeclaration",
+                  },
+                  "parent": undefined,
+                  "type": "ClassName",
+                },
+              ],
+              "eslintUsed": undefined,
+              "identifiers": Array [
+                Object {
+                  "name": "Test",
+                  "range": Array [
+                    13,
+                    17,
+                  ],
+                  "type": "Identifier",
+                },
+              ],
+              "name": "Test",
+              "references": Array [],
+              "scope": Object {
+                "$ref": 6,
+              },
+            },
+          ],
+        },
+      ],
+      "functionExpressionScope": false,
+      "isStrict": true,
+      "references": Array [],
+      "throughReferences": Array [
+        Object {
+          "$ref": 4,
+        },
+      ],
+      "type": "module",
+      "upperScope": Object {
+        "$ref": 8,
+      },
+      "variableMap": Object {
+        "Test": Object {
+          "$ref": 0,
+        },
+      },
+      "variableScope": Object {
+        "$ref": 7,
+      },
+      "variables": Array [
+        Object {
+          "$id": 0,
+          "defs": Array [
+            Object {
+              "name": Object {
+                "name": "Test",
+                "range": Array [
+                  13,
+                  17,
+                ],
+                "type": "Identifier",
+              },
+              "node": Object {
+                "range": Array [
+                  7,
+                  64,
+                ],
+                "type": "ClassDeclaration",
+              },
+              "parent": null,
+              "type": "ClassName",
+            },
+          ],
+          "eslintUsed": undefined,
+          "identifiers": Array [
+            Object {
+              "name": "Test",
+              "range": Array [
+                13,
+                17,
+              ],
+              "type": "Identifier",
+            },
+          ],
+          "name": "Test",
+          "references": Array [],
+          "scope": Object {
+            "$ref": 7,
+          },
+        },
+      ],
+    },
+  ],
+  "functionExpressionScope": false,
+  "isStrict": false,
+  "references": Array [],
+  "throughReferences": Array [
+    Object {
+      "$ref": 4,
+    },
+  ],
+  "type": "global",
+  "upperScope": null,
+  "variableMap": Object {},
+  "variableScope": Object {
+    "$ref": 8,
+  },
+  "variables": Array [],
+}
+`;
+
 exports[`TypeScript scope analysis tests/fixtures/scope-analysis/ignore-type-only-stuff.ts 1`] = `
 Object {
   "$id": 1,
@@ -3003,6 +3286,31 @@ Object {
 }
 `;
 
+exports[`TypeScript scope analysis tests/fixtures/scope-analysis/interface-type.ts 1`] = `
+Object {
+  "$id": 0,
+  "block": Object {
+    "range": Array [
+      0,
+      67,
+    ],
+    "type": "Program",
+  },
+  "childScopes": Array [],
+  "functionExpressionScope": false,
+  "isStrict": false,
+  "references": Array [],
+  "throughReferences": Array [],
+  "type": "global",
+  "upperScope": null,
+  "variableMap": Object {},
+  "variableScope": Object {
+    "$ref": 0,
+  },
+  "variables": Array [],
+}
+`;
+
 exports[`TypeScript scope analysis tests/fixtures/scope-analysis/method-overload.ts 1`] = `
 Object {
   "$id": 10,

diff --git a/visitor-keys.js b/visitor-keys.js
@@ -16,7 +16,7 @@ module.exports = Evk.unionWith({
     ClassExpression: ["decorators", "id", "typeParameters", "superClass", "body"],
     FunctionDeclaration: ["id", "typeParameters", "params", "returnType", "body"],
     FunctionExpression: ["id", "typeParameters", "params", "returnType", "body"],
-    Identifier: ["typeAnnotation"],
+    Identifier: ["decorators", "typeAnnotation"],
     MethodDefinition: ["decorators", "key", "value"],
     ObjectPattern: ["properties", "typeAnnotation"],
 
@@ -46,9 +46,9 @@ module.exports = Evk.unionWith({
     TSLiteralType: ["literal"],
     TSIndexSignature: ["typeAnnotation", "index"],
     TSInterfaceBody: ["body"],
-    TSInterfaceDeclaration: ["body", "id", "heritage"],
+    TSInterfaceDeclaration: ["id", "typeParameters", "heritage", "body"],
     TSInterfaceHeritage: ["id", "typeParameters"],
-    TSFunctionType: ["typeAnnotation"],
+    TSFunctionType: ["parameters", "typeAnnotation"],
     TSMethodSignature: ["typeAnnotation", "typeParameters", "key", "params"],
     TSModuleBlock: ["body"],
     TSModuleDeclaration: ["id", "body"],