Skip to content

Commit 1fa0def

Browse files
chore: use [email protected]
Remove `EditorCommandContribution` override, since https://redirect.github.com/eclipse-theia/theia/pull/13683 fixed the unwanted save on startup
1 parent 96c723b commit 1fa0def

File tree

6 files changed

+401
-422
lines changed

6 files changed

+401
-422
lines changed

arduino-ide-extension/package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,29 @@
2424
},
2525
"dependencies": {
2626
"@grpc/grpc-js": "^1.8.14",
27-
"@theia/application-package": "1.48.3",
28-
"@theia/core": "1.48.3",
29-
"@theia/debug": "1.48.3",
30-
"@theia/editor": "1.48.3",
31-
"@theia/electron": "1.48.3",
32-
"@theia/filesystem": "1.48.3",
33-
"@theia/keymaps": "1.48.3",
34-
"@theia/markers": "1.48.3",
35-
"@theia/messages": "1.48.3",
36-
"@theia/monaco": "1.48.3",
27+
"@theia/application-package": "1.50.1",
28+
"@theia/core": "1.50.1",
29+
"@theia/debug": "1.50.1",
30+
"@theia/editor": "1.50.1",
31+
"@theia/electron": "1.50.1",
32+
"@theia/filesystem": "1.50.1",
33+
"@theia/keymaps": "1.50.1",
34+
"@theia/markers": "1.50.1",
35+
"@theia/messages": "1.50.1",
36+
"@theia/monaco": "1.50.1",
3737
"@theia/monaco-editor-core": "1.83.101",
38-
"@theia/navigator": "1.48.3",
39-
"@theia/outline-view": "1.48.3",
40-
"@theia/output": "1.48.3",
41-
"@theia/plugin-ext": "1.48.3",
42-
"@theia/plugin-ext-vscode": "1.48.3",
43-
"@theia/preferences": "1.48.3",
44-
"@theia/scm": "1.48.3",
45-
"@theia/search-in-workspace": "1.48.3",
46-
"@theia/terminal": "1.48.3",
47-
"@theia/test": "1.48.3",
48-
"@theia/typehierarchy": "1.48.3",
49-
"@theia/workspace": "1.48.3",
38+
"@theia/navigator": "1.50.1",
39+
"@theia/outline-view": "1.50.1",
40+
"@theia/output": "1.50.1",
41+
"@theia/plugin-ext": "1.50.1",
42+
"@theia/plugin-ext-vscode": "1.50.1",
43+
"@theia/preferences": "1.50.1",
44+
"@theia/scm": "1.50.1",
45+
"@theia/search-in-workspace": "1.50.1",
46+
"@theia/terminal": "1.50.1",
47+
"@theia/test": "1.50.1",
48+
"@theia/typehierarchy": "1.50.1",
49+
"@theia/workspace": "1.50.1",
5050
"@tippyjs/react": "^4.2.5",
5151
"@types/auth0-js": "^9.21.3",
5252
"@types/btoa": "^1.2.3",

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

-9
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ import {
9595
ArduinoDaemonPath,
9696
ArduinoDaemon,
9797
} from '../common/protocol/arduino-daemon';
98-
import { EditorCommandContribution as TheiaEditorCommandContribution } from '@theia/editor/lib/browser';
9998
import {
10099
FrontendConnectionStatusService,
101100
ApplicationConnectionStatusContribution,
@@ -184,7 +183,6 @@ import {
184183
import { About } from './contributions/about';
185184
import { IconThemeService } from '@theia/core/lib/browser/icon-theme-service';
186185
import { TabBarRenderer } from './theia/core/tab-bars';
187-
import { EditorCommandContribution } from './theia/editor/editor-command';
188186
import { NavigatorTabBarDecorator as TheiaNavigatorTabBarDecorator } from '@theia/navigator/lib/browser/navigator-tab-bar-decorator';
189187
import { NavigatorTabBarDecorator } from './theia/navigator/navigator-tab-bar-decorator';
190188
import { Debug, DebugDisabledStatusMessageSource } from './contributions/debug';
@@ -843,13 +841,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
843841
);
844842
});
845843

