@theia/monaco 1.25.0-next.23 → 1.25.0-next.28
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-editor-model.d.ts +1 -3
- package/lib/browser/monaco-editor-model.d.ts.map +1 -1
- package/lib/browser/monaco-editor-model.js +3 -1
- package/lib/browser/monaco-editor-model.js.map +1 -1
- package/lib/browser/monaco-editor-service.d.ts +3 -2
- package/lib/browser/monaco-editor-service.d.ts.map +1 -1
- package/lib/browser/monaco-editor-service.js +7 -1
- package/lib/browser/monaco-editor-service.js.map +1 -1
- package/lib/browser/monaco-text-model-service.d.ts +2 -4
- package/lib/browser/monaco-text-model-service.d.ts.map +1 -1
- package/lib/browser/monaco-text-model-service.js +4 -14
- package/lib/browser/monaco-text-model-service.js.map +1 -1
- package/package.json +7 -7
- package/src/browser/monaco-editor-model.ts +3 -2
- package/src/browser/monaco-editor-service.ts +10 -3
- package/src/browser/monaco-text-model-service.ts +4 -15
|
@@ -143,9 +143,7 @@ export declare class MonacoEditorModel implements IResolvedTextEditorModel, Text
|
|
|
143
143
|
protected fireDidSaveModel(): void;
|
|
144
144
|
revert(options?: Saveable.RevertOptions): Promise<void>;
|
|
145
145
|
createSnapshot(preserveBOM?: boolean): ITextSnapshot;
|
|
146
|
-
applySnapshot(snapshot:
|
|
147
|
-
value: string;
|
|
148
|
-
}): void;
|
|
146
|
+
applySnapshot(snapshot: Saveable.Snapshot): void;
|
|
149
147
|
protected trace(loggable: Loggable): void;
|
|
150
148
|
}
|
|
151
149
|
export declare namespace MonacoEditorModel {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-editor-model.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-model.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,sBAAsB,EAAE,8BAA8B,EAAE,MAAM,mDAAmD,CAAC;AAC5I,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,kBAAkB,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC/H,OAAO,EAAE,oBAAoB,EAAc,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACjG,OAAO,EAAE,QAAQ,EAAiB,eAAe,EAAmB,MAAM,iCAAiC,CAAC;AAC5G,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAO,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,8BAA8B,EAAE,kBAAkB,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sDAAsD,CAAC;AACrJ,OAAO,EAAE,wBAAwB,EAAE,MAAM,yEAAyE,CAAC;AACnH,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAOpD,OAAO,EACH,sBAAsB,EACzB,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACrC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAC;IACxC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;IAC/B,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,8BAA8B,EAAE,CAAC,GAAG,IAAI,CAAC;CACzE;AAED,MAAM,WAAW,8BAA8B;IAC3C,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,8BAA8B,EAAE,CAAC;CAC7D;AAED,qBAAa,iBAAkB,YAAW,wBAAwB,EAAE,kBAAkB;IAsC9E,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IACrC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB;IACjD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB;IACjD,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC1B,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAxCzC,QAAQ,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,CAAgB;IAC7D,aAAa,SAAO;IACpB,2BAA2B,UAAS;IACpC,mBAAmB,SAAK;IAGxB,QAAQ,CAAC,qBAAqB,QAAQ;IACtC,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAEvC,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC;IAC5B,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAC1D,SAAS,CAAC,QAAQ,CAAC,mBAAmB,uBAA8B;IAEpE,SAAS,CAAC,QAAQ,CAAC,yBAAyB,0CAAiD;IAC7F,QAAQ,CAAC,kBAAkB,wCAAwC;IAEnE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,sBAA6B;IACrE,QAAQ,CAAC,cAAc,oBAAoC;IAE3D,SAAS,CAAC,QAAQ,CAAC,sBAAsB,oCAA2C;IACpF,QAAQ,CAAC,eAAe,kCAAqC;IAE7D,SAAS,CAAC,QAAQ,CAAC,uBAAuB,gBAAuB;IACjE,QAAQ,CAAC,gBAAgB,cAAsC;IAE/D,SAAS,CAAC,QAAQ,CAAC,0BAA0B,kBAAyB;IACtE,QAAQ,CAAC,mBAAmB,gBAAyC;IAErE,OAAO,CAAC,iBAAiB,CAAqB;IAC9C,OAAO,CAAC,eAAe,CAAqB;IAE5C,SAAS,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;gBAGhC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,yBAAyB,EAC9B,GAAG,EAAE,yBAAyB,EAC9B,MAAM,CAAC,qBAAS,EAChB,iBAAiB,CAAC,+BAAmB;IAgB5D,OAAO,IAAI,IAAI;IAIf,UAAU,IAAI,OAAO;IAIrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,UAAU,IAAI,OAAO;IAIrB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAahE,WAAW,IAAI,MAAM,GAAG,SAAS;IAIjC,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IASzD,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAWvC;;;;OAIG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI;IA0B9D;;;OAGG;IACH,SAAS,CAAC,MAAM,UAAS;IACzB;;OAEG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IACD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAQxC,SAAS,CAAC,MAAM,UAAS;IACzB,IAAI,KAAK,IAAI,OAAO,CAEnB;IACD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAWxC,OAAO,CAAC,oBAAoB;IAI5B,SAAS,CAAC,QAAQ,CAAC,qBAAqB,gBAAuB;IAC/D,IAAI,cAAc,IAAI,KAAK,CAAC,IAAI,CAAC,CAEhC;IAED,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,aAAa,IAAI,MAAM,GAAG,SAAS;IAInC;;OAEG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAInD,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;OAEG;IACH,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM;IAQ9B,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ;IAKpC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM;IAIpC,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;OAEG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAI1C,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAI5C,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,UAAU,IAAI,OAAO;IAIrB,IAAI,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAEnC;IAED,IAAI,aAAa,IAAI,KAAK,CAAC,IAAI,CAAC,CAE/B;IAID,IAAI,eAAe,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,UAAU,CAG3D;IAED;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,SAAS,EAAE;IAwB/C,IAAI,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAKxC,IAAI,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,SAAS,CAAC,gBAAgB,gBAAqB;cAC/B,GAAG,CAAC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAalE,SAAS,CAAC,2BAA2B,0BAAiC;IACtE,SAAS,CAAC,UAAU,IAAI,iBAAiB;IAOnC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;cA4B/C,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAAC;IAsBhF,SAAS,CAAC,gBAAgB,UAAS;IACnC,SAAS,CAAC,WAAW,IAAI,IAAI;IAY7B,SAAS,CAAC,UAAU,IAAI,IAAI;IAa5B,SAAS,CAAC,2BAA2B,0BAAiC;IACtE,SAAS,CAAC,UAAU,IAAI,iBAAiB;IAOzC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,GAAE,iBAAqC,EAAE,iBAAiB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvK,SAAS,CAAC,oBAAoB,UAAS;IACvC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,8BAA8B,EAAE,CAAM;IACzE,SAAS,CAAC,kBAAkB,CAAC,cAAc,EAAE,8BAA8B,EAAE,GAAG,IAAI;IAMpF,SAAS,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,yBAAyB,GAAG,IAAI;IAapF,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,yBAAyB,GAAG,8BAA8B;IAI/G,SAAS,CAAC,gCAAgC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,GAAG,8BAA8B;IAOrH,SAAS,CAAC,UAAU,CAChB,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,8BAA8B,EAAE,EAC1D,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,GACvD,IAAI;IAIP,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,CAAC;cAiBtF,MAAM,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;cAuCnI,iBAAiB,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA6DjI,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAI5B,MAAM,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7D,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,aAAa;IAIpD,aAAa,CAAC,QAAQ,EAAE
|
|
1
|
+
{"version":3,"file":"monaco-editor-model.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -535,7 +535,9 @@ class MonacoEditorModel {
|
|
|
535
535
|
return this.model.createSnapshot(preserveBOM);
|
|
536
536
|
}
|
|
537
537
|
applySnapshot(snapshot) {
|
|
538
|
-
|
|
538
|
+
var _a;
|
|
539
|
+
const value = 'value' in snapshot ? snapshot.value : (_a = snapshot.read()) !== null && _a !== void 0 ? _a : '';
|
|
540
|
+
this.model.setValue(value);
|
|
539
541
|
}
|
|
540
542
|
trace(loggable) {
|
|
541
543
|
if (this.logger) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-editor-model.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"monaco-editor-model.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { OpenerService, WidgetOpenMode, ApplicationShell, PreferenceService } from '@theia/core/lib/browser';
|
|
2
2
|
import { EditorWidget, EditorOpenerOptions, EditorManager } from '@theia/editor/lib/browser';
|
|
3
3
|
import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
|
|
4
|
-
import { IResourceEditorInput } from '@theia/monaco-editor-core/esm/vs/platform/editor/common/editor';
|
|
4
|
+
import { IResourceEditorInput, ITextResourceEditorInput } from '@theia/monaco-editor-core/esm/vs/platform/editor/common/editor';
|
|
5
5
|
import { StandaloneCodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditorService';
|
|
6
6
|
import { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
|
|
7
7
|
import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
@@ -19,7 +19,8 @@ export declare class MonacoEditorService extends StandaloneCodeEditorService {
|
|
|
19
19
|
getActiveCodeEditor(): StandaloneCodeEditor | null;
|
|
20
20
|
openCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null>;
|
|
21
21
|
protected findEditorWidgetByUri(widget: object | undefined, uriAsString: string): Promise<EditorWidget | undefined>;
|
|
22
|
-
protected createEditorOpenerOptions(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): EditorOpenerOptions;
|
|
22
|
+
protected createEditorOpenerOptions(input: IResourceEditorInput | ITextResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): EditorOpenerOptions;
|
|
23
|
+
protected getSelection(input: IResourceEditorInput | ITextResourceEditorInput): EditorOpenerOptions['selection'];
|
|
23
24
|
protected getEditorOpenMode(input: IResourceEditorInput): WidgetOpenMode;
|
|
24
25
|
protected getWidgetOptions(source: ICodeEditor | null, sideBySide?: boolean): ApplicationShell.WidgetOptions | undefined;
|
|
25
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-editor-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAQ,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnH,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAsB,MAAM,2BAA2B,CAAC;AAEjH,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gEAAgE,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-editor-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAQ,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnH,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAsB,MAAM,2BAA2B,CAAC;AAEjH,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,gEAAgE,CAAC;AAGhI,OAAO,EAAE,2BAA2B,EAAE,MAAM,wFAAwF,CAAC;AAErI,OAAO,EAAE,oBAAoB,EAAE,MAAM,iFAAiF,CAAC;AACvH,OAAO,EAAE,WAAW,EAAE,MAAM,+DAA+D,CAAC;AAI5F,qBACa,mBAAoB,SAAQ,2BAA2B;IAEhE,gBAAuB,yBAAyB,EAAE,MAAM,CAA0B;IAGlF,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAG1C,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;;IAMzD;;OAEG;IACM,mBAAmB,IAAI,oBAAoB,GAAG,IAAI;IAc5C,cAAc,CAAC,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;cAezH,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAkBzH,SAAS,CAAC,yBAAyB,CAAC,KAAK,EAAE,oBAAoB,GAAG,wBAAwB,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,mBAAmB;IAQlK,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,oBAAoB,GAAG,wBAAwB,GAAG,mBAAmB,CAAC,WAAW,CAAC;IAMhH,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,oBAAoB,GAAG,cAAc;IAYxE,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC,aAAa,GAAG,SAAS;CAU3H"}
|
|
@@ -93,8 +93,14 @@ let MonacoEditorService = MonacoEditorService_1 = class MonacoEditorService exte
|
|
|
93
93
|
createEditorOpenerOptions(input, source, sideBySide) {
|
|
94
94
|
const mode = this.getEditorOpenMode(input);
|
|
95
95
|
const widgetOptions = this.getWidgetOptions(source, sideBySide);
|
|
96
|
+
const selection = this.getSelection(input);
|
|
96
97
|
const preview = !!this.preferencesService.get(MonacoEditorService_1.ENABLE_PREVIEW_PREFERENCE, false);
|
|
97
|
-
return { mode, widgetOptions, preview };
|
|
98
|
+
return { mode, widgetOptions, preview, selection };
|
|
99
|
+
}
|
|
100
|
+
getSelection(input) {
|
|
101
|
+
if ('options' in input && input.options && 'selection' in input.options) {
|
|
102
|
+
return this.m2p.asRange(input.options.selection);
|
|
103
|
+
}
|
|
98
104
|
}
|
|
99
105
|
getEditorOpenMode(input) {
|
|
100
106
|
const options = Object.assign({ preserveFocus: false, revealIfVisible: true }, input.options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-editor-service.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-service.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;;;;;;;;;;;;;AAEhF,4DAA4E;AAC5E,oDAA6C;AAC7C,qDAAmH;AACnH,uDAAiH;AACjH,mDAA+C;AAC/C,iFAA2E;AAC3E,+DAA0D;AAE1D,sHAAmH;AACnH,+GAAoH;AACpH,wIAAqI;AACrI,uGAA4G;AAC5G,0HAAuH;AAGvH,IAAA,oBAAQ,EAAC,IAAA,sBAAU,GAAE,EAAE,yDAA2B,CAAC,CAAC;AAGpD,IAAa,mBAAmB,2BAAhC,MAAa,mBAAoB,SAAQ,yDAA2B;IAmBhE;QACI,KAAK,CAAC,uCAAkB,CAAC,GAAG,CAAC,+BAAkB,CAAC,EAAE,uCAAkB,CAAC,GAAG,CAAC,yCAAuB,CAAC,CAAC,CAAC;IACvG,CAAC;IAED;;OAEG;IACM,mBAAmB;QACxB,IAAI,MAAM,GAAG,4BAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,IAAI,4BAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;YACtD,IAAI,KAAK,CAAC,eAAe,YAAY,uCAAiB,EAAE;gBACpD,MAAM,GAAG,4BAAY,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;aAChF;SACJ;QACD,MAAM,SAAS,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,EAAE,CAAC;QACvC,iKAAiK;QACjK,8CAA8C;QAC9C,OAAO,SAAS,YAAY,2CAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IACxE,CAAC;IAEQ,KAAK,CAAC,cAAc,CAAC,KAA2B,EAAE,MAA0B,EAAE,UAAoB;QACvG,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAChF,MAAM,MAAM,GAAG,MAAM,IAAA,cAAI,EAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9E,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,YAAY,4BAAY,EAAE;YAC7D,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACnD,iKAAiK;YACjK,2CAA2C;YAC3C,OAAO,SAAS,YAAY,2CAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;SACvE;QACD,2CAA2C;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,KAAK,CAAC,qBAAqB,CAAC,MAA0B,EAAE,WAAmB;QACjF,IAAI,MAAM,YAAY,sBAAY,EAAE;YAChC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,WAAW,EAAE;gBAC9C,OAAO,MAAM,CAAC;aACjB;YACD,OAAO,SAAS,CAAC;SACpB;QACD,IAAI,0BAAgB,CAAC,uBAAuB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACrD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,mBAAmB,EAAE,EAAE;gBACpD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBAChF,IAAI,YAAY,EAAE;oBACd,OAAO,YAAY,CAAC;iBACvB;aACJ;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,yBAAyB,CAAC,
|
|
1
|
+
{"version":3,"file":"monaco-editor-service.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,6 @@ import { IDisposable, IReference } from '@theia/monaco-editor-core/esm/vs/base/c
|
|
|
6
6
|
import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
|
|
7
7
|
import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
|
|
8
8
|
import { ILogger } from '@theia/core/lib/common/logger';
|
|
9
|
-
import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
|
|
10
|
-
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
11
9
|
import * as monaco from '@theia/monaco-editor-core';
|
|
12
10
|
import { ITextModelService, ITextModelContentProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService';
|
|
13
11
|
import { ITextModelUpdateOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
|
|
@@ -19,9 +17,10 @@ export interface MonacoEditorModelFactory {
|
|
|
19
17
|
}
|
|
20
18
|
export declare class MonacoTextModelService implements ITextModelService {
|
|
21
19
|
readonly _serviceBrand: undefined;
|
|
22
|
-
protected readonly _ready: Deferred<void>;
|
|
23
20
|
/**
|
|
24
21
|
* This component does some asynchronous work before being fully initialized.
|
|
22
|
+
*
|
|
23
|
+
* @deprecated since 1.25.0. Is instantly resolved.
|
|
25
24
|
*/
|
|
26
25
|
readonly ready: Promise<void>;
|
|
27
26
|
protected readonly _models: ReferenceCollection<string, MonacoEditorModel>;
|
|
@@ -31,7 +30,6 @@ export declare class MonacoTextModelService implements ITextModelService {
|
|
|
31
30
|
protected readonly p2m: ProtocolToMonacoConverter;
|
|
32
31
|
protected readonly factories: ContributionProvider<MonacoEditorModelFactory>;
|
|
33
32
|
protected readonly logger: ILogger;
|
|
34
|
-
protected readonly applicationServer: ApplicationServer;
|
|
35
33
|
protected readonly fileService: FileService;
|
|
36
34
|
init(): void;
|
|
37
35
|
get models(): MonacoEditorModel[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-text-model-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-text-model-service.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,oBAAoB,EAAM,MAAM,aAAa,CAAC;AAC7H,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"monaco-text-model-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-text-model-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,19 +33,18 @@ const monaco_editor_model_1 = require("./monaco-editor-model");
|
|
|
33
33
|
const monaco_to_protocol_converter_1 = require("./monaco-to-protocol-converter");
|
|
34
34
|
const protocol_to_monaco_converter_1 = require("./protocol-to-monaco-converter");
|
|
35
35
|
const logger_1 = require("@theia/core/lib/common/logger");
|
|
36
|
-
const application_protocol_1 = require("@theia/core/lib/common/application-protocol");
|
|
37
|
-
const promise_util_1 = require("@theia/core/lib/common/promise-util");
|
|
38
36
|
const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
|
|
39
37
|
const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
|
|
40
38
|
const textResourceConfiguration_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/services/textResourceConfiguration");
|
|
41
39
|
exports.MonacoEditorModelFactory = Symbol('MonacoEditorModelFactory');
|
|
42
40
|
let MonacoTextModelService = class MonacoTextModelService {
|
|
43
41
|
constructor() {
|
|
44
|
-
this._ready = new promise_util_1.Deferred();
|
|
45
42
|
/**
|
|
46
43
|
* This component does some asynchronous work before being fully initialized.
|
|
44
|
+
*
|
|
45
|
+
* @deprecated since 1.25.0. Is instantly resolved.
|
|
47
46
|
*/
|
|
48
|
-
this.ready =
|
|
47
|
+
this.ready = Promise.resolve();
|
|
49
48
|
this._models = new core_1.ReferenceCollection(uri => this.loadModel(new uri_1.default(uri)));
|
|
50
49
|
this.modelOptions = {
|
|
51
50
|
'editor.tabSize': 'tabSize',
|
|
@@ -53,10 +52,6 @@ let MonacoTextModelService = class MonacoTextModelService {
|
|
|
53
52
|
};
|
|
54
53
|
}
|
|
55
54
|
init() {
|
|
56
|
-
let isWindowsBackend = false;
|
|
57
|
-
this.applicationServer.getBackendOS().then(os => {
|
|
58
|
-
isWindowsBackend = os === core_1.OS.Type.Windows;
|
|
59
|
-
}, () => undefined).then(() => this._ready.resolve());
|
|
60
55
|
const resourcePropertiesService = standaloneServices_1.StandaloneServices.get(textResourceConfiguration_1.ITextResourcePropertiesService);
|
|
61
56
|
if (resourcePropertiesService) {
|
|
62
57
|
resourcePropertiesService.getEOL = () => {
|
|
@@ -64,7 +59,7 @@ let MonacoTextModelService = class MonacoTextModelService {
|
|
|
64
59
|
if (eol && eol !== 'auto') {
|
|
65
60
|
return eol;
|
|
66
61
|
}
|
|
67
|
-
return
|
|
62
|
+
return core_1.OS.backend.isWindows ? '\r\n' : '\n';
|
|
68
63
|
};
|
|
69
64
|
}
|
|
70
65
|
}
|
|
@@ -81,7 +76,6 @@ let MonacoTextModelService = class MonacoTextModelService {
|
|
|
81
76
|
return this._models.acquire(raw.toString());
|
|
82
77
|
}
|
|
83
78
|
async loadModel(uri) {
|
|
84
|
-
await this.ready;
|
|
85
79
|
await this.editorPreferences.ready;
|
|
86
80
|
const resource = await this.resourceProvider(uri);
|
|
87
81
|
const model = await (await this.createModel(resource)).load();
|
|
@@ -176,10 +170,6 @@ __decorate([
|
|
|
176
170
|
(0, inversify_1.inject)(logger_1.ILogger),
|
|
177
171
|
__metadata("design:type", Object)
|
|
178
172
|
], MonacoTextModelService.prototype, "logger", void 0);
|
|
179
|
-
__decorate([
|
|
180
|
-
(0, inversify_1.inject)(application_protocol_1.ApplicationServer),
|
|
181
|
-
__metadata("design:type", Object)
|
|
182
|
-
], MonacoTextModelService.prototype, "applicationServer", void 0);
|
|
183
173
|
__decorate([
|
|
184
174
|
(0, inversify_1.inject)(file_service_1.FileService),
|
|
185
175
|
__metadata("design:type", file_service_1.FileService)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-text-model-service.js","sourceRoot":"","sources":["../../src/browser/monaco-text-model-service.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;;;;;;;;;;;;AAEhF,4DAAwF;AACxF,oDAA6C;AAC7C,sCAA6H;AAC7H,uDAAsF;AACtF,+DAA0D;AAE1D,iFAA2E;AAC3E,iFAA2E;AAC3E,0DAAwD;
|
|
1
|
+
{"version":3,"file":"monaco-text-model-service.js","sourceRoot":"","sources":["../../src/browser/monaco-text-model-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/monaco",
|
|
3
|
-
"version": "1.25.0-next.
|
|
3
|
+
"version": "1.25.0-next.28+034a9f3b799",
|
|
4
4
|
"description": "Theia - Monaco Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.25.0-next.
|
|
7
|
-
"@theia/editor": "1.25.0-next.
|
|
8
|
-
"@theia/filesystem": "1.25.0-next.
|
|
9
|
-
"@theia/markers": "1.25.0-next.
|
|
6
|
+
"@theia/core": "1.25.0-next.28+034a9f3b799",
|
|
7
|
+
"@theia/editor": "1.25.0-next.28+034a9f3b799",
|
|
8
|
+
"@theia/filesystem": "1.25.0-next.28+034a9f3b799",
|
|
9
|
+
"@theia/markers": "1.25.0-next.28+034a9f3b799",
|
|
10
10
|
"@theia/monaco-editor-core": "1.65.2",
|
|
11
|
-
"@theia/outline-view": "1.25.0-next.
|
|
11
|
+
"@theia/outline-view": "1.25.0-next.28+034a9f3b799",
|
|
12
12
|
"fast-plist": "^0.1.2",
|
|
13
13
|
"idb": "^4.0.5",
|
|
14
14
|
"jsonc-parser": "^2.2.0",
|
|
@@ -54,5 +54,5 @@
|
|
|
54
54
|
"nyc": {
|
|
55
55
|
"extends": "../../configs/nyc.json"
|
|
56
56
|
},
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "034a9f3b799e1b36a79c55e1f0302104af7180a3"
|
|
58
58
|
}
|
|
@@ -650,8 +650,9 @@ export class MonacoEditorModel implements IResolvedTextEditorModel, TextEditorDo
|
|
|
650
650
|
return this.model.createSnapshot(preserveBOM);
|
|
651
651
|
}
|
|
652
652
|
|
|
653
|
-
applySnapshot(snapshot:
|
|
654
|
-
|
|
653
|
+
applySnapshot(snapshot: Saveable.Snapshot): void {
|
|
654
|
+
const value = 'value' in snapshot ? snapshot.value : snapshot.read() ?? '';
|
|
655
|
+
this.model.setValue(value);
|
|
655
656
|
}
|
|
656
657
|
|
|
657
658
|
protected trace(loggable: Loggable): void {
|
|
@@ -21,7 +21,7 @@ import { EditorWidget, EditorOpenerOptions, EditorManager, CustomEditorWidget }
|
|
|
21
21
|
import { MonacoEditor } from './monaco-editor';
|
|
22
22
|
import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
|
|
23
23
|
import { MonacoEditorModel } from './monaco-editor-model';
|
|
24
|
-
import { IResourceEditorInput } from '@theia/monaco-editor-core/esm/vs/platform/editor/common/editor';
|
|
24
|
+
import { IResourceEditorInput, ITextResourceEditorInput } from '@theia/monaco-editor-core/esm/vs/platform/editor/common/editor';
|
|
25
25
|
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
|
|
26
26
|
import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
|
|
27
27
|
import { StandaloneCodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditorService';
|
|
@@ -105,11 +105,18 @@ export class MonacoEditorService extends StandaloneCodeEditorService {
|
|
|
105
105
|
return undefined;
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
-
protected createEditorOpenerOptions(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): EditorOpenerOptions {
|
|
108
|
+
protected createEditorOpenerOptions(input: IResourceEditorInput | ITextResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): EditorOpenerOptions {
|
|
109
109
|
const mode = this.getEditorOpenMode(input);
|
|
110
110
|
const widgetOptions = this.getWidgetOptions(source, sideBySide);
|
|
111
|
+
const selection = this.getSelection(input);
|
|
111
112
|
const preview = !!this.preferencesService.get<boolean>(MonacoEditorService.ENABLE_PREVIEW_PREFERENCE, false);
|
|
112
|
-
return { mode, widgetOptions, preview };
|
|
113
|
+
return { mode, widgetOptions, preview, selection };
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
protected getSelection(input: IResourceEditorInput | ITextResourceEditorInput): EditorOpenerOptions['selection'] {
|
|
117
|
+
if ('options' in input && input.options && 'selection' in input.options) {
|
|
118
|
+
return this.m2p.asRange(input.options.selection);
|
|
119
|
+
}
|
|
113
120
|
}
|
|
114
121
|
|
|
115
122
|
protected getEditorOpenMode(input: IResourceEditorInput): WidgetOpenMode {
|
|
@@ -23,8 +23,6 @@ import { IDisposable, IReference } from '@theia/monaco-editor-core/esm/vs/base/c
|
|
|
23
23
|
import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
|
|
24
24
|
import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
|
|
25
25
|
import { ILogger } from '@theia/core/lib/common/logger';
|
|
26
|
-
import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
|
|
27
|
-
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
28
26
|
import * as monaco from '@theia/monaco-editor-core';
|
|
29
27
|
import { ITextModelService, ITextModelContentProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService';
|
|
30
28
|
import { ITextModelUpdateOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
|
|
@@ -47,11 +45,12 @@ export interface MonacoEditorModelFactory {
|
|
|
47
45
|
export class MonacoTextModelService implements ITextModelService {
|
|
48
46
|
declare readonly _serviceBrand: undefined;
|
|
49
47
|
|
|
50
|
-
protected readonly _ready = new Deferred<void>();
|
|
51
48
|
/**
|
|
52
49
|
* This component does some asynchronous work before being fully initialized.
|
|
50
|
+
*
|
|
51
|
+
* @deprecated since 1.25.0. Is instantly resolved.
|
|
53
52
|
*/
|
|
54
|
-
readonly ready: Promise<void> =
|
|
53
|
+
readonly ready: Promise<void> = Promise.resolve();
|
|
55
54
|
|
|
56
55
|
protected readonly _models = new ReferenceCollection<string, MonacoEditorModel>(
|
|
57
56
|
uri => this.loadModel(new URI(uri))
|
|
@@ -76,20 +75,11 @@ export class MonacoTextModelService implements ITextModelService {
|
|
|
76
75
|
@inject(ILogger)
|
|
77
76
|
protected readonly logger: ILogger;
|
|
78
77
|
|
|
79
|
-
@inject(ApplicationServer)
|
|
80
|
-
protected readonly applicationServer!: ApplicationServer;
|
|
81
|
-
|
|
82
78
|
@inject(FileService)
|
|
83
79
|
protected readonly fileService: FileService;
|
|
84
80
|
|
|
85
81
|
@postConstruct()
|
|
86
82
|
public init(): void {
|
|
87
|
-
let isWindowsBackend = false;
|
|
88
|
-
|
|
89
|
-
this.applicationServer.getBackendOS().then(os => {
|
|
90
|
-
isWindowsBackend = os === OS.Type.Windows;
|
|
91
|
-
}, () => undefined).then(() => this._ready.resolve());
|
|
92
|
-
|
|
93
83
|
const resourcePropertiesService = StandaloneServices.get(ITextResourcePropertiesService);
|
|
94
84
|
|
|
95
85
|
if (resourcePropertiesService) {
|
|
@@ -98,7 +88,7 @@ export class MonacoTextModelService implements ITextModelService {
|
|
|
98
88
|
if (eol && eol !== 'auto') {
|
|
99
89
|
return eol;
|
|
100
90
|
}
|
|
101
|
-
return
|
|
91
|
+
return OS.backend.isWindows ? '\r\n' : '\n';
|
|
102
92
|
};
|
|
103
93
|
}
|
|
104
94
|
}
|
|
@@ -120,7 +110,6 @@ export class MonacoTextModelService implements ITextModelService {
|
|
|
120
110
|
}
|
|
121
111
|
|
|
122
112
|
protected async loadModel(uri: URI): Promise<MonacoEditorModel> {
|
|
123
|
-
await this.ready;
|
|
124
113
|
await this.editorPreferences.ready;
|
|
125
114
|
const resource = await this.resourceProvider(uri);
|
|
126
115
|
const model = await (await this.createModel(resource)).load();
|