@theia/monaco 1.45.0 → 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,250 +1,250 @@
|
|
|
1
|
-
// *****************************************************************************
|
|
2
|
-
// Copyright (C) 2018 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
|
-
* Copyright (c) Microsoft Corporation and others. All rights reserved.
|
|
18
|
-
* Licensed under the MIT License. See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.
|
|
19
|
-
*--------------------------------------------------------------------------------------------*/
|
|
20
|
-
|
|
21
|
-
import { Disposable, DisposableCollection, Event, Emitter } from '@theia/core';
|
|
22
|
-
import { TrackedRangeStickiness } from '@theia/editor/lib/browser';
|
|
23
|
-
import * as monaco from '@theia/monaco-editor-core';
|
|
24
|
-
|
|
25
|
-
export interface MonacoEditorViewZone extends monaco.editor.IViewZone {
|
|
26
|
-
id: string;
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
export class MonacoEditorZoneWidget implements Disposable {
|
|
30
|
-
|
|
31
|
-
private arrow: Arrow | undefined;
|
|
32
|
-
|
|
33
|
-
readonly zoneNode = document.createElement('div');
|
|
34
|
-
readonly containerNode = document.createElement('div');
|
|
35
|
-
|
|
36
|
-
protected readonly onDidLayoutChangeEmitter = new Emitter<monaco.editor.IDimension>();
|
|
37
|
-
readonly onDidLayoutChange: Event<monaco.editor.IDimension> = this.onDidLayoutChangeEmitter.event;
|
|
38
|
-
|
|
39
|
-
protected viewZone: MonacoEditorViewZone | undefined;
|
|
40
|
-
|
|
41
|
-
protected readonly toHide = new DisposableCollection();
|
|
42
|
-
|
|
43
|
-
protected readonly toDispose = new DisposableCollection(
|
|
44
|
-
this.onDidLayoutChangeEmitter,
|
|
45
|
-
this.toHide
|
|
46
|
-
);
|
|
47
|
-
|
|
48
|
-
editor: monaco.editor.IStandaloneCodeEditor;
|
|
49
|
-
|
|
50
|
-
constructor(
|
|
51
|
-
editorInstance: monaco.editor.IStandaloneCodeEditor, readonly showArrow: boolean = true
|
|
52
|
-
) {
|
|
53
|
-
this.editor = editorInstance;
|
|
54
|
-
this.zoneNode.classList.add('zone-widget');
|
|
55
|
-
this.containerNode.classList.add('zone-widget-container');
|
|
56
|
-
this.zoneNode.appendChild(this.containerNode);
|
|
57
|
-
this.updateWidth();
|
|
58
|
-
this.toDispose.push(this.editor.onDidLayoutChange(info => this.updateWidth(info)));
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
dispose(): void {
|
|
62
|
-
this.toDispose.dispose();
|
|
63
|
-
this.hide();
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
protected _options: MonacoEditorZoneWidget.Options | undefined;
|
|
67
|
-
get options(): MonacoEditorZoneWidget.Options | undefined {
|
|
68
|
-
return this.viewZone ? this._options : undefined;
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
hide(): void {
|
|
72
|
-
this.toHide.dispose();
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
show(options: MonacoEditorZoneWidget.Options): void {
|
|
76
|
-
let { afterLineNumber, afterColumn, heightInLines } = this._options = { showFrame: true, ...options };
|
|
77
|
-
const lineHeight = this.editor.getOption(monaco.editor.EditorOption.lineHeight);
|
|
78
|
-
// adjust heightInLines to viewport
|
|
79
|
-
const maxHeightInLines = Math.max(12, (this.editor.getLayoutInfo().height / lineHeight) * 0.8);
|
|
80
|
-
heightInLines = Math.min(heightInLines, maxHeightInLines);
|
|
81
|
-
let arrowHeight = 0;
|
|
82
|
-
this.toHide.dispose();
|
|
83
|
-
this.editor.changeViewZones(accessor => {
|
|
84
|
-
this.zoneNode.style.top = '-1000px';
|
|
85
|
-
const domNode = document.createElement('div');
|
|
86
|
-
domNode.style.overflow = 'hidden';
|
|
87
|
-
const zone: monaco.editor.IViewZone = {
|
|
88
|
-
domNode,
|
|
89
|
-
afterLineNumber,
|
|
90
|
-
afterColumn,
|
|
91
|
-
heightInLines,
|
|
92
|
-
onDomNodeTop: zoneTop => this.updateTop(zoneTop),
|
|
93
|
-
onComputedHeight: zoneHeight => this.updateHeight(zoneHeight)
|
|
94
|
-
};
|
|
95
|
-
this.viewZone = Object.assign(zone, {
|
|
96
|
-
id: accessor.addZone(zone)
|
|
97
|
-
});
|
|
98
|
-
const id = this.viewZone.id;
|
|
99
|
-
this.toHide.push(Disposable.create(() => {
|
|
100
|
-
this.editor.changeViewZones(a => a.removeZone(id));
|
|
101
|
-
this.viewZone = undefined;
|
|
102
|
-
}));
|
|
103
|
-
if (this.showArrow) {
|
|
104
|
-
this.arrow = new Arrow(this.editor);
|
|
105
|
-
arrowHeight = Math.round(lineHeight / 3);
|
|
106
|
-
this.arrow.height = arrowHeight;
|
|
107
|
-
this.arrow.show({ lineNumber: options.afterLineNumber, column: 0 });
|
|
108
|
-
|
|
109
|
-
this.toHide.push(this.arrow);
|
|
110
|
-
}
|
|
111
|
-
const widget: monaco.editor.IOverlayWidget = {
|
|
112
|
-
getId: () => 'editor-zone-widget-' + id,
|
|
113
|
-
getDomNode: () => this.zoneNode,
|
|
114
|
-
// eslint-disable-next-line no-null/no-null
|
|
115
|
-
getPosition: () => null!
|
|
116
|
-
};
|
|
117
|
-
this.editor.addOverlayWidget(widget);
|
|
118
|
-
this.toHide.push(Disposable.create(() => this.editor.removeOverlayWidget(widget)));
|
|
119
|
-
});
|
|
120
|
-
|
|
121
|
-
this.containerNode.style.overflow = 'hidden';
|
|
122
|
-
this.updateContainerHeight(heightInLines * lineHeight);
|
|
123
|
-
|
|
124
|
-
const model = this.editor.getModel();
|
|
125
|
-
if (model) {
|
|
126
|
-
const revealLineNumber = Math.min(model.getLineCount(), Math.max(1, afterLineNumber + 1));
|
|
127
|
-
this.editor.revealLine(revealLineNumber, monaco.editor.ScrollType.Smooth);
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
layout(heightInLines: number): void {
|
|
132
|
-
if (this.viewZone && this.viewZone.heightInLines !== heightInLines) {
|
|
133
|
-
this.viewZone.heightInLines = heightInLines;
|
|
134
|
-
const id = this.viewZone.id;
|
|
135
|
-
this.editor.changeViewZones(accessor => accessor.layoutZone(id));
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
protected updateTop(top: number): void {
|
|
140
|
-
this.zoneNode.style.top = top + (this.showArrow ? 6 : 0) + 'px';
|
|
141
|
-
}
|
|
142
|
-
protected updateHeight(zoneHeight: number): void {
|
|
143
|
-
this.zoneNode.style.height = zoneHeight + 'px';
|
|
144
|
-
this.updateContainerHeight(zoneHeight);
|
|
145
|
-
}
|
|
146
|
-
protected updateContainerHeight(zoneHeight: number): void {
|
|
147
|
-
const { frameWidth, height } = this.computeContainerHeight(zoneHeight);
|
|
148
|
-
this.containerNode.style.height = height + 'px';
|
|
149
|
-
this.containerNode.style.borderTopWidth = frameWidth + 'px';
|
|
150
|
-
this.containerNode.style.borderBottomWidth = frameWidth + 'px';
|
|
151
|
-
const width = this.computeWidth();
|
|
152
|
-
this.onDidLayoutChangeEmitter.fire({ height, width });
|
|
153
|
-
}
|
|
154
|
-
protected computeContainerHeight(zoneHeight: number): {
|
|
155
|
-
height: number,
|
|
156
|
-
frameWidth: number
|
|
157
|
-
} {
|
|
158
|
-
const lineHeight = this.editor.getOption(monaco.editor.EditorOption.lineHeight);
|
|
159
|
-
const frameWidth = this._options && this._options.frameWidth;
|
|
160
|
-
const frameThickness = this._options && this._options.showFrame ? Math.round(lineHeight / 9) : 0;
|
|
161
|
-
return {
|
|
162
|
-
frameWidth: frameWidth !== undefined ? frameWidth : frameThickness,
|
|
163
|
-
height: zoneHeight - 2 * frameThickness
|
|
164
|
-
};
|
|
165
|
-
}
|
|
166
|
-
|
|
167
|
-
protected updateWidth(info: monaco.editor.EditorLayoutInfo = this.editor.getLayoutInfo()): void {
|
|
168
|
-
const width = this.computeWidth(info);
|
|
169
|
-
this.zoneNode.style.width = width + 'px';
|
|
170
|
-
this.zoneNode.style.left = this.computeLeft(info) + 'px';
|
|
171
|
-
}
|
|
172
|
-
protected computeWidth(info: monaco.editor.EditorLayoutInfo = this.editor.getLayoutInfo()): number {
|
|
173
|
-
return info.width - info.minimap.minimapWidth - info.verticalScrollbarWidth;
|
|
174
|
-
}
|
|
175
|
-
protected computeLeft(info: monaco.editor.EditorLayoutInfo = this.editor.getLayoutInfo()): number {
|
|
176
|
-
// If minimap is to the left, we move beyond it
|
|
177
|
-
if (info.minimap.minimapWidth > 0 && info.minimap.minimapLeft === 0) {
|
|
178
|
-
return info.minimap.minimapWidth;
|
|
179
|
-
}
|
|
180
|
-
return 0;
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
}
|
|
184
|
-
|
|
185
|
-
class IdGenerator {
|
|
186
|
-
private lastId: number;
|
|
187
|
-
constructor(private prefix: string) {
|
|
188
|
-
this.lastId = 0;
|
|
189
|
-
}
|
|
190
|
-
|
|
191
|
-
nextId(): string {
|
|
192
|
-
return this.prefix + (++this.lastId);
|
|
193
|
-
}
|
|
194
|
-
}
|
|
195
|
-
|
|
196
|
-
class Arrow implements Disposable {
|
|
197
|
-
|
|
198
|
-
private readonly idGenerator = new IdGenerator('.arrow-decoration-');
|
|
199
|
-
|
|
200
|
-
private readonly ruleName = this.idGenerator.nextId();
|
|
201
|
-
private decorations: string[] = [];
|
|
202
|
-
private _height: number = -1;
|
|
203
|
-
|
|
204
|
-
constructor(
|
|
205
|
-
private readonly _editor: monaco.editor.ICodeEditor
|
|
206
|
-
) { }
|
|
207
|
-
|
|
208
|
-
dispose(): void {
|
|
209
|
-
this.hide();
|
|
210
|
-
}
|
|
211
|
-
|
|
212
|
-
set height(value: number) {
|
|
213
|
-
if (this._height !== value) {
|
|
214
|
-
this._height = value;
|
|
215
|
-
this._updateStyle();
|
|
216
|
-
}
|
|
217
|
-
}
|
|
218
|
-
|
|
219
|
-
private _updateStyle(): void {
|
|
220
|
-
const style = document.createElement('style');
|
|
221
|
-
style.type = 'text/css';
|
|
222
|
-
style.media = 'screen';
|
|
223
|
-
document.getElementsByTagName('head')[0].appendChild(style);
|
|
224
|
-
const selector = `.monaco-editor ${this.ruleName}`;
|
|
225
|
-
const cssText = `border-style: solid; border-color: transparent transparent var(--theia-peekView-border); border-width:
|
|
226
|
-
${this._height}px; bottom: -${this._height}px; margin-left: -${this._height}px; `;
|
|
227
|
-
(<CSSStyleSheet>style.sheet).insertRule(selector + '{' + cssText + '}', 0);
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
show(where: monaco.IPosition): void {
|
|
231
|
-
this.decorations = this._editor.deltaDecorations(
|
|
232
|
-
this.decorations,
|
|
233
|
-
[{ range: monaco.Range.fromPositions(where), options: { className: this.ruleName, stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges } }]
|
|
234
|
-
);
|
|
235
|
-
}
|
|
236
|
-
|
|
237
|
-
hide(): void {
|
|
238
|
-
this._editor.deltaDecorations(this.decorations, []);
|
|
239
|
-
}
|
|
240
|
-
}
|
|
241
|
-
|
|
242
|
-
export namespace MonacoEditorZoneWidget {
|
|
243
|
-
export interface Options {
|
|
244
|
-
afterLineNumber: number,
|
|
245
|
-
afterColumn?: number,
|
|
246
|
-
heightInLines: number,
|
|
247
|
-
showFrame?: boolean,
|
|
248
|
-
frameWidth?: number
|
|
249
|
-
}
|
|
250
|
-
}
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2018 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
|
+
* Copyright (c) Microsoft Corporation and others. All rights reserved.
|
|
18
|
+
* Licensed under the MIT License. See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.
|
|
19
|
+
*--------------------------------------------------------------------------------------------*/
|
|
20
|
+
|
|
21
|
+
import { Disposable, DisposableCollection, Event, Emitter } from '@theia/core';
|
|
22
|
+
import { TrackedRangeStickiness } from '@theia/editor/lib/browser';
|
|
23
|
+
import * as monaco from '@theia/monaco-editor-core';
|
|
24
|
+
|
|
25
|
+
export interface MonacoEditorViewZone extends monaco.editor.IViewZone {
|
|
26
|
+
id: string;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export class MonacoEditorZoneWidget implements Disposable {
|
|
30
|
+
|
|
31
|
+
private arrow: Arrow | undefined;
|
|
32
|
+
|
|
33
|
+
readonly zoneNode = document.createElement('div');
|
|
34
|
+
readonly containerNode = document.createElement('div');
|
|
35
|
+
|
|
36
|
+
protected readonly onDidLayoutChangeEmitter = new Emitter<monaco.editor.IDimension>();
|
|
37
|
+
readonly onDidLayoutChange: Event<monaco.editor.IDimension> = this.onDidLayoutChangeEmitter.event;
|
|
38
|
+
|
|
39
|
+
protected viewZone: MonacoEditorViewZone | undefined;
|
|
40
|
+
|
|
41
|
+
protected readonly toHide = new DisposableCollection();
|
|
42
|
+
|
|
43
|
+
protected readonly toDispose = new DisposableCollection(
|
|
44
|
+
this.onDidLayoutChangeEmitter,
|
|
45
|
+
this.toHide
|
|
46
|
+
);
|
|
47
|
+
|
|
48
|
+
editor: monaco.editor.IStandaloneCodeEditor;
|
|
49
|
+
|
|
50
|
+
constructor(
|
|
51
|
+
editorInstance: monaco.editor.IStandaloneCodeEditor, readonly showArrow: boolean = true
|
|
52
|
+
) {
|
|
53
|
+
this.editor = editorInstance;
|
|
54
|
+
this.zoneNode.classList.add('zone-widget');
|
|
55
|
+
this.containerNode.classList.add('zone-widget-container');
|
|
56
|
+
this.zoneNode.appendChild(this.containerNode);
|
|
57
|
+
this.updateWidth();
|
|
58
|
+
this.toDispose.push(this.editor.onDidLayoutChange(info => this.updateWidth(info)));
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
dispose(): void {
|
|
62
|
+
this.toDispose.dispose();
|
|
63
|
+
this.hide();
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
protected _options: MonacoEditorZoneWidget.Options | undefined;
|
|
67
|
+
get options(): MonacoEditorZoneWidget.Options | undefined {
|
|
68
|
+
return this.viewZone ? this._options : undefined;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
hide(): void {
|
|
72
|
+
this.toHide.dispose();
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
show(options: MonacoEditorZoneWidget.Options): void {
|
|
76
|
+
let { afterLineNumber, afterColumn, heightInLines } = this._options = { showFrame: true, ...options };
|
|
77
|
+
const lineHeight = this.editor.getOption(monaco.editor.EditorOption.lineHeight);
|
|
78
|
+
// adjust heightInLines to viewport
|
|
79
|
+
const maxHeightInLines = Math.max(12, (this.editor.getLayoutInfo().height / lineHeight) * 0.8);
|
|
80
|
+
heightInLines = Math.min(heightInLines, maxHeightInLines);
|
|
81
|
+
let arrowHeight = 0;
|
|
82
|
+
this.toHide.dispose();
|
|
83
|
+
this.editor.changeViewZones(accessor => {
|
|
84
|
+
this.zoneNode.style.top = '-1000px';
|
|
85
|
+
const domNode = document.createElement('div');
|
|
86
|
+
domNode.style.overflow = 'hidden';
|
|
87
|
+
const zone: monaco.editor.IViewZone = {
|
|
88
|
+
domNode,
|
|
89
|
+
afterLineNumber,
|
|
90
|
+
afterColumn,
|
|
91
|
+
heightInLines,
|
|
92
|
+
onDomNodeTop: zoneTop => this.updateTop(zoneTop),
|
|
93
|
+
onComputedHeight: zoneHeight => this.updateHeight(zoneHeight)
|
|
94
|
+
};
|
|
95
|
+
this.viewZone = Object.assign(zone, {
|
|
96
|
+
id: accessor.addZone(zone)
|
|
97
|
+
});
|
|
98
|
+
const id = this.viewZone.id;
|
|
99
|
+
this.toHide.push(Disposable.create(() => {
|
|
100
|
+
this.editor.changeViewZones(a => a.removeZone(id));
|
|
101
|
+
this.viewZone = undefined;
|
|
102
|
+
}));
|
|
103
|
+
if (this.showArrow) {
|
|
104
|
+
this.arrow = new Arrow(this.editor);
|
|
105
|
+
arrowHeight = Math.round(lineHeight / 3);
|
|
106
|
+
this.arrow.height = arrowHeight;
|
|
107
|
+
this.arrow.show({ lineNumber: options.afterLineNumber, column: 0 });
|
|
108
|
+
|
|
109
|
+
this.toHide.push(this.arrow);
|
|
110
|
+
}
|
|
111
|
+
const widget: monaco.editor.IOverlayWidget = {
|
|
112
|
+
getId: () => 'editor-zone-widget-' + id,
|
|
113
|
+
getDomNode: () => this.zoneNode,
|
|
114
|
+
// eslint-disable-next-line no-null/no-null
|
|
115
|
+
getPosition: () => null!
|
|
116
|
+
};
|
|
117
|
+
this.editor.addOverlayWidget(widget);
|
|
118
|
+
this.toHide.push(Disposable.create(() => this.editor.removeOverlayWidget(widget)));
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
this.containerNode.style.overflow = 'hidden';
|
|
122
|
+
this.updateContainerHeight(heightInLines * lineHeight);
|
|
123
|
+
|
|
124
|
+
const model = this.editor.getModel();
|
|
125
|
+
if (model) {
|
|
126
|
+
const revealLineNumber = Math.min(model.getLineCount(), Math.max(1, afterLineNumber + 1));
|
|
127
|
+
this.editor.revealLine(revealLineNumber, monaco.editor.ScrollType.Smooth);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
layout(heightInLines: number): void {
|
|
132
|
+
if (this.viewZone && this.viewZone.heightInLines !== heightInLines) {
|
|
133
|
+
this.viewZone.heightInLines = heightInLines;
|
|
134
|
+
const id = this.viewZone.id;
|
|
135
|
+
this.editor.changeViewZones(accessor => accessor.layoutZone(id));
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
protected updateTop(top: number): void {
|
|
140
|
+
this.zoneNode.style.top = top + (this.showArrow ? 6 : 0) + 'px';
|
|
141
|
+
}
|
|
142
|
+
protected updateHeight(zoneHeight: number): void {
|
|
143
|
+
this.zoneNode.style.height = zoneHeight + 'px';
|
|
144
|
+
this.updateContainerHeight(zoneHeight);
|
|
145
|
+
}
|
|
146
|
+
protected updateContainerHeight(zoneHeight: number): void {
|
|
147
|
+
const { frameWidth, height } = this.computeContainerHeight(zoneHeight);
|
|
148
|
+
this.containerNode.style.height = height + 'px';
|
|
149
|
+
this.containerNode.style.borderTopWidth = frameWidth + 'px';
|
|
150
|
+
this.containerNode.style.borderBottomWidth = frameWidth + 'px';
|
|
151
|
+
const width = this.computeWidth();
|
|
152
|
+
this.onDidLayoutChangeEmitter.fire({ height, width });
|
|
153
|
+
}
|
|
154
|
+
protected computeContainerHeight(zoneHeight: number): {
|
|
155
|
+
height: number,
|
|
156
|
+
frameWidth: number
|
|
157
|
+
} {
|
|
158
|
+
const lineHeight = this.editor.getOption(monaco.editor.EditorOption.lineHeight);
|
|
159
|
+
const frameWidth = this._options && this._options.frameWidth;
|
|
160
|
+
const frameThickness = this._options && this._options.showFrame ? Math.round(lineHeight / 9) : 0;
|
|
161
|
+
return {
|
|
162
|
+
frameWidth: frameWidth !== undefined ? frameWidth : frameThickness,
|
|
163
|
+
height: zoneHeight - 2 * frameThickness
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
protected updateWidth(info: monaco.editor.EditorLayoutInfo = this.editor.getLayoutInfo()): void {
|
|
168
|
+
const width = this.computeWidth(info);
|
|
169
|
+
this.zoneNode.style.width = width + 'px';
|
|
170
|
+
this.zoneNode.style.left = this.computeLeft(info) + 'px';
|
|
171
|
+
}
|
|
172
|
+
protected computeWidth(info: monaco.editor.EditorLayoutInfo = this.editor.getLayoutInfo()): number {
|
|
173
|
+
return info.width - info.minimap.minimapWidth - info.verticalScrollbarWidth;
|
|
174
|
+
}
|
|
175
|
+
protected computeLeft(info: monaco.editor.EditorLayoutInfo = this.editor.getLayoutInfo()): number {
|
|
176
|
+
// If minimap is to the left, we move beyond it
|
|
177
|
+
if (info.minimap.minimapWidth > 0 && info.minimap.minimapLeft === 0) {
|
|
178
|
+
return info.minimap.minimapWidth;
|
|
179
|
+
}
|
|
180
|
+
return 0;
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
class IdGenerator {
|
|
186
|
+
private lastId: number;
|
|
187
|
+
constructor(private prefix: string) {
|
|
188
|
+
this.lastId = 0;
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
nextId(): string {
|
|
192
|
+
return this.prefix + (++this.lastId);
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
class Arrow implements Disposable {
|
|
197
|
+
|
|
198
|
+
private readonly idGenerator = new IdGenerator('.arrow-decoration-');
|
|
199
|
+
|
|
200
|
+
private readonly ruleName = this.idGenerator.nextId();
|
|
201
|
+
private decorations: string[] = [];
|
|
202
|
+
private _height: number = -1;
|
|
203
|
+
|
|
204
|
+
constructor(
|
|
205
|
+
private readonly _editor: monaco.editor.ICodeEditor
|
|
206
|
+
) { }
|
|
207
|
+
|
|
208
|
+
dispose(): void {
|
|
209
|
+
this.hide();
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
set height(value: number) {
|
|
213
|
+
if (this._height !== value) {
|
|
214
|
+
this._height = value;
|
|
215
|
+
this._updateStyle();
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
private _updateStyle(): void {
|
|
220
|
+
const style = document.createElement('style');
|
|
221
|
+
style.type = 'text/css';
|
|
222
|
+
style.media = 'screen';
|
|
223
|
+
document.getElementsByTagName('head')[0].appendChild(style);
|
|
224
|
+
const selector = `.monaco-editor ${this.ruleName}`;
|
|
225
|
+
const cssText = `border-style: solid; border-color: transparent transparent var(--theia-peekView-border); border-width:
|
|
226
|
+
${this._height}px; bottom: -${this._height}px; margin-left: -${this._height}px; `;
|
|
227
|
+
(<CSSStyleSheet>style.sheet).insertRule(selector + '{' + cssText + '}', 0);
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
show(where: monaco.IPosition): void {
|
|
231
|
+
this.decorations = this._editor.deltaDecorations(
|
|
232
|
+
this.decorations,
|
|
233
|
+
[{ range: monaco.Range.fromPositions(where), options: { className: this.ruleName, stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges } }]
|
|
234
|
+
);
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
hide(): void {
|
|
238
|
+
this._editor.deltaDecorations(this.decorations, []);
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
|
|
242
|
+
export namespace MonacoEditorZoneWidget {
|
|
243
|
+
export interface Options {
|
|
244
|
+
afterLineNumber: number,
|
|
245
|
+
afterColumn?: number,
|
|
246
|
+
heightInLines: number,
|
|
247
|
+
showFrame?: boolean,
|
|
248
|
+
frameWidth?: number
|
|
249
|
+
}
|
|
250
|
+
}
|