cleanup: Switch some method calls to new indentation style

The legacy indent rule currently ignores arrow functions in parameters
to allow callbacks to not align with the other arguments:

    this._someFunctionWithFairlyLongishName(arg1, arg2, arg3,
        () => {
            this._someOtherFunctionWithLongName(arg1);
        });

But as ignoring entire nodes means we can end up with arbitrary
indentation, we should drop the exception. While this would make
the above "illegal" under the legacy config, it conforms with the
non-legacy style, so everything should be fine ...

... except that eslint starts to complain about some function args
that should be fine under the legacy config. Maybe it's thrown off
by the function-arg-in-arrow-function-in-function-arg structure, but
rather than figuring it out, let's just move those to the new style.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/725
This commit is contained in:
Florian Müllner 2019-09-13 00:41:47 +02:00 committed by Florian Müllner
parent af87bd8c87
commit 3a9eaa39ea
2 changed files with 8 additions and 8 deletions

View File

@ -116,8 +116,8 @@ var ScreenshotService = class {
try { try {
let [result, area, filenameUsed] = let [result, area, filenameUsed] =
screenshot.screenshot_area_finish(res); screenshot.screenshot_area_finish(res);
this._onScreenshotComplete(result, area, filenameUsed, this._onScreenshotComplete(
flash, invocation); result, area, filenameUsed, flash, invocation);
} catch (e) { } catch (e) {
invocation.return_gerror (e); invocation.return_gerror (e);
} }
@ -134,8 +134,8 @@ var ScreenshotService = class {
try { try {
let [result, area, filenameUsed] = let [result, area, filenameUsed] =
screenshot.screenshot_window_finish(res); screenshot.screenshot_window_finish(res);
this._onScreenshotComplete(result, area, filenameUsed, this._onScreenshotComplete(
flash, invocation); result, area, filenameUsed, flash, invocation);
} catch (e) { } catch (e) {
invocation.return_gerror (e); invocation.return_gerror (e);
} }
@ -152,8 +152,8 @@ var ScreenshotService = class {
try { try {
let [result, area, filenameUsed] = let [result, area, filenameUsed] =
screenshot.screenshot_finish(res); screenshot.screenshot_finish(res);
this._onScreenshotComplete(result, area, filenameUsed, this._onScreenshotComplete(
flash, invocation); result, area, filenameUsed, flash, invocation);
} catch (e) { } catch (e) {
invocation.return_gerror (e); invocation.return_gerror (e);
} }

View File

@ -179,8 +179,8 @@ class ATIndicator extends PanelMenu.Button {
settings.is_writable(KEY_TEXT_SCALING_FACTOR), settings.is_writable(KEY_TEXT_SCALING_FACTOR),
enabled => { enabled => {
if (enabled) if (enabled)
settings.set_double(KEY_TEXT_SCALING_FACTOR, settings.set_double(
DPI_FACTOR_LARGE); KEY_TEXT_SCALING_FACTOR, DPI_FACTOR_LARGE);
else else
settings.reset(KEY_TEXT_SCALING_FACTOR); settings.reset(KEY_TEXT_SCALING_FACTOR);
}); });