Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
JPinkney committed Sep 23, 2018
1 parent 833ff6b commit 632fa49
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/java/src/browser/java-client-contribution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export class JavaClientContribution extends BaseLanguageClientContribution {
options.initializationOptions = {
extendedClientCapabilities: {
classFileContentsSupport: true,
semanticHighlighting: true
semanticHighlighting: true,
progressReportProvider: true
}
};
Expand Down
8 changes: 7 additions & 1 deletion packages/progress-monitor/src/browser/progress-status-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,13 @@ export class ProgressStatusBar extends DefaultFrontendApplicationContribution {
percentDone += (p.workDone / p.totalWork);
});
const percentDoneOverall = Math.round((percentDone / this.progressService.progressItems.size) * 100);
return `${percentDoneOverall}% Overall Progress`;
const progressItems = Array.from(this.progressService.progressItems);
if (progressItems.length > 0) {
const firstProgressItem = progressItems[0];
const progressItemText = firstProgressItem['1'].task;
return `${percentDoneOverall}% ${progressItemText}`;
}
return `${percentDoneOverall}% Progress Overall`;
}

}

0 comments on commit 632fa49

Please sign in to comment.