js: Split gi imports to be on new lines to prepare for ES modules

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2794>

tests/interactive/background-repeat.js

@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

tests/interactive/background-size.js

@@ -2,7 +2,10 @@
 
 const UI = imports.testcommon.ui;
 
-const { Cogl, Clutter, Meta, St } = imports.gi;
+const Cogl = imports.gi.Cogl;
+const Clutter = imports.gi.Clutter;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 
 function test() {

tests/interactive/border-radius.js

@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

tests/interactive/border-width.js

@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

tests/interactive/borders.js

@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

tests/interactive/box-layout.js

@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage();

tests/interactive/box-shadow-animated.js

@@ -2,7 +2,9 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, GLib, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const St = imports.gi.St;
 
 const DELAY = 2000;
 

tests/interactive/box-shadows.js

@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

tests/interactive/calendar.js

@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 400, height: 400 });

tests/interactive/css-fonts.js

@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage();

tests/interactive/entry.js

@@ -2,7 +2,9 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, GLib, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 400, height: 400 });

tests/interactive/icons.js

@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage();

tests/interactive/inline-style.js

@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage();

tests/interactive/scroll-view-sizing.js

@@ -2,7 +2,10 @@
 
 const UI = imports.testcommon.ui;
 
-const {Clutter, GObject, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 // This is an interactive test of the sizing behavior of StScrollView. It
 // may be interesting in the future to split out the two classes at the

tests/interactive/scrolling.js

@@ -2,7 +2,9 @@
 
 const UI = imports.testcommon.ui;
 
-const {Clutter, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+
 
 function test() {
     let stage = new Clutter.Stage();

tests/interactive/test-title.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env gjs
 
 imports.gi.versions.Gtk = '4.0';
-const {Gtk} = imports.gi;
+const Gtk = imports.gi.Gtk;
 
 function nextTitle() {
     let length = Math.random() * 20;

tests/interactive/transitions.js

@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage();

tests/testcommon/ui.js

@@ -4,7 +4,10 @@ const Config = imports.misc.config;
 
 imports.gi.versions = {Clutter: Config.LIBMUTTER_API_VERSION};
 
-const { Clutter, Gio, GLib, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const St = imports.gi.St;
 
 const Environment = imports.ui.environment;
 

tests/unit/signalTracker.js

@@ -2,7 +2,7 @@
 
 // Test cases for version comparison
 
-const { GObject } = imports.gi;
+const GObject = imports.gi.GObject;
 
 const JsUnit = imports.jsUnit;
 const Signals = imports.misc.signals;