[meld: 8/10] build: Indent meson build files with recommended settings

[Kai Willadsen <kaiw src gnome org>]

commit bfc1b074d2e66268eb9c47b7eb12309800c6554c
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Mon Feb 15 12:02:09 2021 +0100

    build: Indent meson build files with recommended settings
    
    There is not unified indentation convention between meson build
    files. They have been now unified by using common convention
    based on the recommended settings.
    
    Missing trailing commas have also been added.

 data/meson.build |  31 +++++------
 help/meson.build |  38 +++++++-------
 meld/meson.build | 154 +++++++++++++++++++++++++++----------------------------
 meson.build      |   9 ++--
 4 files changed, 113 insertions(+), 119 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index c18d03e1..70324118 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,8 +1,7 @@
-
 # Install man page
 install_data(
   'meld.1',
-  install_dir: mandir / 'man1'
+  install_dir: mandir / 'man1',
 )
 
 # Install schema file
@@ -31,7 +30,7 @@ if desktop_file_validate.found()
   test (
     'Validate desktop file',
     desktop_file_validate,
-    args: desktop_file.full_path()
+    args: desktop_file.full_path(),
   )
 endif
 
@@ -54,11 +53,7 @@ if appstreamcli.found()
   test(
     'Validate appdata file',
     appstreamcli,
-    args: [
-        'validate-relax',
-        '--nonet',
-        appdata_file.full_path()
-     ]
+    args: ['validate-relax', '--nonet', appdata_file.full_path()],
   )
 endif
 
@@ -78,17 +73,17 @@ if compile_schemas.found()
   test(
     'Validate schema file',
     compile_schemas,
-    args: ['--strict', '--dry-run', meson.current_source_dir()]
+    args: ['--strict', '--dry-run', meson.current_source_dir()],
   )
 endif
 
 # Install GtkSourceview style files
 styles = [
-          'meld-base.style-scheme.xml',
-          'meld-dark.style-scheme.xml'
-         ]
+  'meld-base.style-scheme.xml',
+  'meld-dark.style-scheme.xml',
+]
 
