Skip to content

Commit 8053c55

Browse files
giacomocusinatogiacomocusinato
committed
chore: use [email protected]
Use changes from #2362 and rebase on main branch
1 parent d298b3f commit 8053c55

File tree

55 files changed

+1972
-2022
lines changed

Some content is hidden

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

55 files changed

+1972
-2022
lines changed

‎arduino-ide-extension/package.json

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
22
import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
33
import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
4-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
4+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
55
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
66
import {
77
TabBarToolbarContribution,

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

+9-18
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ import { CommandContribution } from '@theia/core/lib/common/command';
99
import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
1010
import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
1111
import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider';
12-
import {
13-
FrontendApplicationContribution,
14-
FrontendApplication as TheiaFrontendApplication,
15-
} from '@theia/core/lib/browser/frontend-application';
12+
import { FrontendApplication as TheiaFrontendApplication } from '@theia/core/lib/browser/frontend-application';
13+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
1614
import { LibraryListWidget } from './library/library-list-widget';
1715
import { ArduinoFrontendContribution } from './arduino-frontend-contribution';
1816
import {
@@ -275,7 +273,7 @@ import {
275273
IDEUpdaterDialog,
276274
IDEUpdaterDialogProps,
277275
} from './dialogs/ide-updater/ide-updater-dialog';
278-
import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-provider';
276+
import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-source';
279277
import { MonitorModel } from './monitor-model';
280278
import { MonitorManagerProxyClientImpl } from './monitor-manager-proxy-client-impl';
281279
import { EditorManager as TheiaEditorManager } from '@theia/editor/lib/browser/editor-manager';
@@ -295,10 +293,6 @@ import { PreferenceTreeGenerator } from './theia/preferences/preference-tree-gen
295293
import { PreferenceTreeGenerator as TheiaPreferenceTreeGenerator } from '@theia/preferences/lib/browser/util/preference-tree-generator';
296294
import { AboutDialog } from './theia/core/about-dialog';
297295
import { AboutDialog as TheiaAboutDialog } from '@theia/core/lib/browser/about-dialog';
298-
import {
299-
SurveyNotificationService,
300-
SurveyNotificationServicePath,
301-
} from '../common/protocol/survey-service';
302296
import { WindowContribution } from './theia/core/window-contribution';
303297
import { WindowContribution as TheiaWindowContribution } from '@theia/core/lib/browser/window-contribution';
304298
import { CoreErrorHandler } from './contributions/core-error-handler';
@@ -394,6 +388,8 @@ import {
394388
VersionWelcomeDialog,
395389
VersionWelcomeDialogProps,
396390
} from './dialogs/version-welcome-dialog';
391+
import { TestViewContribution as TheiaTestViewContribution } from '@theia/test/lib/browser/view/test-view-contribution';
392+
import { TestViewContribution } from './theia/test/test-view-contribution';
397393

398394
// Hack to fix copy/cut/paste issue after electron version update in Theia.
399395
// https://github.com/eclipse-theia/theia/issues/12487
@@ -574,15 +570,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
574570
WorkspaceVariableContribution
575571
);
576572

577-
bind(SurveyNotificationService)
578-
.toDynamicValue((context) => {
579-
return ElectronIpcConnectionProvider.createProxy(
580-
context.container,
581-
SurveyNotificationServicePath
582-
);
583-
})
584-
.inSingletonScope();
585-
586573
// Layout and shell customizations.
587574
rebind(TheiaOutlineViewContribution)
588575
.to(OutlineViewContribution)
@@ -1113,6 +1100,10 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
11131100
);
11141101

11151102
bindViewsWelcome_TheiaGH14309({ bind, widget: TreeViewWidget });
1103+
1104+
// Hides the Test Explorer from the side-bar
1105+
bind(TestViewContribution).toSelf().inSingletonScope();
1106+
rebind(TheiaTestViewContribution).toService(TestViewContribution);
11161107
});
11171108

11181109
// Align the viewsWelcome rendering with VS Code (https://github.com/eclipse-theia/theia/issues/14309)

‎arduino-ide-extension/src/browser/arduino-preferences.ts