846-
// Workaround for https://github.com/eclipse-theia/theia/issues/8722
847-
// Do not trigger a save on IDE startup if `"editor.autoSave": "on"` was set as a preference.
848-
// Note: `"editor.autoSave" was renamed to `"files.autoSave" and `"on"` was replaced with three
849-
// different cases, but we treat `!== 'off'` as auto save enabled. (https://github.com/eclipse-theia/theia/issues/10812)
850-
bind(EditorCommandContribution).toSelf().inSingletonScope();
851-
rebind(TheiaEditorCommandContribution).toService(EditorCommandContribution);
852-
853844
// Silent the badge decoration in the Explorer view.
854845
bind(NavigatorTabBarDecorator).toSelf().inSingletonScope();
855846
rebind(TheiaNavigatorTabBarDecorator).toService(NavigatorTabBarDecorator);

arduino-ide-extension/src/browser/theia/editor/editor-command.ts

-21
This file was deleted.

electron-app/package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@
55
"license": "AGPL-3.0-or-later",
66
"main": "./src-gen/backend/electron-main.js",
77
"dependencies": {
8-
"@theia/core": "1.48.3",
9-
"@theia/debug": "1.48.3",
10-
"@theia/editor": "1.48.3",
11-
"@theia/electron": "1.48.3",
12-
"@theia/filesystem": "1.48.3",
13-
"@theia/keymaps": "1.48.3",
14-
"@theia/messages": "1.48.3",
15-
"@theia/monaco": "1.48.3",
16-
"@theia/navigator": "1.48.3",
17-
"@theia/plugin-ext": "1.48.3",
18-
"@theia/plugin-ext-vscode": "1.48.3",
19-
"@theia/preferences": "1.48.3",
20-
"@theia/terminal": "1.48.3",
21-
"@theia/workspace": "1.48.3",
8+
"@theia/core": "1.50.1",
9+
"@theia/debug": "1.50.1",
10+
"@theia/editor": "1.50.1",
11+
"@theia/electron": "1.50.1",
12+
"@theia/filesystem": "1.50.1",
13+
"@theia/keymaps": "1.50.1",
14+
"@theia/messages": "1.50.1",
15+
"@theia/monaco": "1.50.1",
16+
"@theia/navigator": "1.50.1",
17+
"@theia/plugin-ext": "1.50.1",
18+
"@theia/plugin-ext-vscode": "1.50.1",
19+
"@theia/preferences": "1.50.1",
20+
"@theia/terminal": "1.50.1",
21+
"@theia/workspace": "1.50.1",
2222
"arduino-ide-extension": "2.3.5"
2323
},
2424
"devDependencies": {
25-
"@theia/cli": "1.48.3",
25+
"@theia/cli": "1.50.1",
2626
"7zip-min": "^1.4.4",
2727
"chmodr": "^1.2.0",
2828
"compression-webpack-plugin": "^9.0.0",
2929
"copy-webpack-plugin": "^8.1.1",
3030
"dateformat": "^5.0.3",
31-
"electron": "^27.3.1",
31+
"electron": "^28.2.8",
3232
"electron-builder": "^24.6.4",
3333
"electron-notarize": "^1.1.1",
3434
"execa": "^7.1.1",

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"**/ip": "^2.0.1"
1818
},
1919
"devDependencies": {
20-
"@theia/cli": "1.48.3",
20+
"@theia/cli": "1.50.1",
2121
"@typescript-eslint/eslint-plugin": "^5.59.0",
2222
"@typescript-eslint/parser": "^5.59.0",
2323
"@xhmikosr/downloader": "^13.0.1",

0 commit comments

Comments
 (0)