@codingame/monaco-vscode-view-status-bar-service-override 15.0.2 → 16.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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-view-status-bar-service-override",
3
- "version": "15.0.2",
3
+ "version": "16.0.0",
4
4
  "private": false,
5
5
  "description": "VSCode public API plugged on the monaco editor - view-status-bar service-override",
6
6
  "keywords": [],
@@ -15,11 +15,11 @@
15
15
  },
16
16
  "type": "module",
17
17
  "dependencies": {
18
- "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "15.0.2",
19
- "@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common": "15.0.2",
20
- "@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common": "15.0.2",
21
- "@codingame/monaco-vscode-api": "15.0.2",
22
- "@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common": "15.0.2"
18
+ "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "16.0.0",
19
+ "@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common": "16.0.0",
20
+ "@codingame/monaco-vscode-api": "16.0.0",
21
+ "@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common": "16.0.0",
22
+ "@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common": "16.0.0"
23
23
  },
24
24
  "main": "index.js",
25
25
  "module": "index.js",
@@ -28,6 +28,9 @@
28
28
  ".": {
29
29
  "default": "./index.js"
30
30
  },
31
+ "./vscode/*.css": {
32
+ "default": "./vscode/src/*.css"
33
+ },
31
34
  "./vscode/*": {
32
35
  "types": "./vscode/src/*.d.ts",
33
36
  "default": "./vscode/src/*.js"
@@ -30,62 +30,62 @@ const statusBarItemSchema = {
30
30
  id: {
31
31
  type: 'string',
32
32
  markdownDescription: ( localize(
33
- 2390,
33
+ 2429,
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
- 2391,
40
+ 2430,
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
- 2392,
47
+ 2431,
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(2393, 'The tooltip text for the entry.'))
53
+ description: ( localize(2432, 'The tooltip text for the entry.'))
54
54
  },
55
55
  command: {
56
56
  type: 'string',
57
- description: ( localize(2394, 'The command to execute when the status bar entry is clicked.'))
57
+ description: ( localize(2433, '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(2395, 'The alignment of the status bar entry.'))
62
+ description: ( localize(2434, 'The alignment of the status bar entry.'))
63
63
  },
64
64
  priority: {
65
65
  type: 'number',
66
66
  description: ( localize(
67
- 2396,
67
+ 2435,
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
- 2397,
74
+ 2436,
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
- 2398,
81
+ 2437,
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
- 2399,
88
+ 2438,
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(2400, "Contributes items to the status bar.")),
97
+ description: ( localize(2439, "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(2401, "Invalid status bar item contribution.")));
123
+ collector.error(( localize(2440, "Invalid status bar item contribution.")));
124
124
  continue;
125
125
  }
126
126
  const fullItemId = asStatusBarItemIdentifier(entry.description.identifier, candidate.id);
@@ -0,0 +1,184 @@
1
+ .monaco-workbench .part.statusbar {
2
+ box-sizing: border-box;
3
+ cursor: default;
4
+ width: 100%;
5
+ height: 22px;
6
+ font-size: 12px;
7
+ display: flex;
8
+ overflow: hidden;
9
+ }
10
+ .monaco-workbench:not(.reduce-motion) .part.statusbar {
11
+ transition: background-color 0.15s ease-out;
12
+ }
13
+ .monaco-workbench .part.statusbar.status-border-top::after {
14
+ content: '';
15
+ position: absolute;
16
+ top: 0;
17
+ left: 0;
18
+ z-index: 5;
19
+ pointer-events: none;
20
+ background-color: var(--status-border-top-color);
21
+ width: 100%;
22
+ height: 1px;
23
+ }
24
+ .monaco-workbench .part.statusbar > .left-items,
25
+ .monaco-workbench .part.statusbar > .right-items {
26
+ display: flex;
27
+ }
28
+ .monaco-workbench .part.statusbar > .right-items {
29
+ flex-wrap: wrap;
30
+ flex-direction: row-reverse;
31
+ }
32
+ .monaco-workbench .part.statusbar > .left-items {
33
+ flex-grow: 1;
34
+ }
35
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item {
36
+ display: inline-block;
37
+ line-height: 22px;
38
+ height: 100%;
39
+ vertical-align: top;
40
+ max-width: 40vw;
41
+ font-variant-numeric: tabular-nums;
42
+ }
43
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-beak {
44
+ position: relative;
45
+ }
46
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-beak > .status-bar-item-beak-container {
47
+ position: absolute;
48
+ left: calc(50% - 5px);
49
+ top: -5px;
50
+ width: 10px;
51
+ height: 5px;
52
+ }
53
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-beak > .status-bar-item-beak-container:before {
54
+ content: '';
55
+ position: fixed;
56
+ border-bottom-width: 5px;
57
+ border-bottom-style: solid;
58
+ border-left: 5px solid transparent;
59
+ border-right: 5px solid transparent;
60
+ }
61
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item > .statusbar-item-label {
62
+ margin-right: 3px;
63
+ margin-left: 3px;
64
+ }
65
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.compact-left > .statusbar-item-label {
66
+ margin-right: 3px;
67
+ margin-left: 0;
68
+ }
69
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.compact-right > .statusbar-item-label {
70
+ margin-right: 0;
71
+ margin-left: 3px;
72
+ }
73
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.compact-left.compact-right > .statusbar-item-label {
74
+ margin-right:0;
75
+ margin-left: 0;
76
+ }
77
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.left.first-visible-item {
78
+ padding-left: 7px;
79
+ }
80
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.right.last-visible-item {
81
+ padding-right: 7px;
82
+ }
83
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-background-color.left.first-visible-item,
84
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-background-color.right.last-visible-item {
85
+ padding-right: 0;
86
+ padding-left: 0;
87
+ }
88
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-background-color > .statusbar-item-label {
89
+ margin-right: 0;
90
+ margin-left: 0;
91
+ padding-left: 10px;
92
+ padding-right: 10px;
93
+ }
94
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.compact-left.has-background-color > .statusbar-item-label {
95
+ padding-left: 3px;
96
+ padding-right: 10px;
97
+ }
98
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.compact-right.has-background-color > .statusbar-item-label {
99
+ padding-left: 10px;
100
+ padding-right: 3px;
101
+ }
102
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item > .statusbar-item-label {
103
+ cursor: pointer;
104
+ display: flex;
105
+ height: 100%;
106
+ padding: 0 5px 0 5px;
107
+ white-space: pre;
108
+ align-items: center;
109
+ text-overflow: ellipsis;
110
+ overflow: hidden;
111
+ outline-width: 0px;
112
+ }
113
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.compact-left > .statusbar-item-label {
114
+ padding: 0 3px;
115
+ }
116
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.compact-right > .statusbar-item-label {
117
+ padding: 0 3px;
118
+ }
119
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item > a:hover:not(.disabled) {
120
+ text-decoration: none;
121
+ color: var(--vscode-statusBarItem-hoverForeground);
122
+ }
123
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item > a.disabled {
124
+ cursor: default;
125
+ }
126
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item span.codicon {
127
+ text-align: center;
128
+ font-size: 14px;
129
+ color: inherit;
130
+ }
131
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item a:active:not(.disabled) {
132
+ outline: 1px solid var(--vscode-contrastActiveBorder) !important;
133
+ outline-offset: -1px;
134
+ }
135
+ .monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar > .items-container > .statusbar-item a:active:not(.disabled) {
136
+ background-color: var(--vscode-statusBarItem-activeBackground) !important;
137
+ }
138
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item a:hover:not(.disabled) {
139
+ outline: 1px dashed var(--vscode-contrastActiveBorder);
140
+ outline-offset: -1px;
141
+ }
142
+ .monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar > .items-container > .statusbar-item a:hover:not(.disabled) {
143
+ background-color: var(--vscode-statusBarItem-hoverBackground);
144
+ }
145
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.warning-kind {
146
+ color: var(--vscode-statusBarItem-warningForeground);
147
+ background-color: var(--vscode-statusBarItem-warningBackground);
148
+ }
149
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.warning-kind a:hover:not(.disabled) {
150
+ color: var(--vscode-statusBarItem-warningHoverForeground);
151
+ background-color: var(--vscode-statusBarItem-warningHoverBackground) !important;
152
+ }
153
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.error-kind {
154
+ color: var(--vscode-statusBarItem-errorForeground);
155
+ background-color: var(--vscode-statusBarItem-errorBackground);
156
+ }
157
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.error-kind a:hover:not(.disabled) {
158
+ color: var(--vscode-statusBarItem-errorHoverForeground);
159
+ background-color: var(--vscode-statusBarItem-errorHoverBackground) !important;
160
+ }
161
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.prominent-kind {
162
+ color: var(--vscode-statusBarItem-prominentForeground);
163
+ background-color: var(--vscode-statusBarItem-prominentBackground);
164
+ }
165
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.prominent-kind:not(.compact-right):not(.compact-left) a:hover:not(.disabled) {
166
+ color: var(--vscode-statusBarItem-prominentHoverForeground);
167
+ background-color: var(--vscode-statusBarItem-prominentHoverBackground) !important;
168
+ }
169
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.remote-kind {
170
+ color: var(--vscode-statusBarItem-remoteForeground);
171
+ background-color: var(--vscode-statusBarItem-remoteBackground);
172
+ }
173
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.remote-kind a:hover:not(.disabled) {
174
+ color: var(--vscode-statusBarItem-remoteHoverForeground);
175
+ background-color: var(--vscode-statusBarItem-remoteHoverBackground) !important;
176
+ }
177
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.offline-kind {
178
+ color: var(--vscode-statusBarItem-offlineForeground);
179
+ background-color: var(--vscode-statusBarItem-offlineBackground);
180
+ }
181
+ .monaco-workbench .part.statusbar > .items-container > .statusbar-item.offline-kind a:hover:not(.disabled) {
182
+ color: var(--vscode-statusBarItem-offlineHoverForeground);
183
+ background-color: var(--vscode-statusBarItem-offlineHoverBackground) !important;
184
+ }
@@ -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-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
6
+ import { Parts } from '@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-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(3395, "Hide '{0}'", name)), undefined, true);
34
+ super(id, ( localize(3436, "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(3396, "Manage Extension")));
43
+ super('statusbar.manage.extension', ( localize(3437, "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(3397, 'Focus Status Bar')),
118
+ title: ( localize2(3438, 'Focus Status Bar')),
119
119
  category: Categories.View,
120
120
  f1: true
121
121
  });
@@ -8,7 +8,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
8
8
  import { isTooltipWithCommands, ShowTooltipCommand, StatusbarEntryKinds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
9
9
  import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
10
10
  import { isThemeColor } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon';
11
- import { show, hide, addDisposableListener, EventType, EventHelper, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
11
+ import { $, show, hide, addDisposableListener, EventType, EventHelper, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
12
12
  import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
13
13
  import { assertIsDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
14
14
  import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
@@ -42,15 +42,14 @@ let StatusbarEntryItem = class StatusbarEntryItem extends Disposable {
42
42
  this.commandTouchListener = this._register(( new MutableDisposable()));
43
43
  this.commandKeyboardListener = this._register(( new MutableDisposable()));
44
44
  this.hover = undefined;
45
- this.labelContainer = document.createElement('a');
46
- this.labelContainer.tabIndex = -1;
47
- this.labelContainer.setAttribute('role', 'button');
48
- this.labelContainer.className = 'statusbar-item-label';
45
+ this.labelContainer = $('a.statusbar-item-label', {
46
+ role: 'button',
47
+ tabIndex: -1
48
+ });
49
49
  this._register(Gesture.addTarget(this.labelContainer));
50
50
  this.label = this._register(( new StatusBarCodiconLabel(this.labelContainer)));
51
51
  this.container.appendChild(this.labelContainer);
52
- this.beakContainer = document.createElement('div');
53
- this.beakContainer.className = 'status-bar-item-beak-container';
52
+ this.beakContainer = $('.status-bar-item-beak-container');
54
53
  this.container.appendChild(this.beakContainer);
55
54
  this.update(entry);
56
55
  }
@@ -90,7 +89,7 @@ let StatusbarEntryItem = class StatusbarEntryItem extends Disposable {
90
89
  }
91
90
  const hoverContents = isMarkdownString(hoverTooltip) ? { markdown: hoverTooltip, markdownNotSupportedFallback: undefined } : hoverTooltip;
92
91
  if (this.hover) {
93
- this.hover.update(typeof hoverContents === 'function' ? hoverContents() : hoverContents, hoverOptions);
92
+ this.hover.update(hoverContents, hoverOptions);
94
93
  }
95
94
  else {
96
95
  this.hover = this._register(this.hoverService.setupManagedHover(this.hoverDelegate, this.container, hoverContents, hoverOptions));
@@ -184,8 +183,8 @@ let StatusbarEntryItem = class StatusbarEntryItem extends Disposable {
184
183
  if (color) {
185
184
  if (isThemeColor(color)) {
186
185
  colorResult = this.themeService.getColorTheme().getColor(color.id)?.toString();
187
- const listener = this.themeService.onDidColorThemeChange(e => {
188
- const colorValue = e.theme.getColor(color.id)?.toString();
186
+ const listener = this.themeService.onDidColorThemeChange(theme => {
187
+ const colorValue = theme.getColor(color.id)?.toString();
189
188
  if (isBackground) {
190
189
  container.style.backgroundColor = colorValue ?? '';
191
190
  }
@@ -31,7 +31,6 @@ export interface IStatusbarEntryContainer extends IDisposable {
31
31
  declare class StatusbarPart extends Part implements IStatusbarEntryContainer {
32
32
  private readonly instantiationService;
33
33
  private readonly contextService;
34
- private readonly storageService;
35
34
  private readonly contextMenuService;
36
35
  private readonly contextKeyService;
37
36
  static readonly HEIGHT = 22;
@@ -1,6 +1,6 @@
1
1
 
2
2
  import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
3
- import './media/statusbarpart.css.js';
3
+ import './media/statusbarpart.css';
4
4
  import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
5
5
  import { MutableDisposable, toDisposable, DisposableStore, disposeIfDisposable, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
6
6
  import { Part, MultiWindowParts } from '@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common/vscode/vs/workbench/browser/part';
@@ -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 { isHTMLElement, 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-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
31
+ import { Parts } from '@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-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,7 +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
+ import { isManagedHoverTooltipMarkdownString, isManagedHoverTooltipHTMLElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover';
48
48
 
49
49
  var StatusbarPart_1, AuxiliaryStatusbarPart_1;
50
50
  let StatusbarPart = class StatusbarPart extends Part {
@@ -54,7 +54,6 @@ let StatusbarPart = class StatusbarPart extends Part {
54
54
  super(id, { hasTitle: false }, themeService, storageService, layoutService);
55
55
  this.instantiationService = instantiationService;
56
56
  this.contextService = contextService;
57
- this.storageService = storageService;
58
57
  this.contextMenuService = contextMenuService;
59
58
  this.contextKeyService = contextKeyService;
60
59
  this.minimumWidth = 0;
@@ -62,18 +61,21 @@ let StatusbarPart = class StatusbarPart extends Part {
62
61
  this.minimumHeight = StatusbarPart_1.HEIGHT;
63
62
  this.maximumHeight = StatusbarPart_1.HEIGHT;
64
63
  this.pendingEntries = [];
65
- this.viewModel = this._register(( new StatusbarViewModel(this.storageService)));
66
- this.onDidChangeEntryVisibility = this.viewModel.onDidChangeEntryVisibility;
67
64
  this._onWillDispose = this._register(( new Emitter()));
68
65
  this.onWillDispose = this._onWillDispose.event;
69
66
  this.onDidOverrideEntry = this._register(( new Emitter()));
70
67
  this.entryOverrides = ( new Map());
68
+ this.compactEntriesDisposable = this._register(( new MutableDisposable()));
69
+ this.styleOverrides = ( new Set());
70
+ this.viewModel = this._register(( new StatusbarViewModel(storageService)));
71
+ this.onDidChangeEntryVisibility = this.viewModel.onDidChangeEntryVisibility;
71
72
  this.hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', {
72
73
  instantHover: true,
73
74
  dynamicDelay(content) {
74
75
  if (typeof content === 'function' ||
75
76
  isHTMLElement(content) ||
76
- (isManagedHoverTooltipMarkdownString(content) && typeof content.markdown === 'function')) {
77
+ (isManagedHoverTooltipMarkdownString(content) && typeof content.markdown === 'function') ||
78
+ isManagedHoverTooltipHTMLElement(content)) {
77
79
  return 500;
78
80
  }
79
81
  return undefined;
@@ -84,8 +86,6 @@ let StatusbarPart = class StatusbarPart extends Part {
84
86
  sticky: focus
85
87
  }
86
88
  })));
87
- this.compactEntriesDisposable = this._register(( new MutableDisposable()));
88
- this.styleOverrides = ( new Set());
89
89
  this.registerListeners();
90
90
  }
91
91
  registerListeners() {
@@ -198,9 +198,7 @@ let StatusbarPart = class StatusbarPart extends Part {
198
198
  return accessor;
199
199
  }
200
200
  doCreateStatusItem(id, alignment, ...extraClasses) {
201
- const itemContainer = document.createElement('div');
202
- itemContainer.id = id;
203
- itemContainer.classList.add('statusbar-item');
201
+ const itemContainer = $('.statusbar-item', { id });
204
202
  if (extraClasses) {
205
203
  itemContainer.classList.add(...extraClasses);
206
204
  }
@@ -261,12 +259,10 @@ let StatusbarPart = class StatusbarPart extends Part {
261
259
  this.element = parent;
262
260
  const scopedContextKeyService = this._register(this.contextKeyService.createScoped(this.element));
263
261
  StatusBarFocused.bindTo(scopedContextKeyService).set(true);
264
- this.leftItemsContainer = document.createElement('div');
265
- this.leftItemsContainer.classList.add('left-items', 'items-container');
262
+ this.leftItemsContainer = $('.left-items.items-container');
266
263
  this.element.appendChild(this.leftItemsContainer);
267
264
  this.element.tabIndex = 0;
268
- this.rightItemsContainer = document.createElement('div');
269
- this.rightItemsContainer.classList.add('right-items', 'items-container');
265
+ this.rightItemsContainer = $('.right-items.items-container');
270
266
  this.element.appendChild(this.rightItemsContainer);
271
267
  this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, e => this.showContextMenu(e)));
272
268
  this._register(Gesture.addTarget(parent));
@@ -395,7 +391,7 @@ let StatusbarPart = class StatusbarPart extends Part {
395
391
  }
396
392
  getContextMenuActions(event) {
397
393
  const actions = [];
398
- actions.push(toAction({ id: ToggleStatusbarVisibilityAction.ID, label: ( localize(3398, "Hide Status Bar")), run: () => this.instantiationService.invokeFunction(accessor => ( new ToggleStatusbarVisibilityAction()).run(accessor)) }));
394
+ actions.push(toAction({ id: ToggleStatusbarVisibilityAction.ID, label: ( localize(3439, "Hide Status Bar")), run: () => this.instantiationService.invokeFunction(accessor => ( new ToggleStatusbarVisibilityAction()).run(accessor)) }));
399
395
  actions.push(( new Separator()));
400
396
  const handledEntries = ( new Set());
401
397
  for (const entry of this.viewModel.entries) {
@@ -530,19 +526,19 @@ let StatusbarService = class StatusbarService extends MultiWindowParts {
530
526
  constructor(instantiationService, storageService, themeService) {
531
527
  super('workbench.statusBarService', themeService, storageService);
532
528
  this.instantiationService = instantiationService;
533
- this.mainPart = this._register(this.instantiationService.createInstance(MainStatusbarPart));
534
529
  this._onDidCreateAuxiliaryStatusbarPart = this._register(( new Emitter()));
535
530
  this.onDidCreateAuxiliaryStatusbarPart = this._onDidCreateAuxiliaryStatusbarPart.event;
536
- this.onDidChangeEntryVisibility = this.mainPart.onDidChangeEntryVisibility;
531
+ this.mainPart = this._register(this.instantiationService.createInstance(MainStatusbarPart));
537
532
  this._register(this.registerPart(this.mainPart));
533
+ this.onDidChangeEntryVisibility = this.mainPart.onDidChangeEntryVisibility;
538
534
  }
539
535
  createAuxiliaryStatusbarPart(container) {
540
- const statusbarPartContainer = document.createElement('footer');
541
- statusbarPartContainer.classList.add('part', 'statusbar');
542
- statusbarPartContainer.setAttribute('role', 'status');
536
+ const statusbarPartContainer = $('footer.part.statusbar', {
537
+ 'role': 'status',
538
+ 'aria-live': 'off',
539
+ 'tabIndex': '0'
540
+ });
543
541
  statusbarPartContainer.style.position = 'relative';
544
- statusbarPartContainer.setAttribute('aria-live', 'off');
545
- statusbarPartContainer.setAttribute('tabindex', '0');
546
542
  container.appendChild(statusbarPartContainer);
547
543
  const statusbarPart = this.instantiationService.createInstance(AuxiliaryStatusbarPart, statusbarPartContainer);
548
544
  const disposable = this.registerPart(statusbarPart);
@@ -1,80 +0,0 @@
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
- }
@@ -1,8 +0,0 @@
1
-
2
-
3
- function isManagedHoverTooltipMarkdownString(obj) {
4
- const candidate = obj;
5
- return typeof candidate === 'object' && 'markdown' in candidate && 'markdownNotSupportedFallback' in candidate;
6
- }
7
-
8
- export { isManagedHoverTooltipMarkdownString };
@@ -1,6 +0,0 @@
1
- import n from '@codingame/monaco-vscode-api/external/rollup-plugin-styles/dist/runtime/inject-css';
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{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
- n(css,{});
5
-
6
- export { css, css as default };