-9
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,6 @@ const properties: ArduinoPreferenceSchemaProperties = {
280280
),
281281
default: 'https://auth.arduino.cc/login#/register',
282282
},
283-
'arduino.survey.notification': {
284-
type: 'boolean',
285-
description: nls.localize(
286-
'arduino/preferences/survey.notification',
287-
'True if users should be notified if a survey is available. True by default.'
288-
),
289-
default: true,
290-
},
291283
'arduino.cli.daemon.debug': {
292284
type: 'boolean',
293285
description: nls.localize(
@@ -355,7 +347,6 @@ export interface ArduinoConfiguration {
355347
'arduino.auth.domain': string;
356348
'arduino.auth.audience': string;
357349
'arduino.auth.registerUri': string;
358-
'arduino.survey.notification': boolean;
359350
'arduino.cli.daemon.debug': boolean;
360351
'arduino.sketch.inoBlueprint': string;
361352
'arduino.checkForUpdates': boolean;

‎arduino-ide-extension/src/browser/auth/authentication-client-service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Emitter } from '@theia/core/lib/common/event';
33
import { JsonRpcProxy } from '@theia/core/lib/common/messaging/proxy-factory';
44
import { WindowService } from '@theia/core/lib/browser/window/window-service';
55
import { DisposableCollection } from '@theia/core/lib/common/disposable';
6-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
6+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
77
import {
88
CommandRegistry,
99
CommandContribution,

‎arduino-ide-extension/src/browser/boards/boards-auto-installer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
1+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
22
import { DisposableCollection } from '@theia/core/lib/common/disposable';
33
import { MessageService } from '@theia/core/lib/common/message-service';
44
import { MessageType } from '@theia/core/lib/common/message-service-protocol';

‎arduino-ide-extension/src/browser/boards/boards-data-store.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
1+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
22
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
33
import { StorageService } from '@theia/core/lib/browser/storage-service';
44
import type {

‎arduino-ide-extension/src/browser/boards/boards-service-provider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
1+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
22
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
33
import { StorageService } from '@theia/core/lib/browser/storage-service';
44
import {

‎arduino-ide-extension/src/browser/config/config-service-client.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
1+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
22
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
33
import { DisposableCollection } from '@theia/core/lib/common/disposable';
44
import { Emitter, Event } from '@theia/core/lib/common/event';

‎arduino-ide-extension/src/browser/contributions/close.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { Dialog } from '@theia/core/lib/browser/dialogs';
2-
import type {
3-
FrontendApplication,
4-
OnWillStopAction,
5-
} from '@theia/core/lib/browser/frontend-application';
2+
import type { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
3+
import type { OnWillStopAction } from '@theia/core/lib/browser/frontend-application-contribution';
64
import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
75
import { nls } from '@theia/core/lib/common/nls';
86
import type { MaybePromise } from '@theia/core/lib/common/types';

‎arduino-ide-extension/src/browser/contributions/contribution.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
2-
import {
3-
FrontendApplication,
4-
FrontendApplicationContribution,
5-
} from '@theia/core/lib/browser/frontend-application';
2+
import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
3+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
64
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
75
import {
86
KeybindingContribution,

‎arduino-ide-extension/src/browser/contributions/survey-notification.ts

-78
This file was deleted.

‎arduino-ide-extension/src/browser/create/create-features.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
1+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
22
import { DisposableCollection } from '@theia/core/lib/common/disposable';
33
import { Emitter, Event } from '@theia/core/lib/common/event';
44
import URI from '@theia/core/lib/common/uri';

‎arduino-ide-extension/src/browser/create/create-fs-provider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
Disposable,
66
DisposableCollection,
77
} from '@theia/core/lib/common/disposable';
8-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
8+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
99
import {
1010
Stat,
1111
FileType,

‎arduino-ide-extension/src/browser/notification-center.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
import { Emitter } from '@theia/core/lib/common/event';
77
import { JsonRpcProxy } from '@theia/core/lib/common/messaging/proxy-factory';
88
import { DisposableCollection } from '@theia/core/lib/common/disposable';
9-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
9+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
1010
import {
1111
IndexUpdateDidCompleteParams,
1212
IndexUpdateDidFailParams,

‎arduino-ide-extension/src/browser/sketches-service-client-impl.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
Disposable,
1010
DisposableCollection,
1111
} from '@theia/core/lib/common/disposable';
12-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
12+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
1313
import { Sketch, SketchesService } from '../common/protocol';
1414
import { ConfigServiceClient } from './config/config-service-client';
1515
import {
@@ -74,6 +74,7 @@ export class SketchesServiceClientImpl
7474
const sketchDirUri = this.configService.tryGetSketchDirUri();
7575
this.watchSketchbookDir(sketchDirUri);
7676
const refreshCurrentSketch = async () => {
77+
await this.workspaceService.ready;
7778
const currentSketch = await this.loadCurrentSketch();
7879
const ideTempFolderUri = await this.getIdeTempFolderUriForSketch(
7980
currentSketch

‎arduino-ide-extension/src/browser/theia/core/common-frontend-contribution.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
CommonCommands,
33
CommonFrontendContribution as TheiaCommonFrontendContribution,
44
} from '@theia/core/lib/browser/common-frontend-contribution';
5-
import type { OnWillStopAction } from '@theia/core/lib/browser/frontend-application';
5+
import type { OnWillStopAction } from '@theia/core/lib/browser/frontend-application-contribution';
66
import type { KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
77
import type { CommandRegistry } from '@theia/core/lib/common/command';
88
import type { MenuModelRegistry } from '@theia/core/lib/common/menu';

‎arduino-ide-extension/src/browser/theia/core/connection-status-service.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {
2-
ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution,
32
ConnectionStatus,
3+
ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution,
44
FrontendConnectionStatusService as TheiaFrontendConnectionStatusService,
55
} from '@theia/core/lib/browser/connection-status-service';
6-
import type { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
7-
import { WebSocketConnectionProvider } from '@theia/core/lib/browser/index';
6+
import type { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
7+
import { WebSocketConnectionSource } from '@theia/core/lib/browser/messaging/ws-connection-source';
88
import { StatusBarAlignment } from '@theia/core/lib/browser/status-bar/status-bar';
99
import { Disposable } from '@theia/core/lib/common/disposable';
1010
import { Emitter, Event } from '@theia/core/lib/common/event';
@@ -114,8 +114,8 @@ export class FrontendConnectionStatusService extends TheiaFrontendConnectionStat
114114
private readonly daemonPort: DaemonPort;
115115
@inject(IsOnline)
116116
private readonly isOnline: IsOnline;
117-
@inject(WebSocketConnectionProvider)
118-
private readonly connectionProvider: WebSocketConnectionProvider;
117+
@inject(WebSocketConnectionSource)
118+
private readonly connectionSource: WebSocketConnectionSource;
119119

120120
@postConstruct()
121121
protected override init(): void {
@@ -128,7 +128,7 @@ export class FrontendConnectionStatusService extends TheiaFrontendConnectionStat
128128
}
129129

130130
protected override async performPingRequest(): Promise<void> {
131-
if (!this.connectionProvider['socket'].connected) {
131+
if (!this.connectionSource['socket'].connected) {
132132
this.updateStatus(false);
133133
return;
134134
}
@@ -171,8 +171,8 @@ export class ApplicationConnectionStatusContribution extends TheiaApplicationCon
171171
private readonly notificationManager: NotificationManager;
172172
@inject(CreateFeatures)
173173
private readonly createFeatures: CreateFeatures;
174-
@inject(WebSocketConnectionProvider)
175-
private readonly connectionProvider: WebSocketConnectionProvider;
174+
@inject(WebSocketConnectionSource)
175+
private readonly connectionSource: WebSocketConnectionSource;
176176

177177
private readonly offlineStatusDidChangeEmitter = new Emitter<
178178
OfflineConnectionStatus | undefined
@@ -202,7 +202,7 @@ export class ApplicationConnectionStatusContribution extends TheiaApplicationCon
202202
const params = <OfflineMessageParams>{
203203
port: this.daemonPort.port,
204204
online: this.isOnline.online,
205-
backendConnected: this.connectionProvider['socket'].connected, // https://github.com/arduino/arduino-ide/issues/2081
205+
backendConnected: this.connectionSource['socket'].connected, // https://github.com/arduino/arduino-ide/issues/2081
206206
};
207207
this._offlineStatus = offlineConnectionStatusType(params);
208208
const { text, tooltip } = offlineMessage(params);

0 commit comments

Comments
 (0)