Consistently use isInJavaScriptFile helper (microsoft#17075)

Andy · web-flow · commit 2561ced1e300 · 2017-07-11T07:26:45.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -4239,7 +4239,7 @@ namespace ts {
                 return addOptionality(declaredType, /*optional*/ declaration.questionToken && includeOptionality);
             }
 
-            if ((noImplicitAny || declaration.flags & NodeFlags.JavaScriptFile) &&
+            if ((noImplicitAny || isInJavaScriptFile(declaration)) &&
                 declaration.kind === SyntaxKind.VariableDeclaration && !isBindingPattern(declaration.name) &&
                 !(getCombinedModifierFlags(declaration) & ModifierFlags.Export) && !isInAmbientContext(declaration)) {
                 // If --noImplicitAny is on or the declaration is in a Javascript file,
@@ -4493,7 +4493,7 @@ namespace ts {
                 if (declaration.kind === SyntaxKind.ExportAssignment) {
                     return links.type = checkExpression((<ExportAssignment>declaration).expression);
                 }
-                if (declaration.flags & NodeFlags.JavaScriptFile && declaration.kind === SyntaxKind.JSDocPropertyTag && (<JSDocPropertyTag>declaration).typeExpression) {
+                if (isInJavaScriptFile(declaration) && declaration.kind === SyntaxKind.JSDocPropertyTag && (<JSDocPropertyTag>declaration).typeExpression) {
                     return links.type = getTypeFromTypeNode((<JSDocPropertyTag>declaration).typeExpression.type);
                 }
                 // Handle variable, parameter or property
@@ -4552,7 +4552,7 @@ namespace ts {
                 const getter = getDeclarationOfKind<AccessorDeclaration>(symbol, SyntaxKind.GetAccessor);
                 const setter = getDeclarationOfKind<AccessorDeclaration>(symbol, SyntaxKind.SetAccessor);
 
-                if (getter && getter.flags & NodeFlags.JavaScriptFile) {
+                if (getter && isInJavaScriptFile(getter)) {
                     const jsDocType = getTypeForDeclarationFromJSDocComment(getter);
                     if (jsDocType) {
                         return links.type = jsDocType;
@@ -6206,7 +6206,7 @@ namespace ts {
         }
 
         function isJSDocOptionalParameter(node: ParameterDeclaration) {
-            if (node.flags & NodeFlags.JavaScriptFile) {
+            if (isInJavaScriptFile(node)) {
                 if (node.type && node.type.kind === SyntaxKind.JSDocOptionalType) {
                     return true;
                 }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -1619,7 +1619,7 @@ namespace ts {
     }
 
     export function isRestParameter(node: ParameterDeclaration) {
-        if (node && (node.flags & NodeFlags.JavaScriptFile)) {
+        if (isInJavaScriptFile(node)) {
             if (node.type && node.type.kind === SyntaxKind.JSDocVariadicType ||
                 forEach(getJSDocParameterTags(node),
                         t => t.typeExpression && t.typeExpression.type.kind === SyntaxKind.JSDocVariadicType)) {
@@ -2743,7 +2743,7 @@ namespace ts {
         if (node.typeParameters) {
             return node.typeParameters;
         }
-        if (node.flags & NodeFlags.JavaScriptFile) {
+        if (isInJavaScriptFile(node)) {
             const templateTag = getJSDocTemplateTag(node);
             return templateTag && templateTag.typeParameters;
         }

Original file line number	Diff line number	Diff line change
`@@ -1619,7 +1619,7 @@ namespace ts {`
`1619`	`1619`	`}`
`1620`	`1620`
`1621`	`1621`	`export function isRestParameter(node: ParameterDeclaration) {`
`1622`		`- if (node && (node.flags & NodeFlags.JavaScriptFile)) {`
	`1622`	`+ if (isInJavaScriptFile(node)) {`
`1623`	`1623`	`if (node.type && node.type.kind === SyntaxKind.JSDocVariadicType \|\|`
`1624`	`1624`	`forEach(getJSDocParameterTags(node),`
`1625`	`1625`	`t => t.typeExpression && t.typeExpression.type.kind === SyntaxKind.JSDocVariadicType)) {`
`@@ -2743,7 +2743,7 @@ namespace ts {`
`2743`	`2743`	`if (node.typeParameters) {`
`2744`	`2744`	`return node.typeParameters;`
`2745`	`2745`	`}`
`2746`		`- if (node.flags & NodeFlags.JavaScriptFile) {`
	`2746`	`+ if (isInJavaScriptFile(node)) {`
`2747`	`2747`	`const templateTag = getJSDocTemplateTag(node);`
`2748`	`2748`	`return templateTag && templateTag.typeParameters;`
`2749`	`2749`	`}`