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 d36c108

Browse files
committed
Update Theia to 1.24.0
1 parent 15b4c94 commit d36c108

File tree

14 files changed

+407
-396
lines changed

14 files changed

+407
-396
lines changed

‎arduino-ide-extension/package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@
2222
},
2323
"dependencies": {
2424
"@grpc/grpc-js": "^1.3.7",
25-
"@theia/application-package": "1.23.0",
26-
"@theia/core": "1.23.0",
27-
"@theia/editor": "1.23.0",
28-
"@theia/editor-preview": "1.23.0",
29-
"@theia/electron": "1.23.0",
30-
"@theia/filesystem": "1.23.0",
31-
"@theia/git": "1.23.0",
32-
"@theia/keymaps": "1.23.0",
33-
"@theia/markers": "1.23.0",
34-
"@theia/monaco": "1.23.0",
35-
"@theia/navigator": "1.23.0",
36-
"@theia/outline-view": "1.23.0",
37-
"@theia/output": "1.23.0",
38-
"@theia/preferences": "1.23.0",
39-
"@theia/search-in-workspace": "1.23.0",
40-
"@theia/terminal": "1.23.0",
41-
"@theia/workspace": "1.23.0",
25+
"@theia/application-package": "1.24.0",
26+
"@theia/core": "1.24.0",
27+
"@theia/editor": "1.24.0",
28+
"@theia/editor-preview": "1.24.0",
29+
"@theia/electron": "1.24.0",
30+
"@theia/filesystem": "1.24.0",
31+
"@theia/git": "1.24.0",
32+
"@theia/keymaps": "1.24.0",
33+
"@theia/markers": "1.24.0",
34+
"@theia/monaco": "1.24.0",
35+
"@theia/navigator": "1.24.0",
36+
"@theia/outline-view": "1.24.0",
37+
"@theia/output": "1.24.0",
38+
"@theia/preferences": "1.24.0",
39+
"@theia/search-in-workspace": "1.24.0",
40+
"@theia/terminal": "1.24.0",
41+
"@theia/workspace": "1.24.0",
4242
"@tippyjs/react": "^4.2.5",
4343
"@types/atob": "^2.1.2",
4444
"@types/auth0-js": "^9.14.0",

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import {
1212
} from './contribution';
1313
import { ArduinoMenus } from '../menu/arduino-menus';
1414
import { nls } from '@theia/core/lib/common';
15+
import type { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
16+
import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
1517

1618
// TODO: [macOS]: to remove `Start Dictation...` and `Emoji & Symbol` see this thread: https://github.com/electron/electron/issues/8283#issuecomment-269522072
1719
// Depends on https://github.com/eclipse-theia/theia/pull/7964
@@ -250,10 +252,10 @@ ${value}
250252
});
251253
}
252254

