@codingame/monaco-vscode-view-status-bar-service-override 11.1.1 → 12.0.0
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/index.d.ts +2 -1
- package/index.js +15 -1
- package/package.json +24 -7
- package/vscode/src/vs/workbench/api/browser/statusBarExtensionPoint.d.ts +4 -0
- package/vscode/src/vs/workbench/api/browser/statusBarExtensionPoint.js +25 -24
- package/vscode/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarActions.d.ts +12 -0
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarActions.js +19 -16
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarItem.d.ts +34 -0
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarItem.js +7 -5
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarModel.d.ts +47 -0
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarModel.js +15 -13
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarPart.d.ts +145 -0
- package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarPart.js +127 -82
- package/viewStatusBar.js +0 -14
package/index.d.ts
CHANGED
|
@@ -1 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
|
|
2
|
+
export default function getServiceOverride(): IEditorOverrideServices;
|
package/index.js
CHANGED
|
@@ -1 +1,15 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
|
|
3
|
+
import { StatusbarService } from './vscode/src/vs/workbench/browser/parts/statusbar/statusbarPart.js';
|
|
4
|
+
import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
|
|
5
|
+
import { IExtensionStatusBarItemService, ExtensionStatusBarItemService } from 'vscode/vscode/vs/workbench/api/browser/statusBarService';
|
|
6
|
+
import './vscode/src/vs/workbench/api/browser/statusBarExtensionPoint.js';
|
|
7
|
+
|
|
8
|
+
function getServiceOverride() {
|
|
9
|
+
return {
|
|
10
|
+
[IStatusbarService.toString()]: new SyncDescriptor(StatusbarService, [], false),
|
|
11
|
+
[IExtensionStatusBarItemService.toString()]: new SyncDescriptor(ExtensionStatusBarItemService, [], false)
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export { getServiceOverride as default };
|
package/package.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-view-status-bar-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "12.0.0",
|
|
4
|
+
"private": false,
|
|
5
|
+
"description": "VSCode public API plugged on the monaco editor - view-status-bar service-override",
|
|
4
6
|
"keywords": [],
|
|
5
7
|
"author": {
|
|
6
8
|
"name": "CodinGame",
|
|
@@ -12,8 +14,21 @@
|
|
|
12
14
|
"url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
|
|
13
15
|
},
|
|
14
16
|
"type": "module",
|
|
15
|
-
"
|
|
16
|
-
|
|
17
|
+
"dependencies": {
|
|
18
|
+
"@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "12.0.0",
|
|
19
|
+
"@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common": "12.0.0",
|
|
20
|
+
"@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common": "12.0.0",
|
|
21
|
+
"@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common": "12.0.0",
|
|
22
|
+
"vscode": "npm:@codingame/monaco-vscode-api@12.0.0"
|
|
23
|
+
},
|
|
24
|
+
"peerDependencies": {
|
|
25
|
+
"@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "12.0.0"
|
|
26
|
+
},
|
|
27
|
+
"peerDependenciesMeta": {
|
|
28
|
+
"@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": {
|
|
29
|
+
"optional": true
|
|
30
|
+
}
|
|
31
|
+
},
|
|
17
32
|
"main": "index.js",
|
|
18
33
|
"module": "index.js",
|
|
19
34
|
"types": "index.d.ts",
|
|
@@ -22,10 +37,12 @@
|
|
|
22
37
|
"default": "./index.js"
|
|
23
38
|
},
|
|
24
39
|
"./vscode/*": {
|
|
25
|
-
"default": "./vscode/src/*.js"
|
|
40
|
+
"default": "./vscode/src/*.js",
|
|
41
|
+
"types": "./vscode/src/*.d.ts"
|
|
42
|
+
},
|
|
43
|
+
"./*": {
|
|
44
|
+
"default": "./*.js",
|
|
45
|
+
"types": "./*.d.ts"
|
|
26
46
|
}
|
|
27
|
-
},
|
|
28
|
-
"dependencies": {
|
|
29
|
-
"vscode": "npm:@codingame/monaco-vscode-api@11.1.1"
|
|
30
47
|
}
|
|
31
48
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
|
|
2
3
|
import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
3
4
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
4
5
|
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
@@ -8,8 +9,8 @@ import { isAccessibilityInformation } from 'vscode/vscode/vs/platform/accessibil
|
|
|
8
9
|
import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
|
|
9
10
|
import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
|
|
10
11
|
import { asStatusBarItemIdentifier } from 'vscode/vscode/vs/workbench/api/common/extHostTypes';
|
|
11
|
-
import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
|
|
12
|
-
import { IExtensionStatusBarItemService } from 'vscode/vscode/vs/workbench/api/browser/statusBarService';
|
|
12
|
+
import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
|
|
13
|
+
import { StatusBarUpdateKind, IExtensionStatusBarItemService } from 'vscode/vscode/vs/workbench/api/browser/statusBarService';
|
|
13
14
|
|
|
14
15
|
function isUserFriendlyStatusItemEntry(candidate) {
|
|
15
16
|
const obj = candidate;
|
|
@@ -29,62 +30,62 @@ const statusBarItemSchema = {
|
|
|
29
30
|
id: {
|
|
30
31
|
type: 'string',
|
|
31
32
|
markdownDescription: ( localize(
|
|
32
|
-
|
|
33
|
+
2310,
|
|
33
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'
|
|
34
35
|
))
|
|
35
36
|
},
|
|
36
37
|
name: {
|
|
37
38
|
type: 'string',
|
|
38
39
|
description: ( localize(
|
|
39
|
-
|
|
40
|
+
2311,
|
|
40
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.'
|
|
41
42
|
))
|
|
42
43
|
},
|
|
43
44
|
text: {
|
|
44
45
|
type: 'string',
|
|
45
46
|
description: ( localize(
|
|
46
|
-
|
|
47
|
+
2312,
|
|
47
48
|
'The text to show for the entry. You can embed icons in the text by leveraging the `$(<name>)`-syntax, like \'Hello $(globe)!\''
|
|
48
49
|
))
|
|
49
50
|
},
|
|
50
51
|
tooltip: {
|
|
51
52
|
type: 'string',
|
|
52
|
-
description: ( localize(
|
|
53
|
+
description: ( localize(2313, 'The tooltip text for the entry.'))
|
|
53
54
|
},
|
|
54
55
|
command: {
|
|
55
56
|
type: 'string',
|
|
56
|
-
description: ( localize(
|
|
57
|
+
description: ( localize(2314, 'The command to execute when the status bar entry is clicked.'))
|
|
57
58
|
},
|
|
58
59
|
alignment: {
|
|
59
60
|
type: 'string',
|
|
60
61
|
enum: ['left', 'right'],
|
|
61
|
-
description: ( localize(
|
|
62
|
+
description: ( localize(2315, 'The alignment of the status bar entry.'))
|
|
62
63
|
},
|
|
63
64
|
priority: {
|
|
64
65
|
type: 'number',
|
|
65
66
|
description: ( localize(
|
|
66
|
-
|
|
67
|
+
2316,
|
|
67
68
|
'The priority of the status bar entry. Higher value means the item should be shown more to the left.'
|
|
68
69
|
))
|
|
69
70
|
},
|
|
70
71
|
accessibilityInformation: {
|
|
71
72
|
type: 'object',
|
|
72
73
|
description: ( localize(
|
|
73
|
-
|
|
74
|
+
2317,
|
|
74
75
|
'Defines the role and aria label to be used when the status bar entry is focused.'
|
|
75
76
|
)),
|
|
76
77
|
properties: {
|
|
77
78
|
role: {
|
|
78
79
|
type: 'string',
|
|
79
80
|
description: ( localize(
|
|
80
|
-
|
|
81
|
+
2318,
|
|
81
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'
|
|
82
83
|
))
|
|
83
84
|
},
|
|
84
85
|
label: {
|
|
85
86
|
type: 'string',
|
|
86
87
|
description: ( localize(
|
|
87
|
-
|
|
88
|
+
2319,
|
|
88
89
|
'The aria label of the status bar entry. Defaults to the entry\'s text.'
|
|
89
90
|
))
|
|
90
91
|
}
|
|
@@ -93,7 +94,7 @@ const statusBarItemSchema = {
|
|
|
93
94
|
}
|
|
94
95
|
};
|
|
95
96
|
const statusBarItemsSchema = {
|
|
96
|
-
description: ( localize(
|
|
97
|
+
description: ( localize(2320, "Contributes items to the status bar.")),
|
|
97
98
|
oneOf: [
|
|
98
99
|
statusBarItemSchema,
|
|
99
100
|
{
|
|
@@ -108,7 +109,7 @@ const statusBarItemsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
|
|
|
108
109
|
});
|
|
109
110
|
let StatusBarItemsExtensionPoint = class StatusBarItemsExtensionPoint {
|
|
110
111
|
constructor(statusBarItemsService) {
|
|
111
|
-
const contributions = (
|
|
112
|
+
const contributions = ( new DisposableStore());
|
|
112
113
|
statusBarItemsExtensionPoint.setHandler((extensions) => {
|
|
113
114
|
contributions.clear();
|
|
114
115
|
for (const entry of extensions) {
|
|
@@ -119,12 +120,12 @@ let StatusBarItemsExtensionPoint = class StatusBarItemsExtensionPoint {
|
|
|
119
120
|
const { value, collector } = entry;
|
|
120
121
|
for (const candidate of Iterable.wrap(value)) {
|
|
121
122
|
if (!isUserFriendlyStatusItemEntry(candidate)) {
|
|
122
|
-
collector.error(( localize(
|
|
123
|
+
collector.error(( localize(2321, "Invalid status bar item contribution.")));
|
|
123
124
|
continue;
|
|
124
125
|
}
|
|
125
126
|
const fullItemId = asStatusBarItemIdentifier(entry.description.identifier, candidate.id);
|
|
126
127
|
const kind = statusBarItemsService.setOrUpdateEntry(fullItemId, fullItemId, ExtensionIdentifier.toKey(entry.description.identifier), candidate.name ?? entry.description.displayName ?? entry.description.name, candidate.text, candidate.tooltip, candidate.command ? { id: candidate.command, title: candidate.name } : undefined, undefined, undefined, candidate.alignment === 'left', candidate.priority, candidate.accessibilityInformation);
|
|
127
|
-
if (kind ===
|
|
128
|
+
if (kind === StatusBarUpdateKind.DidDefine) {
|
|
128
129
|
contributions.add(toDisposable(() => statusBarItemsService.unsetEntry(fullItemId)));
|
|
129
130
|
}
|
|
130
131
|
}
|
|
@@ -132,9 +133,9 @@ let StatusBarItemsExtensionPoint = class StatusBarItemsExtensionPoint {
|
|
|
132
133
|
});
|
|
133
134
|
}
|
|
134
135
|
};
|
|
135
|
-
StatusBarItemsExtensionPoint = (
|
|
136
|
-
(
|
|
137
|
-
], StatusBarItemsExtensionPoint))
|
|
136
|
+
StatusBarItemsExtensionPoint = ( __decorate([
|
|
137
|
+
( __param(0, IExtensionStatusBarItemService))
|
|
138
|
+
], StatusBarItemsExtensionPoint));
|
|
138
139
|
let StatusBarItemsExtensionPointWorkbenchContribution = class StatusBarItemsExtensionPointWorkbenchContribution {
|
|
139
140
|
static { this.ID = 'workbench.contrib.statusBarItemsExtensionPoint'; }
|
|
140
141
|
constructor(instantiationService) {
|
|
@@ -142,9 +143,9 @@ let StatusBarItemsExtensionPointWorkbenchContribution = class StatusBarItemsExte
|
|
|
142
143
|
this.instantiationService.createInstance(StatusBarItemsExtensionPoint);
|
|
143
144
|
}
|
|
144
145
|
};
|
|
145
|
-
StatusBarItemsExtensionPointWorkbenchContribution = (
|
|
146
|
-
(
|
|
147
|
-
], StatusBarItemsExtensionPointWorkbenchContribution))
|
|
148
|
-
registerWorkbenchContribution2(StatusBarItemsExtensionPointWorkbenchContribution.ID, StatusBarItemsExtensionPointWorkbenchContribution,
|
|
146
|
+
StatusBarItemsExtensionPointWorkbenchContribution = ( __decorate([
|
|
147
|
+
( __param(0, IInstantiationService))
|
|
148
|
+
], StatusBarItemsExtensionPointWorkbenchContribution));
|
|
149
|
+
registerWorkbenchContribution2(StatusBarItemsExtensionPointWorkbenchContribution.ID, StatusBarItemsExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup);
|
|
149
150
|
|
|
150
151
|
export { StatusBarItemsExtensionPoint };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css
|
|
1
|
+
import n from 'vscode/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{margin-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 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)}";
|
|
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{margin-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 };
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Action } from "vscode/vscode/vs/base/common/actions";
|
|
2
|
+
import { StatusbarViewModel } from "./statusbarModel.js";
|
|
3
|
+
export declare class ToggleStatusbarEntryVisibilityAction extends Action {
|
|
4
|
+
private model;
|
|
5
|
+
constructor(id: string, label: string, model: StatusbarViewModel);
|
|
6
|
+
run(): Promise<void>;
|
|
7
|
+
}
|
|
8
|
+
export declare class HideStatusbarEntryAction extends Action {
|
|
9
|
+
private model;
|
|
10
|
+
constructor(id: string, name: string, model: StatusbarViewModel);
|
|
11
|
+
run(): Promise<void>;
|
|
12
|
+
}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
|
|
1
2
|
import { localize, localize2 } from 'vscode/vscode/vs/nls';
|
|
2
3
|
import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
|
|
3
4
|
import { Action } from 'vscode/vscode/vs/base/common/actions';
|
|
5
|
+
import { Parts } from '@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common/vscode/vs/workbench/services/layout/browser/layoutService';
|
|
4
6
|
import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
|
|
5
|
-
import {
|
|
7
|
+
import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
|
|
8
|
+
import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
|
|
6
9
|
import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
|
|
7
10
|
import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
|
|
8
11
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
@@ -26,7 +29,7 @@ class ToggleStatusbarEntryVisibilityAction extends Action {
|
|
|
26
29
|
}
|
|
27
30
|
class HideStatusbarEntryAction extends Action {
|
|
28
31
|
constructor(id, name, model) {
|
|
29
|
-
super(id, ( localize(
|
|
32
|
+
super(id, ( localize(3311, "Hide '{0}'", name)), undefined, true);
|
|
30
33
|
this.model = model;
|
|
31
34
|
}
|
|
32
35
|
async run() {
|
|
@@ -35,9 +38,9 @@ class HideStatusbarEntryAction extends Action {
|
|
|
35
38
|
}
|
|
36
39
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
37
40
|
id: 'workbench.statusBar.focusPrevious',
|
|
38
|
-
weight:
|
|
39
|
-
primary:
|
|
40
|
-
secondary: [
|
|
41
|
+
weight: KeybindingWeight.WorkbenchContrib,
|
|
42
|
+
primary: KeyCode.LeftArrow,
|
|
43
|
+
secondary: [KeyCode.UpArrow],
|
|
41
44
|
when: StatusBarFocused,
|
|
42
45
|
handler: (accessor) => {
|
|
43
46
|
const statusBarService = accessor.get(IStatusbarService);
|
|
@@ -46,9 +49,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
46
49
|
});
|
|
47
50
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
48
51
|
id: 'workbench.statusBar.focusNext',
|
|
49
|
-
weight:
|
|
50
|
-
primary:
|
|
51
|
-
secondary: [
|
|
52
|
+
weight: KeybindingWeight.WorkbenchContrib,
|
|
53
|
+
primary: KeyCode.RightArrow,
|
|
54
|
+
secondary: [KeyCode.DownArrow],
|
|
52
55
|
when: StatusBarFocused,
|
|
53
56
|
handler: (accessor) => {
|
|
54
57
|
const statusBarService = accessor.get(IStatusbarService);
|
|
@@ -57,8 +60,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
57
60
|
});
|
|
58
61
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
59
62
|
id: 'workbench.statusBar.focusFirst',
|
|
60
|
-
weight:
|
|
61
|
-
primary:
|
|
63
|
+
weight: KeybindingWeight.WorkbenchContrib,
|
|
64
|
+
primary: KeyCode.Home,
|
|
62
65
|
when: StatusBarFocused,
|
|
63
66
|
handler: (accessor) => {
|
|
64
67
|
const statusBarService = accessor.get(IStatusbarService);
|
|
@@ -68,8 +71,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
68
71
|
});
|
|
69
72
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
70
73
|
id: 'workbench.statusBar.focusLast',
|
|
71
|
-
weight:
|
|
72
|
-
primary:
|
|
74
|
+
weight: KeybindingWeight.WorkbenchContrib,
|
|
75
|
+
primary: KeyCode.End,
|
|
73
76
|
when: StatusBarFocused,
|
|
74
77
|
handler: (accessor) => {
|
|
75
78
|
const statusBarService = accessor.get(IStatusbarService);
|
|
@@ -79,8 +82,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
79
82
|
});
|
|
80
83
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
81
84
|
id: 'workbench.statusBar.clearFocus',
|
|
82
|
-
weight:
|
|
83
|
-
primary:
|
|
85
|
+
weight: KeybindingWeight.WorkbenchContrib,
|
|
86
|
+
primary: KeyCode.Escape,
|
|
84
87
|
when: StatusBarFocused,
|
|
85
88
|
handler: (accessor) => {
|
|
86
89
|
const statusBarService = accessor.get(IStatusbarService);
|
|
@@ -97,14 +100,14 @@ class FocusStatusBarAction extends Action2 {
|
|
|
97
100
|
constructor() {
|
|
98
101
|
super({
|
|
99
102
|
id: 'workbench.action.focusStatusBar',
|
|
100
|
-
title: ( localize2(
|
|
103
|
+
title: ( localize2(3312, 'Focus Status Bar')),
|
|
101
104
|
category: Categories.View,
|
|
102
105
|
f1: true
|
|
103
106
|
});
|
|
104
107
|
}
|
|
105
108
|
async run(accessor) {
|
|
106
109
|
const layoutService = accessor.get(IWorkbenchLayoutService);
|
|
107
|
-
layoutService.focusPart(
|
|
110
|
+
layoutService.focusPart(Parts.STATUSBAR_PART, getActiveWindow());
|
|
108
111
|
}
|
|
109
112
|
}
|
|
110
113
|
registerAction2(FocusStatusBarAction);
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
|
|
2
|
+
import { ICommandService } from "vscode/vscode/vs/platform/commands/common/commands.service";
|
|
3
|
+
import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
|
|
4
|
+
import { IStatusbarEntry } from "vscode/vscode/vs/workbench/services/statusbar/browser/statusbar";
|
|
5
|
+
import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
|
|
6
|
+
import { INotificationService } from "vscode/vscode/vs/platform/notification/common/notification.service";
|
|
7
|
+
import { IHoverDelegate } from "vscode/vscode/vs/base/browser/ui/hover/hoverDelegate";
|
|
8
|
+
import { IHoverService } from "vscode/vscode/vs/platform/hover/browser/hover.service";
|
|
9
|
+
export declare class StatusbarEntryItem extends Disposable {
|
|
10
|
+
private container;
|
|
11
|
+
private readonly hoverDelegate;
|
|
12
|
+
private readonly commandService;
|
|
13
|
+
private readonly hoverService;
|
|
14
|
+
private readonly notificationService;
|
|
15
|
+
private readonly telemetryService;
|
|
16
|
+
private readonly themeService;
|
|
17
|
+
private readonly label;
|
|
18
|
+
private entry;
|
|
19
|
+
private readonly foregroundListener;
|
|
20
|
+
private readonly backgroundListener;
|
|
21
|
+
private readonly commandMouseListener;
|
|
22
|
+
private readonly commandTouchListener;
|
|
23
|
+
private readonly commandKeyboardListener;
|
|
24
|
+
private hover;
|
|
25
|
+
readonly labelContainer: HTMLElement;
|
|
26
|
+
readonly beakContainer: HTMLElement;
|
|
27
|
+
get name(): string;
|
|
28
|
+
get hasCommand(): boolean;
|
|
29
|
+
constructor(container: HTMLElement, entry: IStatusbarEntry, hoverDelegate: IHoverDelegate, commandService: ICommandService, hoverService: IHoverService, notificationService: INotificationService, telemetryService: ITelemetryService, themeService: IThemeService);
|
|
30
|
+
update(entry: IStatusbarEntry): void;
|
|
31
|
+
private isEqualTooltip;
|
|
32
|
+
private executeCommand;
|
|
33
|
+
private applyColor;
|
|
34
|
+
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
|
|
2
3
|
import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
|
|
3
4
|
import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
4
|
-
import { SimpleIconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/simpleIconLabel';
|
|
5
|
+
import { SimpleIconLabel } from '@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/base/browser/ui/iconLabel/simpleIconLabel';
|
|
5
6
|
import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
|
|
6
7
|
import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
|
|
7
8
|
import { ShowTooltipCommand, StatusbarEntryKinds } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
|
|
@@ -11,6 +12,7 @@ import { show, hide, addDisposableListener, EventType, EventHelper, append } fro
|
|
|
11
12
|
import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
|
|
12
13
|
import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
|
|
13
14
|
import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
|
|
15
|
+
import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
|
|
14
16
|
import { renderIcon, renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
|
|
15
17
|
import { syncing, spinningLoading } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
|
|
16
18
|
import { isMarkdownString, markdownStringEqual } from 'vscode/vscode/vs/base/common/htmlContent';
|
|
@@ -89,11 +91,11 @@ let StatusbarEntryItem = class StatusbarEntryItem extends Disposable {
|
|
|
89
91
|
this.commandTouchListener.value = addDisposableListener(this.labelContainer, EventType$1.Tap, () => this.executeCommand(command));
|
|
90
92
|
this.commandKeyboardListener.value = addDisposableListener(this.labelContainer, EventType.KEY_DOWN, e => {
|
|
91
93
|
const event = ( new StandardKeyboardEvent(e));
|
|
92
|
-
if (event.equals(
|
|
94
|
+
if (event.equals(KeyCode.Space) || event.equals(KeyCode.Enter)) {
|
|
93
95
|
EventHelper.stop(e);
|
|
94
96
|
this.executeCommand(command);
|
|
95
97
|
}
|
|
96
|
-
else if (event.equals(
|
|
98
|
+
else if (event.equals(KeyCode.Escape) || event.equals(KeyCode.LeftArrow) || event.equals(KeyCode.RightArrow)) {
|
|
97
99
|
EventHelper.stop(e);
|
|
98
100
|
this.hover?.hide();
|
|
99
101
|
}
|
|
@@ -229,7 +231,7 @@ class StatusBarCodiconLabel extends SimpleIconLabel {
|
|
|
229
231
|
}
|
|
230
232
|
let textContent = text ?? '';
|
|
231
233
|
if (textContent) {
|
|
232
|
-
textContent =
|
|
234
|
+
textContent = `\u00A0${textContent}`;
|
|
233
235
|
}
|
|
234
236
|
append(this.container, ...renderLabelWithIcons(textContent));
|
|
235
237
|
}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
|
|
2
|
+
import { IStatusbarEntryPriority, StatusbarAlignment } from "vscode/vscode/vs/workbench/services/statusbar/browser/statusbar";
|
|
3
|
+
import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
|
|
4
|
+
export interface IStatusbarViewModelEntry {
|
|
5
|
+
readonly id: string;
|
|
6
|
+
readonly name: string;
|
|
7
|
+
readonly hasCommand: boolean;
|
|
8
|
+
readonly alignment: StatusbarAlignment;
|
|
9
|
+
readonly priority: IStatusbarEntryPriority;
|
|
10
|
+
readonly container: HTMLElement;
|
|
11
|
+
readonly labelContainer: HTMLElement;
|
|
12
|
+
}
|
|
13
|
+
export declare class StatusbarViewModel extends Disposable {
|
|
14
|
+
private readonly storageService;
|
|
15
|
+
private static readonly HIDDEN_ENTRIES_KEY;
|
|
16
|
+
private readonly _onDidChangeEntryVisibility;
|
|
17
|
+
readonly onDidChangeEntryVisibility: import("vscode/vscode/vs/base/common/event").Event<{
|
|
18
|
+
id: string;
|
|
19
|
+
visible: boolean;
|
|
20
|
+
}>;
|
|
21
|
+
private _entries;
|
|
22
|
+
get entries(): IStatusbarViewModelEntry[];
|
|
23
|
+
private _lastFocusedEntry;
|
|
24
|
+
get lastFocusedEntry(): IStatusbarViewModelEntry | undefined;
|
|
25
|
+
private hidden;
|
|
26
|
+
constructor(storageService: IStorageService);
|
|
27
|
+
private restoreState;
|
|
28
|
+
private registerListeners;
|
|
29
|
+
private onDidStorageValueChange;
|
|
30
|
+
add(entry: IStatusbarViewModelEntry): void;
|
|
31
|
+
remove(entry: IStatusbarViewModelEntry): void;
|
|
32
|
+
isHidden(id: string): boolean;
|
|
33
|
+
hide(id: string): void;
|
|
34
|
+
show(id: string): void;
|
|
35
|
+
findEntry(container: HTMLElement): IStatusbarViewModelEntry | undefined;
|
|
36
|
+
getEntries(alignment: StatusbarAlignment): IStatusbarViewModelEntry[];
|
|
37
|
+
focusNextEntry(): void;
|
|
38
|
+
focusPreviousEntry(): void;
|
|
39
|
+
isEntryFocused(): boolean;
|
|
40
|
+
private getFocusedEntry;
|
|
41
|
+
private focusEntry;
|
|
42
|
+
private updateVisibility;
|
|
43
|
+
private saveState;
|
|
44
|
+
private sort;
|
|
45
|
+
private markFirstLastVisibleEntry;
|
|
46
|
+
private doMarkFirstLastVisibleStatusbarItem;
|
|
47
|
+
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
1
|
+
|
|
2
|
+
import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
3
|
+
import { isStatusbarEntryLocation, StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
|
|
3
4
|
import { isAncestorOfActiveElement, hide, show } from 'vscode/vscode/vs/base/browser/dom';
|
|
5
|
+
import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
|
|
4
6
|
import { Emitter } from 'vscode/vscode/vs/base/common/event';
|
|
5
7
|
|
|
6
8
|
class StatusbarViewModel extends Disposable {
|
|
@@ -20,7 +22,7 @@ class StatusbarViewModel extends Disposable {
|
|
|
20
22
|
this.registerListeners();
|
|
21
23
|
}
|
|
22
24
|
restoreState() {
|
|
23
|
-
const hiddenRaw = this.storageService.get(StatusbarViewModel.HIDDEN_ENTRIES_KEY,
|
|
25
|
+
const hiddenRaw = this.storageService.get(StatusbarViewModel.HIDDEN_ENTRIES_KEY, StorageScope.PROFILE);
|
|
24
26
|
if (hiddenRaw) {
|
|
25
27
|
try {
|
|
26
28
|
this.hidden = ( new Set(JSON.parse(hiddenRaw)));
|
|
@@ -30,7 +32,7 @@ class StatusbarViewModel extends Disposable {
|
|
|
30
32
|
}
|
|
31
33
|
}
|
|
32
34
|
registerListeners() {
|
|
33
|
-
this._register(this.storageService.onDidChangeValue(
|
|
35
|
+
this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, StatusbarViewModel.HIDDEN_ENTRIES_KEY, this._store)(() => this.onDidStorageValueChange()));
|
|
34
36
|
}
|
|
35
37
|
onDidStorageValueChange() {
|
|
36
38
|
const currentlyHidden = ( new Set(this.hidden));
|
|
@@ -98,7 +100,7 @@ class StatusbarViewModel extends Disposable {
|
|
|
98
100
|
return this._entries.filter(entry => entry.alignment === alignment);
|
|
99
101
|
}
|
|
100
102
|
focusNextEntry() {
|
|
101
|
-
this.focusEntry(
|
|
103
|
+
this.focusEntry(1, 0);
|
|
102
104
|
}
|
|
103
105
|
focusPreviousEntry() {
|
|
104
106
|
this.focusEntry(-1, this.entries.length - 1);
|
|
@@ -160,10 +162,10 @@ class StatusbarViewModel extends Disposable {
|
|
|
160
162
|
}
|
|
161
163
|
saveState() {
|
|
162
164
|
if (this.hidden.size > 0) {
|
|
163
|
-
this.storageService.store(StatusbarViewModel.HIDDEN_ENTRIES_KEY, JSON.stringify(Array.from(( this.hidden.values()))),
|
|
165
|
+
this.storageService.store(StatusbarViewModel.HIDDEN_ENTRIES_KEY, JSON.stringify(Array.from(( this.hidden.values()))), StorageScope.PROFILE, StorageTarget.USER);
|
|
164
166
|
}
|
|
165
167
|
else {
|
|
166
|
-
this.storageService.remove(StatusbarViewModel.HIDDEN_ENTRIES_KEY,
|
|
168
|
+
this.storageService.remove(StatusbarViewModel.HIDDEN_ENTRIES_KEY, StorageScope.PROFILE);
|
|
167
169
|
}
|
|
168
170
|
}
|
|
169
171
|
sort() {
|
|
@@ -203,10 +205,10 @@ class StatusbarViewModel extends Disposable {
|
|
|
203
205
|
}
|
|
204
206
|
return mapEntryWithNumberedPriorityToIndex.get(entryA) - mapEntryWithNumberedPriorityToIndex.get(entryB);
|
|
205
207
|
}
|
|
206
|
-
if (entryA.alignment ===
|
|
208
|
+
if (entryA.alignment === StatusbarAlignment.LEFT) {
|
|
207
209
|
return -1;
|
|
208
210
|
}
|
|
209
|
-
if (entryB.alignment ===
|
|
211
|
+
if (entryB.alignment === StatusbarAlignment.LEFT) {
|
|
210
212
|
return 1;
|
|
211
213
|
}
|
|
212
214
|
return 0;
|
|
@@ -218,11 +220,11 @@ class StatusbarViewModel extends Disposable {
|
|
|
218
220
|
const relativeEntriesMap = mapEntryWithRelativePriority.get(entry.id);
|
|
219
221
|
const relativeEntries = relativeEntriesMap ? Array.from(( relativeEntriesMap.values())) : undefined;
|
|
220
222
|
if (relativeEntries) {
|
|
221
|
-
sortedEntries.push(...relativeEntries.filter(entry => isStatusbarEntryLocation(entry.priority.primary) && entry.priority.primary.alignment ===
|
|
223
|
+
sortedEntries.push(...relativeEntries.filter(entry => isStatusbarEntryLocation(entry.priority.primary) && entry.priority.primary.alignment === StatusbarAlignment.LEFT));
|
|
222
224
|
}
|
|
223
225
|
sortedEntries.push(entry);
|
|
224
226
|
if (relativeEntries) {
|
|
225
|
-
sortedEntries.push(...relativeEntries.filter(entry => isStatusbarEntryLocation(entry.priority.primary) && entry.priority.primary.alignment ===
|
|
227
|
+
sortedEntries.push(...relativeEntries.filter(entry => isStatusbarEntryLocation(entry.priority.primary) && entry.priority.primary.alignment === StatusbarAlignment.RIGHT));
|
|
226
228
|
}
|
|
227
229
|
mapEntryWithRelativePriority.delete(entry.id);
|
|
228
230
|
}
|
|
@@ -236,8 +238,8 @@ class StatusbarViewModel extends Disposable {
|
|
|
236
238
|
this._entries = sortedEntries;
|
|
237
239
|
}
|
|
238
240
|
markFirstLastVisibleEntry() {
|
|
239
|
-
this.doMarkFirstLastVisibleStatusbarItem(this.getEntries(
|
|
240
|
-
this.doMarkFirstLastVisibleStatusbarItem(this.getEntries(
|
|
241
|
+
this.doMarkFirstLastVisibleStatusbarItem(this.getEntries(StatusbarAlignment.LEFT));
|
|
242
|
+
this.doMarkFirstLastVisibleStatusbarItem(this.getEntries(StatusbarAlignment.RIGHT));
|
|
241
243
|
}
|
|
242
244
|
doMarkFirstLastVisibleStatusbarItem(entries) {
|
|
243
245
|
let firstVisibleItem;
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import { Disposable, DisposableStore, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
|
|
2
|
+
import { MultiWindowParts, Part } from "@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common/vscode/vs/workbench/browser/part";
|
|
3
|
+
import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
|
|
4
|
+
import { StatusbarAlignment, IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarStyleOverride, IStatusbarEntryLocation, IStatusbarEntryPriority, IStatusbarEntryOverride } from "vscode/vscode/vs/workbench/services/statusbar/browser/statusbar";
|
|
5
|
+
import { IStatusbarService } from "vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service";
|
|
6
|
+
import { IContextMenuService } from "vscode/vscode/vs/platform/contextview/browser/contextView.service";
|
|
7
|
+
import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
|
|
8
|
+
import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
|
|
9
|
+
import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
|
|
10
|
+
import { IWorkbenchLayoutService } from "vscode/vscode/vs/workbench/services/layout/browser/layoutService.service";
|
|
11
|
+
import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
|
|
12
|
+
import { Event } from "vscode/vscode/vs/base/common/event";
|
|
13
|
+
import { IView } from "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/base/browser/ui/grid/grid";
|
|
14
|
+
export interface IStatusbarEntryContainer extends IDisposable {
|
|
15
|
+
readonly onDidChangeEntryVisibility: Event<{
|
|
16
|
+
id: string;
|
|
17
|
+
visible: boolean;
|
|
18
|
+
}>;
|
|
19
|
+
addEntry(entry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, priority?: number | IStatusbarEntryPriority): IStatusbarEntryAccessor;
|
|
20
|
+
addEntry(entry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, priority?: number | IStatusbarEntryPriority | IStatusbarEntryLocation): IStatusbarEntryAccessor;
|
|
21
|
+
addEntry(entry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, location?: IStatusbarEntryLocation): IStatusbarEntryAccessor;
|
|
22
|
+
isEntryVisible(id: string): boolean;
|
|
23
|
+
updateEntryVisibility(id: string, visible: boolean): void;
|
|
24
|
+
overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable;
|
|
25
|
+
focus(preserveEntryFocus?: boolean): void;
|
|
26
|
+
focusNextEntry(): void;
|
|
27
|
+
focusPreviousEntry(): void;
|
|
28
|
+
isEntryFocused(): boolean;
|
|
29
|
+
overrideStyle(style: IStatusbarStyleOverride): IDisposable;
|
|
30
|
+
}
|
|
31
|
+
declare class StatusbarPart extends Part implements IStatusbarEntryContainer {
|
|
32
|
+
private readonly instantiationService;
|
|
33
|
+
private readonly contextService;
|
|
34
|
+
private readonly storageService;
|
|
35
|
+
private readonly contextMenuService;
|
|
36
|
+
private readonly contextKeyService;
|
|
37
|
+
static readonly HEIGHT = 22;
|
|
38
|
+
readonly minimumWidth: number;
|
|
39
|
+
readonly maximumWidth: number;
|
|
40
|
+
readonly minimumHeight: number;
|
|
41
|
+
readonly maximumHeight: number;
|
|
42
|
+
private styleElement;
|
|
43
|
+
private pendingEntries;
|
|
44
|
+
private readonly viewModel;
|
|
45
|
+
readonly onDidChangeEntryVisibility: Event<{
|
|
46
|
+
id: string;
|
|
47
|
+
visible: boolean;
|
|
48
|
+
}>;
|
|
49
|
+
private readonly _onWillDispose;
|
|
50
|
+
readonly onWillDispose: Event<void>;
|
|
51
|
+
private readonly onDidOverrideEntry;
|
|
52
|
+
private readonly entryOverrides;
|
|
53
|
+
private leftItemsContainer;
|
|
54
|
+
private rightItemsContainer;
|
|
55
|
+
private readonly hoverDelegate;
|
|
56
|
+
private readonly compactEntriesDisposable;
|
|
57
|
+
private readonly styleOverrides;
|
|
58
|
+
constructor(id: string, instantiationService: IInstantiationService, themeService: IThemeService, contextService: IWorkspaceContextService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService);
|
|
59
|
+
private registerListeners;
|
|
60
|
+
overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable;
|
|
61
|
+
private withEntryOverride;
|
|
62
|
+
addEntry(entry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, priorityOrLocation?: number | IStatusbarEntryLocation | IStatusbarEntryPriority): IStatusbarEntryAccessor;
|
|
63
|
+
private doAddPendingEntry;
|
|
64
|
+
private doAddEntry;
|
|
65
|
+
private doCreateStatusItem;
|
|
66
|
+
private doAddOrRemoveModelEntry;
|
|
67
|
+
isEntryVisible(id: string): boolean;
|
|
68
|
+
updateEntryVisibility(id: string, visible: boolean): void;
|
|
69
|
+
focusNextEntry(): void;
|
|
70
|
+
focusPreviousEntry(): void;
|
|
71
|
+
isEntryFocused(): boolean;
|
|
72
|
+
focus(preserveEntryFocus?: boolean): void;
|
|
73
|
+
protected createContentArea(parent: HTMLElement): HTMLElement;
|
|
74
|
+
private createInitialStatusbarEntries;
|
|
75
|
+
private appendStatusbarEntries;
|
|
76
|
+
private appendStatusbarEntry;
|
|
77
|
+
private updateCompactEntries;
|
|
78
|
+
private showContextMenu;
|
|
79
|
+
private getContextMenuActions;
|
|
80
|
+
updateStyles(): void;
|
|
81
|
+
layout(width: number, height: number, top: number, left: number): void;
|
|
82
|
+
overrideStyle(style: IStatusbarStyleOverride): IDisposable;
|
|
83
|
+
toJSON(): object;
|
|
84
|
+
dispose(): void;
|
|
85
|
+
}
|
|
86
|
+
export declare class MainStatusbarPart extends StatusbarPart {
|
|
87
|
+
constructor(instantiationService: IInstantiationService, themeService: IThemeService, contextService: IWorkspaceContextService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService);
|
|
88
|
+
}
|
|
89
|
+
export interface IAuxiliaryStatusbarPart extends IStatusbarEntryContainer, IView {
|
|
90
|
+
readonly container: HTMLElement;
|
|
91
|
+
readonly height: number;
|
|
92
|
+
}
|
|
93
|
+
export declare class AuxiliaryStatusbarPart extends StatusbarPart implements IAuxiliaryStatusbarPart {
|
|
94
|
+
readonly container: HTMLElement;
|
|
95
|
+
private static COUNTER;
|
|
96
|
+
readonly height = 22;
|
|
97
|
+
constructor(container: HTMLElement, instantiationService: IInstantiationService, themeService: IThemeService, contextService: IWorkspaceContextService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService);
|
|
98
|
+
}
|
|
99
|
+
export declare class StatusbarService extends MultiWindowParts<StatusbarPart> implements IStatusbarService {
|
|
100
|
+
private readonly instantiationService;
|
|
101
|
+
readonly _serviceBrand: undefined;
|
|
102
|
+
readonly mainPart: MainStatusbarPart;
|
|
103
|
+
private readonly _onDidCreateAuxiliaryStatusbarPart;
|
|
104
|
+
private readonly onDidCreateAuxiliaryStatusbarPart;
|
|
105
|
+
constructor(instantiationService: IInstantiationService, storageService: IStorageService, themeService: IThemeService);
|
|
106
|
+
createAuxiliaryStatusbarPart(container: HTMLElement): IAuxiliaryStatusbarPart;
|
|
107
|
+
createScoped(statusbarEntryContainer: IStatusbarEntryContainer, disposables: DisposableStore): IStatusbarService;
|
|
108
|
+
readonly onDidChangeEntryVisibility: Event<{
|
|
109
|
+
id: string;
|
|
110
|
+
visible: boolean;
|
|
111
|
+
}>;
|
|
112
|
+
addEntry(entry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, priorityOrLocation?: number | IStatusbarEntryLocation | IStatusbarEntryPriority): IStatusbarEntryAccessor;
|
|
113
|
+
private doAddEntryToAllWindows;
|
|
114
|
+
isEntryVisible(id: string): boolean;
|
|
115
|
+
updateEntryVisibility(id: string, visible: boolean): void;
|
|
116
|
+
overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable;
|
|
117
|
+
focus(preserveEntryFocus?: boolean): void;
|
|
118
|
+
focusNextEntry(): void;
|
|
119
|
+
focusPreviousEntry(): void;
|
|
120
|
+
isEntryFocused(): boolean;
|
|
121
|
+
overrideStyle(style: IStatusbarStyleOverride): IDisposable;
|
|
122
|
+
}
|
|
123
|
+
export declare class ScopedStatusbarService extends Disposable implements IStatusbarService {
|
|
124
|
+
private readonly statusbarEntryContainer;
|
|
125
|
+
private readonly statusbarService;
|
|
126
|
+
readonly _serviceBrand: undefined;
|
|
127
|
+
constructor(statusbarEntryContainer: IStatusbarEntryContainer, statusbarService: IStatusbarService);
|
|
128
|
+
createAuxiliaryStatusbarPart(container: HTMLElement): IAuxiliaryStatusbarPart;
|
|
129
|
+
createScoped(statusbarEntryContainer: IStatusbarEntryContainer, disposables: DisposableStore): IStatusbarService;
|
|
130
|
+
getPart(): IStatusbarEntryContainer;
|
|
131
|
+
readonly onDidChangeEntryVisibility: Event<{
|
|
132
|
+
id: string;
|
|
133
|
+
visible: boolean;
|
|
134
|
+
}>;
|
|
135
|
+
addEntry(entry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, priorityOrLocation?: number | IStatusbarEntryLocation | IStatusbarEntryPriority): IStatusbarEntryAccessor;
|
|
136
|
+
isEntryVisible(id: string): boolean;
|
|
137
|
+
updateEntryVisibility(id: string, visible: boolean): void;
|
|
138
|
+
overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable;
|
|
139
|
+
focus(preserveEntryFocus?: boolean): void;
|
|
140
|
+
focusNextEntry(): void;
|
|
141
|
+
focusPreviousEntry(): void;
|
|
142
|
+
isEntryFocused(): boolean;
|
|
143
|
+
overrideStyle(style: IStatusbarStyleOverride): IDisposable;
|
|
144
|
+
}
|
|
145
|
+
export {};
|
|
@@ -1,16 +1,18 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
|
|
2
3
|
import './media/statusbarpart.css.js';
|
|
3
4
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
4
|
-
import { MutableDisposable,
|
|
5
|
-
import { Part, MultiWindowParts } from 'vscode/vscode/vs/workbench/browser/part';
|
|
5
|
+
import { MutableDisposable, toDisposable, DisposableStore, disposeIfDisposable, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
6
|
+
import { Part, MultiWindowParts } from '@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common/vscode/vs/workbench/browser/part';
|
|
6
7
|
import { Gesture, EventType as EventType$1 } from 'vscode/vscode/vs/base/browser/touch';
|
|
7
8
|
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
8
|
-
import { isStatusbarEntryPriority, isStatusbarEntryLocation } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
|
|
9
|
+
import { isStatusbarEntryPriority, StatusbarAlignment, isStatusbarEntryLocation } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
|
|
9
10
|
import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
|
|
10
11
|
import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
|
|
11
12
|
import { toAction, Separator } from 'vscode/vscode/vs/base/common/actions';
|
|
12
13
|
import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
|
|
13
14
|
import { STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND, STATUS_BAR_BACKGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_ITEM_FOCUS_BORDER, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_BORDER, STATUS_BAR_FOCUS_BORDER } from 'vscode/vscode/vs/workbench/common/theme';
|
|
15
|
+
import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
|
|
14
16
|
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
|
|
15
17
|
import 'vscode/vscode/vs/platform/theme/common/colorUtils';
|
|
16
18
|
import { contrastBorder, activeContrastBorder } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
|
|
@@ -23,12 +25,15 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
|
|
|
23
25
|
import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
|
|
24
26
|
import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
|
|
25
27
|
import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
|
|
26
|
-
import { addDisposableListener, EventType, clearNode, EventHelper, getWindow
|
|
28
|
+
import { addDisposableListener, EventType, clearNode, EventHelper, getWindow } from 'vscode/vscode/vs/base/browser/dom';
|
|
29
|
+
import { createStyleSheet } from 'vscode/vscode/vs/base/browser/domStylesheets';
|
|
27
30
|
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
|
|
31
|
+
import { Parts } from '@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common/vscode/vs/workbench/services/layout/browser/layoutService';
|
|
28
32
|
import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
|
|
33
|
+
import 'vscode/vscode/vs/platform/instantiation/common/extensions';
|
|
29
34
|
import { equals } from 'vscode/vscode/vs/base/common/arrays';
|
|
30
35
|
import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
|
|
31
|
-
import { ToggleStatusbarVisibilityAction } from 'vscode/vscode/vs/workbench/browser/actions/layoutActions';
|
|
36
|
+
import { ToggleStatusbarVisibilityAction } from '@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common/vscode/vs/workbench/browser/actions/layoutActions';
|
|
32
37
|
import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
|
|
33
38
|
import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
|
|
34
39
|
import { isHighContrast } from 'vscode/vscode/vs/platform/theme/common/theme';
|
|
@@ -56,24 +61,44 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
56
61
|
this.minimumHeight = StatusbarPart_1.HEIGHT;
|
|
57
62
|
this.maximumHeight = StatusbarPart_1.HEIGHT;
|
|
58
63
|
this.pendingEntries = [];
|
|
59
|
-
this.viewModel = this._register((
|
|
64
|
+
this.viewModel = this._register(( new StatusbarViewModel(this.storageService)));
|
|
60
65
|
this.onDidChangeEntryVisibility = this.viewModel.onDidChangeEntryVisibility;
|
|
61
|
-
this._onWillDispose = this._register((
|
|
66
|
+
this._onWillDispose = this._register(( new Emitter()));
|
|
62
67
|
this.onWillDispose = this._onWillDispose.event;
|
|
68
|
+
this.onDidOverrideEntry = this._register(( new Emitter()));
|
|
69
|
+
this.entryOverrides = ( new Map());
|
|
63
70
|
this.hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', true, (_, focus) => ({
|
|
64
71
|
persistence: {
|
|
65
72
|
hideOnKeyDown: true,
|
|
66
73
|
sticky: focus
|
|
67
74
|
}
|
|
68
75
|
})));
|
|
69
|
-
this.compactEntriesDisposable = this._register((
|
|
70
|
-
this.styleOverrides = (
|
|
76
|
+
this.compactEntriesDisposable = this._register(( new MutableDisposable()));
|
|
77
|
+
this.styleOverrides = ( new Set());
|
|
71
78
|
this.registerListeners();
|
|
72
79
|
}
|
|
73
80
|
registerListeners() {
|
|
74
81
|
this._register(this.onDidChangeEntryVisibility(() => this.updateCompactEntries()));
|
|
75
82
|
this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
|
|
76
83
|
}
|
|
84
|
+
overrideEntry(id, override) {
|
|
85
|
+
this.entryOverrides.set(id, override);
|
|
86
|
+
this.onDidOverrideEntry.fire(id);
|
|
87
|
+
return toDisposable(() => {
|
|
88
|
+
const currentOverride = this.entryOverrides.get(id);
|
|
89
|
+
if (currentOverride === override) {
|
|
90
|
+
this.entryOverrides.delete(id);
|
|
91
|
+
this.onDidOverrideEntry.fire(id);
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
withEntryOverride(entry, id) {
|
|
96
|
+
const override = this.entryOverrides.get(id);
|
|
97
|
+
if (override) {
|
|
98
|
+
entry = { ...entry, ...override };
|
|
99
|
+
}
|
|
100
|
+
return entry;
|
|
101
|
+
}
|
|
77
102
|
addEntry(entry, id, alignment, priorityOrLocation = 0) {
|
|
78
103
|
let priority;
|
|
79
104
|
if (isStatusbarEntryPriority(priorityOrLocation)) {
|
|
@@ -114,8 +139,9 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
114
139
|
return accessor;
|
|
115
140
|
}
|
|
116
141
|
doAddEntry(entry, id, alignment, priority) {
|
|
142
|
+
const disposables = ( new DisposableStore());
|
|
117
143
|
const itemContainer = this.doCreateStatusItem(id, alignment);
|
|
118
|
-
const item = this.instantiationService.createInstance(StatusbarEntryItem, itemContainer, entry, this.hoverDelegate);
|
|
144
|
+
const item = disposables.add(this.instantiationService.createInstance(StatusbarEntryItem, itemContainer, this.withEntryOverride(entry, id), this.hoverDelegate));
|
|
119
145
|
const viewModelEntry = new class {
|
|
120
146
|
constructor() {
|
|
121
147
|
this.id = id;
|
|
@@ -134,9 +160,11 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
134
160
|
else {
|
|
135
161
|
this.appendStatusbarEntry(viewModelEntry);
|
|
136
162
|
}
|
|
137
|
-
|
|
163
|
+
let lastEntry = entry;
|
|
164
|
+
const accessor = {
|
|
138
165
|
update: entry => {
|
|
139
|
-
|
|
166
|
+
lastEntry = entry;
|
|
167
|
+
item.update(this.withEntryOverride(entry, id));
|
|
140
168
|
},
|
|
141
169
|
dispose: () => {
|
|
142
170
|
const { needsFullRefresh } = this.doAddOrRemoveModelEntry(viewModelEntry, false);
|
|
@@ -145,10 +173,17 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
145
173
|
}
|
|
146
174
|
else {
|
|
147
175
|
itemContainer.remove();
|
|
176
|
+
this.updateCompactEntries();
|
|
148
177
|
}
|
|
149
|
-
dispose(
|
|
178
|
+
disposables.dispose();
|
|
150
179
|
}
|
|
151
180
|
};
|
|
181
|
+
disposables.add(this.onDidOverrideEntry.event(overrideEntryId => {
|
|
182
|
+
if (overrideEntryId === id) {
|
|
183
|
+
accessor.update(lastEntry);
|
|
184
|
+
}
|
|
185
|
+
}));
|
|
186
|
+
return accessor;
|
|
152
187
|
}
|
|
153
188
|
doCreateStatusItem(id, alignment, ...extraClasses) {
|
|
154
189
|
const itemContainer = document.createElement('div');
|
|
@@ -157,7 +192,7 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
157
192
|
if (extraClasses) {
|
|
158
193
|
itemContainer.classList.add(...extraClasses);
|
|
159
194
|
}
|
|
160
|
-
if (alignment ===
|
|
195
|
+
if (alignment === StatusbarAlignment.RIGHT) {
|
|
161
196
|
itemContainer.classList.add('right');
|
|
162
197
|
}
|
|
163
198
|
else {
|
|
@@ -242,20 +277,20 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
242
277
|
clearNode(leftItemsContainer);
|
|
243
278
|
clearNode(rightItemsContainer);
|
|
244
279
|
for (const entry of [
|
|
245
|
-
...this.viewModel.getEntries(
|
|
246
|
-
...this.viewModel.getEntries(
|
|
280
|
+
...this.viewModel.getEntries(StatusbarAlignment.LEFT),
|
|
281
|
+
...this.viewModel.getEntries(StatusbarAlignment.RIGHT).reverse()
|
|
247
282
|
]) {
|
|
248
|
-
const target = entry.alignment ===
|
|
283
|
+
const target = entry.alignment === StatusbarAlignment.LEFT ? leftItemsContainer : rightItemsContainer;
|
|
249
284
|
target.appendChild(entry.container);
|
|
250
285
|
}
|
|
251
286
|
this.updateCompactEntries();
|
|
252
287
|
}
|
|
253
288
|
appendStatusbarEntry(entry) {
|
|
254
289
|
const entries = this.viewModel.getEntries(entry.alignment);
|
|
255
|
-
if (entry.alignment ===
|
|
290
|
+
if (entry.alignment === StatusbarAlignment.RIGHT) {
|
|
256
291
|
entries.reverse();
|
|
257
292
|
}
|
|
258
|
-
const target = assertIsDefined(entry.alignment ===
|
|
293
|
+
const target = assertIsDefined(entry.alignment === StatusbarAlignment.LEFT ? this.leftItemsContainer : this.rightItemsContainer);
|
|
259
294
|
const index = entries.indexOf(entry);
|
|
260
295
|
if (index + 1 === entries.length) {
|
|
261
296
|
target.appendChild(entry.container);
|
|
@@ -267,15 +302,15 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
267
302
|
}
|
|
268
303
|
updateCompactEntries() {
|
|
269
304
|
const entries = this.viewModel.entries;
|
|
270
|
-
const mapIdToVisibleEntry = (
|
|
305
|
+
const mapIdToVisibleEntry = ( new Map());
|
|
271
306
|
for (const entry of entries) {
|
|
272
307
|
if (!this.viewModel.isHidden(entry.id)) {
|
|
273
308
|
mapIdToVisibleEntry.set(entry.id, entry);
|
|
274
309
|
}
|
|
275
310
|
entry.container.classList.remove('compact-left', 'compact-right');
|
|
276
311
|
}
|
|
277
|
-
const compactEntryGroups = (
|
|
278
|
-
for (const entry of (
|
|
312
|
+
const compactEntryGroups = ( new Map());
|
|
313
|
+
for (const entry of ( mapIdToVisibleEntry.values())) {
|
|
279
314
|
if (isStatusbarEntryLocation(entry.priority.primary) &&
|
|
280
315
|
entry.priority.primary.compact
|
|
281
316
|
) {
|
|
@@ -286,20 +321,20 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
286
321
|
}
|
|
287
322
|
let compactEntryGroup = compactEntryGroups.get(locationId);
|
|
288
323
|
if (!compactEntryGroup) {
|
|
289
|
-
for (const group of (
|
|
290
|
-
if ((
|
|
324
|
+
for (const group of ( compactEntryGroups.values())) {
|
|
325
|
+
if (( group.has(locationId))) {
|
|
291
326
|
compactEntryGroup = group;
|
|
292
327
|
break;
|
|
293
328
|
}
|
|
294
329
|
}
|
|
295
330
|
if (!compactEntryGroup) {
|
|
296
|
-
compactEntryGroup = (
|
|
331
|
+
compactEntryGroup = ( new Map());
|
|
297
332
|
compactEntryGroups.set(locationId, compactEntryGroup);
|
|
298
333
|
}
|
|
299
334
|
}
|
|
300
335
|
compactEntryGroup.set(entry.id, entry);
|
|
301
336
|
compactEntryGroup.set(location.id, location);
|
|
302
|
-
if (entry.priority.primary.alignment ===
|
|
337
|
+
if (entry.priority.primary.alignment === StatusbarAlignment.LEFT) {
|
|
303
338
|
location.container.classList.add('compact-left');
|
|
304
339
|
entry.container.classList.add('compact-right');
|
|
305
340
|
}
|
|
@@ -311,10 +346,10 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
311
346
|
}
|
|
312
347
|
const statusBarItemHoverBackground = this.getColor(STATUS_BAR_ITEM_HOVER_BACKGROUND);
|
|
313
348
|
const statusBarItemCompactHoverBackground = this.getColor(STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND);
|
|
314
|
-
this.compactEntriesDisposable.value = (
|
|
349
|
+
this.compactEntriesDisposable.value = ( new DisposableStore());
|
|
315
350
|
if (statusBarItemHoverBackground && statusBarItemCompactHoverBackground && !isHighContrast(this.theme.type)) {
|
|
316
351
|
for (const [, compactEntryGroup] of compactEntryGroups) {
|
|
317
|
-
for (const compactEntry of (
|
|
352
|
+
for (const compactEntry of ( compactEntryGroup.values())) {
|
|
318
353
|
if (!compactEntry.hasCommand) {
|
|
319
354
|
continue;
|
|
320
355
|
}
|
|
@@ -331,7 +366,7 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
331
366
|
}
|
|
332
367
|
showContextMenu(e) {
|
|
333
368
|
EventHelper.stop(e, true);
|
|
334
|
-
const event = (
|
|
369
|
+
const event = ( new StandardMouseEvent(getWindow(this.element), e));
|
|
335
370
|
let actions = undefined;
|
|
336
371
|
this.contextMenuService.showContextMenu({
|
|
337
372
|
getAnchor: () => event,
|
|
@@ -348,12 +383,12 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
348
383
|
}
|
|
349
384
|
getContextMenuActions(event) {
|
|
350
385
|
const actions = [];
|
|
351
|
-
actions.push(toAction({ id: ToggleStatusbarVisibilityAction.ID, label: ( localize(
|
|
352
|
-
actions.push((
|
|
353
|
-
const handledEntries = (
|
|
386
|
+
actions.push(toAction({ id: ToggleStatusbarVisibilityAction.ID, label: ( localize(3313, "Hide Status Bar")), run: () => this.instantiationService.invokeFunction(accessor => ( new ToggleStatusbarVisibilityAction()).run(accessor)) }));
|
|
387
|
+
actions.push(( new Separator()));
|
|
388
|
+
const handledEntries = ( new Set());
|
|
354
389
|
for (const entry of this.viewModel.entries) {
|
|
355
|
-
if (!(
|
|
356
|
-
actions.push((
|
|
390
|
+
if (!( handledEntries.has(entry.id))) {
|
|
391
|
+
actions.push(( new ToggleStatusbarEntryVisibilityAction(entry.id, entry.name, this.viewModel)));
|
|
357
392
|
handledEntries.add(entry.id);
|
|
358
393
|
}
|
|
359
394
|
}
|
|
@@ -366,8 +401,8 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
366
401
|
}
|
|
367
402
|
}
|
|
368
403
|
if (statusEntryUnderMouse) {
|
|
369
|
-
actions.push((
|
|
370
|
-
actions.push((
|
|
404
|
+
actions.push(( new Separator()));
|
|
405
|
+
actions.push(( new HideStatusbarEntryAction(statusEntryUnderMouse.id, statusEntryUnderMouse.name, this.viewModel)));
|
|
371
406
|
}
|
|
372
407
|
return actions;
|
|
373
408
|
}
|
|
@@ -375,12 +410,12 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
375
410
|
super.updateStyles();
|
|
376
411
|
const container = assertIsDefined(this.getContainer());
|
|
377
412
|
const styleOverride = [...this.styleOverrides].sort((a, b) => a.priority - b.priority)[0];
|
|
378
|
-
const backgroundColor = this.getColor(styleOverride?.background ?? (this.contextService.getWorkbenchState() !==
|
|
413
|
+
const backgroundColor = this.getColor(styleOverride?.background ?? (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_BACKGROUND : STATUS_BAR_NO_FOLDER_BACKGROUND)) || '';
|
|
379
414
|
container.style.backgroundColor = backgroundColor;
|
|
380
|
-
const foregroundColor = this.getColor(styleOverride?.foreground ?? (this.contextService.getWorkbenchState() !==
|
|
415
|
+
const foregroundColor = this.getColor(styleOverride?.foreground ?? (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND)) || '';
|
|
381
416
|
container.style.color = foregroundColor;
|
|
382
417
|
const itemBorderColor = this.getColor(STATUS_BAR_ITEM_FOCUS_BORDER);
|
|
383
|
-
const borderColor = this.getColor(styleOverride?.border ?? (this.contextService.getWorkbenchState() !==
|
|
418
|
+
const borderColor = this.getColor(styleOverride?.border ?? (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_BORDER : STATUS_BAR_NO_FOLDER_BORDER)) || this.getColor(contrastBorder);
|
|
384
419
|
if (borderColor) {
|
|
385
420
|
container.classList.add('status-border-top');
|
|
386
421
|
container.style.setProperty('--status-border-top-color', borderColor);
|
|
@@ -426,7 +461,7 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
426
461
|
}
|
|
427
462
|
toJSON() {
|
|
428
463
|
return {
|
|
429
|
-
type:
|
|
464
|
+
type: Parts.STATUSBAR_PART
|
|
430
465
|
};
|
|
431
466
|
}
|
|
432
467
|
dispose() {
|
|
@@ -434,29 +469,29 @@ let StatusbarPart = class StatusbarPart extends Part {
|
|
|
434
469
|
super.dispose();
|
|
435
470
|
}
|
|
436
471
|
};
|
|
437
|
-
StatusbarPart = StatusbarPart_1 = (
|
|
438
|
-
(
|
|
439
|
-
(
|
|
440
|
-
(
|
|
441
|
-
(
|
|
442
|
-
(
|
|
443
|
-
(
|
|
444
|
-
(
|
|
445
|
-
], StatusbarPart))
|
|
472
|
+
StatusbarPart = StatusbarPart_1 = ( __decorate([
|
|
473
|
+
( __param(1, IInstantiationService)),
|
|
474
|
+
( __param(2, IThemeService)),
|
|
475
|
+
( __param(3, IWorkspaceContextService)),
|
|
476
|
+
( __param(4, IStorageService)),
|
|
477
|
+
( __param(5, IWorkbenchLayoutService)),
|
|
478
|
+
( __param(6, IContextMenuService)),
|
|
479
|
+
( __param(7, IContextKeyService))
|
|
480
|
+
], StatusbarPart));
|
|
446
481
|
let MainStatusbarPart = class MainStatusbarPart extends StatusbarPart {
|
|
447
482
|
constructor(instantiationService, themeService, contextService, storageService, layoutService, contextMenuService, contextKeyService) {
|
|
448
|
-
super(
|
|
483
|
+
super(Parts.STATUSBAR_PART, instantiationService, themeService, contextService, storageService, layoutService, contextMenuService, contextKeyService);
|
|
449
484
|
}
|
|
450
485
|
};
|
|
451
|
-
MainStatusbarPart = (
|
|
452
|
-
(
|
|
453
|
-
(
|
|
454
|
-
(
|
|
455
|
-
(
|
|
456
|
-
(
|
|
457
|
-
(
|
|
458
|
-
(
|
|
459
|
-
], MainStatusbarPart))
|
|
486
|
+
MainStatusbarPart = ( __decorate([
|
|
487
|
+
( __param(0, IInstantiationService)),
|
|
488
|
+
( __param(1, IThemeService)),
|
|
489
|
+
( __param(2, IWorkspaceContextService)),
|
|
490
|
+
( __param(3, IStorageService)),
|
|
491
|
+
( __param(4, IWorkbenchLayoutService)),
|
|
492
|
+
( __param(5, IContextMenuService)),
|
|
493
|
+
( __param(6, IContextKeyService))
|
|
494
|
+
], MainStatusbarPart));
|
|
460
495
|
let AuxiliaryStatusbarPart = class AuxiliaryStatusbarPart extends StatusbarPart {
|
|
461
496
|
static { AuxiliaryStatusbarPart_1 = this; }
|
|
462
497
|
static { this.COUNTER = 1; }
|
|
@@ -467,21 +502,21 @@ let AuxiliaryStatusbarPart = class AuxiliaryStatusbarPart extends StatusbarPart
|
|
|
467
502
|
this.height = StatusbarPart.HEIGHT;
|
|
468
503
|
}
|
|
469
504
|
};
|
|
470
|
-
AuxiliaryStatusbarPart = AuxiliaryStatusbarPart_1 = (
|
|
471
|
-
(
|
|
472
|
-
(
|
|
473
|
-
(
|
|
474
|
-
(
|
|
475
|
-
(
|
|
476
|
-
(
|
|
477
|
-
(
|
|
478
|
-
], AuxiliaryStatusbarPart))
|
|
505
|
+
AuxiliaryStatusbarPart = AuxiliaryStatusbarPart_1 = ( __decorate([
|
|
506
|
+
( __param(1, IInstantiationService)),
|
|
507
|
+
( __param(2, IThemeService)),
|
|
508
|
+
( __param(3, IWorkspaceContextService)),
|
|
509
|
+
( __param(4, IStorageService)),
|
|
510
|
+
( __param(5, IWorkbenchLayoutService)),
|
|
511
|
+
( __param(6, IContextMenuService)),
|
|
512
|
+
( __param(7, IContextKeyService))
|
|
513
|
+
], AuxiliaryStatusbarPart));
|
|
479
514
|
let StatusbarService = class StatusbarService extends MultiWindowParts {
|
|
480
515
|
constructor(instantiationService, storageService, themeService) {
|
|
481
516
|
super('workbench.statusBarService', themeService, storageService);
|
|
482
517
|
this.instantiationService = instantiationService;
|
|
483
518
|
this.mainPart = this._register(this.instantiationService.createInstance(MainStatusbarPart));
|
|
484
|
-
this._onDidCreateAuxiliaryStatusbarPart = this._register((
|
|
519
|
+
this._onDidCreateAuxiliaryStatusbarPart = this._register(( new Emitter()));
|
|
485
520
|
this.onDidCreateAuxiliaryStatusbarPart = this._onDidCreateAuxiliaryStatusbarPart.event;
|
|
486
521
|
this.onDidChangeEntryVisibility = this.mainPart.onDidChangeEntryVisibility;
|
|
487
522
|
this._register(this.registerPart(this.mainPart));
|
|
@@ -511,10 +546,10 @@ let StatusbarService = class StatusbarService extends MultiWindowParts {
|
|
|
511
546
|
return this.mainPart.addEntry(entry, id, alignment, priorityOrLocation);
|
|
512
547
|
}
|
|
513
548
|
doAddEntryToAllWindows(entry, id, alignment, priorityOrLocation = 0) {
|
|
514
|
-
const entryDisposables = (
|
|
515
|
-
const accessors = (
|
|
549
|
+
const entryDisposables = ( new DisposableStore());
|
|
550
|
+
const accessors = ( new Set());
|
|
516
551
|
function addEntry(part) {
|
|
517
|
-
const partDisposables = (
|
|
552
|
+
const partDisposables = ( new DisposableStore());
|
|
518
553
|
partDisposables.add(part.onWillDispose(() => partDisposables.dispose()));
|
|
519
554
|
const accessor = partDisposables.add(part.addEntry(entry, id, alignment, priorityOrLocation));
|
|
520
555
|
accessors.add(accessor);
|
|
@@ -543,6 +578,13 @@ let StatusbarService = class StatusbarService extends MultiWindowParts {
|
|
|
543
578
|
part.updateEntryVisibility(id, visible);
|
|
544
579
|
}
|
|
545
580
|
}
|
|
581
|
+
overrideEntry(id, override) {
|
|
582
|
+
const disposables = ( new DisposableStore());
|
|
583
|
+
for (const part of this.parts) {
|
|
584
|
+
disposables.add(part.overrideEntry(id, override));
|
|
585
|
+
}
|
|
586
|
+
return disposables;
|
|
587
|
+
}
|
|
546
588
|
focus(preserveEntryFocus) {
|
|
547
589
|
this.activePart.focus(preserveEntryFocus);
|
|
548
590
|
}
|
|
@@ -556,18 +598,18 @@ let StatusbarService = class StatusbarService extends MultiWindowParts {
|
|
|
556
598
|
return this.activePart.isEntryFocused();
|
|
557
599
|
}
|
|
558
600
|
overrideStyle(style) {
|
|
559
|
-
const disposables = (
|
|
601
|
+
const disposables = ( new DisposableStore());
|
|
560
602
|
for (const part of this.parts) {
|
|
561
603
|
disposables.add(part.overrideStyle(style));
|
|
562
604
|
}
|
|
563
605
|
return disposables;
|
|
564
606
|
}
|
|
565
607
|
};
|
|
566
|
-
StatusbarService = (
|
|
567
|
-
(
|
|
568
|
-
(
|
|
569
|
-
(
|
|
570
|
-
], StatusbarService))
|
|
608
|
+
StatusbarService = ( __decorate([
|
|
609
|
+
( __param(0, IInstantiationService)),
|
|
610
|
+
( __param(1, IStorageService)),
|
|
611
|
+
( __param(2, IThemeService))
|
|
612
|
+
], StatusbarService));
|
|
571
613
|
let ScopedStatusbarService = class ScopedStatusbarService extends Disposable {
|
|
572
614
|
constructor(statusbarEntryContainer, statusbarService) {
|
|
573
615
|
super();
|
|
@@ -593,6 +635,9 @@ let ScopedStatusbarService = class ScopedStatusbarService extends Disposable {
|
|
|
593
635
|
updateEntryVisibility(id, visible) {
|
|
594
636
|
this.statusbarEntryContainer.updateEntryVisibility(id, visible);
|
|
595
637
|
}
|
|
638
|
+
overrideEntry(id, override) {
|
|
639
|
+
return this.statusbarEntryContainer.overrideEntry(id, override);
|
|
640
|
+
}
|
|
596
641
|
focus(preserveEntryFocus) {
|
|
597
642
|
this.statusbarEntryContainer.focus(preserveEntryFocus);
|
|
598
643
|
}
|
|
@@ -609,8 +654,8 @@ let ScopedStatusbarService = class ScopedStatusbarService extends Disposable {
|
|
|
609
654
|
return this.statusbarEntryContainer.overrideStyle(style);
|
|
610
655
|
}
|
|
611
656
|
};
|
|
612
|
-
ScopedStatusbarService = (
|
|
613
|
-
(
|
|
614
|
-
], ScopedStatusbarService))
|
|
657
|
+
ScopedStatusbarService = ( __decorate([
|
|
658
|
+
( __param(1, IStatusbarService))
|
|
659
|
+
], ScopedStatusbarService));
|
|
615
660
|
|
|
616
661
|
export { AuxiliaryStatusbarPart, MainStatusbarPart, ScopedStatusbarService, StatusbarService };
|
package/viewStatusBar.js
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
|
|
2
|
-
import { StatusbarService } from './vscode/src/vs/workbench/browser/parts/statusbar/statusbarPart.js';
|
|
3
|
-
import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
|
|
4
|
-
import { IExtensionStatusBarItemService, ExtensionStatusBarItemService } from 'vscode/vscode/vs/workbench/api/browser/statusBarService';
|
|
5
|
-
import './vscode/src/vs/workbench/api/browser/statusBarExtensionPoint.js';
|
|
6
|
-
|
|
7
|
-
function getServiceOverride() {
|
|
8
|
-
return {
|
|
9
|
-
[( IStatusbarService.toString())]: new SyncDescriptor(StatusbarService, [], false),
|
|
10
|
-
[( IExtensionStatusBarItemService.toString())]: new SyncDescriptor(ExtensionStatusBarItemService, [], false)
|
|
11
|
-
};
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
export { getServiceOverride as default };
|