Merge branch 'master' into formatbar-linewidthguide

elementary · Aug 2, 2023 · 50b5a1f · 50b5a1f
2 parents bbe6346 + 9babc15
commit 50b5a1f
Show file tree

Hide file tree

Showing 634 changed files with 59,621 additions and 36,104 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,16 +10,19 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [stable, unstable, development-target]
     container:
-      image: elementary/docker:next-unstable
+      image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
     - uses: actions/checkout@v3
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y exuberant-ctags libeditorconfig-dev libgail-3-dev libgee-0.8-dev libgit2-glib-1.0-dev libgranite-dev libgtk-3-dev libgtksourceview-4-dev libgtkspell3-3-dev libhandy-1-dev libpeas-dev libsoup2.4-dev libvala-dev libvte-2.91-dev meson valac
+        apt install -y exuberant-ctags libeditorconfig-dev libgail-3-dev libgee-0.8-dev libgit2-glib-1.0-dev libgranite-dev libgtk-3-dev libgtksourceview-4-dev libgtkspell3-3-dev libhandy-1-dev libpeas-dev libsoup2.4-dev libvala-dev libvte-2.91-dev meson valac polkitd libpolkit-gobject-1-dev
     - name: Build
       env:
         DESTDIR: out
@@ -47,12 +50,12 @@ jobs:
 
       - name: Set up QEMU for aarch64 emulation
         if: ${{ matrix.arch != 'x86_64' }}
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: arm64
 
       - name: Build
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v5
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: code.flatpak
           manifest-path: io.elementary.code.yml

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -2,13 +2,13 @@ name: Gettext Updates
 
 on:
   push:
-    branches: master
+    branches: [master]
 
 jobs:
   build:
     runs-on: ubuntu-22.04
     container:
-      image: elementary/docker:next-unstable
+      image: ghcr.io/elementary/docker:next-unstable
 
     steps:
     - name: Install git

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,14 +2,14 @@ name: Release
 
 on:
   pull_request:
-    branches: master
-    types: closed
+    branches: [master]
+    types: [closed]
 jobs:
   release:
      runs-on: ubuntu-latest
      if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
      steps:
-     - uses: actions/checkout@v1
+     - uses: actions/checkout@v3
      - uses: elementary/actions/release@master
        env:
          GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

diff --git a/data/code.metainfo.xml.in b/data/code.metainfo.xml.in
@@ -29,13 +29,17 @@
 
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/code/7.0.0/data/screenshot.png</image>
+      <image>https://raw.githubusercontent.com/elementary/code/7.1.0/data/screenshot.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/code/7.0.0/data/screenshot-dark.png</image>
+      <image>https://raw.githubusercontent.com/elementary/code/7.1.0/data/screenshot-dark.png</image>
     </screenshot>
   </screenshots>
 
+  <branding>
+    <color type="primary">#cfa25e</color>
+  </branding>
+
   <content_rating type="oars-1.1" />
 
   <provides>
@@ -62,19 +66,51 @@
   <update_contact>contact_AT_elementary.io</update_contact>
 
   <releases>
-    <release version="7.0.1" date="2023-02-22" urgency="medium">
+    <release version="7.1.0" date="2023-07-28" urgency="medium">
       <description>
+        <p>Improvements:</p>
+        <ul>
+          <li>Search options transferred to searchbar menu</li>
+          <li>Whole word search option added</li>
+          <li>Whole word, case sensitive mode and use regex search settings now persist</li>
+        </ul>
         <p>Minor updates:</p>
         <ul>
