Merge pull request microsoft#15909 from Microsoft/isDeclarationFile

Andy · web-flow · commit ecbfdbf76f49 · 2017-05-17T09:12:25.000-07:00
Remove 'isDeclarationFile()' function, use '.isDeclarationFile'
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -149,7 +149,7 @@ namespace ts {
             inStrictMode = bindInStrictMode(file, opts);
             classifiableNames = createMap<string>();
             symbolCount = 0;
-            skipTransformFlagAggregation = isDeclarationFile(file);
+            skipTransformFlagAggregation = file.isDeclarationFile;
 
             Symbol = objectAllocator.getSymbolConstructor();
 
@@ -182,7 +182,7 @@ namespace ts {
         return bindSourceFile;
 
         function bindInStrictMode(file: SourceFile, opts: CompilerOptions): boolean {
-            if ((opts.alwaysStrict === undefined ? opts.strict : opts.alwaysStrict) && !isDeclarationFile(file)) {
+            if ((opts.alwaysStrict === undefined ? opts.strict : opts.alwaysStrict) && !file.isDeclarationFile) {
                 // bind in strict mode source files with alwaysStrict option
                 return true;
             }
@@ -2527,7 +2527,7 @@ namespace ts {
         }
 
         function bindFunctionDeclaration(node: FunctionDeclaration) {
-            if (!isDeclarationFile(file) && !isInAmbientContext(node)) {
+            if (!file.isDeclarationFile && !isInAmbientContext(node)) {
                 if (isAsyncFunction(node)) {
                     emitFlags |= NodeFlags.HasAsyncFunctions;
                 }
@@ -2544,7 +2544,7 @@ namespace ts {
         }
 
         function bindFunctionExpression(node: FunctionExpression) {
-            if (!isDeclarationFile(file) && !isInAmbientContext(node)) {
+            if (!file.isDeclarationFile && !isInAmbientContext(node)) {
                 if (isAsyncFunction(node)) {
                     emitFlags |= NodeFlags.HasAsyncFunctions;
                 }
@@ -2558,7 +2558,7 @@ namespace ts {
         }
 
         function bindPropertyOrMethodOrAccessor(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags) {
-            if (!isDeclarationFile(file) && !isInAmbientContext(node)) {
+            if (!file.isDeclarationFile && !isInAmbientContext(node)) {
                 if (isAsyncFunction(node)) {
                     emitFlags |= NodeFlags.HasAsyncFunctions;
                 }
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
@@ -1840,7 +1840,7 @@ namespace ts {
         function writeReferencePath(referencedFile: SourceFile, addBundledFileReference: boolean, emitOnlyDtsFiles: boolean): boolean {
             let declFileName: string;
             let addedBundledEmitReference = false;
-            if (isDeclarationFile(referencedFile)) {
+            if (referencedFile.isDeclarationFile) {
                 // Declaration file, use declaration file name
                 declFileName = referencedFile.fileName;
             }
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -3858,7 +3858,7 @@ namespace ts {
         if (file.moduleName) {
             return createLiteral(file.moduleName);
         }
-        if (!isDeclarationFile(file) && (options.out || options.outFile)) {
+        if (!file.isDeclarationFile && (options.out || options.outFile)) {
             return createLiteral(getExternalModuleNameFromPath(host, file.fileName));
         }
         return undefined;
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1309,7 +1309,7 @@ namespace ts {
         }
 
         function getDeclarationDiagnosticsForFile(sourceFile: SourceFile, cancellationToken: CancellationToken): Diagnostic[] {
-            return isDeclarationFile(sourceFile) ? [] : getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+            return sourceFile.isDeclarationFile ? [] : getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
         }
 
         function getOptionsDiagnostics(): Diagnostic[] {
@@ -1348,7 +1348,6 @@ namespace ts {
 
             const isJavaScriptFile = isSourceFileJavaScript(file);
             const isExternalModuleFile = isExternalModule(file);
-            const isDtsFile = isDeclarationFile(file);
 
             let imports: LiteralExpression[];
             let moduleAugmentations: LiteralExpression[];
@@ -1401,7 +1400,7 @@ namespace ts {
                         }
                         break;
                     case SyntaxKind.ModuleDeclaration:
-                        if (isAmbientModule(<ModuleDeclaration>node) && (inAmbientModule || hasModifier(node, ModifierFlags.Ambient) || isDeclarationFile(file))) {
+                        if (isAmbientModule(<ModuleDeclaration>node) && (inAmbientModule || hasModifier(node, ModifierFlags.Ambient) || file.isDeclarationFile)) {
                             const moduleName = <LiteralExpression>(<ModuleDeclaration>node).name;
                             // Ambient module declarations can be interpreted as augmentations for some existing external modules.
                             // This will happen in two cases:
@@ -1412,7 +1411,7 @@ namespace ts {
                                 (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
                             }
                             else if (!inAmbientModule) {
-                                if (isDtsFile) {
+                                if (file.isDeclarationFile) {
                                     // for global .d.ts files record name of ambient module
                                     (ambientModules || (ambientModules = [])).push(moduleName.text);
                                 }
@@ -1730,7 +1729,7 @@ namespace ts {
                 const absoluteRootDirectoryPath = host.getCanonicalFileName(getNormalizedAbsolutePath(rootDirectory, currentDirectory));
 
                 for (const sourceFile of sourceFiles) {
-                    if (!isDeclarationFile(sourceFile)) {
+                    if (!sourceFile.isDeclarationFile) {
                         const absoluteSourceFilePath = host.getCanonicalFileName(getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
                         if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
                             programDiagnostics.add(createCompilerDiagnostic(Diagnostics.File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files, sourceFile.fileName, options.rootDir));
@@ -1843,13 +1842,13 @@ namespace ts {
             const languageVersion = options.target || ScriptTarget.ES3;
             const outFile = options.outFile || options.out;
 
-            const firstNonAmbientExternalModuleSourceFile = forEach(files, f => isExternalModule(f) && !isDeclarationFile(f) ? f : undefined);
+            const firstNonAmbientExternalModuleSourceFile = forEach(files, f => isExternalModule(f) && !f.isDeclarationFile ? f : undefined);
             if (options.isolatedModules) {
                 if (options.module === ModuleKind.None && languageVersion < ScriptTarget.ES2015) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
                 }
 
-                const firstNonExternalModuleSourceFile = forEach(files, f => !isExternalModule(f) && !isDeclarationFile(f) ? f : undefined);
+                const firstNonExternalModuleSourceFile = forEach(files, f => !isExternalModule(f) && !f.isDeclarationFile ? f : undefined);
                 if (firstNonExternalModuleSourceFile) {
                     const span = getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
                     programDiagnostics.add(createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
@@ -165,7 +165,7 @@ namespace ts {
         };
 
         function transformRoot(node: T) {
-            return node && (!isSourceFile(node) || !isDeclarationFile(node)) ? transformation(node) : node;
+            return node && (!isSourceFile(node) || !node.isDeclarationFile) ? transformation(node) : node;
         }
 
         /**
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
@@ -295,7 +295,7 @@ namespace ts {
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node)) {
+            if (node.isDeclarationFile) {
                 return node;
             }
 
diff --git a/src/compiler/transformers/es2016.ts b/src/compiler/transformers/es2016.ts
@@ -9,7 +9,7 @@ namespace ts {
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node)) {
+            if (node.isDeclarationFile) {
                 return node;
             }
 
diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
@@ -47,7 +47,7 @@ namespace ts {
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node)) {
+            if (node.isDeclarationFile) {
                 return node;
             }
 
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
@@ -33,7 +33,7 @@ namespace ts {
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node)) {
+            if (node.isDeclarationFile) {
                 return node;
             }
 
diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts
@@ -293,8 +293,7 @@ namespace ts {
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node)
-                || (node.transformFlags & TransformFlags.ContainsGenerator) === 0) {
+            if (node.isDeclarationFile || (node.transformFlags & TransformFlags.ContainsGenerator) === 0) {
                 return node;
             }
 
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
@@ -15,7 +15,7 @@ namespace ts {
          * @param node A SourceFile node.
          */
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node)) {
+            if (node.isDeclarationFile) {
                 return node;
             }
 
diff --git a/src/compiler/transformers/module/es2015.ts b/src/compiler/transformers/module/es2015.ts
@@ -16,7 +16,7 @@ namespace ts {
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node)) {
+            if (node.isDeclarationFile) {
                 return node;
             }
 
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -55,7 +55,7 @@ namespace ts {
          * @param node The SourceFile node.
          */
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node) || !(isExternalModule(node) || compilerOptions.isolatedModules)) {
+            if (node.isDeclarationFile || !(isExternalModule(node) || compilerOptions.isolatedModules)) {
                 return node;
             }
 
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
@@ -50,9 +50,7 @@ namespace ts {
          * @param node The SourceFile node.
          */
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node)
-                || !(isExternalModule(node)
-                    || compilerOptions.isolatedModules)) {
+            if (node.isDeclarationFile || !(isExternalModule(node) || compilerOptions.isolatedModules)) {
                 return node;
             }
 
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
@@ -76,7 +76,7 @@ namespace ts {
          * @param node A SourceFile node.
          */
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node)) {
+            if (node.isDeclarationFile) {
                 return node;
             }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -587,10 +587,6 @@ namespace ts {
         return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
     }
 
-    export function isDeclarationFile(file: SourceFile): boolean {
-        return file.isDeclarationFile;
-    }
-
     export function isConstEnumDeclaration(node: Node): boolean {
         return node.kind === SyntaxKind.EnumDeclaration && isConst(node);
     }
@@ -2575,7 +2571,7 @@ namespace ts {
 
     export function getExternalModuleNameFromDeclaration(host: EmitHost, resolver: EmitResolver, declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration | ModuleDeclaration): string {
         const file = resolver.getExternalModuleFileFromDeclaration(declaration);
-        if (!file || isDeclarationFile(file)) {
+        if (!file || file.isDeclarationFile) {
             return undefined;
         }
         return getResolvedExternalModuleName(host, file);
@@ -2648,7 +2644,7 @@ namespace ts {
 
     /** Don't call this for `--outFile`, just for `--outDir` or plain emit. `--outFile` needs additional checks. */
     export function sourceFileMayBeEmitted(sourceFile: SourceFile, options: CompilerOptions, isSourceFileFromExternalLibrary: (file: SourceFile) => boolean) {
-        return !(options.noEmitForJsFiles && isSourceFileJavaScript(sourceFile)) && !isDeclarationFile(sourceFile) && !isSourceFileFromExternalLibrary(sourceFile);
+        return !(options.noEmitForJsFiles && isSourceFileJavaScript(sourceFile)) && !sourceFile.isDeclarationFile && !isSourceFileFromExternalLibrary(sourceFile);
     }
 
     /**
diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
@@ -372,7 +372,7 @@ class ProjectRunner extends RunnerBase {
             const compilerOptions = compilerResult.program.getCompilerOptions();
 
             ts.forEach(compilerResult.program.getSourceFiles(), sourceFile => {
-                if (ts.isDeclarationFile(sourceFile)) {
+                if (sourceFile.isDeclarationFile) {
                     allInputFiles.unshift({ emittedFileName: sourceFile.fileName, code: sourceFile.text });
                 }
                 else if (!(compilerOptions.outFile || compilerOptions.out)) {

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ namespace ts {`
`149`	`149`	`inStrictMode = bindInStrictMode(file, opts);`
`150`	`150`	`classifiableNames = createMap<string>();`
`151`	`151`	`symbolCount = 0;`
`152`		`- skipTransformFlagAggregation = isDeclarationFile(file);`
	`152`	`+ skipTransformFlagAggregation = file.isDeclarationFile;`
`153`	`153`
`154`	`154`	`Symbol = objectAllocator.getSymbolConstructor();`
`155`	`155`
`@@ -182,7 +182,7 @@ namespace ts {`
`182`	`182`	`return bindSourceFile;`
`183`	`183`
`184`	`184`	`function bindInStrictMode(file: SourceFile, opts: CompilerOptions): boolean {`
`185`		`- if ((opts.alwaysStrict === undefined ? opts.strict : opts.alwaysStrict) && !isDeclarationFile(file)) {`
	`185`	`+ if ((opts.alwaysStrict === undefined ? opts.strict : opts.alwaysStrict) && !file.isDeclarationFile) {`
`186`	`186`	`// bind in strict mode source files with alwaysStrict option`
`187`	`187`	`return true;`
`188`	`188`	`}`
`@@ -2527,7 +2527,7 @@ namespace ts {`
`2527`	`2527`	`}`
`2528`	`2528`
`2529`	`2529`	`function bindFunctionDeclaration(node: FunctionDeclaration) {`
`2530`		`- if (!isDeclarationFile(file) && !isInAmbientContext(node)) {`
	`2530`	`+ if (!file.isDeclarationFile && !isInAmbientContext(node)) {`
`2531`	`2531`	`if (isAsyncFunction(node)) {`
`2532`	`2532`	`emitFlags \|= NodeFlags.HasAsyncFunctions;`
`2533`	`2533`	`}`
`@@ -2544,7 +2544,7 @@ namespace ts {`
`2544`	`2544`	`}`
`2545`	`2545`
`2546`	`2546`	`function bindFunctionExpression(node: FunctionExpression) {`
`2547`		`- if (!isDeclarationFile(file) && !isInAmbientContext(node)) {`
	`2547`	`+ if (!file.isDeclarationFile && !isInAmbientContext(node)) {`
`2548`	`2548`	`if (isAsyncFunction(node)) {`
`2549`	`2549`	`emitFlags \|= NodeFlags.HasAsyncFunctions;`
`2550`	`2550`	`}`
`@@ -2558,7 +2558,7 @@ namespace ts {`
`2558`	`2558`	`}`
`2559`	`2559`
`2560`	`2560`	`function bindPropertyOrMethodOrAccessor(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags) {`
`2561`		`- if (!isDeclarationFile(file) && !isInAmbientContext(node)) {`
	`2561`	`+ if (!file.isDeclarationFile && !isInAmbientContext(node)) {`
`2562`	`2562`	`if (isAsyncFunction(node)) {`
`2563`	`2563`	`emitFlags \|= NodeFlags.HasAsyncFunctions;`
`2564`	`2564`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1840,7 +1840,7 @@ namespace ts {`
`1840`	`1840`	`function writeReferencePath(referencedFile: SourceFile, addBundledFileReference: boolean, emitOnlyDtsFiles: boolean): boolean {`
`1841`	`1841`	`let declFileName: string;`
`1842`	`1842`	`let addedBundledEmitReference = false;`
`1843`		`- if (isDeclarationFile(referencedFile)) {`
	`1843`	`+ if (referencedFile.isDeclarationFile) {`
`1844`	`1844`	`// Declaration file, use declaration file name`
`1845`	`1845`	`declFileName = referencedFile.fileName;`
`1846`	`1846`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3858,7 +3858,7 @@ namespace ts {`
`3858`	`3858`	`if (file.moduleName) {`
`3859`	`3859`	`return createLiteral(file.moduleName);`
`3860`	`3860`	`}`
`3861`		`- if (!isDeclarationFile(file) && (options.out \|\| options.outFile)) {`
	`3861`	`+ if (!file.isDeclarationFile && (options.out \|\| options.outFile)) {`
`3862`	`3862`	`return createLiteral(getExternalModuleNameFromPath(host, file.fileName));`
`3863`	`3863`	`}`
`3864`	`3864`	`return undefined;`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ namespace ts {`
`165`	`165`	`};`
`166`	`166`
`167`	`167`	`function transformRoot(node: T) {`
`168`		`- return node && (!isSourceFile(node) \|\| !isDeclarationFile(node)) ? transformation(node) : node;`
	`168`	`+ return node && (!isSourceFile(node) \|\| !node.isDeclarationFile) ? transformation(node) : node;`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ namespace ts {`
`295`	`295`	`return transformSourceFile;`
`296`	`296`
`297`	`297`	`function transformSourceFile(node: SourceFile) {`
`298`		`- if (isDeclarationFile(node)) {`
	`298`	`+ if (node.isDeclarationFile) {`
`299`	`299`	`return node;`
`300`	`300`	`}`
`301`	`301`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace ts {`
`9`	`9`	`return transformSourceFile;`
`10`	`10`
`11`	`11`	`function transformSourceFile(node: SourceFile) {`
`12`		`- if (isDeclarationFile(node)) {`
	`12`	`+ if (node.isDeclarationFile) {`
`13`	`13`	`return node;`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ namespace ts {`
`47`	`47`	`return transformSourceFile;`
`48`	`48`
`49`	`49`	`function transformSourceFile(node: SourceFile) {`
`50`		`- if (isDeclarationFile(node)) {`
	`50`	`+ if (node.isDeclarationFile) {`
`51`	`51`	`return node;`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ namespace ts {`
`33`	`33`	`return transformSourceFile;`
`34`	`34`
`35`	`35`	`function transformSourceFile(node: SourceFile) {`
`36`		`- if (isDeclarationFile(node)) {`
	`36`	`+ if (node.isDeclarationFile) {`
`37`	`37`	`return node;`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -293,8 +293,7 @@ namespace ts {`
`293`	`293`	`return transformSourceFile;`
`294`	`294`
`295`	`295`	`function transformSourceFile(node: SourceFile) {`
`296`		`- if (isDeclarationFile(node)`
`297`		`- \|\| (node.transformFlags & TransformFlags.ContainsGenerator) === 0) {`
	`296`	`+ if (node.isDeclarationFile \|\| (node.transformFlags & TransformFlags.ContainsGenerator) === 0) {`
`298`	`297`	`return node;`
`299`	`298`	`}`
`300`	`299`