8000 #1016, #1274 Aligned the "Save your sketch" dialog behavior by kittaakos · Pull Request #1351 · arduino/arduino-ide · GitHub
[go: up one dir, main page]
Skip to content
8000

#1016, #1274 Aligned the "Save your sketch" dialog behavior #1351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Aug 26, 2022
Merged

#1016, #1274 Aligned the "Save your sketch" dialog behavior #1351

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
efdb5d5
init
Aug 23, 2022
ad6d99c
No save dialog prompt if closing untouched sketch.
Aug 24, 2022
ea69029
do not try to restore temp sketches.
Aug 24, 2022
efb5451
Update `currentSketch` when files change.
Aug 25, 2022
5e668ff
Unified the sketch close and the app quit logic.
Aug 25, 2022
0608fe4
Restored logic to close current closable widget
Aug 25, 2022
be78162
Updated translations.
Aug 25, 2022
20020dc
Moved uncloseable widget tracking to manager.
Aug 25, 2022
1bc202d
Removed `File` > `Close Editor`.
Aug 25, 2022
80cbb5c
removed space from discovery json log.
Aug 25, 2022
bd49329
Fixed dirty indicator of uncloseable widgets.
Aug 26, 2022
6acffdc
Fixed sketch content changes when renaming a file.
Aug 26, 2022
6a924da
Can close non-root sketch file editors.
Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restored logic to close current closable widget 
and then the window.

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
  • Loading branch information
Akos Kitta committed Aug 26, 2022
commit 0608fe46106581a89012c6ed967259933d3ce29a
24 changes: 23 additions & 1 deletion arduino-ide-extension/src/browser/contributions/close.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { injectable } from '@theia/core/shared/inversify';
import { toArray } from '@theia/core/shared/@phosphor/algorithm';
import * as remote from '@theia/core/electron-shared/@electron/remote';
import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
import type { MaybePromise } from '@theia/core/lib/common/types';
Expand Down Expand Up @@ -35,7 +36,28 @@ export class Close extends SketchContribution {

override registerCommands(registry: CommandRegistry): void {
registry.registerCommand(Close.Commands.CLOSE, {
execute: () => remote.getCurrentWindow().close(),
execute: () => {
// Close current editor if closeable.
const { currentEditor } = this.editorManager;
if (currentEditor && currentEditor.title.closable) {
currentEditor.close();
return;
}

if (this.shell) {
// Close current widget from the main area if possible.
const { currentWidget } = this.shell;
if (currentWidget) {
const currentWidgetInMain = toArray(
this.shell.mainPanel.widgets()
).find((widget) => widget === currentWidget);
if (currentWidgetInMain && currentWidgetInMain.title.closable) {
return currentWidgetInMain.close();
}
}
}
return remote.getCurrentWindow().close();
},
});
}

Expand Down
0