Move isJSDocIndexSignature to utilities

sandersn · sandersn · commit f82dd7b1dab6 · 2017-10-18T13:16:22.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -7064,14 +7064,6 @@ namespace ts {
             }
         }
 
-        function isJSDocIndexSignature(node: TypeReferenceNode | ExpressionWithTypeArguments) {
-            return isTypeReferenceNode(node) &&
-                isIdentifier(node.typeName) &&
-                node.typeName.escapedText === "Object" &&
-                node.typeArguments && node.typeArguments.length === 2 &&
-                (node.typeArguments[0].kind === SyntaxKind.StringKeyword || node.typeArguments[0].kind === SyntaxKind.NumberKeyword);
-        }
-
         function getTypeFromJSDocNullableTypeNode(node: JSDocNullableType) {
             const type = getTypeFromTypeNode(node.type);
             return strictNullChecks ? getUnionType([type, nullType]) : type;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -1360,6 +1360,14 @@ namespace ts {
         return node && !!(node.flags & NodeFlags.JSDoc);
     }
 
+    export function isJSDocIndexSignature(node: TypeReferenceNode | ExpressionWithTypeArguments) {
+        return isTypeReferenceNode(node) &&
+            isIdentifier(node.typeName) &&
+            node.typeName.escapedText === "Object" &&
+            node.typeArguments && node.typeArguments.length === 2 &&
+            (node.typeArguments[0].kind === SyntaxKind.StringKeyword || node.typeArguments[0].kind === SyntaxKind.NumberKeyword);
+    }
+
     /**
      * Returns true if the node is a CallExpression to the identifier 'require' with
      * exactly one argument (of the form 'require("name")').
diff --git a/src/services/refactors/annotateWithTypeFromJSDoc.ts b/src/services/refactors/annotateWithTypeFromJSDoc.ts
@@ -249,12 +249,4 @@ namespace ts.refactor.annotateWithTypeFromJSDoc {
         setEmitFlags(indexSignature, EmitFlags.SingleLine);
         return indexSignature;
     }
-
-    function isJSDocIndexSignature(node: TypeReferenceNode | ExpressionWithTypeArguments) {
-        return isTypeReferenceNode(node) &&
-            isIdentifier(node.typeName) &&
-            node.typeName.escapedText === "Object" &&
-            node.typeArguments && node.typeArguments.length === 2 &&
-            (node.typeArguments[0].kind === SyntaxKind.StringKeyword || node.typeArguments[0].kind === SyntaxKind.NumberKeyword);
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -7064,14 +7064,6 @@ namespace ts {`
`7064`	`7064`	`}`
`7065`	`7065`	`}`
`7066`	`7066`
`7067`		`- function isJSDocIndexSignature(node: TypeReferenceNode \| ExpressionWithTypeArguments) {`
`7068`		`- return isTypeReferenceNode(node) &&`
`7069`		`- isIdentifier(node.typeName) &&`
`7070`		`- node.typeName.escapedText === "Object" &&`
`7071`		`- node.typeArguments && node.typeArguments.length === 2 &&`
`7072`		`- (node.typeArguments[0].kind === SyntaxKind.StringKeyword \|\| node.typeArguments[0].kind === SyntaxKind.NumberKeyword);`
`7073`		`- }`
`7074`		`-`
`7075`	`7067`	`function getTypeFromJSDocNullableTypeNode(node: JSDocNullableType) {`
`7076`	`7068`	`const type = getTypeFromTypeNode(node.type);`
`7077`	`7069`	`return strictNullChecks ? getUnionType([type, nullType]) : type;`
Original file line number	Diff line number	Diff line change
`@@ -249,12 +249,4 @@ namespace ts.refactor.annotateWithTypeFromJSDoc {`
`249`	`249`	`setEmitFlags(indexSignature, EmitFlags.SingleLine);`
`250`	`250`	`return indexSignature;`
`251`	`251`	`}`
`252`		`-`
`253`		`- function isJSDocIndexSignature(node: TypeReferenceNode \| ExpressionWithTypeArguments) {`
`254`		`- return isTypeReferenceNode(node) &&`
`255`		`- isIdentifier(node.typeName) &&`
`256`		`- node.typeName.escapedText === "Object" &&`
`257`		`- node.typeArguments && node.typeArguments.length === 2 &&`
`258`		`- (node.typeArguments[0].kind === SyntaxKind.StringKeyword \|\| node.typeArguments[0].kind === SyntaxKind.NumberKeyword);`
`259`		`- }`
`260`	`252`	`}`