Skip to content

Commit abf1f3a

Browse files
fstasifstasi
committed
wip
1 parent 437caeb commit abf1f3a

File tree

83 files changed

+714
-687
lines changed

Some content is hidden

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

83 files changed

+714
-687
lines changed

‎arduino-ide-extension/package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@
1919
},
2020
"dependencies": {
2121
"@grpc/grpc-js": "^1.3.7",
22-
"@theia/application-package": "1.18.0",
23-
"@theia/core": "1.18.0",
24-
"@theia/editor": "1.18.0",
25-
"@theia/editor-preview": "1.18.0",
26-
"@theia/filesystem": "1.18.0",
27-
"@theia/git": "1.18.0",
28-
"@theia/keymaps": "1.18.0",
29-
"@theia/markers": "1.18.0",
30-
"@theia/monaco": "1.18.0",
31-
"@theia/navigator": "1.18.0",
32-
"@theia/outline-view": "1.18.0",
33-
"@theia/output": "1.18.0",
34-
"@theia/preferences": "1.18.0",
35-
"@theia/search-in-workspace": "1.18.0",
36-
"@theia/terminal": "1.18.0",
37-
"@theia/workspace": "1.18.0",
22+
"@theia/application-package": "1.19.0",
23+
"@theia/core": "1.19.0",
24+
"@theia/editor": "1.19.0",
25+
"@theia/editor-preview": "1.19.0",
26+
"@theia/filesystem": "1.19.0",
27+
"@theia/git": "1.19.0",
28+
"@theia/keymaps": "1.19.0",
29+
"@theia/markers": "1.19.0",
30+
"@theia/monaco": "1.19.0",
31+
"@theia/navigator": "1.19.0",
32+
"@theia/outline-view": "1.19.0",
33+
"@theia/output": "1.19.0",
34+
"@theia/preferences": "1.19.0",
35+
"@theia/search-in-workspace": "1.19.0",
36+
"@theia/terminal": "1.19.0",
37+
"@theia/workspace": "1.19.0",
3838
"@tippyjs/react": "^4.2.5",
3939
"@types/atob": "^2.1.2",
4040
"@types/auth0-js": "^9.14.0",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
StatusBar,
1717
StatusBarAlignment,
1818
} from '@theia/core/lib/browser';
19-
import { nls } from '@theia/core/lib/browser/nls';
19+
import { nls } from '@theia/core/lib/common';
2020
import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
2121
import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
2222
import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ import {
154154
} from '../common/protocol/examples-service';
155155
import { BuiltInExamples, LibraryExamples } from './contributions/examples';
156156
import { IncludeLibrary } from './contributions/include-library';
157-
import { OutputChannelManager as TheiaOutputChannelManager } from '@theia/output/lib/common/output-channel';
157+
import { OutputChannelManager as TheiaOutputChannelManager } from '@theia/output/lib/browser/output-channel';
158158
import { OutputChannelManager } from './theia/output/output-channel';
159159
import {
160160
OutputChannelRegistryMainImpl as TheiaOutputChannelRegistryMainImpl,
@@ -253,7 +253,7 @@ import {
253253
UploadCertificateDialogProps,
254254
UploadCertificateDialogWidget,
255255
} from './dialogs/certificate-uploader/certificate-uploader-dialog';
256-
import { nls } from '@theia/core/lib/browser/nls';
256+
import { nls } from '@theia/core/lib/common';
257257

258258
const ElementQueries = require('css-element-queries/src/ElementQueries');
259259

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
PreferenceContribution,
77
PreferenceSchema,
88
} from '@theia/core/lib/browser/preferences';
9-
import { nls } from '@theia/core/lib/browser/nls';
9+
import { nls } from '@theia/core/lib/common';
1010
import { CompilerWarningLiterals, CompilerWarnings } from '../common/protocol';
1111

