Tag release 40.alpha

Update NEWS.

.gitlab-ci.yml

@@ -1,33 +1,81 @@
-image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2
+include:
+ - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/8445ff7af2a68795afb98f486251f2ef8f90621c/templates/ci-fairy.yml"
+
+image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/33:2020-11-17.0
 
 stages:
+ - pre_review
  - review
  - build
 
+default:
+    # Cancel jobs if newer commits are pushed to the branch
+    interruptible: true
+    # Auto-retry jobs in case of infra failures
+    retry:
+        max: 1
+        when:
+            - 'runner_system_failure'
+            - 'stuck_or_timeout_failure'
+            - 'scheduler_failure'
+            - 'api_failure'
+
 variables:
- LINT_LOG: "eslint-report.txt"
+ LINT_LOG: "eslint-report.xml"
  JS_LOG: "js-report.txt"
 
-.only_default: &only_default
+workflow:
-    only:
+    rules:
-        - branches
+        - if: '$CI_MERGE_REQUEST_IID'
-        - tags
+        - if: '$CI_COMMIT_TAG'
-        - merge_requests
+        - if: '$CI_COMMIT_BRANCH'
+
+.pipeline_guard: &pipeline_guard
+    rules:
+        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+        - if: '$CI_COMMIT_TAG'
+        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+        - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/'
+        - when: 'manual'
 
 check_commit_log:
-    image: registry.gitlab.gnome.org/gnome/gjs:fedora.static-analysis
+    extends:
-    stage: review
+        - .fdo.ci-fairy
+    stage: pre_review
     script:
         - ./.gitlab-ci/check-commit-log.sh
-    only:
+    <<: *pipeline_guard
-        - merge_requests
+    artifacts:
+        expire_in: 1 week
+        paths:
+            - commit-message-junit-report.xml
+        reports:
+            junit: commit-message-junit-report.xml
+
+check-merge-request:
+    extends:
+        - .fdo.ci-fairy
+    stage: pre_review
+    script:
+        - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
+          then
+            ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request-report.xml ;
+          else
+            echo "Not a merge request" ;
+          fi
+    <<: *pipeline_guard
+    artifacts:
+        expire_in: 1 week
+        paths:
+            - check-merge-request-report.xml
+        reports:
+            junit: check-merge-request-report.xml
 
 js_check:
   stage: review
   script:
-    - find extensions -name '*.js' -exec js68 -c -s '{}' ';' 2>&1 | tee $JS_LOG
+    - find extensions -name '*.js' -exec js78 -c '{}' ';' 2>&1 | tee $JS_LOG
     - (! grep -q . $JS_LOG)
-  <<: *only_default
   artifacts:
     paths:
       - ${JS_LOG}
@@ -36,18 +84,18 @@ js_check:
 eslint:
   stage: review
   script:
-    - eslint -o $LINT_LOG extensions --no-color || { cat $LINT_LOG; false; }
+    - eslint -o $LINT_LOG -f junit extensions
-  <<: *only_default
   artifacts:
     paths:
       - ${LINT_LOG}
-    when: on_failure
+    reports:
+      junit: ${LINT_LOG}
 
 build-bundles:
   stage: build
+  needs: ["check_commit_log"]
   script:
     - ./export-zips.sh
-  <<: *only_default
   artifacts:
     name: 'Extension bundles'
     expose_as: 'Get Extension bundles here'

.gitlab-ci/check-commit-log.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
-  echo Cannot review non-merge request
+  echo This is not a merge request, skipping
-  exit 1
+  exit 0
 fi
 
 git fetch $CI_MERGE_REQUEST_PROJECT_URL.git $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
@@ -16,16 +16,59 @@ if [ -z "$commits" ]; then
   exit 1
 fi
 
