Skip to content

Fix bug with glob not resuming search #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jakob101 merged 2 commits into from
Sep 13, 2016
Merged

Fix bug with glob not resuming search #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24a5af3
Updated vscode version
Sep 13, 2016
ccf7650
Fixed glob not resuming
Sep 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"theme": "dark"
},
"engines": {
"vscode": "^1.0.0"
"vscode": "^0.10.x"
},
"categories": [
"Other"
Expand Down Expand Up @@ -77,11 +77,12 @@
],
"scripts": {
"vscode:prepublish": "node ./node_modules/vscode/bin/compile",
"compile": "node ./node_modules/vscode/bin/compile -watch -p ./"
"compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
"postinstall": "node ./node_modules/vscode/bin/install"
},
"devDependencies": {
"typescript": "^1.6.2",
"vscode": "0.10.x"
"vscode": "^0.11.0"
},
"dependencies": {
"@types/glob": "^5.0.29",
Expand Down
29 changes: 17 additions & 12 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ class RelativePath {
private _workspacePath: string;
private _configuration: any;
private _pausedSearch: boolean;
private _myGlob: any;

constructor() {
this._items = null;
this._pausedSearch = false;
this._pausedSearch = null;
this._myGlob = null;
this._workspacePath = workspace.rootPath.replace(/\\/g, "/");
this._configuration = workspace.getConfiguration("relativePath");

Expand Down Expand Up @@ -66,33 +68,36 @@ class RelativePath {
// Go through workspace to cache files
private searchWorkspace() {
let emptyItem: QuickPickItem = { label: "", description: "No files found" };
let myGlob = null;

// Show loading info box
let info = window.showQuickPick([emptyItem], { matchOnDescription: false, placeHolder: "Finding files... Please wait. (Press escape to cancel)" });
info.then(
(value?: any) => {
if (myGlob) {
myGlob.pause();
if (this._myGlob) {
this._myGlob.pause();
}
if (this._pausedSearch === null) {
this._pausedSearch = true;
}
this._pausedSearch = true;
},
(rejected?: any) => {
if (myGlob) {
myGlob.pause();
if (this._myGlob) {
this._myGlob.pause();
}
if (this._pausedSearch === null) {
this._pausedSearch = true;
}
this._pausedSearch = true;
}
);

// Search for files
if (this._pausedSearch) {
this._pausedSearch = false;
if (myGlob) {
myGlob.resume();
if (this._myGlob) {
this._myGlob.resume();
}
} else {
myGlob = new Glob(this._workspacePath + "/**/*.*",
this._myGlob = new Glob(this._workspacePath + "/**/*.*",
{ ignore: this._configuration.get("ignore") },
(err, files) => {
if (err) {
Expand All @@ -102,7 +107,7 @@ class RelativePath {
this._items = files;
this.findRelativePath();
});
myGlob.on("end", () => {
this._myGlob.on("end", () => {
this._pausedSearch = false;
});
}
Expand Down