cleanup: "Only" use two indentation styles for object literals

We currently use no less than three different ways of indenting
object literals:

    let obj1 = {
        foo: 42,
        bar: 23,
    };

    let obj2 = { foo: 42,
                 bar: 23 };

    let obj3 = { foo: 42,
                 bar: 23
               };

The first is the one we want to use everywhere eventually, while the
second is the most commonly used "legacy" style.

It is the third one that is most problematic, as it throws off eslint
fairly badly: It violates both the rule to have consistent line breaks
in braces as well as the indentation style of both regular and legacy
configurations.

Fortunately the third style was mostly used for tween parameters, so
is quite rare after the Tweener purge. Get rid of the remaining ones
to cut down on pre-existing eslint errors.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/716

js/ui/appDisplay.js

@@ -1158,11 +1158,10 @@ var AppSearchProvider = class AppSearchProvider {
             if (id.endsWith('.desktop')) {
                 let app = this._appSys.lookup_app(id);
 
-                metas.push({ 'id': app.get_id(),
+                metas.push({
-                             'name': app.get_name(),
+                    id: app.get_id(),
-                             'createIcon'(size) {
+                    name: app.get_name(),
-                                 return app.create_icon_texture(size);
+                    createIcon: size => app.create_icon_texture(size),
-                             }
                 });
             } else {
                 let name = this._systemActions.getName(id);

js/ui/appFavorites.js

@@ -147,11 +147,10 @@ class AppFavorites {
 
         let app = Shell.AppSystem.get_default().lookup_app(appId);
 
-        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()),
+        let msg = _("%s has been added to your favorites.").format(app.get_name());
-                                 { forFeedback: true,
+        Main.overview.setMessage(msg, {
-                                   undoCallback: () => {
+            forFeedback: true,
-                                       this._removeFavorite(appId);
+            undoCallback: () => this._removeFavorite(appId),
-                                   }
         });
     }
 
@@ -181,11 +180,10 @@ class AppFavorites {
         if (!this._removeFavorite(appId))
             return;
 
-        Main.overview.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
+        let msg = _("%s has been removed from your favorites.").format(app.get_name());
-                                 { forFeedback: true,
+        Main.overview.setMessage(msg, {
-                                   undoCallback: () => {
+            forFeedback: true,
-                                       this._addFavorite(appId, pos);
+            undoCallback: () => this._addFavorite(appId, pos),
-                                   }
         });
     }
 }

js/ui/background.js

@@ -441,7 +441,8 @@ var Background = class Background {
     }
 
     _loadAnimation(file) {
-        this._cache.getAnimation({ file: file,
+        this._cache.getAnimation({
+            file: file,
             settingsSchema: this._settings.schema_id,
             onLoaded: animation => {
                 this._animation = animation;
@@ -748,7 +749,8 @@ var BackgroundManager = class BackgroundManager {
 
     _createBackgroundActor() {
         let background = this._backgroundSource.getBackground(this._monitorIndex);
-        let backgroundActor = new Meta.BackgroundActor({ meta_display: global.display,
+        let backgroundActor = new Meta.BackgroundActor({
+            meta_display: global.display,
             monitor: this._monitorIndex,
             background: background.background,
             vignette: this._vignette,

js/ui/components/autorunManager.js

@@ -325,9 +325,9 @@ var AutorunNotification = class extends MessageTray.Notification {
                                  style_class: 'hotplug-notification-item-icon' });
         box.add(icon);
 
-        let label = new St.Bin({ y_align: St.Align.MIDDLE,
+        let label = new St.Bin({
-                                 child: new St.Label
+            y_align: St.Align.MIDDLE,
-                                 ({ text: _("Open with %s").format(app.get_name()) })
+            child: new St.Label({ text: _("Open with %s").format(app.get_name()) }),
         });
         box.add(label);
 

js/ui/components/networkAgent.js

@@ -112,16 +112,17 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
                                         expand: true });
         }
 
-        this._okButton = { label: _("Connect"),
+        this._okButton = {
+            label: _("Connect"),
             action: this._onOk.bind(this),
-                           default: true
+            default: true,
         };
 
-        this.setButtons([{ label: _("Cancel"),
+        this.setButtons([{
+            label: _("Cancel"),
             action: this.cancel.bind(this),
             key: Clutter.KEY_Escape,
-                         },
+        }, this._okButton]);
-                         this._okButton]);
 
         this._updateOkButton();
     }
@@ -551,10 +552,11 @@ var VPNRequestHandler = class {
                 let shouldAsk = keyfile.get_boolean(groups[i], 'ShouldAsk');
 
                 if (shouldAsk) {
-                    contentOverride.secrets.push({ label: keyfile.get_string(groups[i], 'Label'),
+                    contentOverride.secrets.push({
+                        label: keyfile.get_string(groups[i], 'Label'),
                         key: groups[i],
                         value: value,
-                                                   password: keyfile.get_boolean(groups[i], 'IsSecret')
+                        password: keyfile.get_boolean(groups[i], 'IsSecret'),
                     });
                 } else {
                     if (!value.length) // Ignore empty secrets
@@ -609,9 +611,10 @@ Signals.addSignalMethods(VPNRequestHandler.prototype);
 
 var NetworkAgent = class {
     constructor() {
-        this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent',
+        this._native = new Shell.NetworkAgent({
+            identifier: 'org.gnome.Shell.NetworkAgent',
             capabilities: NM.SecretAgentCapabilities.VPN_HINTS,
-                                                auto_register: false
+            auto_register: false,
         });
 
         this._dialogs = { };

js/ui/dateMenu.js

@@ -30,10 +30,12 @@ var TodayButton = class TodayButton {
         // Having the ability to go to the current date if the user is already
         // on the current date can be confusing. So don't make the button reactive
         // until the selected date changes.
-        this.actor = new St.Button({ style_class: 'datemenu-today-button',
+        this.actor = new St.Button({
-                                     x_expand: true, x_align: St.Align.START,
+            style_class: 'datemenu-today-button',
+            x_align: St.Align.START,
+            x_expand: true,
             can_focus: true,
-                                     reactive: false
+            reactive: false,
         });
         this.actor.connect('clicked', () => {
             this._calendar.setDate(new Date(), false);

js/ui/endSessionDialog.js

@@ -449,14 +449,16 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
             let signal = dialogContent.confirmButtons[i].signal;
             let label = dialogContent.confirmButtons[i].label;
-            buttons.push({ action: () => {
+            buttons.push({
+                action: () => {
                     this.close(true);
                     let signalId = this.connect('closed', () => {
                         this.disconnect(signalId);
                         this._confirm(signal);
                     });
                 },
-                           label: label });
+                label: label,
+            });
         }
 
         this.setButtons(buttons);

js/ui/extensionDownloader.js

@@ -186,13 +186,14 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
         this._info = info;
         this._invocation = invocation;
 
-        this.setButtons([{ label: _("Cancel"),
+        this.setButtons([{
+            label: _("Cancel"),
             action: this._onCancelButtonPressed.bind(this),
-                           key: Clutter.Escape
+            key: Clutter.Escape,
-                         },
+        }, {
-                         { label: _("Install"),
+            label: _("Install"),
             action: this._onInstallButtonPressed.bind(this),
-                           default: true
+            default: true,
         }]);
 
         let content = new Dialog.MessageDialogContent({

js/ui/layout.js

@@ -238,7 +238,8 @@ var LayoutManager = GObject.registerClass({
                                              reactive: true });
         this.addChrome(this.overviewGroup);
 
-        this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',
+        this.screenShieldGroup = new St.Widget({
+            name: 'screenShieldGroup',
             visible: false,
             clip_to_allocation: true,
             layout_manager: new Clutter.BinLayout(),

js/ui/lightbox.js

@@ -108,7 +108,8 @@ var RadialShaderEffect = GObject.registerClass({
  */
 var Lightbox = class Lightbox {
     constructor(container, params) {
-        params = Params.parse(params, { inhibitEvents: false,
+        params = Params.parse(params, {
+            inhibitEvents: false,
             width: null,
             height: null,
             fadeFactor: DEFAULT_FADE_FACTOR,

js/ui/messageTray.js

@@ -136,12 +136,13 @@ var FocusGrabber = class FocusGrabber {
 // A notification without a policy object will inherit the default one.
 var NotificationPolicy = class NotificationPolicy {
     constructor(params) {
-        params = Params.parse(params, { enable: true,
+        params = Params.parse(params, {
+            enable: true,
             enableSound: true,
             showBanners: true,
             forceExpanded: false,
             showInLockScreen: true,
-                                        detailsInLockScreen: false
+            detailsInLockScreen: false,
         });
         Object.getOwnPropertyNames(params).forEach(key => {
             let desc = Object.getOwnPropertyDescriptor(params, key);

js/ui/overview.js

@@ -42,8 +42,9 @@ var ShellInfo = class {
     }
 
     setMessage(text, options) {
-        options = Params.parse(options, { undoCallback: null,
+        options = Params.parse(options, {
-                                          forFeedback: false
+            undoCallback: null,
+            forFeedback: false,
         });
 
         let undoCallback = options.undoCallback;

js/ui/popupMenu.js

@@ -67,11 +67,12 @@ var PopupBaseMenuItem = GObject.registerClass({
     }
 }, class PopupBaseMenuItem extends St.BoxLayout {
     _init(params) {
-        params = Params.parse (params, { reactive: true,
+        params = Params.parse (params, {
+            reactive: true,
             activate: true,
             hover: true,
             style_class: null,
-                                         can_focus: true
+            can_focus: true,
         });
         super._init({ style_class: 'popup-menu-item',
                       reactive: params.reactive,
@@ -331,8 +332,9 @@ var PopupSwitchMenuItem = GObject.registerClass({
         this._statusBin = new St.Bin({ x_align: St.Align.END });
         this.add(this._statusBin, { expand: true, x_align: St.Align.END });
 
-        this._statusLabel = new St.Label({ text: '',
+        this._statusLabel = new St.Label({
-                                           style_class: 'popup-status-menu-item'
+            text: '',
+            style_class: 'popup-status-menu-item',
         });
         this._statusBin.child = this._switch;
     }

js/ui/runDialog.js

@@ -94,9 +94,11 @@ class RunDialog extends ModalDialog.ModalDialog {
 
         this._errorBox.hide();
 
-        this.setButtons([{ action: this.close.bind(this),
+        this.setButtons([{
+            action: this.close.bind(this),
             label: _("Close"),
-                           key: Clutter.Escape }]);
+            key: Clutter.Escape,
+        }]);
 
         this._pathCompleter = new Gio.FilenameCompleter();
 

js/ui/screenShield.js

@@ -429,7 +429,8 @@ var ScreenShield = class {
         this.actor = Main.layoutManager.screenShieldGroup;
 
         this._lockScreenState = MessageTray.State.HIDDEN;
-        this._lockScreenGroup = new St.Widget({ x_expand: true,
+        this._lockScreenGroup = new St.Widget({
+            x_expand: true,
             y_expand: true,
             reactive: true,
             can_focus: true,

js/ui/shellMountOperation.js

@@ -26,8 +26,9 @@ function _setButtonsForChoices(dialog, choices) {
 
     for (let idx = 0; idx < choices.length; idx++) {
         let button = idx;
-        buttons.unshift({ label: choices[idx],
+        buttons.unshift({
-                          action: () => dialog.emit('response', button)
+            label: choices[idx],
+            action: () => dialog.emit('response', button),
         });
     }
 
@@ -387,23 +388,25 @@ var ShellMountPasswordDialog = GObject.registerClass({
             this._rememberChoice = null;
         }
 
-        this._defaultButtons = [{ label: _("Cancel"),
+        this._defaultButtons = [{
+            label: _("Cancel"),
             action: this._onCancelButton.bind(this),
-                                  key: Clutter.Escape
+            key: Clutter.Escape,
-                                },
+        }, {
-                                { label: _("Unlock"),
+            label: _("Unlock"),
             action: this._onUnlockButton.bind(this),
-                                  default: true
+            default: true,
         }];
 
-        this._usesKeyfilesButtons = [{ label: _("Cancel"),
+        this._usesKeyfilesButtons = [{
+            label: _("Cancel"),
             action: this._onCancelButton.bind(this),
-                                       key: Clutter.Escape
+            key: Clutter.Escape,
-                                     },
+        }, {
-                                     { /* Translators: %s is the Disks application */
+            /* Translators: %s is the Disks application */
             label: _("Open %s").format(disksApp.get_name()),
             action: this._onOpenDisksButton.bind(this),
-                                       default: true
+            default: true,
         }];
 
         this.setButtons(this._defaultButtons);

js/ui/status/network.js

@@ -1073,12 +1073,13 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
 
             this._resortItems();
         } else {
-            network = { ssid: accessPoint.get_ssid(),
+            network = {
+                ssid: accessPoint.get_ssid(),
                 mode: accessPoint.mode,
                 security: this._getApSecurityType(accessPoint),
                 connections: [],
                 item: null,
-                        accessPoints: [accessPoint]
+                accessPoints: [accessPoint],
             };
             network.ssidText = ssidToLabel(network.ssid);
             this._checkConnections(network, accessPoint);

js/ui/viewSelector.js

@@ -309,11 +309,9 @@ var ViewSelector = class {
         if (params.a11yFocus)
             Main.ctrlAltTabManager.addGroup(params.a11yFocus, name, a11yIcon);
         else
-            Main.ctrlAltTabManager.addGroup(actor, name, a11yIcon,
+            Main.ctrlAltTabManager.addGroup(actor, name, a11yIcon, {
-                                            { proxy: this.actor,
+                proxy: this.actor,
-                                              focusCallback: () => {
+                focusCallback: () => this._a11yFocusPage(page),
-                                                  this._a11yFocusPage(page);
-                                              }
             });
         page.hide();
         this.actor.add_actor(page);