@theia/monaco 1.24.0-next.46 → 1.24.0-next.49
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/lib/browser/monaco-bulk-edit-service.d.ts +6 -4
- package/lib/browser/monaco-bulk-edit-service.d.ts.map +1 -1
- package/lib/browser/monaco-bulk-edit-service.js.map +1 -1
- package/lib/browser/monaco-color-registry.d.ts +6 -3
- package/lib/browser/monaco-color-registry.d.ts.map +1 -1
- package/lib/browser/monaco-color-registry.js +17 -13
- package/lib/browser/monaco-color-registry.js.map +1 -1
- package/lib/browser/monaco-command-service.d.ts +6 -5
- package/lib/browser/monaco-command-service.d.ts.map +1 -1
- package/lib/browser/monaco-command-service.js +2 -2
- package/lib/browser/monaco-command-service.js.map +1 -1
- package/lib/browser/monaco-command.d.ts +2 -1
- package/lib/browser/monaco-command.d.ts.map +1 -1
- package/lib/browser/monaco-command.js +17 -16
- package/lib/browser/monaco-command.js.map +1 -1
- package/lib/browser/monaco-context-key-service.d.ts +10 -8
- package/lib/browser/monaco-context-key-service.d.ts.map +1 -1
- package/lib/browser/monaco-context-key-service.js +18 -9
- package/lib/browser/monaco-context-key-service.js.map +1 -1
- package/lib/browser/monaco-context-menu.d.ts +8 -2
- package/lib/browser/monaco-context-menu.d.ts.map +1 -1
- package/lib/browser/monaco-context-menu.js +22 -4
- package/lib/browser/monaco-context-menu.js.map +1 -1
- package/lib/browser/monaco-diagnostic-collection.d.ts +4 -6
- package/lib/browser/monaco-diagnostic-collection.d.ts.map +1 -1
- package/lib/browser/monaco-diagnostic-collection.js +1 -0
- package/lib/browser/monaco-diagnostic-collection.js.map +1 -1
- package/lib/browser/monaco-diff-editor.d.ts +8 -10
- package/lib/browser/monaco-diff-editor.d.ts.map +1 -1
- package/lib/browser/monaco-diff-editor.js +4 -1
- package/lib/browser/monaco-diff-editor.js.map +1 -1
- package/lib/browser/monaco-diff-navigator-factory.d.ts +3 -4
- package/lib/browser/monaco-diff-navigator-factory.d.ts.map +1 -1
- package/lib/browser/monaco-diff-navigator-factory.js +14 -9
- package/lib/browser/monaco-diff-navigator-factory.js.map +1 -1
- package/lib/browser/monaco-editor-model.d.ts +20 -13
- package/lib/browser/monaco-editor-model.d.ts.map +1 -1
- package/lib/browser/monaco-editor-model.js +39 -14
- package/lib/browser/monaco-editor-model.js.map +1 -1
- package/lib/browser/monaco-editor-provider.d.ts +13 -19
- package/lib/browser/monaco-editor-provider.d.ts.map +1 -1
- package/lib/browser/monaco-editor-provider.js +39 -96
- package/lib/browser/monaco-editor-provider.js.map +1 -1
- package/lib/browser/monaco-editor-service.d.ts +9 -8
- package/lib/browser/monaco-editor-service.d.ts.map +1 -1
- package/lib/browser/monaco-editor-service.js +19 -8
- package/lib/browser/monaco-editor-service.js.map +1 -1
- package/lib/browser/monaco-editor-zone-widget.d.ts +3 -3
- package/lib/browser/monaco-editor-zone-widget.d.ts.map +1 -1
- package/lib/browser/monaco-editor-zone-widget.js +3 -2
- package/lib/browser/monaco-editor-zone-widget.js.map +1 -1
- package/lib/browser/monaco-editor.d.ts +20 -18
- package/lib/browser/monaco-editor.d.ts.map +1 -1
- package/lib/browser/monaco-editor.js +53 -19
- package/lib/browser/monaco-editor.js.map +1 -1
- package/lib/browser/monaco-formatting-conflicts.d.ts +1 -1
- package/lib/browser/monaco-formatting-conflicts.d.ts.map +1 -1
- package/lib/browser/monaco-formatting-conflicts.js +2 -1
- package/lib/browser/monaco-formatting-conflicts.js.map +1 -1
- package/lib/browser/monaco-frontend-application-contribution.d.ts +10 -1
- package/lib/browser/monaco-frontend-application-contribution.d.ts.map +1 -1
- package/lib/browser/monaco-frontend-application-contribution.js +42 -1
- package/lib/browser/monaco-frontend-application-contribution.js.map +1 -1
- package/lib/browser/monaco-frontend-module.d.ts +2 -1
- package/lib/browser/monaco-frontend-module.d.ts.map +1 -1
- package/lib/browser/monaco-frontend-module.js +8 -5
- package/lib/browser/monaco-frontend-module.js.map +1 -1
- package/lib/browser/monaco-gotoline-quick-access.d.ts +4 -2
- package/lib/browser/monaco-gotoline-quick-access.d.ts.map +1 -1
- package/lib/browser/monaco-gotoline-quick-access.js +9 -4
- package/lib/browser/monaco-gotoline-quick-access.js.map +1 -1
- package/lib/browser/monaco-gotosymbol-quick-access.d.ts +10 -3
- package/lib/browser/monaco-gotosymbol-quick-access.d.ts.map +1 -1
- package/lib/browser/monaco-gotosymbol-quick-access.js +19 -8
- package/lib/browser/monaco-gotosymbol-quick-access.js.map +1 -1
- package/lib/browser/monaco-indexed-db.d.ts +1 -1
- package/lib/browser/monaco-indexed-db.d.ts.map +1 -1
- package/lib/browser/monaco-indexed-db.js.map +1 -1
- package/lib/browser/monaco-keybinding.d.ts.map +1 -1
- package/lib/browser/monaco-keybinding.js +4 -2
- 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.d.ts.map +1 -1
- package/lib/browser/monaco-keycode-map.js +122 -122
- package/lib/browser/monaco-keycode-map.js.map +1 -1
- package/lib/browser/monaco-languages.d.ts +1 -1
- package/lib/browser/monaco-languages.d.ts.map +1 -1
- package/lib/browser/monaco-languages.js +1 -0
- package/lib/browser/monaco-languages.js.map +1 -1
- package/lib/browser/monaco-menu.js +7 -7
- package/lib/browser/monaco-menu.js.map +1 -1
- package/lib/browser/monaco-mime-service.d.ts.map +1 -1
- package/lib/browser/monaco-mime-service.js +8 -4
- package/lib/browser/monaco-mime-service.js.map +1 -1
- package/lib/browser/monaco-outline-contribution.d.ts +15 -16
- package/lib/browser/monaco-outline-contribution.d.ts.map +1 -1
- package/lib/browser/monaco-outline-contribution.js +21 -19
- package/lib/browser/monaco-outline-contribution.js.map +1 -1
- package/lib/browser/monaco-quick-access-registry.d.ts.map +1 -1
- package/lib/browser/monaco-quick-access-registry.js +11 -13
- package/lib/browser/monaco-quick-access-registry.js.map +1 -1
- package/lib/browser/monaco-quick-input-service.d.ts +46 -25
- package/lib/browser/monaco-quick-input-service.d.ts.map +1 -1
- package/lib/browser/monaco-quick-input-service.js +40 -29
- package/lib/browser/monaco-quick-input-service.js.map +1 -1
- package/lib/browser/monaco-resolved-keybinding.d.ts +9 -7
- package/lib/browser/monaco-resolved-keybinding.d.ts.map +1 -1
- package/lib/browser/monaco-resolved-keybinding.js +35 -14
- package/lib/browser/monaco-resolved-keybinding.js.map +1 -1
- package/lib/browser/monaco-snippet-suggest-provider.d.ts +1 -1
- package/lib/browser/monaco-snippet-suggest-provider.d.ts.map +1 -1
- package/lib/browser/monaco-snippet-suggest-provider.js +5 -3
- package/lib/browser/monaco-snippet-suggest-provider.js.map +1 -1
- package/lib/browser/monaco-status-bar-contribution.d.ts +2 -2
- package/lib/browser/monaco-status-bar-contribution.d.ts.map +1 -1
- package/lib/browser/monaco-status-bar-contribution.js.map +1 -1
- package/lib/browser/monaco-text-model-service.d.ts +14 -8
- package/lib/browser/monaco-text-model-service.d.ts.map +1 -1
- package/lib/browser/monaco-text-model-service.js +35 -17
- package/lib/browser/monaco-text-model-service.js.map +1 -1
- package/lib/browser/monaco-theming-service.d.ts +1 -1
- package/lib/browser/monaco-theming-service.d.ts.map +1 -1
- package/lib/browser/monaco-theming-service.js.map +1 -1
- package/lib/browser/monaco-to-protocol-converter.d.ts +1 -1
- package/lib/browser/monaco-to-protocol-converter.d.ts.map +1 -1
- package/lib/browser/monaco-to-protocol-converter.js.map +1 -1
- package/lib/browser/monaco-workspace.d.ts +7 -6
- package/lib/browser/monaco-workspace.d.ts.map +1 -1
- package/lib/browser/monaco-workspace.js +13 -7
- package/lib/browser/monaco-workspace.js.map +1 -1
- package/lib/browser/protocol-to-monaco-converter.d.ts +1 -1
- package/lib/browser/protocol-to-monaco-converter.d.ts.map +1 -1
- package/lib/browser/protocol-to-monaco-converter.js +1 -0
- package/lib/browser/protocol-to-monaco-converter.js.map +1 -1
- package/lib/browser/textmate/monaco-textmate-service.d.ts.map +1 -1
- package/lib/browser/textmate/monaco-textmate-service.js +14 -11
- package/lib/browser/textmate/monaco-textmate-service.js.map +1 -1
- package/lib/browser/textmate/monaco-theme-registry.d.ts +5 -3
- package/lib/browser/textmate/monaco-theme-registry.d.ts.map +1 -1
- package/lib/browser/textmate/monaco-theme-registry.js +6 -3
- package/lib/browser/textmate/monaco-theme-registry.js.map +1 -1
- package/lib/browser/textmate/monaco-theme-types.d.ts +5 -4
- package/lib/browser/textmate/monaco-theme-types.d.ts.map +1 -1
- package/lib/browser/textmate/monaco-theme-types.js +1 -0
- package/lib/browser/textmate/monaco-theme-types.js.map +1 -1
- package/lib/browser/textmate/textmate-contribution.d.ts.map +1 -1
- package/lib/browser/textmate/textmate-contribution.js +1 -0
- package/lib/browser/textmate/textmate-contribution.js.map +1 -1
- package/lib/browser/textmate/textmate-snippet-completion-provider.d.ts +1 -1
- package/lib/browser/textmate/textmate-snippet-completion-provider.d.ts.map +1 -1
- package/lib/browser/textmate/textmate-snippet-completion-provider.js +3 -1
- package/lib/browser/textmate/textmate-snippet-completion-provider.js.map +1 -1
- package/lib/browser/textmate/textmate-tokenizer.d.ts +1 -1
- package/lib/browser/textmate/textmate-tokenizer.d.ts.map +1 -1
- package/lib/browser/textmate/textmate-tokenizer.js +2 -2
- package/lib/browser/textmate/textmate-tokenizer.js.map +1 -1
- package/package.json +9 -10
- package/src/browser/monaco-bulk-edit-service.ts +9 -4
- package/src/browser/monaco-color-registry.ts +17 -14
- package/src/browser/monaco-command-service.ts +8 -7
- package/src/browser/monaco-command.ts +18 -16
- package/src/browser/monaco-context-key-service.ts +25 -16
- package/src/browser/monaco-context-menu.ts +23 -6
- package/src/browser/monaco-diagnostic-collection.ts +4 -5
- package/src/browser/monaco-diff-editor.ts +12 -14
- package/src/browser/monaco-diff-navigator-factory.ts +18 -14
- package/src/browser/monaco-editor-model.ts +56 -24
- package/src/browser/monaco-editor-provider.ts +48 -114
- package/src/browser/monaco-editor-service.ts +27 -16
- package/src/browser/monaco-editor-zone-widget.ts +6 -2
- package/src/browser/monaco-editor.ts +85 -44
- package/src/browser/monaco-formatting-conflicts.ts +10 -5
- package/src/browser/monaco-frontend-application-contribution.ts +40 -2
- package/src/browser/monaco-frontend-module.ts +18 -14
- package/src/browser/monaco-gotoline-quick-access.ts +10 -5
- package/src/browser/monaco-gotosymbol-quick-access.ts +17 -6
- package/src/browser/monaco-indexed-db.ts +1 -0
- package/src/browser/monaco-keybinding.ts +3 -2
- package/src/browser/monaco-keycode-map.ts +72 -71
- package/src/browser/monaco-languages.ts +1 -0
- package/src/browser/monaco-menu.ts +7 -7
- package/src/browser/monaco-mime-service.ts +9 -5
- package/src/browser/monaco-outline-contribution.ts +36 -32
- package/src/browser/monaco-quick-access-registry.ts +29 -19
- package/src/browser/monaco-quick-input-service.ts +102 -59
- package/src/browser/monaco-resolved-keybinding.ts +52 -28
- package/src/browser/monaco-snippet-suggest-provider.ts +5 -3
- package/src/browser/monaco-status-bar-contribution.ts +2 -1
- package/src/browser/monaco-text-model-service.ts +49 -26
- package/src/browser/monaco-theming-service.ts +1 -0
- package/src/browser/monaco-to-protocol-converter.ts +1 -0
- package/src/browser/monaco-workspace.ts +28 -19
- package/src/browser/protocol-to-monaco-converter.ts +1 -0
- package/src/browser/textmate/monaco-textmate-service.ts +15 -12
- package/src/browser/textmate/monaco-theme-registry.ts +10 -5
- package/src/browser/textmate/monaco-theme-types.ts +5 -4
- package/src/browser/textmate/textmate-contribution.ts +1 -0
- package/src/browser/textmate/textmate-snippet-completion-provider.ts +4 -1
- package/src/browser/textmate/textmate-tokenizer.ts +3 -2
- package/lib/browser/monaco-browser-module.d.ts +0 -5
- package/lib/browser/monaco-browser-module.d.ts.map +0 -1
- package/lib/browser/monaco-browser-module.js +0 -27
- package/lib/browser/monaco-browser-module.js.map +0 -1
- package/lib/browser/monaco-comparers.d.ts +0 -10
- package/lib/browser/monaco-comparers.d.ts.map +0 -1
- package/lib/browser/monaco-comparers.js +0 -109
- package/lib/browser/monaco-comparers.js.map +0 -1
- package/lib/browser/monaco-loader.d.ts +0 -4
- package/lib/browser/monaco-loader.d.ts.map +0 -1
- package/lib/browser/monaco-loader.js +0 -177
- package/lib/browser/monaco-loader.js.map +0 -1
- package/lib/electron-browser/monaco-electron-module.d.ts +0 -5
- package/lib/electron-browser/monaco-electron-module.d.ts.map +0 -1
- package/lib/electron-browser/monaco-electron-module.js +0 -50
- package/lib/electron-browser/monaco-electron-module.js.map +0 -1
- package/src/browser/monaco-browser-module.ts +0 -26
- package/src/browser/monaco-comparers.ts +0 -125
- package/src/browser/monaco-loader.ts +0 -193
- package/src/electron-browser/monaco-electron-module.ts +0 -52
- package/src/typings/monaco/index.d.ts +0 -2471
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-editor-zone-widget.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-zone-widget.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;AAChF;;;gGAGgG;;;AAEhG,sCAA+E;AAC/E,uDAAmE;
|
|
1
|
+
{"version":3,"file":"monaco-editor-zone-widget.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-zone-widget.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference types="@theia/monaco-editor-core/monaco" />
|
|
2
1
|
import { ElementExt } from '@theia/core/shared/@phosphor/domutils';
|
|
3
2
|
import URI from '@theia/core/lib/common/uri';
|
|
4
3
|
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
|
|
@@ -8,11 +7,13 @@ import { MonacoEditorModel } from './monaco-editor-model';
|
|
|
8
7
|
import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
|
|
9
8
|
import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
|
|
10
9
|
import { TextEdit } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
11
|
-
import
|
|
12
|
-
import
|
|
13
|
-
import
|
|
14
|
-
import
|
|
15
|
-
|
|
10
|
+
import * as monaco from '@theia/monaco-editor-core';
|
|
11
|
+
import { IInstantiationService, ServiceIdentifier } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
|
|
12
|
+
import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
13
|
+
import { IStandaloneEditorConstructionOptions } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
|
|
14
|
+
export declare type ServicePair<T> = [ServiceIdentifier<T>, T];
|
|
15
|
+
export interface EditorServiceOverrides extends Iterable<ServicePair<unknown>> {
|
|
16
|
+
}
|
|
16
17
|
export declare class MonacoEditorServices {
|
|
17
18
|
protected readonly m2p: MonacoToProtocolConverter;
|
|
18
19
|
protected readonly p2m: ProtocolToMonacoConverter;
|
|
@@ -27,7 +28,7 @@ export declare class MonacoEditor extends MonacoEditorServices implements TextEd
|
|
|
27
28
|
protected readonly autoSizing: boolean;
|
|
28
29
|
protected readonly minHeight: number;
|
|
29
30
|
protected readonly maxHeight: number;
|
|
30
|
-
protected editor: IStandaloneCodeEditor;
|
|
31
|
+
protected editor: monaco.editor.IStandaloneCodeEditor;
|
|
31
32
|
protected readonly onCursorPositionChangedEmitter: Emitter<Position>;
|
|
32
33
|
protected readonly onSelectionChangedEmitter: Emitter<Range>;
|
|
33
34
|
protected readonly onFocusChangedEmitter: Emitter<boolean>;
|
|
@@ -40,11 +41,12 @@ export declare class MonacoEditor extends MonacoEditorServices implements TextEd
|
|
|
40
41
|
protected readonly onResizeEmitter: Emitter<Dimension | null>;
|
|
41
42
|
readonly onDidResize: Event<Dimension | null>;
|
|
42
43
|
readonly documents: Set<MonacoEditorModel>;
|
|
43
|
-
constructor(uri: URI, document: MonacoEditorModel, node: HTMLElement, services: MonacoEditorServices, options?: MonacoEditor.IOptions, override?:
|
|
44
|
+
constructor(uri: URI, document: MonacoEditorModel, node: HTMLElement, services: MonacoEditorServices, options?: MonacoEditor.IOptions, override?: EditorServiceOverrides);
|
|
44
45
|
getEncoding(): string;
|
|
45
46
|
setEncoding(encoding: string, mode: EncodingMode): Promise<void>;
|
|
46
|
-
protected create(options?: IStandaloneEditorConstructionOptions, override?:
|
|
47
|
-
protected
|
|
47
|
+
protected create(options?: monaco.editor.IStandaloneEditorConstructionOptions | IStandaloneEditorConstructionOptions, override?: EditorServiceOverrides): Disposable;
|
|
48
|
+
protected getInstantiatorWithOverrides(override?: EditorServiceOverrides): IInstantiationService;
|
|
49
|
+
protected addHandlers(codeEditor: monaco.editor.IStandaloneCodeEditor): void;
|
|
48
50
|
getVisibleRanges(): Range[];
|
|
49
51
|
protected mapModelContentChange(change: monaco.editor.IModelContentChange): TextDocumentContentChangeDelta;
|
|
50
52
|
get onDispose(): Event<void>;
|
|
@@ -79,21 +81,21 @@ export declare class MonacoEditor extends MonacoEditorServices implements TextEd
|
|
|
79
81
|
isRenameInputVisible(): boolean;
|
|
80
82
|
dispose(): void;
|
|
81
83
|
trigger(source: string, handlerId: string, payload: any): void;
|
|
82
|
-
getControl(): IStandaloneCodeEditor;
|
|
84
|
+
getControl(): monaco.editor.IStandaloneCodeEditor;
|
|
83
85
|
refresh(): void;
|
|
84
86
|
resizeToFit(): void;
|
|
85
87
|
setSize(dimension: Dimension): void;
|
|
86
88
|
protected autoresize(): void;
|
|
87
89
|
protected resize(dimension: Dimension | null): void;
|
|
88
90
|
protected computeLayoutSize(hostNode: HTMLElement, dimension: monaco.editor.IDimension | null): monaco.editor.IDimension;
|
|
89
|
-
protected getWidth(hostNode: HTMLElement, boxSizing: IBoxSizing): number;
|
|
90
|
-
protected getHeight(hostNode: HTMLElement, boxSizing: IBoxSizing): number;
|
|
91
|
+
protected getWidth(hostNode: HTMLElement, boxSizing: ElementExt.IBoxSizing): number;
|
|
92
|
+
protected getHeight(hostNode: HTMLElement, boxSizing: ElementExt.IBoxSizing): number;
|
|
91
93
|
isActionSupported(id: string): boolean;
|
|
92
94
|
runAction(id: string): Promise<void>;
|
|
93
|
-
get commandService(): monaco.commands.ICommandService;
|
|
94
|
-
get instantiationService(): monaco.instantiation.IInstantiationService;
|
|
95
95
|
deltaDecorations(params: DeltaDecorationParams): string[];
|
|
96
|
-
protected toDeltaDecorations(params: DeltaDecorationParams): IModelDeltaDecoration[];
|
|
96
|
+
protected toDeltaDecorations(params: DeltaDecorationParams): monaco.editor.IModelDeltaDecoration[];
|
|
97
|
+
protected fromStringToMarkdownString(hoverMessage?: string | monaco.IMarkdownString | monaco.IMarkdownString[]): monaco.IMarkdownString | monaco.IMarkdownString[] | undefined;
|
|
98
|
+
protected fromMarkdownToString(maybeMarkdown?: null | string | monaco.IMarkdownString | monaco.IMarkdownString[]): string | undefined;
|
|
97
99
|
getLinesDecorations(startLineNumber: number, endLineNumber: number): (EditorDecoration & Readonly<{
|
|
98
100
|
id: string;
|
|
99
101
|
}>)[];
|
|
@@ -137,13 +139,13 @@ export declare namespace MonacoEditor {
|
|
|
137
139
|
*/
|
|
138
140
|
maxHeight?: number;
|
|
139
141
|
}
|
|
140
|
-
interface IOptions extends ICommonOptions, IStandaloneEditorConstructionOptions {
|
|
142
|
+
interface IOptions extends ICommonOptions, monaco.editor.IStandaloneEditorConstructionOptions {
|
|
141
143
|
}
|
|
142
144
|
function getAll(manager: EditorManager): MonacoEditor[];
|
|
143
145
|
function getCurrent(manager: EditorManager): MonacoEditor | undefined;
|
|
144
146
|
function getActive(manager: EditorManager): MonacoEditor | undefined;
|
|
145
147
|
function get(editorWidget: EditorWidget | undefined): MonacoEditor | undefined;
|
|
146
148
|
function findByDocument(manager: EditorManager, document: MonacoEditorModel): MonacoEditor[];
|
|
147
|
-
function getWidgetFor(manager: EditorManager, control: monaco.editor.ICodeEditor | undefined): EditorWidget | undefined;
|
|
149
|
+
function getWidgetFor(manager: EditorManager, control: monaco.editor.ICodeEditor | ICodeEditor | undefined | null): EditorWidget | undefined;
|
|
148
150
|
}
|
|
149
151
|
//# sourceMappingURL=monaco-editor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-editor.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"monaco-editor.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,11 @@ const common_1 = require("@theia/core/lib/common");
|
|
|
35
35
|
const monaco_to_protocol_converter_1 = require("./monaco-to-protocol-converter");
|
|
36
36
|
const protocol_to_monaco_converter_1 = require("./protocol-to-monaco-converter");
|
|
37
37
|
const encodings_1 = require("@theia/core/lib/common/encodings");
|
|
38
|
+
const monaco = require("@theia/monaco-editor-core");
|
|
39
|
+
const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
|
|
40
|
+
const language_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/languages/language");
|
|
41
|
+
const serviceCollection_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection");
|
|
42
|
+
const standaloneCodeEditor_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor");
|
|
38
43
|
let MonacoEditorServices = class MonacoEditorServices {
|
|
39
44
|
constructor(services) {
|
|
40
45
|
Object.assign(this, services);
|
|
@@ -74,7 +79,6 @@ class MonacoEditor extends MonacoEditorServices {
|
|
|
74
79
|
this.onLanguageChanged = this.onLanguageChangedEmitter.event;
|
|
75
80
|
this.onScrollChangedEmitter = new common_1.Emitter();
|
|
76
81
|
this.onEncodingChanged = this.document.onDidChangeEncoding;
|
|
77
|
-
// eslint-disable-next-line no-null/no-null
|
|
78
82
|
this.onResizeEmitter = new common_1.Emitter();
|
|
79
83
|
this.onDidResize = this.onResizeEmitter.event;
|
|
80
84
|
this.documents = new Set();
|
|
@@ -103,13 +107,24 @@ class MonacoEditor extends MonacoEditorServices {
|
|
|
103
107
|
return this.document.setEncoding(encoding, mode);
|
|
104
108
|
}
|
|
105
109
|
create(options, override) {
|
|
106
|
-
|
|
110
|
+
const combinedOptions = Object.assign(Object.assign({}, options), { lightbulb: { enabled: true }, fixedOverflowWidgets: true, scrollbar: {
|
|
107
111
|
useShadows: false,
|
|
108
112
|
verticalHasArrows: false,
|
|
109
113
|
horizontalHasArrows: false,
|
|
110
114
|
verticalScrollbarSize: 10,
|
|
111
115
|
horizontalScrollbarSize: 10
|
|
112
|
-
} })
|
|
116
|
+
} });
|
|
117
|
+
const instantiator = this.getInstantiatorWithOverrides(override);
|
|
118
|
+
// Incomparability of internal and external interfaces.
|
|
119
|
+
return this.editor = instantiator.createInstance(standaloneCodeEditor_1.StandaloneEditor, this.node, combinedOptions);
|
|
120
|
+
}
|
|
121
|
+
getInstantiatorWithOverrides(override) {
|
|
122
|
+
const instantiator = standaloneServices_1.StandaloneServices.initialize({});
|
|
123
|
+
if (override) {
|
|
124
|
+
const overrideServices = new serviceCollection_1.ServiceCollection(...override);
|
|
125
|
+
return instantiator.createChild(overrideServices);
|
|
126
|
+
}
|
|
127
|
+
return instantiator;
|
|
113
128
|
}
|
|
114
129
|
addHandlers(codeEditor) {
|
|
115
130
|
this.toDispose.push(codeEditor.onDidChangeModelLanguage(e => this.fireLanguageChanged(e.newLanguage)));
|
|
@@ -126,7 +141,7 @@ class MonacoEditor extends MonacoEditorServices {
|
|
|
126
141
|
this.toDispose.push(codeEditor.onMouseDown(e => {
|
|
127
142
|
const { element, position, range } = e.target;
|
|
128
143
|
this.onMouseDownEmitter.fire({
|
|
129
|
-
target: Object.assign(Object.assign({}, e.target), { element: element || undefined, mouseColumn: this.m2p.asPosition(undefined, e.target.mouseColumn).character, range: range && this.m2p.asRange(range) || undefined, position: position && this.m2p.asPosition(position.lineNumber, position.column) || undefined }),
|
|
144
|
+
target: Object.assign(Object.assign({}, e.target), { element: element || undefined, mouseColumn: this.m2p.asPosition(undefined, e.target.mouseColumn).character, range: range && this.m2p.asRange(range) || undefined, position: position && this.m2p.asPosition(position.lineNumber, position.column) || undefined, detail: undefined }),
|
|
130
145
|
event: e.event.browserEvent
|
|
131
146
|
});
|
|
132
147
|
}));
|
|
@@ -339,19 +354,37 @@ class MonacoEditor extends MonacoEditorServices {
|
|
|
339
354
|
await action.run();
|
|
340
355
|
}
|
|
341
356
|
}
|
|
342
|
-
get commandService() {
|
|
343
|
-
return this.editor._commandService;
|
|
344
|
-
}
|
|
345
|
-
get instantiationService() {
|
|
346
|
-
return this.editor._instantiationService;
|
|
347
|
-
}
|
|
348
357
|
deltaDecorations(params) {
|
|
349
358
|
const oldDecorations = params.oldDecorations;
|
|
350
359
|
const newDecorations = this.toDeltaDecorations(params);
|
|
351
360
|
return this.editor.deltaDecorations(oldDecorations, newDecorations);
|
|
352
361
|
}
|
|
353
362
|
toDeltaDecorations(params) {
|
|
354
|
-
return params.newDecorations.map(
|
|
363
|
+
return params.newDecorations.map(({ options: theiaOptions, range }) => {
|
|
364
|
+
const options = Object.assign(Object.assign({}, theiaOptions), { hoverMessage: this.fromStringToMarkdownString(theiaOptions.hoverMessage), glyphMarginHoverMessage: this.fromStringToMarkdownString(theiaOptions.glyphMarginHoverMessage) });
|
|
365
|
+
return {
|
|
366
|
+
options,
|
|
367
|
+
range: this.p2m.asRange(range),
|
|
368
|
+
};
|
|
369
|
+
});
|
|
370
|
+
}
|
|
371
|
+
fromStringToMarkdownString(hoverMessage) {
|
|
372
|
+
if (typeof hoverMessage === 'string') {
|
|
373
|
+
return { value: hoverMessage };
|
|
374
|
+
}
|
|
375
|
+
return hoverMessage;
|
|
376
|
+
}
|
|
377
|
+
fromMarkdownToString(maybeMarkdown) {
|
|
378
|
+
if (!maybeMarkdown) {
|
|
379
|
+
return undefined;
|
|
380
|
+
}
|
|
381
|
+
if (typeof maybeMarkdown === 'string') {
|
|
382
|
+
return maybeMarkdown;
|
|
383
|
+
}
|
|
384
|
+
if (Array.isArray(maybeMarkdown)) {
|
|
385
|
+
return maybeMarkdown.map(({ value }) => value).join('\n');
|
|
386
|
+
}
|
|
387
|
+
return maybeMarkdown.value;
|
|
355
388
|
}
|
|
356
389
|
getLinesDecorations(startLineNumber, endLineNumber) {
|
|
357
390
|
const toPosition = (line) => this.p2m.asPosition({ line, character: 0 });
|
|
@@ -364,9 +397,10 @@ class MonacoEditor extends MonacoEditorServices {
|
|
|
364
397
|
}
|
|
365
398
|
toEditorDecoration(decoration) {
|
|
366
399
|
const range = this.m2p.asRange(decoration.range);
|
|
367
|
-
const { id, options } = decoration;
|
|
400
|
+
const { id, options: monacoOptions } = decoration;
|
|
401
|
+
const options = Object.assign(Object.assign({}, monacoOptions), { hoverMessage: this.fromMarkdownToString(monacoOptions.hoverMessage), glyphMarginHoverMessage: this.fromMarkdownToString(monacoOptions.hoverMessage) });
|
|
368
402
|
return {
|
|
369
|
-
options,
|
|
403
|
+
options: (0, common_1.nullToUndefined)(options),
|
|
370
404
|
range,
|
|
371
405
|
id
|
|
372
406
|
};
|
|
@@ -402,11 +436,11 @@ class MonacoEditor extends MonacoEditorServices {
|
|
|
402
436
|
return this._languageAutoDetected;
|
|
403
437
|
}
|
|
404
438
|
async detectLanguage() {
|
|
405
|
-
const
|
|
439
|
+
const languageService = standaloneServices_1.StandaloneServices.get(language_1.ILanguageService);
|
|
406
440
|
const firstLine = this.document.textEditorModel.getLineContent(1);
|
|
407
441
|
const model = this.getControl().getModel();
|
|
408
|
-
const language =
|
|
409
|
-
this.setLanguage(language.
|
|
442
|
+
const language = languageService.createByFilepathOrFirstLine(model && model.uri, firstLine);
|
|
443
|
+
this.setLanguage(language.languageId);
|
|
410
444
|
this._languageAutoDetected = true;
|
|
411
445
|
}
|
|
412
446
|
setLanguage(languageId) {
|
|
@@ -447,7 +481,7 @@ exports.MonacoEditor = MonacoEditor;
|
|
|
447
481
|
}
|
|
448
482
|
MonacoEditor.get = get;
|
|
449
483
|
function findByDocument(manager, document) {
|
|
450
|
-
return getAll(manager).filter(
|
|
484
|
+
return getAll(manager).filter(candidate => candidate.documents.has(document));
|
|
451
485
|
}
|
|
452
486
|
MonacoEditor.findByDocument = findByDocument;
|
|
453
487
|
function getWidgetFor(manager, control) {
|
|
@@ -455,8 +489,8 @@ exports.MonacoEditor = MonacoEditor;
|
|
|
455
489
|
return undefined;
|
|
456
490
|
}
|
|
457
491
|
return manager.all.find(widget => {
|
|
458
|
-
const
|
|
459
|
-
return
|
|
492
|
+
const candidate = get(widget);
|
|
493
|
+
return candidate && candidate.getControl() === control;
|
|
460
494
|
});
|
|
461
495
|
}
|
|
462
496
|
MonacoEditor.getWidgetFor = getWidgetFor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-editor.js","sourceRoot":"","sources":["../../src/browser/monaco-editor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"monaco-editor.js","sourceRoot":"","sources":["../../src/browser/monaco-editor.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export declare class MonacoFormattingConflictsContribution implements FrontendAp
|
|
|
7
7
|
protected readonly preferenceSchema: PreferenceLanguageOverrideService;
|
|
8
8
|
protected readonly editorManager: EditorManager;
|
|
9
9
|
initialize(): Promise<void>;
|
|
10
|
-
|
|
10
|
+
protected setDefaultFormatter(language: string, formatter: string): Promise<void>;
|
|
11
11
|
private getDefaultFormatter;
|
|
12
12
|
private selectFormatter;
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-formatting-conflicts.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-formatting-conflicts.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,iCAAiC,EAAE,MAAM,yBAAyB,CAAC;AAChI,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-formatting-conflicts.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-formatting-conflicts.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,iCAAiC,EAAE,MAAM,yBAAyB,CAAC;AAChI,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAUvE,qBACa,qCAAsC,YAAW,+BAA+B;IAGzF,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,iCAAiC,CAAC;IAGvE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAE1C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;cAOjB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASvF,OAAO,CAAC,mBAAmB;YASb,eAAe;CAyChC"}
|
|
@@ -29,10 +29,11 @@ const inversify_1 = require("@theia/core/shared/inversify");
|
|
|
29
29
|
const browser_1 = require("@theia/core/lib/browser");
|
|
30
30
|
const browser_2 = require("@theia/editor/lib/browser");
|
|
31
31
|
const monaco_quick_input_service_1 = require("./monaco-quick-input-service");
|
|
32
|
+
const format_1 = require("@theia/monaco-editor-core/esm/vs/editor/contrib/format/browser/format");
|
|
32
33
|
const PREFERENCE_NAME = 'editor.defaultFormatter';
|
|
33
34
|
let MonacoFormattingConflictsContribution = class MonacoFormattingConflictsContribution {
|
|
34
35
|
async initialize() {
|
|
35
|
-
|
|
36
|
+
format_1.FormattingConflicts.setFormatterSelector((formatters, document, mode) => this.selectFormatter(formatters, document, mode));
|
|
36
37
|
}
|
|
37
38
|
async setDefaultFormatter(language, formatter) {
|
|
38
39
|
const name = this.preferenceSchema.overridePreferenceName({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-formatting-conflicts.js","sourceRoot":"","sources":["../../src/browser/monaco-formatting-conflicts.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAkE;AAClE,qDAAgI;AAChI,uDAA0D;AAC1D,6EAAuE;
|
|
1
|
+
{"version":3,"file":"monaco-formatting-conflicts.js","sourceRoot":"","sources":["../../src/browser/monaco-formatting-conflicts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,17 @@
|
|
|
1
|
-
import { FrontendApplicationContribution, PreferenceSchemaProvider } from '@theia/core/lib/browser';
|
|
1
|
+
import { FrontendApplicationContribution, PreferenceSchemaProvider, QuickAccessRegistry } from '@theia/core/lib/browser';
|
|
2
2
|
import { MonacoSnippetSuggestProvider } from './monaco-snippet-suggest-provider';
|
|
3
|
+
import { MonacoEditorService } from './monaco-editor-service';
|
|
4
|
+
import { MonacoTextModelService } from './monaco-text-model-service';
|
|
5
|
+
import { ContextKeyService as VSCodeContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
|
|
6
|
+
import { MonacoContextMenuService } from './monaco-context-menu';
|
|
3
7
|
export declare class MonacoFrontendApplicationContribution implements FrontendApplicationContribution {
|
|
8
|
+
protected readonly codeEditorService: MonacoEditorService;
|
|
9
|
+
protected readonly textModelService: MonacoTextModelService;
|
|
10
|
+
protected readonly contextKeyService: VSCodeContextKeyService;
|
|
4
11
|
protected readonly snippetSuggestProvider: MonacoSnippetSuggestProvider;
|
|
5
12
|
protected readonly preferenceSchema: PreferenceSchemaProvider;
|
|
13
|
+
protected readonly quickAccessRegistry: QuickAccessRegistry;
|
|
14
|
+
protected readonly contextMenuService: MonacoContextMenuService;
|
|
6
15
|
initialize(): Promise<void>;
|
|
7
16
|
}
|
|
8
17
|
//# sourceMappingURL=monaco-frontend-application-contribution.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-frontend-application-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-frontend-application-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,+BAA+B,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-frontend-application-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-frontend-application-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,+BAA+B,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACzH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAIjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,iBAAiB,IAAI,uBAAuB,EAAE,MAAM,gFAAgF,CAAC;AAM9I,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,qBACa,qCAAsC,YAAW,+BAA+B;IAGzF,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,uBAAuB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;IAGxE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,wBAAwB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,wBAAwB,CAAC;IAE1D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAyBpC"}
|
|
@@ -28,9 +28,30 @@ exports.MonacoFrontendApplicationContribution = void 0;
|
|
|
28
28
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
29
29
|
const browser_1 = require("@theia/core/lib/browser");
|
|
30
30
|
const monaco_snippet_suggest_provider_1 = require("./monaco-snippet-suggest-provider");
|
|
31
|
+
const monaco = require("@theia/monaco-editor-core");
|
|
32
|
+
const suggest_1 = require("@theia/monaco-editor-core/esm/vs/editor/contrib/suggest/browser/suggest");
|
|
33
|
+
const monaco_editor_service_1 = require("./monaco-editor-service");
|
|
34
|
+
const monaco_text_model_service_1 = require("./monaco-text-model-service");
|
|
35
|
+
const contextKeyService_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService");
|
|
36
|
+
const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
|
|
37
|
+
const codeEditorService_1 = require("@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService");
|
|
38
|
+
const resolverService_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService");
|
|
39
|
+
const contextkey_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey");
|
|
40
|
+
const contextView_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView");
|
|
41
|
+
const monaco_context_menu_1 = require("./monaco-context-menu");
|
|
31
42
|
let MonacoFrontendApplicationContribution = class MonacoFrontendApplicationContribution {
|
|
32
43
|
async initialize() {
|
|
33
|
-
|
|
44
|
+
const { codeEditorService, textModelService, contextKeyService, contextMenuService } = this;
|
|
45
|
+
standaloneServices_1.StandaloneServices.initialize({
|
|
46
|
+
[codeEditorService_1.ICodeEditorService.toString()]: codeEditorService,
|
|
47
|
+
[resolverService_1.ITextModelService.toString()]: textModelService,
|
|
48
|
+
[contextkey_1.IContextKeyService.toString()]: contextKeyService,
|
|
49
|
+
[contextView_1.IContextMenuService.toString()]: contextMenuService,
|
|
50
|
+
});
|
|
51
|
+
// Monaco registers certain quick access providers (e.g. QuickCommandAccess) at import time, but we want to use our own.
|
|
52
|
+
this.quickAccessRegistry.clear();
|
|
53
|
+
// Incomparability of enum types between public and private API's
|
|
54
|
+
(0, suggest_1.setSnippetSuggestSupport)(this.snippetSuggestProvider);
|
|
34
55
|
for (const language of monaco.languages.getLanguages()) {
|
|
35
56
|
this.preferenceSchema.registerOverrideIdentifier(language.id);
|
|
36
57
|
}
|
|
@@ -42,6 +63,18 @@ let MonacoFrontendApplicationContribution = class MonacoFrontendApplicationContr
|
|
|
42
63
|
};
|
|
43
64
|
}
|
|
44
65
|
};
|
|
66
|
+
__decorate([
|
|
67
|
+
(0, inversify_1.inject)(monaco_editor_service_1.MonacoEditorService),
|
|
68
|
+
__metadata("design:type", monaco_editor_service_1.MonacoEditorService)
|
|
69
|
+
], MonacoFrontendApplicationContribution.prototype, "codeEditorService", void 0);
|
|
70
|
+
__decorate([
|
|
71
|
+
(0, inversify_1.inject)(monaco_text_model_service_1.MonacoTextModelService),
|
|
72
|
+
__metadata("design:type", monaco_text_model_service_1.MonacoTextModelService)
|
|
73
|
+
], MonacoFrontendApplicationContribution.prototype, "textModelService", void 0);
|
|
74
|
+
__decorate([
|
|
75
|
+
(0, inversify_1.inject)(contextKeyService_1.ContextKeyService),
|
|
76
|
+
__metadata("design:type", contextKeyService_1.ContextKeyService)
|
|
77
|
+
], MonacoFrontendApplicationContribution.prototype, "contextKeyService", void 0);
|
|
45
78
|
__decorate([
|
|
46
79
|
(0, inversify_1.inject)(monaco_snippet_suggest_provider_1.MonacoSnippetSuggestProvider),
|
|
47
80
|
__metadata("design:type", monaco_snippet_suggest_provider_1.MonacoSnippetSuggestProvider)
|
|
@@ -50,6 +83,14 @@ __decorate([
|
|
|
50
83
|
(0, inversify_1.inject)(browser_1.PreferenceSchemaProvider),
|
|
51
84
|
__metadata("design:type", browser_1.PreferenceSchemaProvider)
|
|
52
85
|
], MonacoFrontendApplicationContribution.prototype, "preferenceSchema", void 0);
|
|
86
|
+
__decorate([
|
|
87
|
+
(0, inversify_1.inject)(browser_1.QuickAccessRegistry),
|
|
88
|
+
__metadata("design:type", Object)
|
|
89
|
+
], MonacoFrontendApplicationContribution.prototype, "quickAccessRegistry", void 0);
|
|
90
|
+
__decorate([
|
|
91
|
+
(0, inversify_1.inject)(monaco_context_menu_1.MonacoContextMenuService),
|
|
92
|
+
__metadata("design:type", monaco_context_menu_1.MonacoContextMenuService)
|
|
93
|
+
], MonacoFrontendApplicationContribution.prototype, "contextMenuService", void 0);
|
|
53
94
|
MonacoFrontendApplicationContribution = __decorate([
|
|
54
95
|
(0, inversify_1.injectable)()
|
|
55
96
|
], MonacoFrontendApplicationContribution);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-frontend-application-contribution.js","sourceRoot":"","sources":["../../src/browser/monaco-frontend-application-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"monaco-frontend-application-contribution.js","sourceRoot":"","sources":["../../src/browser/monaco-frontend-application-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAkE;AAClE,qDAAyH;AACzH,uFAAiF;AACjF,oDAAoD;AACpD,qGAAmH;AAEnH,mEAA8D;AAC9D,2EAAqE;AACrE,sHAA8I;AAC9I,sHAAmH;AACnH,kHAAgH;AAChH,6GAA4G;AAC5G,uGAA4G;AAC5G,2GAAgH;AAChH,+DAAiE;AAGjE,IAAa,qCAAqC,GAAlD,MAAa,qCAAqC;IAuB9C,KAAK,CAAC,UAAU;QACZ,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC;QAC5F,uCAAkB,CAAC,UAAU,CAAC;YAC1B,CAAC,sCAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB;YAClD,CAAC,mCAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,gBAAgB;YAChD,CAAC,+BAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB;YAClD,CAAC,iCAAmB,CAAC,QAAQ,EAAE,CAAC,EAAE,kBAAkB;SACvD,CAAC,CAAC;QACH,wHAAwH;QACxH,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;QAEjC,iEAAiE;QACjE,IAAA,kCAAwB,EAAC,IAAI,CAAC,sBAA2D,CAAC,CAAC;QAE3F,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE;YACpD,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;SACjE;QACD,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1E,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC,EAAE;YACnC,gJAAgJ;YAChJ,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC9D,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC,CAAC;IACN,CAAC;CAEJ,CAAA;AA7CG;IADC,IAAA,kBAAM,EAAC,2CAAmB,CAAC;8BACU,2CAAmB;gFAAC;AAG1D;IADC,IAAA,kBAAM,EAAC,kDAAsB,CAAC;8BACM,kDAAsB;+EAAC;AAG5D;IADC,IAAA,kBAAM,EAAC,qCAAuB,CAAC;8BACM,qCAAuB;gFAAC;AAG9D;IADC,IAAA,kBAAM,EAAC,8DAA4B,CAAC;8BACM,8DAA4B;qFAAC;AAGxE;IADC,IAAA,kBAAM,EAAC,kCAAwB,CAAC;8BACI,kCAAwB;+EAAC;AAG9D;IADC,IAAA,kBAAM,EAAC,6BAAmB,CAAC;;kFACgC;AAG5D;IADC,IAAA,kBAAM,EAAC,8CAAwB,CAAC;8BACM,8CAAwB;iFAAC;AArBvD,qCAAqC;IADjD,IAAA,sBAAU,GAAE;GACA,qCAAqC,CAgDjD;AAhDY,sFAAqC"}
|
|
@@ -2,8 +2,9 @@ import '../../src/browser/style/index.css';
|
|
|
2
2
|
import '../../src/browser/style/symbol-sprite.svg';
|
|
3
3
|
import '../../src/browser/style/symbol-icons.css';
|
|
4
4
|
import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
|
|
5
|
+
import { IConfigurationService } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
|
|
5
6
|
declare const _default: ContainerModule;
|
|
6
7
|
export default _default;
|
|
7
8
|
export declare const MonacoConfigurationService: unique symbol;
|
|
8
|
-
export declare function createMonacoConfigurationService(container: interfaces.Container):
|
|
9
|
+
export declare function createMonacoConfigurationService(container: interfaces.Container): IConfigurationService;
|
|
9
10
|
//# sourceMappingURL=monaco-frontend-module.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,2CAA2C,CAAC;AACnD,OAAO,0CAA0C,CAAC;AAClD,OAAO,EAAE,eAAe,EAAwB,UAAU,EAAE,MAAM,8BAA8B,CAAC;;
|
|
1
|
+
{"version":3,"file":"monaco-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,2CAA2C,CAAC;AACnD,OAAO,0CAA0C,CAAC;AAClD,OAAO,EAAE,eAAe,EAAwB,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAkDjG,OAAO,EAAkD,qBAAqB,EAAE,MAAM,8EAA8E,CAAC;;AAQrK,wBAwFG;AAEH,eAAO,MAAM,0BAA0B,eAAuC,CAAC;AAC/E,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,GAAG,qBAAqB,CA0HvG"}
|
|
@@ -64,7 +64,10 @@ const monaco_gotoline_quick_access_1 = require("./monaco-gotoline-quick-access")
|
|
|
64
64
|
const monaco_gotosymbol_quick_access_1 = require("./monaco-gotosymbol-quick-access");
|
|
65
65
|
const quick_access_1 = require("@theia/core/lib/browser/quick-input/quick-access");
|
|
66
66
|
const monaco_quick_access_registry_1 = require("./monaco-quick-access-registry");
|
|
67
|
-
|
|
67
|
+
const contextKeyService_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService");
|
|
68
|
+
const configuration_1 = require("@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration");
|
|
69
|
+
const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
|
|
70
|
+
(0, inversify_1.decorate)((0, inversify_1.injectable)(), contextKeyService_1.ContextKeyService);
|
|
68
71
|
monaco_theming_service_1.MonacoThemingService.init();
|
|
69
72
|
exports.default = new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
|
|
70
73
|
bind(monaco_theming_service_1.MonacoThemingService).toSelf().inSingletonScope();
|
|
@@ -82,7 +85,7 @@ exports.default = new inversify_1.ContainerModule((bind, unbind, isBound, rebind
|
|
|
82
85
|
}
|
|
83
86
|
bind(monaco_workspace_1.MonacoWorkspace).toSelf().inSingletonScope();
|
|
84
87
|
bind(exports.MonacoConfigurationService).toDynamicValue(({ container }) => createMonacoConfigurationService(container)).inSingletonScope();
|
|
85
|
-
bind(
|
|
88
|
+
bind(contextKeyService_1.ContextKeyService).toDynamicValue(({ container }) => new contextKeyService_1.ContextKeyService(container.get(exports.MonacoConfigurationService))).inSingletonScope();
|
|
86
89
|
bind(monaco_bulk_edit_service_1.MonacoBulkEditService).toSelf().inSingletonScope();
|
|
87
90
|
bind(monaco_editor_service_1.MonacoEditorService).toSelf().inSingletonScope();
|
|
88
91
|
bind(monaco_text_model_service_1.MonacoTextModelService).toSelf().inSingletonScope();
|
|
@@ -130,8 +133,8 @@ exports.MonacoConfigurationService = Symbol('MonacoConfigurationService');
|
|
|
130
133
|
function createMonacoConfigurationService(container) {
|
|
131
134
|
const preferences = container.get(browser_1.PreferenceService);
|
|
132
135
|
const preferenceSchemaProvider = container.get(browser_1.PreferenceSchemaProvider);
|
|
133
|
-
const service =
|
|
134
|
-
const _configuration = service
|
|
136
|
+
const service = standaloneServices_1.StandaloneServices.get(configuration_1.IConfigurationService);
|
|
137
|
+
const _configuration = service['_configuration'];
|
|
135
138
|
_configuration.getValue = (section, overrides) => {
|
|
136
139
|
const overrideIdentifier = (overrides && 'overrideIdentifier' in overrides && typeof overrides.overrideIdentifier === 'string')
|
|
137
140
|
? overrides['overrideIdentifier']
|
|
@@ -168,7 +171,7 @@ function createMonacoConfigurationService(container) {
|
|
|
168
171
|
for (const [override, values] of context.overrides) {
|
|
169
172
|
overrides.push([override, [...values]]);
|
|
170
173
|
}
|
|
171
|
-
service
|
|
174
|
+
service['_onDidChangeConfiguration'].fire({
|
|
172
175
|
change: {
|
|
173
176
|
keys: [...context.keys],
|
|
174
177
|
overrides
|