[gjs: 21/43] CI: Add no-lonely-if to eslint rules

[Philip Chimento <pchimento src gnome org>]

commit 66b01cb783da4213691c1df2144209ac218799a8
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Aug 3 22:44:13 2019 -0700

    CI: Add no-lonely-if to eslint rules
    
    This avoids extra indentation and keeps if-statement conditions easier
    to read.

 .eslintrc.yml                  |  1 +
 modules/_bootstrap/debugger.js |  5 ++---
 modules/tweener/tweener.js     | 26 ++++++++++++--------------
 3 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/.eslintrc.yml b/.eslintrc.yml
index deed713d..d45a9765 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -79,6 +79,7 @@ rules:
     - error
     - allow:
       - '!!'
+  no-lonely-if: error
   no-prototype-builtins: 'off'
   no-restricted-properties:
     - error
diff --git a/modules/_bootstrap/debugger.js b/modules/_bootstrap/debugger.js
index 38ad4c78..7f197dcf 100644
--- a/modules/_bootstrap/debugger.js
+++ b/modules/_bootstrap/debugger.js
@@ -491,10 +491,9 @@ function doStepOrNext(kind) {
             // running until a given line is reached
             if (this.line === kind.stopLine)
                 stop = true;
-        } else {
+        } else if (this.line !== startLine || this !== startFrame) {
             // regular step; stop whenever the line number changes
-            if (this.line !== startLine || this !== startFrame)
-                stop = true;
+            stop = true;
         }
 
         if (stop) {
diff --git a/modules/tweener/tweener.js b/modules/tweener/tweener.js
index 3adc6f78..95c29a7a 100644
--- a/modules/tweener/tweener.js
+++ b/modules/tweener/tweener.js
@@ -293,21 +293,19 @@ function _updateTweenByIndex(i) {
                 if (isOver) {
                     // Tweening time has finished, just set it to the final value
                     nv = property.valueComplete;
+                } else if (property.hasModifier) {
+                    // Modified
+                    t = currentTime - tweening.timeStart;
+                    d = tweening.timeComplete - tweening.timeStart;
+                    nv = tweening.transition(t, 0, 1, d, tweening.transitionParams);
+                    nv = property.modifierFunction(property.valueStart, property.valueComplete, nv, 
property.modifierParameters);
                 } else {
-                    if (property.hasModifier) {
-                        // Modified
-                        t = currentTime - tweening.timeStart;
-                        d = tweening.timeComplete - tweening.timeStart;
-                        nv = tweening.transition(t, 0, 1, d, tweening.transitionParams);
-                        nv = property.modifierFunction(property.valueStart, property.valueComplete, nv, 
property.modifierParameters);
-                    } else {
-                        // Normal update
-                        t = currentTime - tweening.timeStart;
-                        b = property.valueStart;
-                        c = property.valueComplete - property.valueStart;
-                        d = tweening.timeComplete - tweening.timeStart;
-                        nv = tweening.transition(t, b, c, d, tweening.transitionParams);
-                    }
+                    // Normal update
+                    t = currentTime - tweening.timeStart;
+                    b = property.valueStart;
+                    c = property.valueComplete - property.valueStart;
+                    d = tweening.timeComplete - tweening.timeStart;
+                    nv = tweening.transition(t, b, c, d, tweening.transitionParams);
                 }
 
                 if (tweening.rounded)