-          <li>Show when running a development branch of Code</li>
+          <li>The search bar now updates properly after changing the active document</li>
+          <li>Trying to save a document to an unwritable location is now handled better</li>
+          <li>The system style is now followed by the symbol outline and when launched without open documents</li>
+          <li>Mixed case sensitive search now works as expected</li>
+          <li>The search results no longer change unexpectedly when focusing a document</li>
+          <li>Now there is always an active project at startup if there are projects in the sidebar</li>
+          <li>If a development branch is running this shows in the window title and in the dock tooltip</li>
+          <li>Ctrl+PageUp and Ctrl+PageDown shortcuts now switch tabs</li>
+          <li>Ensure active project at startup (include non-git folders)</li>
           <li>Updated translations</li>
         </ul>
       </description>
       <issues>
-        <issue url="https://github.com/elementary/code/issues/1261">Handle saving to unwritable location better to avoid data loss</issue>
+        <issue url="https://github.com/elementary/code/issues/739">No expander on folders that contain no text files</issue>
+        <issue url="https://github.com/elementary/code/issues/933">Add whole word search</issue>
+        <issue url="https://github.com/elementary/code/issues/965">Undo-ing sometimes deletes the entire contents of a file</issue>
+        <issue url="https://github.com/elementary/code/issues/1175">Search occurence label does not update when active document changed</issue>
+        <issue url="https://github.com/elementary/code/issues/1183">Autosave of unsaved buffers not reliable</issue>
+        <issue url="https://github.com/elementary/code/issues/1208">Slow to close multiple documents</issue>
+        <issue url="https://github.com/elementary/code/issues/1210">Unexpected closing on pressing Global Search accelerator with no open documents</issue>
+        <issue url="https://github.com/elementary/code/issues/1248">Clicking "Find in Project…" in the welcome screen causes the app crashing</issue>
+        <issue url="https://github.com/elementary/code/issues/1256">Cancelling saving does not work as expected when closing project folder resulting in data loss</issue>
+        <issue url="https://github.com/elementary/code/issues/1261">Saving new document to an unwritable location gives unexpected behaviour and possible data loss</issue>
         <issue url="https://github.com/elementary/code/issues/1263">Symbol outline does not respect system style</issue>
+        <issue url="https://github.com/elementary/code/issues/1266">"Replace All" should not disable the "Replace" and "Replace All" buttons</issue>
         <issue url="https://github.com/elementary/code/issues/1270">Does not follow system color scheme when launching with no files open</issue>
-        <issue url="https://github.com/elementary/code/pull/1254">Ensure active project at startup (include non-git folders)</issue>
+        <issue url="https://github.com/elementary/code/issues/1272">Secure WebDav files opened from Files cannot save</issue>
+        <issue url="https://github.com/elementary/code/issues/1275">Case sensitive/insensitive search does not work as expected with mixed case search term</issue>
+        <issue url="https://github.com/elementary/code/issues/1282">Cannot open files with unknown characters</issue>
+        <issue url="https://github.com/elementary/code/issues/1293">Search results change when document focused in</issue>
+        <issue url="https://github.com/elementary/code/issues/1319">Document does not open when sidebar entry clicked if it is already focused</issue>
+        <issue url="https://github.com/elementary/code/issues/1327">Git branch change can result in unwanted warnings</issue>
+        <issue url="https://github.com/elementary/code/issues/1335">Search entry reverts to previous term after editing and pressing Control+f</issue>
+        <issue url="https://github.com/elementary/code/issues/1340">Tab width menu does not work</issue>
+        <issue url="https://github.com/elementary/code/issues/1341">Line numbers should start from one not zero</issue>
       </issues>
     </release>
 

