[polari] style: Always use braces when nesting blocks



commit aebfebf589688f9d04b4bbe258fe685277c2114d
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Apr 4 02:54:16 2019 +0200

    style: Always use braces when nesting blocks
    
    We usually avoid braces if the outer block contains a single statement,
    except when that would result in ambiguity or worse legibility.
    Unfortunately that's a matter of taste that cannot be expressed in an
    automated rule. As removing the braces in the cases where we have them
    would be worse than adding them where they are avoided, settle
    on the latter.
    
    https://gitlab.gnome.org/GNOME/polari/merge_requests/108

 src/application.js     | 6 ++++--
 src/chatView.js        | 6 ++++--
 src/networksManager.js | 3 ++-
 src/roomList.js        | 3 ++-
 src/roomManager.js     | 9 ++++++---
 src/userTracker.js     | 6 ++++--
 6 files changed, 22 insertions(+), 11 deletions(-)
---
diff --git a/src/application.js b/src/application.js
index 04a2499..2945f18 100644
--- a/src/application.js
+++ b/src/application.js
@@ -697,14 +697,16 @@ var Application = GObject.registerClass({
         if (status == Tp.ConnectionStatus.DISCONNECTED) {
             let reason = account.connection_status_reason;
 
-            if (reason == Tp.ConnectionStatusReason.NAME_IN_USE)
+            if (reason == Tp.ConnectionStatusReason.NAME_IN_USE) {
                 if (this._retryNickRequest(account))
                     return;
+            }
 
             if (reason == Tp.ConnectionStatusReason.NETWORK_ERROR ||
-                reason == Tp.ConnectionStatusReason.NONE_SPECIFIED)
+                reason == Tp.ConnectionStatusReason.NONE_SPECIFIED) {
                 if (this._retryServerRequest(account))
                     return;
+            }
 
             if (reason != Tp.ConnectionStatusReason.REQUESTED) {
                 let strReason = Object.keys(Tp.ConnectionStatusReason)[reason];
diff --git a/src/chatView.js b/src/chatView.js
index 6fc807c..858a39d 100644
--- a/src/chatView.js
+++ b/src/chatView.js
@@ -597,10 +597,11 @@ var ChatView = GObject.registerClass({
         let nick = this._pendingLogs[0].nick;
         let type = this._pendingLogs[0].messageType;
         let maxNum = this._pendingLogs.length - this._initialPending.length;
-        for (let i = 0; i < maxNum; i++)
+        for (let i = 0; i < maxNum; i++) {
             if (this._pendingLogs[i].nick != nick ||
                 this._pendingLogs[i].messageType != type)
                 return this._pendingLogs.splice(i);
+        }
         return [];
     }
 
@@ -610,12 +611,13 @@ var ChatView = GObject.registerClass({
 
         let numLogs = logs.length;
         let pos;
-        for (pos = numLogs - pending.length; pos < numLogs; pos++)
+        for (pos = numLogs - pending.length; pos < numLogs; pos++) {
             if (logs[pos].nick == firstPending.nick &&
                 logs[pos].text == firstPending.text &&
                 logs[pos].timestamp == firstPending.timestamp &&
                 logs[pos].messageType == firstPending.messageType)
                 break;
+        }
         // Remove entries that are also in pending (if any), then
         // add the entries from pending
         logs.splice.apply(logs, [pos, numLogs, ...pending]);
diff --git a/src/networksManager.js b/src/networksManager.js
index efa6340..113c325 100644
--- a/src/networksManager.js
+++ b/src/networksManager.js
@@ -104,9 +104,10 @@ var NetworksManager = class {
     }
 
     findByServer(server) {
-        for (let n of this._networks)
+        for (let n of this._networks) {
             if (n.servers.some(s => s.address == server))
                 return n.id;
+        }
         return null;
     }
 };
diff --git a/src/roomList.js b/src/roomList.js
index f742024..3a5d145 100644
--- a/src/roomList.js
+++ b/src/roomList.js
@@ -523,9 +523,10 @@ class RoomList extends Gtk.ListBox {
 
     _roomToRowIndex(index) {
         let nChildren = this.get_children().length;
-        for (let i = 0, roomIndex = 0; i < nChildren; i++)
+        for (let i = 0, roomIndex = 0; i < nChildren; i++) {
             if (this.get_row_at_index(i).room && roomIndex++ == index)
                 return i;
+        }
         return -1;
     }
 
diff --git a/src/roomManager.js b/src/roomManager.js
index f984679..1e35409 100644
--- a/src/roomManager.js
+++ b/src/roomManager.js
@@ -55,9 +55,10 @@ var RoomManager = class {
     }
 
     lookupRoomByName(name, account) {
-        for (let room of this._rooms.values())
+        for (let room of this._rooms.values()) {
             if (room.channel_name == name && room.account == account)
                 return room;
+        }
         return null;
     }
 
@@ -113,17 +114,19 @@ var RoomManager = class {
     }
 
     _removeRooms(accountPath) {
-        for (let room of this._rooms.values())
+        for (let room of this._rooms.values()) {
             if (accountPath == null || room.account.object_path == accountPath)
                 this._removeRoom(room);
+        }
     }
 
     _findChannelIndex(channels, accountPath, channelName) {
         let matchName = channelName.toLowerCase();
-        for (let i = 0; i < channels.length; i++)
+        for (let i = 0; i < channels.length; i++) {
             if (channels[i].account.deep_unpack() == accountPath &&
                 channels[i].channel.deep_unpack().toLowerCase() == matchName)
                 return i;
+        }
         return -1;
     }
 
diff --git a/src/userTracker.js b/src/userTracker.js
index 95067fc..3c6e9ed 100644
--- a/src/userTracker.js
+++ b/src/userTracker.js
@@ -183,9 +183,10 @@ const UserTracker = GObject.registerClass({
     _runHandlers(room, member, status) {
         let baseNick = Polari.util_get_basenick(member.alias);
         let roomHandlers = this._getRoomHandlers(room);
-        for (let [, info] of roomHandlers)
+        for (let [, info] of roomHandlers) {
             if (!info.nickName || info.nickName == baseNick)
                 info.handler(baseNick, status);
+        }
     }
 
     _pushMember(map, baseNick, member) {
@@ -286,9 +287,10 @@ const UserTracker = GObject.registerClass({
         if (!contacts.length)
             return null;
 
-        for (let i = 0; i < contacts.length; i++)
+        for (let i = 0; i < contacts.length; i++) {
             if (contacts[i].alias == nickName)
                 return contacts[i];
+        }
 
         return contacts[0];
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]