microsoft/pyright
1
1
Fork 0
mirror of https://github.com/microsoft/pyright.git synced 2024-10-05 12:27:30 +03:00
Code Issues Projects Releases Wiki Activity

Fixed bug in parsing of from import clauses where it didn't detect empty import statements.

Browse Source
This commit is contained in:
Eric Traut 2019-03-16 12:15:20 -07:00
parent 64ef65546b
commit 6a246da971
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server/src/parser/parser.ts
View File

@ -910,23 +910,25 @@ export class Parser {
while (true) {
let importName = this._getTokenIfIdentifier();
if (importName) {
let importFromAsNode = new ImportFromAsNode(new NameNode(importName));
if (this._consumeTokenIfKeyword(KeywordType.As)) {
let aliasName = this._getTokenIfIdentifier();
if (!aliasName) {
this._addError('Expected alias symbol name', this._peekToken());
} else {
importFromAsNode.alias = new NameNode(aliasName);
importFromAsNode.extend(aliasName);
}
}
importFromNode.imports.push(importFromAsNode);
importFromNode.extend(importFromAsNode);
if (!importName) {
break;
}
let importFromAsNode = new ImportFromAsNode(new NameNode(importName));
if (this._consumeTokenIfKeyword(KeywordType.As)) {
let aliasName = this._getTokenIfIdentifier();
if (!aliasName) {
this._addError('Expected alias symbol name', this._peekToken());
} else {
importFromAsNode.alias = new NameNode(aliasName);
importFromAsNode.extend(aliasName);
}
}
importFromNode.imports.push(importFromAsNode);
importFromNode.extend(importFromAsNode);
if (!this._consumeTokenIfType(TokenType.Comma)) {
break;
}