diff --git a/data/io.elementary.code.1 b/data/io.elementary.code.1
@@ -0,0 +1,50 @@
+.TH "Code" "1" "November 2017"
+.
+.SH "NAME"
+\fBio.elementary.code\fR \- text editor that works for you
+.
+.SH "SYNOPSIS"
+\fBio.elementary.code\fR [\fIOPTION\.\.\.\fR] [\fIFILE\.\.\.\fR]
+.
+.SH "DESCRIPTION"
+\fBCode\fR is the text editor that works for you\. It auto-saves your files, meaning they're always up-to-date\. Plus it remembers your tabs so you never lose your spot, even in between sessions\.
+.
+.P
+\fBMake it yours.\fR Code is written from the ground up to be extensible\. Keep things super lightweight and simple, or install extensions to turn Code into a full-blown IDE; it's your choice\. And with a handful of useful preferences, you can tweak the behavior and interface to your liking\.
+.
+.P
+\fBIt's elementary.\fR Code is made to be the perfect text editor for elementary OS, meaning it closely follows the high standards of design, speed, and consistency\. It's sexy, but not distracting\.
+.
+.P
+\fBWorks with your language.\fR Whether you're crafting code in Vala, scripting with PHP, or marking things up in HTML, Code has you covered\. Experience full syntax highlighting with nearly all programming, scripting, and markup languages\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-t\fR, \fB\-\-new\-tab\fR
+Open a new tab\.
+.
+.TP
+\fB\-n\fR, \fB\-\-new\-window\fR
+Open a new window\.
+.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show a help message and exit\.
+.
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print version info and exit\.
+.
+.TP
+\fB\-\-display=\fR\fIDISPLAY\fR
+X display to use\.
+.
+.SH "AUTHOR"
+Mario Guerriero <[email protected]>,
+Julien Spautz <[email protected]>,
+Giulio Collura <[email protected]>,
+Lucas Baudin <[email protected]> et al.
+.PP
+This manual page was written by Sergey "Shnatsel" Davidoff <[email protected]>,
+for the Debian project (but may be used by others).
diff --git a/data/io.elementary.code.gschema.xml b/data/io.elementary.code.gschema.xml
@@ -10,6 +10,11 @@
     <value nick="For Selection" value="1" />
     <value nick="Always" value="2" />
   </enum>
+  <enum id="io.elementary.code.case-sensitive-mode">
+    <value nick="never" value="0" />
+    <value nick="mixed" value="1" />
+    <value nick="always" value="2" />
+  </enum>
 
   <schema path="/io/elementary/code/saved-state/" id="io.elementary.code.saved-state" gettext-domain="io.elementary.code">
     <key name="window-state" enum="io.elementary.code.window-states">
@@ -116,6 +121,7 @@
       <description>Whether Code should use auto indentation</description>
     </key>
     <key name="indent-width" type="i">
+      <range min="2" max="16"/>
       <default>4</default>
       <summary>Tab Size</summary>
       <description>Specifies the number of spaces that should be displayed instead of Tab characters.</description>
@@ -155,6 +161,21 @@
       <summary>Whether search is cyclic</summary>
       <description>Whether text searching should cycle back to the beginning of the document after reaching the end of the document.</description>
     </key>
+    <key name="wholeword-search" type="b">
+      <default>false</default>
+      <summary>Whether search is for whole words</summary>
+      <description>Whether the search should only match whole words.</description>
+    </key>
+    <key name="regex-search" type="b">
+      <default>false</default>
+      <summary>Whether search term is a regex expression</summary>
+      <description>Whether the search should use the search term as a regex expression for matching.</description>
+    </key>
+    <key name="case-sensitive-search" enum="io.elementary.code.case-sensitive-mode">
+      <default>'mixed'</default>
+      <summary>When text search is case sensitive</summary>
+      <description>Whether the text search is case sensitive never, always or only when search term is mixed case</description>
+    </key>
     <key name="strip-trailing-on-save" type="b">
       <default>false</default>
       <summary>Whether to automatically remove trailing whitespace on saving</summary>

