Skip to content

Commit 352adb4

Browse files
author
Akos Kitta
committed
Bumped to Theia 1.27.0
Signed-off-by: Akos Kitta <[email protected]>
1 parent 4368725 commit 352adb4

File tree

12 files changed

+1870
-1888
lines changed

12 files changed

+1870
-1888
lines changed

‎arduino-ide-extension/package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@
2121
},
2222
"dependencies": {
2323
"@grpc/grpc-js": "^1.6.7",
24-
"@theia/application-package": "1.25.0",
25-
"@theia/core": "1.25.0",
26-
"@theia/editor": "1.25.0",
27-
"@theia/electron": "1.25.0",
28-
"@theia/filesystem": "1.25.0",
29-
"@theia/keymaps": "1.25.0",
30-
"@theia/markers": "1.25.0",
31-
"@theia/monaco": "1.25.0",
32-
"@theia/navigator": "1.25.0",
33-
"@theia/outline-view": "1.25.0",
34-
"@theia/output": "1.25.0",
35-
"@theia/preferences": "1.25.0",
36-
"@theia/search-in-workspace": "1.25.0",
37-
"@theia/terminal": "1.25.0",
38-
"@theia/workspace": "1.25.0",
24+
"@theia/application-package": "1.27.0",
25+
"@theia/core": "1.27.0",
26+
"@theia/editor": "1.27.0",
27+
"@theia/electron": "1.27.0",
28+
"@theia/filesystem": "1.27.0",
29+
"@theia/keymaps": "1.27.0",
30+
"@theia/markers": "1.27.0",
31+
"@theia/monaco": "1.27.0",
32+
"@theia/navigator": "1.27.0",
33+
"@theia/outline-view": "1.27.0",
34+
"@theia/output": "1.27.0",
35+
"@theia/preferences": "1.27.0",
36+
"@theia/search-in-workspace": "1.27.0",
37+
"@theia/terminal": "1.27.0",
38+
"@theia/workspace": "1.27.0",
3939
"@tippyjs/react": "^4.2.5",
4040
"@types/atob": "^2.1.2",
4141
"@types/auth0-js": "^9.14.0",

‎arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import { MonitorViewContribution } from './serial/monitor/monitor-view-contribut
4747
import { ArduinoToolbar } from './toolbar/arduino-toolbar';
4848
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
4949
import { SerialPlotterContribution } from './serial/plotter/plotter-frontend-contribution';
50+
import { MonacoThemeRegistry } from '@theia/monaco/lib/browser/textmate/monaco-theme-registry';
5051

5152
@injectable()
5253
export class ArduinoFrontendContribution
@@ -78,6 +79,9 @@ export class ArduinoFrontendContribution
7879
@inject(FrontendApplicationStateService)
7980
private readonly appStateService: FrontendApplicationStateService;
8081

82+
@inject(MonacoThemeRegistry)
83+
private readonly themeRegistry: MonacoThemeRegistry;
84+
8185
@postConstruct()
8286
protected async init(): Promise<void> {
8387
if (!window.navigator.onLine) {
@@ -89,6 +93,18 @@ export class ArduinoFrontendContribution
8993
)
9094
);
9195
}
96+
this.themeRegistry.register({
97+
id: 'arduino-theme',
98+
label: 'Light (Arduino)',
99+
uiTheme: 'vs',
100+
json: require('../../src/browser/data/default.color-theme.json'),
101+
});
102+
this.themeRegistry.register({
103+
id: 'arduino-theme-dark',
104+
label: 'Dark (Arduino)',
105+
uiTheme: 'vs-dark',
106+
json: require('../../src/browser/data/dark.color-theme.json'),
107+
});
92108
}
93109

