Skip to content

[bugfix] Correct the content shown in status-bar #202

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
jdneo merged 2 commits into from
Mar 13, 2019
Merged

[bugfix] Correct the content shown in status-bar #202

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8594024
[bugfix] Correct the content shown in status-bar
jdneo Mar 12, 2019
b39a468
Address comments
jdneo Mar 13, 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
15 changes: 14 additions & 1 deletion src/leetCodeManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class LeetCodeManager extends EventEmitter {
public async getLoginStatus(): Promise<void> {
try {
const result: string = await leetCodeExecutor.getUserInfo();
this.currentUser = result.slice("You are now login as".length).trim();
this.currentUser = this.tryParseUserName(result);
this.userStatus = UserStatus.SignedIn;
} catch (error) {
this.currentUser = undefined;
Expand Down Expand Up @@ -117,6 +117,19 @@ class LeetCodeManager extends EventEmitter {
public getUser(): string | undefined {
return this.currentUser;
}

private tryParseUserName(output: string): string {
const lines: string[] = output.trim().split(/\r?\n/);
if (lines.length === 3) {
const reg: RegExp = /^\s*.{1}\s*(.+)\s*https:\/\/leetcode/;
Copy link
Contributor

@Vigilans Vigilans Mar 12, 2019

Choose a reason for hiding this comment

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

The regex executing on

'    ×      vigilans             https://leetcode-cn.com'

will return

'vigilans             '

Append ? to .+ to prevent greedy match could solve the problem.

Besides, is there any difference between .{1} and .?

Copy link
Member Author

@jdneo jdneo Mar 13, 2019

Choose a reason for hiding this comment

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

Updated

const match: RegExpMatchArray | null = lines[2].match(reg);
if (match && match.length === 2) {
return match[1].trim();
}
}

return "Unknown";
}
}

export const leetCodeManager: LeetCodeManager = new LeetCodeManager();