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 6e9577a

Browse files
chore: use theia@1.47.0 
1 parent 8291626 commit 6e9577a

File tree

10 files changed

+496
-448
lines changed

10 files changed

+496
-448
lines changed

‎arduino-ide-extension/package.json‎

Lines changed: 23 additions & 23 deletions
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.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",
37-
"@theia/monaco-editor-core": "1.72.3",
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",
27+
"@theia/application-package": "1.47.0",
28+
"@theia/core": "1.47.0",
29+
"@theia/debug": "1.47.0",
30+
"@theia/editor": "1.47.0",
31+
"@theia/electron": "1.47.0",
32+
"@theia/filesystem": "1.47.0",
33+
"@theia/keymaps": "1.47.0",
34+
"@theia/markers": "1.47.0",
35+
"@theia/messages": "1.47.0",
36+
"@theia/monaco": "1.47.0",
37+
"@theia/monaco-editor-core": "1.83.101",
38+
"@theia/navigator": "1.47.0",
39+
"@theia/outline-view": "1.47.0",
40+
"@theia/output": "1.47.0",
41+
"@theia/plugin-ext": "1.47.0",
42+
"@theia/plugin-ext-vscode": "1.47.0",
43+
"@theia/preferences": "1.47.0",
44+
"@theia/scm": "1.47.0",
45+
"@theia/search-in-workspace": "1.47.0",
46+
"@theia/terminal": "1.47.0",
47+
"@theia/test": "1.47.0",
48+
"@theia/typehierarchy": "1.47.0",
49+
"@theia/workspace": "1.47.0",
5050
"@tippyjs/react": "^4.2.5",
5151
"@types/auth0-js": "^9.21.3",
5252
"@types/btoa": "^1.2.3",

