Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8291626

Browse files
chore: use theia@1.46.1
Use changes from #2362 and rebase on main branch
1 parent 5ec1915 commit 8291626

File tree

55 files changed

+1968
-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

+1968
-2022
lines changed

‎arduino-ide-extension/package.json‎

Lines changed: 22 additions & 21 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 9 additions & 18 deletions
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‎

Lines changed: 0 additions & 9 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 4 deletions
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';

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /