Merge branch 'master' into jeremypw/rework-highlight-selection2

Author: jeremypw

.github/workflows/release.yml

@@ -16,4 +16,4 @@ jobs:
          GIT_USER_NAME: "elementaryBot"
          GIT_USER_EMAIL: "[email protected]"
        with:
-         release_branch: 'odin'
+         release_branch: 'noble'

data/code.metainfo.xml.in

@@ -29,10 +29,10 @@
 
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/code/7.4.0/data/screenshot.png</image>
+      <image>https://raw.githubusercontent.com/elementary/code/8.0.0/data/screenshot.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/code/7.4.0/data/screenshot-dark.png</image>
+      <image>https://raw.githubusercontent.com/elementary/code/8.0.0/data/screenshot-dark.png</image>
     </screenshot>
   </screenshots>
 
@@ -68,6 +68,59 @@
   <update_contact>contact_AT_elementary.io</update_contact>
 
   <releases>
+    <release version="8.0.0" date="2025-06-20" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+        <ul>
+          <li>A new gutter is added for adding/removing edit marks that can be navigated between with keyboard shortcuts</li>
+          <li>Remote branches may now be opened from the "Branch" menu</li>
+          <li>Options to overwrite or cancel are given when switching branch with uncommitted changes</li>
+          <li>The network can now be accessed from within the Flatpak</li>
+          <li>The branch names in the "Branch" submenus are now sorted alphabetically</li>
+          <li>The extension list now has switches instead of checkboxes in order to provide a larger target</li>
+          <li>The terminal pane now implements smart copy-paste and follows the "natural-copy-paste" setting of Terminal</li>
+          <li>The Vala symbol pane now gives more information in the tooltips</li>
+        </ul>
+        <p>Minor updates:</p>
+        <ul>
+          <li>Launcher actions now have icons</li>
+          <li>Opening and immediately closing a new document no longer prevents further documents being opened</li>
+          <li>The Vala symbol pane may only block the UI for a limited time if there are a large number of symbols</li>
+          <li>The "Open in …" menu is no longer empty when running as Flatpak</li>
+          <li>The search term now persists until editing or closing the search bar.</li>
+          <li>No longer allow the parent or child of an open project to be itself opened as a project</li>
+          <li>The active project dropdown now keeps in sync</li>
+          <li>Numbered lists are now handled correctly by Markdown plugin</li>
+          <li>The highlighting plugin now works with selections of more than one word</li>
+          <li>The "Open in …" menu is now sorted and includes a "Terminal Pane" entry</li>
+          <li>Folders containing may items now expand faster without blocking the UI</li>
+          <li>Symbol Pane now always scrolls document to selected symbol</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/code/issues/1575">Sort the branch names in "Branch" menu</issue>
+        <issue url="https://github.com/elementary/code/issues/1558">Add icons for launcher actions</issue>
+        <issue url="https://github.com/elementary/code/issues/1536">Cannot open docs after opening and closing a new document</issue>
+        <issue url="https://github.com/elementary/code/issues/1521">Uncommitted changes lost without warning if another branch is checked out with the context menu</issue>
+        <issue url="https://github.com/elementary/code/issues/1519">Sort Apps for "Open in …"</issue>
+        <issue url="https://github.com/elementary/code/issues/1515">Limit time vala symbol pane takes to parse and display symbols</issue>
+        <issue url="https://github.com/elementary/code/issues/1511">Open in menu empty when running as Flatpak</issue>
+        <issue url="https://github.com/elementary/code/issues/1508">Search term disappears unexpectedly when editing text</issue>
+        <issue url="https://github.com/elementary/code/issues/1494">Code crashes when both a folder and its parent are open as projects and a document present in both is opened</issue>
+        <issue url="https://github.com/elementary/code/issues/1471">Active project dropdown sometimes out of sync on restart</issue>
+        <issue url="https://github.com/elementary/code/issues/1473">Markdown numbered list auto-completion deletes text</issue>
+        <issue url="https://github.com/elementary/code/issues/1469">Certain word selections are not highlighted by plugin</issue>
+        <issue url="https://github.com/elementary/code/issues/1410">Add more information to Symbol plugin tooltips</issue>
+        <issue url="https://github.com/elementary/code/issues/1408">Move "Open in Terminal Pane" item to the "Open In" menu</issue>
+        <issue url="https://github.com/elementary/code/issues/1332">Sidebar is slow to expand folders containing moderately many (2000) files first time</issue>
+        <issue url="https://github.com/elementary/code/issues/1317">Symbol Pane: Does not scroll back to already selected method</issue>
+        <issue url="https://github.com/elementary/code/issues/1156">ProjectFolder menu: "Branch" option does not show remote branches</issue>
+        <issue url="https://github.com/elementary/code/issues/677">Improve message when file changes on disk to include moving or renaming</issue>
+        <issue url="https://github.com/elementary/code/issues/147">Implement natural copy/paste in terminal plug</issue>
+      </issues>
+    </release>
+
     <release version="7.4.0" date="2024-10-21" urgency="medium">
       <description>
         <p>Minor updates:</p>

data/icons/git-symbolic.svg

@@ -2,7 +2,6 @@
 <gresources>
   <gresource prefix="/io/elementary/code">
     <file alias="Application.css" compressed="true">Application.css</file>
-    <file alias="git.svg" compressed="true" preprocess="xml-stripblanks">icons/48/git.svg</file>
     <file alias="lang-class-abstract.svg" compressed="true" preprocess="xml-stripblanks">icons/SymbolOutline/abstractclass.svg</file>
     <file alias="lang-method-abstract.svg" compressed="true" preprocess="xml-stripblanks">icons/SymbolOutline/abstractmethod.svg</file>
     <file alias="lang-property-abstract.svg" compressed="true" preprocess="xml-stripblanks">icons/SymbolOutline/abstractproperty.svg</file>
@@ -30,8 +29,10 @@
     <file alias="scalable/actions/panel-right-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/panel-right-symbolic.svg</file>
   </gresource>
   <gresource prefix="/io/elementary/code/icons">
+    <file alias="48x48/actions/git.svg" compressed="true" preprocess="xml-stripblanks">icons/48/git.svg</file>
     <file alias="48x48/actions/open-project.svg" compressed="true" preprocess="xml-stripblanks">icons/48/open-project.svg</file>
     <file alias="scalable/actions/filter-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/filter-symbolic.svg</file>
+    <file alias="scalable/actions/git-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/git-symbolic.svg</file>
     <file alias="scalable/emblems/emblem-git-modified-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/emblem-git-modified-symbolic.svg</file>
     <file alias="scalable/emblems/emblem-git-new-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/emblem-git-new-symbolic.svg</file>
   </gresource>

data/io.elementary.code.gresource.xml

@@ -162,6 +162,16 @@
       <summary>The default build directory's relative path.</summary>
       <description>The directory, relative to the project root, at which to open the terminal pane and where to run build commands by default.</description>
     </key>
+    <key name="default-projects-folder" type="s">
+      <default>''</default>
+      <summary>The default Projects folder</summary>
+      <description>The path to the folder below which projects are saved or cloned</description>
+    </key>
+    <key name="default-remote" type="s">
+      <default>''</default>
+      <summary>The default git remote</summary>
+      <description>The URL of the remote from where repositories can be cloned, for example https://github.com/elementary/</description>
+    </key>
     <key name="prefer-dark-style" type="b">
       <default>false</default>
       <summary>Request dark Gtk stylesheet variant</summary>

data/io.elementary.code.gschema.xml

@@ -1,6 +1,6 @@
 app-id: io.elementary.code
 runtime: io.elementary.Sdk # The outline plugin requires libvala which is only in the SDK, not the runtime
-runtime-version: '7.1'
+runtime-version: '8' # Does not build with version '8.1' for some reason
 sdk: io.elementary.Sdk
 command: io.elementary.code
 finish-args:
@@ -57,7 +57,7 @@ modules:
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/libgit2-glib.git
-        tag: v1.1.0
+        tag: v1.2.0
     modules:
       - name: ssh2
         buildsystem: cmake-ninja
@@ -81,7 +81,7 @@ modules:
         sources:
           - type: git
             url: https://github.com/libgit2/libgit2.git
-            tag: 'v1.5.1'
+            tag: 'v1.7.2'
 
   - name: editorconfig
     buildsystem: cmake-ninja

io.elementary.code.yml

@@ -2,7 +2,7 @@ project(
     'io.elementary.code',
     'vala', 'c',
     meson_version: '>= 0.58.0',
-    version: '7.4.0'
+    version: '8.0.0'
 )
 
 add_project_arguments([
@@ -34,7 +34,7 @@ granite_dep = dependency('granite', version: '>=6.0.0')
 handy_dep = dependency('libhandy-1', version: '>=0.90.0')
 gtksourceview_dep = dependency('gtksourceview-4')
 peas_dep = dependency('libpeas-2')
-git_dep = dependency('libgit2-glib-1.0')
+git_dep = dependency('libgit2-glib-1.0', version: '>=1.2.0')
 fontconfig_dep = dependency('fontconfig')
 pangofc_dep = dependency('pangoft2')
 posix_dep = meson.get_compiler('vala').find_library('posix')

meson.build

@@ -9,7 +9,7 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Se
         "", " ", "\b", "\r", "\n", "\t", ",", ".", ";", ":"
     };
 
-    public Object object { owned get; construct; }
+    public Object object { owned get; set construct; }
 
     private Gee.HashMap<string, string> brackets;
     private Gee.HashMap<uint, string> keys;

plugins/brackets-completion/brackets-completion.vala

@@ -2,7 +2,7 @@ public class Scratch.Plugins.DetectIndent: Peas.ExtensionBase, Scratch.Services.
     const int MAX_LINES = 500;
 
     Scratch.Services.Interface plugins;
-    public Object object {owned get; construct;}
+    public Object object {owned get; set construct;}
 
     public void update_state () {
     }

plugins/detect-indent/detect-indent.vala

@@ -19,7 +19,7 @@
 
 public class Scratch.Plugins.EditorConfigPlugin: Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     Scratch.Services.Interface plugins;
-    public Object object { owned get; construct; }
+    public Object object { owned get; set construct; }
     private Code.FormatBar format_bar;
 
     public void update_state () { }