Skip to content

Commit 7f598a6

Browse files
erha19erha19
committed
Merge branch 'v2.19' of github.com:opensumi/core into main
2 parents 8227521 + 9df8a1f commit 7f598a6

File tree

65 files changed

+558
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+558
-481
lines changed

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.19.3",
2+
"version": "2.19.4",
33
"npmClient": "npm",
44
"packages": ["packages/*", "tools/dev-tool"],
55
"command": {

‎packages/addons/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-addons",
3-
"version": "2.19.3",
3+
"version": "2.19.4",
44
"files": [
55
"lib"
66
],
@@ -16,19 +16,19 @@
1616
"url": "[email protected]:opensumi/core.git"
1717
},
1818
"dependencies": {
19-
"@opensumi/ide-core-common": "2.19.3",
20-
"@opensumi/ide-core-node": "2.19.3"
19+
"@opensumi/ide-core-common": "2.19.4",
20+
"@opensumi/ide-core-node": "2.19.4"
2121
},
2222
"devDependencies": {
23-
"@opensumi/ide-components": "2.19.3",
24-
"@opensumi/ide-core-browser": "2.19.3",
23+
"@opensumi/ide-components": "2.19.4",
24+
"@opensumi/ide-core-browser": "2.19.4",
2525
"@opensumi/ide-dev-tool": "^1.3.1",
26-
"@opensumi/ide-editor": "2.19.3",
27-
"@opensumi/ide-file-search": "2.19.3",
28-
"@opensumi/ide-file-service": "2.19.3",
29-
"@opensumi/ide-overlay": "2.19.3",
30-
"@opensumi/ide-quick-open": "2.19.3",
31-
"@opensumi/ide-workspace": "2.19.3",
32-
"@opensumi/ide-workspace-edit": "2.19.3"
26+
"@opensumi/ide-editor": "2.19.4",
27+
"@opensumi/ide-file-search": "2.19.4",
28+
"@opensumi/ide-file-service": "2.19.4",
29+
"@opensumi/ide-overlay": "2.19.4",
30+
"@opensumi/ide-quick-open": "2.19.4",
31+
"@opensumi/ide-workspace": "2.19.4",
32+
"@opensumi/ide-workspace-edit": "2.19.4"
3333
}
3434
}

‎packages/comments/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-comments",
3-
"version": "2.19.3",
3+
"version": "2.19.4",
44
"files": [
55
"lib"
66
],
@@ -16,18 +16,18 @@
1616
"url": "[email protected]:opensumi/core.git"
1717
},
1818
"dependencies": {
19-
"@opensumi/ide-core-common": "2.19.3",
19+
"@opensumi/ide-core-common": "2.19.4",
2020
"marked": "4.0.10",
2121
"react-mentions": "^3.3.1"
2222
},
2323
"devDependencies": {
24-
"@opensumi/ide-components": "2.19.3",
25-
"@opensumi/ide-core-browser": "2.19.3",
24+
"@opensumi/ide-components": "2.19.4",
25+
"@opensumi/ide-core-browser": "2.19.4",
2626
"@opensumi/ide-dev-tool": "^1.3.1",
27-
"@opensumi/ide-editor": "2.19.3",
28-
"@opensumi/ide-main-layout": "2.19.3",
29-
"@opensumi/ide-monaco-enhance": "2.19.3",
30-
"@opensumi/ide-theme": "2.19.3",
27+
"@opensumi/ide-editor": "2.19.4",
28+
"@opensumi/ide-main-layout": "2.19.4",
29+
"@opensumi/ide-monaco-enhance": "2.19.4",
30+
"@opensumi/ide-theme": "2.19.4",
3131
"@types/marked": "4.0.1"
3232
}
3333
}

‎packages/components/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-components",
3-
"version": "2.19.3",
3+
"version": "2.19.4",
44
"description": "@opensumi/ide-components",
55
"license": "MIT",
66
"main": "lib/index.js",
@@ -16,7 +16,7 @@
1616
},
1717
"dependencies": {
1818
"@ant-design/icons": "^4.6.4",
19-
"@opensumi/ide-utils": "2.19.3",
19+
"@opensumi/ide-utils": "2.19.4",
2020
"@types/react-window": "^1.8.5",
2121
"fuzzy": "^0.1.3",
2222
"lodash": "^4.17.15",

‎packages/connection/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-connection",
3-
"version": "2.19.3",
3+
"version": "2.19.4",
44
"files": [
55
"lib"
66
],
@@ -16,13 +16,13 @@
1616
"url": "[email protected]:opensumi/core.git"
1717
},
1818
"dependencies": {
19-
"@opensumi/ide-core-common": "2.19.3",
19+
"@opensumi/ide-core-common": "2.19.4",
2020
"@opensumi/vscode-jsonrpc": "^8.0.0-next.2",
2121
"path-match": "^1.2.4",
2222
"ws": "^7.2.0"
2323
},
2424
"devDependencies": {
25-
"@opensumi/ide-components": "2.19.3",
25+
"@opensumi/ide-components": "2.19.4",
2626
"@opensumi/ide-dev-tool": "^1.3.1",
2727
"mock-socket": "^9.0.2"
2828
}

