@codingame/monaco-vscode-view-common-service-override 10.0.1 → 10.1.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 +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/editor/editor.contribution.js +159 -159
- package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +8 -8
- 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/customEditor/common/contributedCustomEditors.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +1 -1
- package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +7 -7
- 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/inputCodeEditorView.js +11 -11
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.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/webview/browser/webviewElement.js +1 -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 +9 -9
- package/vscode/src/vs/workbench/services/history/browser/historyService.js +9 -9
- package/vscode/src/vs/workbench/services/progress/browser/progressService.js +7 -7
- 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/editors/inputCodeEditorView.js
CHANGED
|
@@ -159,8 +159,8 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
|
|
|
159
159
|
}
|
|
160
160
|
this.editor.setModel(this.inputNumber === 1 ? vm.model.input1.textModel : vm.model.input2.textModel);
|
|
161
161
|
const title = this.inputNumber === 1
|
|
162
|
-
? vm.model.input1.title || ( localize(
|
|
163
|
-
: vm.model.input2.title || ( localize(
|
|
162
|
+
? vm.model.input1.title || ( localize(11382, 'Input 1'))
|
|
163
|
+
: vm.model.input2.title || ( localize(11383, 'Input 2'));
|
|
164
164
|
const description = this.inputNumber === 1
|
|
165
165
|
? vm.model.input1.description
|
|
166
166
|
: vm.model.input2.description;
|
|
@@ -242,19 +242,19 @@ class ModifiedBaseRangeGutterItemModel {
|
|
|
242
242
|
const both = state.includesInput1 && state.includesInput2;
|
|
243
243
|
return [
|
|
244
244
|
this.baseRange.input1Diffs.length > 0
|
|
245
|
-
? action('mergeEditor.acceptInput1', ( localize(
|
|
245
|
+
? action('mergeEditor.acceptInput1', ( localize(11384, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
|
|
246
246
|
: undefined,
|
|
247
247
|
this.baseRange.input2Diffs.length > 0
|
|
248
|
-
? action('mergeEditor.acceptInput2', ( localize(
|
|
248
|
+
? action('mergeEditor.acceptInput2', ( localize(11384, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
|
|
249
249
|
: undefined,
|
|
250
250
|
this.baseRange.isConflicting
|
|
251
|
-
? setFields(action('mergeEditor.acceptBoth', ( localize(
|
|
251
|
+
? setFields(action('mergeEditor.acceptBoth', ( localize(11385, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
|
|
252
252
|
: undefined,
|
|
253
253
|
( (new Separator())),
|
|
254
254
|
this.baseRange.isConflicting
|
|
255
|
-
? setFields(action('mergeEditor.swap', ( localize(
|
|
255
|
+
? setFields(action('mergeEditor.swap', ( localize(11386, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
|
|
256
256
|
: undefined,
|
|
257
|
-
setFields(( (new Action('mergeEditor.markAsHandled', ( localize(
|
|
257
|
+
setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11387, 'Mark as Handled')), undefined, true, () => {
|
|
258
258
|
transaction((tx) => {
|
|
259
259
|
this.model.setHandled(this.baseRange, !handled, tx);
|
|
260
260
|
});
|
|
@@ -297,10 +297,10 @@ class MergeConflictGutterItemView extends Disposable {
|
|
|
297
297
|
const item = this.item.read(reader);
|
|
298
298
|
const value = item.toggleState.read(reader);
|
|
299
299
|
const iconMap = {
|
|
300
|
-
[0 ]: { icon: undefined, checked: false, title: ( localize(
|
|
301
|
-
[3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localize(
|
|
302
|
-
[1 ]: { icon: Codicon.check, checked: true, title: ( localize(
|
|
303
|
-
[2 ]: { icon: Codicon.checkAll, checked: true, title: ( localize(
|
|
300
|
+
[0 ]: { icon: undefined, checked: false, title: ( localize(11388, "Accept")) },
|
|
301
|
+
[3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11389, "Accept (result is dirty)")) },
|
|
302
|
+
[1 ]: { icon: Codicon.check, checked: true, title: ( localize(11390, "Undo accept")) },
|
|
303
|
+
[2 ]: { icon: Codicon.checkAll, checked: true, title: ( localize(11391, "Undo accept (currently second)")) },
|
|
304
304
|
};
|
|
305
305
|
const state = iconMap[value];
|
|
306
306
|
checkBox.setIcon(state.icon);
|
|
@@ -122,7 +122,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
|
|
|
122
122
|
if (this.input) {
|
|
123
123
|
return this.input.getName();
|
|
124
124
|
}
|
|
125
|
-
return ( localize(
|
|
125
|
+
return ( localize(9885, "Text Merge Editor"));
|
|
126
126
|
}
|
|
127
127
|
createEditorControl(parent, initialOptions) {
|
|
128
128
|
this.rootHtmlElement = parent;
|
|
@@ -22,11 +22,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
|
|
|
22
22
|
this.keyboardLayoutService = keyboardLayoutService;
|
|
23
23
|
this.statusbarService = statusbarService;
|
|
24
24
|
this.pickerElement = this._register(( (new MutableDisposable())));
|
|
25
|
-
const name = ( localize(
|
|
25
|
+
const name = ( localize(4457, "Keyboard Layout"));
|
|
26
26
|
const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
|
|
27
27
|
if (layout) {
|
|
28
28
|
const layoutInfo = parseKeyboardLayoutDescription(layout);
|
|
29
|
-
const text = ( localize(
|
|
29
|
+
const text = ( localize(4458, "Layout: {0}", layoutInfo.label));
|
|
30
30
|
this.pickerElement.value = this.statusbarService.addEntry({
|
|
31
31
|
name,
|
|
32
32
|
text,
|
|
@@ -38,7 +38,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
|
|
|
38
38
|
const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
|
|
39
39
|
const layoutInfo = parseKeyboardLayoutDescription(layout);
|
|
40
40
|
if (this.pickerElement.value) {
|
|
41
|
-
const text = ( localize(
|
|
41
|
+
const text = ( localize(4458, "Layout: {0}", layoutInfo.label));
|
|
42
42
|
this.pickerElement.value.update({
|
|
43
43
|
name,
|
|
44
44
|
text,
|
|
@@ -47,7 +47,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
|
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
|
-
const text = ( localize(
|
|
50
|
+
const text = ( localize(4458, "Layout: {0}", layoutInfo.label));
|
|
51
51
|
this.pickerElement.value = this.statusbarService.addEntry({
|
|
52
52
|
name,
|
|
53
53
|
text,
|
|
@@ -65,11 +65,11 @@ KeyboardLayoutPickerContribution = ( (__decorate([
|
|
|
65
65
|
registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, 1 );
|
|
66
66
|
const DEFAULT_CONTENT = [
|
|
67
67
|
`// ${( localize(
|
|
68
|
-
|
|
68
|
+
4459,
|
|
69
69
|
'Defines the keyboard layout used in VS Code in the browser environment.'
|
|
70
70
|
))}`,
|
|
71
71
|
`// ${( localize(
|
|
72
|
-
|
|
72
|
+
4460,
|
|
73
73
|
'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
|
|
74
74
|
))}`,
|
|
75
75
|
``,
|
|
@@ -80,7 +80,7 @@ registerAction2(class extends Action2 {
|
|
|
80
80
|
constructor() {
|
|
81
81
|
super({
|
|
82
82
|
id: KEYBOARD_LAYOUT_OPEN_PICKER,
|
|
83
|
-
title: ( localize2(
|
|
83
|
+
title: ( localize2(4461, "Change Keyboard Layout")),
|
|
84
84
|
f1: true
|
|
85
85
|
});
|
|
86
86
|
}
|
|
@@ -110,17 +110,17 @@ registerAction2(class extends Action2 {
|
|
|
110
110
|
});
|
|
111
111
|
if (picks.length > 0) {
|
|
112
112
|
const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
|
|
113
|
-
picks.unshift({ type: 'separator', label: ( localize(
|
|
113
|
+
picks.unshift({ type: 'separator', label: ( localize(4462, "Keyboard Layouts ({0})", platform)) });
|
|
114
114
|
}
|
|
115
|
-
const configureKeyboardLayout = { label: ( localize(
|
|
115
|
+
const configureKeyboardLayout = { label: ( localize(4463, "Configure Keyboard Layout")) };
|
|
116
116
|
picks.unshift(configureKeyboardLayout);
|
|
117
117
|
const autoDetectMode = {
|
|
118
|
-
label: ( localize(
|
|
118
|
+
label: ( localize(4464, "Auto Detect")),
|
|
119
119
|
description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
|
|
120
120
|
picked: isAutoDetect ? true : undefined
|
|
121
121
|
};
|
|
122
122
|
picks.unshift(autoDetectMode);
|
|
123
|
-
const pick = await quickInputService.pick(picks, { placeHolder: ( localize(
|
|
123
|
+
const pick = await quickInputService.pick(picks, { placeHolder: ( localize(4465, "Select Keyboard Layout")), matchOnDescription: true });
|
|
124
124
|
if (!pick) {
|
|
125
125
|
return;
|
|
126
126
|
}
|
|
@@ -143,7 +143,7 @@ registerAction2(class extends Action2 {
|
|
|
143
143
|
});
|
|
144
144
|
}, (error) => {
|
|
145
145
|
throw ( (new Error(
|
|
146
|
-
localize(
|
|
146
|
+
localize(4466, "Unable to create '{0}' ({1}).", ( (file.toString())), error)
|
|
147
147
|
)));
|
|
148
148
|
});
|
|
149
149
|
return Promise.resolve();
|
|
@@ -18,7 +18,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
|
|
|
18
18
|
minimum: 1,
|
|
19
19
|
maximum: 20,
|
|
20
20
|
description: ( localize(
|
|
21
|
-
|
|
21
|
+
4445,
|
|
22
22
|
"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."
|
|
23
23
|
))
|
|
24
24
|
},
|
|
@@ -28,7 +28,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
|
|
|
28
28
|
minimum: 0,
|
|
29
29
|
maximum: 2000,
|
|
30
30
|
description: ( localize(
|
|
31
|
-
|
|
31
|
+
4446,
|
|
32
32
|
"Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
|
|
33
33
|
))
|
|
34
34
|
},
|
|
@@ -18,12 +18,12 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
|
|
|
18
18
|
import { TypeHierarchyProviderRegistry, TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
|
|
19
19
|
|
|
20
20
|
var TypeHierarchyController_1;
|
|
21
|
-
const _ctxHasTypeHierarchyProvider = ( (new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(
|
|
22
|
-
const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localize(
|
|
21
|
+
const _ctxHasTypeHierarchyProvider = ( (new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(4239, 'Whether a type hierarchy provider is available')))));
|
|
22
|
+
const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localize(4240, 'Whether type hierarchy peek is currently showing')))));
|
|
23
23
|
const _ctxTypeHierarchyDirection = ( (new RawContextKey(
|
|
24
24
|
'typeHierarchyDirection',
|
|
25
25
|
undefined,
|
|
26
|
-
{ type: 'string', description: ( localize(
|
|
26
|
+
{ type: 'string', description: ( localize(4241, 'whether type hierarchy shows super types or subtypes')) }
|
|
27
27
|
)));
|
|
28
28
|
function sanitizedDirection(candidate) {
|
|
29
29
|
return candidate === "subtypes" || candidate === "supertypes"
|
|
@@ -92,14 +92,14 @@ let TypeHierarchyController = class TypeHierarchyController {
|
|
|
92
92
|
this._widget.showModel(model);
|
|
93
93
|
}
|
|
94
94
|
else {
|
|
95
|
-
this._widget.showMessage(( localize(
|
|
95
|
+
this._widget.showMessage(( localize(4242, "No results")));
|
|
96
96
|
}
|
|
97
97
|
}).catch(err => {
|
|
98
98
|
if (isCancellationError(err)) {
|
|
99
99
|
this.endTypeHierarchy();
|
|
100
100
|
return;
|
|
101
101
|
}
|
|
102
|
-
this._widget.showMessage(( localize(
|
|
102
|
+
this._widget.showMessage(( localize(4243, "Failed to show type hierarchy")));
|
|
103
103
|
});
|
|
104
104
|
}
|
|
105
105
|
async startTypeHierarchyFromTypeHierarchy() {
|
|
@@ -144,7 +144,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
|
|
|
144
144
|
constructor() {
|
|
145
145
|
super({
|
|
146
146
|
id: 'editor.showTypeHierarchy',
|
|
147
|
-
title: ( localize2(
|
|
147
|
+
title: ( localize2(4244, 'Peek Type Hierarchy')),
|
|
148
148
|
menu: {
|
|
149
149
|
id: MenuId.EditorContextPeek,
|
|
150
150
|
group: 'navigation',
|
|
@@ -163,7 +163,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
163
163
|
constructor() {
|
|
164
164
|
super({
|
|
165
165
|
id: 'editor.showSupertypes',
|
|
166
|
-
title: ( localize2(
|
|
166
|
+
title: ( localize2(4245, 'Show Supertypes')),
|
|
167
167
|
icon: Codicon.typeHierarchySuper,
|
|
168
168
|
precondition: ( (ContextKeyExpr.and(
|
|
169
169
|
_ctxTypeHierarchyVisible,
|
|
@@ -188,7 +188,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
188
188
|
constructor() {
|
|
189
189
|
super({
|
|
190
190
|
id: 'editor.showSubtypes',
|
|
191
|
-
title: ( localize2(
|
|
191
|
+
title: ( localize2(4246, 'Show Subtypes')),
|
|
192
192
|
icon: Codicon.typeHierarchySub,
|
|
193
193
|
precondition: ( (ContextKeyExpr.and(
|
|
194
194
|
_ctxTypeHierarchyVisible,
|
|
@@ -213,7 +213,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
213
213
|
constructor() {
|
|
214
214
|
super({
|
|
215
215
|
id: 'editor.refocusTypeHierarchy',
|
|
216
|
-
title: ( localize2(
|
|
216
|
+
title: ( localize2(4247, 'Refocus Type Hierarchy')),
|
|
217
217
|
precondition: _ctxTypeHierarchyVisible,
|
|
218
218
|
keybinding: {
|
|
219
219
|
weight: 200 ,
|
|
@@ -229,7 +229,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
229
229
|
constructor() {
|
|
230
230
|
super({
|
|
231
231
|
id: 'editor.closeTypeHierarchy',
|
|
232
|
-
title: ( localize(
|
|
232
|
+
title: ( localize(4248, 'Close')),
|
|
233
233
|
icon: Codicon.close,
|
|
234
234
|
precondition: _ctxTypeHierarchyVisible,
|
|
235
235
|
keybinding: {
|
|
@@ -252,13 +252,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
252
252
|
}
|
|
253
253
|
this._previewDisposable.add(value);
|
|
254
254
|
const title = this._direction === "supertypes"
|
|
255
|
-
? ( localize(
|
|
256
|
-
: ( localize(
|
|
255
|
+
? ( localize(9632, "Supertypes of '{0}'", element.model.root.name))
|
|
256
|
+
: ( localize(9633, "Subtypes of '{0}'", element.model.root.name));
|
|
257
257
|
this.setTitle(title);
|
|
258
258
|
}
|
|
259
259
|
showLoading() {
|
|
260
260
|
this._parent.dataset['state'] = "loading" ;
|
|
261
|
-
this.setTitle(( localize(
|
|
261
|
+
this.setTitle(( localize(9634, "Loading...")));
|
|
262
262
|
this._show();
|
|
263
263
|
}
|
|
264
264
|
showMessage(message) {
|
|
@@ -277,8 +277,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
277
277
|
await this._tree.expand(root.element);
|
|
278
278
|
if (root.children.length === 0) {
|
|
279
279
|
this.showMessage(this._direction === "supertypes"
|
|
280
|
-
? ( localize(
|
|
281
|
-
: ( localize(
|
|
280
|
+
? ( localize(9635, "No supertypes of '{0}'", model.root.name))
|
|
281
|
+
: ( localize(9636, "No subtypes of '{0}'", model.root.name)));
|
|
282
282
|
}
|
|
283
283
|
else {
|
|
284
284
|
this._parent.dataset['state'] = "data" ;
|
|
@@ -157,7 +157,7 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
157
157
|
this._hasFindResult.fire(didFind);
|
|
158
158
|
}));
|
|
159
159
|
this._register(this.on('fatal-error', (e) => {
|
|
160
|
-
notificationService.error(( localize(
|
|
160
|
+
notificationService.error(( localize(9619, "Error loading webview: {0}", e.message)));
|
|
161
161
|
this._onFatalError.fire({ message: e.message });
|
|
162
162
|
}));
|
|
163
163
|
this._register(this.on('did-keydown', (data) => {
|
|
@@ -15,7 +15,7 @@ const webviewActiveContextKeyExpr = ( (ContextKeyExpr.and(
|
|
|
15
15
|
)));
|
|
16
16
|
class ShowWebViewEditorFindWidgetAction extends Action2 {
|
|
17
17
|
static { this.ID = 'editor.action.webvieweditor.showFind'; }
|
|
18
|
-
static { this.LABEL = ( localize(
|
|
18
|
+
static { this.LABEL = ( localize(9845, "Show find")); }
|
|
19
19
|
constructor() {
|
|
20
20
|
super({
|
|
21
21
|
id: ShowWebViewEditorFindWidgetAction.ID,
|
|
@@ -36,7 +36,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
|
|
|
36
36
|
}
|
|
37
37
|
class HideWebViewEditorFindCommand extends Action2 {
|
|
38
38
|
static { this.ID = 'editor.action.webvieweditor.hideFind'; }
|
|
39
|
-
static { this.LABEL = ( localize(
|
|
39
|
+
static { this.LABEL = ( localize(9846, "Stop find")); }
|
|
40
40
|
constructor() {
|
|
41
41
|
super({
|
|
42
42
|
id: HideWebViewEditorFindCommand.ID,
|
|
@@ -57,7 +57,7 @@ class HideWebViewEditorFindCommand extends Action2 {
|
|
|
57
57
|
}
|
|
58
58
|
class WebViewEditorFindNextCommand extends Action2 {
|
|
59
59
|
static { this.ID = 'editor.action.webvieweditor.findNext'; }
|
|
60
|
-
static { this.LABEL = ( localize(
|
|
60
|
+
static { this.LABEL = ( localize(9847, 'Find next')); }
|
|
61
61
|
constructor() {
|
|
62
62
|
super({
|
|
63
63
|
id: WebViewEditorFindNextCommand.ID,
|
|
@@ -78,7 +78,7 @@ class WebViewEditorFindNextCommand extends Action2 {
|
|
|
78
78
|
}
|
|
79
79
|
class WebViewEditorFindPreviousCommand extends Action2 {
|
|
80
80
|
static { this.ID = 'editor.action.webvieweditor.findPrevious'; }
|
|
81
|
-
static { this.LABEL = ( localize(
|
|
81
|
+
static { this.LABEL = ( localize(9848, 'Find previous')); }
|
|
82
82
|
constructor() {
|
|
83
83
|
super({
|
|
84
84
|
id: WebViewEditorFindPreviousCommand.ID,
|
|
@@ -99,7 +99,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
|
|
|
99
99
|
}
|
|
100
100
|
class ReloadWebviewAction extends Action2 {
|
|
101
101
|
static { this.ID = 'workbench.action.webview.reloadWebviewAction'; }
|
|
102
|
-
static { this.LABEL = ( localize2(
|
|
102
|
+
static { this.LABEL = ( localize2(9849, "Reload Webviews")); }
|
|
103
103
|
constructor() {
|
|
104
104
|
super({
|
|
105
105
|
id: ReloadWebviewAction.ID,
|
|
@@ -16,7 +16,7 @@ import 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbench
|
|
|
16
16
|
import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
17
17
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
18
18
|
|
|
19
|
-
(( (Registry.as(EditorExtensions.EditorPane)))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(
|
|
19
|
+
(( (Registry.as(EditorExtensions.EditorPane)))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(4430, "webview editor"))), [( (new SyncDescriptor(WebviewInput)))]);
|
|
20
20
|
let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {
|
|
21
21
|
static { this.ID = 'workbench.contrib.webviewPanel'; }
|
|
22
22
|
constructor(editorService, editorGroupService) {
|
|
@@ -448,8 +448,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
448
448
|
if (storedChoices[globForResource] && storedChoices[globForResource].find(editorID => editorID === currentEditor.editorId)) {
|
|
449
449
|
return;
|
|
450
450
|
}
|
|
451
|
-
const handle = this.notificationService.prompt(Severity$1.Warning, ( localize(
|
|
452
|
-
label: ( localize(
|
|
451
|
+
const handle = this.notificationService.prompt(Severity$1.Warning, ( localize(4152, 'There are multiple default editors available for the resource.')), [{
|
|
452
|
+
label: ( localize(4153, 'Configure Default')),
|
|
453
453
|
run: async () => {
|
|
454
454
|
const picked = await this.doPickEditor(untypedInput, true);
|
|
455
455
|
if (!picked) {
|
|
@@ -470,7 +470,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
470
470
|
}
|
|
471
471
|
},
|
|
472
472
|
{
|
|
473
|
-
label: ( localize(
|
|
473
|
+
label: ( localize(4154, 'Keep {0}', editorName)),
|
|
474
474
|
run: writeCurrentEditorsToStorage
|
|
475
475
|
}
|
|
476
476
|
]);
|
|
@@ -496,9 +496,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
496
496
|
}
|
|
497
497
|
});
|
|
498
498
|
const quickPickEntries = [];
|
|
499
|
-
const currentlyActiveLabel = ( localize(
|
|
500
|
-
const currentDefaultLabel = ( localize(
|
|
501
|
-
const currentDefaultAndActiveLabel = ( localize(
|
|
499
|
+
const currentlyActiveLabel = ( localize(4155, "Active"));
|
|
500
|
+
const currentDefaultLabel = ( localize(4156, "Default"));
|
|
501
|
+
const currentDefaultAndActiveLabel = ( localize(4157, "Active and Default"));
|
|
502
502
|
let defaultViewType = defaultSetting;
|
|
503
503
|
if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
|
|
504
504
|
defaultViewType = registeredEditors[1]?.editorInfo.id;
|
|
@@ -523,7 +523,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
523
523
|
quickPickEntries.push(separator);
|
|
524
524
|
const configureDefaultEntry = {
|
|
525
525
|
id: EditorResolverService_1.configureDefaultID,
|
|
526
|
-
label: ( localize(
|
|
526
|
+
label: ( localize(4158, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
|
|
527
527
|
};
|
|
528
528
|
quickPickEntries.push(configureDefaultEntry);
|
|
529
529
|
}
|
|
@@ -538,8 +538,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
538
538
|
const disposables = ( (new DisposableStore()));
|
|
539
539
|
const editorPicker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
|
|
540
540
|
const placeHolderMessage = showDefaultPicker ?
|
|
541
|
-
( localize(
|
|
542
|
-
( localize(
|
|
541
|
+
( localize(4159, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
|
|
542
|
+
( localize(4160, "Select editor for '{0}'", basename(resource)));
|
|
543
543
|
editorPicker.placeholder = placeHolderMessage;
|
|
544
544
|
editorPicker.canAcceptInBackground = true;
|
|
545
545
|
editorPicker.items = editorPicks;
|
|
@@ -52,33 +52,33 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
52
52
|
this.activeEditorListeners = this._register(( (new DisposableStore())));
|
|
53
53
|
this.lastActiveEditor = undefined;
|
|
54
54
|
this.editorHelper = this.instantiationService.createInstance(EditorHelper);
|
|
55
|
-
this.canNavigateBackContextKey = (( (new RawContextKey('canNavigateBack', false, ( localize(
|
|
56
|
-
this.canNavigateForwardContextKey = (( (new RawContextKey('canNavigateForward', false, ( localize(
|
|
55
|
+
this.canNavigateBackContextKey = (( (new RawContextKey('canNavigateBack', false, ( localize(4202, "Whether it is possible to navigate back in editor history")))))).bindTo(this.contextKeyService);
|
|
56
|
+
this.canNavigateForwardContextKey = (( (new RawContextKey('canNavigateForward', false, ( localize(4203, "Whether it is possible to navigate forward in editor history")))))).bindTo(this.contextKeyService);
|
|
57
57
|
this.canNavigateBackInNavigationsContextKey = (( (new RawContextKey('canNavigateBackInNavigationLocations', false, ( localize(
|
|
58
|
-
|
|
58
|
+
4204,
|
|
59
59
|
"Whether it is possible to navigate back in editor navigation locations history"
|
|
60
60
|
)))))).bindTo(this.contextKeyService);
|
|
61
61
|
this.canNavigateForwardInNavigationsContextKey = (( (new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localize(
|
|
62
|
-
|
|
62
|
+
4205,
|
|
63
63
|
"Whether it is possible to navigate forward in editor navigation locations history"
|
|
64
64
|
)))))).bindTo(this.contextKeyService);
|
|
65
65
|
this.canNavigateToLastNavigationLocationContextKey = (( (new RawContextKey('canNavigateToLastNavigationLocation', false, ( localize(
|
|
66
|
-
|
|
66
|
+
4206,
|
|
67
67
|
"Whether it is possible to navigate to the last editor navigation location"
|
|
68
68
|
)))))).bindTo(this.contextKeyService);
|
|
69
69
|
this.canNavigateBackInEditsContextKey = (( (new RawContextKey('canNavigateBackInEditLocations', false, ( localize(
|
|
70
|
-
|
|
70
|
+
4207,
|
|
71
71
|
"Whether it is possible to navigate back in editor edit locations history"
|
|
72
72
|
)))))).bindTo(this.contextKeyService);
|
|
73
73
|
this.canNavigateForwardInEditsContextKey = (( (new RawContextKey('canNavigateForwardInEditLocations', false, ( localize(
|
|
74
|
-
|
|
74
|
+
4208,
|
|
75
75
|
"Whether it is possible to navigate forward in editor edit locations history"
|
|
76
76
|
)))))).bindTo(this.contextKeyService);
|
|
77
77
|
this.canNavigateToLastEditLocationContextKey = (( (new RawContextKey('canNavigateToLastEditLocation', false, ( localize(
|
|
78
|
-
|
|
78
|
+
4209,
|
|
79
79
|
"Whether it is possible to navigate to the last editor edit location"
|
|
80
80
|
)))))).bindTo(this.contextKeyService);
|
|
81
|
-
this.canReopenClosedEditorContextKey = (( (new RawContextKey('canReopenClosedEditor', false, ( localize(
|
|
81
|
+
this.canReopenClosedEditorContextKey = (( (new RawContextKey('canReopenClosedEditor', false, ( localize(4210, "Whether it is possible to reopen the last closed editor")))))).bindTo(this.contextKeyService);
|
|
82
82
|
this._onDidChangeEditorNavigationStack = this._register(( (new Emitter())));
|
|
83
83
|
this.onDidChangeEditorNavigationStack = this._onDidChangeEditorNavigationStack.event;
|
|
84
84
|
this.defaultScopedEditorNavigationStack = undefined;
|
|
@@ -127,23 +127,23 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
127
127
|
let title;
|
|
128
128
|
const source = options.source && typeof options.source !== 'string' ? options.source.label : options.source;
|
|
129
129
|
if (progressTitle && progressMessage) {
|
|
130
|
-
text = ( localize(
|
|
131
|
-
title = source ? ( localize(
|
|
130
|
+
text = ( localize(4211, "{0}: {1}", progressTitle, progressMessage));
|
|
131
|
+
title = source ? ( localize(4212, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
|
|
132
132
|
}
|
|
133
133
|
else if (progressTitle) {
|
|
134
134
|
text = progressTitle;
|
|
135
|
-
title = source ? ( localize(
|
|
135
|
+
title = source ? ( localize(4213, "[{0}]: {1}", source, progressTitle)) : text;
|
|
136
136
|
}
|
|
137
137
|
else if (progressMessage) {
|
|
138
138
|
text = progressMessage;
|
|
139
|
-
title = source ? ( localize(
|
|
139
|
+
title = source ? ( localize(4213, "[{0}]: {1}", source, progressMessage)) : text;
|
|
140
140
|
}
|
|
141
141
|
else {
|
|
142
142
|
this.updateWindowProgress(idx + 1);
|
|
143
143
|
return;
|
|
144
144
|
}
|
|
145
145
|
const statusEntryProperties = {
|
|
146
|
-
name: ( localize(
|
|
146
|
+
name: ( localize(4214, "Progress Message")),
|
|
147
147
|
text,
|
|
148
148
|
showProgress: options.type || true,
|
|
149
149
|
ariaLabel: text,
|
|
@@ -239,7 +239,7 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
239
239
|
if (options.cancellable) {
|
|
240
240
|
const cancelAction = new (class extends Action {
|
|
241
241
|
constructor() {
|
|
242
|
-
super('progress.cancel', ( localize(
|
|
242
|
+
super('progress.cancel', ( localize(4215, "Cancel")), undefined, true);
|
|
243
243
|
}
|
|
244
244
|
async run() {
|
|
245
245
|
progressStateModel.cancel();
|
|
@@ -424,7 +424,7 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
424
424
|
const createDialog = (message) => {
|
|
425
425
|
const buttons = options.buttons || [];
|
|
426
426
|
if (!options.sticky) {
|
|
427
|
-
buttons.push(options.cancellable ? ( localize(
|
|
427
|
+
buttons.push(options.cancellable ? ( localize(4215, "Cancel")) : ( localize(4216, "Dismiss")));
|
|
428
428
|
}
|
|
429
429
|
dialog = ( (new Dialog(this.layoutService.activeContainer, message, buttons, {
|
|
430
430
|
type: 'pending',
|
|
@@ -583,7 +583,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
583
583
|
super({
|
|
584
584
|
id: `${viewDescriptor.id}.removeView`,
|
|
585
585
|
viewPaneContainerId: viewContainerModel.viewContainer.id,
|
|
586
|
-
title: ( localize(
|
|
586
|
+
title: ( localize(4150, "Hide '{0}'", viewDescriptor.name.value)),
|
|
587
587
|
precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyExpr.true() : ( (ContextKeyExpr.false())),
|
|
588
588
|
menu: [{
|
|
589
589
|
id: MenuId.ViewTitleContext,
|
|
@@ -610,7 +610,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
610
610
|
constructor() {
|
|
611
611
|
super({
|
|
612
612
|
id: `${viewContainer.id}.resetViewContainerLocation`,
|
|
613
|
-
title: ( localize2(
|
|
613
|
+
title: ( localize2(4151, "Reset Location")),
|
|
614
614
|
menu: [{
|
|
615
615
|
id: MenuId.ViewContainerTitleContext,
|
|
616
616
|
when: ( (ContextKeyExpr.or( (ContextKeyExpr.and(
|
|
@@ -23,7 +23,7 @@ registerAction2(class extends Action2 {
|
|
|
23
23
|
constructor() {
|
|
24
24
|
super({
|
|
25
25
|
id: '_workbench.output.showViewsLog',
|
|
26
|
-
title: ( localize2(
|
|
26
|
+
title: ( localize2(9613, "Show Views Log")),
|
|
27
27
|
category: Categories.Developer,
|
|
28
28
|
f1: true
|
|
29
29
|
});
|