253-
protected async current(): Promise<monaco.editor.ICodeEditor | undefined> {
255+
protected async current(): Promise<ICodeEditor|StandaloneCodeEditor | undefined> {
254256
return (
255257
this.codeEditorService.getFocusedCodeEditor() ||
256-
this.codeEditorService.getActiveCodeEditor()
258+
this.codeEditorService.getActiveCodeEditor()||undefined
257259
);
258260
}
259261

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
import { nls } from '@theia/core/lib/common';
1616
import { IDEUpdaterCommands } from '../ide-updater/ide-updater-commands';
1717
import { ElectronCommands } from '@theia/core/lib/electron-browser/menu/electron-menu-contribution';
18+
import * as monaco from '@theia/monaco-editor-core';
1819

1920
@injectable()
2021
export class Help extends Contribution {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { BoardsServiceProvider } from '../boards/boards-service-provider';
1616
import { SketchContribution, Command, CommandRegistry } from './contribution';
1717
import { NotificationCenter } from '../notification-center';
1818
import { nls } from '@theia/core/lib/common';
19+
import * as monaco from '@theia/monaco-editor-core';
1920

2021
@injectable()
2122
export class IncludeLibrary extends SketchContribution {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ export class EditorCommandContribution extends TheiaEditorCommandContribution {
88
// Workaround for https://github.com/eclipse-theia/theia/issues/8722.
99
this.editorPreferences.onPreferenceChanged(
1010
({ preferenceName, newValue, oldValue }) => {
11-
if (preferenceName === 'editor.autoSave') {
12-
const autoSaveWasOnBeforeChange = !oldValue || oldValue ==='on';
13-
const autoSaveIsOnAfterChange = !newValue || newValue ==='on';
11+
if (preferenceName === 'files.autoSave') {
12+
const autoSaveWasOnBeforeChange = !oldValue || oldValue !=='off';
13+
const autoSaveIsOnAfterChange = !newValue || newValue !=='off';
1414
if (!autoSaveWasOnBeforeChange && autoSaveIsOnAfterChange) {
1515
this.shell.saveAll();
1616
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@ import {
44
Disposable,
55
DisposableCollection,
66
} from '@theia/core/lib/common/disposable';
7-
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
7+
import { EditorServiceOverrides,MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
88
import { MonacoEditorProvider as TheiaMonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
99
import { SketchesServiceClientImpl } from '../../../common/protocol/sketches-service-client-impl';
10+
import * as monaco from '@theia/monaco-editor-core';
11+
import type { ReferencesModel } from '@theia/monaco-editor-core/esm/vs/editor/contrib/gotoSymbol/browser/referencesModel';
1012

11-
type CancelablePromise = Promise<monaco.referenceSearch.ReferencesModel> & {
13+
14+
type CancelablePromise = Promise<ReferencesModel> & {
1215
cancel: () => void;
1316
};
1417
interface EditorFactory {
1518
(
16-
override: monaco.editor.IEditorOverrideServices,
19+
override: EditorServiceOverrides,
1720
toDispose: DisposableCollection
1821
): Promise<MonacoEditor>;
1922
}
@@ -36,8 +39,7 @@ export class MonacoEditorProvider extends TheiaMonacoEditorProvider {
3639

3740
private installCustomReferencesController(editor: MonacoEditor): Disposable {
3841
const control = editor.getControl();
39-
const referencesController =
40-
control._contributions['editor.contrib.referencesController'];
42+
const referencesController: any = control.getContribution('editor.contrib.referencesController');
4143
const originalToggleWidget = referencesController.toggleWidget;
4244
const toDispose = new DisposableCollection();
4345
const toDisposeBeforeToggleWidget = new DisposableCollection();

‎arduino-ide-extension/src/browser/theia/output/output-channel.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as PQueue from 'p-queue';
22
import { injectable } from 'inversify';
33
import { Deferred } from '@theia/core/lib/common/promise-util';
44
import { OutputUri } from '@theia/output/lib/common/output-uri';
5-
import { IReference } from '@theia/monaco/lib/browser/monaco-text-model-service';
5+
import { IReference } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
66
import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
77
import {
88
OutputChannelManager as TheiaOutputChannelManager,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
ARDUINO_CLOUD_FOLDER,
1616
REMOTE_SKETCHBOOK_FOLDER,
1717
} from '../../browser/utils/constants';
18+
import * as monaco from '@theia/monaco-editor-core';
1819

1920
const READ_ONLY_FILES = ['sketch.json'];
2021
const READ_ONLY_FILES_REMOTE = ['thingProperties.h', 'thingsProperties.h'];

‎arduino-ide-extension/tsconfig.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"src"
2727
],
2828
"files": [
29-
"../node_modules/nsfw/index.d.ts",
30-
"../node_modules/@theia/monaco/src/typings/monaco/index.d.ts"
29+
"../node_modules/nsfw/index.d.ts"
3130
]
3231
}

‎browser-app/package.json‎

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

0 commit comments

Comments
(0)

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