@codingame/monaco-vscode-view-status-bar-service-override 14.0.6 → 15.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +6 -5
- package/vscode/src/vs/base/browser/ui/hover/hover.d.ts +80 -0
- package/vscode/src/vs/base/browser/ui/hover/hover.js +8 -0
- package/vscode/src/vs/workbench/api/browser/statusBarExtensionPoint.js +12 -12
- package/vscode/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarActions.js +4 -4
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarItem.js +4 -4
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarModel.js +15 -8
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarPart.js +21 -8
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-view-status-bar-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "15.0.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - view-status-bar service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,10 +15,11 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "
|
|
19
|
-
"@codingame/monaco-vscode-
|
|
20
|
-
"@codingame/monaco-vscode-
|
|
21
|
-
"@codingame/monaco-vscode-
|
|
18
|
+
"@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "15.0.1",
|
|
19
|
+
"@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common": "15.0.1",
|
|
20
|
+
"@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common": "15.0.1",
|
|
21
|
+
"@codingame/monaco-vscode-api": "15.0.1",
|
|
22
|
+
"@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common": "15.0.1"
|
|
22
23
|
},
|
|
23
24
|
"main": "index.js",
|
|
24
25
|
"module": "index.js",
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import type { IHoverDelegate } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegate";
|
|
2
|
+
import type { HoverPosition } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget";
|
|
3
|
+
import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
|
|
4
|
+
import type { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
|
|
5
|
+
import type { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
|
|
6
|
+
export interface IHoverDelegate2 {
|
|
7
|
+
showHover(options: IHoverOptions, focus?: boolean): IHoverWidget | undefined;
|
|
8
|
+
showDelayedHover(options: IHoverOptions, lifecycleOptions: Pick<IHoverLifecycleOptions, "groupId">): IHoverWidget | undefined;
|
|
9
|
+
setupDelayedHover(target: HTMLElement, hoverOptions: (() => IDelayedHoverOptions) | IDelayedHoverOptions, lifecycleOptions?: IHoverLifecycleOptions): IDisposable;
|
|
10
|
+
setupDelayedHoverAtMouse(target: HTMLElement, hoverOptions: (() => IDelayedHoverAtMouseOptions) | IDelayedHoverAtMouseOptions, lifecycleOptions?: IHoverLifecycleOptions): IDisposable;
|
|
11
|
+
hideHover(force?: boolean): void;
|
|
12
|
+
showAndFocusLastHover(): void;
|
|
13
|
+
setupManagedHover(hoverDelegate: IHoverDelegate, targetElement: HTMLElement, content: IManagedHoverContentOrFactory, options?: IManagedHoverOptions): IManagedHover;
|
|
14
|
+
showManagedHover(targetElement: HTMLElement): void;
|
|
15
|
+
}
|
|
16
|
+
export interface IHoverWidget extends IDisposable {
|
|
17
|
+
readonly isDisposed: boolean;
|
|
18
|
+
}
|
|
19
|
+
export interface IHoverOptions {
|
|
20
|
+
content: IMarkdownString | string | HTMLElement;
|
|
21
|
+
target: IHoverTarget | HTMLElement;
|
|
22
|
+
container?: HTMLElement;
|
|
23
|
+
id?: string;
|
|
24
|
+
actions?: IHoverAction[];
|
|
25
|
+
additionalClasses?: string[];
|
|
26
|
+
linkHandler?(url: string): void;
|
|
27
|
+
trapFocus?: boolean;
|
|
28
|
+
position?: IHoverPositionOptions;
|
|
29
|
+
persistence?: IHoverPersistenceOptions;
|
|
30
|
+
appearance?: IHoverAppearanceOptions;
|
|
31
|
+
}
|
|
32
|
+
export type IDelayedHoverOptions = Omit<IHoverOptions, "target">;
|
|
33
|
+
export type IDelayedHoverAtMouseOptions = Omit<IDelayedHoverOptions, "position" | "appearance"> & {
|
|
34
|
+
appearance?: Omit<IHoverAppearanceOptions, "showPointer">;
|
|
35
|
+
};
|
|
36
|
+
export interface IHoverLifecycleOptions {
|
|
37
|
+
groupId?: string;
|
|
38
|
+
setupKeyboardEvents?: boolean;
|
|
39
|
+
}
|
|
40
|
+
export interface IHoverPositionOptions {
|
|
41
|
+
hoverPosition?: HoverPosition | MouseEvent;
|
|
42
|
+
forcePosition?: boolean;
|
|
43
|
+
}
|
|
44
|
+
export interface IHoverPersistenceOptions {
|
|
45
|
+
hideOnHover?: boolean;
|
|
46
|
+
hideOnKeyDown?: boolean;
|
|
47
|
+
sticky?: boolean;
|
|
48
|
+
}
|
|
49
|
+
export interface IHoverAppearanceOptions {
|
|
50
|
+
showPointer?: boolean;
|
|
51
|
+
compact?: boolean;
|
|
52
|
+
showHoverHint?: boolean;
|
|
53
|
+
skipFadeInAnimation?: boolean;
|
|
54
|
+
}
|
|
55
|
+
export interface IHoverAction {
|
|
56
|
+
label: string;
|
|
57
|
+
commandId: string;
|
|
58
|
+
iconClass?: string;
|
|
59
|
+
run(target: HTMLElement): void;
|
|
60
|
+
}
|
|
61
|
+
export interface IHoverTarget extends Partial<IDisposable> {
|
|
62
|
+
readonly targetElements: readonly HTMLElement[];
|
|
63
|
+
readonly x?: number;
|
|
64
|
+
readonly y?: number;
|
|
65
|
+
}
|
|
66
|
+
export interface IManagedHoverTooltipMarkdownString {
|
|
67
|
+
markdown: IMarkdownString | string | undefined | ((token: CancellationToken) => Promise<IMarkdownString | string | undefined>);
|
|
68
|
+
markdownNotSupportedFallback: string | undefined;
|
|
69
|
+
}
|
|
70
|
+
export declare function isManagedHoverTooltipMarkdownString(obj: unknown): obj is IManagedHoverTooltipMarkdownString;
|
|
71
|
+
export type IManagedHoverContent = string | IManagedHoverTooltipMarkdownString | HTMLElement | undefined;
|
|
72
|
+
export type IManagedHoverContentOrFactory = IManagedHoverContent | (() => IManagedHoverContent);
|
|
73
|
+
export interface IManagedHoverOptions extends Pick<IHoverOptions, "actions" | "linkHandler" | "trapFocus"> {
|
|
74
|
+
appearance?: Pick<IHoverAppearanceOptions, "showHoverHint">;
|
|
75
|
+
}
|
|
76
|
+
export interface IManagedHover extends IDisposable {
|
|
77
|
+
show(focus?: boolean): void;
|
|
78
|
+
hide(): void;
|
|
79
|
+
update(tooltip: IManagedHoverContent, options?: IManagedHoverOptions): void;
|
|
80
|
+
}
|
|
@@ -30,62 +30,62 @@ const statusBarItemSchema = {
|
|
|
30
30
|
id: {
|
|
31
31
|
type: 'string',
|
|
32
32
|
markdownDescription: ( localize(
|
|
33
|
-
|
|
33
|
+
2390,
|
|
34
34
|
'The identifier of the status bar entry. Must be unique within the extension. The same value must be used when calling the `vscode.window.createStatusBarItem(id, ...)`-API'
|
|
35
35
|
))
|
|
36
36
|
},
|
|
37
37
|
name: {
|
|
38
38
|
type: 'string',
|
|
39
39
|
description: ( localize(
|
|
40
|
-
|
|
40
|
+
2391,
|
|
41
41
|
'The name of the entry, like \'Python Language Indicator\', \'Git Status\' etc. Try to keep the length of the name short, yet descriptive enough that users can understand what the status bar item is about.'
|
|
42
42
|
))
|
|
43
43
|
},
|
|
44
44
|
text: {
|
|
45
45
|
type: 'string',
|
|
46
46
|
description: ( localize(
|
|
47
|
-
|
|
47
|
+
2392,
|
|
48
48
|
'The text to show for the entry. You can embed icons in the text by leveraging the `$(<name>)`-syntax, like \'Hello $(globe)!\''
|
|
49
49
|
))
|
|
50
50
|
},
|
|
51
51
|
tooltip: {
|
|
52
52
|
type: 'string',
|
|
53
|
-
description: ( localize(
|
|
53
|
+
description: ( localize(2393, 'The tooltip text for the entry.'))
|
|
54
54
|
},
|
|
55
55
|
command: {
|
|
56
56
|
type: 'string',
|
|
57
|
-
description: ( localize(
|
|
57
|
+
description: ( localize(2394, 'The command to execute when the status bar entry is clicked.'))
|
|
58
58
|
},
|
|
59
59
|
alignment: {
|
|
60
60
|
type: 'string',
|
|
61
61
|
enum: ['left', 'right'],
|
|
62
|
-
description: ( localize(
|
|
62
|
+
description: ( localize(2395, 'The alignment of the status bar entry.'))
|
|
63
63
|
},
|
|
64
64
|
priority: {
|
|
65
65
|
type: 'number',
|
|
66
66
|
description: ( localize(
|
|
67
|
-
|
|
67
|
+
2396,
|
|
68
68
|
'The priority of the status bar entry. Higher value means the item should be shown more to the left.'
|
|
69
69
|
))
|
|
70
70
|
},
|
|
71
71
|
accessibilityInformation: {
|
|
72
72
|
type: 'object',
|
|
73
73
|
description: ( localize(
|
|
74
|
-
|
|
74
|
+
2397,
|
|
75
75
|
'Defines the role and aria label to be used when the status bar entry is focused.'
|
|
76
76
|
)),
|
|
77
77
|
properties: {
|
|
78
78
|
role: {
|
|
79
79
|
type: 'string',
|
|
80
80
|
description: ( localize(
|
|
81
|
-
|
|
81
|
+
2398,
|
|
82
82
|
'The role of the status bar entry which defines how a screen reader interacts with it. More about aria roles can be found here https://w3c.github.io/aria/#widget_roles'
|
|
83
83
|
))
|
|
84
84
|
},
|
|
85
85
|
label: {
|
|
86
86
|
type: 'string',
|
|
87
87
|
description: ( localize(
|
|
88
|
-
|
|
88
|
+
2399,
|
|
89
89
|
'The aria label of the status bar entry. Defaults to the entry\'s text.'
|
|
90
90
|
))
|
|
91
91
|
}
|
|
@@ -94,7 +94,7 @@ const statusBarItemSchema = {
|
|
|
94
94
|
}
|
|
95
95
|
};
|
|
96
96
|
const statusBarItemsSchema = {
|
|
97
|
-
description: ( localize(
|
|
97
|
+
description: ( localize(2400, "Contributes items to the status bar.")),
|
|
98
98
|
oneOf: [
|
|
99
99
|
statusBarItemSchema,
|
|
100
100
|
{
|
|
@@ -120,7 +120,7 @@ let StatusBarItemsExtensionPoint = class StatusBarItemsExtensionPoint {
|
|
|
120
120
|
const { value, collector } = entry;
|
|
121
121
|
for (const candidate of Iterable.wrap(value)) {
|
|
122
122
|
if (!isUserFriendlyStatusItemEntry(candidate)) {
|
|
123
|
-
collector.error(( localize(
|
|
123
|
+
collector.error(( localize(2401, "Invalid status bar item contribution.")));
|
|
124
124
|
continue;
|
|
125
125
|
}
|
|
126
126
|
const fullItemId = asStatusBarItemIdentifier(entry.description.identifier, candidate.id);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import n from '@codingame/monaco-vscode-api/external/rollup-plugin-styles/dist/runtime/inject-css';
|
|
2
2
|
|
|
3
|
-
var css = ".monaco-workbench .part.statusbar{box-sizing:border-box;cursor:default;display:flex;font-size:12px;height:22px;overflow:hidden;width:100%}.monaco-workbench:not(.reduce-motion) .part.statusbar{transition:background-color .15s ease-out}.monaco-workbench .part.statusbar.status-border-top:after{background-color:var(--status-border-top-color);content:\"\";height:1px;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:5}.monaco-workbench .part.statusbar>.left-items,.monaco-workbench .part.statusbar>.right-items{display:flex}.monaco-workbench .part.statusbar>.right-items{flex-direction:row-reverse;flex-wrap:wrap}.monaco-workbench .part.statusbar>.left-items{flex-grow:1}.monaco-workbench .part.statusbar>.items-container>.statusbar-item{display:inline-block;font-variant-numeric:tabular-nums;height:100%;line-height:22px;max-width:40vw;vertical-align:top}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak{position:relative}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container{height:5px;left:calc(50% - 5px);position:absolute;top:-5px;width:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container:before{border-bottom-style:solid;border-bottom-width:5px;border-left:5px solid transparent;border-right:5px solid transparent;content:\"\";position:fixed}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{margin-left:3px;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label{margin-left:0;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{margin-left:3px;margin-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left.compact-right>.statusbar-item-label{margin-left:0;margin-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.left.first-visible-item{padding-left:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.right.last-visible-item{
|
|
3
|
+
var css = ".monaco-workbench .part.statusbar{box-sizing:border-box;cursor:default;display:flex;font-size:12px;height:22px;overflow:hidden;width:100%}.monaco-workbench:not(.reduce-motion) .part.statusbar{transition:background-color .15s ease-out}.monaco-workbench .part.statusbar.status-border-top:after{background-color:var(--status-border-top-color);content:\"\";height:1px;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:5}.monaco-workbench .part.statusbar>.left-items,.monaco-workbench .part.statusbar>.right-items{display:flex}.monaco-workbench .part.statusbar>.right-items{flex-direction:row-reverse;flex-wrap:wrap}.monaco-workbench .part.statusbar>.left-items{flex-grow:1}.monaco-workbench .part.statusbar>.items-container>.statusbar-item{display:inline-block;font-variant-numeric:tabular-nums;height:100%;line-height:22px;max-width:40vw;vertical-align:top}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak{position:relative}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container{height:5px;left:calc(50% - 5px);position:absolute;top:-5px;width:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container:before{border-bottom-style:solid;border-bottom-width:5px;border-left:5px solid transparent;border-right:5px solid transparent;content:\"\";position:fixed}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{margin-left:3px;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label{margin-left:0;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{margin-left:3px;margin-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left.compact-right>.statusbar-item-label{margin-left:0;margin-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.left.first-visible-item{padding-left:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.right.last-visible-item{padding-right:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.left.first-visible-item,.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.right.last-visible-item{padding-left:0;padding-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color>.statusbar-item-label{margin-left:0;margin-right:0;padding-left:10px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left.has-background-color>.statusbar-item-label{padding-left:3px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right.has-background-color>.statusbar-item-label{padding-left:10px;padding-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{align-items:center;cursor:pointer;display:flex;height:100%;outline-width:0;overflow:hidden;padding:0 5px;text-overflow:ellipsis;white-space:pre}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label,.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{padding:0 3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>a:hover:not(.disabled){color:var(--vscode-statusBarItem-hoverForeground);text-decoration:none}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>a.disabled{cursor:default}.monaco-workbench .part.statusbar>.items-container>.statusbar-item span.codicon{color:inherit;font-size:14px;text-align:center}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a:active:not(.disabled){outline:1px solid var(--vscode-contrastActiveBorder)!important;outline-offset:-1px}.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar>.items-container>.statusbar-item a:active:not(.disabled){background-color:var(--vscode-statusBarItem-activeBackground)!important}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a:hover:not(.disabled){outline:1px dashed var(--vscode-contrastActiveBorder);outline-offset:-1px}.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar>.items-container>.statusbar-item a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-hoverBackground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.warning-kind{background-color:var(--vscode-statusBarItem-warningBackground);color:var(--vscode-statusBarItem-warningForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.warning-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-warningHoverBackground)!important;color:var(--vscode-statusBarItem-warningHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.error-kind{background-color:var(--vscode-statusBarItem-errorBackground);color:var(--vscode-statusBarItem-errorForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.error-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-errorHoverBackground)!important;color:var(--vscode-statusBarItem-errorHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.prominent-kind{background-color:var(--vscode-statusBarItem-prominentBackground);color:var(--vscode-statusBarItem-prominentForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.prominent-kind:not(.compact-right):not(.compact-left) a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-prominentHoverBackground)!important;color:var(--vscode-statusBarItem-prominentHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.remote-kind{background-color:var(--vscode-statusBarItem-remoteBackground);color:var(--vscode-statusBarItem-remoteForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.remote-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-remoteHoverBackground)!important;color:var(--vscode-statusBarItem-remoteHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.offline-kind{background-color:var(--vscode-statusBarItem-offlineBackground);color:var(--vscode-statusBarItem-offlineForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.offline-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-offlineHoverBackground)!important;color:var(--vscode-statusBarItem-offlineHoverForeground)}";
|
|
4
4
|
n(css,{});
|
|
5
5
|
|
|
6
6
|
export { css, css as default };
|
|
@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
|
|
|
3
3
|
import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
4
4
|
import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
|
|
5
5
|
import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
|
|
6
|
-
import { Parts } from '@codingame/monaco-vscode-
|
|
6
|
+
import { Parts } from '@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
|
|
7
7
|
import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
|
|
8
8
|
import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
|
|
9
9
|
import { KeybindingsRegistry, KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
|
|
@@ -31,7 +31,7 @@ class ToggleStatusbarEntryVisibilityAction extends Action {
|
|
|
31
31
|
}
|
|
32
32
|
class HideStatusbarEntryAction extends Action {
|
|
33
33
|
constructor(id, name, model) {
|
|
34
|
-
super(id, ( localize(
|
|
34
|
+
super(id, ( localize(3395, "Hide '{0}'", name)), undefined, true);
|
|
35
35
|
this.model = model;
|
|
36
36
|
}
|
|
37
37
|
async run() {
|
|
@@ -40,7 +40,7 @@ class HideStatusbarEntryAction extends Action {
|
|
|
40
40
|
}
|
|
41
41
|
let ManageExtensionAction = class ManageExtensionAction extends Action {
|
|
42
42
|
constructor(extensionId, commandService) {
|
|
43
|
-
super('statusbar.manage.extension', ( localize(
|
|
43
|
+
super('statusbar.manage.extension', ( localize(3396, "Manage Extension")));
|
|
44
44
|
this.extensionId = extensionId;
|
|
45
45
|
this.commandService = commandService;
|
|
46
46
|
}
|
|
@@ -115,7 +115,7 @@ class FocusStatusBarAction extends Action2 {
|
|
|
115
115
|
constructor() {
|
|
116
116
|
super({
|
|
117
117
|
id: 'workbench.action.focusStatusBar',
|
|
118
|
-
title: ( localize2(
|
|
118
|
+
title: ( localize2(3397, 'Focus Status Bar')),
|
|
119
119
|
category: Categories.View,
|
|
120
120
|
f1: true
|
|
121
121
|
});
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
3
|
import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
|
|
4
4
|
import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
5
|
-
import { SimpleIconLabel } from '@codingame/monaco-vscode-
|
|
5
|
+
import { SimpleIconLabel } from '@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common/vscode/vs/base/browser/ui/iconLabel/simpleIconLabel';
|
|
6
6
|
import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
|
|
7
7
|
import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
|
|
8
8
|
import { isTooltipWithCommands, ShowTooltipCommand, StatusbarEntryKinds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
|
|
@@ -90,7 +90,7 @@ let StatusbarEntryItem = class StatusbarEntryItem extends Disposable {
|
|
|
90
90
|
}
|
|
91
91
|
const hoverContents = isMarkdownString(hoverTooltip) ? { markdown: hoverTooltip, markdownNotSupportedFallback: undefined } : hoverTooltip;
|
|
92
92
|
if (this.hover) {
|
|
93
|
-
this.hover.update(hoverContents, hoverOptions);
|
|
93
|
+
this.hover.update(typeof hoverContents === 'function' ? hoverContents() : hoverContents, hoverOptions);
|
|
94
94
|
}
|
|
95
95
|
else {
|
|
96
96
|
this.hover = this._register(this.hoverService.setupManagedHover(this.hoverDelegate, this.container, hoverContents, hoverOptions));
|
|
@@ -184,8 +184,8 @@ let StatusbarEntryItem = class StatusbarEntryItem extends Disposable {
|
|
|
184
184
|
if (color) {
|
|
185
185
|
if (isThemeColor(color)) {
|
|
186
186
|
colorResult = this.themeService.getColorTheme().getColor(color.id)?.toString();
|
|
187
|
-
const listener = this.themeService.onDidColorThemeChange(
|
|
188
|
-
const colorValue = theme.getColor(color.id)?.toString();
|
|
187
|
+
const listener = this.themeService.onDidColorThemeChange(e => {
|
|
188
|
+
const colorValue = e.theme.getColor(color.id)?.toString();
|
|
189
189
|
if (isBackground) {
|
|
190
190
|
container.style.backgroundColor = colorValue ?? '';
|
|
191
191
|
}
|
|
@@ -69,7 +69,7 @@ class StatusbarViewModel extends Disposable {
|
|
|
69
69
|
if (index >= 0) {
|
|
70
70
|
this._entries.splice(index, 1);
|
|
71
71
|
if (( this._entries.some(
|
|
72
|
-
otherEntry => isStatusbarEntryLocation(otherEntry.priority.primary) && otherEntry.priority.primary.id === entry.id
|
|
72
|
+
otherEntry => isStatusbarEntryLocation(otherEntry.priority.primary) && otherEntry.priority.primary.location.id === entry.id
|
|
73
73
|
))) {
|
|
74
74
|
this.sort();
|
|
75
75
|
}
|
|
@@ -169,15 +169,16 @@ class StatusbarViewModel extends Disposable {
|
|
|
169
169
|
}
|
|
170
170
|
}
|
|
171
171
|
sort() {
|
|
172
|
+
const allEntryIds = ( new Set(( this._entries.map(entry => entry.id))));
|
|
172
173
|
const mapEntryWithNumberedPriorityToIndex = ( new Map());
|
|
173
174
|
const mapEntryWithRelativePriority = ( new Map());
|
|
174
175
|
for (let i = 0; i < this._entries.length; i++) {
|
|
175
176
|
const entry = this._entries[i];
|
|
176
|
-
if (typeof entry.priority.primary === 'number') {
|
|
177
|
+
if (typeof entry.priority.primary === 'number' || !( allEntryIds.has(entry.priority.primary.location.id))) {
|
|
177
178
|
mapEntryWithNumberedPriorityToIndex.set(entry, i);
|
|
178
179
|
}
|
|
179
180
|
else {
|
|
180
|
-
const referenceEntryId = entry.priority.primary.id;
|
|
181
|
+
const referenceEntryId = entry.priority.primary.location.id;
|
|
181
182
|
let entries = mapEntryWithRelativePriority.get(referenceEntryId);
|
|
182
183
|
if (!entries) {
|
|
183
184
|
for (const relativeEntries of ( mapEntryWithRelativePriority.values())) {
|
|
@@ -197,8 +198,10 @@ class StatusbarViewModel extends Disposable {
|
|
|
197
198
|
const sortedEntriesWithNumberedPriority = Array.from(( mapEntryWithNumberedPriorityToIndex.keys()));
|
|
198
199
|
sortedEntriesWithNumberedPriority.sort((entryA, entryB) => {
|
|
199
200
|
if (entryA.alignment === entryB.alignment) {
|
|
200
|
-
|
|
201
|
-
|
|
201
|
+
const entryAPrimaryPriority = typeof entryA.priority.primary === 'number' ? entryA.priority.primary : entryA.priority.primary.location.priority;
|
|
202
|
+
const entryBPrimaryPriority = typeof entryB.priority.primary === 'number' ? entryB.priority.primary : entryB.priority.primary.location.priority;
|
|
203
|
+
if (entryAPrimaryPriority !== entryBPrimaryPriority) {
|
|
204
|
+
return entryBPrimaryPriority - entryAPrimaryPriority;
|
|
202
205
|
}
|
|
203
206
|
if (entryA.priority.secondary !== entryB.priority.secondary) {
|
|
204
207
|
return entryB.priority.secondary - entryA.priority.secondary;
|
|
@@ -220,16 +223,20 @@ class StatusbarViewModel extends Disposable {
|
|
|
220
223
|
const relativeEntriesMap = mapEntryWithRelativePriority.get(entry.id);
|
|
221
224
|
const relativeEntries = relativeEntriesMap ? Array.from(( relativeEntriesMap.values())) : undefined;
|
|
222
225
|
if (relativeEntries) {
|
|
223
|
-
sortedEntries.push(...relativeEntries
|
|
226
|
+
sortedEntries.push(...relativeEntries
|
|
227
|
+
.filter(entry => isStatusbarEntryLocation(entry.priority.primary) && entry.priority.primary.alignment === StatusbarAlignment.LEFT)
|
|
228
|
+
.sort((entryA, entryB) => entryB.priority.secondary - entryA.priority.secondary));
|
|
224
229
|
}
|
|
225
230
|
sortedEntries.push(entry);
|
|
226
231
|
if (relativeEntries) {
|
|
227
|
-
sortedEntries.push(...relativeEntries
|
|
232
|
+
sortedEntries.push(...relativeEntries
|
|
233
|
+
.filter(entry => isStatusbarEntryLocation(entry.priority.primary) && entry.priority.primary.alignment === StatusbarAlignment.RIGHT)
|
|
234
|
+
.sort((entryA, entryB) => entryB.priority.secondary - entryA.priority.secondary));
|
|
228
235
|
}
|
|
229
236
|
mapEntryWithRelativePriority.delete(entry.id);
|
|
230
237
|
}
|
|
231
238
|
for (const [, entries] of mapEntryWithRelativePriority) {
|
|
232
|
-
sortedEntries.push(...( entries.values()));
|
|
239
|
+
sortedEntries.push(...Array.from(( entries.values())).sort((entryA, entryB) => entryB.priority.secondary - entryA.priority.secondary));
|
|
233
240
|
}
|
|
234
241
|
}
|
|
235
242
|
else {
|
|
@@ -25,10 +25,10 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/mini
|
|
|
25
25
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
|
|
26
26
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
|
|
27
27
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
|
|
28
|
-
import { addDisposableListener, EventType, clearNode, EventHelper, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
|
|
28
|
+
import { isHTMLElement, addDisposableListener, EventType, clearNode, EventHelper, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
|
|
29
29
|
import { createStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
|
|
30
30
|
import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
|
|
31
|
-
import { Parts } from '@codingame/monaco-vscode-
|
|
31
|
+
import { Parts } from '@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
|
|
32
32
|
import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
|
|
33
33
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
|
|
34
34
|
import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
|
|
@@ -44,6 +44,7 @@ import { StatusbarViewModel } from './statusbarModel.js';
|
|
|
44
44
|
import { StatusbarEntryItem } from './statusbarItem.js';
|
|
45
45
|
import { StatusBarFocused } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
|
|
46
46
|
import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
47
|
+
import { isManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
|
|
47
48
|
|
|
48
49
|
var StatusbarPart_1, AuxiliaryStatusbarPart_1;
|
|
49
50
|
let StatusbarPart = class StatusbarPart extends Part {
|
|
@@ -67,7 +68,17 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
67
68
|
this.onWillDispose = this._onWillDispose.event;
|
|
68
69
|
this.onDidOverrideEntry = this._register(( new Emitter()));
|
|
69
70
|
this.entryOverrides = ( new Map());
|
|
70
|
-
this.hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element',
|
|
71
|
+
this.hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', {
|
|
72
|
+
instantHover: true,
|
|
73
|
+
dynamicDelay(content) {
|
|
74
|
+
if (typeof content === 'function' ||
|
|
75
|
+
isHTMLElement(content) ||
|
|
76
|
+
(isManagedHoverTooltipMarkdownString(content) && typeof content.markdown === 'function')) {
|
|
77
|
+
return 500;
|
|
78
|
+
}
|
|
79
|
+
return undefined;
|
|
80
|
+
}
|
|
81
|
+
}, (_, focus) => ({
|
|
71
82
|
persistence: {
|
|
72
83
|
hideOnKeyDown: true,
|
|
73
84
|
sticky: focus
|
|
@@ -315,7 +326,7 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
315
326
|
if (isStatusbarEntryLocation(entry.priority.primary) &&
|
|
316
327
|
entry.priority.primary.compact
|
|
317
328
|
) {
|
|
318
|
-
const locationId = entry.priority.primary.id;
|
|
329
|
+
const locationId = entry.priority.primary.location.id;
|
|
319
330
|
const location = mapIdToVisibleEntry.get(locationId);
|
|
320
331
|
if (!location) {
|
|
321
332
|
continue;
|
|
@@ -384,7 +395,7 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
384
395
|
}
|
|
385
396
|
getContextMenuActions(event) {
|
|
386
397
|
const actions = [];
|
|
387
|
-
actions.push(toAction({ id: ToggleStatusbarVisibilityAction.ID, label: ( localize(
|
|
398
|
+
actions.push(toAction({ id: ToggleStatusbarVisibilityAction.ID, label: ( localize(3398, "Hide Status Bar")), run: () => this.instantiationService.invokeFunction(accessor => ( new ToggleStatusbarVisibilityAction()).run(accessor)) }));
|
|
388
399
|
actions.push(( new Separator()));
|
|
389
400
|
const handledEntries = ( new Set());
|
|
390
401
|
for (const entry of this.viewModel.entries) {
|
|
@@ -549,9 +560,10 @@ let StatusbarService = class StatusbarService extends MultiWindowParts {
|
|
|
549
560
|
}
|
|
550
561
|
return this.mainPart.addEntry(entry, id, alignment, priorityOrLocation);
|
|
551
562
|
}
|
|
552
|
-
doAddEntryToAllWindows(
|
|
563
|
+
doAddEntryToAllWindows(originalEntry, id, alignment, priorityOrLocation = 0) {
|
|
553
564
|
const entryDisposables = ( new DisposableStore());
|
|
554
565
|
const accessors = ( new Set());
|
|
566
|
+
let entry = originalEntry;
|
|
555
567
|
function addEntry(part) {
|
|
556
568
|
const partDisposables = ( new DisposableStore());
|
|
557
569
|
partDisposables.add(part.onWillDispose(() => partDisposables.dispose()));
|
|
@@ -566,9 +578,10 @@ let StatusbarService = class StatusbarService extends MultiWindowParts {
|
|
|
566
578
|
}
|
|
567
579
|
entryDisposables.add(this.onDidCreateAuxiliaryStatusbarPart(part => addEntry(part)));
|
|
568
580
|
return {
|
|
569
|
-
update: (
|
|
581
|
+
update: (updatedEntry) => {
|
|
582
|
+
entry = updatedEntry;
|
|
570
583
|
for (const update of accessors) {
|
|
571
|
-
update.update(
|
|
584
|
+
update.update(updatedEntry);
|
|
572
585
|
}
|
|
573
586
|
},
|
|
574
587
|
dispose: () => entryDisposables.dispose()
|