94110
async onStart(app: FrontendApplication): Promise<void> {

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ import { BoardsAutoInstaller } from './boards/boards-auto-installer';
8282
import { ShellLayoutRestorer } from './theia/core/shell-layout-restorer';
8383
import { ListItemRenderer } from './widgets/component-list/list-item-renderer';
8484
import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
85-
import { MonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service';
8685
import {
8786
ArduinoDaemonPath,
8887
ArduinoDaemon,
@@ -311,20 +310,6 @@ import { CheckForUpdates } from './contributions/check-for-updates';
311310
import { OpenBoardsConfig } from './contributions/open-boards-config';
312311
import { SketchFilesTracker } from './contributions/sketch-files-tracker';
313312

314-
MonacoThemingService.register({
315-
id: 'arduino-theme',
316-
label: 'Light (Arduino)',
317-
uiTheme: 'vs',
318-
json: require('../../src/browser/data/default.color-theme.json'),
319-
});
320-
321-
MonacoThemingService.register({
322-
id: 'arduino-theme-dark',
323-
label: 'Dark (Arduino)',
324-
uiTheme: 'vs-dark',
325-
json: require('../../src/browser/data/dark.color-theme.json'),
326-
});
327-
328313
export default new ContainerModule((bind, unbind, isBound, rebind) => {
329314
// Commands and toolbar items
330315
bind(ArduinoFrontendContribution).toSelf().inSingletonScope();

‎arduino-ide-extension/src/browser/dialogs/settings/settings-component.tsx‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -202,20 +202,18 @@ export class SettingsComponent extends React.Component<
202202
<select
203203
className="theia-select"
204204
value={
205-
ThemeService.get()
205+
this.props.themeService
206206
.getThemes()
207207
.find(({ id }) => id === this.state.themeId)?.label ||
208208
nls.localize('arduino/common/unknown', 'Unknown')
209209
}
210210
onChange={this.themeDidChange}
211211
>
212-
{ThemeService.get()
213-
.getThemes()
214-
.map(({ id, label }) => (
215-
<option key={id} value={label}>
216-
{label}
217-
</option>
218-
))}
212+
{this.props.themeService.getThemes().map(({ id, label }) => (
213+
<option key={id} value={label}>
214+
{label}
215+
</option>
216+
))}
219217
</select>
220218
</div>
221219
<div className="flex-line">
@@ -588,7 +586,7 @@ export class SettingsComponent extends React.Component<
588586
event: React.ChangeEvent<HTMLSelectElement>
589587
): void => {
590588
const { selectedIndex } = event.target.options;
591-
const theme = ThemeService.get().getThemes()[selectedIndex];
589+
const theme = this.props.themeService.getThemes()[selectedIndex];
592590
if (theme) {
593591
this.setState({ themeId: theme.id });
594592
}
@@ -728,6 +726,7 @@ export namespace SettingsComponent {
728726
readonly fileDialogService: FileDialogService;
729727
readonly windowService: WindowService;
730728
readonly localizationProvider: AsyncLocalizationProvider;
729+
readonly themeService: ThemeService;
731730
}
732731
export type State = Settings & {
733732
rawAdditionalUrlsValue: string;

‎arduino-ide-extension/src/browser/dialogs/settings/settings-dialog.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { SettingsComponent } from './settings-component';
1616
import { AsyncLocalizationProvider } from '@theia/core/lib/common/i18n/localization';
1717
import { AdditionalUrls } from '../../../common/protocol';
1818
import { AbstractDialog } from '../../theia/dialogs/dialogs';
19+
import { ThemeService } from '@theia/core/lib/browser/theming';
1920

2021
@injectable()
2122
export class SettingsWidget extends ReactWidget {
@@ -34,6 +35,9 @@ export class SettingsWidget extends ReactWidget {
3435
@inject(AsyncLocalizationProvider)
3536
protected readonly localizationProvider: AsyncLocalizationProvider;
3637

38+
@inject(ThemeService)
39+
private readonly themeService: ThemeService;
40+
3741
protected render(): React.ReactNode {
3842
return (
3943
<SettingsComponent
@@ -42,6 +46,7 @@ export class SettingsWidget extends ReactWidget {
4246
fileDialogService={this.fileDialogService}
4347
windowService={this.windowService}
4448
localizationProvider={this.localizationProvider}
49+
themeService={this.themeService}
4550
/>
4651
);
4752
}

‎arduino-ide-extension/src/browser/dialogs/settings/settings.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ export class SettingsService {
101101
@inject(CommandService)
102102
protected commandService: CommandService;
103103

104+
@inject(ThemeService)
105+
private readonly themeService: ThemeService;
106+
104107
protected readonly onDidChangeEmitter = new Emitter<Readonly<Settings>>();
105108
readonly onDidChange = this.onDidChangeEmitter.event;
106109
protected readonly onDidResetEmitter = new Emitter<Readonly<Settings>>();
@@ -226,11 +229,7 @@ export class SettingsService {
226229
'Invalid editor font size. It must be a positive integer.'
227230
);
228231
}
229-
if (
230-
!ThemeService.get()
231-
.getThemes()
232-
.find(({ id }) => id === themeId)
233-
) {
232+
if (!this.themeService.getThemes().find(({ id }) => id === themeId)) {
234233
return nls.localize(
235234
'arduino/preferences/invalid.theme',
236235
'Invalid theme.'

‎arduino-ide-extension/src/browser/theia/debug/debug-session-manager.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ export class DebugSessionManager extends TheiaDebugSessionManager {
4949
}
5050

5151
const sessionId = await this.debug.createDebugSession(
52-
resolved.configuration
52+
resolved.configuration,
53+
undefined
5354
);
5455
return this.doStart(sessionId, resolved);
5556
} catch (e) {

‎browser-app/package.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
"version": "2.0.0-rc9",
55
"license": "AGPL-3.0-or-later",
66
"dependencies": {
7-
"@theia/core": "1.25.0",
8-
"@theia/debug": "1.25.0",
9-
"@theia/editor": "1.25.0",
10-
"@theia/file-search": "1.25.0",
11-
"@theia/filesystem": "1.25.0",
12-
"@theia/keymaps": "1.25.0",
13-
"@theia/messages": "1.25.0",
14-
"@theia/monaco": "1.25.0",
15-
"@theia/navigator": "1.25.0",
16-
"@theia/plugin-ext": "1.25.0",
17-
"@theia/plugin-ext-vscode": "1.25.0",
18-
"@theia/preferences": "1.25.0",
19-
"@theia/process": "1.25.0",
20-
"@theia/terminal": "1.25.0",
21-
"@theia/workspace": "1.25.0",
7+
"@theia/core": "1.27.0",
8+
"@theia/debug": "1.27.0",
9+
"@theia/editor": "1.27.0",
10+
"@theia/file-search": "1.27.0",
11+
"@theia/filesystem": "1.27.0",
12+
"@theia/keymaps": "1.27.0",
13+
"@theia/messages": "1.27.0",
14+
"@theia/monaco": "1.27.0",
15+
"@theia/navigator": "1.27.0",
16+
"@theia/plugin-ext": "1.27.0",
17+
"@theia/plugin-ext-vscode": "1.27.0",
18+
"@theia/preferences": "1.27.0",
19+
"@theia/process": "1.27.0",
20+
"@theia/terminal": "1.27.0",
21+
"@theia/workspace": "1.27.0",
2222
"arduino-ide-extension": "2.0.0-rc9"
2323
},
2424
"devDependencies": {
25-
"@theia/cli": "1.25.0"
25+
"@theia/cli": "1.27.0"
2626
},
2727
"scripts": {
2828
"prepare": "theia build --mode development",

‎electron-app/package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
"license": "AGPL-3.0-or-later",
66
"main": "src-gen/frontend/electron-main.js",
77
"dependencies": {
8-
"@theia/core": "1.25.0",
9-
"@theia/debug": "1.25.0",
10-
"@theia/editor": "1.25.0",
11-
"@theia/electron": "1.25.0",
12-
"@theia/file-search": "1.25.0",
13-
"@theia/filesystem": "1.25.0",
14-
"@theia/keymaps": "1.25.0",
15-
"@theia/messages": "1.25.0",
16-
"@theia/monaco": "1.25.0",
17-
"@theia/navigator": "1.25.0",
18-
"@theia/plugin-ext": "1.25.0",
19-
"@theia/plugin-ext-vscode": "1.25.0",
20-
"@theia/preferences": "1.25.0",
21-
"@theia/process": "1.25.0",
22-
"@theia/terminal": "1.25.0",
23-
"@theia/workspace": "1.25.0",
8+
"@theia/core": "1.27.0",
9+
"@theia/debug": "1.27.0",
10+
"@theia/editor": "1.27.0",
11+
"@theia/electron": "1.27.0",
12+
"@theia/file-search": "1.27.0",
13+
"@theia/filesystem": "1.27.0",
14+
"@theia/keymaps": "1.27.0",
15+
"@theia/messages": "1.27.0",
16+
"@theia/monaco": "1.27.0",
17+
"@theia/navigator": "1.27.0",
18+
"@theia/plugin-ext": "1.27.0",
19+
"@theia/plugin-ext-vscode": "1.27.0",
20+
"@theia/preferences": "1.27.0",
21+
"@theia/process": "1.27.0",
22+
"@theia/terminal": "1.27.0",
23+
"@theia/workspace": "1.27.0",
2424
"arduino-ide-extension": "2.0.0-rc9"
2525
},
2626
"devDependencies": {
27-
"@theia/cli": "1.25.0",
27+
"@theia/cli": "1.27.0",
2828
"electron": "^15.3.5"
2929
},
3030
"scripts": {

‎electron/build/template-package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"node-log-rotate": "^0.1.5"
1010
},
1111
"devDependencies": {
12-
"@theia/cli": "1.25.0",
12+
"@theia/cli": "1.27.0",
1313
"cross-env": "^7.0.2",
1414
"electron-builder": "23.0.2",
1515
"electron-notarize": "^1.1.1",

0 commit comments

Comments
 (0)