@theia/monaco 1.68.0-next.23 → 1.68.0-next.48
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/content-hover-widget-patcher.js +1 -2
- package/lib/browser/content-hover-widget-patcher.js.map +1 -1
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js +2 -2
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js.map +1 -1
- package/lib/browser/monaco-bulk-edit-service.js +1 -1
- package/lib/browser/monaco-bulk-edit-service.js.map +1 -1
- package/lib/browser/monaco-code-action-save-participant.js +1 -1
- package/lib/browser/monaco-code-action-save-participant.js.map +1 -1
- package/lib/browser/monaco-color-registry.js +2 -3
- package/lib/browser/monaco-color-registry.js.map +1 -1
- package/lib/browser/monaco-command.js +4 -7
- package/lib/browser/monaco-command.js.map +1 -1
- package/lib/browser/monaco-context-key-service.d.ts +1 -0
- package/lib/browser/monaco-context-key-service.d.ts.map +1 -1
- package/lib/browser/monaco-context-key-service.js +14 -2
- package/lib/browser/monaco-context-key-service.js.map +1 -1
- package/lib/browser/monaco-context-menu.js +1 -2
- package/lib/browser/monaco-context-menu.js.map +1 -1
- package/lib/browser/monaco-diff-computer.js +8 -11
- package/lib/browser/monaco-diff-computer.js.map +1 -1
- package/lib/browser/monaco-diff-editor.d.ts +3 -4
- package/lib/browser/monaco-diff-editor.d.ts.map +1 -1
- package/lib/browser/monaco-diff-editor.js +8 -27
- package/lib/browser/monaco-diff-editor.js.map +1 -1
- package/lib/browser/monaco-diff-navigator-factory.d.ts.map +1 -1
- package/lib/browser/monaco-diff-navigator-factory.js +6 -6
- package/lib/browser/monaco-diff-navigator-factory.js.map +1 -1
- package/lib/browser/monaco-editor-content-menu.js +1 -2
- package/lib/browser/monaco-editor-content-menu.js.map +1 -1
- package/lib/browser/monaco-editor-model.d.ts.map +1 -1
- package/lib/browser/monaco-editor-model.js +6 -11
- package/lib/browser/monaco-editor-model.js.map +1 -1
- package/lib/browser/monaco-editor-overlay-button.js +1 -1
- package/lib/browser/monaco-editor-overlay-button.js.map +1 -1
- package/lib/browser/monaco-editor-peek-view-widget.js +1 -2
- package/lib/browser/monaco-editor-peek-view-widget.js.map +1 -1
- package/lib/browser/monaco-editor-provider.d.ts +1 -1
- package/lib/browser/monaco-editor-provider.d.ts.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.js +6 -6
- package/lib/browser/monaco-editor-service.js.map +1 -1
- package/lib/browser/monaco-editor.d.ts +18 -3
- package/lib/browser/monaco-editor.d.ts.map +1 -1
- package/lib/browser/monaco-editor.js +35 -15
- package/lib/browser/monaco-editor.js.map +1 -1
- package/lib/browser/monaco-frontend-application-contribution.js +1 -2
- package/lib/browser/monaco-frontend-application-contribution.js.map +1 -1
- package/lib/browser/monaco-frontend-module.js +6 -8
- package/lib/browser/monaco-frontend-module.js.map +1 -1
- package/lib/browser/monaco-gotoline-quick-access.js +1 -2
- package/lib/browser/monaco-gotoline-quick-access.js.map +1 -1
- package/lib/browser/monaco-gotosymbol-quick-access.js +1 -2
- package/lib/browser/monaco-gotosymbol-quick-access.js.map +1 -1
- package/lib/browser/monaco-indexed-db.js +8 -9
- package/lib/browser/monaco-indexed-db.js.map +1 -1
- package/lib/browser/monaco-keybinding.js +2 -4
- package/lib/browser/monaco-keybinding.js.map +1 -1
- package/lib/browser/monaco-languages.js +3 -6
- package/lib/browser/monaco-languages.js.map +1 -1
- package/lib/browser/monaco-mime-service.d.ts +0 -1
- package/lib/browser/monaco-mime-service.d.ts.map +1 -1
- package/lib/browser/monaco-outline-contribution.js +1 -2
- package/lib/browser/monaco-outline-contribution.js.map +1 -1
- package/lib/browser/monaco-outline-decorator.d.ts.map +1 -1
- package/lib/browser/monaco-quick-input-service.d.ts +9 -1
- package/lib/browser/monaco-quick-input-service.d.ts.map +1 -1
- package/lib/browser/monaco-quick-input-service.js +18 -20
- package/lib/browser/monaco-quick-input-service.js.map +1 -1
- package/lib/browser/monaco-resolved-keybinding.js +5 -6
- package/lib/browser/monaco-resolved-keybinding.js.map +1 -1
- package/lib/browser/monaco-snippet-suggest-provider.js +4 -3
- package/lib/browser/monaco-snippet-suggest-provider.js.map +1 -1
- package/lib/browser/monaco-utilities.js +5 -6
- package/lib/browser/monaco-utilities.js.map +1 -1
- package/lib/browser/monaco-workspace.js +6 -8
- package/lib/browser/monaco-workspace.js.map +1 -1
- package/lib/browser/simple-monaco-editor.js +2 -2
- package/lib/browser/simple-monaco-editor.js.map +1 -1
- package/lib/browser/textmate/monaco-textmate-frontend-bindings.d.ts.map +1 -1
- package/lib/browser/textmate/monaco-textmate-frontend-bindings.js +3 -3
- package/lib/browser/textmate/monaco-textmate-frontend-bindings.js.map +1 -1
- package/lib/browser/textmate/textmate-contribution.js +2 -2
- package/lib/browser/textmate/textmate-contribution.js.map +1 -1
- package/lib/browser/textmate/textmate-tokenizer.js +2 -2
- package/lib/browser/textmate/textmate-tokenizer.js.map +1 -1
- package/lib/browser/workspace-symbol-command.js +3 -2
- package/lib/browser/workspace-symbol-command.js.map +1 -1
- package/package.json +8 -8
- package/src/browser/monaco-context-key-service.ts +15 -2
- package/src/browser/monaco-diff-editor.ts +8 -26
- package/src/browser/monaco-editor-provider.ts +4 -5
- package/src/browser/monaco-editor.ts +36 -15
- package/src/browser/monaco-quick-input-service.ts +25 -13
|
@@ -156,7 +156,7 @@ let MonacoWorkspace = class MonacoWorkspace {
|
|
|
156
156
|
applyBackgroundEdit(model, editOperations, shouldSave) {
|
|
157
157
|
return this.suppressOpenIfDirty(model, async () => {
|
|
158
158
|
const editor = monaco_editor_1.MonacoEditor.findByDocument(this.editorManager, model)[0];
|
|
159
|
-
const wasDirty = !!
|
|
159
|
+
const wasDirty = !!editor?.document.dirty;
|
|
160
160
|
const cursorState = editor && editor.getControl().getSelections() || [];
|
|
161
161
|
model.textEditorModel.pushStackElement();
|
|
162
162
|
model.textEditorModel.pushEditOperations(cursorState, editOperations, () => cursorState);
|
|
@@ -171,7 +171,7 @@ let MonacoWorkspace = class MonacoWorkspace {
|
|
|
171
171
|
let totalEdits = 0;
|
|
172
172
|
let totalFiles = 0;
|
|
173
173
|
const fileEdits = edits.filter(edit => edit instanceof bulkEditService_1.ResourceFileEdit);
|
|
174
|
-
const [snippetEdits, textEdits] = types_1.ArrayUtils.partition(edits.filter(edit => edit instanceof bulkEditService_1.ResourceTextEdit), edit =>
|
|
174
|
+
const [snippetEdits, textEdits] = types_1.ArrayUtils.partition(edits.filter(edit => edit instanceof bulkEditService_1.ResourceTextEdit), edit => edit.textEdit.insertAsSnippet && (edit.resource.toString() === this.editorManager.activeEditor?.getResourceUri()?.toString()));
|
|
175
175
|
if (fileEdits.length > 0) {
|
|
176
176
|
await this.performFileEdits(fileEdits);
|
|
177
177
|
}
|
|
@@ -188,7 +188,7 @@ let MonacoWorkspace = class MonacoWorkspace {
|
|
|
188
188
|
const resources = new Set(edits
|
|
189
189
|
.filter((edit) => edit instanceof bulkEditService_1.ResourceTextEdit)
|
|
190
190
|
.map(edit => edit.resource.toString()));
|
|
191
|
-
if (resources.size > 0 &&
|
|
191
|
+
if (resources.size > 0 && options?.respectAutoSaveConfig && this.editorPreferences.get('files.refactoring.autoSave') === true) {
|
|
192
192
|
await this.saveAll(resources);
|
|
193
193
|
}
|
|
194
194
|
const ariaSummary = this.getAriaSummary(totalEdits, totalFiles);
|
|
@@ -203,7 +203,7 @@ let MonacoWorkspace = class MonacoWorkspace {
|
|
|
203
203
|
}
|
|
204
204
|
}
|
|
205
205
|
async saveAll(resources) {
|
|
206
|
-
await Promise.all(Array.from(resources.values()).map(uri =>
|
|
206
|
+
await Promise.all(Array.from(resources.values()).map(uri => this.textModelService.get(uri)?.save()));
|
|
207
207
|
}
|
|
208
208
|
getAriaSummary(totalEdits, totalFiles) {
|
|
209
209
|
if (totalEdits === 0) {
|
|
@@ -236,7 +236,6 @@ let MonacoWorkspace = class MonacoWorkspace {
|
|
|
236
236
|
const pending = [];
|
|
237
237
|
for (const [key, value] of resourceEdits) {
|
|
238
238
|
pending.push((async () => {
|
|
239
|
-
var _a;
|
|
240
239
|
const uri = monaco.Uri.parse(key);
|
|
241
240
|
let eol;
|
|
242
241
|
const editOperations = [];
|
|
@@ -266,7 +265,7 @@ let MonacoWorkspace = class MonacoWorkspace {
|
|
|
266
265
|
const document = reference.object;
|
|
267
266
|
const model = document.textEditorModel;
|
|
268
267
|
const editor = monaco_editor_1.MonacoEditor.findByDocument(this.editorManager, document)[0];
|
|
269
|
-
const cursorState =
|
|
268
|
+
const cursorState = editor?.getControl().getSelections() ?? [];
|
|
270
269
|
// start a fresh operation
|
|
271
270
|
model.pushStackElement();
|
|
272
271
|
if (editOperations.length) {
|
|
@@ -321,8 +320,7 @@ let MonacoWorkspace = class MonacoWorkspace {
|
|
|
321
320
|
}
|
|
322
321
|
}
|
|
323
322
|
async performSnippetEdits(edits) {
|
|
324
|
-
|
|
325
|
-
const activeEditor = (_a = monaco_editor_1.MonacoEditor.getActive(this.editorManager)) === null || _a === void 0 ? void 0 : _a.getControl();
|
|
323
|
+
const activeEditor = monaco_editor_1.MonacoEditor.getActive(this.editorManager)?.getControl();
|
|
326
324
|
if (activeEditor) {
|
|
327
325
|
const snippetController = activeEditor.getContribution('snippetController2');
|
|
328
326
|
snippetController.apply(edits.map(edit => ({ range: monaco.Range.lift(edit.textEdit.range), template: edit.textEdit.text })));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-workspace.js","sourceRoot":"","sources":["../../src/browser/monaco-workspace.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"monaco-workspace.js","sourceRoot":"","sources":["../../src/browser/monaco-workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,7 @@ class SimpleMonacoEditor extends monaco_editor_1.MonacoEditorServices {
|
|
|
84
84
|
horizontalHasArrows: false,
|
|
85
85
|
verticalScrollbarSize: 10,
|
|
86
86
|
horizontalScrollbarSize: 10,
|
|
87
|
-
...options
|
|
87
|
+
...options?.scrollbar,
|
|
88
88
|
}
|
|
89
89
|
};
|
|
90
90
|
const instantiator = this.getInstantiatorWithOverrides(override);
|
|
@@ -94,7 +94,7 @@ class SimpleMonacoEditor extends monaco_editor_1.MonacoEditorServices {
|
|
|
94
94
|
width: 0,
|
|
95
95
|
height: 0
|
|
96
96
|
},
|
|
97
|
-
}, widgetOptions
|
|
97
|
+
}, widgetOptions ?? {});
|
|
98
98
|
}
|
|
99
99
|
addHandlers(codeEditor) {
|
|
100
100
|
this.toDispose.push(codeEditor.onDidChangeModelLanguage(e => this.fireLanguageChanged(e.newLanguage)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple-monaco-editor.js","sourceRoot":"","sources":["../../src/browser/simple-monaco-editor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"simple-monaco-editor.js","sourceRoot":"","sources":["../../src/browser/simple-monaco-editor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-textmate-frontend-bindings.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-frontend-bindings.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAO1D,OAAO,EAA+B,WAAW,EAAoB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC1G,OAAO,EAAE,QAAQ,EAA0C,MAAM,iBAAiB,CAAC;AAGnF,qBAAa,UAAW,YAAW,QAAQ;IACvC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW;IAGjD,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU;CAGhD
|
|
1
|
+
{"version":3,"file":"monaco-textmate-frontend-bindings.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-frontend-bindings.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAO1D,OAAO,EAA+B,WAAW,EAAoB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC1G,OAAO,EAAE,QAAQ,EAA0C,MAAM,iBAAiB,CAAC;AAGnF,qBAAa,UAAW,YAAW,QAAQ;IACvC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW;IAGjD,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU;CAGhD;yBAEe,MAAM,UAAU,CAAC,IAAI,EAAE,QAAQ,UAAU,CAAC,MAAM,EAAE,SAAS,UAAU,CAAC,OAAO,EAAE,QAAQ,UAAU,CAAC,MAAM;AAAxH,wBAqCE;AAEF,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,QAAQ,CAAC,CAO1D;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,CAKzD"}
|
|
@@ -15,7 +15,9 @@
|
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.
|
|
18
|
+
exports.OnigasmLib = void 0;
|
|
19
|
+
exports.createOnigasmLib = createOnigasmLib;
|
|
20
|
+
exports.fetchOnigasm = fetchOnigasm;
|
|
19
21
|
const browser_1 = require("@theia/core/lib/browser");
|
|
20
22
|
const core_1 = require("@theia/core");
|
|
21
23
|
const textmate_registry_1 = require("./textmate-registry");
|
|
@@ -81,12 +83,10 @@ async function createOnigasmLib() {
|
|
|
81
83
|
await (0, vscode_oniguruma_1.loadWASM)(wasm);
|
|
82
84
|
return new OnigasmLib();
|
|
83
85
|
}
|
|
84
|
-
exports.createOnigasmLib = createOnigasmLib;
|
|
85
86
|
async function fetchOnigasm() {
|
|
86
87
|
// Using Webpack's wasm loader should give us a URL to fetch the resource from:
|
|
87
88
|
const onigasmPath = require('vscode-oniguruma/release/onig.wasm');
|
|
88
89
|
const response = await fetch(onigasmPath, { method: 'GET' });
|
|
89
90
|
return response.arrayBuffer();
|
|
90
91
|
}
|
|
91
|
-
exports.fetchOnigasm = fetchOnigasm;
|
|
92
92
|
//# sourceMappingURL=monaco-textmate-frontend-bindings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-textmate-frontend-bindings.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-frontend-bindings.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,gFAAgF;AAChF,gFAAgF;;;
|
|
1
|
+
{"version":3,"file":"monaco-textmate-frontend-bindings.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-frontend-bindings.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,8 @@
|
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.
|
|
18
|
+
exports.LanguageGrammarDefinitionContribution = void 0;
|
|
19
|
+
exports.getEncodedLanguageId = getEncodedLanguageId;
|
|
19
20
|
const monaco = require("@theia/monaco-editor-core");
|
|
20
21
|
/**
|
|
21
22
|
* Callback for extensions to contribute language grammar definitions
|
|
@@ -24,5 +25,4 @@ exports.LanguageGrammarDefinitionContribution = Symbol('LanguageGrammarDefinitio
|
|
|
24
25
|
function getEncodedLanguageId(languageId) {
|
|
25
26
|
return monaco.languages.getEncodedLanguageId(languageId);
|
|
26
27
|
}
|
|
27
|
-
exports.getEncodedLanguageId = getEncodedLanguageId;
|
|
28
28
|
//# sourceMappingURL=textmate-contribution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textmate-contribution.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-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,gFAAgF;AAChF,gFAAgF;;;
|
|
1
|
+
{"version":3,"file":"textmate-contribution.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-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,gFAAgF;AAChF,gFAAgF;;;AAYhF,oDAEC;AAXD,oDAAoD;AAEpD;;GAEG;AACU,QAAA,qCAAqC,GAAG,MAAM,CAAC,uCAAuC,CAAC,CAAC;AAIrG,SAAgB,oBAAoB,CAAC,UAAkB;IACnD,OAAO,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC"}
|
|
@@ -15,7 +15,8 @@
|
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.
|
|
18
|
+
exports.TokenizerState = void 0;
|
|
19
|
+
exports.createTextmateTokenizer = createTextmateTokenizer;
|
|
19
20
|
const vscode_textmate_1 = require("vscode-textmate");
|
|
20
21
|
class TokenizerState {
|
|
21
22
|
constructor(stateStack) {
|
|
@@ -62,5 +63,4 @@ function createTextmateTokenizer(grammar, options) {
|
|
|
62
63
|
}
|
|
63
64
|
};
|
|
64
65
|
}
|
|
65
|
-
exports.createTextmateTokenizer = createTextmateTokenizer;
|
|
66
66
|
//# sourceMappingURL=textmate-tokenizer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textmate-tokenizer.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-tokenizer.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,gFAAgF;AAChF,gFAAgF;;;
|
|
1
|
+
{"version":3,"file":"textmate-tokenizer.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-tokenizer.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,gFAAgF;AAChF,gFAAgF;;;AAqChF,0DAgCC;AAnED,qDAAgE;AAGhE,MAAa,cAAc;IAEvB,YACoB,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEL,KAAK;QACD,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,KAA8B;QACjC,OAAO,KAAK,YAAY,cAAc,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC;IACvG,CAAC;CAEJ;AAdD,wCAcC;AAkBD,SAAgB,uBAAuB,CAAC,OAAiB,EAAE,OAAwB;IAC/E,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QACtG,MAAM,IAAI,KAAK,CAAC,sDAAsD,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC;IAChG,CAAC;IACD,OAAO;QACH,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,yBAAO,CAAC;QAClD,eAAe,CAAC,IAAY,EAAE,KAAqB;YAC/C,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;gBACrE,yDAAyD;gBACzD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,WAAW,EAAE,EAAE,CAAC;YACrE,CAAC;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YAClE,OAAO;gBACH,QAAQ,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM;aACxB,CAAC;QACN,CAAC;QACD,QAAQ,CAAC,IAAY,EAAE,KAAqB;YACxC,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;gBACrE,yDAAyD;gBACzD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;YACtD,CAAC;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACjE,OAAO;gBACH,QAAQ,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC5B,UAAU,EAAE,CAAC,CAAC,UAAU;oBACxB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;iBACvC,CAAC,CAAC;aACN,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -27,13 +27,15 @@ const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-lang
|
|
|
27
27
|
const monaco_languages_1 = require("./monaco-languages");
|
|
28
28
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
29
29
|
const browser_2 = require("@theia/editor/lib/browser");
|
|
30
|
-
let WorkspaceSymbolCommand =
|
|
30
|
+
let WorkspaceSymbolCommand = class WorkspaceSymbolCommand {
|
|
31
31
|
constructor() {
|
|
32
32
|
this.command = common_1.Command.toDefaultLocalizedCommand({
|
|
33
33
|
id: 'languages.workspace.symbol',
|
|
34
34
|
label: 'Go to Symbol in Workspace...'
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
|
+
static { WorkspaceSymbolCommand_1 = this; }
|
|
38
|
+
static { this.PREFIX = '#'; }
|
|
37
39
|
isEnabled() {
|
|
38
40
|
return this.languages.workspaceSymbolProviders !== undefined;
|
|
39
41
|
}
|
|
@@ -148,7 +150,6 @@ let WorkspaceSymbolCommand = WorkspaceSymbolCommand_1 = class WorkspaceSymbolCom
|
|
|
148
150
|
}
|
|
149
151
|
};
|
|
150
152
|
exports.WorkspaceSymbolCommand = WorkspaceSymbolCommand;
|
|
151
|
-
WorkspaceSymbolCommand.PREFIX = '#';
|
|
152
153
|
tslib_1.__decorate([
|
|
153
154
|
(0, inversify_1.inject)(monaco_languages_1.MonacoLanguages),
|
|
154
155
|
tslib_1.__metadata("design:type", monaco_languages_1.MonacoLanguages)
|
|
@@ -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;AAGpD,IAAM,sBAAsB,
|
|
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.68.0-next.
|
|
3
|
+
"version": "1.68.0-next.48+c13611b3f",
|
|
4
4
|
"description": "Theia - Monaco Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.68.0-next.
|
|
7
|
-
"@theia/editor": "1.68.0-next.
|
|
8
|
-
"@theia/filesystem": "1.68.0-next.
|
|
9
|
-
"@theia/markers": "1.68.0-next.
|
|
6
|
+
"@theia/core": "1.68.0-next.48+c13611b3f",
|
|
7
|
+
"@theia/editor": "1.68.0-next.48+c13611b3f",
|
|
8
|
+
"@theia/filesystem": "1.68.0-next.48+c13611b3f",
|
|
9
|
+
"@theia/markers": "1.68.0-next.48+c13611b3f",
|
|
10
10
|
"@theia/monaco-editor-core": "1.96.302",
|
|
11
|
-
"@theia/outline-view": "1.68.0-next.
|
|
12
|
-
"@theia/workspace": "1.68.0-next.
|
|
11
|
+
"@theia/outline-view": "1.68.0-next.48+c13611b3f",
|
|
12
|
+
"@theia/workspace": "1.68.0-next.48+c13611b3f",
|
|
13
13
|
"fast-plist": "^0.1.2",
|
|
14
14
|
"idb": "^4.0.5",
|
|
15
15
|
"jsonc-parser": "^2.2.0",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"nyc": {
|
|
58
58
|
"extends": "../../configs/nyc.json"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "c13611b3f07bfc3d2c7525d8488283ff3e575422"
|
|
61
61
|
}
|
|
@@ -20,7 +20,7 @@ import {
|
|
|
20
20
|
ScopedValueStore, ContextMatcher, ContextKeyValue, Context
|
|
21
21
|
} from '@theia/core/lib/browser/context-key-service';
|
|
22
22
|
import { Emitter, Event } from '@theia/core';
|
|
23
|
-
import { AbstractContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
|
|
23
|
+
import { AbstractContextKeyService, Context as MonacoContext } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
|
|
24
24
|
import { ContextKeyExpr, ContextKeyExpression, IContext, IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
|
|
25
25
|
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
|
|
26
26
|
|
|
@@ -147,10 +147,23 @@ export class MonacoContextKeyService implements TheiaContextKeyService {
|
|
|
147
147
|
this.contextKeyService.setContext(key, value);
|
|
148
148
|
}
|
|
149
149
|
|
|
150
|
+
getLocalContextKeys(element: HTMLElement): Set<string> {
|
|
151
|
+
const context = this.contextKeyService.getContext(element);
|
|
152
|
+
// Get local values
|
|
153
|
+
if (context && context instanceof MonacoContext) {
|
|
154
|
+
const localValues = context.value;
|
|
155
|
+
// Filter out the internal '_contextId' key
|
|
156
|
+
const res = new Set(Object.keys(localValues));
|
|
157
|
+
res.delete('_contextId');
|
|
158
|
+
return res;
|
|
159
|
+
}
|
|
160
|
+
// For other IContext implementations (like NullContext), return empty set
|
|
161
|
+
return new Set<string>();
|
|
162
|
+
}
|
|
163
|
+
|
|
150
164
|
dispose(): void {
|
|
151
165
|
this.activeContext = undefined;
|
|
152
166
|
this.onDidChangeEmitter.dispose();
|
|
153
167
|
this.contextKeyService.dispose();
|
|
154
168
|
}
|
|
155
169
|
}
|
|
156
|
-
|
|
@@ -43,9 +43,7 @@ export namespace MonacoDiffEditor {
|
|
|
43
43
|
export class MonacoDiffEditor extends MonacoEditor {
|
|
44
44
|
protected _diffEditor: IStandaloneDiffEditor;
|
|
45
45
|
protected _diffNavigator: DiffNavigator;
|
|
46
|
-
protected
|
|
47
|
-
protected originalTextModel: monaco.editor.ITextModel;
|
|
48
|
-
protected modifiedTextModel: monaco.editor.ITextModel;
|
|
46
|
+
protected readonly diffEditorModel: monaco.editor.IDiffEditorModel;
|
|
49
47
|
|
|
50
48
|
constructor(
|
|
51
49
|
uri: URI,
|
|
@@ -59,14 +57,10 @@ export class MonacoDiffEditor extends MonacoEditor {
|
|
|
59
57
|
parentEditor?: MonacoEditor
|
|
60
58
|
) {
|
|
61
59
|
super(uri, modifiedModel, node, services, options, override, parentEditor);
|
|
62
|
-
this.
|
|
63
|
-
this.modifiedTextModel = modifiedModel.textEditorModel;
|
|
60
|
+
this.diffEditorModel = { original: this.originalModel.textEditorModel, modified: this.modifiedModel.textEditorModel };
|
|
64
61
|
this.documents.add(originalModel);
|
|
65
|
-
const original = originalModel.textEditorModel;
|
|
66
|
-
const modified = modifiedModel.textEditorModel;
|
|
67
62
|
this.wordWrapOverride = options?.wordWrapOverride2;
|
|
68
63
|
this._diffNavigator = diffNavigatorFactory.createdDiffNavigator(this._diffEditor);
|
|
69
|
-
this._diffEditor.setModel({ original, modified });
|
|
70
64
|
}
|
|
71
65
|
|
|
72
66
|
get diffEditor(): monaco.editor.IStandaloneDiffEditor {
|
|
@@ -138,24 +132,12 @@ export class MonacoDiffEditor extends MonacoEditor {
|
|
|
138
132
|
// no op
|
|
139
133
|
}
|
|
140
134
|
|
|
141
|
-
override
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
const originalModel = this.diffEditor.getOriginalEditor().getModel();
|
|
148
|
-
if (originalModel) {
|
|
149
|
-
this.originalTextModel = originalModel;
|
|
150
|
-
}
|
|
151
|
-
const modifiedModel = this.diffEditor.getModifiedEditor().getModel();
|
|
152
|
-
if (modifiedModel) {
|
|
153
|
-
this.modifiedTextModel = modifiedModel;
|
|
154
|
-
}
|
|
155
|
-
this.savedDiffState = this.diffEditor.saveViewState();
|
|
156
|
-
// eslint-disable-next-line no-null/no-null
|
|
157
|
-
this.diffEditor.setModel(null);
|
|
158
|
-
}
|
|
135
|
+
protected override get baseEditor(): monaco.editor.IEditor {
|
|
136
|
+
return this.diffEditor;
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
protected override get baseModel(): monaco.editor.IEditorModel {
|
|
140
|
+
return this.diffEditorModel;
|
|
159
141
|
}
|
|
160
142
|
}
|
|
161
143
|
|
|
@@ -126,7 +126,7 @@ export class MonacoEditorProvider {
|
|
|
126
126
|
return this.doCreateEditor(uri, (override, toDispose) => this.createEditor(uri, override, toDispose));
|
|
127
127
|
}
|
|
128
128
|
|
|
129
|
-
protected async doCreateEditor<T>(uri: URI, factory: (
|
|
129
|
+
protected async doCreateEditor<T extends MonacoEditor | SimpleMonacoEditor>(uri: URI, factory: (
|
|
130
130
|
override: EditorServiceOverrides, toDispose: DisposableCollection) => Promise<T>
|
|
131
131
|
): Promise<T> {
|
|
132
132
|
const domNode = document.createElement('div');
|
|
@@ -139,9 +139,7 @@ export class MonacoEditorProvider {
|
|
|
139
139
|
];
|
|
140
140
|
const toDispose = new DisposableCollection();
|
|
141
141
|
const editor = await factory(overrides, toDispose);
|
|
142
|
-
|
|
143
|
-
editor.onDispose(() => toDispose.dispose());
|
|
144
|
-
}
|
|
142
|
+
editor.onDispose(() => toDispose.dispose());
|
|
145
143
|
if (editor instanceof MonacoEditor) {
|
|
146
144
|
|
|
147
145
|
this.injectKeybindingResolver(editor);
|
|
@@ -238,7 +236,8 @@ export class MonacoEditorProvider {
|
|
|
238
236
|
|
|
239
237
|
protected createMonacoEditorOptions(model: MonacoEditorModel): MonacoEditor.IOptions {
|
|
240
238
|
const options = this.createOptions(this.preferencePrefixes, model.uri, model.languageId);
|
|
241
|
-
|
|
239
|
+
// eslint-disable-next-line no-null/no-null
|
|
240
|
+
options.model = null; // explicitly set to null to avoid creating an initial model automatically
|
|
242
241
|
options.readOnly = model.readOnly;
|
|
243
242
|
this.updateReadOnlyMessage(options, model.readOnly);
|
|
244
243
|
options.lineNumbersMinChars = model.lineNumbersMinChars;
|
|
@@ -128,8 +128,9 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
|
|
|
128
128
|
readonly onShouldDisplayDirtyDiffChanged: Event<boolean> | undefined = this.onShouldDisplayDirtyDiffChangedEmitter.event;
|
|
129
129
|
|
|
130
130
|
readonly documents = new Set<MonacoEditorModel>();
|
|
131
|
-
|
|
132
|
-
|
|
131
|
+
|
|
132
|
+
// eslint-disable-next-line no-null/no-null
|
|
133
|
+
protected savedViewState: monaco.editor.IEditorViewState | null = null;
|
|
133
134
|
|
|
134
135
|
protected constructor(
|
|
135
136
|
readonly uri: URI,
|
|
@@ -264,20 +265,39 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
|
|
|
264
265
|
|
|
265
266
|
handleVisibilityChanged(nowVisible: boolean): void {
|
|
266
267
|
if (nowVisible) {
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
this.editor.focus();
|
|
271
|
-
}
|
|
268
|
+
this.baseEditor.setModel(this.baseModel);
|
|
269
|
+
this.baseEditor.restoreViewState(this.savedViewState);
|
|
270
|
+
this.baseEditor.focus();
|
|
272
271
|
} else {
|
|
273
|
-
this.
|
|
274
|
-
this.savedViewState = this.editor.saveViewState();
|
|
272
|
+
this.savedViewState = this.baseEditor.saveViewState();
|
|
275
273
|
|
|
276
274
|
// eslint-disable-next-line no-null/no-null
|
|
277
|
-
this.
|
|
275
|
+
this.baseEditor.setModel(null); // workaround for https://github.com/eclipse-theia/theia/issues/14880
|
|
278
276
|
}
|
|
279
277
|
}
|
|
280
278
|
|
|
279
|
+
/**
|
|
280
|
+
* This property allows working with the underlying editor instance
|
|
281
|
+
* through the base editor interface, `monaco.editor.IEditor`.
|
|
282
|
+
*
|
|
283
|
+
* This property is intended to be overriden in subclasses as needed,
|
|
284
|
+
* e.g. it returns the underlying diff editor in `MonacoDiffEditor`.
|
|
285
|
+
*/
|
|
286
|
+
protected get baseEditor(): monaco.editor.IEditor {
|
|
287
|
+
return this.editor;
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
/**
|
|
291
|
+
* This property allows working with the underlying editor model instance
|
|
292
|
+
* through the base editor model interface, `monaco.editor.IEditorModel`.
|
|
293
|
+
*
|
|
294
|
+
* This property is intended to be overriden in subclasses as needed,
|
|
295
|
+
* e.g. it returns the underlying diff editor model in `MonacoDiffEditor`.
|
|
296
|
+
*/
|
|
297
|
+
protected get baseModel(): monaco.editor.IEditorModel {
|
|
298
|
+
return this.document.textEditorModel;
|
|
299
|
+
}
|
|
300
|
+
|
|
281
301
|
getVisibleRanges(): Range[] {
|
|
282
302
|
return this.editor.getVisibleRanges().map(range => this.m2p.asRange(range));
|
|
283
303
|
}
|
|
@@ -615,15 +635,16 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
|
|
|
615
635
|
}
|
|
616
636
|
|
|
617
637
|
storeViewState(): object {
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
this.savedViewState = state;
|
|
638
|
+
if (this.baseEditor.getModel()) {
|
|
639
|
+
this.savedViewState = this.baseEditor.saveViewState();
|
|
621
640
|
}
|
|
622
641
|
return this.savedViewState!;
|
|
623
642
|
}
|
|
624
643
|
|
|
625
|
-
restoreViewState(state: monaco.editor.
|
|
626
|
-
this.
|
|
644
|
+
restoreViewState(state: monaco.editor.IEditorViewState): void {
|
|
645
|
+
if (this.baseEditor.getModel()) {
|
|
646
|
+
this.baseEditor.restoreViewState(state);
|
|
647
|
+
}
|
|
627
648
|
this.savedViewState = state;
|
|
628
649
|
}
|
|
629
650
|
|