@opensumi/ide-monaco 3.8.3-next-1744177390.0 → 3.8.3-next-1744190019.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.
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Injector } from '@opensumi/di';
|
|
2
|
-
import { Disposable, ServiceNames } from '@opensumi/ide-core-browser';
|
|
2
|
+
import { Disposable, KeybindingService, ServiceNames } from '@opensumi/ide-core-browser';
|
|
3
3
|
import { IMergeEditorEditor } from '@opensumi/ide-core-browser/lib/monaco/merge-editor-widget';
|
|
4
4
|
import { IEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/config/editorConfiguration';
|
|
5
5
|
import { IDiffEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
@@ -11,12 +11,14 @@ export default class MonacoServiceImpl extends Disposable implements MonacoServi
|
|
|
11
11
|
private textMateService;
|
|
12
12
|
private readonly overrideServiceRegistry;
|
|
13
13
|
private readonly keybindingRegistry;
|
|
14
|
+
protected readonly keybindingService: KeybindingService;
|
|
14
15
|
private readonly logger;
|
|
15
16
|
get monacoBaseOptions(): IStandaloneEditorConstructionOptions;
|
|
16
17
|
createCodeEditor(monacoContainer: HTMLElement, options?: IEditorConstructionOptions, overrides?: {
|
|
17
18
|
[key: string]: any;
|
|
18
19
|
}): ICodeEditor;
|
|
19
20
|
private doAddClickEventListener;
|
|
21
|
+
private doAddCompositionEventListener;
|
|
20
22
|
private addClickEventListener;
|
|
21
23
|
createDiffEditor(monacoContainer: HTMLElement, options?: IDiffEditorConstructionOptions, overrides?: {
|
|
22
24
|
[key: string]: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco.service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EACL,UAAU,
|
|
1
|
+
{"version":3,"file":"monaco.service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EACL,UAAU,EAGV,iBAAiB,EAEjB,YAAY,EACb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2DAA2D,CAAC;AAE/F,OAAO,EAAE,0BAA0B,EAAE,MAAM,+EAA+E,CAAC;AAC3H,OAAO,EACL,8BAA8B,EAG/B,MAAM,kEAAkE,CAAC;AAG1E,OAAO,EAAE,oCAAoC,EAAE,MAAM,oFAAoF,CAAC;AAG1I,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAK1C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAO9D,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAW,YAAW,aAAa;IAEhF,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAG7B,OAAO,CAAC,eAAe,CAA4B;IAGnD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAgC;IAGxE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAGxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,IAAI,iBAAiB,IAWd,oCAAoC,CAC1C;IAEM,gBAAgB,CACrB,eAAe,EAAE,WAAW,EAC5B,OAAO,CAAC,EAAE,0BAA0B,EACpC,SAAS,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO,GACrC,WAAW;IAkBd,OAAO,CAAC,uBAAuB;IAsB/B,OAAO,CAAC,6BAA6B;IAarC,OAAO,CAAC,qBAAqB;IAatB,gBAAgB,CACrB,eAAe,EAAE,WAAW,EAC5B,OAAO,CAAC,EAAE,8BAA8B,EACxC,SAAS,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO,GACrC,WAAW;IAcP,iBAAiB,CACtB,eAAe,EAAE,WAAW,EAC5B,OAAO,CAAC,EAAE,8BAA8B,EACxC,SAAS,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO,GACrC,kBAAkB;IAQrB,OAAO,CAAC,+BAA+B;IAIvC;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAoB3B,gBAAgB,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG;IAQxD,WAAW,CAAC,WAAW,EAAE,YAAY;IAQrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;CAGrD"}
|
|
@@ -49,6 +49,16 @@ let MonacoServiceImpl = class MonacoServiceImpl extends ide_core_browser_1.Dispo
|
|
|
49
49
|
}
|
|
50
50
|
}));
|
|
51
51
|
}
|
|
52
|
+
doAddCompositionEventListener(editor) {
|
|
53
|
+
this.addDispose(editor.onDidCompositionStart((e) => {
|
|
54
|
+
var _a;
|
|
55
|
+
(_a = this.keybindingService) === null || _a === void 0 ? void 0 : _a.handleCompositionStart();
|
|
56
|
+
}));
|
|
57
|
+
this.addDispose(editor.onDidCompositionEnd((e) => {
|
|
58
|
+
var _a;
|
|
59
|
+
(_a = this.keybindingService) === null || _a === void 0 ? void 0 : _a.handleCompositionEnd();
|
|
60
|
+
}));
|
|
61
|
+
}
|
|
52
62
|
addClickEventListener(editor) {
|
|
53
63
|
if ((0, editorBrowser_1.isDiffEditor)(editor)) {
|
|
54
64
|
const originalEditor = editor.getOriginalEditor();
|
|
@@ -58,6 +68,7 @@ let MonacoServiceImpl = class MonacoServiceImpl extends ide_core_browser_1.Dispo
|
|
|
58
68
|
}
|
|
59
69
|
else {
|
|
60
70
|
this.doAddClickEventListener(editor);
|
|
71
|
+
this.doAddCompositionEventListener(editor);
|
|
61
72
|
}
|
|
62
73
|
}
|
|
63
74
|
createDiffEditor(monacoContainer, options, overrides = {}) {
|
|
@@ -124,6 +135,10 @@ tslib_1.__decorate([
|
|
|
124
135
|
(0, di_1.Autowired)(ide_core_browser_1.KeybindingRegistry),
|
|
125
136
|
tslib_1.__metadata("design:type", Object)
|
|
126
137
|
], MonacoServiceImpl.prototype, "keybindingRegistry", void 0);
|
|
138
|
+
tslib_1.__decorate([
|
|
139
|
+
(0, di_1.Autowired)(ide_core_browser_1.KeybindingService),
|
|
140
|
+
tslib_1.__metadata("design:type", Object)
|
|
141
|
+
], MonacoServiceImpl.prototype, "keybindingService", void 0);
|
|
127
142
|
tslib_1.__decorate([
|
|
128
143
|
(0, di_1.Autowired)(ide_core_browser_1.ILogger),
|
|
129
144
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco.service.js","sourceRoot":"","sources":["../../src/browser/monaco.service.ts"],"names":[],"mappings":";;;AAAA,qCAA+E;AAC/E,
|
|
1
|
+
{"version":3,"file":"monaco.service.js","sourceRoot":"","sources":["../../src/browser/monaco.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-monaco",
|
|
3
|
-
"version": "3.8.3-next-
|
|
3
|
+
"version": "3.8.3-next-1744190019.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src",
|
|
@@ -15,18 +15,18 @@
|
|
|
15
15
|
"build:worker": "../../node_modules/.bin/webpack --config webpack.config.js"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@opensumi/ide-components": "3.8.3-next-
|
|
19
|
-
"@opensumi/ide-core-browser": "3.8.3-next-
|
|
20
|
-
"@opensumi/ide-core-common": "3.8.3-next-
|
|
21
|
-
"@opensumi/ide-overlay": "3.8.3-next-
|
|
22
|
-
"@opensumi/ide-theme": "3.8.3-next-
|
|
23
|
-
"@opensumi/ide-utils": "3.8.3-next-
|
|
18
|
+
"@opensumi/ide-components": "3.8.3-next-1744190019.0",
|
|
19
|
+
"@opensumi/ide-core-browser": "3.8.3-next-1744190019.0",
|
|
20
|
+
"@opensumi/ide-core-common": "3.8.3-next-1744190019.0",
|
|
21
|
+
"@opensumi/ide-overlay": "3.8.3-next-1744190019.0",
|
|
22
|
+
"@opensumi/ide-theme": "3.8.3-next-1744190019.0",
|
|
23
|
+
"@opensumi/ide-utils": "3.8.3-next-1744190019.0",
|
|
24
24
|
"@opensumi/monaco-editor-core": "0.54.0-patch.2"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@opensumi/ide-dev-tool": "3.8.3-next-
|
|
28
|
-
"@opensumi/ide-file-service": "3.8.3-next-
|
|
29
|
-
"@opensumi/ide-workspace": "3.8.3-next-
|
|
27
|
+
"@opensumi/ide-dev-tool": "3.8.3-next-1744190019.0",
|
|
28
|
+
"@opensumi/ide-file-service": "3.8.3-next-1744190019.0",
|
|
29
|
+
"@opensumi/ide-workspace": "3.8.3-next-1744190019.0"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "f7f8ecf9ba05a0a2740cff1a583fcf66d5fa58d6"
|
|
32
32
|
}
|
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
Disposable,
|
|
4
4
|
ILogger,
|
|
5
5
|
KeybindingRegistry,
|
|
6
|
+
KeybindingService,
|
|
6
7
|
MonacoOverrideServiceRegistry,
|
|
7
8
|
ServiceNames,
|
|
8
9
|
} from '@opensumi/ide-core-browser';
|
|
@@ -44,6 +45,9 @@ export default class MonacoServiceImpl extends Disposable implements MonacoServi
|
|
|
44
45
|
@Autowired(KeybindingRegistry)
|
|
45
46
|
private readonly keybindingRegistry: KeybindingRegistry;
|
|
46
47
|
|
|
48
|
+
@Autowired(KeybindingService)
|
|
49
|
+
protected readonly keybindingService: KeybindingService;
|
|
50
|
+
|
|
47
51
|
@Autowired(ILogger)
|
|
48
52
|
private readonly logger: ILogger;
|
|
49
53
|
|
|
@@ -105,6 +109,19 @@ export default class MonacoServiceImpl extends Disposable implements MonacoServi
|
|
|
105
109
|
);
|
|
106
110
|
}
|
|
107
111
|
|
|
112
|
+
private doAddCompositionEventListener(editor: ICodeEditor) {
|
|
113
|
+
this.addDispose(
|
|
114
|
+
editor.onDidCompositionStart((e) => {
|
|
115
|
+
this.keybindingService?.handleCompositionStart();
|
|
116
|
+
}),
|
|
117
|
+
);
|
|
118
|
+
this.addDispose(
|
|
119
|
+
editor.onDidCompositionEnd((e) => {
|
|
120
|
+
this.keybindingService?.handleCompositionEnd();
|
|
121
|
+
}),
|
|
122
|
+
);
|
|
123
|
+
}
|
|
124
|
+
|
|
108
125
|
private addClickEventListener(editor: IEditorType) {
|
|
109
126
|
if (isDiffEditor(editor)) {
|
|
110
127
|
const originalEditor = editor.getOriginalEditor();
|
|
@@ -114,6 +131,7 @@ export default class MonacoServiceImpl extends Disposable implements MonacoServi
|
|
|
114
131
|
this.doAddClickEventListener(modifiedEditor);
|
|
115
132
|
} else {
|
|
116
133
|
this.doAddClickEventListener(editor as ICodeEditor);
|
|
134
|
+
this.doAddCompositionEventListener(editor as ICodeEditor);
|
|
117
135
|
}
|
|
118
136
|
}
|
|
119
137
|
|