jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-11-08 18:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Theia to 1.25.0

Browse Source 
Co-authored-by: Mark Sujew <mark.sujew@typefox.io>
Co-authored-by: Akos Kitta <a.kitta@arduino.cc>

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
This commit is contained in:
Mark Sujew
2022-03-08 14:59:30 +01:00
committed by Akos Kitta
parent b8c718ce9e
commit 1ae60ec9bc
202 changed files with 4461 additions and 3602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,19 +1,22 @@
import { inject, injectable } from 'inversify';
import { inject, injectable } from '@theia/core/shared/inversify';
import URI from '@theia/core/lib/common/uri';
import {
Disposable,
DisposableCollection,
} from '@theia/core/lib/common/disposable';
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
import { EditorServiceOverrides, MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
import { MonacoEditorProvider as TheiaMonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
import { SketchesServiceClientImpl } from '../../../common/protocol/sketches-service-client-impl';
import * as monaco from '@theia/monaco-editor-core';
import type { ReferencesModel } from '@theia/monaco-editor-core/esm/vs/editor/contrib/gotoSymbol/browser/referencesModel';
type CancelablePromise = Promise<monaco.referenceSearch.ReferencesModel> & {
type CancelablePromise = Promise<ReferencesModel> & {
cancel: () => void;
};
interface EditorFactory {
(
override: monaco.editor.IEditorOverrideServices,
override: EditorServiceOverrides,
toDispose: DisposableCollection
): Promise<MonacoEditor>;
}
@@ -36,8 +39,7 @@ export class MonacoEditorProvider extends TheiaMonacoEditorProvider {
private installCustomReferencesController(editor: MonacoEditor): Disposable {
const control = editor.getControl();
const referencesController =
control._contributions['editor.contrib.referencesController'];
const referencesController: any = control.getContribution('editor.contrib.referencesController');
const originalToggleWidget = referencesController.toggleWidget;
const toDispose = new DisposableCollection();
const toDisposeBeforeToggleWidget = new DisposableCollection();

2
arduino-ide-extension/src/browser/theia/monaco/monaco-status-bar-contribution.ts
View File

@@ -1,4 +1,4 @@
import { injectable } from 'inversify';
import { injectable } from '@theia/core/shared/inversify';
import { MonacoStatusBarContribution as TheiaMonacoStatusBarContribution } from '@theia/monaco/lib/browser/monaco-status-bar-contribution';
@injectable()

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

@@ -1,4 +1,4 @@
import { inject, injectable } from 'inversify';
import { inject, injectable } from '@theia/core/shared/inversify';
import { Resource } from '@theia/core/lib/common/resource';
import { ILogger, Log, Loggable } from '@theia/core/lib/common/logger';
import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';