@theia/monaco 1.45.1 → 1.46.0-next.72
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/README.md +100 -100
- package/data/monaco-nls.json +1379 -1379
- package/data/monaco-themes/vscode/dark_plus.json +201 -201
- package/data/monaco-themes/vscode/dark_theia.json +5 -5
- package/data/monaco-themes/vscode/dark_vs.json +393 -393
- package/data/monaco-themes/vscode/hc_black.json +457 -457
- package/data/monaco-themes/vscode/hc_light.json +590 -590
- package/data/monaco-themes/vscode/hc_theia.json +5 -5
- package/data/monaco-themes/vscode/hc_theia_light.json +5 -5
- package/data/monaco-themes/vscode/light_plus.json +202 -202
- package/data/monaco-themes/vscode/light_theia.json +10 -10
- package/data/monaco-themes/vscode/light_vs.json +421 -421
- package/lib/browser/index.d.ts +1 -1
- package/lib/browser/index.js +28 -28
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.d.ts +20 -24
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.d.ts.map +1 -1
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js +122 -137
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js.map +1 -1
- package/lib/browser/monaco-bulk-edit-service.d.ts +12 -14
- package/lib/browser/monaco-bulk-edit-service.d.ts.map +1 -1
- package/lib/browser/monaco-bulk-edit-service.js +66 -66
- package/lib/browser/monaco-bulk-edit-service.js.map +1 -1
- package/lib/browser/monaco-color-registry.d.ts +16 -16
- package/lib/browser/monaco-color-registry.js +82 -82
- package/lib/browser/monaco-command-registry.d.ts +19 -19
- package/lib/browser/monaco-command-registry.d.ts.map +1 -1
- package/lib/browser/monaco-command-registry.js +88 -85
- package/lib/browser/monaco-command-registry.js.map +1 -1
- package/lib/browser/monaco-command-service.d.ts +21 -26
- package/lib/browser/monaco-command-service.d.ts.map +1 -1
- package/lib/browser/monaco-command-service.js +93 -92
- package/lib/browser/monaco-command-service.js.map +1 -1
- package/lib/browser/monaco-command.d.ts +88 -94
- package/lib/browser/monaco-command.d.ts.map +1 -1
- package/lib/browser/monaco-command.js +294 -307
- package/lib/browser/monaco-command.js.map +1 -1
- package/lib/browser/monaco-context-key-service.d.ts +22 -22
- package/lib/browser/monaco-context-key-service.d.ts.map +1 -1
- package/lib/browser/monaco-context-key-service.js +146 -147
- package/lib/browser/monaco-context-key-service.js.map +1 -1
- package/lib/browser/monaco-context-menu.d.ts +17 -16
- package/lib/browser/monaco-context-menu.d.ts.map +1 -1
- package/lib/browser/monaco-context-menu.js +112 -102
- package/lib/browser/monaco-context-menu.js.map +1 -1
- package/lib/browser/monaco-diff-editor.d.ts +29 -29
- package/lib/browser/monaco-diff-editor.d.ts.map +1 -1
- package/lib/browser/monaco-diff-editor.js +74 -74
- package/lib/browser/monaco-diff-editor.js.map +1 -1
- package/lib/browser/monaco-diff-navigator-factory.d.ts +6 -7
- package/lib/browser/monaco-diff-navigator-factory.d.ts.map +1 -1
- package/lib/browser/monaco-diff-navigator-factory.js +45 -66
- package/lib/browser/monaco-diff-navigator-factory.js.map +1 -1
- package/lib/browser/monaco-editor-model.d.ts +158 -156
- package/lib/browser/monaco-editor-model.d.ts.map +1 -1
- package/lib/browser/monaco-editor-model.js +562 -559
- package/lib/browser/monaco-editor-model.js.map +1 -1
- package/lib/browser/monaco-editor-provider.d.ts +70 -89
- package/lib/browser/monaco-editor-provider.d.ts.map +1 -1
- package/lib/browser/monaco-editor-provider.js +386 -440
- package/lib/browser/monaco-editor-provider.js.map +1 -1
- package/lib/browser/monaco-editor-service.d.ts +32 -27
- package/lib/browser/monaco-editor-service.d.ts.map +1 -1
- package/lib/browser/monaco-editor-service.js +158 -155
- package/lib/browser/monaco-editor-service.js.map +1 -1
- package/lib/browser/monaco-editor-zone-widget.d.ts +43 -43
- package/lib/browser/monaco-editor-zone-widget.js +194 -194
- package/lib/browser/monaco-editor.d.ts +154 -151
- package/lib/browser/monaco-editor.d.ts.map +1 -1
- package/lib/browser/monaco-editor.js +542 -524
- package/lib/browser/monaco-editor.js.map +1 -1
- package/lib/browser/monaco-formatting-conflicts.d.ts +13 -13
- package/lib/browser/monaco-formatting-conflicts.js +111 -111
- package/lib/browser/monaco-formatting-conflicts.js.map +1 -1
- package/lib/browser/monaco-frontend-application-contribution.d.ts +22 -28
- package/lib/browser/monaco-frontend-application-contribution.d.ts.map +1 -1
- package/lib/browser/monaco-frontend-application-contribution.js +178 -215
- package/lib/browser/monaco-frontend-application-contribution.js.map +1 -1
- package/lib/browser/monaco-frontend-module.d.ts +7 -7
- package/lib/browser/monaco-frontend-module.d.ts.map +1 -1
- package/lib/browser/monaco-frontend-module.js +280 -271
- package/lib/browser/monaco-frontend-module.js.map +1 -1
- package/lib/browser/monaco-gotoline-quick-access.d.ts +11 -11
- package/lib/browser/monaco-gotoline-quick-access.js +64 -64
- package/lib/browser/monaco-gotosymbol-quick-access.d.ts +16 -16
- package/lib/browser/monaco-gotosymbol-quick-access.js +70 -70
- package/lib/browser/monaco-icon-registry.d.ts +10 -11
- package/lib/browser/monaco-icon-registry.d.ts.map +1 -1
- package/lib/browser/monaco-icon-registry.js +52 -50
- package/lib/browser/monaco-icon-registry.js.map +1 -1
- package/lib/browser/monaco-indexed-db.d.ts +28 -28
- package/lib/browser/monaco-indexed-db.js +131 -131
- package/lib/browser/monaco-init.d.ts +5 -0
- package/lib/browser/monaco-init.d.ts.map +1 -0
- package/lib/browser/monaco-init.js +125 -0
- package/lib/browser/monaco-init.js.map +1 -0
- package/lib/browser/monaco-keybinding.d.ts +16 -16
- package/lib/browser/monaco-keybinding.js +134 -134
- package/lib/browser/monaco-keybinding.js.map +1 -1
- package/lib/browser/monaco-keycode-map.d.ts +2 -2
- package/lib/browser/monaco-keycode-map.js +163 -163
- package/lib/browser/monaco-keycode-map.js.map +1 -1
- package/lib/browser/monaco-languages.d.ts +35 -35
- package/lib/browser/monaco-languages.js +180 -180
- package/lib/browser/monaco-marker-collection.d.ts +18 -18
- package/lib/browser/monaco-marker-collection.js +70 -70
- package/lib/browser/monaco-menu.d.ts +20 -20
- package/lib/browser/monaco-menu.js +145 -145
- package/lib/browser/monaco-mime-service.d.ts +10 -10
- package/lib/browser/monaco-mime-service.js +78 -78
- package/lib/browser/monaco-outline-contribution.d.ts +78 -78
- package/lib/browser/monaco-outline-contribution.js +384 -384
- package/lib/browser/monaco-outline-decorator.d.ts +12 -12
- package/lib/browser/monaco-outline-decorator.js +67 -67
- package/lib/browser/monaco-quick-access-registry.d.ts +11 -11
- package/lib/browser/monaco-quick-access-registry.js +99 -99
- package/lib/browser/monaco-quick-input-service.d.ts +99 -101
- package/lib/browser/monaco-quick-input-service.d.ts.map +1 -1
- package/lib/browser/monaco-quick-input-service.js +529 -568
- package/lib/browser/monaco-quick-input-service.js.map +1 -1
- package/lib/browser/monaco-resolved-keybinding.d.ts +23 -23
- package/lib/browser/monaco-resolved-keybinding.d.ts.map +1 -1
- package/lib/browser/monaco-resolved-keybinding.js +131 -131
- package/lib/browser/monaco-resolved-keybinding.js.map +1 -1
- package/lib/browser/monaco-snippet-suggest-provider.d.ts +66 -66
- package/lib/browser/monaco-snippet-suggest-provider.js +273 -273
- package/lib/browser/monaco-status-bar-contribution.d.ts +17 -17
- package/lib/browser/monaco-status-bar-contribution.js +121 -121
- package/lib/browser/monaco-text-model-service.d.ts +51 -51
- package/lib/browser/monaco-text-model-service.js +189 -189
- package/lib/browser/monaco-text-model-service.js.map +1 -1
- package/lib/browser/monaco-theming-service.d.ts +67 -67
- package/lib/browser/monaco-theming-service.js +171 -171
- package/lib/browser/monaco-to-protocol-converter.d.ts +26 -26
- package/lib/browser/monaco-to-protocol-converter.js +61 -61
- package/lib/browser/monaco-workspace.d.ts +83 -85
- package/lib/browser/monaco-workspace.d.ts.map +1 -1
- package/lib/browser/monaco-workspace.js +384 -384
- package/lib/browser/monaco-workspace.js.map +1 -1
- package/lib/browser/protocol-to-monaco-converter.d.ts +31 -31
- package/lib/browser/protocol-to-monaco-converter.js +133 -133
- package/lib/browser/simple-monaco-editor.d.ts +45 -44
- package/lib/browser/simple-monaco-editor.d.ts.map +1 -1
- package/lib/browser/simple-monaco-editor.js +184 -176
- package/lib/browser/simple-monaco-editor.js.map +1 -1
- package/lib/browser/textmate/index.d.ts +4 -4
- package/lib/browser/textmate/index.js +31 -31
- package/lib/browser/textmate/monaco-textmate-frontend-bindings.d.ts +11 -11
- package/lib/browser/textmate/monaco-textmate-frontend-bindings.js +91 -91
- package/lib/browser/textmate/monaco-textmate-service.d.ts +30 -30
- package/lib/browser/textmate/monaco-textmate-service.js +185 -185
- package/lib/browser/textmate/monaco-textmate-service.js.map +1 -1
- package/lib/browser/textmate/monaco-theme-registry.d.ts +27 -27
- package/lib/browser/textmate/monaco-theme-registry.js +173 -173
- package/lib/browser/textmate/monaco-theme-types.d.ts +20 -20
- package/lib/browser/textmate/monaco-theme-types.js +21 -21
- package/lib/browser/textmate/textmate-contribution.d.ts +9 -9
- package/lib/browser/textmate/textmate-contribution.js +27 -27
- package/lib/browser/textmate/textmate-registry.d.ts +31 -31
- package/lib/browser/textmate/textmate-registry.js +109 -109
- package/lib/browser/textmate/textmate-snippet-completion-provider.d.ts +26 -26
- package/lib/browser/textmate/textmate-snippet-completion-provider.js +53 -53
- package/lib/browser/textmate/textmate-tokenizer.d.ts +22 -22
- package/lib/browser/textmate/textmate-tokenizer.js +65 -65
- package/lib/browser/workspace-symbol-command.d.ts +55 -55
- package/lib/browser/workspace-symbol-command.js +215 -215
- package/lib/package.spec.js +25 -25
- package/package.json +10 -10
- package/src/browser/index.ts +17 -17
- package/src/browser/markdown-renderer/monaco-markdown-renderer.ts +109 -117
- package/src/browser/monaco-bulk-edit-service.ts +64 -64
- package/src/browser/monaco-color-registry.ts +73 -73
- package/src/browser/monaco-command-registry.ts +85 -82
- package/src/browser/monaco-command-service.ts +90 -99
- package/src/browser/monaco-command.ts +303 -313
- package/src/browser/monaco-context-key-service.ts +144 -143
- package/src/browser/monaco-context-menu.ts +100 -90
- package/src/browser/monaco-diff-editor.ts +100 -101
- package/src/browser/monaco-diff-navigator-factory.ts +39 -61
- package/src/browser/monaco-editor-model.ts +684 -681
- package/src/browser/monaco-editor-provider.ts +409 -452
- package/src/browser/monaco-editor-service.ts +149 -144
- package/src/browser/monaco-editor-zone-widget.ts +250 -250
- package/src/browser/monaco-editor.ts +663 -644
- package/src/browser/monaco-formatting-conflicts.ts +116 -116
- package/src/browser/monaco-frontend-application-contribution.ts +165 -200
- package/src/browser/monaco-frontend-module.ts +328 -320
- package/src/browser/monaco-gotoline-quick-access.ts +47 -47
- package/src/browser/monaco-gotosymbol-quick-access.ts +53 -53
- package/src/browser/monaco-icon-registry.ts +49 -47
- package/src/browser/monaco-indexed-db.ts +130 -130
- package/src/browser/monaco-init.ts +114 -0
- package/src/browser/monaco-keybinding.ts +111 -111
- package/src/browser/monaco-keycode-map.ts +171 -171
- package/src/browser/monaco-languages.ts +177 -177
- package/src/browser/monaco-marker-collection.ts +83 -83
- package/src/browser/monaco-menu.ts +142 -142
- package/src/browser/monaco-mime-service.ts +71 -71
- package/src/browser/monaco-outline-contribution.ts +404 -404
- package/src/browser/monaco-outline-decorator.ts +66 -66
- package/src/browser/monaco-quick-access-registry.ts +112 -112
- package/src/browser/monaco-quick-input-service.ts +647 -676
- package/src/browser/monaco-resolved-keybinding.ts +162 -162
- package/src/browser/monaco-snippet-suggest-provider.ts +306 -306
- package/src/browser/monaco-status-bar-contribution.ts +110 -110
- package/src/browser/monaco-text-model-service.ts +199 -199
- package/src/browser/monaco-theming-service.ts +204 -204
- package/src/browser/monaco-to-protocol-converter.ts +71 -71
- package/src/browser/monaco-workspace.ts +412 -412
- package/src/browser/protocol-to-monaco-converter.ts +158 -158
- package/src/browser/simple-monaco-editor.ts +217 -210
- package/src/browser/style/index.css +263 -263
- package/src/browser/textmate/index.ts +20 -20
- package/src/browser/textmate/monaco-textmate-frontend-bindings.ts +90 -90
- package/src/browser/textmate/monaco-textmate-service.ts +187 -187
- package/src/browser/textmate/monaco-theme-registry.ts +176 -176
- package/src/browser/textmate/monaco-theme-types.ts +37 -37
- package/src/browser/textmate/textmate-contribution.ts +29 -29
- package/src/browser/textmate/textmate-registry.ts +129 -129
- package/src/browser/textmate/textmate-snippet-completion-provider.ts +73 -73
- package/src/browser/textmate/textmate-tokenizer.ts +84 -84
- package/src/browser/workspace-symbol-command.ts +196 -196
- package/src/package.spec.ts +28 -28
|
@@ -1,404 +1,404 @@
|
|
|
1
|
-
// *****************************************************************************
|
|
2
|
-
// Copyright (C) 2017 TypeFox and others.
|
|
3
|
-
//
|
|
4
|
-
// This program and the accompanying materials are made available under the
|
|
5
|
-
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
-
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
-
//
|
|
8
|
-
// This Source Code may also be made available under the following Secondary
|
|
9
|
-
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
-
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
-
// with the GNU Classpath Exception which is available at
|
|
12
|
-
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
-
//
|
|
14
|
-
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
-
// *****************************************************************************
|
|
16
|
-
|
|
17
|
-
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
18
|
-
import { FrontendApplicationContribution, FrontendApplication, TreeNode } from '@theia/core/lib/browser';
|
|
19
|
-
import { Range, EditorManager, EditorOpenerOptions } from '@theia/editor/lib/browser';
|
|
20
|
-
import { DisposableCollection, Disposable } from '@theia/core';
|
|
21
|
-
import { OutlineViewService } from '@theia/outline-view/lib/browser/outline-view-service';
|
|
22
|
-
import { OutlineSymbolInformationNode } from '@theia/outline-view/lib/browser/outline-view-widget';
|
|
23
|
-
import URI from '@theia/core/lib/common/uri';
|
|
24
|
-
import { MonacoEditor } from './monaco-editor';
|
|
25
|
-
import debounce = require('@theia/core/shared/lodash.debounce');
|
|
26
|
-
import * as monaco from '@theia/monaco-editor-core';
|
|
27
|
-
import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
|
|
28
|
-
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
|
|
29
|
-
import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
|
|
30
|
-
import { DocumentSymbol } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
|
|
31
|
-
|
|
32
|
-
@injectable()
|
|
33
|
-
export class MonacoOutlineContribution implements FrontendApplicationContribution {
|
|
34
|
-
|
|
35
|
-
protected readonly toDisposeOnEditor = new DisposableCollection();
|
|
36
|
-
protected roots: MonacoOutlineSymbolInformationNode[] | undefined;
|
|
37
|
-
protected canUpdateOutline: boolean = true;
|
|
38
|
-
|
|
39
|
-
@inject(OutlineViewService) protected readonly outlineViewService: OutlineViewService;
|
|
40
|
-
@inject(EditorManager) protected readonly editorManager: EditorManager;
|
|
41
|
-
|
|
42
|
-
onStart(app: FrontendApplication): void {
|
|
43
|
-
|
|
44
|
-
// updateOutline and handleCurrentEditorChanged need to be called even when the outline view widget is closed
|
|
45
|
-
// in order to update breadcrumbs.
|
|
46
|
-
StandaloneServices.get(ILanguageFeaturesService).documentSymbolProvider.onDidChange(
|
|
47
|
-
debounce(() => this.updateOutline())
|
|
48
|
-
);
|
|
49
|
-
this.editorManager.onCurrentEditorChanged(
|
|
50
|
-
debounce(() => this.handleCurrentEditorChanged(), 50)
|
|
51
|
-
);
|
|
52
|
-
this.handleCurrentEditorChanged();
|
|
53
|
-
|
|
54
|
-
this.outlineViewService.onDidSelect(async node => {
|
|
55
|
-
if (MonacoOutlineSymbolInformationNode.is(node) && node.parent) {
|
|
56
|
-
const options: EditorOpenerOptions = {
|
|
57
|
-
mode: 'reveal',
|
|
58
|
-
selection: node.range
|
|
59
|
-
};
|
|
60
|
-
await this.selectInEditor(node, options);
|
|
61
|
-
}
|
|
62
|
-
});
|
|
63
|
-
this.outlineViewService.onDidOpen(async node => {
|
|
64
|
-
if (MonacoOutlineSymbolInformationNode.is(node)) {
|
|
65
|
-
const options: EditorOpenerOptions = {
|
|
66
|
-
selection: {
|
|
67
|
-
start: node.range.start
|
|
68
|
-
}
|
|
69
|
-
};
|
|
70
|
-
await this.selectInEditor(node, options);
|
|
71
|
-
}
|
|
72
|
-
});
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
protected async selectInEditor(node: MonacoOutlineSymbolInformationNode, options?: EditorOpenerOptions): Promise<void> {
|
|
76
|
-
// Avoid cyclic updates: Outline -> Editor -> Outline.
|
|
77
|
-
this.canUpdateOutline = false;
|
|
78
|
-
try {
|
|
79
|
-
await this.editorManager.open(node.uri, options);
|
|
80
|
-
} finally {
|
|
81
|
-
this.canUpdateOutline = true;
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
protected handleCurrentEditorChanged(): void {
|
|
86
|
-
this.toDisposeOnEditor.dispose();
|
|
87
|
-
this.toDisposeOnEditor.push(Disposable.create(() => this.roots = undefined));
|
|
88
|
-
const editor = this.editorManager.currentEditor;
|
|
89
|
-
if (editor) {
|
|
90
|
-
const model = MonacoEditor.get(editor)!.getControl().getModel();
|
|
91
|
-
if (model) {
|
|
92
|
-
this.toDisposeOnEditor.push(model.onDidChangeContent(() => {
|
|
93
|
-
this.roots = undefined; // Invalidate the previously resolved roots.
|
|
94
|
-
this.updateOutline();
|
|
95
|
-
}));
|
|
96
|
-
}
|
|
97
|
-
this.toDisposeOnEditor.push(editor.editor.onSelectionChanged(selection => this.updateOutline(selection)));
|
|
98
|
-
}
|
|
99
|
-
this.updateOutline();
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
protected tokenSource = new monaco.CancellationTokenSource();
|
|
103
|
-
protected async updateOutline(editorSelection?: Range): Promise<void> {
|
|
104
|
-
if (!this.canUpdateOutline) {
|
|
105
|
-
return;
|
|
106
|
-
}
|
|
107
|
-
this.tokenSource.cancel();
|
|
108
|
-
this.tokenSource = new monaco.CancellationTokenSource();
|
|
109
|
-
const token = this.tokenSource.token;
|
|
110
|
-
|
|
111
|
-
const editor = MonacoEditor.get(this.editorManager.currentEditor);
|
|
112
|
-
const model = editor && editor.getControl().getModel();
|
|
113
|
-
const roots = model && await this.createRoots(model, token, editorSelection);
|
|
114
|
-
if (token.isCancellationRequested) {
|
|
115
|
-
return;
|
|
116
|
-
}
|
|
117
|
-
this.outlineViewService.publish(roots || []);
|
|
118
|
-
}
|
|
119
|
-
|
|
120
|
-
protected async createRoots(
|
|
121
|
-
model: monaco.editor.ITextModel | ITextModel, token: monaco.CancellationToken, editorSelection?: Range
|
|
122
|
-
): Promise<MonacoOutlineSymbolInformationNode[]> {
|
|
123
|
-
model = model as ITextModel;
|
|
124
|
-
if (this.roots && this.roots.length > 0) {
|
|
125
|
-
// Reset the selection on the tree nodes, so that we can apply the new ones based on the `editorSelection`.
|
|
126
|
-
const resetSelection = (node: MonacoOutlineSymbolInformationNode) => {
|
|
127
|
-
node.selected = false;
|
|
128
|
-
node.children.forEach(resetSelection);
|
|
129
|
-
};
|
|
130
|
-
this.roots.forEach(resetSelection);
|
|
131
|
-
} else {
|
|
132
|
-
this.roots = [];
|
|
133
|
-
const providers = StandaloneServices.get(ILanguageFeaturesService).documentSymbolProvider.all(model);
|
|
134
|
-
if (token.isCancellationRequested) {
|
|
135
|
-
return [];
|
|
136
|
-
}
|
|
137
|
-
const uri = new URI(model.uri.toString());
|
|
138
|
-
for (const provider of providers) {
|
|
139
|
-
try {
|
|
140
|
-
const symbols = await provider.provideDocumentSymbols(model, token) ?? [];
|
|
141
|
-
if (token.isCancellationRequested) {
|
|
142
|
-
return [];
|
|
143
|
-
}
|
|
144
|
-
const nodes = this.createNodes(uri, symbols);
|
|
145
|
-
if (providers.length > 1 && provider.displayName) {
|
|
146
|
-
const providerRoot = this.createProviderRootNode(uri, provider.displayName, nodes);
|
|
147
|
-
this.roots.push(providerRoot);
|
|
148
|
-
} else {
|
|
149
|
-
this.roots.push(...nodes);
|
|
150
|
-
}
|
|
151
|
-
} catch {
|
|
152
|
-
/* collect symbols from other providers */
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
this.applySelection(this.roots, editorSelection);
|
|
157
|
-
return this.roots;
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
protected createProviderRootNode(uri: URI, displayName: string, children: MonacoOutlineSymbolInformationNode[]): MonacoOutlineSymbolInformationNode {
|
|
161
|
-
const node: MonacoOutlineSymbolInformationNode = {
|
|
162
|
-
uri,
|
|
163
|
-
id: displayName,
|
|
164
|
-
name: displayName,
|
|
165
|
-
iconClass: '',
|
|
166
|
-
range: this.asRange(new monaco.Range(1, 1, 1, 1)),
|
|
167
|
-
fullRange: this.asRange(new monaco.Range(1, 1, 1, 1)),
|
|
168
|
-
children,
|
|
169
|
-
parent: undefined,
|
|
170
|
-
selected: false,
|
|
171
|
-
expanded: true
|
|
172
|
-
};
|
|
173
|
-
return node;
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
protected createNodes(uri: URI, symbols: monaco.languages.DocumentSymbol[] | DocumentSymbol[]): MonacoOutlineSymbolInformationNode[] {
|
|
177
|
-
symbols = symbols as monaco.languages.DocumentSymbol[];
|
|
178
|
-
let rangeBased = false;
|
|
179
|
-
const ids = new Map();
|
|
180
|
-
const roots: MonacoOutlineSymbolInformationNode[] = [];
|
|
181
|
-
const nodesByName = symbols.sort(this.orderByPosition).reduce((result, symbol) => {
|
|
182
|
-
const node = this.createNode(uri, symbol, ids);
|
|
183
|
-
if (symbol.children) {
|
|
184
|
-
MonacoOutlineSymbolInformationNode.insert(roots, node);
|
|
185
|
-
} else {
|
|
186
|
-
rangeBased = rangeBased || symbol.range.startLineNumber !== symbol.range.endLineNumber;
|
|
187
|
-
const values = result.get(symbol.name) || [];
|
|
188
|
-
values.push({ symbol, node });
|
|
189
|
-
result.set(symbol.name, values);
|
|
190
|
-
}
|
|
191
|
-
return result;
|
|
192
|
-
}, new Map<string, MonacoOutlineContribution.NodeAndSymbol[]>());
|
|
193
|
-
|
|
194
|
-
for (const nodes of nodesByName.values()) {
|
|
195
|
-
for (const { node, symbol } of nodes) {
|
|
196
|
-
if (!symbol.containerName) {
|
|
197
|
-
MonacoOutlineSymbolInformationNode.insert(roots, node);
|
|
198
|
-
} else {
|
|
199
|
-
const possibleParents = nodesByName.get(symbol.containerName);
|
|
200
|
-
if (possibleParents) {
|
|
201
|
-
const parent = possibleParents.find(possibleParent => this.parentContains(symbol, possibleParent.symbol, rangeBased));
|
|
202
|
-
if (parent) {
|
|
203
|
-
node.parent = parent.node;
|
|
204
|
-
MonacoOutlineSymbolInformationNode.insert(parent.node.children, node);
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
if (!roots.length) {
|
|
211
|
-
const nodes = nodesByName.values().next().value;
|
|
212
|
-
if (nodes && !nodes[0].node.parent) {
|
|
213
|
-
return [nodes[0].node];
|
|
214
|
-
}
|
|
215
|
-
return [];
|
|
216
|
-
}
|
|
217
|
-
return roots;
|
|
218
|
-
}
|
|
219
|
-
|
|
220
|
-
/**
|
|
221
|
-
* Sets the selection on the sub-trees based on the optional editor selection.
|
|
222
|
-
* Select the narrowest node that is strictly contains the editor selection.
|
|
223
|
-
*/
|
|
224
|
-
protected applySelection(roots: MonacoOutlineSymbolInformationNode[], editorSelection?: Range): boolean {
|
|
225
|
-
if (editorSelection) {
|
|
226
|
-
for (const root of roots) {
|
|
227
|
-
if (this.parentContains(editorSelection, root.fullRange, true)) {
|
|
228
|
-
const { children } = root;
|
|
229
|
-
root.selected = !root.expanded || !this.applySelection(children, editorSelection);
|
|
230
|
-
return true;
|
|
231
|
-
}
|
|
232
|
-
}
|
|
233
|
-
}
|
|
234
|
-
return false;
|
|
235
|
-
}
|
|
236
|
-
|
|
237
|
-
/**
|
|
238
|
-
* Returns `true` if `candidate` is strictly contained inside `parent`
|
|
239
|
-
*
|
|
240
|
-
* If the argument is a `DocumentSymbol`, then `getFullRange` will be used to retrieve the range of the underlying symbol.
|
|
241
|
-
*/
|
|
242
|
-
protected parentContains(candidate: monaco.languages.DocumentSymbol | Range, parent: monaco.languages.DocumentSymbol | Range, rangeBased: boolean): boolean {
|
|
243
|
-
// TODO: move this code to the `monaco-languageclient`: https://github.com/eclipse-theia/theia/pull/2885#discussion_r217800446
|
|
244
|
-
const candidateRange = Range.is(candidate) ? candidate : this.getFullRange(candidate);
|
|
245
|
-
const parentRange = Range.is(parent) ? parent : this.getFullRange(parent);
|
|
246
|
-
const sameStartLine = candidateRange.start.line === parentRange.start.line;
|
|
247
|
-
const startColGreaterOrEqual = candidateRange.start.character >= parentRange.start.character;
|
|
248
|
-
const startLineGreater = candidateRange.start.line > parentRange.start.line;
|
|
249
|
-
const sameEndLine = candidateRange.end.line === parentRange.end.line;
|
|
250
|
-
const endColSmallerOrEqual = candidateRange.end.character <= parentRange.end.character;
|
|
251
|
-
const endLineSmaller = candidateRange.end.line < parentRange.end.line;
|
|
252
|
-
return (((sameStartLine && startColGreaterOrEqual || startLineGreater) &&
|
|
253
|
-
(sameEndLine && endColSmallerOrEqual || endLineSmaller)) || !rangeBased);
|
|
254
|
-
}
|
|
255
|
-
|
|
256
|
-
/**
|
|
257
|
-
* `monaco` to LSP `Range` converter. Converts the `1-based` location indices into `0-based` ones.
|
|
258
|
-
*/
|
|
259
|
-
protected asRange(range: monaco.IRange): Range {
|
|
260
|
-
const { startLineNumber, startColumn, endLineNumber, endColumn } = range;
|
|
261
|
-
return {
|
|
262
|
-
start: {
|
|
263
|
-
line: startLineNumber - 1,
|
|
264
|
-
character: startColumn - 1
|
|
265
|
-
},
|
|
266
|
-
end: {
|
|
267
|
-
line: endLineNumber - 1,
|
|
268
|
-
character: endColumn - 1
|
|
269
|
-
}
|
|
270
|
-
};
|
|
271
|
-
}
|
|
272
|
-
|
|
273
|
-
/**
|
|
274
|
-
* Returns with a range enclosing this symbol not including leading/trailing whitespace but everything else like comments.
|
|
275
|
-
* This information is typically used to determine if the clients cursor is inside the symbol to reveal in the symbol in the UI.
|
|
276
|
-
* This allows to obtain the range including the associated comments.
|
|
277
|
-
*
|
|
278
|
-
* See: [`DocumentSymbol#range`](https://microsoft.github.io/language-server-protocol/specification#textDocument_documentSymbol) for more details.
|
|
279
|
-
*/
|
|
280
|
-
protected getFullRange(documentSymbol: monaco.languages.DocumentSymbol): Range {
|
|
281
|
-
return this.asRange(documentSymbol.range);
|
|
282
|
-
}
|
|
283
|
-
|
|
284
|
-
/**
|
|
285
|
-
* The range that should be selected and revealed when this symbol is being picked, e.g the name of a function. Must be contained by the `getSelectionRange`.
|
|
286
|
-
*
|
|
287
|
-
* See: [`DocumentSymbol#selectionRange`](https://microsoft.github.io/language-server-protocol/specification#textDocument_documentSymbol) for more details.
|
|
288
|
-
*/
|
|
289
|
-
protected getNameRange(documentSymbol: monaco.languages.DocumentSymbol): Range {
|
|
290
|
-
return this.asRange(documentSymbol.selectionRange);
|
|
291
|
-
}
|
|
292
|
-
|
|
293
|
-
protected createNode(
|
|
294
|
-
uri: URI, symbol: monaco.languages.DocumentSymbol, ids: Map<string, number>, parent?: MonacoOutlineSymbolInformationNode
|
|
295
|
-
): MonacoOutlineSymbolInformationNode {
|
|
296
|
-
const id = this.createId(symbol.name, ids);
|
|
297
|
-
const children: MonacoOutlineSymbolInformationNode[] = [];
|
|
298
|
-
const node: MonacoOutlineSymbolInformationNode = {
|
|
299
|
-
children,
|
|
300
|
-
id,
|
|
301
|
-
iconClass: monaco.languages.SymbolKind[symbol.kind].toString().toLowerCase(),
|
|
302
|
-
name: this.getName(symbol),
|
|
303
|
-
detail: this.getDetail(symbol),
|
|
304
|
-
parent,
|
|
305
|
-
uri,
|
|
306
|
-
range: this.getNameRange(symbol),
|
|
307
|
-
fullRange: this.getFullRange(symbol),
|
|
308
|
-
selected: false,
|
|
309
|
-
expanded: this.shouldExpand(symbol)
|
|
310
|
-
};
|
|
311
|
-
if (symbol.children) {
|
|
312
|
-
for (const child of symbol.children) {
|
|
313
|
-
MonacoOutlineSymbolInformationNode.insert(children, this.createNode(uri, child, ids, node));
|
|
314
|
-
}
|
|
315
|
-
}
|
|
316
|
-
return node;
|
|
317
|
-
}
|
|
318
|
-
|
|
319
|
-
protected getName(symbol: monaco.languages.DocumentSymbol): string {
|
|
320
|
-
return symbol.name;
|
|
321
|
-
}
|
|
322
|
-
|
|
323
|
-
protected getDetail(symbol: monaco.languages.DocumentSymbol): string {
|
|
324
|
-
return symbol.detail;
|
|
325
|
-
}
|
|
326
|
-
|
|
327
|
-
protected createId(name: string, ids: Map<string, number>): string {
|
|
328
|
-
const counter = ids.get(name);
|
|
329
|
-
const index = typeof counter === 'number' ? counter + 1 : 0;
|
|
330
|
-
ids.set(name, index);
|
|
331
|
-
return name + '_' + index;
|
|
332
|
-
}
|
|
333
|
-
|
|
334
|
-
protected shouldExpand(symbol: monaco.languages.DocumentSymbol): boolean {
|
|
335
|
-
return [
|
|
336
|
-
monaco.languages.SymbolKind.Class,
|
|
337
|
-
monaco.languages.SymbolKind.Enum, monaco.languages.SymbolKind.File,
|
|
338
|
-
monaco.languages.SymbolKind.Interface, monaco.languages.SymbolKind.Module,
|
|
339
|
-
monaco.languages.SymbolKind.Namespace, monaco.languages.SymbolKind.Object,
|
|
340
|
-
monaco.languages.SymbolKind.Package, monaco.languages.SymbolKind.Struct
|
|
341
|
-
].indexOf(symbol.kind) !== -1;
|
|
342
|
-
}
|
|
343
|
-
|
|
344
|
-
protected orderByPosition(symbol: monaco.languages.DocumentSymbol, symbol2: monaco.languages.DocumentSymbol): number {
|
|
345
|
-
const startLineComparison = symbol.range.startLineNumber - symbol2.range.startLineNumber;
|
|
346
|
-
if (startLineComparison !== 0) {
|
|
347
|
-
return startLineComparison;
|
|
348
|
-
}
|
|
349
|
-
const startOffsetComparison = symbol.range.startColumn - symbol2.range.startColumn;
|
|
350
|
-
if (startOffsetComparison !== 0) {
|
|
351
|
-
return startOffsetComparison;
|
|
352
|
-
}
|
|
353
|
-
const endLineComparison = symbol.range.endLineNumber - symbol2.range.endLineNumber;
|
|
354
|
-
if (endLineComparison !== 0) {
|
|
355
|
-
return endLineComparison;
|
|
356
|
-
}
|
|
357
|
-
return symbol.range.endColumn - symbol2.range.endColumn;
|
|
358
|
-
}
|
|
359
|
-
|
|
360
|
-
}
|
|
361
|
-
export namespace MonacoOutlineContribution {
|
|
362
|
-
export interface NodeAndSymbol {
|
|
363
|
-
node: MonacoOutlineSymbolInformationNode;
|
|
364
|
-
symbol: monaco.languages.DocumentSymbol
|
|
365
|
-
}
|
|
366
|
-
}
|
|
367
|
-
|
|
368
|
-
export interface MonacoOutlineSymbolInformationNode extends OutlineSymbolInformationNode {
|
|
369
|
-
uri: URI;
|
|
370
|
-
range: Range;
|
|
371
|
-
fullRange: Range;
|
|
372
|
-
detail?: string;
|
|
373
|
-
parent: MonacoOutlineSymbolInformationNode | undefined;
|
|
374
|
-
children: MonacoOutlineSymbolInformationNode[];
|
|
375
|
-
}
|
|
376
|
-
|
|
377
|
-
export namespace MonacoOutlineSymbolInformationNode {
|
|
378
|
-
export function is(node: TreeNode): node is MonacoOutlineSymbolInformationNode {
|
|
379
|
-
return OutlineSymbolInformationNode.is(node) && 'uri' in node && 'range' in node;
|
|
380
|
-
}
|
|
381
|
-
export function insert(nodes: MonacoOutlineSymbolInformationNode[], node: MonacoOutlineSymbolInformationNode): void {
|
|
382
|
-
const index = nodes.findIndex(current => compare(node, current) < 0);
|
|
383
|
-
if (index === -1) {
|
|
384
|
-
nodes.push(node);
|
|
385
|
-
} else {
|
|
386
|
-
nodes.splice(index, 0, node);
|
|
387
|
-
}
|
|
388
|
-
}
|
|
389
|
-
export function compare(node: MonacoOutlineSymbolInformationNode, node2: MonacoOutlineSymbolInformationNode): number {
|
|
390
|
-
const startLineComparison = node.range.start.line - node2.range.start.line;
|
|
391
|
-
if (startLineComparison !== 0) {
|
|
392
|
-
return startLineComparison;
|
|
393
|
-
}
|
|
394
|
-
const startColumnComparison = node.range.start.character - node2.range.start.character;
|
|
395
|
-
if (startColumnComparison !== 0) {
|
|
396
|
-
return startColumnComparison;
|
|
397
|
-
}
|
|
398
|
-
const endLineComparison = node2.range.end.line - node.range.end.line;
|
|
399
|
-
if (endLineComparison !== 0) {
|
|
400
|
-
return endLineComparison;
|
|
401
|
-
}
|
|
402
|
-
return node2.range.end.character - node.range.end.character;
|
|
403
|
-
}
|
|
404
|
-
}
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2017 TypeFox and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
18
|
+
import { FrontendApplicationContribution, FrontendApplication, TreeNode } from '@theia/core/lib/browser';
|
|
19
|
+
import { Range, EditorManager, EditorOpenerOptions } from '@theia/editor/lib/browser';
|
|
20
|
+
import { DisposableCollection, Disposable } from '@theia/core';
|
|
21
|
+
import { OutlineViewService } from '@theia/outline-view/lib/browser/outline-view-service';
|
|
22
|
+
import { OutlineSymbolInformationNode } from '@theia/outline-view/lib/browser/outline-view-widget';
|
|
23
|
+
import URI from '@theia/core/lib/common/uri';
|
|
24
|
+
import { MonacoEditor } from './monaco-editor';
|
|
25
|
+
import debounce = require('@theia/core/shared/lodash.debounce');
|
|
26
|
+
import * as monaco from '@theia/monaco-editor-core';
|
|
27
|
+
import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
|
|
28
|
+
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
|
|
29
|
+
import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
|
|
30
|
+
import { DocumentSymbol } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
|
|
31
|
+
|
|
32
|
+
@injectable()
|
|
33
|
+
export class MonacoOutlineContribution implements FrontendApplicationContribution {
|
|
34
|
+
|
|
35
|
+
protected readonly toDisposeOnEditor = new DisposableCollection();
|
|
36
|
+
protected roots: MonacoOutlineSymbolInformationNode[] | undefined;
|
|
37
|
+
protected canUpdateOutline: boolean = true;
|
|
38
|
+
|
|
39
|
+
@inject(OutlineViewService) protected readonly outlineViewService: OutlineViewService;
|
|
40
|
+
@inject(EditorManager) protected readonly editorManager: EditorManager;
|
|
41
|
+
|
|
42
|
+
onStart(app: FrontendApplication): void {
|
|
43
|
+
|
|
44
|
+
// updateOutline and handleCurrentEditorChanged need to be called even when the outline view widget is closed
|
|
45
|
+
// in order to update breadcrumbs.
|
|
46
|
+
StandaloneServices.get(ILanguageFeaturesService).documentSymbolProvider.onDidChange(
|
|
47
|
+
debounce(() => this.updateOutline())
|
|
48
|
+
);
|
|
49
|
+
this.editorManager.onCurrentEditorChanged(
|
|
50
|
+
debounce(() => this.handleCurrentEditorChanged(), 50)
|
|
51
|
+
);
|
|
52
|
+
this.handleCurrentEditorChanged();
|
|
53
|
+
|
|
54
|
+
this.outlineViewService.onDidSelect(async node => {
|
|
55
|
+
if (MonacoOutlineSymbolInformationNode.is(node) && node.parent) {
|
|
56
|
+
const options: EditorOpenerOptions = {
|
|
57
|
+
mode: 'reveal',
|
|
58
|
+
selection: node.range
|
|
59
|
+
};
|
|
60
|
+
await this.selectInEditor(node, options);
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
this.outlineViewService.onDidOpen(async node => {
|
|
64
|
+
if (MonacoOutlineSymbolInformationNode.is(node)) {
|
|
65
|
+
const options: EditorOpenerOptions = {
|
|
66
|
+
selection: {
|
|
67
|
+
start: node.range.start
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
await this.selectInEditor(node, options);
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
protected async selectInEditor(node: MonacoOutlineSymbolInformationNode, options?: EditorOpenerOptions): Promise<void> {
|
|
76
|
+
// Avoid cyclic updates: Outline -> Editor -> Outline.
|
|
77
|
+
this.canUpdateOutline = false;
|
|
78
|
+
try {
|
|
79
|
+
await this.editorManager.open(node.uri, options);
|
|
80
|
+
} finally {
|
|
81
|
+
this.canUpdateOutline = true;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
protected handleCurrentEditorChanged(): void {
|
|
86
|
+
this.toDisposeOnEditor.dispose();
|
|
87
|
+
this.toDisposeOnEditor.push(Disposable.create(() => this.roots = undefined));
|
|
88
|
+
const editor = this.editorManager.currentEditor;
|
|
89
|
+
if (editor) {
|
|
90
|
+
const model = MonacoEditor.get(editor)!.getControl().getModel();
|
|
91
|
+
if (model) {
|
|
92
|
+
this.toDisposeOnEditor.push(model.onDidChangeContent(() => {
|
|
93
|
+
this.roots = undefined; // Invalidate the previously resolved roots.
|
|
94
|
+
this.updateOutline();
|
|
95
|
+
}));
|
|
96
|
+
}
|
|
97
|
+
this.toDisposeOnEditor.push(editor.editor.onSelectionChanged(selection => this.updateOutline(selection)));
|
|
98
|
+
}
|
|
99
|
+
this.updateOutline();
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
protected tokenSource = new monaco.CancellationTokenSource();
|
|
103
|
+
protected async updateOutline(editorSelection?: Range): Promise<void> {
|
|
104
|
+
if (!this.canUpdateOutline) {
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
this.tokenSource.cancel();
|
|
108
|
+
this.tokenSource = new monaco.CancellationTokenSource();
|
|
109
|
+
const token = this.tokenSource.token;
|
|
110
|
+
|
|
111
|
+
const editor = MonacoEditor.get(this.editorManager.currentEditor);
|
|
112
|
+
const model = editor && editor.getControl().getModel();
|
|
113
|
+
const roots = model && await this.createRoots(model, token, editorSelection);
|
|
114
|
+
if (token.isCancellationRequested) {
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
this.outlineViewService.publish(roots || []);
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
protected async createRoots(
|
|
121
|
+
model: monaco.editor.ITextModel | ITextModel, token: monaco.CancellationToken, editorSelection?: Range
|
|
122
|
+
): Promise<MonacoOutlineSymbolInformationNode[]> {
|
|
123
|
+
model = model as ITextModel;
|
|
124
|
+
if (this.roots && this.roots.length > 0) {
|
|
125
|
+
// Reset the selection on the tree nodes, so that we can apply the new ones based on the `editorSelection`.
|
|
126
|
+
const resetSelection = (node: MonacoOutlineSymbolInformationNode) => {
|
|
127
|
+
node.selected = false;
|
|
128
|
+
node.children.forEach(resetSelection);
|
|
129
|
+
};
|
|
130
|
+
this.roots.forEach(resetSelection);
|
|
131
|
+
} else {
|
|
132
|
+
this.roots = [];
|
|
133
|
+
const providers = StandaloneServices.get(ILanguageFeaturesService).documentSymbolProvider.all(model);
|
|
134
|
+
if (token.isCancellationRequested) {
|
|
135
|
+
return [];
|
|
136
|
+
}
|
|
137
|
+
const uri = new URI(model.uri.toString());
|
|
138
|
+
for (const provider of providers) {
|
|
139
|
+
try {
|
|
140
|
+
const symbols = await provider.provideDocumentSymbols(model, token) ?? [];
|
|
141
|
+
if (token.isCancellationRequested) {
|
|
142
|
+
return [];
|
|
143
|
+
}
|
|
144
|
+
const nodes = this.createNodes(uri, symbols);
|
|
145
|
+
if (providers.length > 1 && provider.displayName) {
|
|
146
|
+
const providerRoot = this.createProviderRootNode(uri, provider.displayName, nodes);
|
|
147
|
+
this.roots.push(providerRoot);
|
|
148
|
+
} else {
|
|
149
|
+
this.roots.push(...nodes);
|
|
150
|
+
}
|
|
151
|
+
} catch {
|
|
152
|
+
/* collect symbols from other providers */
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
this.applySelection(this.roots, editorSelection);
|
|
157
|
+
return this.roots;
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
protected createProviderRootNode(uri: URI, displayName: string, children: MonacoOutlineSymbolInformationNode[]): MonacoOutlineSymbolInformationNode {
|
|
161
|
+
const node: MonacoOutlineSymbolInformationNode = {
|
|
162
|
+
uri,
|
|
163
|
+
id: displayName,
|
|
164
|
+
name: displayName,
|
|
165
|
+
iconClass: '',
|
|
166
|
+
range: this.asRange(new monaco.Range(1, 1, 1, 1)),
|
|
167
|
+
fullRange: this.asRange(new monaco.Range(1, 1, 1, 1)),
|
|
168
|
+
children,
|
|
169
|
+
parent: undefined,
|
|
170
|
+
selected: false,
|
|
171
|
+
expanded: true
|
|
172
|
+
};
|
|
173
|
+
return node;
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
protected createNodes(uri: URI, symbols: monaco.languages.DocumentSymbol[] | DocumentSymbol[]): MonacoOutlineSymbolInformationNode[] {
|
|
177
|
+
symbols = symbols as monaco.languages.DocumentSymbol[];
|
|
178
|
+
let rangeBased = false;
|
|
179
|
+
const ids = new Map();
|
|
180
|
+
const roots: MonacoOutlineSymbolInformationNode[] = [];
|
|
181
|
+
const nodesByName = symbols.sort(this.orderByPosition).reduce((result, symbol) => {
|
|
182
|
+
const node = this.createNode(uri, symbol, ids);
|
|
183
|
+
if (symbol.children) {
|
|
184
|
+
MonacoOutlineSymbolInformationNode.insert(roots, node);
|
|
185
|
+
} else {
|
|
186
|
+
rangeBased = rangeBased || symbol.range.startLineNumber !== symbol.range.endLineNumber;
|
|
187
|
+
const values = result.get(symbol.name) || [];
|
|
188
|
+
values.push({ symbol, node });
|
|
189
|
+
result.set(symbol.name, values);
|
|
190
|
+
}
|
|
191
|
+
return result;
|
|
192
|
+
}, new Map<string, MonacoOutlineContribution.NodeAndSymbol[]>());
|
|
193
|
+
|
|
194
|
+
for (const nodes of nodesByName.values()) {
|
|
195
|
+
for (const { node, symbol } of nodes) {
|
|
196
|
+
if (!symbol.containerName) {
|
|
197
|
+
MonacoOutlineSymbolInformationNode.insert(roots, node);
|
|
198
|
+
} else {
|
|
199
|
+
const possibleParents = nodesByName.get(symbol.containerName);
|
|
200
|
+
if (possibleParents) {
|
|
201
|
+
const parent = possibleParents.find(possibleParent => this.parentContains(symbol, possibleParent.symbol, rangeBased));
|
|
202
|
+
if (parent) {
|
|
203
|
+
node.parent = parent.node;
|
|
204
|
+
MonacoOutlineSymbolInformationNode.insert(parent.node.children, node);
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
if (!roots.length) {
|
|
211
|
+
const nodes = nodesByName.values().next().value;
|
|
212
|
+
if (nodes && !nodes[0].node.parent) {
|
|
213
|
+
return [nodes[0].node];
|
|
214
|
+
}
|
|
215
|
+
return [];
|
|
216
|
+
}
|
|
217
|
+
return roots;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
/**
|
|
221
|
+
* Sets the selection on the sub-trees based on the optional editor selection.
|
|
222
|
+
* Select the narrowest node that is strictly contains the editor selection.
|
|
223
|
+
*/
|
|
224
|
+
protected applySelection(roots: MonacoOutlineSymbolInformationNode[], editorSelection?: Range): boolean {
|
|
225
|
+
if (editorSelection) {
|
|
226
|
+
for (const root of roots) {
|
|
227
|
+
if (this.parentContains(editorSelection, root.fullRange, true)) {
|
|
228
|
+
const { children } = root;
|
|
229
|
+
root.selected = !root.expanded || !this.applySelection(children, editorSelection);
|
|
230
|
+
return true;
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
return false;
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
/**
|
|
238
|
+
* Returns `true` if `candidate` is strictly contained inside `parent`
|
|
239
|
+
*
|
|
240
|
+
* If the argument is a `DocumentSymbol`, then `getFullRange` will be used to retrieve the range of the underlying symbol.
|
|
241
|
+
*/
|
|
242
|
+
protected parentContains(candidate: monaco.languages.DocumentSymbol | Range, parent: monaco.languages.DocumentSymbol | Range, rangeBased: boolean): boolean {
|
|
243
|
+
// TODO: move this code to the `monaco-languageclient`: https://github.com/eclipse-theia/theia/pull/2885#discussion_r217800446
|
|
244
|
+
const candidateRange = Range.is(candidate) ? candidate : this.getFullRange(candidate);
|
|
245
|
+
const parentRange = Range.is(parent) ? parent : this.getFullRange(parent);
|
|
246
|
+
const sameStartLine = candidateRange.start.line === parentRange.start.line;
|
|
247
|
+
const startColGreaterOrEqual = candidateRange.start.character >= parentRange.start.character;
|
|
248
|
+
const startLineGreater = candidateRange.start.line > parentRange.start.line;
|
|
249
|
+
const sameEndLine = candidateRange.end.line === parentRange.end.line;
|
|
250
|
+
const endColSmallerOrEqual = candidateRange.end.character <= parentRange.end.character;
|
|
251
|
+
const endLineSmaller = candidateRange.end.line < parentRange.end.line;
|
|
252
|
+
return (((sameStartLine && startColGreaterOrEqual || startLineGreater) &&
|
|
253
|
+
(sameEndLine && endColSmallerOrEqual || endLineSmaller)) || !rangeBased);
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
/**
|
|
257
|
+
* `monaco` to LSP `Range` converter. Converts the `1-based` location indices into `0-based` ones.
|
|
258
|
+
*/
|
|
259
|
+
protected asRange(range: monaco.IRange): Range {
|
|
260
|
+
const { startLineNumber, startColumn, endLineNumber, endColumn } = range;
|
|
261
|
+
return {
|
|
262
|
+
start: {
|
|
263
|
+
line: startLineNumber - 1,
|
|
264
|
+
character: startColumn - 1
|
|
265
|
+
},
|
|
266
|
+
end: {
|
|
267
|
+
line: endLineNumber - 1,
|
|
268
|
+
character: endColumn - 1
|
|
269
|
+
}
|
|
270
|
+
};
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
/**
|
|
274
|
+
* Returns with a range enclosing this symbol not including leading/trailing whitespace but everything else like comments.
|
|
275
|
+
* This information is typically used to determine if the clients cursor is inside the symbol to reveal in the symbol in the UI.
|
|
276
|
+
* This allows to obtain the range including the associated comments.
|
|
277
|
+
*
|
|
278
|
+
* See: [`DocumentSymbol#range`](https://microsoft.github.io/language-server-protocol/specification#textDocument_documentSymbol) for more details.
|
|
279
|
+
*/
|
|
280
|
+
protected getFullRange(documentSymbol: monaco.languages.DocumentSymbol): Range {
|
|
281
|
+
return this.asRange(documentSymbol.range);
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
/**
|
|
285
|
+
* The range that should be selected and revealed when this symbol is being picked, e.g the name of a function. Must be contained by the `getSelectionRange`.
|
|
286
|
+
*
|
|
287
|
+
* See: [`DocumentSymbol#selectionRange`](https://microsoft.github.io/language-server-protocol/specification#textDocument_documentSymbol) for more details.
|
|
288
|
+
*/
|
|
289
|
+
protected getNameRange(documentSymbol: monaco.languages.DocumentSymbol): Range {
|
|
290
|
+
return this.asRange(documentSymbol.selectionRange);
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
protected createNode(
|
|
294
|
+
uri: URI, symbol: monaco.languages.DocumentSymbol, ids: Map<string, number>, parent?: MonacoOutlineSymbolInformationNode
|
|
295
|
+
): MonacoOutlineSymbolInformationNode {
|
|
296
|
+
const id = this.createId(symbol.name, ids);
|
|
297
|
+
const children: MonacoOutlineSymbolInformationNode[] = [];
|
|
298
|
+
const node: MonacoOutlineSymbolInformationNode = {
|
|
299
|
+
children,
|
|
300
|
+
id,
|
|
301
|
+
iconClass: monaco.languages.SymbolKind[symbol.kind].toString().toLowerCase(),
|
|
302
|
+
name: this.getName(symbol),
|
|
303
|
+
detail: this.getDetail(symbol),
|
|
304
|
+
parent,
|
|
305
|
+
uri,
|
|
306
|
+
range: this.getNameRange(symbol),
|
|
307
|
+
fullRange: this.getFullRange(symbol),
|
|
308
|
+
selected: false,
|
|
309
|
+
expanded: this.shouldExpand(symbol)
|
|
310
|
+
};
|
|
311
|
+
if (symbol.children) {
|
|
312
|
+
for (const child of symbol.children) {
|
|
313
|
+
MonacoOutlineSymbolInformationNode.insert(children, this.createNode(uri, child, ids, node));
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
return node;
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
protected getName(symbol: monaco.languages.DocumentSymbol): string {
|
|
320
|
+
return symbol.name;
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
protected getDetail(symbol: monaco.languages.DocumentSymbol): string {
|
|
324
|
+
return symbol.detail;
|
|
325
|
+
}
|
|
326
|
+
|
|
327
|
+
protected createId(name: string, ids: Map<string, number>): string {
|
|
328
|
+
const counter = ids.get(name);
|
|
329
|
+
const index = typeof counter === 'number' ? counter + 1 : 0;
|
|
330
|
+
ids.set(name, index);
|
|
331
|
+
return name + '_' + index;
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
protected shouldExpand(symbol: monaco.languages.DocumentSymbol): boolean {
|
|
335
|
+
return [
|
|
336
|
+
monaco.languages.SymbolKind.Class,
|
|
337
|
+
monaco.languages.SymbolKind.Enum, monaco.languages.SymbolKind.File,
|
|
338
|
+
monaco.languages.SymbolKind.Interface, monaco.languages.SymbolKind.Module,
|
|
339
|
+
monaco.languages.SymbolKind.Namespace, monaco.languages.SymbolKind.Object,
|
|
340
|
+
monaco.languages.SymbolKind.Package, monaco.languages.SymbolKind.Struct
|
|
341
|
+
].indexOf(symbol.kind) !== -1;
|
|
342
|
+
}
|
|
343
|
+
|
|
344
|
+
protected orderByPosition(symbol: monaco.languages.DocumentSymbol, symbol2: monaco.languages.DocumentSymbol): number {
|
|
345
|
+
const startLineComparison = symbol.range.startLineNumber - symbol2.range.startLineNumber;
|
|
346
|
+
if (startLineComparison !== 0) {
|
|
347
|
+
return startLineComparison;
|
|
348
|
+
}
|
|
349
|
+
const startOffsetComparison = symbol.range.startColumn - symbol2.range.startColumn;
|
|
350
|
+
if (startOffsetComparison !== 0) {
|
|
351
|
+
return startOffsetComparison;
|
|
352
|
+
}
|
|
353
|
+
const endLineComparison = symbol.range.endLineNumber - symbol2.range.endLineNumber;
|
|
354
|
+
if (endLineComparison !== 0) {
|
|
355
|
+
return endLineComparison;
|
|
356
|
+
}
|
|
357
|
+
return symbol.range.endColumn - symbol2.range.endColumn;
|
|
358
|
+
}
|
|
359
|
+
|
|
360
|
+
}
|
|
361
|
+
export namespace MonacoOutlineContribution {
|
|
362
|
+
export interface NodeAndSymbol {
|
|
363
|
+
node: MonacoOutlineSymbolInformationNode;
|
|
364
|
+
symbol: monaco.languages.DocumentSymbol
|
|
365
|
+
}
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
export interface MonacoOutlineSymbolInformationNode extends OutlineSymbolInformationNode {
|
|
369
|
+
uri: URI;
|
|
370
|
+
range: Range;
|
|
371
|
+
fullRange: Range;
|
|
372
|
+
detail?: string;
|
|
373
|
+
parent: MonacoOutlineSymbolInformationNode | undefined;
|
|
374
|
+
children: MonacoOutlineSymbolInformationNode[];
|
|
375
|
+
}
|
|
376
|
+
|
|
377
|
+
export namespace MonacoOutlineSymbolInformationNode {
|
|
378
|
+
export function is(node: TreeNode): node is MonacoOutlineSymbolInformationNode {
|
|
379
|
+
return OutlineSymbolInformationNode.is(node) && 'uri' in node && 'range' in node;
|
|
380
|
+
}
|
|
381
|
+
export function insert(nodes: MonacoOutlineSymbolInformationNode[], node: MonacoOutlineSymbolInformationNode): void {
|
|
382
|
+
const index = nodes.findIndex(current => compare(node, current) < 0);
|
|
383
|
+
if (index === -1) {
|
|
384
|
+
nodes.push(node);
|
|
385
|
+
} else {
|
|
386
|
+
nodes.splice(index, 0, node);
|
|
387
|
+
}
|
|
388
|
+
}
|
|
389
|
+
export function compare(node: MonacoOutlineSymbolInformationNode, node2: MonacoOutlineSymbolInformationNode): number {
|
|
390
|
+
const startLineComparison = node.range.start.line - node2.range.start.line;
|
|
391
|
+
if (startLineComparison !== 0) {
|
|
392
|
+
return startLineComparison;
|
|
393
|
+
}
|
|
394
|
+
const startColumnComparison = node.range.start.character - node2.range.start.character;
|
|
395
|
+
if (startColumnComparison !== 0) {
|
|
396
|
+
return startColumnComparison;
|
|
397
|
+
}
|
|
398
|
+
const endLineComparison = node2.range.end.line - node.range.end.line;
|
|
399
|
+
if (endLineComparison !== 0) {
|
|
400
|
+
return endLineComparison;
|
|
401
|
+
}
|
|
402
|
+
return node2.range.end.character - node.range.end.character;
|
|
403
|
+
}
|
|
404
|
+
}
|