diff --git a/data/meson.build b/data/meson.build
@@ -16,16 +16,16 @@ endforeach
 install_data([
   'styles/elementary-dark.xml',
   'styles/elementary-light.xml',
-], install_dir: join_paths(get_option('datadir'), 'gtksourceview-4', 'styles'))
+], install_dir: get_option('datadir') / 'gtksourceview-4' / 'styles')
 
 install_data([
   'fonts/BuilderBlocks.ttf',
-], install_dir: join_paths(get_option('datadir'), meson.project_name(), 'fonts'))
+], install_dir: get_option('datadir') / meson.project_name() / 'fonts')
 
 install_data(
     'io.elementary.code.gschema.xml',
     'io.elementary.code.plugins.spell.gschema.xml',
-    install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')
+    install_dir: get_option('prefix') / get_option('datadir') / 'glib-2.0' / 'schemas'
 )
 
 config_data = configuration_data()
@@ -47,16 +47,16 @@ desktop_in_file = configure_file(
 desktop_file = i18n.merge_file(
     input: desktop_in_file,
     output: 'io.elementary.code.desktop',
-    po_dir: join_paths(meson.source_root (), 'po', 'extra'),
+    po_dir: meson.project_source_root () / 'po' / 'extra',
     type: 'desktop',
-    install_dir: join_paths(get_option('datadir'), 'applications'),
+    install_dir: get_option('datadir') / 'applications',
     install: true
 )
 
 i18n.merge_file(
     input: 'code.metainfo.xml.in',
     output: meson.project_name() + '.metainfo.xml',
-    po_dir: meson.source_root() / 'po' / 'extra',
+    po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,
     install_dir: get_option('datadir') / 'metainfo',
@@ -78,8 +78,12 @@ if get_option ('have_pkexec')
     i18n.merge_file(
         input: policy_in,
         output: meson.project_name() + '.policy',
-        po_dir: join_paths(meson.source_root (), 'po', 'extra'),
+        po_dir: meson.project_source_root () / 'po' / 'extra',
         install: true,
-        install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions'),
+        install_dir: get_option('datadir') / 'polkit-1' / 'actions',
     )
 endif
+
+install_man(
+    'io.elementary.code.1'
+)
diff --git a/meson.build b/meson.build
@@ -1,7 +1,8 @@
 project(
     'io.elementary.code',
     'vala', 'c',
-    version: '7.0.0'
+    meson_version: '>= 0.58.0',
+    version: '7.1.0'
 )
 
 add_project_arguments([
@@ -11,16 +12,16 @@ add_project_arguments([
 )
 
 add_project_arguments(
-    ['--vapidir', join_paths(meson.current_source_dir(), 'vapi')],
+    ['--vapidir', meson.project_source_root() / 'vapi'],
     language: 'vala'
 )
 
 if get_option('have_pkexec')
     add_project_arguments('--define=HAVE_PKEXEC', language: 'vala')
 endif
 
-libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), meson.project_name())
-pluginsdir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
+libexecdir = get_option('prefix') / get_option('libexecdir') / meson.project_name()
+pluginsdir = get_option('prefix') / get_option('libdir') / meson.project_name() / 'plugins'
 
 gnome = import('gnome')
 i18n = import('i18n')
@@ -46,7 +47,7 @@ code_resources = gnome.compile_resources(
 )
 
 # We need libvala-X.XX library, but it changes depending on the version that is installed
-vala_version = run_command (meson.get_compiler('vala'), '--api-version').stdout().strip()
+vala_version = run_command (meson.get_compiler('vala'), '--api-version', check: true).stdout().strip()
 vala_dep = dependency('libvala-@0@'.format(vala_version))
 
 dependencies = [
@@ -81,4 +82,4 @@ if get_option('plugins')
 endif
 subdir('po')
 
-meson.add_install_script('meson/post_install.py')
+gnome.post_install(glib_compile_schemas: true)
diff --git a/meson/post_install.py b/meson/post_install.py
diff --git a/plugins/brackets-completion/meson.build b/plugins/brackets-completion/meson.build
@@ -13,7 +13,7 @@ shared_module(
     module_files,
     dependencies: module_deps,
     install: true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
 
 custom_target(module_name + '.plugin_merge',
@@ -23,10 +23,10 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + meson.project_source_root () / 'po' / 'plugins',
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],
     install : true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )