Merge branch 'master' into jeremypw/rework-word-completion/no-unnecessary-reparse

Author: jeremypw

.github/workflows/ci.yml

@@ -32,37 +32,35 @@ jobs:
 
   flatpak:
     name: Flatpak
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.configuration.runs-on }}
 
     strategy:
       matrix:
-        arch: [x86_64, aarch64]
+        configuration:
+          - arch: x86_64
+            runs-on: ubuntu-latest
+          - arch: aarch64
+            runs-on: ubuntu-24.04-arm
       # Don't fail the whole workflow if one architecture fails
       fail-fast: false
 
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:7.1-${{ matrix.arch }}
+      image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
       options: --privileged
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up QEMU for aarch64 emulation
-        if: ${{ matrix.arch != 'x86_64' }}
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-
       - name: Build
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.5
         with:
           bundle: code.flatpak
           manifest-path: io.elementary.code.yml
           repository-name: appcenter
           repository-url: https://flatpak.elementary.io/repo.flatpakrepo
           cache-key: "flatpak-builder-${{ github.sha }}"
-          arch: ${{ matrix.arch }}
+          arch: ${{ matrix.configuration.arch }}
 
   lint:
     name: Lint

data/icons/48/open-project.svg

@@ -30,6 +30,7 @@
     <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/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/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>

data/io.elementary.code.gresource.xml

@@ -152,6 +152,11 @@
       <summary>Remember the last focused document.</summary>
       <description>Restore the focused document from a previous session when opening Code.</description>
     </key>
+    <key name="active-project-path" type="s">
+      <default>''</default>
+      <summary>The active project path.</summary>
+      <description>The path to the folder containing the active project.</description>
+    </key>
     <key name="default-build-directory" type="s">
       <default>''</default>
       <summary>The default build directory's relative path.</summary>

data/io.elementary.code.gschema.xml

@@ -32,60 +32,65 @@ public class Scratch.Plugins.EditorConfigPlugin: Peas.ExtensionBase, Peas.Activa
         });
 
         plugins.hook_document.connect ((d) => {
-            // Ensure use global settings by default
-            format_bar.tab_style_set_by_editor_config = false;
-            format_bar.tab_width_set_by_editor_config = false;
-            format_bar.set_document (d);
+            update_config.begin (d);
+        });
 
-            Scratch.Widgets.SourceView view = d.source_view;
-            File file = d.file;
+    }
 
-            if (file == null || !file.query_exists ()) {
-                return;
-            }
+    private async void update_config (Scratch.Services.Document d) {
+        // Ensure use global settings by default
+        format_bar.tab_style_set_by_editor_config = false;
+        format_bar.tab_width_set_by_editor_config = false;
+        format_bar.set_document (d);
 
-            var handle = new EditorConfig.Handle ();
-            handle.set_conf_file_name (".editorconfig");
-            if (handle.parse (file.get_path ()) != 0) {
-                return;
-            }
+        Scratch.Widgets.SourceView view = d.source_view;
+        File file = d.file;
 
-            for (int i = 0; i < handle.get_name_value_count (); i++) {
-                string name, val;
-                handle.get_name_value (i, out name, out val);
-                /* These are all properties (https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties) */
-                switch (name) {
-                    case "indent_style":
-                        format_bar.tab_style_set_by_editor_config = true;
-                        var use_spaces = (val != "tab");
-                        format_bar.set_insert_spaces_instead_of_tabs (use_spaces);
-                        break;
-                    case "indent_size":
-                    case "tab_width":
-                        format_bar.tab_width_set_by_editor_config = true;
-                        var indent_width = (int.parse (val)).clamp (2, 16);
-                        format_bar.set_tab_width (indent_width);
-                        break;
-                    case "end_of_line":
-                        break;
-                    case "charset":
-                        break;
-                    case "trim_trailing_whitespace":
-                        break;
-                    case "insert_final_newline":
-                        break;
-                    case "max_line_length":
-                        view.right_margin_position = int.parse (val);
-                        break;
-                    default:
-                        warning ("unrecognised name/value %s/%s", name, val);
-                        break;
-                }
+        if (file == null || !file.query_exists ()) {
+            return;
+        }
+
+        var handle = new EditorConfig.Handle ();
+        handle.set_conf_file_name (".editorconfig");
+        if (handle.parse (file.get_path ()) != 0) {
+            return;
+        }
+
+        for (int i = 0; i < handle.get_name_value_count (); i++) {
+            string name, val;
+            handle.get_name_value (i, out name, out val);
+            /* These are all properties (https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties) */
+            switch (name) {
+                case "indent_style":
+                    format_bar.tab_style_set_by_editor_config = true;
+                    var use_spaces = (val != "tab");
+                    format_bar.set_insert_spaces_instead_of_tabs (use_spaces);
+                    break;
+                case "indent_size":
+                case "tab_width":
+                    format_bar.tab_width_set_by_editor_config = true;
+                    var indent_width = (int.parse (val)).clamp (2, 16);
+                    format_bar.set_tab_width (indent_width);
+                    break;
+                case "end_of_line":
+                    break;
+                case "charset":
+                    break;
+                case "trim_trailing_whitespace":
+                    break;
+                case "insert_final_newline":
+                    break;
+                case "max_line_length":
+                    view.right_margin_position = int.parse (val);
+                    break;
+                default:
+                    warning ("unrecognised name/value %s/%s", name, val);
+                    break;
             }
-        });
+        }
     }
 
-    public void deactivate () { }
+    public void deactivate () { debug ("Editor config deactivate");}
 }
 
 [ModuleInit]

plugins/editorconfig/editorconfig.vala

@@ -23,9 +23,7 @@ public class Scratch.Plugins.HighlightSelectedWords : Peas.ExtensionBase, Peas.A
     Scratch.MainWindow? main_window = null;
     Gtk.SourceSearchContext? current_search_context = null;
 
-    // Consts
-    // Pneumonoultramicroscopicsilicovolcanoconiosis longest word in a major dictionary @ 45
-    private const uint SELECTION_HIGHLIGHT_MAX_CHARS = 45;
+    private const uint SELECTION_HIGHLIGHT_MAX_CHARS = 255;
 
     Scratch.Services.Interface plugins;
     public Object object { owned get; construct; }
@@ -50,12 +48,8 @@ public class Scratch.Plugins.HighlightSelectedWords : Peas.ExtensionBase, Peas.A
         });
     }
 
-    public void on_selection_changed (ref Gtk.TextIter start, ref Gtk.TextIter end) {
-        var window_search_context = main_window != null ? main_window.search_bar.search_context : null;
-
-        if (window_search_context == null ||
-            window_search_context.settings.search_text == "" ||
-            window_search_context.get_occurrences_count () == 0) {
+    public void on_selection_changed (ref Gtk.TextIter start, ref Gtk.TextIter end) requires (main_window != null) {
+        if (!main_window.has_successful_search ()) {
             // Perform plugin selection when there is no ongoing and successful search 
             current_search_context = new Gtk.SourceSearchContext (
                 (Gtk.SourceBuffer)current_source.buffer,

plugins/highlight-word-selection/highlight-word-selection.vala

@@ -2,6 +2,7 @@ module_name = 'word-completion'
 
 module_files = [
     'prefix-tree.vala',
+    'prefix-tree-node.vala',
     'completion-provider.vala',
     'engine.vala',
     'plugin.vala'

plugins/word-completion/meson.build

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2024 elementary, Inc. <https://elementary.io>
+ *           2011 Lucas Baudin <xapantu@gmail.com>
+ *  *
+ * This is a free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+public class Scratch.Plugins.PrefixNode : Object {
+    public enum NodeType {
+        ROOT,
+        CHAR,
+        WORD_END
+    }
+
+    private const unichar WORD_END_CHAR = '\0';
+    private uint occurrences; // Only used for WORD_END nodes
+
+    public unichar uc { get; construct; }
+    public NodeType node_type { get; construct; }
+    public PrefixNode? parent { get; construct; }
+    public unichar value { get; construct; }
+
+    public Gee.ArrayList<PrefixNode> children;
+
+    public PrefixNode.from_unichar (unichar c, PrefixNode? _parent) requires (c != WORD_END_CHAR) {
+        Object (
+            value: c,
+            parent: _parent,
+            uc: c,
+            node_type: NodeType.CHAR
+        );
+    }
+
+    public PrefixNode.root () {
+        Object (
+            parent: null,
+            uc: WORD_END_CHAR,
+            node_type: NodeType.ROOT
+        );
+    }
+
+    public PrefixNode.word_end (PrefixNode _parent) {
+        Object (
+            parent: _parent,
+            uc: WORD_END_CHAR,
+            node_type: NodeType.WORD_END
+        );
+
+        occurrences = 1;
+    }
+
+    construct {
+        children = new Gee.ArrayList<PrefixNode> ();
+    }
+}

plugins/word-completion/prefix-tree-node.vala

@@ -1,14 +1,5 @@
 
 namespace Scratch.Plugins {
-    private class PrefixNode : Object {
-        public GLib.List<PrefixNode> children;
-        public unichar value { get; set; }
-
-        construct {
-            children = new List<PrefixNode> ();
-        }
-    }
-
     public class PrefixTree : Object {
         private PrefixNode root;
         public bool completed { get; set; default = false; }
@@ -18,9 +9,7 @@ namespace Scratch.Plugins {
         }
 
         public void clear () {
-            root = new PrefixNode () {
-                value = '\0'
-            };
+            root = new PrefixNode ();
         }
 
         public void insert (string word) {
@@ -48,10 +37,9 @@ namespace Scratch.Plugins {
                 }
             }
 
-            var new_child = new PrefixNode () {
-                value = curr
-            };
-            node.children.insert_sorted (new_child, (c1, c2) => {
+            var new_child = new PrefixNode.from_unichar (curr, null);
+            node.children.insert (0, new_child);
+            node.children.sort ((c1, c2) => {
                 if (c1.value > c2.value) {
                     return 1;
                 } else if (c1.value == c2.value) {

plugins/word-completion/prefix-tree.vala

@@ -5,6 +5,8 @@ src/Dialogs/GlobalSearchDialog.vala
 src/Dialogs/NewBranchDialog.vala
 src/Dialogs/PreferencesDialog.vala
 src/Dialogs/RestoreConfirmationDialog.vala
+src/Dialogs/CloseProjectsConfirmationDialog.vala
+src/Dialogs/OverwriteUncommittedConfirmationDialog.vala
 src/FolderManager/File.vala
 src/FolderManager/FileItem.vala
 src/FolderManager/FileView.vala
@@ -13,6 +15,7 @@ src/FolderManager/Item.vala
 src/FolderManager/ProjectFolderItem.vala
 src/Services/Document.vala
 src/Services/FileHandler.vala
+src/Services/MonitoredRepository.vala
 src/Services/PluginManager.vala
 src/Services/Settings.vala
 src/Services/TemplateManager.vala