‎packages/core-browser/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-core-browser",
3-
"version": "2.19.3",
3+
"version": "2.19.4",
44
"description": "@opensumi/ide-core-browser",
55
"files": [
66
"lib"
@@ -17,9 +17,9 @@
1717
"build": "tsc --build ../../configs/ts/references/tsconfig.core-browser.json"
1818
},
1919
"dependencies": {
20-
"@opensumi/ide-components": "2.19.3",
21-
"@opensumi/ide-connection": "2.19.3",
22-
"@opensumi/ide-core-common": "2.19.3",
20+
"@opensumi/ide-components": "2.19.4",
21+
"@opensumi/ide-connection": "2.19.4",
22+
"@opensumi/ide-core-common": "2.19.4",
2323
"@opensumi/vscode-debugprotocol": "1.49.0-beta.1",
2424
"@vscode/codicons": "0.0.27",
2525
"ajv": "^6.10.0",

‎packages/core-browser/src/style/override.less

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
@import '~@opensumi/ide-components/lib/style/mixins.less';
22
@import './variable.less';
33

4+
.codicon[class*='codicon-'] {
5+
display: inline-block !important;
6+
}
7+
48
.overrideMenu(@n, @i: 1) when (@i =< @n) {
59
@clsx: extract(@menuClx, @i);
610

‎packages/core-common/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-core-common",
3-
"version": "2.19.3",
3+
"version": "2.19.4",
44
"description": "@opensumi/ide-core-common",
55
"files": [
66
"lib"
@@ -18,7 +18,7 @@
1818
},
1919
"dependencies": {
2020
"@opensumi/di": "^1.4.0",
21-
"@opensumi/ide-utils": "2.19.3",
21+
"@opensumi/ide-utils": "2.19.4",
2222
"jschardet": "3.0.0"
2323
},
2424
"devDependencies": {

‎packages/core-electron-main/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-core-electron-main",
3-
"version": "2.19.3",
3+
"version": "2.19.4",
44
"files": [
55
"lib",
66
"browser-preload"
@@ -17,7 +17,7 @@
1717
"url": "[email protected]:opensumi/core.git"
1818
},
1919
"dependencies": {
20-
"@opensumi/ide-core-common": "2.19.3",
20+
"@opensumi/ide-core-common": "2.19.4",
2121
"tree-kill": "^1.2.2"
2222
},
2323
"peerDependencies": {

‎packages/core-node/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-core-node",
3-
"version": "2.19.3",
3+
"version": "2.19.4",
44
"description": "@opensumi/ide-core-node",
55
"files": [
66
"lib"
@@ -17,8 +17,8 @@
1717
"url": "[email protected]:opensumi/core.git"
1818
},
1919
"dependencies": {
20-
"@opensumi/ide-connection": "2.19.3",
21-
"@opensumi/ide-core-common": "2.19.3",
20+
"@opensumi/ide-connection": "2.19.4",
21+
"@opensumi/ide-core-common": "2.19.4",
2222
"keytar": "^7.7.0"
2323
},
2424
"devDependencies": {

‎packages/debug/package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-debug",
3-
"version": "2.19.3",
3+
"version": "2.19.4",
44
"files": [
55
"lib"
66
],
@@ -16,32 +16,32 @@
1616
"url": "[email protected]:opensumi/core.git"
1717
},
1818
"dependencies": {
19-
"@opensumi/ide-connection": "2.19.3",
20-
"@opensumi/ide-core-common": "2.19.3",
21-
"@opensumi/ide-core-node": "2.19.3",
22-
"@opensumi/ide-file-service": "2.19.3",
23-
"@opensumi/ide-task": "2.19.3",
24-
"@opensumi/ide-terminal-next": "2.19.3",
19+
"@opensumi/ide-connection": "2.19.4",
20+
"@opensumi/ide-core-common": "2.19.4",
21+
"@opensumi/ide-core-node": "2.19.4",
22+
"@opensumi/ide-file-service": "2.19.4",
23+
"@opensumi/ide-task": "2.19.4",
24+
"@opensumi/ide-terminal-next": "2.19.4",
2525
"anser": "^1.4.9",
2626
"btoa": "^1.2.1"
2727
},
2828
"devDependencies": {
29-
"@opensumi/ide-components": "2.19.3",
30-
"@opensumi/ide-core-browser": "2.19.3",
29+
"@opensumi/ide-components": "2.19.4",
30+
"@opensumi/ide-core-browser": "2.19.4",
3131
"@opensumi/ide-dev-tool": "^1.3.1",
32-
"@opensumi/ide-editor": "2.19.3",
33-
"@opensumi/ide-main-layout": "2.19.3",
34-
"@opensumi/ide-monaco": "2.19.3",
35-
"@opensumi/ide-monaco-enhance": "2.19.3",
36-
"@opensumi/ide-output": "2.19.3",
37-
"@opensumi/ide-overlay": "2.19.3",
38-
"@opensumi/ide-preferences": "2.19.3",
39-
"@opensumi/ide-quick-open": "2.19.3",
40-
"@opensumi/ide-storage": "2.19.3",
41-
"@opensumi/ide-theme": "2.19.3",
42-
"@opensumi/ide-variable": "2.19.3",
43-
"@opensumi/ide-workspace": "2.19.3",
44-
"@opensumi/ide-workspace-edit": "2.19.3",
32+
"@opensumi/ide-editor": "2.19.4",
33+
"@opensumi/ide-main-layout": "2.19.4",
34+
"@opensumi/ide-monaco": "2.19.4",
35+
"@opensumi/ide-monaco-enhance": "2.19.4",
36+
"@opensumi/ide-output": "2.19.4",
37+
"@opensumi/ide-overlay": "2.19.4",
38+
"@opensumi/ide-preferences": "2.19.4",
39+
"@opensumi/ide-quick-open": "2.19.4",
40+
"@opensumi/ide-storage": "2.19.4",
41+
"@opensumi/ide-theme": "2.19.4",
42+
"@opensumi/ide-variable": "2.19.4",
43+
"@opensumi/ide-workspace": "2.19.4",
44+
"@opensumi/ide-workspace-edit": "2.19.4",
4545
"@types/btoa": "^1.2.3"
4646
}
4747
}

‎packages/decoration/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-decoration",
3-
"version": "2.19.3",
3+
"version": "2.19.4",
44
"files": [
55
"lib"
66
],
@@ -16,11 +16,11 @@
1616
"url": "[email protected]:opensumi/core.git"
1717
},
1818
"dependencies": {
19-
"@opensumi/ide-core-common": "2.19.3",
20-
"@opensumi/ide-core-node": "2.19.3"
19+
"@opensumi/ide-core-common": "2.19.4",
20+
"@opensumi/ide-core-node": "2.19.4"
2121
},
2222
"devDependencies": {
23-
"@opensumi/ide-core-browser": "2.19.3",
23+
"@opensumi/ide-core-browser": "2.19.4",
2424
"@opensumi/ide-dev-tool": "^1.3.1"
2525
}
2626
}

‎packages/editor/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-editor",
3-
"version": "2.19.3",
3+
"version": "2.19.4",
44
"files": [
55
"lib"
66
],
@@ -16,19 +16,19 @@
1616
"url": "[email protected]:opensumi/core.git"
1717
},
1818
"dependencies": {
19-
"@opensumi/ide-core-common": "2.19.3",
20-
"@opensumi/ide-core-node": "2.19.3",
21-
"@opensumi/ide-file-service": "2.19.3",
22-
"@opensumi/ide-monaco": "2.19.3",
19+
"@opensumi/ide-core-common": "2.19.4",
20+
"@opensumi/ide-core-node": "2.19.4",
21+
"@opensumi/ide-file-service": "2.19.4",
22+
"@opensumi/ide-monaco": "2.19.4",
2323
"vscode-oniguruma": "1.5.1"
2424
},
2525
"devDependencies": {
26-
"@opensumi/ide-components": "2.19.3",
27-
"@opensumi/ide-core-browser": "2.19.3",
26+
"@opensumi/ide-components": "2.19.4",
27+
"@opensumi/ide-core-browser": "2.19.4",
2828
"@opensumi/ide-dev-tool": "^1.3.1",
29-
"@opensumi/ide-overlay": "2.19.3",
30-
"@opensumi/ide-quick-open": "2.19.3",
31-
"@opensumi/ide-theme": "2.19.3",
32-
"@opensumi/ide-workspace": "2.19.3"
29+
"@opensumi/ide-overlay": "2.19.4",
30+
"@opensumi/ide-quick-open": "2.19.4",
31+
"@opensumi/ide-theme": "2.19.4",
32+
"@opensumi/ide-workspace": "2.19.4"
3333
}
3434
}

‎packages/editor/src/browser/tab.view.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ export const Tabs = ({ group }: ITabsProps) => {
318318
}}
319319
onMouseDown={(e) => {
320320
if (e.nativeEvent.which === 1) {
321-
group.open(resource.uri);
321+
group.open(resource.uri, { focus: true });
322322
}
323323
}}
324324
onDragOver={(e) => {

‎packages/editor/src/browser/types.ts

+2
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@ export interface IEditorSelectionChangeEventPayload {
274274
source: string | undefined;
275275

276276
editorUri: URI;
277+
278+
side?: 'original' | 'modified';
277279
}
278280

279281
export class EditorVisibleChangeEvent extends BasicEvent<IEditorVisibleChangeEventPayload> {}

0 commit comments

Comments
 (0)