@codingame/monaco-vscode-view-common-service-override 4.5.1 → 4.5.2
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 +3 -3
- package/vscode/src/vs/base/browser/ui/grid/grid.js +12 -12
- package/vscode/src/vs/base/browser/ui/grid/gridview.js +26 -26
- package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +4 -3
- package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js +127 -220
- package/vscode/src/vs/workbench/browser/actions/listCommands.js +43 -44
- package/vscode/src/vs/workbench/browser/actions/navigationActions.js +7 -30
- package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js +67 -138
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js +21 -36
- package/vscode/src/vs/workbench/browser/parts/compositeBar.js +26 -27
- package/vscode/src/vs/workbench/browser/parts/compositePart.js +17 -31
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +215 -764
- package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +27 -42
- package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js +24 -23
- package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js +31 -33
- package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js +51 -54
- package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js +38 -41
- package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js +21 -24
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js +2 -5
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js +17 -20
- package/vscode/src/vs/workbench/browser/window.js +41 -92
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js +41 -78
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +23 -46
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js +36 -27
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js +14 -15
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +10 -11
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js +25 -52
- package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +55 -87
- package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js +18 -48
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js +61 -150
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js +15 -70
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js +9 -20
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js +14 -65
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +38 -113
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +12 -19
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +34 -75
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +16 -37
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js +40 -43
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js +12 -11
- package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js +24 -61
- package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js +7 -6
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +37 -70
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +23 -46
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +26 -27
- package/vscode/src/vs/workbench/contrib/webview/browser/overlayWebview.js +2 -2
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +50 -52
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +18 -34
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +7 -10
- package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewService.js +2 -2
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +45 -46
- package/vscode/src/vs/workbench/services/driver/browser/driver.js +8 -6
- package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +45 -68
- package/vscode/src/vs/workbench/services/history/browser/historyService.js +95 -98
- package/vscode/src/vs/workbench/services/progress/browser/progressService.js +34 -74
- package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +69 -67
- package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +52 -47
|
@@ -18,6 +18,7 @@ import { defaultProgressBarStyles } from 'vscode/vscode/vs/platform/theme/browse
|
|
|
18
18
|
import { createInstantHoverDelegate, getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
|
|
19
19
|
import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
|
|
20
20
|
|
|
21
|
+
const _moduleId = "vs/workbench/browser/parts/compositePart";
|
|
21
22
|
class CompositePart extends Part {
|
|
22
23
|
constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, registry, activeCompositeSettingsKey, defaultCompositeId, nameForTelemetry, compositeCSSClass, titleForegroundColor, id, options) {
|
|
23
24
|
super(id, options, themeService, storageService, layoutService);
|
|
@@ -32,12 +33,12 @@ class CompositePart extends Part {
|
|
|
32
33
|
this.nameForTelemetry = nameForTelemetry;
|
|
33
34
|
this.compositeCSSClass = compositeCSSClass;
|
|
34
35
|
this.titleForegroundColor = titleForegroundColor;
|
|
35
|
-
this.onDidCompositeOpen = this._register(( new Emitter()));
|
|
36
|
-
this.onDidCompositeClose = this._register(( new Emitter()));
|
|
37
|
-
this.mapCompositeToCompositeContainer = ( new Map());
|
|
38
|
-
this.mapActionsBindingToComposite = ( new Map());
|
|
39
|
-
this.instantiatedCompositeItems = ( new Map());
|
|
40
|
-
this.actionsListener = this._register(( new MutableDisposable()));
|
|
36
|
+
this.onDidCompositeOpen = this._register(( (new Emitter())));
|
|
37
|
+
this.onDidCompositeClose = this._register(( (new Emitter())));
|
|
38
|
+
this.mapCompositeToCompositeContainer = ( (new Map()));
|
|
39
|
+
this.mapActionsBindingToComposite = ( (new Map()));
|
|
40
|
+
this.instantiatedCompositeItems = ( (new Map()));
|
|
41
|
+
this.actionsListener = this._register(( (new MutableDisposable())));
|
|
41
42
|
this.lastActiveCompositeId = storageService.get(activeCompositeSettingsKey, 1 , this.defaultCompositeId);
|
|
42
43
|
this.toolbarHoverDelegate = this._register(createInstantHoverDelegate());
|
|
43
44
|
}
|
|
@@ -88,7 +89,7 @@ class CompositePart extends Part {
|
|
|
88
89
|
const compositeDescriptor = this.registry.getComposite(id);
|
|
89
90
|
if (compositeDescriptor) {
|
|
90
91
|
const that = this;
|
|
91
|
-
const compositeProgressIndicator = ( new ScopedProgressIndicator(
|
|
92
|
+
const compositeProgressIndicator = ( (new ScopedProgressIndicator(
|
|
92
93
|
assertIsDefined(this.progressBar),
|
|
93
94
|
new (class extends AbstractProgressScope {
|
|
94
95
|
constructor() {
|
|
@@ -97,17 +98,17 @@ class CompositePart extends Part {
|
|
|
97
98
|
this._register(that.onDidCompositeClose.event(e => this.onScopeClosed(e.getId())));
|
|
98
99
|
}
|
|
99
100
|
})()
|
|
100
|
-
));
|
|
101
|
-
const compositeInstantiationService = this.instantiationService.createChild(( new ServiceCollection(
|
|
102
|
-
[IEditorProgressService, compositeProgressIndicator]
|
|
103
101
|
)));
|
|
102
|
+
const compositeInstantiationService = this.instantiationService.createChild(( (new ServiceCollection(
|
|
103
|
+
[IEditorProgressService, compositeProgressIndicator]
|
|
104
|
+
))));
|
|
104
105
|
const composite = compositeDescriptor.instantiate(compositeInstantiationService);
|
|
105
|
-
const disposable = ( new DisposableStore());
|
|
106
|
+
const disposable = ( (new DisposableStore()));
|
|
106
107
|
this.instantiatedCompositeItems.set(id, { composite, disposable, progress: compositeProgressIndicator });
|
|
107
108
|
disposable.add(composite.onTitleAreaUpdate(() => this.onTitleAreaUpdate(composite.getId()), this));
|
|
108
109
|
return composite;
|
|
109
110
|
}
|
|
110
|
-
throw new Error(`Unable to find composite with id ${id}`);
|
|
111
|
+
throw ( (new Error(`Unable to find composite with id ${id}`)));
|
|
111
112
|
}
|
|
112
113
|
showComposite(composite) {
|
|
113
114
|
this.activeComposite = composite;
|
|
@@ -187,12 +188,7 @@ class CompositePart extends Part {
|
|
|
187
188
|
const keybinding = this.keybindingService.lookupKeybinding(compositeId);
|
|
188
189
|
this.titleLabel.updateTitle(compositeId, compositeTitle, keybinding?.getLabel() ?? undefined);
|
|
189
190
|
const toolBar = assertIsDefined(this.toolBar);
|
|
190
|
-
toolBar.setAriaLabel(( localizeWithPath(
|
|
191
|
-
'vs/workbench/browser/parts/compositePart',
|
|
192
|
-
'ariaCompositeToolbarLabel',
|
|
193
|
-
"{0} actions",
|
|
194
|
-
compositeTitle
|
|
195
|
-
)));
|
|
191
|
+
toolBar.setAriaLabel(( localizeWithPath(_moduleId, 0, "{0} actions", compositeTitle)));
|
|
196
192
|
}
|
|
197
193
|
collectCompositeActions(composite) {
|
|
198
194
|
const menuIds = composite?.getMenuIds();
|
|
@@ -237,11 +233,7 @@ class CompositePart extends Part {
|
|
|
237
233
|
orientation: 0 ,
|
|
238
234
|
getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
|
|
239
235
|
anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
|
|
240
|
-
toggleMenuTitle: ( localizeWithPath(
|
|
241
|
-
'vs/workbench/browser/parts/compositePart',
|
|
242
|
-
'viewsAndMoreActions',
|
|
243
|
-
"Views and More Actions..."
|
|
244
|
-
)),
|
|
236
|
+
toggleMenuTitle: ( localizeWithPath(_moduleId, 1, "Views and More Actions...")),
|
|
245
237
|
telemetrySource: this.nameForTelemetry,
|
|
246
238
|
hoverDelegate: this.toolbarHoverDelegate
|
|
247
239
|
}));
|
|
@@ -258,13 +250,7 @@ class CompositePart extends Part {
|
|
|
258
250
|
updateTitle: (id, title, keybinding) => {
|
|
259
251
|
if (!this.activeComposite || this.activeComposite.getId() === id) {
|
|
260
252
|
titleLabel.innerText = title;
|
|
261
|
-
hover.update(keybinding ? ( localizeWithPath(
|
|
262
|
-
'vs/workbench/browser/parts/compositePart',
|
|
263
|
-
'titleTooltip',
|
|
264
|
-
"{0} ({1})",
|
|
265
|
-
title,
|
|
266
|
-
keybinding
|
|
267
|
-
)) : title);
|
|
253
|
+
hover.update(keybinding ? ( localizeWithPath(_moduleId, 2, "{0} ({1})", title, keybinding)) : title);
|
|
268
254
|
}
|
|
269
255
|
},
|
|
270
256
|
updateStyles: () => {
|
|
@@ -297,7 +283,7 @@ class CompositePart extends Part {
|
|
|
297
283
|
}
|
|
298
284
|
createContentArea(parent) {
|
|
299
285
|
const contentContainer = append(parent, $('.content'));
|
|
300
|
-
this.progressBar = this._register(( new ProgressBar(contentContainer, defaultProgressBarStyles)));
|
|
286
|
+
this.progressBar = this._register(( (new ProgressBar(contentContainer, defaultProgressBarStyles))));
|
|
301
287
|
this.progressBar.hide();
|
|
302
288
|
return contentContainer;
|
|
303
289
|
}
|