1212
export const ArduinoConfigSchema: PreferenceSchema = {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { BoardsServiceProvider } from './boards-service-provider';
1010
import { BoardsConfig } from './boards-config';
1111
import { Installable, ResponseServiceArduino } from '../../common/protocol';
1212
import { BoardsListWidgetFrontendContribution } from './boards-widget-frontend-contribution';
13-
import { nls } from '@theia/core/lib/browser/nls';
13+
import { nls } from '@theia/core/lib/common';
1414

1515
/**
1616
* Listens on `BoardsConfig.Config` changes, if a board is selected which does not

‎arduino-ide-extension/src/browser/boards/boards-config-dialog.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { BoardsConfig } from './boards-config';
66
import { BoardsService } from '../../common/protocol/boards-service';
77
import { BoardsServiceProvider } from './boards-service-provider';
88
import { BoardsConfigDialogWidget } from './boards-config-dialog-widget';
9-
import { nls } from '@theia/core/lib/browser/nls';
9+
import { nls } from '@theia/core/lib/common';
1010

1111
@injectable()
1212
export class BoardsConfigDialogProps extends DialogProps {}

‎arduino-ide-extension/src/browser/boards/boards-config.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from '../../common/protocol/boards-service';
1212
import { NotificationCenter } from '../notification-center';
1313
import { BoardsServiceProvider } from './boards-service-provider';
14-
import { nls } from '@theia/core/lib/browser/nls';
14+
import { nls } from '@theia/core/lib/common';
1515

1616
export namespace BoardsConfig {
1717
export interface Config {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { FrontendApplicationContribution } from '@theia/core/lib/browser';
1212
import { BoardsDataStore } from './boards-data-store';
1313
import { MainMenuManager } from '../../common/main-menu-manager';
1414
import { ArduinoMenus, unregisterSubmenu } from '../menu/arduino-menus';
15-
import { nls } from '@theia/core/lib/browser/nls';
15+
import { nls } from '@theia/core/lib/common';
1616

1717
@injectable()
1818
export class BoardsDataMenuUpdater implements FrontendApplicationContribution {

‎arduino-ide-extension/src/browser/boards/boards-list-widget.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
} from '../../common/protocol/boards-service';
66
import { ListWidget } from '../widgets/component-list/list-widget';
77
import { ListItemRenderer } from '../widgets/component-list/list-item-renderer';
8-
import { nls } from '@theia/core/lib/browser/nls';
8+
import { nls } from '@theia/core/lib/common';
99

1010
@injectable()
1111
export class BoardsListWidget extends ListWidget<BoardsPackage> {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { naturalCompare } from '../../common/utils';
1818
import { NotificationCenter } from '../notification-center';
1919
import { ArduinoCommands } from '../arduino-commands';
2020
import { StorageWrapper } from '../storage-wrapper';
21-
import { nls } from '@theia/core/lib/browser/nls';
21+
import { nls } from '@theia/core/lib/common';
2222

2323
@injectable()
2424
export class BoardsServiceProvider implements FrontendApplicationContribution {

‎arduino-ide-extension/src/browser/boards/boards-toolbar-item.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
BoardsServiceProvider,
1010
AvailableBoard,
1111
} from './boards-service-provider';
12-
import { nls } from '@theia/core/lib/browser/nls';
12+
import { nls } from '@theia/core/lib/common';
1313

1414
export interface BoardsDropDownListCoords {
1515
readonly top: number;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
} from './contribution';
1313
import { ArduinoMenus } from '../menu/arduino-menus';
1414
import { ConfigService } from '../../common/protocol';
15-
import { nls } from '@theia/core/lib/browser/nls';
15+
import { nls } from '@theia/core/lib/common';
1616

1717
@injectable()
1818
export class About extends Contribution {

‎arduino-ide-extension/src/browser/contributions/add-file.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
URI,
1010
} from './contribution';
1111
import { FileDialogService } from '@theia/filesystem/lib/browser';
12-
import { nls } from '@theia/core/lib/browser/nls';
12+
import { nls } from '@theia/core/lib/common';
1313

1414
@injectable()
1515
export class AddFile extends SketchContribution {

‎arduino-ide-extension/src/browser/contributions/add-zip-library.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
CommandRegistry,
1616
MenuModelRegistry,
1717
} from './contribution';
18-
import { nls } from '@theia/core/lib/browser/nls';
18+
import { nls } from '@theia/core/lib/common';
1919

2020
@injectable()
2121
export class AddZipLibrary extends SketchContribution {

‎arduino-ide-extension/src/browser/contributions/archive-sketch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
CommandRegistry,
1010
MenuModelRegistry,
1111
} from './contribution';
12-
import { nls } from '@theia/core/lib/browser/nls';
12+
import { nls } from '@theia/core/lib/common';
1313

1414
@injectable()
1515
export class ArchiveSketch extends SketchContribution {

‎arduino-ide-extension/src/browser/contributions/board-selection.ts

+18-8
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
Port,
2424
} from '../../common/protocol';
2525
import { SketchContribution, Command, CommandRegistry } from './contribution';
26-
import { nls } from '@theia/core/lib/browser/nls';
26+
import { nls } from '@theia/core/lib/common';
2727

2828
@injectable()
2929
export class BoardSelection extends SketchContribution {
@@ -138,7 +138,11 @@ PID: ${PID}`;
138138
// The board specific items, and the rest, have order with `z`. We needed something between `0` and `z` with natural-order.
139139
this.menuModelRegistry.registerSubmenu(
140140
boardsSubmenuPath,
141-
nls.localize('arduino/board/board', 'Board{0}', !!boardsSubmenuLabel ? `: "${boardsSubmenuLabel}"` : ''),
141+
nls.localize(
142+
'arduino/board/board',
143+
'Board{0}',
144+
!!boardsSubmenuLabel ? `: "${boardsSubmenuLabel}"` : ''
145+
),
142146
{ order: '100' }
143147
);
144148
this.toDisposeBeforeMenuRebuild.push(
@@ -155,7 +159,11 @@ PID: ${PID}`;
155159
const portsSubmenuLabel = config.selectedPort?.address;
156160
this.menuModelRegistry.registerSubmenu(
157161
portsSubmenuPath,
158-
nls.localize('arduino/board/port', 'Port{0}', portsSubmenuLabel ? `: "${portsSubmenuLabel}"` : ''),
162+
nls.localize(
163+
'arduino/board/port',
164+
'Port{0}',
165+
portsSubmenuLabel ? `: "${portsSubmenuLabel}"` : ''
166+
),
159167
{ order: '101' }
160168
);
161169
this.toDisposeBeforeMenuRebuild.push(
@@ -193,9 +201,10 @@ PID: ${PID}`;
193201

194202
const packageLabel =
195203
packageName +
196-
`${manuallyInstalled
197-
? nls.localize('arduino/board/inSketchbook', ' (in Sketchbook)')
198-
: ''
204+
`${
205+
manuallyInstalled
206+
? nls.localize('arduino/board/inSketchbook', ' (in Sketchbook)')
207+
: ''
199208
}`;
200209
// Platform submenu
201210
const platformMenuPath = [...boardsPackagesGroup, packageId];
@@ -268,8 +277,9 @@ PID: ${PID}`;
268277
});
269278
}
270279
for (const { name, fqbn } of boards) {
271-
const id = `arduino-select-port--${address}${fqbn ? `--${fqbn}` : ''
272-
}`;
280+
const id = `arduino-select-port--${address}${
281+
fqbn ? `--${fqbn}` : ''
282+
}`;
273283
const command = { id };
274284
const handler = {
275285
execute: () => {

‎arduino-ide-extension/src/browser/contributions/burn-bootloader.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { inject, injectable } from 'inversify';
2-
import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
2+
import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
33
import { CoreService } from '../../common/protocol';
44
import { ArduinoMenus } from '../menu/arduino-menus';
55
import { BoardsDataStore } from '../boards/boards-data-store';
@@ -11,7 +11,7 @@ import {
1111
CommandRegistry,
1212
MenuModelRegistry,
1313
} from './contribution';
14-
import { nls } from '@theia/core/lib/browser/nls';
14+
import { nls } from '@theia/core/lib/common';
1515

1616
@injectable()
1717
export class BurnBootloader extends SketchContribution {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
KeybindingRegistry,
1616
URI,
1717
} from './contribution';
18-
import { nls } from '@theia/core/lib/browser/nls';
18+
import { nls } from '@theia/core/lib/common';
1919

2020
/**
2121
* Closes the `current` closeable editor, or any closeable current widget from the main area, or the current sketch window.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
99
import { MessageService } from '@theia/core/lib/common/message-service';
1010
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
1111
import { open, OpenerService } from '@theia/core/lib/browser/opener-service';
12-
import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
12+
import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
1313
import {
1414
MenuModelRegistry,
1515
MenuContribution,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
SketchContribution,
1313
TabBarToolbarRegistry,
1414
} from './contribution';
15-
import { nls } from '@theia/core/lib/browser/nls';
15+
import { nls } from '@theia/core/lib/common';
1616

1717
@injectable()
1818
export class Debug extends SketchContribution {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
CommandRegistry,
1212
} from './contribution';
1313
import { ArduinoMenus } from '../menu/arduino-menus';
14-
import { nls } from '@theia/core/lib/browser/nls';
14+
import { nls } from '@theia/core/lib/common';
1515

1616
// TODO: [macOS]: to remove `Start Dictation...` and `Emoji & Symbol` see this thread: https://github.com/electron/electron/issues/8283#issuecomment-269522072
1717
// Depends on https://github.com/eclipse-theia/theia/pull/7964

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
} from './contribution';
2323
import { NotificationCenter } from '../notification-center';
2424
import { Board, Sketch, SketchContainer } from '../../common/protocol';
25-
import { nls } from '@theia/core/lib/browser/nls';
25+
import { nls } from '@theia/core/lib/common';
2626

2727
@injectable()
2828
export abstract class Examples extends SketchContribution {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
CommandRegistry,
1313
KeybindingRegistry,
1414
} from './contribution';
15-
import { nls } from '@theia/core/lib/browser/nls';
15+
import { nls } from '@theia/core/lib/common';
1616

1717
@injectable()
1818
export class Help extends Contribution {

‎arduino-ide-extension/src/browser/contributions/include-library.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { LibraryListWidget } from '../library/library-list-widget';
1515
import { BoardsServiceProvider } from '../boards/boards-service-provider';
1616
import { SketchContribution, Command, CommandRegistry } from './contribution';
1717
import { NotificationCenter } from '../notification-center';
18-
import { nls } from '@theia/core/lib/browser/nls';
18+
import { nls } from '@theia/core/lib/common';
1919

2020
@injectable()
2121
export class IncludeLibrary extends SketchContribution {

‎arduino-ide-extension/src/browser/contributions/new-sketch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { nls } from '@theia/core/lib/browser/nls';
1+
import { nls } from '@theia/core/lib/common';
22
import { injectable } from 'inversify';
33
import { ArduinoMenus } from '../menu/arduino-menus';
44
import { ArduinoToolbar } from '../toolbar/arduino-toolbar';

‎arduino-ide-extension/src/browser/contributions/open-recent-sketch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { ArduinoMenus } from '../menu/arduino-menus';
1414
import { MainMenuManager } from '../../common/main-menu-manager';
1515
import { OpenSketch } from './open-sketch';
1616
import { NotificationCenter } from '../notification-center';
17-
import { nls } from '@theia/core/lib/browser/nls';
17+
import { nls } from '@theia/core/lib/common';
1818

1919
@injectable()
2020
export class OpenRecentSketch extends SketchContribution {

‎arduino-ide-extension/src/browser/contributions/open-sketch-external.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
MenuModelRegistry,
1010
KeybindingRegistry,
1111
} from './contribution';
12-
import { nls } from '@theia/core/lib/browser/nls';
12+
import { nls } from '@theia/core/lib/common';
1313

1414
@injectable()
1515
export class OpenSketchExternal extends SketchContribution {

‎arduino-ide-extension/src/browser/contributions/open-sketch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { ExamplesService } from '../../common/protocol/examples-service';
2222
import { BuiltInExamples } from './examples';
2323
import { Sketchbook } from './sketchbook';
2424
import { SketchContainer } from '../../common/protocol';
25-
import { nls } from '@theia/core/lib/browser/nls';
25+
import { nls } from '@theia/core/lib/common';
2626

2727
@injectable()
2828
export class OpenSketch extends SketchContribution {

‎arduino-ide-extension/src/browser/contributions/quit-app.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
CommandRegistry,
1010
} from './contribution';
1111
import { ArduinoMenus } from '../menu/arduino-menus';
12-
import { nls } from '@theia/core/lib/browser/nls';
12+
import { nls } from '@theia/core/lib/common';
1313

1414
@injectable()
1515
export class QuitApp extends Contribution {

‎arduino-ide-extension/src/browser/contributions/save-as-sketch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
MenuModelRegistry,
1111
KeybindingRegistry,
1212
} from './contribution';
13-
import { nls } from '@theia/core/lib/browser/nls';
13+
import { nls } from '@theia/core/lib/common';
1414

1515
@injectable()
1616
export class SaveAsSketch extends SketchContribution {

‎arduino-ide-extension/src/browser/contributions/save-sketch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
KeybindingRegistry,
1212
TabBarToolbarRegistry,
1313
} from './contribution';
14-
import { nls } from '@theia/core/lib/browser/nls';
14+
import { nls } from '@theia/core/lib/common';
1515

1616
@injectable()
1717
export class SaveSketch extends SketchContribution {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
} from './contribution';
99
import { ArduinoMenus } from '../menu/arduino-menus';
1010
import { Settings as Preferences, SettingsDialog } from '../settings';
11-
import { nls } from '@theia/core/lib/browser/nls';
11+
import { nls } from '@theia/core/lib/common';
1212

1313
@injectable()
1414
export class Settings extends SketchContribution {

‎arduino-ide-extension/src/browser/contributions/sketch-control.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
2121
import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
2222
import { SketchesServiceClientImpl } from '../../common/protocol/sketches-service-client-impl';
2323
import { LocalCacheFsProvider } from '../local-cache/local-cache-fs-provider';
24-
import { nls } from '@theia/core/lib/browser/nls';
24+
import { nls } from '@theia/core/lib/common';
2525

2626
@injectable()
2727
export class SketchControl extends SketchContribution {

0 commit comments

Comments
 (0)