isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lookingGlass: Evaluate command asynchronously

Browse Source 
This allows using await in the command (or the header we
add to it), for example when handling Promises or importing
a module dynamically.

The latter will be crucial when porting to ESM.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2842>
This commit is contained in:
Florian Müllner 2023-07-12 21:40:05 +02:00 committed by Marge Bot
parent 85a8a6f46c
commit 7eafc248cd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/lookingGlass.js
View File

@ -28,7 +28,7 @@ const CHEVRON = '>>> ';
/* Imports...feel free to add here as needed */ /* Imports...feel free to add here as needed */
const commandHeader = ` const commandHeader = `
const {Clutter, Gio, GLib, GObject, Meta, Shell, St} = imports.gi; const {Clutter, Gio, GLib, GObject, Meta, Shell, St} = imports.gi;
const Main = imports.ui.main; const Main = await imports.ui.main;
/* Utility functions...we should probably be able to use these /* Utility functions...we should probably be able to use these
* in the shell core code too. */ * in the shell core code too. */
@ -39,6 +39,7 @@ const commandHeader = `
const it = Main.lookingGlass.getIt(); const it = Main.lookingGlass.getIt();
const r = Main.lookingGlass.getResult.bind(Main.lookingGlass); const r = Main.lookingGlass.getResult.bind(Main.lookingGlass);
`; `;
const AsyncFunction = async function () {}.constructor;
const HISTORY_KEY = 'looking-glass-history'; const HISTORY_KEY = 'looking-glass-history';
// Time between tabs for them to count as a double-tab event // Time between tabs for them to count as a double-tab event
@ -1412,7 +1413,7 @@ class LookingGlass extends St.BoxLayout {
// Ensure we don't get newlines in the command; the history file is // Ensure we don't get newlines in the command; the history file is
// newline-separated. // newline-separated.
text = text.replace('\n', ' '); text = text.replace('\n', ' ');
this._evaluate(text); this._evaluate(text).catch(logError);
return true; return true;
}); });
@ -1528,7 +1529,7 @@ class LookingGlass extends St.BoxLayout {
} }
} }
_evaluate(command) { async _evaluate(command) {
command = this._history.addItem(command); // trims command command = this._history.addItem(command); // trims command
if (!command) if (!command)
return; return;
@ -1540,7 +1541,7 @@ class LookingGlass extends St.BoxLayout {
let resultObj; let resultObj;
try { try {
resultObj = Function(fullCmd)(); resultObj = await AsyncFunction(fullCmd)();
} catch (e) { } catch (e) {
resultObj = `<exception ${e}>`; resultObj = `<exception ${e}>`;
} }