GNOME.org
 

[polari/wip/fmuellner/cleanups: 7/11] cleanup: Regroup imports

commit e8d14c622f3d1ce97fe1bf08fcd75f07ff0bfcf6
Author: Florian Müllner <fmuellner gnome org>
Date:   Fri Nov 10 02:02:02 2017 +0100

    cleanup: Regroup imports
    
    Reorder imports so that
     - external modules from gjs or gobject-introspection
       form one block, and our own modules another
     - imports in each block are listed alphabetically

 src/accountsMonitor.js   |  3 +--
 src/appNotifications.js  |  3 +--
 src/application.js       |  6 +++---
 src/chatView.js          | 10 +++++-----
 src/entryArea.js         |  8 ++++----
 src/initialSetup.js      |  2 +-
 src/ircParser.js         |  2 +-
 src/joinDialog.js        |  4 ++--
 src/main.js              |  3 ++-
 src/mainWindow.js        |  4 ++--
 src/networksManager.js   |  1 -
 src/pasteManager.js      |  4 ++--
 src/roomList.js          |  2 +-
 src/roomManager.js       |  4 ++--
 src/roomStack.js         |  2 +-
 src/serverRoomManager.js |  8 ++++----
 src/tabCompletion.js     |  2 +-
 src/telepathyClient.js   |  2 +-
 src/userList.js          |  7 +++----
 src/userTracker.js       | 10 +++++-----
 src/utils.js             |  2 +-
 21 files changed, 43 insertions(+), 46 deletions(-)
---
diff --git a/src/accountsMonitor.js b/src/accountsMonitor.js
index a2fb92d..31cd351 100644
--- a/src/accountsMonitor.js
+++ b/src/accountsMonitor.js
@@ -1,8 +1,7 @@
 const Gio = imports.gi.Gio;
-const Tp = imports.gi.TelepathyGLib;
-
 const Lang = imports.lang;
 const Signals = imports.signals;
+const Tp = imports.gi.TelepathyGLib;
 
 let _singleton = null;
 
diff --git a/src/appNotifications.js b/src/appNotifications.js
index 334045c..264df72 100644
--- a/src/appNotifications.js
+++ b/src/appNotifications.js
@@ -1,9 +1,8 @@
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
-const Pango = imports.gi.Pango;
-
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
+const Pango = imports.gi.Pango;
 
 const TIMEOUT = 7;
 const COMMAND_OUTPUT_REVEAL_TIME = 3;
diff --git a/src/application.js b/src/application.js
index f509061..452b31e 100644
--- a/src/application.js
+++ b/src/application.js
@@ -3,22 +3,22 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
 const Polari = imports.gi.Polari;
 const Tp = imports.gi.TelepathyGLib;
 
 const AccountsMonitor = imports.accountsMonitor;
 const AppNotifications = imports.appNotifications;
 const Connections = imports.connections;
-const Lang = imports.lang;
+const InitialSetup = imports.initialSetup;
 const MainWindow = imports.mainWindow;
+const NetworksManager = imports.networksManager;
 const PasteManager = imports.pasteManager;
 const RoomManager = imports.roomManager;
 const ServerRoomManager = imports.serverRoomManager;
 const TelepathyClient = imports.telepathyClient;
 const UserTracker = imports.userTracker;
 const Utils = imports.utils;
-const NetworksManager = imports.networksManager;
-const InitialSetup = imports.initialSetup;
 
 const MAX_RETRIES = 3;
 
diff --git a/src/chatView.js b/src/chatView.js
index f025518..1cc521a 100644
--- a/src/chatView.js
+++ b/src/chatView.js
@@ -1,20 +1,20 @@
 const Gdk = imports.gi.Gdk;
-const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const Pango = imports.gi.Pango;
 const PangoCairo = imports.gi.PangoCairo;
 const Polari = imports.gi.Polari;
 const Tp = imports.gi.TelepathyGLib;
 const Tpl = imports.gi.TelepathyLogger;
 
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const PasteManager = imports.pasteManager;
-const Utils = imports.utils;
-const UserTracker = imports.userTracker;
 const UserList = imports.userList;
+const UserTracker = imports.userTracker;
+const Utils = imports.utils;
 
 var MAX_NICK_CHARS = 8;
 const IGNORE_STATUS_TIME = 5;
