-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fix findWorkspaceFolder Previously this could yield surprising results depending on where the original vscode windows was opened from. * Disable cache by default (factory setting) This will require users opt-in to the feature. * Bump to 1.8.0 * Bump bzl to 1.3.3 * Update CHANGELOG * Improve view activation Also better onboarding notes
- Loading branch information
Showing
5 changed files
with
38 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -248,11 +248,6 @@ export abstract class RunnableComponentItem<T extends ComponentConfiguration> | |
| return items; | ||
| } | ||
|
|
||
| if (this.component.status === Status.DISABLED) { | ||
| items.push(new DisabledItem(this.component.statusErrorMessage || 'Unknown')); | ||
| return items; | ||
| } | ||
|
|
||
| return items.concat(await this.getChildrenInternal()); | ||
| } | ||
|
|
||
|
|
@@ -391,10 +386,20 @@ class SubscriptionItem | |
| const items: vscode.TreeItem[] = []; | ||
|
|
||
| if (this.component.status === Status.DISABLED) { | ||
| items.push(new DisabledItem('The subscription token is not set. Login to get started.')); | ||
| items.push(new DisabledItem('Subscription token not available.')); | ||
| items.push( | ||
| new MarkdownItem( | ||
| "Sign up to enable additional hover documentation, autocompletion, and other features." | ||
| ) | ||
| ); | ||
| items.push( | ||
| new MarkdownItem( | ||
| "Using this at work? Encourage your employer to support developer productivity." | ||
| ) | ||
| ); | ||
| items.push( | ||
| new MarkdownItem( | ||
| "Your support assists in improving the Bazel Ecosystem. If you're using this at work, please encourage your employer to contribute. If unsatisfied for any reason send an email to [email protected] and we'll take care of it :)" | ||
| "Contact [email protected] for organizational onboarding." | ||
| ) | ||
| ); | ||
| items.push( | ||
|
|
@@ -404,7 +409,7 @@ class SubscriptionItem | |
| [ | ||
| '### Subscription Token', | ||
| '', | ||
| 'The subscription token is a JWT that has your subscription details encoded inside. When the extension loads it tries to find it on one of the following locations:', | ||
| 'The subscription token is a JWT that encodes your subscription details. The extension will search the following locations for the token:', | ||
| '', | ||
| '1. The setting `bsv.bzl.subscription.token`', | ||
| '2. The file `~/.bzl/license.key`.', | ||
|
|
@@ -435,7 +440,7 @@ class SubscriptionItem | |
| `${license.subscriptionName}`, | ||
| 'Name of the subscription you are registered under' | ||
| ), | ||
| new LicenseItem('Expiration', `${exp.toISODate()}`, 'Expiration date of this license') | ||
| new LicenseItem('Renews', `${exp.toISODate()}`, 'Expiration date of this license') | ||
| ); | ||
| } | ||
| } | ||
|
|
@@ -939,10 +944,10 @@ export class LicenseItem extends vscode.TreeItem { | |
|
|
||
| export class MarkdownItem extends vscode.TreeItem { | ||
| constructor(description: string, markdown?: vscode.MarkdownString) { | ||
| super('Note'); | ||
| super(''); | ||
| this.description = description; | ||
| this.tooltip = markdown || description; | ||
| this.iconPath = new vscode.ThemeIcon('squirrel'); | ||
| this.iconPath = new vscode.ThemeIcon('debug-hint'); | ||
| } | ||
| } | ||
|
|
||
|
|
||