Dropped Git and the custom layout restorer.

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

arduino-ide-extension/package.json

@@ -28,7 +28,6 @@
     "@theia/editor-preview": "1.25.0",
     "@theia/electron": "1.25.0",
     "@theia/filesystem": "1.25.0",
-    "@theia/git": "1.25.0",
     "@theia/keymaps": "1.25.0",
     "@theia/markers": "1.25.0",
     "@theia/monaco": "1.25.0",
@@ -63,11 +62,10 @@
     "atob": "^2.1.2",
     "auth0-js": "^9.14.0",
     "btoa": "^1.2.1",
-    "css-element-queries": "^1.2.0",
     "dateformat": "^3.0.3",
     "deepmerge": "2.0.1",
     "electron-updater": "^4.6.5",
-    "fuzzy": "^0.1.3",
+    "fast-safe-stringify": "^2.1.1",
     "glob": "^7.1.6",
     "google-protobuf": "^3.11.4",
     "grpc": "^1.24.11",

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

@@ -48,9 +48,7 @@ import { MonacoStatusBarContribution as TheiaMonacoStatusBarContribution } from
 import { MonacoStatusBarContribution } from './theia/monaco/monaco-status-bar-contribution';
 import {
   ApplicationShell as TheiaApplicationShell,
-  ShellLayoutRestorer as TheiaShellLayoutRestorer,
   CommonFrontendContribution as TheiaCommonFrontendContribution,
-  KeybindingRegistry as TheiaKeybindingRegistry,
   TabBarRendererFactory,
   ContextMenuRenderer,
   createTreeContainer,
@@ -88,7 +86,6 @@ import { TabBarDecoratorService } from './theia/core/tab-bar-decorator';
 import { ProblemManager as TheiaProblemManager } from '@theia/markers/lib/browser';
 import { ProblemManager } from './theia/markers/problem-manager';
 import { BoardsAutoInstaller } from './boards/boards-auto-installer';
-import { ShellLayoutRestorer } from './theia/core/shell-layout-restorer';
 import { EditorMode } from './editor-mode';
 import { ListItemRenderer } from './widgets/component-list/list-item-renderer';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
@@ -138,7 +135,6 @@ import { PreferencesContribution } from './theia/preferences/preferences-contrib
 import { QuitApp } from './contributions/quit-app';
 import { SketchControl } from './contributions/sketch-control';
 import { Settings } from './contributions/settings';
-import { KeybindingRegistry } from './theia/core/keybindings';
 import { WorkspaceCommandContribution } from './theia/workspace/workspace-commands';
 import { WorkspaceDeleteHandler as TheiaWorkspaceDeleteHandler } from '@theia/workspace/lib/browser/workspace-delete-handler';
 import { WorkspaceDeleteHandler } from './theia/workspace/workspace-delete-handler';
@@ -276,8 +272,6 @@ import {
 } from './dialogs/ide-updater/ide-updater-dialog';
 import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-provider';
 
-const ElementQueries = require('css-element-queries/src/ElementQueries');
-
 MonacoThemingService.register({
   id: 'arduino-theme',
   label: 'Light (Arduino)',
@@ -286,8 +280,6 @@ MonacoThemingService.register({
 });
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
-  ElementQueries.listen();
-  ElementQueries.init();
 
   // Commands and toolbar items
   bind(ArduinoFrontendContribution).toSelf().inSingletonScope();
@@ -477,7 +469,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   rebind(TheiaPreferencesContribution)
     .to(PreferencesContribution)
     .inSingletonScope();
-  rebind(TheiaKeybindingRegistry).to(KeybindingRegistry).inSingletonScope();
   rebind(TheiaWorkspaceCommandContribution)
     .to(WorkspaceCommandContribution)
     .inSingletonScope();
@@ -542,10 +533,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(ProblemManager).toSelf().inSingletonScope();
   rebind(TheiaProblemManager).toService(ProblemManager);
 
-  // Customized layout restorer that can restore the state in async way: https://github.com/eclipse-theia/theia/issues/6579
-  bind(ShellLayoutRestorer).toSelf().inSingletonScope();
-  rebind(TheiaShellLayoutRestorer).toService(ShellLayoutRestorer);
-
   // No dropdown for the _Output_ view.
   bind(OutputToolbarContribution).toSelf().inSingletonScope();
   rebind(TheiaOutputToolbarContribution).toService(OutputToolbarContribution);

arduino-ide-extension/src/node/arduino-ide-backend-module.ts

@@ -80,8 +80,6 @@ import {
 } from '../common/protocol';
 import { BackendApplication } from './theia/core/backend-application';
 import { BoardDiscovery } from './board-discovery';
-import { DefaultGitInit } from './theia/git/git-init';
-import { GitInit } from '@theia/git/lib/node/init/git-init';
 import { AuthenticationServiceImpl } from './auth/authentication-service-impl';
 import {
   AuthenticationService,
@@ -316,9 +314,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     .inSingletonScope()
     .whenTargetNamed(SerialServiceName);
 
-  bind(DefaultGitInit).toSelf();
-  rebind(GitInit).toService(DefaultGitInit);
-
   // Remote sketchbook bindings
   bind(AuthenticationServiceImpl).toSelf().inSingletonScope();
   bind(AuthenticationService).toService(AuthenticationServiceImpl);

electron/build/template-package.json

@@ -3,9 +3,7 @@
   "author": "Arduino SA",
   "resolutions": {
     "**/fs-extra": "^4.0.3",
-    "electron-builder": "23.0.2",
-    "find-git-exec": "0.0.4",
-    "dugite-extra": "0.1.15"
+    "electron-builder": "23.0.2"
   },
   "dependencies": {
     "node-log-rotate": "^0.1.5"

package.json

@@ -35,8 +35,6 @@
     "jsdom": "^11.5.1"
   },
   "resolutions": {
-    "find-git-exec": "0.0.4",
-    "dugite-extra": "0.1.15",
     "@types/react": "16.14.25"
   },
   "scripts": {