Merge pull request #499 from peterzhu2118/locate-bugfix

wingrunr21 · web-flow · commit ea0c6a9ea6d6 · 2019-06-27T07:08:16.000-06:00
Fix bug in locate.js
diff --git a/src/locate/locate.js b/src/locate/locate.js
@@ -70,8 +70,10 @@ export class Locate {
 		this.parseQueue = async.queue((task, callback) => task().then(() => callback()), SINGLE_FILE_PARSE_CONCURRENCY);
 	}
 	listInFile(absPath) {
-		const waitForParse = (absPath in this.tree) ? Promise.resolve() : this.parse(absPath);
-		return waitForParse.then(() => _.clone(this.tree[absPath] || []));
+		if (!absPath in this.tree)
+			this.parse(absPath);
+
+		return Promise.resolve(_.clone(this.tree[absPath] || []));
 	}
 	find(name) {
 		return this._waitForWalk().then(() => this._find(name));

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,10 @@ export class Locate {`
`70`	`70`	`this.parseQueue = async.queue((task, callback) => task().then(() => callback()), SINGLE_FILE_PARSE_CONCURRENCY);`
`71`	`71`	`}`
`72`	`72`	`listInFile(absPath) {`
`73`		`- const waitForParse = (absPath in this.tree) ? Promise.resolve() : this.parse(absPath);`
`74`		`- return waitForParse.then(() => _.clone(this.tree[absPath] \|\| []));`
	`73`	`+ if (!absPath in this.tree)`
	`74`	`+ this.parse(absPath);`
	`75`	`+`
	`76`	`+ return Promise.resolve(_.clone(this.tree[absPath] \|\| []));`
`75`	`77`	`}`
`76`	`78`	`find(name) {`
`77`	`79`	`return this._waitForWalk().then(() => this._find(name));`