chore(plugin-typescript): fix some tests

JamesHenry · JamesHenry · commit f67978697722 · 2019-01-18T07:42:16.000-05:00
diff --git a/packages/eslint-plugin-typescript/lib/rules/adjacent-overload-signatures.js b/packages/eslint-plugin-typescript/lib/rules/adjacent-overload-signatures.js
@@ -47,7 +47,7 @@ module.exports = {
           // have no declarations, so ignore them
           return member.declaration ? getMemberName(member.declaration) : null;
         }
-        case 'DeclareFunction':
+        case 'TSDeclareFunction':
         case 'FunctionDeclaration':
         case 'TSNamespaceFunctionDeclaration':
         case 'TSEmptyBodyFunctionDeclaration':
@@ -60,10 +60,10 @@ module.exports = {
             (member.name && (member.name.name || member.name.value))
           );
         }
-        case 'TSCallSignature': {
+        case 'TSCallSignatureDeclaration': {
           return 'call';
         }
-        case 'TSConstructSignature': {
+        case 'TSConstructSignatureDeclaration': {
           return 'new';
         }
         case 'MethodDefinition': {
diff --git a/packages/eslint-plugin-typescript/lib/rules/member-ordering.js b/packages/eslint-plugin-typescript/lib/rules/member-ordering.js
@@ -217,7 +217,7 @@ module.exports = {
         case 'TSPropertySignature':
         case 'TSMethodSignature':
           return node.key.name;
-        case 'TSConstructSignature':
+        case 'TSConstructSignatureDeclaration':
           return 'new';
         default:
           return null;
diff --git a/packages/eslint-plugin-typescript/lib/rules/no-object-literal-type-assertion.js b/packages/eslint-plugin-typescript/lib/rules/no-object-literal-type-assertion.js
@@ -38,8 +38,8 @@ module.exports = {
      * @returns {*} true or false
      */
     function checkType(node) {
-      if (node && node.type === 'TSTypeAnnotation' && node.typeAnnotation) {
-        switch (node.typeAnnotation.type) {
+      if (node) {
+        switch (node.type) {
           case 'TSAnyKeyword':
           case 'TSUnknownKeyword':
             return false;
@@ -51,7 +51,7 @@ module.exports = {
     }
 
     return {
-      'TSTypeAssertionExpression, TSAsExpression'(node) {
+      'TSTypeAssertion, TSAsExpression'(node) {
         if (
           checkType(node.typeAnnotation) &&
           node.expression.type === 'ObjectExpression'
diff --git a/packages/eslint-plugin-typescript/lib/rules/no-unused-vars.js b/packages/eslint-plugin-typescript/lib/rules/no-unused-vars.js
@@ -53,7 +53,7 @@ module.exports = Object.assign({}, baseRule, {
       'TSTypeReference Identifier'(node) {
         context.markVariableAsUsed(node.name);
       },
-      'ClassImplements Identifier'(node) {
+      'TSClassImplements Identifier'(node) {
         context.markVariableAsUsed(node.name);
       },
       'TSParameterProperty Identifier'(node) {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ module.exports = {`
`47`	`47`	`// have no declarations, so ignore them`
`48`	`48`	`return member.declaration ? getMemberName(member.declaration) : null;`
`49`	`49`	`}`
`50`		`- case 'DeclareFunction':`
	`50`	`+ case 'TSDeclareFunction':`
`51`	`51`	`case 'FunctionDeclaration':`
`52`	`52`	`case 'TSNamespaceFunctionDeclaration':`
`53`	`53`	`case 'TSEmptyBodyFunctionDeclaration':`
`@@ -60,10 +60,10 @@ module.exports = {`
`60`	`60`	`(member.name && (member.name.name \|\| member.name.value))`
`61`	`61`	`);`
`62`	`62`	`}`
`63`		`- case 'TSCallSignature': {`
	`63`	`+ case 'TSCallSignatureDeclaration': {`
`64`	`64`	`return 'call';`
`65`	`65`	`}`
`66`		`- case 'TSConstructSignature': {`
	`66`	`+ case 'TSConstructSignatureDeclaration': {`
`67`	`67`	`return 'new';`
`68`	`68`	`}`
`69`	`69`	`case 'MethodDefinition': {`