Skip to content
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

Jump to bottom

Remove barely used status bar #625

Merged
merged 1 commit into from
Jul 8, 2021
Merged

Remove barely used status bar #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions src/actions/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export async function testExercise(
actionContext: ActionContext,
exercise: WorkspaceExercise,
): Promise<Result<void, Error>> {
const { dialog, ui, tmc, userData, temporaryWebviewProvider } = actionContext;
const { dialog, tmc, userData, temporaryWebviewProvider } = actionContext;

const course = userData.getCourseByName(exercise.courseSlug);
const exerciseId = course.exercises.find((x) => x.name === exercise.exerciseSlug)?.id;
Expand Down Expand Up @@ -103,15 +103,10 @@ export async function testExercise(
}
},
});
ui.setStatusBar(`Running tests for ${exerciseName}`);
Logger.log(`Running local tests for ${exerciseName}`);

const testResult = await testRunner;
if (testResult.err) {
ui.setStatusBar(
`Running tests for ${exerciseName} ${aborted ? "aborted" : "failed"}`,
5000,
);
if (aborted) {
temp.dispose();
return Ok.EMPTY;
Expand All @@ -128,7 +123,6 @@ export async function testExercise(
temporaryWebviewProvider.addToRecycables(temp);
return testResult;
}
ui.setStatusBar(`Tests finished for ${exerciseName}`, 5000);
Logger.log(`Tests finished for ${exerciseName}`);
data = {
testResult: testResult.val,
Expand Down
2 changes: 1 addition & 1 deletion src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>

Logger.configure(settings.getLogLevel());

const ui = new UI(context, resources, vscode.window.createStatusBarItem());
const ui = new UI(context, resources);
const loggedIn = ui.treeDP.createVisibilityGroup(authenticated);
const visibilityGroups = {
loggedIn,
Expand Down
28 changes: 1 addition & 27 deletions src/ui/ui.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,13 @@ export default class UI {
*/
public webview: TmcWebview;

private _statusbar: vscode.StatusBarItem;
private _statusBarTimeout: NodeJS.Timeout;

/**
* Creates an UI object and (temporarily) initializes it with login-related content
* @param extensionContext VSCode extension content
*/
constructor(
extensionContext: vscode.ExtensionContext,
resources: Resources,
statusbaritem: vscode.StatusBarItem,
) {
constructor(extensionContext: vscode.ExtensionContext, resources: Resources) {
this.webview = new TmcWebview(extensionContext, resources);
this.treeDP = new TmcMenuTree("tmcView");
this._statusbar = statusbaritem;
this._statusBarTimeout = setTimeout(() => {}, 0);
}

/**
Expand All @@ -44,21 +35,4 @@ export default class UI {
onClick();
};
}

public setStatusBar(text: string, timeout?: number): void {
clearTimeout(this._statusBarTimeout);
if (timeout) {
this._statusbar.text = `${text}`;
this._statusBarTimeout = setTimeout(() => {
this._statusbar.hide();
}, timeout);
} else {
this._statusbar.text = `${text}`;
}
this._statusbar.show();
}

public hideStatusBar(): void {
this._statusbar.hide();
}
}