Skip to content

Enhanced Tree view #94

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
merged 14 commits into from
Feb 2, 2019
Merged

Enhanced Tree view #94

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e90b44e
Add company plugin check
Vigilans Jan 22, 2019
c1a58b2
Store leetcode-cli root path in LeetCodeExecutor instead of binary path
Vigilans Jan 22, 2019
ce204b9
Add companies and tags information to IProblem
Vigilans Jan 22, 2019
236a020
Add category tree view to explorer
Vigilans Jan 22, 2019
64badc5
Add `require-from-string` dependency
Vigilans Jan 23, 2019
d648f8a
Move getCompaniesAndTags from `list.ts` to `leetCodeExecutor.ts`
Vigilans Jan 23, 2019
21723fe
Minor fixes
Vigilans Jan 23, 2019
39071bf
Capitalize label name and sort labels
Vigilans Jan 23, 2019
3cb8743
Add favorite tree view
Vigilans Jan 23, 2019
86f17ac
Fix lint errors
Vigilans Jan 23, 2019
7e00062
Show AC/NotAC problems in treeview
Vigilans Jan 24, 2019
0153d84
Revert "Show AC/NotAC problems in treeview"
Vigilans Jan 24, 2019
d9abd5f
Option to hide solved problems
Vigilans Jan 24, 2019
7bffd54
Refactor
jdneo Feb 2, 2019
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
Prev Previous commit
Next Next commit
Option to hide solved problems
  • Loading branch information
@Vigilans
Vigilans committed Jan 24, 2019
commit d9abd5f68a92bc7679066ea35bd342fd80a599ea
6 changes: 6 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,12 @@
{
"title": "LeetCode",
"properties": {
"leetcode.hideSolved": {
"type": "boolean",
"default": false,
"scope": "application",
"description": "Hide solved problems."
},
"leetcode.showLocked": {
"type": "boolean",
"default": false,
Expand Down
14 changes: 10 additions & 4 deletions src/leetCodeExplorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
Favorite: list.IProblem[],
};

private leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");

private onDidChangeTreeDataEvent: vscode.EventEmitter<any> = new vscode.EventEmitter<any>();
// tslint:disable-next-line:member-ordering
public readonly onDidChangeTreeData: vscode.Event<any> = this.onDidChangeTreeDataEvent.event;
Expand Down Expand Up @@ -133,6 +135,14 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
Favorite: [],
};
for (const problem of await list.listProblems()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm thinking that we can filter the accepted problems in the method list.listProblems(). If hideSolved === true then only return unaccepted problems.

By doing this, we decouple the this.leetCodeConfig with the explorer

Copy link
Contributor Author

@Vigilans Vigilans Jan 24, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my opinion, Favorite group should show all starred problems no matter whether it's accepted or not.

Maybe it could be checked this way in list.listProblems():
!problem.favorite && problem.state === ProblemState.AC && hideSolved -> continue
The flaw is that the favorite checking logic is duplicated.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, ok, just keep it there first.

// Add favorite problem, no matter whether it is solved.
if (problem.favorite) {
this.treeData.Favorite.push(problem);
}
// Hide solved problem in category view is specified in option.
if (problem.state === ProblemState.AC && this.leetCodeConfig.get<boolean>("hideSolved")) {
continue;
}
// Add problems according to category
const categories: Array<[Category, string[]]> = [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use Map here?

use index to represent the parent-children relationship is confusing

Copy link
Contributor Author

@Vigilans Vigilans Jan 24, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could use Map here this way:

const categories: Map<Category, string[]> = new Map<Category, string[]>([
    ["Difficulty", [problem.difficulty]],
    ["Tag", problem.tags],
    ["Company", problem.companies],
]);

Btw, a better way would be to use Object.entries here, but it is not supported by es6, which is specified by tsconfig.json.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use Map here.

["Difficulty", [problem.difficulty]],
Expand All @@ -151,10 +161,6 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
}
}
}
// Add favorite problems
if (problem.favorite) {
this.treeData.Favorite.push(problem);
}
}
}

Expand Down