@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,158 +1,158 @@
|
|
|
1
|
-
// *****************************************************************************
|
|
2
|
-
// Copyright (C) 2020 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 } from '@theia/core/shared/inversify';
|
|
18
|
-
import { Position, Range, Location, TextEdit, Diagnostic, DiagnosticRelatedInformation } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
19
|
-
import { RecursivePartial } from '@theia/core/lib/common/types';
|
|
20
|
-
import * as monaco from '@theia/monaco-editor-core';
|
|
21
|
-
|
|
22
|
-
@injectable()
|
|
23
|
-
export class ProtocolToMonacoConverter {
|
|
24
|
-
|
|
25
|
-
asRange(range: undefined): undefined;
|
|
26
|
-
asRange(range: Range): monaco.Range;
|
|
27
|
-
asRange(range: Range | undefined): monaco.Range | undefined;
|
|
28
|
-
asRange(range: RecursivePartial<Range>): Partial<monaco.IRange>;
|
|
29
|
-
asRange(range: RecursivePartial<Range> | undefined): monaco.Range | Partial<monaco.IRange> | undefined;
|
|
30
|
-
asRange(range: RecursivePartial<Range> | undefined): monaco.Range | Partial<monaco.IRange> | undefined {
|
|
31
|
-
if (range === undefined) {
|
|
32
|
-
return undefined;
|
|
33
|
-
}
|
|
34
|
-
const start = this.asPosition(range.start);
|
|
35
|
-
const end = this.asPosition(range.end);
|
|
36
|
-
if (start instanceof monaco.Position && end instanceof monaco.Position) {
|
|
37
|
-
return new monaco.Range(start.lineNumber, start.column, end.lineNumber, end.column);
|
|
38
|
-
}
|
|
39
|
-
const startLineNumber = !start || start.lineNumber === undefined ? undefined : start.lineNumber;
|
|
40
|
-
const startColumn = !start || start.column === undefined ? undefined : start.column;
|
|
41
|
-
const endLineNumber = !end || end.lineNumber === undefined ? undefined : end.lineNumber;
|
|
42
|
-
const endColumn = !end || end.column === undefined ? undefined : end.column;
|
|
43
|
-
return { startLineNumber, startColumn, endLineNumber, endColumn };
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
asPosition(position: undefined): undefined;
|
|
47
|
-
asPosition(position: Position): monaco.Position;
|
|
48
|
-
asPosition(position: Position | undefined): monaco.Position | undefined;
|
|
49
|
-
asPosition(position: Partial<Position>): Partial<monaco.IPosition>;
|
|
50
|
-
asPosition(position: Partial<Position> | undefined): monaco.Position | Partial<monaco.IPosition> | undefined;
|
|
51
|
-
asPosition(position: Partial<Position> | undefined): monaco.Position | Partial<monaco.IPosition> | undefined {
|
|
52
|
-
if (position === undefined) {
|
|
53
|
-
return undefined;
|
|
54
|
-
}
|
|
55
|
-
const { line, character } = position;
|
|
56
|
-
const lineNumber = line === undefined ? undefined : line + 1;
|
|
57
|
-
const column = character === undefined ? undefined : character + 1;
|
|
58
|
-
if (lineNumber !== undefined && column !== undefined) {
|
|
59
|
-
return new monaco.Position(lineNumber, column);
|
|
60
|
-
}
|
|
61
|
-
return { lineNumber, column };
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
asLocation(item: Location): monaco.languages.Location;
|
|
65
|
-
asLocation(item: undefined): undefined;
|
|
66
|
-
asLocation(item: Location | undefined): monaco.languages.Location | undefined;
|
|
67
|
-
asLocation(item: Location | undefined): monaco.languages.Location | undefined {
|
|
68
|
-
if (!item) {
|
|
69
|
-
return undefined;
|
|
70
|
-
}
|
|
71
|
-
const uri = monaco.Uri.parse(item.uri);
|
|
72
|
-
const range = this.asRange(item.range)!;
|
|
73
|
-
return {
|
|
74
|
-
uri, range
|
|
75
|
-
};
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
asTextEdit(edit: TextEdit): monaco.languages.TextEdit;
|
|
79
|
-
asTextEdit(edit: undefined): undefined;
|
|
80
|
-
asTextEdit(edit: TextEdit | undefined): undefined;
|
|
81
|
-
asTextEdit(edit: TextEdit | undefined): monaco.languages.TextEdit | undefined {
|
|
82
|
-
if (!edit) {
|
|
83
|
-
return undefined;
|
|
84
|
-
}
|
|
85
|
-
const range = this.asRange(edit.range)!;
|
|
86
|
-
return {
|
|
87
|
-
range,
|
|
88
|
-
text: edit.newText
|
|
89
|
-
};
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
asTextEdits(items: TextEdit[]): monaco.languages.TextEdit[];
|
|
93
|
-
asTextEdits(items: undefined): undefined;
|
|
94
|
-
asTextEdits(items: TextEdit[] | undefined): monaco.languages.TextEdit[] | undefined;
|
|
95
|
-
asTextEdits(items: TextEdit[] | undefined): monaco.languages.TextEdit[] | undefined {
|
|
96
|
-
if (!items) {
|
|
97
|
-
return undefined;
|
|
98
|
-
}
|
|
99
|
-
return items.map(item => this.asTextEdit(item));
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
asSeverity(severity?: number): monaco.MarkerSeverity {
|
|
103
|
-
if (severity === 1) {
|
|
104
|
-
return monaco.MarkerSeverity.Error;
|
|
105
|
-
}
|
|
106
|
-
if (severity === 2) {
|
|
107
|
-
return monaco.MarkerSeverity.Warning;
|
|
108
|
-
}
|
|
109
|
-
if (severity === 3) {
|
|
110
|
-
return monaco.MarkerSeverity.Info;
|
|
111
|
-
}
|
|
112
|
-
return monaco.MarkerSeverity.Hint;
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
asDiagnostics(diagnostics: undefined): undefined;
|
|
116
|
-
asDiagnostics(diagnostics: Diagnostic[]): monaco.editor.IMarkerData[];
|
|
117
|
-
asDiagnostics(diagnostics: Diagnostic[] | undefined): monaco.editor.IMarkerData[] | undefined;
|
|
118
|
-
asDiagnostics(diagnostics: Diagnostic[] | undefined): monaco.editor.IMarkerData[] | undefined {
|
|
119
|
-
if (!diagnostics) {
|
|
120
|
-
return undefined;
|
|
121
|
-
}
|
|
122
|
-
return diagnostics.map(diagnostic => this.asDiagnostic(diagnostic));
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
asDiagnostic(diagnostic: Diagnostic): monaco.editor.IMarkerData {
|
|
126
|
-
return {
|
|
127
|
-
code: typeof diagnostic.code === 'number' ? diagnostic.code.toString() : diagnostic.code,
|
|
128
|
-
severity: this.asSeverity(diagnostic.severity),
|
|
129
|
-
message: diagnostic.message,
|
|
130
|
-
source: diagnostic.source,
|
|
131
|
-
startLineNumber: diagnostic.range.start.line + 1,
|
|
132
|
-
startColumn: diagnostic.range.start.character + 1,
|
|
133
|
-
endLineNumber: diagnostic.range.end.line + 1,
|
|
134
|
-
endColumn: diagnostic.range.end.character + 1,
|
|
135
|
-
relatedInformation: this.asRelatedInformations(diagnostic.relatedInformation),
|
|
136
|
-
tags: diagnostic.tags
|
|
137
|
-
};
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
asRelatedInformations(relatedInformation?: DiagnosticRelatedInformation[]): monaco.editor.IRelatedInformation[] | undefined {
|
|
141
|
-
if (!relatedInformation) {
|
|
142
|
-
return undefined;
|
|
143
|
-
}
|
|
144
|
-
return relatedInformation.map(item => this.asRelatedInformation(item));
|
|
145
|
-
}
|
|
146
|
-
|
|
147
|
-
asRelatedInformation(relatedInformation: DiagnosticRelatedInformation): monaco.editor.IRelatedInformation {
|
|
148
|
-
return {
|
|
149
|
-
resource: monaco.Uri.parse(relatedInformation.location.uri),
|
|
150
|
-
startLineNumber: relatedInformation.location.range.start.line + 1,
|
|
151
|
-
startColumn: relatedInformation.location.range.start.character + 1,
|
|
152
|
-
endLineNumber: relatedInformation.location.range.end.line + 1,
|
|
153
|
-
endColumn: relatedInformation.location.range.end.character + 1,
|
|
154
|
-
message: relatedInformation.message
|
|
155
|
-
};
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
}
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2020 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 } from '@theia/core/shared/inversify';
|
|
18
|
+
import { Position, Range, Location, TextEdit, Diagnostic, DiagnosticRelatedInformation } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
19
|
+
import { RecursivePartial } from '@theia/core/lib/common/types';
|
|
20
|
+
import * as monaco from '@theia/monaco-editor-core';
|
|
21
|
+
|
|
22
|
+
@injectable()
|
|
23
|
+
export class ProtocolToMonacoConverter {
|
|
24
|
+
|
|
25
|
+
asRange(range: undefined): undefined;
|
|
26
|
+
asRange(range: Range): monaco.Range;
|
|
27
|
+
asRange(range: Range | undefined): monaco.Range | undefined;
|
|
28
|
+
asRange(range: RecursivePartial<Range>): Partial<monaco.IRange>;
|
|
29
|
+
asRange(range: RecursivePartial<Range> | undefined): monaco.Range | Partial<monaco.IRange> | undefined;
|
|
30
|
+
asRange(range: RecursivePartial<Range> | undefined): monaco.Range | Partial<monaco.IRange> | undefined {
|
|
31
|
+
if (range === undefined) {
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
const start = this.asPosition(range.start);
|
|
35
|
+
const end = this.asPosition(range.end);
|
|
36
|
+
if (start instanceof monaco.Position && end instanceof monaco.Position) {
|
|
37
|
+
return new monaco.Range(start.lineNumber, start.column, end.lineNumber, end.column);
|
|
38
|
+
}
|
|
39
|
+
const startLineNumber = !start || start.lineNumber === undefined ? undefined : start.lineNumber;
|
|
40
|
+
const startColumn = !start || start.column === undefined ? undefined : start.column;
|
|
41
|
+
const endLineNumber = !end || end.lineNumber === undefined ? undefined : end.lineNumber;
|
|
42
|
+
const endColumn = !end || end.column === undefined ? undefined : end.column;
|
|
43
|
+
return { startLineNumber, startColumn, endLineNumber, endColumn };
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
asPosition(position: undefined): undefined;
|
|
47
|
+
asPosition(position: Position): monaco.Position;
|
|
48
|
+
asPosition(position: Position | undefined): monaco.Position | undefined;
|
|
49
|
+
asPosition(position: Partial<Position>): Partial<monaco.IPosition>;
|
|
50
|
+
asPosition(position: Partial<Position> | undefined): monaco.Position | Partial<monaco.IPosition> | undefined;
|
|
51
|
+
asPosition(position: Partial<Position> | undefined): monaco.Position | Partial<monaco.IPosition> | undefined {
|
|
52
|
+
if (position === undefined) {
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
const { line, character } = position;
|
|
56
|
+
const lineNumber = line === undefined ? undefined : line + 1;
|
|
57
|
+
const column = character === undefined ? undefined : character + 1;
|
|
58
|
+
if (lineNumber !== undefined && column !== undefined) {
|
|
59
|
+
return new monaco.Position(lineNumber, column);
|
|
60
|
+
}
|
|
61
|
+
return { lineNumber, column };
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
asLocation(item: Location): monaco.languages.Location;
|
|
65
|
+
asLocation(item: undefined): undefined;
|
|
66
|
+
asLocation(item: Location | undefined): monaco.languages.Location | undefined;
|
|
67
|
+
asLocation(item: Location | undefined): monaco.languages.Location | undefined {
|
|
68
|
+
if (!item) {
|
|
69
|
+
return undefined;
|
|
70
|
+
}
|
|
71
|
+
const uri = monaco.Uri.parse(item.uri);
|
|
72
|
+
const range = this.asRange(item.range)!;
|
|
73
|
+
return {
|
|
74
|
+
uri, range
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
asTextEdit(edit: TextEdit): monaco.languages.TextEdit;
|
|
79
|
+
asTextEdit(edit: undefined): undefined;
|
|
80
|
+
asTextEdit(edit: TextEdit | undefined): undefined;
|
|
81
|
+
asTextEdit(edit: TextEdit | undefined): monaco.languages.TextEdit | undefined {
|
|
82
|
+
if (!edit) {
|
|
83
|
+
return undefined;
|
|
84
|
+
}
|
|
85
|
+
const range = this.asRange(edit.range)!;
|
|
86
|
+
return {
|
|
87
|
+
range,
|
|
88
|
+
text: edit.newText
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
asTextEdits(items: TextEdit[]): monaco.languages.TextEdit[];
|
|
93
|
+
asTextEdits(items: undefined): undefined;
|
|
94
|
+
asTextEdits(items: TextEdit[] | undefined): monaco.languages.TextEdit[] | undefined;
|
|
95
|
+
asTextEdits(items: TextEdit[] | undefined): monaco.languages.TextEdit[] | undefined {
|
|
96
|
+
if (!items) {
|
|
97
|
+
return undefined;
|
|
98
|
+
}
|
|
99
|
+
return items.map(item => this.asTextEdit(item));
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
asSeverity(severity?: number): monaco.MarkerSeverity {
|
|
103
|
+
if (severity === 1) {
|
|
104
|
+
return monaco.MarkerSeverity.Error;
|
|
105
|
+
}
|
|
106
|
+
if (severity === 2) {
|
|
107
|
+
return monaco.MarkerSeverity.Warning;
|
|
108
|
+
}
|
|
109
|
+
if (severity === 3) {
|
|
110
|
+
return monaco.MarkerSeverity.Info;
|
|
111
|
+
}
|
|
112
|
+
return monaco.MarkerSeverity.Hint;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
asDiagnostics(diagnostics: undefined): undefined;
|
|
116
|
+
asDiagnostics(diagnostics: Diagnostic[]): monaco.editor.IMarkerData[];
|
|
117
|
+
asDiagnostics(diagnostics: Diagnostic[] | undefined): monaco.editor.IMarkerData[] | undefined;
|
|
118
|
+
asDiagnostics(diagnostics: Diagnostic[] | undefined): monaco.editor.IMarkerData[] | undefined {
|
|
119
|
+
if (!diagnostics) {
|
|
120
|
+
return undefined;
|
|
121
|
+
}
|
|
122
|
+
return diagnostics.map(diagnostic => this.asDiagnostic(diagnostic));
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
asDiagnostic(diagnostic: Diagnostic): monaco.editor.IMarkerData {
|
|
126
|
+
return {
|
|
127
|
+
code: typeof diagnostic.code === 'number' ? diagnostic.code.toString() : diagnostic.code,
|
|
128
|
+
severity: this.asSeverity(diagnostic.severity),
|
|
129
|
+
message: diagnostic.message,
|
|
130
|
+
source: diagnostic.source,
|
|
131
|
+
startLineNumber: diagnostic.range.start.line + 1,
|
|
132
|
+
startColumn: diagnostic.range.start.character + 1,
|
|
133
|
+
endLineNumber: diagnostic.range.end.line + 1,
|
|
134
|
+
endColumn: diagnostic.range.end.character + 1,
|
|
135
|
+
relatedInformation: this.asRelatedInformations(diagnostic.relatedInformation),
|
|
136
|
+
tags: diagnostic.tags
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
asRelatedInformations(relatedInformation?: DiagnosticRelatedInformation[]): monaco.editor.IRelatedInformation[] | undefined {
|
|
141
|
+
if (!relatedInformation) {
|
|
142
|
+
return undefined;
|
|
143
|
+
}
|
|
144
|
+
return relatedInformation.map(item => this.asRelatedInformation(item));
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
asRelatedInformation(relatedInformation: DiagnosticRelatedInformation): monaco.editor.IRelatedInformation {
|
|
148
|
+
return {
|
|
149
|
+
resource: monaco.Uri.parse(relatedInformation.location.uri),
|
|
150
|
+
startLineNumber: relatedInformation.location.range.start.line + 1,
|
|
151
|
+
startColumn: relatedInformation.location.range.start.character + 1,
|
|
152
|
+
endLineNumber: relatedInformation.location.range.end.line + 1,
|
|
153
|
+
endColumn: relatedInformation.location.range.end.character + 1,
|
|
154
|
+
message: relatedInformation.message
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
}
|