diff --git a/src/entryArea.js b/src/entryArea.js
index 80b2900..c8535e7 100644
--- a/src/entryArea.js
+++ b/src/entryArea.js
@@ -5,15 +5,15 @@ const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gspell = imports.gi.Gspell;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Tp = imports.gi.TelepathyGLib;
 
 const ChatView = imports.chatView;
 const EmojiPicker = imports.emojiPicker;
 const IrcParser = imports.ircParser;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const TabCompletion = imports.tabCompletion;
-const Tp = imports.gi.TelepathyGLib;
 const PasteManager = imports.pasteManager;
+const TabCompletion = imports.tabCompletion;
 
 const MAX_NICK_UPDATE_TIME = 5; /* s */
 const MAX_LINES = 5;
diff --git a/src/initialSetup.js b/src/initialSetup.js
index 911c71d..334fa8f 100644
--- a/src/initialSetup.js
+++ b/src/initialSetup.js
@@ -2,8 +2,8 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
-
 const Lang = imports.lang;
+
 const Utils = imports.utils;
 
 const SetupPage = {
diff --git a/src/ircParser.js b/src/ircParser.js
index f6c253d..d2cb524 100644
--- a/src/ircParser.js
+++ b/src/ircParser.js
@@ -1,10 +1,10 @@
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const Signals = imports.signals;
 const Tp = imports.gi.TelepathyGLib;
 
 const AppNotifications = imports.appNotifications;
 const RoomManager = imports.roomManager;
-const Signals = imports.signals;
 const Utils = imports.utils;
 
 const N_ = s => s;
diff --git a/src/joinDialog.js b/src/joinDialog.js
index 00f7a07..35aa0cd 100644
--- a/src/joinDialog.js
+++ b/src/joinDialog.js
@@ -1,11 +1,11 @@
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
 const GObject = imports.gi.GObject;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
 
 const AccountsMonitor = imports.accountsMonitor;
-const Lang = imports.lang;
 const Utils = imports.utils;
 
 const DialogPage = {
diff --git a/src/main.js b/src/main.js
index d23beda..f80b3f1 100755
--- a/src/main.js
+++ b/src/main.js
@@ -15,9 +15,10 @@ pkg.requireSymbol('GLib', '2.0', 'log_variant');
 pkg.requireSymbol('Gspell', '1', 'Entry');
 pkg.requireSymbol('Gtk', '3.0', 'ScrolledWindow.propagate_natural_width');
 
-const Application = imports.application;
 const GLib = imports.gi.GLib;
 
+const Application = imports.application;
+
 var LOG_DOMAIN = 'Polari';
 
 function _makeLogFunction(level) {
diff --git a/src/mainWindow.js b/src/mainWindow.js
index 8014208..54e49e4 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -3,13 +3,13 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const Polari = imports.gi.Polari;
 const Tp = imports.gi.TelepathyGLib;
 
 const AccountsMonitor = imports.accountsMonitor;
 const JoinDialog = imports.joinDialog;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const RoomList = imports.roomList; // used in template
 const RoomManager = imports.roomManager;
 const RoomStack = imports.roomStack; // used in template
diff --git a/src/networksManager.js b/src/networksManager.js
index efd18b4..209d59f 100644
--- a/src/networksManager.js
+++ b/src/networksManager.js
@@ -1,6 +1,5 @@
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-
 const Signals = imports.signals;
 
 let _singleton = null;
diff --git a/src/pasteManager.js b/src/pasteManager.js
index 89084a5..d069603 100644
--- a/src/pasteManager.js
+++ b/src/pasteManager.js
@@ -1,12 +1,12 @@
 const Gdk = imports.gi.Gdk;
 const GdkPixbuf = imports.gi.GdkPixbuf;
-const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
 const Polari = imports.gi.Polari;
 
-const Lang = imports.lang;
 const Utils = imports.utils;
 
 const DndTargetType = {
diff --git a/src/roomList.js b/src/roomList.js
index e151b38..677457c 100644
--- a/src/roomList.js
+++ b/src/roomList.js
@@ -3,10 +3,10 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
 const Tp = imports.gi.TelepathyGLib;
 
 const AccountsMonitor = imports.accountsMonitor;
-const Lang = imports.lang;
 const RoomManager = imports.roomManager;
 
 function _onPopoverVisibleChanged(popover) {
diff --git a/src/roomManager.js b/src/roomManager.js
index 4af710e..904cc81 100644
--- a/src/roomManager.js
+++ b/src/roomManager.js
@@ -1,11 +1,11 @@
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const Lang = imports.lang;
 const Polari = imports.gi.Polari;
+const Signals = imports.signals;
 const Tp = imports.gi.TelepathyGLib;
 
 const AccountsMonitor = imports.accountsMonitor;
-const Lang = imports.lang;
-const Signals = imports.signals;
 
 let _singleton = null;
 
diff --git a/src/roomStack.js b/src/roomStack.js
index 9ad9b41..a9fb078 100644
--- a/src/roomStack.js
+++ b/src/roomStack.js
@@ -2,13 +2,13 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
 const Pango = imports.gi.Pango;
 const Tp = imports.gi.TelepathyGLib;
 
 const AccountsMonitor = imports.accountsMonitor;
 const ChatView = imports.chatView;
 const EntryArea = imports.entryArea;
-const Lang = imports.lang;
 const RoomManager = imports.roomManager;
 
 var RoomStack = GObject.registerClass({
diff --git a/src/serverRoomManager.js b/src/serverRoomManager.js
index 7faf0a5..60cb538 100644
--- a/src/serverRoomManager.js
+++ b/src/serverRoomManager.js
@@ -1,14 +1,14 @@
+const Gdk = imports.gi.Gdk;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
-const Gdk = imports.gi.Gdk;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Signals = imports.signals;
 const Tp = imports.gi.TelepathyGLib;
 
 const AccountsMonitor = imports.accountsMonitor;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const RoomManager = imports.roomManager;
-const Signals = imports.signals;
 const Utils = imports.utils;
 
 const MS_PER_IDLE = 10; // max time spend in idle
diff --git a/src/tabCompletion.js b/src/tabCompletion.js
index eb7fc6c..45d519f 100644
--- a/src/tabCompletion.js
+++ b/src/tabCompletion.js
@@ -1,9 +1,9 @@
 const Gdk = imports.gi.Gdk;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
 const Pango = imports.gi.Pango;
 
 const IrcParser = imports.ircParser;
-const Lang = imports.lang;
 
 var TabCompletion = class {
     constructor(entry) {
diff --git a/src/telepathyClient.js b/src/telepathyClient.js
index fe150c6..acc9d36 100644
--- a/src/telepathyClient.js
+++ b/src/telepathyClient.js
@@ -1,11 +1,11 @@
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
+const Lang = imports.lang;
 const Polari = imports.gi.Polari;
 const Tp = imports.gi.TelepathyGLib;
 
 const AccountsMonitor = imports.accountsMonitor;
-const Lang = imports.lang;
 const RoomManager = imports.roomManager;
 const Utils = imports.utils;
 
diff --git a/src/userList.js b/src/userList.js
index f32b1ab..cca11e0 100644
--- a/src/userList.js
+++ b/src/userList.js
@@ -2,12 +2,11 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
-const Pango = imports.gi.Pango;
-const Tp = imports.gi.TelepathyGLib;
-const Polari = imports.gi.Polari;
-
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
+const Pango = imports.gi.Pango;
+const Polari = imports.gi.Polari;
+const Tp = imports.gi.TelepathyGLib;
 
 const READWRITE = GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE;
 
diff --git a/src/userTracker.js b/src/userTracker.js
index 3c0d833..ac94976 100644
--- a/src/userTracker.js
+++ b/src/userTracker.js
@@ -1,13 +1,13 @@
-const Polari = imports.gi.Polari;
-const Lang = imports.lang;
-const Tp = imports.gi.TelepathyGLib;
-const GObject = imports.gi.GObject;
-const Utils = imports.utils;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Lang = imports.lang;
+const Polari = imports.gi.Polari;
+const Tp = imports.gi.TelepathyGLib;
 
 const AccountsMonitor = imports.accountsMonitor;
 const RoomManager = imports.roomManager;
+const Utils = imports.utils;
 
 let _singleton = null;
 
diff --git a/src/utils.js b/src/utils.js
index fe61d05..6c381a0 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -24,8 +24,8 @@ const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
-const Soup = imports.gi.Soup;
 const Secret = imports.gi.Secret;
+const Soup = imports.gi.Soup;
 const Tp = imports.gi.TelepathyGLib;
 
 const AppNotifications = imports.appNotifications;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]