@codingame/monaco-vscode-view-common-service-override 8.0.4 → 9.0.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/workbench/api/browser/viewsExtensionPoint.js +58 -58
- package/vscode/src/vs/workbench/browser/actions/listCommands.js +3 -3
- package/vscode/src/vs/workbench/browser/actions/navigationActions.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js +21 -21
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/compositeBar.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/compositePart.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +159 -159
- package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +8 -8
- package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js +10 -10
- package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js +19 -4
- package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js +12 -12
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +5 -5
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js +3 -3
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js +12 -12
- package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +22 -19
- package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js +8 -8
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js +27 -27
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js +14 -14
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js +13 -13
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +11 -11
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +5 -5
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js +2 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewZones.js +1 -1
- package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js +12 -12
- package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +10 -10
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +5 -5
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +3 -3
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +11 -1
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +5 -5
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +1 -1
- package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +20 -16
- package/vscode/src/vs/workbench/services/history/browser/historyService.js +9 -9
- package/vscode/src/vs/workbench/services/progress/browser/progressService.js +8 -8
- package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +2 -2
- package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +0 -271
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.js +0 -41
|
@@ -19,7 +19,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
|
|
|
19
19
|
minimum: 1,
|
|
20
20
|
maximum: 20,
|
|
21
21
|
description: ( localize(
|
|
22
|
-
|
|
22
|
+
4343,
|
|
23
23
|
"Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
|
|
24
24
|
))
|
|
25
25
|
},
|
|
@@ -29,7 +29,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
|
|
|
29
29
|
minimum: 0,
|
|
30
30
|
maximum: 2000,
|
|
31
31
|
description: ( localize(
|
|
32
|
-
|
|
32
|
+
4344,
|
|
33
33
|
"Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
|
|
34
34
|
))
|
|
35
35
|
},
|
|
@@ -21,12 +21,12 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
|
|
|
21
21
|
import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
|
|
22
22
|
|
|
23
23
|
var TypeHierarchyController_1;
|
|
24
|
-
const _ctxHasTypeHierarchyProvider = ( (new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(
|
|
25
|
-
const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localize(
|
|
24
|
+
const _ctxHasTypeHierarchyProvider = ( (new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(4129, 'Whether a type hierarchy provider is available')))));
|
|
25
|
+
const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localize(4130, 'Whether type hierarchy peek is currently showing')))));
|
|
26
26
|
const _ctxTypeHierarchyDirection = ( (new RawContextKey(
|
|
27
27
|
'typeHierarchyDirection',
|
|
28
28
|
undefined,
|
|
29
|
-
{ type: 'string', description: ( localize(
|
|
29
|
+
{ type: 'string', description: ( localize(4131, 'whether type hierarchy shows super types or subtypes')) }
|
|
30
30
|
)));
|
|
31
31
|
function sanitizedDirection(candidate) {
|
|
32
32
|
return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes
|
|
@@ -95,14 +95,14 @@ let TypeHierarchyController = class TypeHierarchyController {
|
|
|
95
95
|
this._widget.showModel(model);
|
|
96
96
|
}
|
|
97
97
|
else {
|
|
98
|
-
this._widget.showMessage(( localize(
|
|
98
|
+
this._widget.showMessage(( localize(4132, "No results")));
|
|
99
99
|
}
|
|
100
100
|
}).catch(err => {
|
|
101
101
|
if (isCancellationError(err)) {
|
|
102
102
|
this.endTypeHierarchy();
|
|
103
103
|
return;
|
|
104
104
|
}
|
|
105
|
-
this._widget.showMessage(( localize(
|
|
105
|
+
this._widget.showMessage(( localize(4133, "Failed to show type hierarchy")));
|
|
106
106
|
});
|
|
107
107
|
}
|
|
108
108
|
async startTypeHierarchyFromTypeHierarchy() {
|
|
@@ -147,7 +147,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
|
|
|
147
147
|
constructor() {
|
|
148
148
|
super({
|
|
149
149
|
id: 'editor.showTypeHierarchy',
|
|
150
|
-
title: ( localize2(
|
|
150
|
+
title: ( localize2(4134, 'Peek Type Hierarchy')),
|
|
151
151
|
menu: {
|
|
152
152
|
id: MenuId.EditorContextPeek,
|
|
153
153
|
group: 'navigation',
|
|
@@ -166,7 +166,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
166
166
|
constructor() {
|
|
167
167
|
super({
|
|
168
168
|
id: 'editor.showSupertypes',
|
|
169
|
-
title: ( localize2(
|
|
169
|
+
title: ( localize2(4135, 'Show Supertypes')),
|
|
170
170
|
icon: Codicon.typeHierarchySuper,
|
|
171
171
|
precondition: ( (ContextKeyExpr.and(
|
|
172
172
|
_ctxTypeHierarchyVisible,
|
|
@@ -191,7 +191,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
191
191
|
constructor() {
|
|
192
192
|
super({
|
|
193
193
|
id: 'editor.showSubtypes',
|
|
194
|
-
title: ( localize2(
|
|
194
|
+
title: ( localize2(4136, 'Show Subtypes')),
|
|
195
195
|
icon: Codicon.typeHierarchySub,
|
|
196
196
|
precondition: ( (ContextKeyExpr.and(
|
|
197
197
|
_ctxTypeHierarchyVisible,
|
|
@@ -216,7 +216,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
216
216
|
constructor() {
|
|
217
217
|
super({
|
|
218
218
|
id: 'editor.refocusTypeHierarchy',
|
|
219
|
-
title: ( localize2(
|
|
219
|
+
title: ( localize2(4137, 'Refocus Type Hierarchy')),
|
|
220
220
|
precondition: _ctxTypeHierarchyVisible,
|
|
221
221
|
keybinding: {
|
|
222
222
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -232,7 +232,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
232
232
|
constructor() {
|
|
233
233
|
super({
|
|
234
234
|
id: 'editor.closeTypeHierarchy',
|
|
235
|
-
title: ( localize(
|
|
235
|
+
title: ( localize(4138, 'Close')),
|
|
236
236
|
icon: Codicon.close,
|
|
237
237
|
precondition: _ctxTypeHierarchyVisible,
|
|
238
238
|
keybinding: {
|
|
@@ -262,13 +262,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
262
262
|
}
|
|
263
263
|
this._previewDisposable.add(value);
|
|
264
264
|
const title = this._direction === TypeHierarchyDirection.Supertypes
|
|
265
|
-
? ( localize(
|
|
266
|
-
: ( localize(
|
|
265
|
+
? ( localize(9550, "Supertypes of '{0}'", element.model.root.name))
|
|
266
|
+
: ( localize(9551, "Subtypes of '{0}'", element.model.root.name));
|
|
267
267
|
this.setTitle(title);
|
|
268
268
|
}
|
|
269
269
|
showLoading() {
|
|
270
270
|
this._parent.dataset['state'] = State.Loading;
|
|
271
|
-
this.setTitle(( localize(
|
|
271
|
+
this.setTitle(( localize(9552, "Loading...")));
|
|
272
272
|
this._show();
|
|
273
273
|
}
|
|
274
274
|
showMessage(message) {
|
|
@@ -287,8 +287,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
287
287
|
await this._tree.expand(root.element);
|
|
288
288
|
if (root.children.length === 0) {
|
|
289
289
|
this.showMessage(this._direction === TypeHierarchyDirection.Supertypes
|
|
290
|
-
? ( localize(
|
|
291
|
-
: ( localize(
|
|
290
|
+
? ( localize(9553, "No supertypes of '{0}'", model.root.name))
|
|
291
|
+
: ( localize(9554, "No subtypes of '{0}'", model.root.name)));
|
|
292
292
|
}
|
|
293
293
|
else {
|
|
294
294
|
this._parent.dataset['state'] = State.Data;
|
|
@@ -116,14 +116,14 @@ class AccessibilityProvider {
|
|
|
116
116
|
this.getDirection = getDirection;
|
|
117
117
|
}
|
|
118
118
|
getWidgetAriaLabel() {
|
|
119
|
-
return ( localize(
|
|
119
|
+
return ( localize(11245, "Type Hierarchy"));
|
|
120
120
|
}
|
|
121
121
|
getAriaLabel(element) {
|
|
122
122
|
if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
|
|
123
|
-
return ( localize(
|
|
123
|
+
return ( localize(11246, "supertypes of {0}", element.item.name));
|
|
124
124
|
}
|
|
125
125
|
else {
|
|
126
|
-
return ( localize(
|
|
126
|
+
return ( localize(11247, "subtypes of {0}", element.item.name));
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
129
|
}
|
|
@@ -158,7 +158,7 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
158
158
|
this._hasFindResult.fire(didFind);
|
|
159
159
|
}));
|
|
160
160
|
this._register(this.on('fatal-error', (e) => {
|
|
161
|
-
notificationService.error(( localize(
|
|
161
|
+
notificationService.error(( localize(9537, "Error loading webview: {0}", e.message)));
|
|
162
162
|
this._onFatalError.fire({ message: e.message });
|
|
163
163
|
}));
|
|
164
164
|
this._register(this.on('did-keydown', (data) => {
|
|
@@ -227,6 +227,9 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
227
227
|
this._register(this.on('drag-start', () => {
|
|
228
228
|
this._startBlockingIframeDragEvents();
|
|
229
229
|
}));
|
|
230
|
+
this._register(this.on('drag', (event) => {
|
|
231
|
+
this.handleDragEvent('drag', event);
|
|
232
|
+
}));
|
|
230
233
|
if (initInfo.options.enableFindWidget) {
|
|
231
234
|
this._webviewFindWidget = this._register(instantiationService.createInstance(WebviewFindWidget, this));
|
|
232
235
|
}
|
|
@@ -496,6 +499,13 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
496
499
|
});
|
|
497
500
|
this.window?.dispatchEvent(emulatedKeyboardEvent);
|
|
498
501
|
}
|
|
502
|
+
handleDragEvent(type, event) {
|
|
503
|
+
const emulatedDragEvent = ( (new DragEvent(type, event)));
|
|
504
|
+
Object.defineProperty(emulatedDragEvent, 'target', {
|
|
505
|
+
get: () => this.element,
|
|
506
|
+
});
|
|
507
|
+
this.window?.dispatchEvent(emulatedDragEvent);
|
|
508
|
+
}
|
|
499
509
|
windowDidDragStart() {
|
|
500
510
|
this._startBlockingIframeDragEvents();
|
|
501
511
|
}
|
|
@@ -17,7 +17,7 @@ const webviewActiveContextKeyExpr = ( (ContextKeyExpr.and(
|
|
|
17
17
|
)));
|
|
18
18
|
class ShowWebViewEditorFindWidgetAction extends Action2 {
|
|
19
19
|
static { this.ID = 'editor.action.webvieweditor.showFind'; }
|
|
20
|
-
static { this.LABEL = ( localize(
|
|
20
|
+
static { this.LABEL = ( localize(9763, "Show find")); }
|
|
21
21
|
constructor() {
|
|
22
22
|
super({
|
|
23
23
|
id: ShowWebViewEditorFindWidgetAction.ID,
|
|
@@ -38,7 +38,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
|
|
|
38
38
|
}
|
|
39
39
|
class HideWebViewEditorFindCommand extends Action2 {
|
|
40
40
|
static { this.ID = 'editor.action.webvieweditor.hideFind'; }
|
|
41
|
-
static { this.LABEL = ( localize(
|
|
41
|
+
static { this.LABEL = ( localize(9764, "Stop find")); }
|
|
42
42
|
constructor() {
|
|
43
43
|
super({
|
|
44
44
|
id: HideWebViewEditorFindCommand.ID,
|
|
@@ -59,7 +59,7 @@ class HideWebViewEditorFindCommand extends Action2 {
|
|
|
59
59
|
}
|
|
60
60
|
class WebViewEditorFindNextCommand extends Action2 {
|
|
61
61
|
static { this.ID = 'editor.action.webvieweditor.findNext'; }
|
|
62
|
-
static { this.LABEL = ( localize(
|
|
62
|
+
static { this.LABEL = ( localize(9765, 'Find next')); }
|
|
63
63
|
constructor() {
|
|
64
64
|
super({
|
|
65
65
|
id: WebViewEditorFindNextCommand.ID,
|
|
@@ -80,7 +80,7 @@ class WebViewEditorFindNextCommand extends Action2 {
|
|
|
80
80
|
}
|
|
81
81
|
class WebViewEditorFindPreviousCommand extends Action2 {
|
|
82
82
|
static { this.ID = 'editor.action.webvieweditor.findPrevious'; }
|
|
83
|
-
static { this.LABEL = ( localize(
|
|
83
|
+
static { this.LABEL = ( localize(9766, 'Find previous')); }
|
|
84
84
|
constructor() {
|
|
85
85
|
super({
|
|
86
86
|
id: WebViewEditorFindPreviousCommand.ID,
|
|
@@ -101,7 +101,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
|
|
|
101
101
|
}
|
|
102
102
|
class ReloadWebviewAction extends Action2 {
|
|
103
103
|
static { this.ID = 'workbench.action.webview.reloadWebviewAction'; }
|
|
104
|
-
static { this.LABEL = ( localize2(
|
|
104
|
+
static { this.LABEL = ( localize2(9767, "Reload Webviews")); }
|
|
105
105
|
constructor() {
|
|
106
106
|
super({
|
|
107
107
|
id: ReloadWebviewAction.ID,
|
|
@@ -17,7 +17,7 @@ import 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbench
|
|
|
17
17
|
import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
18
18
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
19
19
|
|
|
20
|
-
(( (Registry.as(EditorExtensions.EditorPane)))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(
|
|
20
|
+
(( (Registry.as(EditorExtensions.EditorPane)))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(4320, "webview editor"))), [( (new SyncDescriptor(WebviewInput)))]);
|
|
21
21
|
let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {
|
|
22
22
|
static { this.ID = 'workbench.contrib.webviewPanel'; }
|
|
23
23
|
constructor(editorService, editorGroupService) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
2
|
import { isRelativePattern } from 'vscode/vscode/vs/base/common/glob';
|
|
3
3
|
import { insert, distinct, firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
|
|
4
|
-
import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
4
|
+
import { Disposable, toDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
5
5
|
import { isEqual, extname, basename } from 'vscode/vscode/vs/base/common/resources';
|
|
6
6
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
7
7
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
@@ -450,8 +450,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
450
450
|
if (storedChoices[globForResource] && storedChoices[globForResource].find(editorID => editorID === currentEditor.editorId)) {
|
|
451
451
|
return;
|
|
452
452
|
}
|
|
453
|
-
const handle = this.notificationService.prompt(Severity$1.Warning, ( localize(
|
|
454
|
-
label: ( localize(
|
|
453
|
+
const handle = this.notificationService.prompt(Severity$1.Warning, ( localize(4042, 'There are multiple default editors available for the resource.')), [{
|
|
454
|
+
label: ( localize(4043, 'Configure Default')),
|
|
455
455
|
run: async () => {
|
|
456
456
|
const picked = await this.doPickEditor(untypedInput, true);
|
|
457
457
|
if (!picked) {
|
|
@@ -472,7 +472,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
472
472
|
}
|
|
473
473
|
},
|
|
474
474
|
{
|
|
475
|
-
label: ( localize(
|
|
475
|
+
label: ( localize(4044, 'Keep {0}', editorName)),
|
|
476
476
|
run: writeCurrentEditorsToStorage
|
|
477
477
|
}
|
|
478
478
|
]);
|
|
@@ -498,9 +498,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
498
498
|
}
|
|
499
499
|
});
|
|
500
500
|
const quickPickEntries = [];
|
|
501
|
-
const currentlyActiveLabel = ( localize(
|
|
502
|
-
const currentDefaultLabel = ( localize(
|
|
503
|
-
const currentDefaultAndActiveLabel = ( localize(
|
|
501
|
+
const currentlyActiveLabel = ( localize(4045, "Active"));
|
|
502
|
+
const currentDefaultLabel = ( localize(4046, "Default"));
|
|
503
|
+
const currentDefaultAndActiveLabel = ( localize(4047, "Active and Default"));
|
|
504
504
|
let defaultViewType = defaultSetting;
|
|
505
505
|
if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
|
|
506
506
|
defaultViewType = registeredEditors[1]?.editorInfo.id;
|
|
@@ -525,7 +525,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
525
525
|
quickPickEntries.push(separator);
|
|
526
526
|
const configureDefaultEntry = {
|
|
527
527
|
id: EditorResolverService_1.configureDefaultID,
|
|
528
|
-
label: ( localize(
|
|
528
|
+
label: ( localize(4048, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
|
|
529
529
|
};
|
|
530
530
|
quickPickEntries.push(configureDefaultEntry);
|
|
531
531
|
}
|
|
@@ -537,10 +537,11 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
537
537
|
resource = ( (URI.from({ scheme: Schemas.untitled })));
|
|
538
538
|
}
|
|
539
539
|
const editorPicks = this.mapEditorsToQuickPickEntry(resource, showDefaultPicker);
|
|
540
|
-
const
|
|
540
|
+
const disposables = ( (new DisposableStore()));
|
|
541
|
+
const editorPicker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
|
|
541
542
|
const placeHolderMessage = showDefaultPicker ?
|
|
542
|
-
( localize(
|
|
543
|
-
( localize(
|
|
543
|
+
( localize(4049, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
|
|
544
|
+
( localize(4050, "Select editor for '{0}'", basename(resource)));
|
|
544
545
|
editorPicker.placeholder = placeHolderMessage;
|
|
545
546
|
editorPicker.canAcceptInBackground = true;
|
|
546
547
|
editorPicker.items = editorPicks;
|
|
@@ -549,7 +550,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
549
550
|
editorPicker.selectedItems = [firstItem];
|
|
550
551
|
}
|
|
551
552
|
const picked = await ( (new Promise(resolve => {
|
|
552
|
-
editorPicker.onDidAccept(e => {
|
|
553
|
+
disposables.add(editorPicker.onDidAccept(e => {
|
|
553
554
|
let result = undefined;
|
|
554
555
|
if (editorPicker.selectedItems.length === 1) {
|
|
555
556
|
result = {
|
|
@@ -562,14 +563,17 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
562
563
|
this.updateUserAssociations(`*${extname(resource)}`, result.item.id);
|
|
563
564
|
}
|
|
564
565
|
resolve(result);
|
|
565
|
-
});
|
|
566
|
-
editorPicker.onDidHide(() =>
|
|
567
|
-
|
|
566
|
+
}));
|
|
567
|
+
disposables.add(editorPicker.onDidHide(() => {
|
|
568
|
+
disposables.dispose();
|
|
569
|
+
resolve(undefined);
|
|
570
|
+
}));
|
|
571
|
+
disposables.add(editorPicker.onDidTriggerItemButton(e => {
|
|
568
572
|
resolve({ item: e.item, openInBackground: false });
|
|
569
573
|
if (resource && e.item && e.item.id) {
|
|
570
574
|
this.updateUserAssociations(`*${extname(resource)}`, e.item.id);
|
|
571
575
|
}
|
|
572
|
-
});
|
|
576
|
+
}));
|
|
573
577
|
editorPicker.show();
|
|
574
578
|
})));
|
|
575
579
|
editorPicker.dispose();
|
|
@@ -55,33 +55,33 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
55
55
|
this.activeEditorListeners = this._register(( (new DisposableStore())));
|
|
56
56
|
this.lastActiveEditor = undefined;
|
|
57
57
|
this.editorHelper = this.instantiationService.createInstance(EditorHelper);
|
|
58
|
-
this.canNavigateBackContextKey = (( (new RawContextKey('canNavigateBack', false, ( localize(
|
|
59
|
-
this.canNavigateForwardContextKey = (( (new RawContextKey('canNavigateForward', false, ( localize(
|
|
58
|
+
this.canNavigateBackContextKey = (( (new RawContextKey('canNavigateBack', false, ( localize(4092, "Whether it is possible to navigate back in editor history")))))).bindTo(this.contextKeyService);
|
|
59
|
+
this.canNavigateForwardContextKey = (( (new RawContextKey('canNavigateForward', false, ( localize(4093, "Whether it is possible to navigate forward in editor history")))))).bindTo(this.contextKeyService);
|
|
60
60
|
this.canNavigateBackInNavigationsContextKey = (( (new RawContextKey('canNavigateBackInNavigationLocations', false, ( localize(
|
|
61
|
-
|
|
61
|
+
4094,
|
|
62
62
|
"Whether it is possible to navigate back in editor navigation locations history"
|
|
63
63
|
)))))).bindTo(this.contextKeyService);
|
|
64
64
|
this.canNavigateForwardInNavigationsContextKey = (( (new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localize(
|
|
65
|
-
|
|
65
|
+
4095,
|
|
66
66
|
"Whether it is possible to navigate forward in editor navigation locations history"
|
|
67
67
|
)))))).bindTo(this.contextKeyService);
|
|
68
68
|
this.canNavigateToLastNavigationLocationContextKey = (( (new RawContextKey('canNavigateToLastNavigationLocation', false, ( localize(
|
|
69
|
-
|
|
69
|
+
4096,
|
|
70
70
|
"Whether it is possible to navigate to the last editor navigation location"
|
|
71
71
|
)))))).bindTo(this.contextKeyService);
|
|
72
72
|
this.canNavigateBackInEditsContextKey = (( (new RawContextKey('canNavigateBackInEditLocations', false, ( localize(
|
|
73
|
-
|
|
73
|
+
4097,
|
|
74
74
|
"Whether it is possible to navigate back in editor edit locations history"
|
|
75
75
|
)))))).bindTo(this.contextKeyService);
|
|
76
76
|
this.canNavigateForwardInEditsContextKey = (( (new RawContextKey('canNavigateForwardInEditLocations', false, ( localize(
|
|
77
|
-
|
|
77
|
+
4098,
|
|
78
78
|
"Whether it is possible to navigate forward in editor edit locations history"
|
|
79
79
|
)))))).bindTo(this.contextKeyService);
|
|
80
80
|
this.canNavigateToLastEditLocationContextKey = (( (new RawContextKey('canNavigateToLastEditLocation', false, ( localize(
|
|
81
|
-
|
|
81
|
+
4099,
|
|
82
82
|
"Whether it is possible to navigate to the last editor edit location"
|
|
83
83
|
)))))).bindTo(this.contextKeyService);
|
|
84
|
-
this.canReopenClosedEditorContextKey = (( (new RawContextKey('canReopenClosedEditor', false, ( localize(
|
|
84
|
+
this.canReopenClosedEditorContextKey = (( (new RawContextKey('canReopenClosedEditor', false, ( localize(4100, "Whether it is possible to reopen the last closed editor")))))).bindTo(this.contextKeyService);
|
|
85
85
|
this._onDidChangeEditorNavigationStack = this._register(( (new Emitter())));
|
|
86
86
|
this.onDidChangeEditorNavigationStack = this._onDidChangeEditorNavigationStack.event;
|
|
87
87
|
this.defaultScopedEditorNavigationStack = undefined;
|
|
@@ -47,7 +47,7 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
47
47
|
async withProgress(options, originalTask, onDidCancel) {
|
|
48
48
|
const { location } = options;
|
|
49
49
|
const task = async (progress) => {
|
|
50
|
-
const activeLock = this.userActivityService.markActive();
|
|
50
|
+
const activeLock = this.userActivityService.markActive({ whenHeldFor: 15_000 });
|
|
51
51
|
try {
|
|
52
52
|
return await originalTask(progress);
|
|
53
53
|
}
|
|
@@ -131,23 +131,23 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
131
131
|
let title;
|
|
132
132
|
const source = options.source && typeof options.source !== 'string' ? options.source.label : options.source;
|
|
133
133
|
if (progressTitle && progressMessage) {
|
|
134
|
-
text = ( localize(
|
|
135
|
-
title = source ? ( localize(
|
|
134
|
+
text = ( localize(4101, "{0}: {1}", progressTitle, progressMessage));
|
|
135
|
+
title = source ? ( localize(4102, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
|
|
136
136
|
}
|
|
137
137
|
else if (progressTitle) {
|
|
138
138
|
text = progressTitle;
|
|
139
|
-
title = source ? ( localize(
|
|
139
|
+
title = source ? ( localize(4103, "[{0}]: {1}", source, progressTitle)) : text;
|
|
140
140
|
}
|
|
141
141
|
else if (progressMessage) {
|
|
142
142
|
text = progressMessage;
|
|
143
|
-
title = source ? ( localize(
|
|
143
|
+
title = source ? ( localize(4103, "[{0}]: {1}", source, progressMessage)) : text;
|
|
144
144
|
}
|
|
145
145
|
else {
|
|
146
146
|
this.updateWindowProgress(idx + 1);
|
|
147
147
|
return;
|
|
148
148
|
}
|
|
149
149
|
const statusEntryProperties = {
|
|
150
|
-
name: ( localize(
|
|
150
|
+
name: ( localize(4104, "Progress Message")),
|
|
151
151
|
text,
|
|
152
152
|
showProgress: options.type || true,
|
|
153
153
|
ariaLabel: text,
|
|
@@ -243,7 +243,7 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
243
243
|
if (options.cancellable) {
|
|
244
244
|
const cancelAction = new (class extends Action {
|
|
245
245
|
constructor() {
|
|
246
|
-
super('progress.cancel', ( localize(
|
|
246
|
+
super('progress.cancel', ( localize(4105, "Cancel")), undefined, true);
|
|
247
247
|
}
|
|
248
248
|
async run() {
|
|
249
249
|
progressStateModel.cancel();
|
|
@@ -428,7 +428,7 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
428
428
|
const createDialog = (message) => {
|
|
429
429
|
const buttons = options.buttons || [];
|
|
430
430
|
if (!options.sticky) {
|
|
431
|
-
buttons.push(options.cancellable ? ( localize(
|
|
431
|
+
buttons.push(options.cancellable ? ( localize(4105, "Cancel")) : ( localize(4106, "Dismiss")));
|
|
432
432
|
}
|
|
433
433
|
dialog = ( (new Dialog(this.layoutService.activeContainer, message, buttons, {
|
|
434
434
|
type: 'pending',
|
|
@@ -585,7 +585,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
585
585
|
super({
|
|
586
586
|
id: `${viewDescriptor.id}.removeView`,
|
|
587
587
|
viewPaneContainerId: viewContainerModel.viewContainer.id,
|
|
588
|
-
title: ( localize(
|
|
588
|
+
title: ( localize(4040, "Hide '{0}'", viewDescriptor.name.value)),
|
|
589
589
|
precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyExpr.true() : ( (ContextKeyExpr.false())),
|
|
590
590
|
menu: [{
|
|
591
591
|
id: MenuId.ViewTitleContext,
|
|
@@ -612,7 +612,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
612
612
|
constructor() {
|
|
613
613
|
super({
|
|
614
614
|
id: `${viewContainer.id}.resetViewContainerLocation`,
|
|
615
|
-
title: ( localize2(
|
|
615
|
+
title: ( localize2(4041, "Reset Location")),
|
|
616
616
|
menu: [{
|
|
617
617
|
id: MenuId.ViewContainerTitleContext,
|
|
618
618
|
when: ( (ContextKeyExpr.or( (ContextKeyExpr.and(
|
|
@@ -24,7 +24,7 @@ registerAction2(class extends Action2 {
|
|
|
24
24
|
constructor() {
|
|
25
25
|
super({
|
|
26
26
|
id: '_workbench.output.showViewsLog',
|
|
27
|
-
title: ( localize2(
|
|
27
|
+
title: ( localize2(9531, "Show Views Log")),
|
|
28
28
|
category: Categories.Developer,
|
|
29
29
|
f1: true
|
|
30
30
|
});
|