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