‎arduino-ide-extension/src/browser/contributions/compiler-errors.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ export class CompilerErrors
779779
return undefined;
780780
} else {
781781
return this.editorManager
782-
.getByUri(new URI(uriOrWidget))
782+
.getByUri(new URI(uriOrWidget.toString()))
783783
.then((editor) => {
784784
if (editor) {
785785
return this.monacoEditor(editor);

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
import { nls } from '@theia/core/lib/common';
12
import { inject, injectable } from '@theia/core/shared/inversify';
23
import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
34
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
4-
import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
5+
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
6+
import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
7+
import type { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
8+
import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
59
import {
610
Contribution,
711
Command,
@@ -10,17 +14,11 @@ import {
1014
CommandRegistry,
1115
} from './contribution';
1216
import { ArduinoMenus } from '../menu/arduino-menus';
13-
import { nls } from '@theia/core/lib/common';
14-
import type { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
15-
import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
1617

1718
// TODO: [macOS]: to remove `Start Dictation...` and `Emoji & Symbol` see this thread: https://github.com/electron/electron/issues/8283#issuecomment-269522072
1819
// Depends on https://github.com/eclipse-theia/theia/pull/7964
1920
@injectable()
2021
export class EditContributions extends Contribution {
21-
@inject(MonacoEditorService)
22-
private readonly codeEditorService: MonacoEditorService;
23-
2422
@inject(ClipboardService)
2523
private readonly clipboardService: ClipboardService;
2624

@@ -208,9 +206,10 @@ ${value}
208206
protected async current(): Promise<
209207
ICodeEditor | StandaloneCodeEditor | undefined
210208
> {
209+
const codeEditorService = StandaloneServices.get(ICodeEditorService);
211210
return (
212-
this.codeEditorService.getFocusedCodeEditor() ||
213-
this.codeEditorService.getActiveCodeEditor() ||
211+
codeEditorService.getFocusedCodeEditor() ||
212+
codeEditorService.getActiveCodeEditor() ||
214213
undefined
215214
);
216215
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ export class SketchesServiceClientImpl
288288
* `true` if the `uri` is not contained in any of the opened workspaces. Otherwise, `false`.
289289
*/
290290
isReadOnly(uri: URI | monaco.Uri | string): boolean {
291-
const toCheck = uri instanceof URI ? uri : new URI(uri);
291+
const toCheck = uri instanceof URI ? uri : new URI(uri.toString());
292292
if (toCheck.scheme === 'user-storage') {
293293
return false;
294294
}

‎arduino-ide-extension/src/browser/theia/filesystem/file-resource.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export class FileResourceResolver extends TheiaFileResourceResolver {
3636
);
3737
}
3838
return new WriteQueuedFileResource(uri, this.fileService, {
39-
isReadonly: stat?.isReadonly ?? false,
39+
readOnly: stat?.isReadonly ?? false,
4040
shouldOverwrite: () => this.shouldOverwrite(uri),
4141
shouldOpenAsText: (error) => this.shouldOpenAsText(uri, error),
4242
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export function maybeUpdateReadOnlyState(
117117
const model = editor.document;
118118
const oldReadOnly = model.readOnly;
119119
const resource = model['resource'];
120-
const newReadOnly = Boolean(resource.isReadonly) || isReadOnly(resource.uri);
120+
const newReadOnly = Boolean(resource.readOnly) || isReadOnly(resource.uri);
121121
if (oldReadOnly !== newReadOnly) {
122122
editor.getControl().updateOptions({ readOnly: newReadOnly });
123123
if (newReadOnly) {

‎arduino-ide-extension/src/browser/theia/monaco/monaco-text-model-service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class MonacoTextModelService extends TheiaMonacoTextModelService {
2020
.getContributions()
2121
.find(({ scheme }) => resource.uri.scheme === scheme);
2222
const readOnly =
23-
Boolean(resource.isReadonly) ||
23+
Boolean(resource.readOnly) ||
2424
this.sketchesServiceClient.isReadOnly(resource.uri);
2525
return factory
2626
? factory.createModel(resource)

‎electron-app/package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
"license": "AGPL-3.0-or-later",
66
"main": "./src-gen/backend/electron-main.js",
77
"dependencies": {
8-
"@theia/core": "1.46.1",
9-
"@theia/debug": "1.46.1",
10-
"@theia/editor": "1.46.1",
11-
"@theia/electron": "1.46.1",
12-
"@theia/filesystem": "1.46.1",
13-
"@theia/keymaps": "1.46.1",
14-
"@theia/messages": "1.46.1",
15-
"@theia/monaco": "1.46.1",
16-
"@theia/navigator": "1.46.1",
17-
"@theia/plugin-ext": "1.46.1",
18-
"@theia/plugin-ext-vscode": "1.46.1",
19-
"@theia/preferences": "1.46.1",
20-
"@theia/terminal": "1.46.1",
21-
"@theia/workspace": "1.46.1",
8+
"@theia/core": "1.47.0",
9+
"@theia/debug": "1.47.0",
10+
"@theia/editor": "1.47.0",
11+
"@theia/electron": "1.47.0",
12+
"@theia/filesystem": "1.47.0",
13+
"@theia/keymaps": "1.47.0",
14+
"@theia/messages": "1.47.0",
15+
"@theia/monaco": "1.47.0",
16+
"@theia/navigator": "1.47.0",
17+
"@theia/plugin-ext": "1.47.0",
18+
"@theia/plugin-ext-vscode": "1.47.0",
19+
"@theia/preferences": "1.47.0",
20+
"@theia/terminal": "1.47.0",
21+
"@theia/workspace": "1.47.0",
2222
"arduino-ide-extension": "2.3.5"
2323
},
2424
"devDependencies": {
25-
"@theia/cli": "1.46.1",
25+
"@theia/cli": "1.47.0",
2626
"7zip-min": "^1.4.4",
2727
"chmodr": "^1.2.0",
2828
"compression-webpack-plugin": "^9.0.0",

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"**/ip": "^2.0.1"
1818
},
1919
"devDependencies": {
20-
"@theia/cli": "1.46.1",
20+
"@theia/cli": "1.47.0",
2121
"@typescript-eslint/eslint-plugin": "^5.59.0",
2222
"@typescript-eslint/parser": "^5.59.0",
2323
"@xhmikosr/downloader": "^13.0.1",

0 commit comments

Comments
(0)

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