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

[ATL-1599] [ATL-1416] Upgrade Theia to 1.18.0 (#489)

Browse Source 
Co-authored-by: Alberto Iannaccone <a.iannaccone@arduino.cc>
This commit is contained in:
Francesco Stasi
2021-10-06 10:05:30 +02:00
committed by Francesco Stasi
parent 54a67fc67c
commit fc0f67493b
47 changed files with 1372 additions and 21707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arduino-ide-extension/src/electron-main/theia/electron-main-application.ts
View File

@@ -39,9 +39,10 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
* @param options
*/
async createWindow(
asyncOptions: MaybePromise<TheiaBrowserWindowOptions> = this.getDefaultBrowserWindowOptions()
asyncOptions: MaybePromise<TheiaBrowserWindowOptions> = this.getDefaultTheiaWindowOptions()
): Promise<BrowserWindow> {
const options = await asyncOptions;
let options = await asyncOptions;
options = this.avoidOverlap(options);
let electronWindow: BrowserWindow | undefined;
if (this._windows.length) {
electronWindow = new BrowserWindow(options);
@@ -154,7 +155,9 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
try {
// If we forked the process for the clusters, we need to manually terminate it.
// See: https://github.com/eclipse-theia/theia/issues/835
process.kill(backendProcess.pid);
if (backendProcess.pid) {
process.kill(backendProcess.pid);
}
} catch (e) {
if (e.code === 'ESRCH') {
console.log(