Skip to content

Commit bf708bf

Browse files
Renamed both utilitiy functions uniformly.
1 parent 9f0810c commit bf708bf

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

src/compiler/types.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -4639,7 +4639,7 @@ namespace ts {
46394639
export type AnyImportSyntax = ImportDeclaration | ImportEqualsDeclaration;
46404640

46414641
/* @internal */
4642-
export type AnyImportOrRequire = AnyImportSyntax | RequireVariableDeclaration;
4642+
export type AnyImportOrRequire = AnyImportSyntax | VariableDeclarationInitializedTo<RequireOrImportCall>;
46434643

46444644
/* @internal */
46454645
export type AnyImportOrRequireStatement = AnyImportSyntax | RequireVariableStatement;
@@ -4668,17 +4668,14 @@ namespace ts {
46684668
readonly initializer: T;
46694669
}
46704670

4671-
/* @internal */
4672-
export type RequireVariableDeclaration = VariableDeclarationInitializedTo<RequireOrImportCall>;
4673-
46744671
/* @internal */
46754672
export interface RequireVariableStatement extends VariableStatement {
46764673
readonly declarationList: RequireVariableDeclarationList;
46774674
}
46784675

46794676
/* @internal */
46804677
export interface RequireVariableDeclarationList extends VariableDeclarationList {
4681-
readonly declarations: NodeArray<RequireVariableDeclaration>;
4678+
readonly declarations: NodeArray<VariableDeclarationInitializedTo<RequireOrImportCall>>;
46824679
}
46834680

46844681
/* @internal */

src/compiler/utilities.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -2113,12 +2113,12 @@ namespace ts {
21132113
* Returns true if the node is a VariableDeclaration initialized to a require call (see `isRequireCall`).
21142114
* This function does not test if the node is in a JavaScript file or not.
21152115
*/
2116-
export function isRequireVariableDeclaration(node: Node): node is RequireVariableDeclaration {
2116+
export function isVariableDeclarationInitializedToRequire(node: Node): node is VariableDeclarationInitializedTo<RequireOrImportCall> {
21172117
return isVariableDeclarationInitializedWithRequireHelper(node, /*allowAccessedRequire*/ false);
21182118
}
21192119

21202120
/**
2121-
* Like `isRequireVariableDeclaration` but allows things like `require("...").foo.bar` or `require("...")["baz"]`.
2121+
* Like {@link isVariableDeclarationInitializedToRequire} but allows things like `require("...").foo.bar` or `require("...")["baz"]`.
21222122
*/
21232123
export function isVariableDeclarationInitializedToBareOrAccessedRequire(node: Node): node is VariableDeclarationInitializedTo<RequireOrImportCall | AccessExpression> {
21242124
return isVariableDeclarationInitializedWithRequireHelper(node, /*allowAccessedRequire*/ true);
@@ -2136,7 +2136,7 @@ namespace ts {
21362136
export function isRequireVariableStatement(node: Node): node is RequireVariableStatement {
21372137
return isVariableStatement(node)
21382138
&& node.declarationList.declarations.length > 0
2139-
&& every(node.declarationList.declarations, decl => isRequireVariableDeclaration(decl));
2139+
&& every(node.declarationList.declarations, decl => isVariableDeclarationInitializedToRequire(decl));
21402140
}
21412141

21422142
export function isSingleOrDoubleQuote(charCode: number) {

src/services/codefixes/importFixes.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ namespace ts.codefix {
535535
const importKind = getImportKind(importingFile, exportKind, compilerOptions);
536536
return mapDefined(importingFile.imports, (moduleSpecifier): FixAddToExistingImportInfo | undefined => {
537537
const i = importFromModuleSpecifier(moduleSpecifier);
538-
if (isRequireVariableDeclaration(i.parent)) {
538+
if (isVariableDeclarationInitializedToRequire(i.parent)) {
539539
return checker.resolveExternalModuleName(moduleSpecifier) === moduleSymbol ? { declaration: i.parent, importKind, symbol, targetFlags } : undefined;
540540
}
541541
if (i.kind === SyntaxKind.ImportDeclaration || i.kind === SyntaxKind.ImportEqualsDeclaration) {

0 commit comments

Comments
 (0)