@codingame/monaco-vscode-view-common-service-override 4.5.0 → 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/index.d.ts +1 -1
- 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
- package/viewCommon.d.ts +0 -5
|
@@ -18,25 +18,14 @@ 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
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
))));
|
|
26
|
-
const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localizeWithPath(
|
|
27
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
28
|
-
'typeHierarchyVisible',
|
|
29
|
-
'Whether type hierarchy peek is currently showing'
|
|
30
|
-
))));
|
|
31
|
-
const _ctxTypeHierarchyDirection = ( new RawContextKey(
|
|
21
|
+
const _moduleId = "vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution";
|
|
22
|
+
const _ctxHasTypeHierarchyProvider = ( (new RawContextKey('editorHasTypeHierarchyProvider', false, ( localizeWithPath(_moduleId, 0, 'Whether a type hierarchy provider is available')))));
|
|
23
|
+
const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localizeWithPath(_moduleId, 1, 'Whether type hierarchy peek is currently showing')))));
|
|
24
|
+
const _ctxTypeHierarchyDirection = ( (new RawContextKey(
|
|
32
25
|
'typeHierarchyDirection',
|
|
33
26
|
undefined,
|
|
34
|
-
{ type: 'string', description: ( localizeWithPath(
|
|
35
|
-
|
|
36
|
-
'typeHierarchyDirection',
|
|
37
|
-
'whether type hierarchy shows super types or subtypes'
|
|
38
|
-
)) }
|
|
39
|
-
));
|
|
27
|
+
{ type: 'string', description: ( localizeWithPath(_moduleId, 2, 'whether type hierarchy shows super types or subtypes')) }
|
|
28
|
+
)));
|
|
40
29
|
function sanitizedDirection(candidate) {
|
|
41
30
|
return candidate === "subtypes" || candidate === "supertypes"
|
|
42
31
|
? candidate
|
|
@@ -55,13 +44,13 @@ let TypeHierarchyController = class TypeHierarchyController {
|
|
|
55
44
|
this._storageService = _storageService;
|
|
56
45
|
this._editorService = _editorService;
|
|
57
46
|
this._instantiationService = _instantiationService;
|
|
58
|
-
this._disposables = ( new DisposableStore());
|
|
59
|
-
this._sessionDisposables = ( new DisposableStore());
|
|
47
|
+
this._disposables = ( (new DisposableStore()));
|
|
48
|
+
this._sessionDisposables = ( (new DisposableStore()));
|
|
60
49
|
this._ctxHasProvider = _ctxHasTypeHierarchyProvider.bindTo(this._contextKeyService);
|
|
61
50
|
this._ctxIsVisible = _ctxTypeHierarchyVisible.bindTo(this._contextKeyService);
|
|
62
51
|
this._ctxDirection = _ctxTypeHierarchyDirection.bindTo(this._contextKeyService);
|
|
63
52
|
this._disposables.add(Event.any(_editor.onDidChangeModel, _editor.onDidChangeModelLanguage, TypeHierarchyProviderRegistry.onDidChange)(() => {
|
|
64
|
-
this._ctxHasProvider.set(_editor.hasModel() && ( TypeHierarchyProviderRegistry.has(_editor.getModel())));
|
|
53
|
+
this._ctxHasProvider.set(_editor.hasModel() && ( (TypeHierarchyProviderRegistry.has(_editor.getModel()))));
|
|
65
54
|
}));
|
|
66
55
|
this._disposables.add(this._sessionDisposables);
|
|
67
56
|
}
|
|
@@ -75,10 +64,10 @@ let TypeHierarchyController = class TypeHierarchyController {
|
|
|
75
64
|
}
|
|
76
65
|
const document = this._editor.getModel();
|
|
77
66
|
const position = this._editor.getPosition();
|
|
78
|
-
if (!( TypeHierarchyProviderRegistry.has(document))) {
|
|
67
|
+
if (!( (TypeHierarchyProviderRegistry.has(document)))) {
|
|
79
68
|
return;
|
|
80
69
|
}
|
|
81
|
-
const cts = ( new CancellationTokenSource());
|
|
70
|
+
const cts = ( (new CancellationTokenSource()));
|
|
82
71
|
const model = TypeHierarchyModel.create(document, position, cts.token);
|
|
83
72
|
const direction = sanitizedDirection(this._storageService.get(TypeHierarchyController_1._storageDirectionKey, 0 , "subtypes" ));
|
|
84
73
|
this._showTypeHierarchyWidget(position, direction, model, cts);
|
|
@@ -104,22 +93,14 @@ let TypeHierarchyController = class TypeHierarchyController {
|
|
|
104
93
|
this._widget.showModel(model);
|
|
105
94
|
}
|
|
106
95
|
else {
|
|
107
|
-
this._widget.showMessage(( localizeWithPath(
|
|
108
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
109
|
-
'no.item',
|
|
110
|
-
"No results"
|
|
111
|
-
)));
|
|
96
|
+
this._widget.showMessage(( localizeWithPath(_moduleId, 3, "No results")));
|
|
112
97
|
}
|
|
113
98
|
}).catch(err => {
|
|
114
99
|
if (isCancellationError(err)) {
|
|
115
100
|
this.endTypeHierarchy();
|
|
116
101
|
return;
|
|
117
102
|
}
|
|
118
|
-
this._widget.showMessage(( localizeWithPath(
|
|
119
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
120
|
-
'error',
|
|
121
|
-
"Failed to show type hierarchy"
|
|
122
|
-
)));
|
|
103
|
+
this._widget.showMessage(( localizeWithPath(_moduleId, 4, "Failed to show type hierarchy")));
|
|
123
104
|
});
|
|
124
105
|
}
|
|
125
106
|
async startTypeHierarchyFromTypeHierarchy() {
|
|
@@ -137,7 +118,7 @@ let TypeHierarchyController = class TypeHierarchyController {
|
|
|
137
118
|
}
|
|
138
119
|
const newModel = model.fork(typeItem.item);
|
|
139
120
|
this._sessionDisposables.clear();
|
|
140
|
-
TypeHierarchyController_1.get(newEditor)?._showTypeHierarchyWidget(Range.lift(newModel.root.selectionRange).getStartPosition(), this._widget.direction, Promise.resolve(newModel), ( new CancellationTokenSource()));
|
|
121
|
+
TypeHierarchyController_1.get(newEditor)?._showTypeHierarchyWidget(Range.lift(newModel.root.selectionRange).getStartPosition(), this._widget.direction, Promise.resolve(newModel), ( (new CancellationTokenSource())));
|
|
141
122
|
}
|
|
142
123
|
showSupertypes() {
|
|
143
124
|
this._widget?.updateDirection("supertypes" );
|
|
@@ -153,29 +134,25 @@ let TypeHierarchyController = class TypeHierarchyController {
|
|
|
153
134
|
this._editor.focus();
|
|
154
135
|
}
|
|
155
136
|
};
|
|
156
|
-
TypeHierarchyController = TypeHierarchyController_1 = ( __decorate([
|
|
157
|
-
( __param(1, IContextKeyService)),
|
|
158
|
-
( __param(2, IStorageService)),
|
|
159
|
-
( __param(3, ICodeEditorService)),
|
|
160
|
-
( __param(4, IInstantiationService))
|
|
161
|
-
], TypeHierarchyController));
|
|
137
|
+
TypeHierarchyController = TypeHierarchyController_1 = ( (__decorate([
|
|
138
|
+
( (__param(1, IContextKeyService))),
|
|
139
|
+
( (__param(2, IStorageService))),
|
|
140
|
+
( (__param(3, ICodeEditorService))),
|
|
141
|
+
( (__param(4, IInstantiationService)))
|
|
142
|
+
], TypeHierarchyController)));
|
|
162
143
|
registerEditorContribution(TypeHierarchyController.Id, TypeHierarchyController, 0 );
|
|
163
144
|
registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
|
|
164
145
|
constructor() {
|
|
165
146
|
super({
|
|
166
147
|
id: 'editor.showTypeHierarchy',
|
|
167
|
-
title: ( localize2WithPath(
|
|
168
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
169
|
-
'title',
|
|
170
|
-
'Peek Type Hierarchy'
|
|
171
|
-
)),
|
|
148
|
+
title: ( localize2WithPath(_moduleId, 5, 'Peek Type Hierarchy')),
|
|
172
149
|
menu: {
|
|
173
150
|
id: MenuId.EditorContextPeek,
|
|
174
151
|
group: 'navigation',
|
|
175
152
|
order: 1000,
|
|
176
|
-
when: ( ContextKeyExpr.and(_ctxHasTypeHierarchyProvider, PeekContext.notInPeekEditor)),
|
|
153
|
+
when: ( (ContextKeyExpr.and(_ctxHasTypeHierarchyProvider, PeekContext.notInPeekEditor))),
|
|
177
154
|
},
|
|
178
|
-
precondition: ( ContextKeyExpr.and(_ctxHasTypeHierarchyProvider, PeekContext.notInPeekEditor)),
|
|
155
|
+
precondition: ( (ContextKeyExpr.and(_ctxHasTypeHierarchyProvider, PeekContext.notInPeekEditor))),
|
|
179
156
|
f1: true
|
|
180
157
|
});
|
|
181
158
|
}
|
|
@@ -187,20 +164,19 @@ registerAction2(class extends EditorAction2 {
|
|
|
187
164
|
constructor() {
|
|
188
165
|
super({
|
|
189
166
|
id: 'editor.showSupertypes',
|
|
190
|
-
title: ( localize2WithPath(
|
|
191
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
192
|
-
'title.supertypes',
|
|
193
|
-
'Show Supertypes'
|
|
194
|
-
)),
|
|
167
|
+
title: ( localize2WithPath(_moduleId, 6, 'Show Supertypes')),
|
|
195
168
|
icon: Codicon.typeHierarchySuper,
|
|
196
|
-
precondition: ( ContextKeyExpr.and(
|
|
169
|
+
precondition: ( (ContextKeyExpr.and(
|
|
170
|
+
_ctxTypeHierarchyVisible,
|
|
171
|
+
(_ctxTypeHierarchyDirection.isEqualTo("subtypes" ))
|
|
172
|
+
))),
|
|
197
173
|
keybinding: {
|
|
198
174
|
weight: 200 ,
|
|
199
175
|
primary: 1024 + 512 + 38 ,
|
|
200
176
|
},
|
|
201
177
|
menu: {
|
|
202
178
|
id: TypeHierarchyTreePeekWidget.TitleMenu,
|
|
203
|
-
when: ( _ctxTypeHierarchyDirection.isEqualTo("subtypes" )),
|
|
179
|
+
when: ( (_ctxTypeHierarchyDirection.isEqualTo("subtypes" ))),
|
|
204
180
|
order: 1,
|
|
205
181
|
}
|
|
206
182
|
});
|
|
@@ -213,20 +189,19 @@ registerAction2(class extends EditorAction2 {
|
|
|
213
189
|
constructor() {
|
|
214
190
|
super({
|
|
215
191
|
id: 'editor.showSubtypes',
|
|
216
|
-
title: ( localize2WithPath(
|
|
217
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
218
|
-
'title.subtypes',
|
|
219
|
-
'Show Subtypes'
|
|
220
|
-
)),
|
|
192
|
+
title: ( localize2WithPath(_moduleId, 7, 'Show Subtypes')),
|
|
221
193
|
icon: Codicon.typeHierarchySub,
|
|
222
|
-
precondition: ( ContextKeyExpr.and(
|
|
194
|
+
precondition: ( (ContextKeyExpr.and(
|
|
195
|
+
_ctxTypeHierarchyVisible,
|
|
196
|
+
(_ctxTypeHierarchyDirection.isEqualTo("supertypes" ))
|
|
197
|
+
))),
|
|
223
198
|
keybinding: {
|
|
224
199
|
weight: 200 ,
|
|
225
200
|
primary: 1024 + 512 + 38 ,
|
|
226
201
|
},
|
|
227
202
|
menu: {
|
|
228
203
|
id: TypeHierarchyTreePeekWidget.TitleMenu,
|
|
229
|
-
when: ( _ctxTypeHierarchyDirection.isEqualTo("supertypes" )),
|
|
204
|
+
when: ( (_ctxTypeHierarchyDirection.isEqualTo("supertypes" ))),
|
|
230
205
|
order: 1,
|
|
231
206
|
}
|
|
232
207
|
});
|
|
@@ -239,11 +214,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
239
214
|
constructor() {
|
|
240
215
|
super({
|
|
241
216
|
id: 'editor.refocusTypeHierarchy',
|
|
242
|
-
title: ( localize2WithPath(
|
|
243
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
244
|
-
'title.refocusTypeHierarchy',
|
|
245
|
-
'Refocus Type Hierarchy'
|
|
246
|
-
)),
|
|
217
|
+
title: ( localize2WithPath(_moduleId, 8, 'Refocus Type Hierarchy')),
|
|
247
218
|
precondition: _ctxTypeHierarchyVisible,
|
|
248
219
|
keybinding: {
|
|
249
220
|
weight: 200 ,
|
|
@@ -259,11 +230,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
259
230
|
constructor() {
|
|
260
231
|
super({
|
|
261
232
|
id: 'editor.closeTypeHierarchy',
|
|
262
|
-
title: ( localizeWithPath(
|
|
263
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
264
|
-
'close',
|
|
265
|
-
'Close'
|
|
266
|
-
)),
|
|
233
|
+
title: ( localizeWithPath(_moduleId, 9, 'Close')),
|
|
267
234
|
icon: Codicon.close,
|
|
268
235
|
precondition: _ctxTypeHierarchyVisible,
|
|
269
236
|
keybinding: {
|
|
@@ -25,6 +25,7 @@ import { Sorter, AccessibilityProvider, IdentityProvider, VirtualDelegate, TypeR
|
|
|
25
25
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
26
26
|
|
|
27
27
|
var TypeHierarchyTreePeekWidget_1;
|
|
28
|
+
const _moduleId = "vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek";
|
|
28
29
|
class LayoutInfo {
|
|
29
30
|
static store(info, storageService) {
|
|
30
31
|
storageService.store('typeHierarchyPeekLayout', JSON.stringify(info), 0 , 1 );
|
|
@@ -48,7 +49,7 @@ class TypeHierarchyTree extends WorkbenchAsyncDataTree {
|
|
|
48
49
|
}
|
|
49
50
|
let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends PeekViewWidget {
|
|
50
51
|
static { TypeHierarchyTreePeekWidget_1 = this; }
|
|
51
|
-
static { this.TitleMenu = ( new MenuId('typehierarchy/title')); }
|
|
52
|
+
static { this.TitleMenu = ( (new MenuId('typehierarchy/title'))); }
|
|
52
53
|
constructor(editor, _where, _direction, themeService, _peekViewService, _editorService, _textModelService, _storageService, _menuService, _contextKeyService, _instantiationService) {
|
|
53
54
|
super(editor, { showFrame: true, showArrow: true, isResizeable: true, isAccessible: true }, _instantiationService);
|
|
54
55
|
this._where = _where;
|
|
@@ -60,8 +61,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
60
61
|
this._menuService = _menuService;
|
|
61
62
|
this._contextKeyService = _contextKeyService;
|
|
62
63
|
this._instantiationService = _instantiationService;
|
|
63
|
-
this._treeViewStates = ( new Map());
|
|
64
|
-
this._previewDisposable = ( new DisposableStore());
|
|
64
|
+
this._treeViewStates = ( (new Map()));
|
|
65
|
+
this._previewDisposable = ( (new DisposableStore()));
|
|
65
66
|
this.create();
|
|
66
67
|
this._peekViewService.addExclusiveWidget(editor, this);
|
|
67
68
|
this._applyTheme(themeService.getColorTheme());
|
|
@@ -103,7 +104,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
103
104
|
}
|
|
104
105
|
_fillBody(parent) {
|
|
105
106
|
this._layoutInfo = LayoutInfo.retrieve(this._storageService);
|
|
106
|
-
this._dim = ( new Dimension(0, 0));
|
|
107
|
+
this._dim = ( (new Dimension(0, 0)));
|
|
107
108
|
this._parent = parent;
|
|
108
109
|
parent.classList.add('type-hierarchy');
|
|
109
110
|
const message = document.createElement('div');
|
|
@@ -114,7 +115,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
114
115
|
const container = document.createElement('div');
|
|
115
116
|
container.classList.add('results');
|
|
116
117
|
parent.appendChild(container);
|
|
117
|
-
this._splitView = ( new SplitView(container, { orientation: 1 }));
|
|
118
|
+
this._splitView = ( (new SplitView(container, { orientation: 1 })));
|
|
118
119
|
const editorContainer = document.createElement('div');
|
|
119
120
|
editorContainer.classList.add('editor');
|
|
120
121
|
container.appendChild(editorContainer);
|
|
@@ -241,7 +242,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
241
242
|
const decorations = [];
|
|
242
243
|
let fullRange;
|
|
243
244
|
const loc = { uri: element.item.uri, range: element.item.selectionRange };
|
|
244
|
-
if (( loc.uri.toString()) === ( previewUri.toString())) {
|
|
245
|
+
if (( (loc.uri.toString())) === ( (previewUri.toString()))) {
|
|
245
246
|
decorations.push({ range: loc.range, options });
|
|
246
247
|
fullRange = !fullRange ? loc.range : Range.plusRange(loc.range, fullRange);
|
|
247
248
|
}
|
|
@@ -252,27 +253,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
252
253
|
}
|
|
253
254
|
this._previewDisposable.add(value);
|
|
254
255
|
const title = this._direction === "supertypes"
|
|
255
|
-
? ( localizeWithPath(
|
|
256
|
-
'
|
|
257
|
-
'supertypes',
|
|
258
|
-
"Supertypes of '{0}'",
|
|
259
|
-
element.model.root.name
|
|
260
|
-
))
|
|
261
|
-
: ( localizeWithPath(
|
|
262
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek',
|
|
263
|
-
'subtypes',
|
|
264
|
-
"Subtypes of '{0}'",
|
|
265
|
-
element.model.root.name
|
|
266
|
-
));
|
|
256
|
+
? ( localizeWithPath(_moduleId, 0, "Supertypes of '{0}'", element.model.root.name))
|
|
257
|
+
: ( localizeWithPath(_moduleId, 1, "Subtypes of '{0}'", element.model.root.name));
|
|
267
258
|
this.setTitle(title);
|
|
268
259
|
}
|
|
269
260
|
showLoading() {
|
|
270
261
|
this._parent.dataset['state'] = "loading" ;
|
|
271
|
-
this.setTitle(( localizeWithPath(
|
|
272
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek',
|
|
273
|
-
'title.loading',
|
|
274
|
-
"Loading..."
|
|
275
|
-
)));
|
|
262
|
+
this.setTitle(( localizeWithPath(_moduleId, 2, "Loading...")));
|
|
276
263
|
this._show();
|
|
277
264
|
}
|
|
278
265
|
showMessage(message) {
|
|
@@ -291,18 +278,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
291
278
|
await this._tree.expand(root.element);
|
|
292
279
|
if (root.children.length === 0) {
|
|
293
280
|
this.showMessage(this._direction === "supertypes"
|
|
294
|
-
? ( localizeWithPath(
|
|
295
|
-
'
|
|
296
|
-
'empt.supertypes',
|
|
297
|
-
"No supertypes of '{0}'",
|
|
298
|
-
model.root.name
|
|
299
|
-
))
|
|
300
|
-
: ( localizeWithPath(
|
|
301
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek',
|
|
302
|
-
'empt.subtypes',
|
|
303
|
-
"No subtypes of '{0}'",
|
|
304
|
-
model.root.name
|
|
305
|
-
)));
|
|
281
|
+
? ( localizeWithPath(_moduleId, 3, "No supertypes of '{0}'", model.root.name))
|
|
282
|
+
: ( localizeWithPath(_moduleId, 4, "No subtypes of '{0}'", model.root.name)));
|
|
306
283
|
}
|
|
307
284
|
else {
|
|
308
285
|
this._parent.dataset['state'] = "data" ;
|
|
@@ -341,22 +318,22 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
341
318
|
_doLayoutBody(height, width) {
|
|
342
319
|
if (this._dim.height !== height || this._dim.width !== width) {
|
|
343
320
|
super._doLayoutBody(height, width);
|
|
344
|
-
this._dim = ( new Dimension(width, height));
|
|
321
|
+
this._dim = ( (new Dimension(width, height)));
|
|
345
322
|
this._layoutInfo.height = this._viewZone ? this._viewZone.heightInLines : this._layoutInfo.height;
|
|
346
323
|
this._splitView.layout(width);
|
|
347
324
|
this._splitView.resizeView(0, width * this._layoutInfo.ratio);
|
|
348
325
|
}
|
|
349
326
|
}
|
|
350
327
|
};
|
|
351
|
-
TypeHierarchyTreePeekWidget = TypeHierarchyTreePeekWidget_1 = ( __decorate([
|
|
352
|
-
( __param(3, IThemeService)),
|
|
353
|
-
( __param(4, IPeekViewService)),
|
|
354
|
-
( __param(5, IEditorService)),
|
|
355
|
-
( __param(6, ITextModelService)),
|
|
356
|
-
( __param(7, IStorageService)),
|
|
357
|
-
( __param(8, IMenuService)),
|
|
358
|
-
( __param(9, IContextKeyService)),
|
|
359
|
-
( __param(10, IInstantiationService))
|
|
360
|
-
], TypeHierarchyTreePeekWidget));
|
|
328
|
+
TypeHierarchyTreePeekWidget = TypeHierarchyTreePeekWidget_1 = ( (__decorate([
|
|
329
|
+
( (__param(3, IThemeService))),
|
|
330
|
+
( (__param(4, IPeekViewService))),
|
|
331
|
+
( (__param(5, IEditorService))),
|
|
332
|
+
( (__param(6, ITextModelService))),
|
|
333
|
+
( (__param(7, IStorageService))),
|
|
334
|
+
( (__param(8, IMenuService))),
|
|
335
|
+
( (__param(9, IContextKeyService))),
|
|
336
|
+
( (__param(10, IInstantiationService)))
|
|
337
|
+
], TypeHierarchyTreePeekWidget)));
|
|
361
338
|
|
|
362
339
|
export { TypeHierarchyTreePeekWidget };
|
|
@@ -8,6 +8,7 @@ import { Range } from 'vscode/vscode/vs/editor/common/core/range';
|
|
|
8
8
|
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
9
9
|
import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
|
|
10
10
|
|
|
11
|
+
const _moduleId = "vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree";
|
|
11
12
|
class Type {
|
|
12
13
|
constructor(item, model, parent) {
|
|
13
14
|
this.item = item;
|
|
@@ -15,7 +16,7 @@ class Type {
|
|
|
15
16
|
this.parent = parent;
|
|
16
17
|
}
|
|
17
18
|
static compare(a, b) {
|
|
18
|
-
let res = compare(( a.item.uri.toString()), ( b.item.uri.toString()));
|
|
19
|
+
let res = compare(( (a.item.uri.toString())), ( (b.item.uri.toString())));
|
|
19
20
|
if (res === 0) {
|
|
20
21
|
res = Range.compareRangesUsingStarts(a.item.range, b.item.range);
|
|
21
22
|
}
|
|
@@ -31,18 +32,28 @@ class DataSource {
|
|
|
31
32
|
}
|
|
32
33
|
async getChildren(element) {
|
|
33
34
|
if (element instanceof TypeHierarchyModel) {
|
|
34
|
-
return (
|
|
35
|
+
return (
|
|
36
|
+
(element.roots.map(root => ( (new Type(root, element, undefined)))))
|
|
37
|
+
);
|
|
35
38
|
}
|
|
36
39
|
const { model, item } = element;
|
|
37
40
|
if (this.getDirection() === "supertypes" ) {
|
|
38
|
-
return (
|
|
39
|
-
|
|
40
|
-
|
|
41
|
+
return (
|
|
42
|
+
((await model.provideSupertypes(item, CancellationToken.None)).map(item => {
|
|
43
|
+
return (
|
|
44
|
+
(new Type(item, model, element))
|
|
45
|
+
);
|
|
46
|
+
}))
|
|
47
|
+
);
|
|
41
48
|
}
|
|
42
49
|
else {
|
|
43
|
-
return (
|
|
44
|
-
|
|
45
|
-
|
|
50
|
+
return (
|
|
51
|
+
((await model.provideSubtypes(item, CancellationToken.None)).map(item => {
|
|
52
|
+
return (
|
|
53
|
+
(new Type(item, model, element))
|
|
54
|
+
);
|
|
55
|
+
}))
|
|
56
|
+
);
|
|
46
57
|
}
|
|
47
58
|
}
|
|
48
59
|
}
|
|
@@ -78,8 +89,10 @@ class TypeRenderer {
|
|
|
78
89
|
container.classList.add('typehierarchy-element');
|
|
79
90
|
const icon = document.createElement('div');
|
|
80
91
|
container.appendChild(icon);
|
|
81
|
-
const label = ( new IconLabel(container, { supportHighlights: true }));
|
|
82
|
-
return (
|
|
92
|
+
const label = ( (new IconLabel(container, { supportHighlights: true })));
|
|
93
|
+
return (
|
|
94
|
+
(new TypeRenderingTemplate(icon, label))
|
|
95
|
+
);
|
|
83
96
|
}
|
|
84
97
|
renderElement(node, _index, template) {
|
|
85
98
|
const { element, filterData } = node;
|
|
@@ -104,28 +117,14 @@ class AccessibilityProvider {
|
|
|
104
117
|
this.getDirection = getDirection;
|
|
105
118
|
}
|
|
106
119
|
getWidgetAriaLabel() {
|
|
107
|
-
return ( localizeWithPath(
|
|
108
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree',
|
|
109
|
-
'tree.aria',
|
|
110
|
-
"Type Hierarchy"
|
|
111
|
-
));
|
|
120
|
+
return ( localizeWithPath(_moduleId, 0, "Type Hierarchy"));
|
|
112
121
|
}
|
|
113
122
|
getAriaLabel(element) {
|
|
114
123
|
if (this.getDirection() === "supertypes" ) {
|
|
115
|
-
return ( localizeWithPath(
|
|
116
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree',
|
|
117
|
-
'supertypes',
|
|
118
|
-
"supertypes of {0}",
|
|
119
|
-
element.item.name
|
|
120
|
-
));
|
|
124
|
+
return ( localizeWithPath(_moduleId, 1, "supertypes of {0}", element.item.name));
|
|
121
125
|
}
|
|
122
126
|
else {
|
|
123
|
-
return ( localizeWithPath(
|
|
124
|
-
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree',
|
|
125
|
-
'subtypes',
|
|
126
|
-
"subtypes of {0}",
|
|
127
|
-
element.item.name
|
|
128
|
-
));
|
|
127
|
+
return ( localizeWithPath(_moduleId, 2, "subtypes of {0}", element.item.name));
|
|
129
128
|
}
|
|
130
129
|
}
|
|
131
130
|
}
|
|
@@ -73,7 +73,7 @@ let OverlayWebview = class OverlayWebview extends Disposable {
|
|
|
73
73
|
}
|
|
74
74
|
get container() {
|
|
75
75
|
if (this._isDisposed) {
|
|
76
|
-
throw new Error(`OverlayWebview has been disposed`);
|
|
76
|
+
throw ( new Error(`OverlayWebview has been disposed`));
|
|
77
77
|
}
|
|
78
78
|
if (!this._container) {
|
|
79
79
|
const node = document.createElement('div');
|
|
@@ -163,7 +163,7 @@ let OverlayWebview = class OverlayWebview extends Disposable {
|
|
|
163
163
|
}
|
|
164
164
|
_show(targetWindow) {
|
|
165
165
|
if (this._isDisposed) {
|
|
166
|
-
throw new Error('OverlayWebview is disposed');
|
|
166
|
+
throw ( new Error('OverlayWebview is disposed'));
|
|
167
167
|
}
|
|
168
168
|
if (!this._webview.value) {
|
|
169
169
|
const webview = this._webviewService.createWebviewElement({
|