jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-04-19 12:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: use theia@1.47.0

Browse Source
This commit is contained in:
Giacomo Cusinato 2025-03-11 14:33:23 +07:00
parent 8053c55ec3
commit 2b26323c8b
10 changed files with 458 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
arduino-ide-extension/package.json
View File

@ -24,29 +24,29 @@
},
"dependencies": {
"@grpc/grpc-js": "^1.8.14",
"@theia/application-package": "1.46.1",
"@theia/core": "1.46.1",
"@theia/debug": "1.46.1",
"@theia/editor": "1.46.1",
"@theia/electron": "1.46.1",
"@theia/filesystem": "1.46.1",
"@theia/keymaps": "1.46.1",
"@theia/markers": "1.46.1",
"@theia/messages": "1.46.1",
"@theia/monaco": "1.46.1",
"@theia/monaco-editor-core": "1.72.3",
"@theia/navigator": "1.46.1",
"@theia/outline-view": "1.46.1",
"@theia/output": "1.46.1",
"@theia/plugin-ext": "1.46.1",
"@theia/plugin-ext-vscode": "1.46.1",
"@theia/preferences": "1.46.1",
"@theia/scm": "1.46.1",
"@theia/search-in-workspace": "1.46.1",
"@theia/terminal": "1.46.1",
"@theia/test": "1.46.1",
"@theia/typehierarchy": "1.46.1",
"@theia/workspace": "1.46.1",
"@theia/application-package": "1.47.0",
"@theia/core": "1.47.0",
"@theia/debug": "1.47.0",
"@theia/editor": "1.47.0",
"@theia/electron": "1.47.0",
"@theia/filesystem": "1.47.0",
"@theia/keymaps": "1.47.0",
"@theia/markers": "1.47.0",
"@theia/messages": "1.47.0",
"@theia/monaco": "1.47.0",
"@theia/monaco-editor-core": "1.83.101",
"@theia/navigator": "1.47.0",
"@theia/outline-view": "1.47.0",
"@theia/output": "1.47.0",
"@theia/plugin-ext": "1.47.0",
"@theia/plugin-ext-vscode": "1.47.0",
"@theia/preferences": "1.47.0",
"@theia/scm": "1.47.0",
"@theia/search-in-workspace": "1.47.0",
"@theia/terminal": "1.47.0",
"@theia/test": "1.47.0",
"@theia/typehierarchy": "1.47.0",
"@theia/workspace": "1.47.0",
"@tippyjs/react": "^4.2.5",
"@types/auth0-js": "^9.21.3",
"@types/btoa": "^1.2.3",

2
arduino-ide-extension/src/browser/contributions/compiler-errors.ts
View File

@ -779,7 +779,7 @@ export class CompilerErrors
return undefined;
} else {
return this.editorManager
.getByUri(new URI(uriOrWidget))
.getByUri(new URI(uriOrWidget.toString()))
.then((editor) => {
if (editor) {
return this.monacoEditor(editor);

17
arduino-ide-extension/src/browser/contributions/edit-contributions.ts
View File

@ -1,7 +1,11 @@
import { nls } from '@theia/core/lib/common';
import { inject, injectable } from '@theia/core/shared/inversify';
import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
import type { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
import {
Contribution,
Command,
@ -10,17 +14,11 @@ import {
CommandRegistry,
} from './contribution';
import { ArduinoMenus } from '../menu/arduino-menus';
import { nls } from '@theia/core/lib/common';
import type { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
// TODO: [macOS]: to remove `Start Dictation...` and `Emoji & Symbol` see this thread: https://github.com/electron/electron/issues/8283#issuecomment-269522072
// Depends on https://github.com/eclipse-theia/theia/pull/7964
@injectable()
export class EditContributions extends Contribution {
@inject(MonacoEditorService)
private readonly codeEditorService: MonacoEditorService;
@inject(ClipboardService)
private readonly clipboardService: ClipboardService;
@ -208,9 +206,10 @@ ${value}
protected async current(): Promise<
ICodeEditor | StandaloneCodeEditor | undefined
> {
const codeEditorService = StandaloneServices.get(ICodeEditorService);
return (
this.codeEditorService.getFocusedCodeEditor() ||
this.codeEditorService.getActiveCodeEditor() ||
codeEditorService.getFocusedCodeEditor() ||
codeEditorService.getActiveCodeEditor() ||
undefined
);
}

2
arduino-ide-extension/src/browser/sketches-service-client-impl.ts
View File

@ -288,7 +288,7 @@ export class SketchesServiceClientImpl
* `true` if the `uri` is not contained in any of the opened workspaces. Otherwise, `false`.
*/
isReadOnly(uri: URI | monaco.Uri | string): boolean {
const toCheck = uri instanceof URI ? uri : new URI(uri);
const toCheck = uri instanceof URI ? uri : new URI(uri.toString());
if (toCheck.scheme === 'user-storage') {
return false;
}

2
arduino-ide-extension/src/browser/theia/filesystem/file-resource.ts
View File

@ -36,7 +36,7 @@ export class FileResourceResolver extends TheiaFileResourceResolver {
);
}
return new WriteQueuedFileResource(uri, this.fileService, {
isReadonly: stat?.isReadonly ?? false,
readOnly: stat?.isReadonly ?? false,
shouldOverwrite: () => this.shouldOverwrite(uri),
shouldOpenAsText: (error) => this.shouldOpenAsText(uri, error),
});

2
arduino-ide-extension/src/browser/theia/monaco/monaco-editor-provider.ts
View File

@ -117,7 +117,7 @@ export function maybeUpdateReadOnlyState(
const model = editor.document;
const oldReadOnly = model.readOnly;
const resource = model['resource'];
const newReadOnly = Boolean(resource.isReadonly) || isReadOnly(resource.uri);
const newReadOnly = Boolean(resource.readOnly) || isReadOnly(resource.uri);
if (oldReadOnly !== newReadOnly) {
editor.getControl().updateOptions({ readOnly: newReadOnly });
if (newReadOnly) {

2
arduino-ide-extension/src/browser/theia/monaco/monaco-text-model-service.ts
View File

@ -20,7 +20,7 @@ export class MonacoTextModelService extends TheiaMonacoTextModelService {
.getContributions()
.find(({ scheme }) => resource.uri.scheme === scheme);
const readOnly =
Boolean(resource.isReadonly) ||
Boolean(resource.readOnly) ||
this.sketchesServiceClient.isReadOnly(resource.uri);
return factory
? factory.createModel(resource)

30
electron-app/package.json
View File

@ -5,24 +5,24 @@
"license": "AGPL-3.0-or-later",
"main": "./src-gen/backend/electron-main.js",
"dependencies": {
"@theia/core": "1.46.1",
"@theia/debug": "1.46.1",
"@theia/editor": "1.46.1",
"@theia/electron": "1.46.1",
"@theia/filesystem": "1.46.1",
"@theia/keymaps": "1.46.1",
"@theia/messages": "1.46.1",
"@theia/monaco": "1.46.1",
"@theia/navigator": "1.46.1",
"@theia/plugin-ext": "1.46.1",
"@theia/plugin-ext-vscode": "1.46.1",
"@theia/preferences": "1.46.1",
"@theia/terminal": "1.46.1",
"@theia/workspace": "1.46.1",
"@theia/core": "1.47.0",
"@theia/debug": "1.47.0",
"@theia/editor": "1.47.0",
"@theia/electron": "1.47.0",
"@theia/filesystem": "1.47.0",
"@theia/keymaps": "1.47.0",
"@theia/messages": "1.47.0",
"@theia/monaco": "1.47.0",
"@theia/navigator": "1.47.0",
"@theia/plugin-ext": "1.47.0",
"@theia/plugin-ext-vscode": "1.47.0",
"@theia/preferences": "1.47.0",
"@theia/terminal": "1.47.0",
"@theia/workspace": "1.47.0",
"arduino-ide-extension": "2.3.5"
},
"devDependencies": {
"@theia/cli": "1.46.1",
"@theia/cli": "1.47.0",
"7zip-min": "^1.4.4",
"chmodr": "^1.2.0",
"compression-webpack-plugin": "^9.0.0",

2
package.json
View File

@ -17,7 +17,7 @@
"**/ip": "^2.0.1"
},
"devDependencies": {
"@theia/cli": "1.46.1",
"@theia/cli": "1.47.0",
"@typescript-eslint/eslint-plugin": "^5.59.0",
"@typescript-eslint/parser": "^5.59.0",
"@xhmikosr/downloader": "^13.0.1",

763
yarn.lock
View File

File diff suppressed because it is too large Load Diff