@theia/monaco 1.49.0 → 1.50.0
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/index.js +1 -1
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js +10 -10
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js.map +1 -1
- package/lib/browser/monaco-bulk-edit-service.js +4 -4
- package/lib/browser/monaco-bulk-edit-service.js.map +1 -1
- package/lib/browser/monaco-color-registry.js +2 -2
- package/lib/browser/monaco-color-registry.js.map +1 -1
- package/lib/browser/monaco-command-registry.js +8 -8
- package/lib/browser/monaco-command-registry.js.map +1 -1
- package/lib/browser/monaco-command-service.js +8 -8
- package/lib/browser/monaco-command-service.js.map +1 -1
- package/lib/browser/monaco-command.js +17 -17
- package/lib/browser/monaco-command.js.map +1 -1
- package/lib/browser/monaco-context-key-service.js +6 -6
- package/lib/browser/monaco-context-key-service.js.map +1 -1
- package/lib/browser/monaco-context-menu.js +4 -4
- package/lib/browser/monaco-context-menu.js.map +1 -1
- package/lib/browser/monaco-diff-editor.js.map +1 -1
- package/lib/browser/monaco-diff-navigator-factory.js +2 -2
- package/lib/browser/monaco-diff-navigator-factory.js.map +1 -1
- 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 +7 -16
- package/lib/browser/monaco-editor-model.js.map +1 -1
- package/lib/browser/monaco-editor-peek-view-widget.js.map +1 -1
- package/lib/browser/monaco-editor-provider.js +28 -28
- package/lib/browser/monaco-editor-provider.js.map +1 -1
- package/lib/browser/monaco-editor-service.d.ts +1 -1
- package/lib/browser/monaco-editor-service.d.ts.map +1 -1
- package/lib/browser/monaco-editor-service.js +15 -15
- package/lib/browser/monaco-editor-service.js.map +1 -1
- package/lib/browser/monaco-editor-zone-widget.js.map +1 -1
- package/lib/browser/monaco-editor.d.ts +1 -1
- package/lib/browser/monaco-editor.d.ts.map +1 -1
- package/lib/browser/monaco-editor.js +23 -23
- package/lib/browser/monaco-editor.js.map +1 -1
- package/lib/browser/monaco-formatting-conflicts.js +10 -10
- package/lib/browser/monaco-formatting-conflicts.js.map +1 -1
- package/lib/browser/monaco-frontend-application-contribution.js +20 -20
- package/lib/browser/monaco-frontend-application-contribution.js.map +1 -1
- package/lib/browser/monaco-frontend-module.js +4 -4
- package/lib/browser/monaco-frontend-module.js.map +1 -1
- package/lib/browser/monaco-gotoline-quick-access.js +6 -6
- package/lib/browser/monaco-gotoline-quick-access.js.map +1 -1
- package/lib/browser/monaco-gotosymbol-quick-access.js +8 -8
- package/lib/browser/monaco-gotosymbol-quick-access.js.map +1 -1
- package/lib/browser/monaco-icon-registry.js +2 -2
- package/lib/browser/monaco-icon-registry.js.map +1 -1
- package/lib/browser/monaco-indexed-db.js +3 -3
- package/lib/browser/monaco-indexed-db.js.map +1 -1
- package/lib/browser/monaco-init.js +5 -5
- package/lib/browser/monaco-init.js.map +1 -1
- package/lib/browser/monaco-keybinding.js +14 -14
- package/lib/browser/monaco-keybinding.js.map +1 -1
- package/lib/browser/monaco-keycode-map.js +121 -121
- package/lib/browser/monaco-keycode-map.js.map +1 -1
- package/lib/browser/monaco-languages.js +10 -10
- package/lib/browser/monaco-languages.js.map +1 -1
- package/lib/browser/monaco-marker-collection.js.map +1 -1
- package/lib/browser/monaco-menu.js +5 -5
- package/lib/browser/monaco-menu.js.map +1 -1
- package/lib/browser/monaco-mime-service.js +3 -3
- package/lib/browser/monaco-mime-service.js.map +1 -1
- package/lib/browser/monaco-outline-contribution.js +7 -7
- package/lib/browser/monaco-outline-contribution.js.map +1 -1
- package/lib/browser/monaco-outline-decorator.js +2 -2
- package/lib/browser/monaco-outline-decorator.js.map +1 -1
- package/lib/browser/monaco-quick-access-registry.js +4 -4
- package/lib/browser/monaco-quick-access-registry.js.map +1 -1
- package/lib/browser/monaco-quick-input-service.js +18 -18
- package/lib/browser/monaco-quick-input-service.js.map +1 -1
- package/lib/browser/monaco-resolved-keybinding.js +4 -4
- package/lib/browser/monaco-resolved-keybinding.js.map +1 -1
- package/lib/browser/monaco-snippet-suggest-provider.js +5 -5
- package/lib/browser/monaco-snippet-suggest-provider.js.map +1 -1
- package/lib/browser/monaco-standalone-theme-service.js.map +1 -1
- package/lib/browser/monaco-status-bar-contribution.js +5 -5
- package/lib/browser/monaco-status-bar-contribution.js.map +1 -1
- package/lib/browser/monaco-text-model-service.d.ts +1 -1
- package/lib/browser/monaco-text-model-service.d.ts.map +1 -1
- package/lib/browser/monaco-text-model-service.js +21 -29
- package/lib/browser/monaco-text-model-service.js.map +1 -1
- package/lib/browser/monaco-theming-service.js +8 -8
- package/lib/browser/monaco-theming-service.js.map +1 -1
- package/lib/browser/monaco-to-protocol-converter.js +3 -3
- package/lib/browser/monaco-to-protocol-converter.js.map +1 -1
- package/lib/browser/monaco-workspace.d.ts +3 -1
- package/lib/browser/monaco-workspace.d.ts.map +1 -1
- package/lib/browser/monaco-workspace.js +29 -24
- package/lib/browser/monaco-workspace.js.map +1 -1
- package/lib/browser/protocol-to-monaco-converter.js +2 -2
- package/lib/browser/protocol-to-monaco-converter.js.map +1 -1
- package/lib/browser/simple-monaco-editor.js.map +1 -1
- package/lib/browser/textmate/index.js +4 -4
- package/lib/browser/textmate/index.js.map +1 -1
- package/lib/browser/textmate/monaco-textmate-frontend-bindings.js.map +1 -1
- package/lib/browser/textmate/monaco-textmate-service.js +18 -18
- package/lib/browser/textmate/monaco-textmate-service.js.map +1 -1
- package/lib/browser/textmate/monaco-theme-registry.js +5 -6
- package/lib/browser/textmate/monaco-theme-registry.js.map +1 -1
- package/lib/browser/textmate/monaco-theme-types.d.ts +4 -4
- package/lib/browser/textmate/monaco-theme-types.d.ts.map +1 -1
- package/lib/browser/textmate/textmate-registry.js +2 -2
- package/lib/browser/textmate/textmate-registry.js.map +1 -1
- package/lib/browser/textmate/textmate-snippet-completion-provider.js.map +1 -1
- package/lib/browser/textmate/textmate-tokenizer.js.map +1 -1
- package/lib/browser/workspace-symbol-command.js +14 -14
- package/lib/browser/workspace-symbol-command.js.map +1 -1
- package/package.json +9 -9
- package/src/browser/monaco-editor-model.ts +5 -17
- package/src/browser/monaco-text-model-service.ts +1 -9
- package/src/browser/monaco-workspace.ts +5 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-symbol-command.js","sourceRoot":"","sources":["../../src/browser/workspace-symbol-command.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,gFAAgF;AAChF,gFAAgF;;;;;AAEhF,4DAAkE;AAClE,+FAA4F;AAC5F,qDAAmH;AACnH,qEAAmL;AACnL,mDAGgC;AAChC,sGAA8H;AAC9H,yDAA8E;AAC9E,oDAA6C;AAC7C,uDAA2D;
|
|
1
|
+
{"version":3,"file":"workspace-symbol-command.js","sourceRoot":"","sources":["../../src/browser/workspace-symbol-command.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/monaco",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.50.0",
|
|
4
4
|
"description": "Theia - Monaco Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/editor": "1.
|
|
8
|
-
"@theia/filesystem": "1.
|
|
9
|
-
"@theia/markers": "1.
|
|
6
|
+
"@theia/core": "1.50.0",
|
|
7
|
+
"@theia/editor": "1.50.0",
|
|
8
|
+
"@theia/filesystem": "1.50.0",
|
|
9
|
+
"@theia/markers": "1.50.0",
|
|
10
10
|
"@theia/monaco-editor-core": "1.83.101",
|
|
11
|
-
"@theia/outline-view": "1.
|
|
12
|
-
"@theia/workspace": "1.
|
|
11
|
+
"@theia/outline-view": "1.50.0",
|
|
12
|
+
"@theia/workspace": "1.50.0",
|
|
13
13
|
"fast-plist": "^0.1.2",
|
|
14
14
|
"idb": "^4.0.5",
|
|
15
15
|
"jsonc-parser": "^2.2.0",
|
|
@@ -52,10 +52,10 @@
|
|
|
52
52
|
"watch": "theiaext watch"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@theia/ext-scripts": "1.
|
|
55
|
+
"@theia/ext-scripts": "1.50.0"
|
|
56
56
|
},
|
|
57
57
|
"nyc": {
|
|
58
58
|
"extends": "../../configs/nyc.json"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "63585530b2e32af0ed4bac4edb5ff443bfc248b7"
|
|
61
61
|
}
|
|
@@ -52,8 +52,6 @@ export interface MonacoModelContentChangedEvent {
|
|
|
52
52
|
|
|
53
53
|
export class MonacoEditorModel implements IResolvedTextEditorModel, TextEditorDocument {
|
|
54
54
|
|
|
55
|
-
autoSave: EditorPreferences['files.autoSave'] = 'afterDelay';
|
|
56
|
-
autoSaveDelay = 500;
|
|
57
55
|
suppressOpenEditorWhenDirty = false;
|
|
58
56
|
lineNumbersMinChars = 3;
|
|
59
57
|
|
|
@@ -70,6 +68,10 @@ export class MonacoEditorModel implements IResolvedTextEditorModel, TextEditorDo
|
|
|
70
68
|
protected readonly onDidChangeContentEmitter = new Emitter<MonacoModelContentChangedEvent>();
|
|
71
69
|
readonly onDidChangeContent = this.onDidChangeContentEmitter.event;
|
|
72
70
|
|
|
71
|
+
get onContentChanged(): Event<void> {
|
|
72
|
+
return (listener, thisArgs, disposables) => this.onDidChangeContent(() => listener(), thisArgs, disposables);
|
|
73
|
+
}
|
|
74
|
+
|
|
73
75
|
protected readonly onDidSaveModelEmitter = new Emitter<ITextModel>();
|
|
74
76
|
readonly onDidSaveModel = this.onDidSaveModelEmitter.event;
|
|
75
77
|
|
|
@@ -364,7 +366,7 @@ export class MonacoEditorModel implements IResolvedTextEditorModel, TextEditorDo
|
|
|
364
366
|
}
|
|
365
367
|
|
|
366
368
|
save(options?: SaveOptions): Promise<void> {
|
|
367
|
-
return this.scheduleSave(TextDocumentSaveReason.Manual, undefined, undefined, options);
|
|
369
|
+
return this.scheduleSave(options?.saveReason ?? TextDocumentSaveReason.Manual, undefined, undefined, options);
|
|
368
370
|
}
|
|
369
371
|
|
|
370
372
|
protected pendingOperation = Promise.resolve();
|
|
@@ -452,23 +454,9 @@ export class MonacoEditorModel implements IResolvedTextEditorModel, TextEditorDo
|
|
|
452
454
|
}
|
|
453
455
|
this.cancelSync();
|
|
454
456
|
this.setDirty(true);
|
|
455
|
-
this.doAutoSave();
|
|
456
457
|
this.trace(log => log('MonacoEditorModel.markAsDirty - exit'));
|
|
457
458
|
}
|
|
458
459
|
|
|
459
|
-
protected doAutoSave(): void {
|
|
460
|
-
if (this.autoSave !== 'off' && this.resource.uri.scheme !== UNTITLED_SCHEME) {
|
|
461
|
-
const token = this.cancelSave();
|
|
462
|
-
this.toDisposeOnAutoSave.dispose();
|
|
463
|
-
const handle = window.setTimeout(() => {
|
|
464
|
-
this.scheduleSave(TextDocumentSaveReason.AfterDelay, token);
|
|
465
|
-
}, this.autoSaveDelay);
|
|
466
|
-
this.toDisposeOnAutoSave.push(Disposable.create(() =>
|
|
467
|
-
window.clearTimeout(handle))
|
|
468
|
-
);
|
|
469
|
-
}
|
|
470
|
-
}
|
|
471
|
-
|
|
472
460
|
protected saveCancellationTokenSource = new CancellationTokenSource();
|
|
473
461
|
protected cancelSave(): CancellationToken {
|
|
474
462
|
this.trace(log => log('MonacoEditorModel.cancelSave'));
|
|
@@ -113,7 +113,7 @@ export class MonacoTextModelService implements ITextModelService {
|
|
|
113
113
|
* creates a model which is not saved by the model service.
|
|
114
114
|
* this will therefore also not be created on backend side.
|
|
115
115
|
*/
|
|
116
|
-
|
|
116
|
+
createUnmanagedModel(raw: monaco.Uri | URI): Promise<MonacoEditorModel> {
|
|
117
117
|
return this.loadModel(new URI(raw.toString()));
|
|
118
118
|
}
|
|
119
119
|
|
|
@@ -156,16 +156,8 @@ export class MonacoTextModelService implements ITextModelService {
|
|
|
156
156
|
|
|
157
157
|
protected updateModel(model: MonacoEditorModel, change?: EditorPreferenceChange): void {
|
|
158
158
|
if (!change) {
|
|
159
|
-
model.autoSave = this.editorPreferences.get('files.autoSave', undefined, model.uri);
|
|
160
|
-
model.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, model.uri);
|
|
161
159
|
model.textEditorModel.updateOptions(this.getModelOptions(model));
|
|
162
160
|
} else if (change.affects(model.uri, model.languageId)) {
|
|
163
|
-
if (change.preferenceName === 'files.autoSave') {
|
|
164
|
-
model.autoSave = this.editorPreferences.get('files.autoSave', undefined, model.uri);
|
|
165
|
-
}
|
|
166
|
-
if (change.preferenceName === 'files.autoSaveDelay') {
|
|
167
|
-
model.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, model.uri);
|
|
168
|
-
}
|
|
169
161
|
const modelOption = this.toModelOption(change.preferenceName);
|
|
170
162
|
if (modelOption) {
|
|
171
163
|
model.textEditorModel.updateOptions(this.getModelOptions(model));
|
|
@@ -42,6 +42,7 @@ import { SnippetParser } from '@theia/monaco-editor-core/esm/vs/editor/contrib/s
|
|
|
42
42
|
import { TextEdit } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
|
|
43
43
|
import { SnippetController2 } from '@theia/monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetController2';
|
|
44
44
|
import { isObject, MaybePromise, nls } from '@theia/core/lib/common';
|
|
45
|
+
import { SaveableService } from '@theia/core/lib/browser';
|
|
45
46
|
|
|
46
47
|
export namespace WorkspaceFileEdit {
|
|
47
48
|
export function is(arg: Edit): arg is monaco.languages.IWorkspaceFileEdit {
|
|
@@ -124,6 +125,9 @@ export class MonacoWorkspace {
|
|
|
124
125
|
@inject(ProblemManager)
|
|
125
126
|
protected readonly problems: ProblemManager;
|
|
126
127
|
|
|
128
|
+
@inject(SaveableService)
|
|
129
|
+
protected readonly saveService: SaveableService;
|
|
130
|
+
|
|
127
131
|
@postConstruct()
|
|
128
132
|
protected init(): void {
|
|
129
133
|
this.resolveReady();
|
|
@@ -192,7 +196,7 @@ export class MonacoWorkspace {
|
|
|
192
196
|
// acquired by the editor, thus losing the changes that made it dirty.
|
|
193
197
|
this.textModelService.createModelReference(model.textEditorModel.uri).then(ref => {
|
|
194
198
|
(
|
|
195
|
-
|
|
199
|
+
this.saveService.autoSave !== 'off' ? new Promise(resolve => model.onDidSaveModel(resolve)) :
|
|
196
200
|
this.editorManager.open(new URI(model.uri), { mode: 'open' })
|
|
197
201
|
).then(
|
|
198
202
|
() => ref.dispose()
|