-foreach style : styles
+foreach style: styles
   i18n.merge_file(
     input: 'styles' / style + '.in',
     output: style,
@@ -102,17 +97,17 @@ endforeach
 # Install icons
 icon_sizes = ['scalable']
 
-foreach i : icon_sizes
+foreach i: icon_sizes
   install_data(
     'icons/hicolor' / i / 'apps' / application_id + '.svg',
     install_dir: icondir / 'hicolor' / i / 'apps',
-    rename: '@0@.svg'.format(application_id)
+    rename: '@0@.svg'.format(application_id),
   )
 endforeach
 
 # Install the symbolic icon
 install_data(
-    'icons/hicolor/symbolic/apps' / application_id_no_profile + '-symbolic.svg',
-    install_dir: icondir / 'hicolor/symbolic/apps',
-    rename: '@0 -symbolic svg'.format(application_id)
+  'icons/hicolor/symbolic/apps' / application_id_no_profile + '-symbolic.svg',
+  install_dir: icondir / 'hicolor/symbolic/apps',
+  rename: '@0 -symbolic svg'.format(application_id),
 )
diff --git a/help/meson.build b/help/meson.build
index f98b3cd9..8320656e 100644
--- a/help/meson.build
+++ b/help/meson.build
@@ -1,23 +1,23 @@
 help_files = [
-    'command-line.page',
-    'file-changes.page',
-    'file-filters.page',
-    'file-mode.page',
-    'flattened-view.page',
-    'folder-mode.page',
-    'index.page',
-    'introduction.page',
-    'keyboard-shortcuts.page',
-    'legal.xml',
-    'missing-functionality.page',
-    'preferences.page',
-    'resolving-conflicts.page',
-    'text-filters.page',
-    'vc-mode.page',
-    'vc-supported.page'
+  'command-line.page',
+  'file-changes.page',
+  'file-filters.page',
+  'file-mode.page',
+  'flattened-view.page',
+  'folder-mode.page',
+  'index.page',
+  'introduction.page',
+  'keyboard-shortcuts.page',
+  'legal.xml',
+  'missing-functionality.page',
+  'preferences.page',
+  'resolving-conflicts.page',
+  'text-filters.page',
+  'vc-mode.page',
+  'vc-supported.page',
 ]
 
-
-gnome.yelp(meson.project_name(),
-    sources: help_files
+gnome.yelp(
+  meson.project_name(),
+  sources: help_files,
 )
diff --git a/meld/meson.build b/meld/meson.build
index 46f16cfb..88bfa267 100644
--- a/meld/meson.build
+++ b/meld/meson.build
@@ -3,81 +3,81 @@
 # See e.g., gnome-music for an example of this
 
 folders = {
-    '.': [
-        '__init__.py',
-        'accelerators.py',
-        'actiongutter.py',
-        'build_helpers.py',
-        'chunkmap.py',
-        'const.py',
-        'diffgrid.py',
-        'dirdiff.py',
-        'filediff.py',
-        'filters.py',
-        'gutterrendererchunk.py',
-        'iohelpers.py',
-        'linkmap.py',
-        'meldapp.py',
-        'meldbuffer.py',
-        'melddoc.py',
-        'meldwindow.py',
-        'menuhelpers.py',
-        'misc.py',
-        'newdifftab.py',
-        'patchdialog.py',
-        'preferences.py',
-        'recent.py',
-        'settings.py',
-        'sourceview.py',
-        'style.py',
-        'task.py',
-        'tree.py',
-        'treehelpers.py',
-        'undo.py',
-        'vcview.py',
-        'windowstate.py',
-    ],
-    'matchers': [
-        'matchers/__init__.py',
-        'matchers/diffutil.py',
-        'matchers/helpers.py',
-        'matchers/merge.py',
-        'matchers/myers.py',
-    ],
-    'ui': [
-      'ui/__init__.py',
-      'ui/bufferselectors.py',
-      'ui/cellrenderers.py',
-      'ui/emblemcellrenderer.py',
-      'ui/findbar.py',
-      'ui/gladesupport.py',
-      'ui/gtkcompat.py',
-      'ui/historyentry.py',
-      'ui/listwidget.py',
-      'ui/msgarea.py',
-      'ui/notebook.py',
-      'ui/notebooklabel.py',
-      'ui/recentselector.py',
-      'ui/statusbar.py',
-      'ui/util.py',
-      'ui/vcdialogs.py',
-    ],
-    'vc': [
-      'vc/COPYING',
-      'vc/README',
-      'vc/__init__.py',
-      'vc/_null.py',
-      'vc/_vc.py',
-      'vc/bzr.py',
-      'vc/cvs.py',
-      'vc/darcs.py',
-      'vc/git.py',
-      'vc/mercurial.py',
-      'vc/svn.py',
-    ],
+  '.': [
+    '__init__.py',
+    'accelerators.py',
+    'actiongutter.py',
+    'build_helpers.py',
+    'chunkmap.py',
+    'const.py',
+    'diffgrid.py',
+    'dirdiff.py',
+    'filediff.py',
+    'filters.py',
+    'gutterrendererchunk.py',
+    'iohelpers.py',
+    'linkmap.py',
+    'meldapp.py',
+    'meldbuffer.py',
+    'melddoc.py',
+    'meldwindow.py',
+    'menuhelpers.py',
+    'misc.py',
+    'newdifftab.py',
+    'patchdialog.py',
+    'preferences.py',
+    'recent.py',
+    'settings.py',
+    'sourceview.py',
+    'style.py',
+    'task.py',
+    'tree.py',
+    'treehelpers.py',
+    'undo.py',
+    'vcview.py',
+    'windowstate.py',
+  ],
+  'matchers': [
+    'matchers/__init__.py',
+    'matchers/diffutil.py',
+    'matchers/helpers.py',
+    'matchers/merge.py',
+    'matchers/myers.py',
+  ],
+  'ui': [
+    'ui/__init__.py',
+    'ui/bufferselectors.py',
+    'ui/cellrenderers.py',
+    'ui/emblemcellrenderer.py',
+    'ui/findbar.py',
+    'ui/gladesupport.py',
+    'ui/gtkcompat.py',
+    'ui/historyentry.py',
+    'ui/listwidget.py',
+    'ui/msgarea.py',
+    'ui/notebook.py',
+    'ui/notebooklabel.py',
+    'ui/recentselector.py',
+    'ui/statusbar.py',
+    'ui/util.py',
+    'ui/vcdialogs.py',
+  ],
+  'vc': [
+    'vc/COPYING',
+    'vc/README',
+    'vc/__init__.py',
+    'vc/_null.py',
+    'vc/_vc.py',
+    'vc/bzr.py',
+    'vc/cvs.py',
+    'vc/darcs.py',
+    'vc/git.py',
+    'vc/mercurial.py',
+    'vc/svn.py',
+  ],
 }
 
-foreach folder_name, sources : folders
+foreach folder_name, sources: folders
   pkgdir = meson.project_name() / folder_name
   python3.install_sources(sources, pure: true, subdir: pkgdir)
 endforeach
@@ -93,10 +93,10 @@ app_config = {
 }
 
 configure_file(
-    input: 'conf.py.in',
-    output: 'conf.py',
-    configuration: app_config,
-    install_dir: python3.get_install_dir(pure: true, subdir: meson.project_name()),
+  input: 'conf.py.in',
+  output: 'conf.py',
+  configuration: app_config,
+  install_dir: python3.get_install_dir(pure: true, subdir: meson.project_name()),
 )
 
 subdir('resources')
diff --git a/meson.build b/meson.build
index 8efcaa6a..526a0575 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
-    'meld',
-    version: '3.21.0',
-    meson_version: '>=0.49.0',
+  'meld',
+  version: '3.21.0',
+  meson_version: '>= 0.49.0',
 )
 
 python = import('python')
@@ -10,7 +10,7 @@ gnome = import('gnome')
 
 python3 = python.find_installation('python3')
 if not python3.found()
-    error('Python 3 is required to build and use Meld')
+  error('Python 3 is required to build and use Meld')
 endif
 
 # These requirements are kept in both `bin/meld` and `meson.build`. If you
@@ -22,7 +22,6 @@ dependency('gtksourceview-4', version: '>= 4.0.0')
 dependency('pygobject-3.0', version: '>= 3.30')
 dependency('py3cairo', version: '>= 1.15.0')
 
-
 profile = get_option('profile')
 name_suffix = (profile == 'Devel' ? ' (Development Snapshot)' : '')