Skip to content

Commit cb91633

Browse files
giacomocusinatogiacomocusinato
committed
chore: use [email protected] 
1 parent 49f94d6 commit cb91633

15 files changed

+801
-599
lines changed

‎arduino-ide-extension/package.json

+23-23
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.54.0",
28-
"@theia/core": "1.54.0",
29-
"@theia/debug": "1.54.0",
30-
"@theia/editor": "1.54.0",
31-
"@theia/electron": "1.54.0",
32-
"@theia/filesystem": "1.54.0",
33-
"@theia/keymaps": "1.54.0",
34-
"@theia/markers": "1.54.0",
35-
"@theia/messages": "1.54.0",
36-
"@theia/monaco": "1.54.0",
27+
"@theia/application-package": "1.55.1",
28+
"@theia/core": "1.55.1",
29+
"@theia/debug": "1.55.1",
30+
"@theia/editor": "1.55.1",
31+
"@theia/electron": "1.55.1",
32+
"@theia/filesystem": "1.55.1",
33+
"@theia/keymaps": "1.55.1",
34+
"@theia/markers": "1.55.1",
35+
"@theia/messages": "1.55.1",
36+
"@theia/monaco": "1.55.1",
3737
"@theia/monaco-editor-core": "1.83.101",
38-
"@theia/navigator": "1.54.0",
39-
"@theia/outline-view": "1.54.0",
40-
"@theia/output": "1.54.0",
41-
"@theia/plugin-ext": "1.54.0",
42-
"@theia/plugin-ext-vscode": "1.54.0",
43-
"@theia/preferences": "1.54.0",
44-
"@theia/scm": "1.54.0",
45-
"@theia/search-in-workspace": "1.54.0",
46-
"@theia/terminal": "1.54.0",
47-
"@theia/test": "1.54.0",
48-
"@theia/typehierarchy": "1.54.0",
49-
"@theia/workspace": "1.54.0",
38+
"@theia/navigator": "1.55.1",
39+
"@theia/outline-view": "1.55.1",
40+
"@theia/output": "1.55.1",
41+
"@theia/plugin-ext": "1.55.1",
42+
"@theia/plugin-ext-vscode": "1.55.1",
43+
"@theia/preferences": "1.55.1",
44+
"@theia/scm": "1.55.1",
45+
"@theia/search-in-workspace": "1.55.1",
46+
"@theia/terminal": "1.55.1",
47+
"@theia/test": "1.55.1",
48+
"@theia/typehierarchy": "1.55.1",
49+
"@theia/workspace": "1.55.1",
5050
"@tippyjs/react": "^4.2.5",
5151
"@types/auth0-js": "^9.21.3",
5252
"@types/btoa": "^1.2.3",
@@ -126,7 +126,7 @@
126126
"mockdate": "^3.0.5",
127127
"moment": "^2.24.0",
128128
"ncp": "^2.0.0",
129-
"rimraf": "^2.6.1"
129+
"rimraf": "^5.0.0"
130130
},
131131
"optionalDependencies": {
132132
"@pingghost/protoc": "^1.0.2",

‎arduino-ide-extension/src/browser/theia/editor/editor-contribution.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
import { injectable } from '@theia/core/shared/inversify';
2-
import { TextEditor } from '@theia/editor/lib/browser';
32
import { EditorContribution as TheiaEditorContribution } from '@theia/editor/lib/browser/editor-contribution';
43

54
@injectable()
65
export class EditorContribution extends TheiaEditorContribution {
76
protected override updateLanguageStatus(
8-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-vars
9-
editor: TextEditor | undefined
7+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
8+
..._: Parameters<TheiaEditorContribution['updateLanguageStatus']>
109
): void {
1110
// NOOP
1211
}
1312

1413
protected override updateEncodingStatus(
15-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-vars
16-
editor: TextEditor | undefined
14+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
15+
..._: Parameters<TheiaEditorContribution['updateEncodingStatus']>
1716
): void {
1817
// https://github.com/arduino/arduino-ide/issues/1393
1918
// NOOP

‎arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts

+15-14
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,33 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory {
3838
this.preferencesService.onPreferenceChanged(
3939
debounce((e) => {
4040
if (e.preferenceName === 'window.menuBarVisibility') {
41-
this.setMenuBar();
41+
this.doSetMenuBar();
4242
}
43-
if (this._menu) {
44-
for (const cmd of this._toggledCommands) {
45-
const menuItem = this.findMenuById(this._menu, cmd);
43+
if (this.menu) {
44+
for (const cmd of this.toggledCommands) {
45+
const menuItem = this.findMenuById(this.menu, cmd);
4646
if (menuItem) {
4747
menuItem.checked = this.commandRegistry.isToggled(cmd);
4848
}
4949
}
50-
window.electronArduino.setMenu(this._menu); // calls the IDE2-specific implementation
50+
window.electronArduino.setMenu(this.menu); // calls the IDE2-specific implementation
5151
}
5252
}, 10)
5353
);
5454
this.keybindingRegistry.onKeybindingsChanged(() => {
55-
this.setMenuBar();
55+
this.doSetMenuBar();
5656
});
5757
// #endregion Theia `postConstruct`
5858
this.appStateService.reachedState('ready').then(() => {
5959
this.appReady = true;
6060
if (this.updateWhenReady) {
61-
this.setMenuBar();
61+
this.doSetMenuBar();
6262
}
6363
});
6464
}
6565

6666
override createElectronMenuBar(): MenuDto[] {
67-
this._toggledCommands.clear(); // https://github.com/eclipse-theia/theia/issues/8977
67+
this.toggledCommands.clear(); // https://github.com/eclipse-theia/theia/issues/8977
6868
const menuModel = this.menuProvider.getMenu(MAIN_MENU_BAR);
6969
const menu = this.fillMenuTemplate([], menuModel, [], {
7070
rootMenuPath: MAIN_MENU_BAR,
@@ -73,11 +73,12 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory {
7373
menu.unshift(this.createOSXMenu());
7474
}
7575
const escapedMenu = this.escapeAmpersand(menu);
76-
this._menu = escapedMenu;
76+
this.menu = escapedMenu;
7777
return escapedMenu;
7878
}
7979

80-
override async setMenuBar(): Promise<void> {
80+
// CHECK ME
81+
override async doSetMenuBar(): Promise<void> {
8182
// Avoid updating menu items when the app is not ready.
8283
// Getting the current electron window is not free and synchronous.
8384
// Here, we defer all menu update requests, and fire one when the app is ready.
@@ -124,17 +125,17 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory {
124125
...args
125126
);
126127
if (
127-
this._menu &&
128+
this.menu &&
128129
this.menuCommandExecutor.isVisible(menuPath, commandId, ...args)
129130
) {
130-
const item = this.findMenuById(this._menu, commandId);
131+
const item = this.findMenuById(this.menu, commandId);
131132
if (item) {
132133
item.checked = this.menuCommandExecutor.isToggled(
133134
menuPath,
134135
commandId,
135136
...args
136137
);
137-
window.electronArduino.setMenu(this._menu); // overridden to call the IDE2-specific implementation.
138+
window.electronArduino.setMenu(this.menu); // overridden to call the IDE2-specific implementation.
138139
}
139140
}
140141
}
@@ -342,7 +343,7 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory {
342343
parentItems.push(menuItem);
343344

344345
if (this.commandRegistry.getToggledHandler(commandId, ...args)) {
345-
this._toggledCommands.add(commandId);
346+
this.toggledCommands.add(commandId);
346347
}
347348
}
348349
return parentItems;

‎arduino-ide-extension/src/node/arduino-ide-backend-module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ import { FormatterPath } from '../common/protocol/formatter';
106106
import { HostedPluginLocalizationService } from './theia/plugin-ext/hosted-plugin-localization-service';
107107
import { HostedPluginLocalizationService as TheiaHostedPluginLocalizationService } from '@theia/plugin-ext/lib/hosted/node/hosted-plugin-localization-service';
108108
import { IsTempSketch } from './is-temp-sketch';
109-
import { rebindNsfwFileSystemWatcher } from './theia/filesystem/nsfw-bindings';
110109
import { WebsocketEndpoint } from './theia/core/websocket-endpoint';
111110
import { MessagingService } from '@theia/core/lib/node/messaging/messaging-service';
112111
import { HostedPluginReader } from './theia/plugin-ext/plugin-reader';
@@ -121,6 +120,7 @@ import {
121120
} from './theia/plugin-ext/plugin-deployer';
122121
import { SettingsReader } from './settings-reader';
123122
import { VsCodePluginScanner } from './theia/plugin-ext-vscode/scanner-vscode';
123+
import { rebindParcelFileSystemWatcher } from './theia/filesystem/parcel-bindings';
124124

125125
export default new ContainerModule((bind, unbind, isBound, rebind) => {
126126
bind(BackendApplication).toSelf().inSingletonScope();
@@ -300,7 +300,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
300300
)
301301
)
302302
.inSingletonScope();
303-
rebindNsfwFileSystemWatcher(rebind);
303+
rebindParcelFileSystemWatcher(rebind);
304304

305305
// Output service per connection.
306306
bind(ConnectionContainerModule).toConstantValue(

‎arduino-ide-extension/src/node/theia/filesystem/nsfw-bindings.ts

-42
This file was deleted.

‎arduino-ide-extension/src/node/theia/filesystem/parcel-bindings.ts

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import { join } from 'node:path';
2+
import { interfaces } from '@theia/core/shared/inversify';
3+
import {
4+
FileSystemWatcherServiceProcessOptions,
5+
WATCHER_SINGLE_THREADED,
6+
spawnParcelFileSystemWatcherServiceProcess,
7+
} from '@theia/filesystem/lib/node/filesystem-backend-module';
8+
import { FileSystemWatcherService } from '@theia/filesystem/lib/common/filesystem-watcher-protocol';
9+
import { ParcelFileSystemWatcherServerOptions } from '@theia/filesystem/lib/node/parcel-watcher/parcel-filesystem-service';
10+
import { FileSystemWatcherServiceDispatcher } from '@theia/filesystem/lib/node/filesystem-watcher-dispatcher';
11+
import { NoDelayDisposalTimeoutParcelFileSystemWatcherService } from './parcel-watcher/parcel-filesystem-service';
12+
13+
export function rebindParcelFileSystemWatcher(rebind: interfaces.Rebind): void {
14+
rebind<FileSystemWatcherServiceProcessOptions>(
15+
FileSystemWatcherServiceProcessOptions
16+
).toConstantValue({
17+
entryPoint: join(__dirname, 'parcel-watcher'),
18+
});
19+
rebind<FileSystemWatcherService>(FileSystemWatcherService)
20+
.toDynamicValue((context) =>
21+
WATCHER_SINGLE_THREADED
22+
? createParcelFileSystemWatcherService(context)
23+
: spawnParcelFileSystemWatcherServiceProcess(context)
24+
)
25+
.inSingletonScope();
26+
}
27+
28+
function createParcelFileSystemWatcherService({
29+
container,
30+
}: interfaces.Context): FileSystemWatcherService {
31+
const options = container.get<ParcelFileSystemWatcherServerOptions>(
32+
ParcelFileSystemWatcherServerOptions
33+
);
34+
const dispatcher = container.get<FileSystemWatcherServiceDispatcher>(
35+
FileSystemWatcherServiceDispatcher
36+
);
37+
const server = new NoDelayDisposalTimeoutParcelFileSystemWatcherService(
38+
options
39+
);
40+
server.setClient(dispatcher);
41+
return server;
42+
}

‎arduino-ide-extension/src/node/theia/filesystem/nsfw-watcher/index.ts ‎arduino-ide-extension/src/node/theia/filesystem/parcel-watcher/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as yargs from '@theia/core/shared/yargs';
22
import { JsonRpcProxyFactory } from '@theia/core/lib/common/messaging/proxy-factory';
3-
import { NoDelayDisposalTimeoutNsfwFileSystemWatcherService } from './nsfw-filesystem-service';
3+
import { NoDelayDisposalTimeoutParcelFileSystemWatcherService } from './parcel-filesystem-service';
44
import type { IPCEntryPoint } from '@theia/core/lib/node/messaging/ipc-protocol';
55
import type { FileSystemWatcherServiceClient } from '@theia/filesystem/lib/common/filesystem-watcher-protocol';
66

@@ -20,7 +20,7 @@ const options: {
2020
}).argv as any;
2121

2222
export default <IPCEntryPoint>((connection) => {
23-
const server = new NoDelayDisposalTimeoutNsfwFileSystemWatcherService(
23+
const server = new NoDelayDisposalTimeoutParcelFileSystemWatcherService(
2424
options
2525
);
2626
const factory = new JsonRpcProxyFactory<FileSystemWatcherServiceClient>(

‎arduino-ide-extension/src/node/theia/filesystem/nsfw-watcher/nsfw-filesystem-service.ts ‎arduino-ide-extension/src/node/theia/filesystem/parcel-watcher/parcel-filesystem-service.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
import { Minimatch } from 'minimatch';
22
import type { WatchOptions } from '@theia/filesystem/lib/common/filesystem-watcher-protocol';
33
import {
4-
NsfwFileSystemWatcherService,
5-
NsfwWatcher,
6-
} from '@theia/filesystem/lib/node/nsfw-watcher/nsfw-filesystem-service';
4+
ParcelFileSystemWatcherService,
5+
ParcelWatcher,
6+
} from '@theia/filesystem/lib/node/parcel-watcher/parcel-filesystem-service';
77

88
// Dispose the watcher immediately when the last reference is removed. By default, Theia waits 10 sec.
99
// https://github.com/eclipse-theia/theia/issues/11639#issuecomment-1238980708
1010
const NoDelay = 0;
1111

12-
export class NoDelayDisposalTimeoutNsfwFileSystemWatcherService extends NsfwFileSystemWatcherService {
12+
export class NoDelayDisposalTimeoutParcelFileSystemWatcherService extends ParcelFileSystemWatcherService {
1313
protected override createWatcher(
1414
clientId: number,
1515
fsPath: string,
1616
options: WatchOptions
17-
): NsfwWatcher {
17+
): ParcelWatcher {
1818
const watcherOptions = {
1919
ignored: options.ignored.map(
2020
(pattern) => new Minimatch(pattern, { dot: true })
2121
),
2222
};
23-
return new NsfwWatcher(
23+
return new ParcelWatcher(
2424
clientId,
2525
fsPath,
2626
watcherOptions,

‎arduino-ide-extension/src/test/node/core-client-provider.slow-test.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { expect } from 'chai';
66
import { dump, load } from 'js-yaml';
77
import { promises as fs } from 'node:fs';
88
import { join } from 'node:path';
9-
import { sync as deleteSync } from 'rimraf';
9+
import { rimrafSync } from 'rimraf';
1010
import {
1111
BoardsService,
1212
CoreService,
@@ -65,7 +65,7 @@ describe('core-client-provider', () => {
6565
it("should recover when the 'directories.data' folder is missing", async function () {
6666
this.timeout(timeout);
6767
const configDirPath = await prepareTestConfigDir();
68-
deleteSync(join(configDirPath, 'data'));
68+
rimrafSync(join(configDirPath, 'data'));
6969

7070
const container = await startCli(configDirPath, toDispose);
7171
await assertFunctionalCli(container, ({ coreClientProvider }) => {
@@ -84,7 +84,7 @@ describe('core-client-provider', () => {
8484
'Arduino15',
8585
'package_index.json'
8686
);
87-
deleteSync(primaryPackageIndexPath);
87+
rimrafSync(primaryPackageIndexPath);
8888

8989
const container = await startCli(configDirPath, toDispose);
9090
await assertFunctionalCli(container, ({ coreClientProvider }) => {
@@ -118,7 +118,7 @@ describe('core-client-provider', () => {
118118
'tools',
119119
tool
120120
);
121-
deleteSync(builtinToolsPath);
121+
rimrafSync(builtinToolsPath);
122122

123123
const container = await startCli(configDirPath, toDispose);
124124
await assertFunctionalCli(container, ({ coreClientProvider }) => {
@@ -140,7 +140,7 @@ describe('core-client-provider', () => {
140140
'Arduino15',
141141
'library_index.json'
142142
);
143-
deleteSync(libraryPackageIndexPath);
143+
rimrafSync(libraryPackageIndexPath);
144144

145145
const container = await startCli(configDirPath, toDispose);
146146
await assertFunctionalCli(container, ({ coreClientProvider }) => {
@@ -176,7 +176,7 @@ describe('core-client-provider', () => {
176176
'Arduino15',
177177
'package_teensy_index.json'
178178
);
179-
deleteSync(thirdPartyPackageIndexPath);
179+
rimrafSync(thirdPartyPackageIndexPath);
180180

181181
const container = await startCli(configDirPath, toDispose);
182182
await assertFunctionalCli(
@@ -193,7 +193,7 @@ describe('core-client-provider', () => {
193193
it("should recover when invalid 3rd package URL is defined in the CLI config and the 'directories.data' folder is missing", async function () {
194194
this.timeout(timeout);
195195
const configDirPath = await prepareTestConfigDir();
196-
deleteSync(join(configDirPath, 'data'));
196+
rimrafSync(join(configDirPath, 'data'));
197197

198198
// set an invalid URL so the CLI will try to download it
199199
const cliConfigPath = join(configDirPath, 'arduino-cli.yaml');

0 commit comments

Comments
 (0)