Merge branch 'master' into snippets

.editorconfig

@@ -1,15 +1,12 @@
 # EditorConfig <http://EditorConfig.org>
 root = true
 
-# elementary defaults
+# elementary defaults - global indent width and style are set in UI
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = tab
-indent_style = space
 insert_final_newline = true
 max_line_length = 80
-tab_width = 4
 
 [{*.xml,*.xml.in,*.yml}]
 tab_width = 2

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -10,22 +10,24 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [stable, unstable, development-target]
     container:
-      image: elementary/docker:unstable
+      image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-    - uses: actions/checkout@v2
+    - 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
       run: |
         meson build
-        ninja -C build
         ninja -C build install
 
   flatpak:
@@ -39,25 +41,24 @@ jobs:
       fail-fast: false
 
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:6-${{ matrix.arch }}
+      image: ghcr.io/elementary/flatpak-platform/runtime:7.1-${{ matrix.arch }}
       options: --privileged
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - 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: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: code.flatpak
           manifest-path: io.elementary.code.yml
-          run-tests: true
           repository-name: appcenter
           repository-url: https://flatpak.elementary.io/repo.flatpakrepo
           cache-key: "flatpak-builder-${{ github.sha }}"
@@ -72,7 +73,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Lint
         run: io.elementary.vala-lint -d .

.github/workflows/merge.yml

@@ -1,24 +1,29 @@
----
-
-name: Merge
+name: Gettext Updates
 
 on:
   push:
-    branches:
-      - master
+    branches: [master]
 
 jobs:
-  gettext:
-    name: Gettext
-    runs-on: ubuntu-latest
+  build:
+    runs-on: ubuntu-22.04
+    container:
+      image: ghcr.io/elementary/docker:next-unstable
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v1 # Avoid an error when pushing
+    - name: Install git
+      run: |
+        apt-get update
+        apt-get install git -y
+
+    - name: Clone repository
+      uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.GIT_USER_TOKEN }}
 
-      - name: Gettext
-        uses: elementary/actions/gettext-template@master
-        env:
-          GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
-          GIT_USER_NAME: "elementaryBot"
-          GIT_USER_EMAIL: "[email protected]"
+    - name: Update Translation Files
+      uses: elementary/actions/gettext-template@next
+      env:
+        GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
+        GIT_USER_NAME: "elementaryBot"
+        GIT_USER_EMAIL: "[email protected]"

.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 }}"

.gitignore

@@ -1,4 +1,5 @@
 build
 src/config.vala
 *~
-
+.flatpak
+.flatpak-builder

data/code.metainfo.xml.in

