Skip to content

Commit c521fe4

Browse files
committed
Rename ImportStatement to ImportDeclaration
1 parent 484144b commit c521fe4

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/compiler/parser.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4529,7 +4529,7 @@ module ts {
45294529
token === SyntaxKind.FromKeyword;
45304530
}
45314531

4532-
function parseImportDeclarationOrStatement(fullStart: number, modifiers: ModifiersArray): ImportEqualsDeclaration | ImportStatement {
4532+
function parseImportDeclarationOrImportEqualsDeclaration(fullStart: number, modifiers: ModifiersArray): ImportEqualsDeclaration | ImportDeclaration {
45334533
parseExpected(SyntaxKind.ImportKeyword);
45344534
var identifier: Identifier;
45354535
if (isIdentifier()) {
@@ -4549,8 +4549,8 @@ module ts {
45494549
}
45504550

45514551
// Import statement
4552-
var importStatement = <ImportStatement>createNode(SyntaxKind.ImportStatement, fullStart);
4553-
setModifiers(importStatement, modifiers);
4552+
var importDeclaration = <ImportDeclaration>createNode(SyntaxKind.ImportDeclaration, fullStart);
4553+
setModifiers(importDeclaration, modifiers);
45544554

45554555
// ImportDeclaration:
45564556
// import ImportClause from ModuleSpecifier ;
@@ -4579,13 +4579,13 @@ module ts {
45794579
importClause.namedBindings = token === SyntaxKind.AsteriskToken ? parseNamespaceImport() : parseNamedImports();
45804580
}
45814581

4582-
importStatement.importClause = finishNode(importClause);
4582+
importDeclaration.importClause = finishNode(importClause);
45834583
parseExpected(SyntaxKind.FromKeyword);
45844584
}
45854585

4586-
importStatement.moduleSpecifier = parseModuleSpecifier();
4586+
importDeclaration.moduleSpecifier = parseModuleSpecifier();
45874587
parseSemicolon();
4588-
return finishNode(importStatement);
4588+
return finishNode(importDeclaration);
45894589
}
45904590

45914591
function parseModuleReference() {
@@ -4783,7 +4783,7 @@ module ts {
47834783
case SyntaxKind.ModuleKeyword:
47844784
return parseModuleDeclaration(fullStart, modifiers);
47854785
case SyntaxKind.ImportKeyword:
4786-
return parseImportDeclarationOrStatement(fullStart, modifiers);
4786+
return parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers);
47874787
default:
47884788
Debug.fail("Mismatch between isDeclarationStart and parseDeclaration");
47894789
}

src/compiler/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ module ts {
232232
ModuleBlock,
233233
ImportEqualsDeclaration,
234234
ExportAssignment,
235-
ImportStatement,
235+
ImportDeclaration,
236236
ImportClause,
237237
NamespaceImport,
238238
NamedImports,
@@ -872,7 +872,7 @@ module ts {
872872
// import "mod" => importClause = undefined, moduleSpecifier = "mod"
873873
// In rest of the cases, module specifier is string literal corresponding to module
874874
// ImportClause information is shown at its declaration below.
875-
export interface ImportStatement extends Statement, ModuleElement {
875+
export interface ImportDeclaration extends Statement, ModuleElement {
876876
importClause?: ImportClause;
877877
moduleSpecifier: StringLiteralExpression;
878878
}

0 commit comments

Comments
 (0)