Skip to content

Commit 03c314b

Browse files
author
guqiankun.gqk
committed
chore: 更新opensumi 2.21.13-next & 允许去除行高亮
1 parent 66af190 commit 03c314b

17 files changed

Lines changed: 415 additions & 422 deletions

File tree

‎package.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"description": "Ant Codespaces for browser",
99
"main": "index.js",
1010
"engines": {
11-
"kaitian": "2.21.4"
11+
"kaitian": "2.21.13-next-1673339651.0"
1212
},
1313
"scripts": {
1414
"type-check": "tsc --skipLibCheck --noEmit",
@@ -230,6 +230,21 @@
230230
"publisher": "opensumi-lite-extensions",
231231
"name": "merge-conflict",
232232
"version": "1.0.0"
233+
},
234+
{
235+
"publisher": "vscode-extensions",
236+
"name": "vscode-yaml",
237+
"version": "1.9.1"
238+
},
239+
{
240+
"publisher": "cloud-ide-ext",
241+
"name": "comp-market-test",
242+
"version": "0.0.13"
243+
},
244+
{
245+
"publisher": "cloud-ide-ext",
246+
"name": "aci-yaml",
247+
"version": "1.11.9"
233248
}
234249
]
235250
}

‎packages/acr/src/app.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export default function render(
3232
'editor.quickSuggestionsMaxCount': 50,
3333
'editor.fontSize': 13,
3434
'editor.wordWrap': 'off',
35+
'editor.guides.bracketPairs': false,
3536
'diffEditor.renderSideBySide': true,
3637
'diffEditor.renderIndicators': false,
3738
'lsif.enable': true,

‎packages/alex/package.json‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -30,47 +30,47 @@
3030
"registry": "https://registry.antfin-inc.com"
3131
},
3232
"dependencies": {
33-
"@opensumi/ide-addons": "2.21.4",
34-
"@opensumi/ide-comments": "2.21.4",
35-
"@opensumi/ide-core-browser": "2.21.4",
36-
"@opensumi/ide-core-common": "2.21.4",
37-
"@opensumi/ide-debug": "2.21.4",
38-
"@opensumi/ide-decoration": "2.21.4",
39-
"@opensumi/ide-editor": "2.21.4",
40-
"@opensumi/ide-explorer": "2.21.4",
41-
"@opensumi/ide-express-file-server": "2.21.4",
42-
"@opensumi/ide-extension-storage": "2.21.4",
43-
"@opensumi/ide-file-scheme": "2.21.4",
44-
"@opensumi/ide-file-service": "2.21.4",
45-
"@opensumi/ide-file-tree-next": "2.21.4",
46-
"@opensumi/ide-i18n": "2.21.4",
47-
"@opensumi/ide-extension": "2.21.4",
48-
"@opensumi/ide-keymaps": "2.21.4",
49-
"@opensumi/ide-logs": "2.21.4",
50-
"@opensumi/ide-main-layout": "2.21.4",
51-
"@opensumi/ide-markdown": "2.21.4",
52-
"@opensumi/ide-markers": "2.21.4",
53-
"@opensumi/ide-menu-bar": "2.21.4",
54-
"@opensumi/ide-monaco": "2.21.4",
55-
"@opensumi/ide-monaco-enhance": "2.21.4",
56-
"@opensumi/ide-opened-editor": "2.21.4",
57-
"@opensumi/ide-outline": "2.21.4",
58-
"@opensumi/ide-output": "2.21.4",
59-
"@opensumi/ide-overlay": "2.21.4",
60-
"@opensumi/ide-preferences": "2.21.4",
61-
"@opensumi/ide-quick-open": "2.21.4",
62-
"@opensumi/ide-scm": "2.21.4",
63-
"@opensumi/ide-search": "2.21.4",
64-
"@opensumi/ide-static-resource": "2.21.4",
65-
"@opensumi/ide-status-bar": "2.21.4",
66-
"@opensumi/ide-storage": "2.21.4",
67-
"@opensumi/ide-theme": "2.21.4",
68-
"@opensumi/ide-webview": "2.21.4",
69-
"@opensumi/ide-workspace": "2.21.4",
70-
"@opensumi/ide-workspace-edit": "2.21.4",
71-
"@opensumi/ide-toolbar": "2.21.4",
72-
"@opensumi/ide-testing": "2.21.4",
73-
"@opensumi/ide-variable": "2.21.4",
33+
"@opensumi/ide-addons": "2.21.13-next-1673339651.0",
34+
"@opensumi/ide-comments": "2.21.13-next-1673339651.0",
35+
"@opensumi/ide-core-browser": "2.21.13-next-1673339651.0",
36+
"@opensumi/ide-core-common": "2.21.13-next-1673339651.0",
37+
"@opensumi/ide-debug": "2.21.13-next-1673339651.0",
38+
"@opensumi/ide-decoration": "2.21.13-next-1673339651.0",
39+
"@opensumi/ide-editor": "2.21.13-next-1673339651.0",
40+
"@opensumi/ide-explorer": "2.21.13-next-1673339651.0",
41+
"@opensumi/ide-express-file-server": "2.21.13-next-1673339651.0",
42+
"@opensumi/ide-extension-storage": "2.21.13-next-1673339651.0",
43+
"@opensumi/ide-file-scheme": "2.21.13-next-1673339651.0",
44+
"@opensumi/ide-file-service": "2.21.13-next-1673339651.0",
45+
"@opensumi/ide-file-tree-next": "2.21.13-next-1673339651.0",
46+
"@opensumi/ide-i18n": "2.21.13-next-1673339651.0",
47+
"@opensumi/ide-extension": "2.21.13-next-1673339651.0",
48+
"@opensumi/ide-keymaps": "2.21.13-next-1673339651.0",
49+
"@opensumi/ide-logs": "2.21.13-next-1673339651.0",
50+
"@opensumi/ide-main-layout": "2.21.13-next-1673339651.0",
51+
"@opensumi/ide-markdown": "2.21.13-next-1673339651.0",
52+
"@opensumi/ide-markers": "2.21.13-next-1673339651.0",
53+
"@opensumi/ide-menu-bar": "2.21.13-next-1673339651.0",
54+
"@opensumi/ide-monaco": "2.21.13-next-1673339651.0",
55+
"@opensumi/ide-monaco-enhance": "2.21.13-next-1673339651.0",
56+
"@opensumi/ide-opened-editor": "2.21.13-next-1673339651.0",
57+
"@opensumi/ide-outline": "2.21.13-next-1673339651.0",
58+
"@opensumi/ide-output": "2.21.13-next-1673339651.0",
59+
"@opensumi/ide-overlay": "2.21.13-next-1673339651.0",
60+
"@opensumi/ide-preferences": "2.21.13-next-1673339651.0",
61+
"@opensumi/ide-quick-open": "2.21.13-next-1673339651.0",
62+
"@opensumi/ide-scm": "2.21.13-next-1673339651.0",
63+
"@opensumi/ide-search": "2.21.13-next-1673339651.0",
64+
"@opensumi/ide-static-resource": "2.21.13-next-1673339651.0",
65+
"@opensumi/ide-status-bar": "2.21.13-next-1673339651.0",
66+
"@opensumi/ide-storage": "2.21.13-next-1673339651.0",
67+
"@opensumi/ide-theme": "2.21.13-next-1673339651.0",
68+
"@opensumi/ide-webview": "2.21.13-next-1673339651.0",
69+
"@opensumi/ide-workspace": "2.21.13-next-1673339651.0",
70+
"@opensumi/ide-workspace-edit": "2.21.13-next-1673339651.0",
71+
"@opensumi/ide-toolbar": "2.21.13-next-1673339651.0",
72+
"@opensumi/ide-testing": "2.21.13-next-1673339651.0",
73+
"@opensumi/ide-variable": "2.21.13-next-1673339651.0",
7474
"@ali/kaitian-textmate-languages": "^2.7.0",
7575
"@alipay/alex-cli": "2.1.1-0",
7676
"@alipay/alex-code-api": "2.1.1-0",

‎packages/alex/src/api/createApp.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ export const getDefaultAppConfig = (): IAppOpts => ({
5555
'editor.quickSuggestionsDelay': 10,
5656
'settings.userBeforeWorkspace': true,
5757
'editor.fixedOverflowWidgets': true,
58+
// 取消高亮线
59+
'editor.guides.bracketPairs': false,
5860
'files.exclude': {
5961
...FILES_DEFAULTS.filesExclude,
6062
// browserfs OverlayFS 用来记录删除的文件

‎packages/alex/src/api/createEditor.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ const getDefaultAppConfig = (): IAppOpts => ({
4343
'general.theme': 'opensumi-light',
4444
'application.confirmExit': 'never',
4545
'editor.autoSave': 'afterDelay',
46+
'editor.guides.bracketPairs': false,
4647
'editor.autoSaveDelay': 1000, // one second
4748
'editor.fixedOverflowWidgets': true, // widget editor 默认改为 fixed
4849
'files.exclude': {

‎packages/alex/src/core/editor/editor.module.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,9 @@ class EditorSpecialContribution
432432
disposer.addDispose(
433433
editor.monacoEditor.onMouseMove(
434434
debounce((event) => {
435+
if (this.runtimeConfig.disableHighlightLine) {
436+
return;
437+
}
435438
const type = event?.target?.type;
436439
if (
437440
type === monaco.editor.MouseTargetType.GUTTER_LINE_NUMBERS ||
@@ -456,6 +459,9 @@ class EditorSpecialContribution
456459
);
457460
let oldClickDecorations: string[] = [];
458461
const highlightLine = (lineNumber: number | [number, number] | Array<[number, number]>) => {
462+
if (this.runtimeConfig.disableHighlightLine) {
463+
return;
464+
}
459465
let centerLine: number;
460466
let newDecorations: monaco.editor.IModelDeltaDecoration[];
461467
if (Array.isArray(lineNumber) && Array.isArray(lineNumber[0])) {

‎packages/alex/src/core/patch.ts‎

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ export const disposeMode = () => {
2020
const modeService: any = StandaloneServices.get(ILanguageService);
2121

2222
// 需要把 LanguageRegistry dispose，否则二次加载会重复触发事件，导致加载越来越慢
23-
modeService._value?._registry?.dispose?.();
24-
modeService._value = null;
23+
modeService._registry?.dispose?.();
2524
(<any>ModesRegistry)._languages = [];
2625
};
2726

@@ -44,44 +43,3 @@ DiskFsProviderClient.prototype.getCurrentUserHome = function () {
4443
};
4544
// 极速版暂不支持断点
4645
DebugConfigurationManager.prototype.canSetBreakpointsIn = () => false;
47-
48-
// TODO: 临时 patch icon 路径不对问题，蚂蚁链上线依赖
49-
// OpenSumi 集成 2.10 后删除该 patch 逻辑
50-
// @ts-ignore
51-
IconService.prototype.getPath = function (basePath: string, relativePath: string) {
52-
if (relativePath.startsWith('./')) {
53-
const uri = new URI(basePath).resolve(relativePath.replace(/^\.\//, ''));
54-
return uri.scheme ? uri : URI.file(uri.toString());
55-
} else if (/^http(s)?/.test(relativePath)) {
56-
return new URI(relativePath);
57-
} else if (basePath) {
58-
const uri = new URI(basePath).resolve(relativePath);
59-
return uri.scheme ? uri : URI.file(uri.toString());
60-
} else if (/^file:\/\//.test(relativePath)) {
61-
return new URI(relativePath);
62-
} else {
63-
return URI.file(relativePath);
64-
}
65-
};
66-
67-
// @ts-ignore
68-
IconService.prototype.getMaskStyleSheetWithStaticService = function (
69-
path: URI,
70-
className: string,
71-
baseTheme?: string
72-
) {
73-
const iconUrl = this.staticResourceService.resolveStaticResource(path).toString();
74-
// @ts-ignore
75-
return this.getMaskStyleSheet(iconUrl, className, baseTheme);
76-
};
77-
78-
// @ts-ignore
79-
IconService.prototype.getBackgroundStyleSheetWithStaticService = function (
80-
path: URI,
81-
className: string,
82-
baseTheme?: string
83-
) {
84-
const iconUrl = this.staticResourceService.resolveStaticResource(path).toString();
85-
// @ts-ignore
86-
return this.getBackgroundStyleSheet(iconUrl, className, baseTheme);
87-
};

‎packages/cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"dependencies": {
2121
"@ali/ide-extension-installer": "^2.0.0",
2222
"@alipay/alex-shared": "2.1.1-0",
23-
"@opensumi/ide-extension": "2.21.4",
23+
"@opensumi/ide-extension": "2.21.13-next-1673339651.0",
2424
"commander": "^7.2.0",
2525
"fs-extra": "^9.0.1",
2626
"lodash.pick": "^4.4.0",

‎packages/code-service/src/line-decoration.contribution.ts‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { IThemeService } from '@opensumi/ide-theme';
1616
import debounce from 'lodash.debounce';
1717
import { CodeModelService } from './code-model.service';
1818
import styles from './style.module.less';
19+
import { RuntimeConfig } from '@alipay/alex-core';
1920

2021
@Domain(BrowserEditorContribution, CommandContribution)
2122
export class LineDecorationContribution implements BrowserEditorContribution, CommandContribution {
@@ -28,6 +29,9 @@ export class LineDecorationContribution implements BrowserEditorContribution, Co
2829
@Autowired(CodeModelService)
2930
codeModel: CodeModelService;
3031

32+
@Autowired(RuntimeConfig)
33+
private readonly runtimeConfig: RuntimeConfig;
34+
3135
private lineNumbers: [number, number] | null = null;
3236

3337
private lineDecorations = new Map<string, string[]>();
@@ -41,7 +45,10 @@ export class LineDecorationContribution implements BrowserEditorContribution, Co
4145
disposer.addDispose(
4246
editor.monacoEditor.onMouseMove(
4347
debounce((event) => {
44-
if (this.editorService.currentEditor !== editor) {
48+
if (
49+
this.editorService.currentEditor !== editor ||
50+
this.runtimeConfig.disableHighlightLine
51+
) {
4552
return;
4653
}
4754

@@ -132,6 +139,10 @@ export class LineDecorationContribution implements BrowserEditorContribution, Co
132139
}
133140

134141
private highlightLine(editor: IEditor) {
142+
if (this.runtimeConfig.disableHighlightLine) {
143+
return;
144+
}
145+
135146
if (!this.lineNumbers) {
136147
return [];
137148
}

‎packages/core/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
},
2121
"dependencies": {
2222
"@opensumi/di": "^1.0.0",
23-
"@opensumi/ide-core-browser": "2.21.4",
24-
"@opensumi/ide-core-common": "2.21.4",
25-
"@opensumi/ide-debug": "2.21.4",
26-
"@opensumi/ide-file-scheme": "2.21.4",
27-
"@opensumi/ide-file-service": "2.21.4",
28-
"@opensumi/ide-extension": "2.21.4",
29-
"@opensumi/ide-logs": "2.21.4",
23+
"@opensumi/ide-core-browser": "2.21.13-next-1673339651.0",
24+
"@opensumi/ide-core-common": "2.21.13-next-1673339651.0",
25+
"@opensumi/ide-debug": "2.21.13-next-1673339651.0",
26+
"@opensumi/ide-file-scheme": "2.21.13-next-1673339651.0",
27+
"@opensumi/ide-file-service": "2.21.13-next-1673339651.0",
28+
"@opensumi/ide-extension": "2.21.13-next-1673339651.0",
29+
"@opensumi/ide-logs": "2.21.13-next-1673339651.0",
3030
"@alipay/alex-browserfs": "~2.1.0",
3131
"@alipay/alex-registry": "2.1.1-0",
3232
"@alipay/alex-shared": "2.1.1-0",

0 commit comments

Comments
 (0)