-function commit_message_has_url() {
+JUNIT_REPORT_TESTS_FILE=$(mktemp)
+
+function append_failed_test_case() {
+  test_name="$1"
+  commit="$2"
+  test_message="$3"
+  commit_short=${commit:0:8}
+
+  echo "<testcase name=\"$test_name: $commit_short\"><failure message=\"$commit_short: $test_message\"/></testcase>" >> $JUNIT_REPORT_TESTS_FILE
+  echo &>2 "Commit check failed: $commit_short: $test_message"
+}
+
+function append_passed_test_case() {
+  test_name="$1"
+  commit="$2"
+  commit_short=${commit:0:8}
+  echo "<testcase name=\"$test_name: $commit_short\"></testcase>" >> $JUNIT_REPORT_TESTS_FILE
+}
+
+function generate_junit_report() {
+  junit_report_file="$1"
+  num_tests=$(cat "$JUNIT_REPORT_TESTS_FILE" | wc -l)
+  num_failures=$(grep '<failure />' "$JUNIT_REPORT_TESTS_FILE" | wc -l )
+
+  echo Generating JUnit report \"$(pwd)/$junit_report_file\" with $num_tests tests and $num_failures failures.
+
+  cat > $junit_report_file << __EOF__
+<?xml version="1.0" encoding="utf-8"?>
+<testsuites tests="$num_tests" errors="0" failures="$num_failures">
+<testsuite name="commit-review" tests="$num_tests" errors="0" failures="$num_failures" skipped="0">
+$(< $JUNIT_REPORT_TESTS_FILE)
+</testsuite>
+</testsuites>
+__EOF__
+}
+
+function commit_message_has_mr_url() {
   commit=$1
   commit_message=$(git show -s --format='format:%b' $commit)
-  echo "$commit_message" | grep -qe "\($CI_MERGE_REQUEST_PROJECT_URL/\(-/\)\?\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)"
+  echo "$commit_message" | grep -qe "^$CI_MERGE_REQUEST_PROJECT_URL\/\(-\/\)\?merge_requests\/$CI_MERGE_REQUEST_IID$"
   return $?
 }
 
 for commit in $commits; do
-  if ! commit_message_has_url $commit; then
+  if commit_message_has_mr_url $commit; then
-    echo "Missing merge request or issue URL on commit $(echo $commit | cut -c -8)"
+    append_failed_test_case superfluous_url $commit \
-    exit 1
+      "Commit message must not contain a link to its own merge request"
+  else
+    append_passed_test_case superfluous_url $commit
   fi
 done
+
+generate_junit_report commit-message-junit-report.xml
+
+! grep -q '<failure' commit-message-junit-report.xml
+exit $?

NEWS

@@ -1,15 +1,20 @@
-3.38.2
+40.alpha
-======
+========
 * window-list: Honor changes in skip-taskbar property [Sergio; !130]
+* window-list, workspace-indicator: Adjust to 3.38 changes [Florian; !133]
 * window-list, workspace-indicator: Improve previews in workspace thumbs
   [Florian; #260, !142]
-* window-list, workspace-indicator: Adjust to 3.38 changes [Florian; !133]
 * auto-move: Improve behavior on multi-monitor setups [Florian; !135]
 * windowNavigator: Adjust to 3.38 changes [Thun; #259]
-* Misc. bug fixes [Ray; !145]
+* Misc. bug fixes and cleanups [Florian, Jonas Å, Jordan, Ray; !131, !136,
+  !137, !140, !141, !144, !146, !145]
 
 Contributors:
-  Sergio Costas, Florian Müllner, Thun Pin, Ray Strode
+  Sergio Costas, Florian Müllner, Jordan Petridis, Thun Pin, Ray Strode,
+  Jonas Ådahl
+
+Translators:
+  Fabio Tomat [fur], Jordi Mas [ca]
 
 3.38.1
 ======

extensions/native-window-placement/extension.js

@@ -103,7 +103,6 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
             direction++;
             if (direction === 4)
                 direction = 0;
-
         }
 
         let loopCounter = 0;

extensions/places-menu/placeDisplay.js

@@ -486,7 +486,6 @@ var PlacesManager = class {
     }
 
     _reloadBookmarks() {
-
         this._bookmarks = [];
 
         let content = Shell.get_file_contents_utf8_sync(this._bookmarksFile.get_path());

extensions/window-list/extension.js

@@ -612,7 +612,6 @@ class AppButton extends BaseButton {
             this._contextMenuManager.addMenu(this._appContextMenu);
             this.label_actor = this._multiWindowTitle.label_actor;
         }
-
     }
 
     _onClicked(actor, button) {

gnome-shell-extensions.doap

@@ -34,4 +34,10 @@ and will be picked automatically at next login.
       <gnome:userid>fmuellner</gnome:userid>
     </foaf:Person>
   </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Marge Bot</foaf:name>
+      <gnome:userid>marge-bot</gnome:userid>
+    </foaf:Person>
+  </maintainer>
 </Project>

lint/eslintrc-gjs.yml

@@ -1,4 +1,5 @@
 ---
+# SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
 env:
   es6: true
 extends: 'eslint:recommended'
@@ -24,7 +25,9 @@ rules:
   #     allow: [^vfunc_, ^on_, _instance_init]
   comma-dangle:
     - error
-    - always-multiline
+    - arrays: always-multiline
+      objects: always-multiline
+      functions: never
   comma-spacing:
     - error
     - before: false
@@ -87,6 +90,7 @@ rules:
     - error
     - all
     - conditionalAssign: false
+      nestedBinaryExpressions: false
       returnAssign: false
   no-implicit-coercion:
     - error
@@ -105,15 +109,15 @@ rules:
   no-prototype-builtins: 'off'
   no-restricted-properties:
     - error
+    - object: Lang
+      property: copyProperties
+      message: Use Object.assign()
     - object: Lang
       property: bind
       message: Use arrow notation or Function.prototype.bind()
     - object: Lang
       property: Class
       message: Use ES6 classes
-    - object: imports
-      property: mainloop
-      message: Use GLib main loops and timeouts
   no-restricted-syntax:
     - error
     - selector: >-
@@ -129,6 +133,8 @@ rules:
         BlockStatement[body.length=1]
         CallExpression[arguments.length=0][callee.object.type="Super"][callee.property.name="_init"]
       message: _init() that only calls super._init() is unnecessary
+    - selector: BinaryExpression[operator="instanceof"][right.name="Array"]
+      message: Use Array.isArray()
   no-return-assign: error
   no-return-await: error
   no-self-compare: error
@@ -165,6 +171,9 @@ rules:
   object-shorthand: error
   operator-assignment: error
   operator-linebreak: error
+  padded-blocks:
+    - error
+    - never
   # These may be a bit controversial, we can try them out and enable them later
   # prefer-const: error
   # prefer-destructuring: error
@@ -217,12 +226,12 @@ globals:
   ARGV: readonly
   Debugger: readonly
   GIRepositoryGType: readonly
+  globalThis: readonly
   imports: readonly
   Intl: readonly
   log: readonly
   logError: readonly
   print: readonly
   printerr: readonly
-  window: readonly
 parserOptions:
-  ecmaVersion: 2017
+  ecmaVersion: 2020

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '3.38.2',
+  version: '40.alpha',
   meson_version: '>= 0.44.0',
   license: 'GPL2+'
 )
@@ -21,9 +21,9 @@ sessiondir = join_paths(datadir, 'gnome-session', 'sessions')
 xsessiondir = join_paths(datadir, 'xsessions')
 
 ver_arr = meson.project_version().split('.')
-if ver_arr[1].to_int().is_even()
+if ver_arr[1].version_compare('>=0')
-  shell_version = '@0@.@1@'.format(ver_arr[0], ver_arr[1])
+  shell_version = ver_arr[0]
-else
+else # pre-release (alpha, beta, rc)
   shell_version = '.'.join(ver_arr)
 endif
 

po/ca.po

@@ -83,7 +83,7 @@ msgid ""
 msgstr ""
 "Intenta utilitzar més espai de la pantalla per a posicionar les miniatures de "
 "les finestres adaptant-les a la ràtio d'aspecte de la pantalla, consolidant-"
-"les més per a reduir la capsa que les envolta. Aquest paràmetre de "
+"les més per a reduir la caixa que les envolta. Aquest paràmetre de "
 "configuració només s'aplica a l'estratègia de posicionament de finestres "
 "natural."
 

po/fur.po

@@ -8,23 +8,23 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2020-05-28 00:55+0000\n"
+"POT-Creation-Date: 2020-10-08 21:24+0000\n"
-"PO-Revision-Date: 2020-07-12 18:10+0200\n"
+"PO-Revision-Date: 2020-10-17 22:14+0200\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <fur@li.org>\n"
 "Language: fur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4.1\n"
 
-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+#: data/gnome-classic.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME Classic"
 
 #: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
-msgstr "Cheste session a si invie cun GNOME classic"
+msgstr "Cheste session ti fâs jentrâ in GNOME Classic"
 
 #: extensions/apps-menu/extension.js:113
 msgid "Favorites"
@@ -43,8 +43,8 @@ msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
-"Une liste di stringhis, ogniune a ten il ID di une aplicazion (non dal file ."
+"Une liste di stringhis, ogniune e ten il ID di une aplicazion (non dal file ."
-"desktop), seguît di doi ponts e il numar dal spazi di lavôr"
+"desktop), cun daûr doi ponts e il numar dal spazi di lavôr"
 
 #: extensions/auto-move-windows/prefs.js:35
 msgid "Workspace Rules"
@@ -63,15 +63,15 @@ msgstr "No si è rivâts a parâ fûr la unitât “%s”»:"
 
 #: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
-msgstr "Argagn rimovibil"
+msgstr "Dispositîfs estraibii"
 
 #: extensions/drive-menu/extension.js:155
 msgid "Open Files"
-msgstr "Vierç i file"
+msgstr "Vierç i files"
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
-msgstr "Dopre plui spazi par i balcons"
+msgstr "Dopre plui schermi pai barcons"
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
@@ -79,14 +79,14 @@ msgid ""
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
-"Cîr di doprâ plui puest par plaçâ lis miniaturis dai balcons, adatânsi al "
+"Cîr di doprâ plui schermi par plaçâ lis miniaturis dai barcons, adatant il "
-"rapuart di aspiet dal visôr e consolidanlis ancjemo di plui par ridusi il "
+"rapuart di aspiet dal visôr e consolidant ancjemo di plui lis miniaturis par "
-"spazi complessîf. Cheste impostazion a si apliche dome se l'algoritmo di "
+"ridusi il spazi complessîf. Cheste impostazion si apliche dome se "
-"posizionament al è \"natural\"."
+"l'algoritmi di plaçament al è naturâl."
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
-msgstr "Met il titul dal balcon insomp"
+msgstr "Met il titul dal barcon parsore"
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
@@ -94,9 +94,9 @@ msgid ""
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
-"Se VÊR, al place i titui dai balcons insomp as relativis miniaturis, lant in "
+"Se VÊR, al place i titui dai barcons denant des relativis miniaturis, "
-"volte al compuartament normâl de shell, che lis place in bas.Cambiant cheste "
+"sorpassant il compuartament predefinît de shell, che lis place in bas. "
-"impostazion a si scugne tornâ a inviâ la shell."
+"Cambiant cheste impostazion si scugne tornâ a inviâ la shell."
 
 #: extensions/places-menu/extension.js:89
 #: extensions/places-menu/extension.js:93
@@ -120,7 +120,7 @@ msgstr "Computer"
 
 #: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
-msgstr "Cjase"
+msgstr "Home"
 
 #: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
@@ -128,11 +128,11 @@ msgstr "Esplore rêt"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
-msgstr "Dimensions caturis di schermi ciclichis"
+msgstr "Dimensions videadis catuardis ciclichis"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
 msgid "Cycle Screenshot Sizes Backward"
-msgstr "Dimensions caturis di schermi ciclichis indaûr"
+msgstr "Dimensions videadis caturadis ciclichis indaûr"
 
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
@@ -184,19 +184,19 @@ msgstr "Siere ducj"
 
 #: extensions/window-list/extension.js:734
 msgid "Window List"
-msgstr "Liste balcons"
+msgstr "Liste barcons"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
-msgstr "Quant ingrumâ i balcons"
+msgstr "Cuant meti in grup i barcons"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
 msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
 msgstr ""
-"Al decît cuant intropâ i balcons de stesse aplicazion su le liste dai "
+"Al decît cuant meti dongje i barcons de stesse aplicazion su la liste dai "
-"balcons. I pussibii valôrs a son “never”, “auto” e “always”."
+"barcons. I valôrs pussibii a son “never”, “auto” e “always”."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 #: extensions/window-list/prefs.js:100
@@ -218,23 +218,23 @@ msgid ""
 "primary one."
 msgstr ""
 "Indiche se mostrâ la liste dai barcons su ducj i visôrs tacâts o nome sul "
-"principâl."
+"chel principâl."
 
 #: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
-msgstr "Ingrumament balcons"
+msgstr "Intropament di barcons"
 
 #: extensions/window-list/prefs.js:58
 msgid "Never group windows"
-msgstr "No ingrumâ i balcons"
+msgstr "No sta meti mai in grup i barcons"
 
 #: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
-msgstr "Ingrume i balcons quanche al'è pôc puest"
+msgstr "Met dongje i barcons cuant che il spazi al è limitât"
 
 #: extensions/window-list/prefs.js:60
 msgid "Always group windows"
-msgstr "Ingrume simpri i balcons"
+msgstr "Met simpri in grup i barcons"
 
 #: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"