@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2018–2023 elementary, Inc. <[email protected]> -->
+<component type="desktop-application">
+  <id>io.elementary.code</id>
+  <launchable type="desktop-id">io.elementary.code.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+
+  <name>Code</name>
+  <summary>The editor that works for you</summary>
+  <description>
+    <p>Whether you're writing in Markdown or managing a complex app codebase, Code is the lightweight but full-featured editor for you. It auto-saves your files to ensure they're always up-to-date, and it remembers your tabs so you never lose your spot—even between sessions.</p>
+    <p>Designed around a project-based workflow, Code knows about your separate codebases. It comes with helpful Git integration to create and switch between branches and show changed files and lines within your projects.</p>
+    <p>Work with your language: 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.</p>
+    <p>Find anything in your current file, specific folders, or your whole project with options for case-sensitivity and regular expressions.</p>
+    <p>Smart features throughout: automatic indentation, smart cut/copy behavior, visible whitespace for selected text and at the end of lines by default, and optional extensions for Markdown actions, spell checking, whitespace trimming, word completion, and more.</p>
+    <p>Adapt Code to your workflow: you can tweak the behavior and interface as needed with a handful of useful and well-considered extensions and preferences.</p>
+    <p>There's a ton more:</p>
+    <ul>
+      <li>Solarized Light, Solarized Dark, and High Contrast color schemes that affect the whole UI</li>
+      <li>Togglable sidebar to fit your workflow</li>
+      <li>Smart indentation and .editorconfig support</li>
+      <li>Browser-class tabs with drag-and-drop, duplication, undo closing, and tab history</li>
+      <li>Display the current line and character—and quickly jump to a new line</li>
+      <li>Scroll past the end of the file so you can keep the current line where it's comfortable</li>
+      <li>Optional mini-map to make navigating large files easier</li>
+    </ul>
+  </description>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/elementary/code/7.1.0/data/screenshot.png</image>
+    </screenshot>
+    <screenshot>
+      <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>
+    <binary>io.elementary.code</binary>
+  </provides>
+
+  <recommends>
+    <display_length compare="ge">604</display_length>
+  </recommends>
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <control>touch</control>
+  </supports>
+
+  <url type="homepage">https://elementary.io/</url>
+  <url type="bugtracker">https://github.com/elementary/code/issues</url>
+  <url type="donation">https://elementary.io/get-involved#funding</url>
+  <url type="help">https://github.com/elementary/code/discussions/categories/q-a</url>
+  <url type="translate">https://l10n.elementary.io/projects/code</url>
+
+  <developer_name>elementary, Inc.</developer_name>
+  <project_group>elementary</project_group>
+  <update_contact>contact_AT_elementary.io</update_contact>
+
+  <releases>
+    <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>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/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/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>
+
+    <release version="7.0.0" date="2023-01-23" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+        <ul>
+          <li>Redesigned app icon</li>
+          <li>New custom dark and light elementary styles for the source view</li>
+          <li>Option to follow the system dark style preference</li>
+          <li>Ability to half tile on small notebook displays</li>
+        </ul>
+        <p>Minor updates:</p>
+        <ul>
+          <li>Both Find on Page and Find in Project are now available from the app's menu instead of in the headerbar</li>
+          <li>Options for hiding and showing panels are now all present in a compact set of linked buttons in the app's menu</li>
+          <li>The sidebar now contains the project chooser button and fills the height of the window</li>
+          <li>Starting a global search with text selected now pre-fills that text</li>
+          <li>The symbol outline pane is now shown to the right of the source view and can be shown and hidden with the keyboard shortcut "Alt + \"</li>
+          <li>Terminal, Symbol outline, and the Strip Trailing Whitespace plugins are now part of the main codebase</li>
+          <li>Show an infobar when tab width settings are being overwritten by an EditorConfig file</li>
+          <li>The shortcut for rebuilding the completion word list is now "Ctrl + |"</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/code/issues/1191">Drag and drop of selected text not working with accented characters</issue>
+        <issue url="https://github.com/elementary/code/issues/1193">Dragging text into document in a second window duplicates it</issue>
+        <issue url="https://github.com/elementary/code/issues/1142">Tab width label does not update properly</issue>
+        <issue url="https://github.com/elementary/code/issues/1140">Open tab in new window also opens other tabs in the new window</issue>
+        <issue url="https://github.com/elementary/code/issues/1141">Project list contains duplicates after creating new window</issue>
+        <issue url="https://github.com/elementary/code/issues/1244">Changing zoom with scroll lags</issue>
+      </issues>
+    </release>
+
+    <release version="6.2.0" date="2022-04-01" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+        <ul>
+          <li>The current document filename is now shown as the window title in multitasking view</li>
+          <li>Hidden folders are now shown in the project sidebar</li>
+          <li>The currently selected result and the number of results is displayed while searching</li>
+          <li>The search bar now has a regular expression mode</li>
+        </ul>
+        <p>Fixes:</p>
+        <ul>
+          <li>It is now possible to change Git branch with untracked files present in a project</li>
+          <li>Crashes are prevented while searching in large projects</li>
+          <li>The correct document is now focused after opening Code from an external program</li>
+          <li>Line duplication is now actioned correctly if there is no selection present</li>
+          <li>Code no longer crashes when asked to open an unknown URI format</li>
+        </ul>
+        <p>Minor updates:</p>
+        <ul>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="6.1.0" date="2021-11-23" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+        <ul>
+          <li>Projects with the same name now include their parent folder name as well</li>
+          <li>When scrolling to search results, overshoot slightly for better visibility</li>
+          <li>Use the FileChooser portal instead of the one from GTK</li>
+          <li>Center the global search dialog over the main Code window</li>
+        </ul>
+        <p>Fixes:</p>
+        <ul>
+          <li>Fix visibility of Terminal button on Welcome page</li>
+          <li>Fix some keyboard shortcuts affecting unfocused Document instead of focused Terminal</li>
+          <li>Close Terminal if shell exited and create new Terminal if re-opened with no shell</li>
+        </ul>
+        <p>Minor updates:</p>
+        <ul>
+          <li>"Visible whitespace" combobox is now a switch</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="6.0.1" date="2021-08-28" urgency="medium">
+      <description>
+        <p>Fixes:</p>
+        <ul>
+          <li>Fix crash when creating new window from tab drop</li>
+          <li>Ensure files created from the sidebar are automatically opened</li>
+        </ul>
+        <p>Improvements:</p>
+        <ul>
+          <li>Hide project chooser button when hiding sidebar</li>
+        </ul>
+        <p>Minor updates:</p>
+        <ul>
+          <li>Ensure all copy is translatable</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="6.0.0" date="2021-07-15"/>
+  </releases>
+</component>