Merge dev fixes

.gitignore

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

data/io.elementary.code.appdata.xml.in

@@ -26,6 +26,14 @@
     </ul>
   </description>
   <releases>
+    <release version="6.1.1" date="2021-11-23" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+        <ul>
+          <li>Show symbol list on the right of the document instead of as a tab in the sidebar</li>
+        </ul>
+      </description>
+    </release>
     <release version="6.1.0" date="2021-11-23" urgency="medium">
       <description>
         <p>Improvements:</p>

data/io.elementary.code.gschema.xml

@@ -121,7 +121,7 @@
       <description>Set the preferred font.</description>
     </key>
     <key name="style-scheme" type="s">
-      <default>'solarized-light'</default>
+      <default>'elementary-light'</default>
       <summary>Preferred Style Scheme</summary>
       <description>Set the preferred style scheme.</description>
     </key>
@@ -140,6 +140,11 @@
       <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="strip-trailing-on-save" type="b">
+      <default>false</default>
+      <summary>Whether to automatically remove trailing whitespace on saving</summary>
+      <description>Whether trailing whitespace should be removed from a document whenever it is saved, including on autosave.</description>
+    </key>
   </schema>
 
   <schema path="/io/elementary/code/services/" id="io.elementary.code.services" gettext-domain="io.elementary.code">

data/meson.build

@@ -11,6 +11,11 @@ foreach i : icon_sizes
     )
 endforeach
 
+install_data([
+  'styles/elementary-dark.xml',
+  'styles/elementary-light.xml',
+], install_dir: join_paths(get_option('datadir'), 'gtksourceview-4', 'styles'))
+
 install_data([
   'fonts/BuilderBlocks.ttf',
 ], install_dir: join_paths(get_option('datadir'), meson.project_name(), 'fonts'))

data/styles/elementary-dark.xml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<style-scheme id="elementary-dark" _name="elementary Dark" version="1.0">
+  <author>Micah Ilbery</author>
+  <_description>Color scheme using the elementary color palette</_description>
+
+  <!-- Background Colors Palette -->
+  <color name="bg-0"  value="#485a6c"/> <!-- SLATE500 -->
+  <color name="bg-1"  value="#2a3441"/> <!-- SLATE700 BLACK500 MIX 75% -->
+  <color name="bg-2"  value="#212730"/> <!-- SLATE700 BLACK700 MIX 50% -->
+  <color name="bg-3"  value="#1d2125"/> <!-- SLATE700 BLACK700 MIX 25% -->
+  <color name="bg-4"  value="#0e141f"/> <!-- SLATE900 -->
+
+  <color name="fg-0"   value="#d4d4d4"/> <!-- SILVER300 -->
+  <color name="fg-1"   value="#abacae"/> <!-- SILVER500 -->
+  <color name="fg-2"   value="#667885"/> <!-- SLATE300 -->
+
+  <color name="yellow"  value="#ffe16b"/> <!-- BANANA -->
+  <color name="orange"  value="#ffa154"/> <!-- ORANGE -->
+  <color name="red"     value="#ed5353"/> <!-- STRAWBERRY -->
+  <color name="pink"    value="#f4679d"/> <!-- BUBBLEGUM -->
+  <color name="purple"  value="#cd9ef7"/> <!-- GRAPE -->
+  <color name="blue"    value="#64baff"/> <!-- BLUEBERRY -->
+  <color name="cyan"    value="#28bca3"/> <!-- MINT -->
+  <color name="green"   value="#9bdb4d"/> <!-- LIME -->
+
+  <!-- Global Settings -->
+  <style name="text"                        foreground="fg-0" background="bg-2"/>
+  <style name="selection"                   foreground="bg-4" background="bg-0"/>
+  <style name="cursor"                      foreground="fg-0"/>
+  <style name="secondary-cursor"            foreground="fg-1"/>
+  <style name="current-line"                background="bg-1"/>
+  <style name="line-numbers"                foreground="fg-2" background="bg-3"/>
+  <style name="background-pattern"          background="bg-4"/>
+  <style name="draw-spaces"                 foreground="fg-2"/>
+
+  <!-- Bracket Matching -->
+  <style name="bracket-match"               foreground="bg-4" background="fg-0"/>
+  <style name="bracket-mismatch"            foreground="red" background="fg-2"/>
+
+  <!-- Right Margin -->
+  <style name="right-margin"                foreground="bg-2" background="fg-1"/>
+
+  <!-- Search Matching -->
+  <style name="search-match"                foreground="bg-4" background="yellow"/>
+
+  <!-- Comments -->
+  <style name="def:comment"                 foreground="fg-2"/>
+  <style name="def:shebang"                 foreground="fg-2" bold="true"/>
+  <style name="def:doc-comment-element"     italic="true"/>
+
+  <!-- Constants -->
+  <style name="def:constant"                foreground="cyan"/>
+  <style name="def:special-char"            foreground="green"/>
+
+  <!-- Identifiers -->
+  <style name="def:identifier"              foreground="blue"/>
+
+  <!-- Statements -->
+  <style name="def:statement"               foreground="orange"/>
+
+  <!-- Types -->
+  <style name="def:type"                    foreground="yellow"/>
+
+  <!-- Markup -->
+  <style name="def:emphasis"                italic="true"/>
+  <style name="def:strong-emphasis"         foreground="orange"/>
+  <style name="def:inline-code"             foreground="blue"/>
+  <style name="def:insertion"               underline="single"/>
+  <style name="def:deletion"                strikethrough="true"/>
+  <style name="def:link-text"               foreground="fg-2"/>
+  <style name="def:link-symbol"             foreground="fg-2" bold="true"/>
+  <style name="def:link-destination"        italic="true" underline="single"/>
+  <style name="def:heading"                 foreground="yellow"/>
+  <style name="def:thematic-break"          foreground="yellow"/>
+  <style name="def:preformatted-section"    foreground="blue"/>
+  <style name="def:list-marker"             foreground="orange"/>
+
+  <!-- Operators -->
+  <style name="def:operator"                foreground="green"/>
+
+  <!-- Others -->
+  <style name="def:preprocessor"            foreground="purple"/>
+  <style name="def:error"                   foreground="red" bold="true"/>
+  <style name="def:note"                    foreground="pink" bold="true"/>
+  <style name="def:net-address"             italic="true" underline="single"/>
+
+  <!-- Language specific styles -->
+  <style name="diff:added-line"             foreground="green"/>
+  <style name="diff:removed-line"           foreground="red"/>
+  <style name="diff:changed-line"           foreground="yellow"/>
+  <style name="diff:special-case"           use-style="def:constant"/>
+  <style name="diff:location"               use-style="def:statement"/>
+  <style name="diff:diff-file"              use-style="def:type"/>
+
+  <style name="xml:tags"                    foreground="cyan"/>
+  <style name="xml:attribute-name"          foreground="purple"/>
+  <style name="xml:namespace"               foreground="green" bold="true"/>
+
+  <style name="js:built-in-constructor"     use-style="def:identifier"/>
+
+  <style name="latex:display-math"          foreground="purple"/>
+  <style name="latex:command"               foreground="green" bold="true"/>
+  <style name="latex:include"               use-style="def:preprocessor"/>
+
+  <style name="sh:variable"                 foreground="purple"/>
+
+  <!-- legacy styles for old lang files -->
+  <style name="Others"                      foreground="green" bold="true"/>
+  <style name="Others 2"                    foreground="cyan"/>
+  <style name="Others 3"                    foreground="purple"/>
+
+</style-scheme>

data/styles/elementary-light.xml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<style-scheme id="elementary-light" _name="elementary Light" version="1.0">
+  <author>Micah Ilbery</author>
+  <_description>Color scheme using the elementary color palette</_description>
+
+  <!-- Background Colors Palette -->
+  <color name="bg-0"  value="#f7f3ed"/> <!-- LATTE100 SILVER100 MIX 25% -->
+  <color name="bg-1"  value="#f5eddf"/> <!-- LATTE100 SILVER100 MIX 50% -->
+  <color name="bg-2"  value="#f2e6d2"/> <!-- LATTE100 SILVER100 MIX 75% -->
+  <color name="bg-3"  value="#f0e2c9"/> <!-- LATTE100 SILVER100 MIX 90% -->
+  <color name="bg-4"  value="#efdfc4"/> <!-- LATTE100 -->
+
+  <color name="fg-0"   value="#555761"/> <!-- SILVER900 -->
+  <color name="fg-1"   value="#7e8087"/> <!-- SILVER700 -->
+  <color name="fg-2"   value="#abacae"/> <!-- SILVER300 -->
+
+  <color name="yellow"  value="#d48e15"/> <!-- BANANA700 -->
+  <color name="orange"  value="#cc3b02"/> <!-- ORANGE700 -->
+  <color name="red"     value="#c6262e"/> <!-- STRAWBERRY500 -->
+  <color name="pink"    value="#bc245d"/> <!-- BUBBLEGUM700 -->
+  <color name="purple"  value="#a56de2"/> <!-- GRAPE500 -->
+  <color name="blue"    value="#3689e6"/> <!-- BLUEBERRY500 -->
+  <color name="cyan"    value="#0e9a83"/> <!-- MINT700 -->
+  <color name="green"   value="#68b723"/> <!-- LIME500 -->
+
+  <!-- Global Settings -->
+  <style name="text"                        foreground="fg-0" background="bg-1"/>
+  <style name="selection"                   foreground="fg-1" background="bg-4"/>
+  <style name="cursor"                      foreground="fg-0"/>
+  <style name="secondary-cursor"            foreground="fg-1"/>
+  <style name="current-line"                background="bg-1"/>
+  <style name="line-numbers"                foreground="fg-1" background="bg-2"/>
+  <style name="background-pattern"          background="bg-4"/>
+  <style name="draw-spaces"                 foreground="fg-1"/>
+
+  <!-- Bracket Matching -->
+  <style name="bracket-match"               foreground="bg-4" background="fg-2"/>
+  <style name="bracket-mismatch"            foreground="red" background="fg-2"/>
+
+  <!-- Right Margin -->
+  <style name="right-margin"                foreground="bg-3" background="fg-1"/>
+
+  <!-- Search Matching -->
+  <style name="search-match"                foreground="bg-4" background="yellow"/>
+
+  <!-- Comments -->
+  <style name="def:comment"                 foreground="fg-1"/>
+  <style name="def:shebang"                 foreground="fg-1" bold="true"/>
+  <style name="def:doc-comment-element"     italic="true"/>
+
+  <!-- Constants -->
+  <style name="def:constant"                foreground="cyan"/>
+  <style name="def:special-char"            foreground="green"/>
+
+  <!-- Identifiers -->
+  <style name="def:identifier"              foreground="blue"/>
+
+  <!-- Statements -->
+  <style name="def:statement"               foreground="orange"/>
+
+  <!-- Types -->
+  <style name="def:type"                    foreground="yellow"/>
+
+  <!-- Markup -->
+  <style name="def:emphasis"                italic="true"/>
+  <style name="def:strong-emphasis"         foreground="orange"/>
+  <style name="def:inline-code"             foreground="blue"/>
+  <style name="def:insertion"               underline="single"/>
+  <style name="def:deletion"                strikethrough="true"/>
+  <style name="def:link-text"               foreground="fg-1"/>
+  <style name="def:link-symbol"             foreground="fg-1" bold="true"/>
+  <style name="def:link-destination"        italic="true" underline="single"/>
+  <style name="def:heading"                 foreground="yellow"/>
+  <style name="def:thematic-break"          foreground="yellow"/>
+  <style name="def:preformatted-section"    foreground="blue"/>
+  <style name="def:list-marker"             foreground="orange"/>
+
+  <!-- Operators -->
+  <style name="def:operator"                foreground="green"/>
+
+  <!-- Others -->
+  <style name="def:preprocessor"            foreground="purple"/>
+  <style name="def:error"                   foreground="red" bold="true"/>
+  <style name="def:note"                    foreground="pink" bold="true"/>
+  <style name="def:net-address"             italic="true" underline="single"/>
+
+  <!-- Language specific styles -->
+  <style name="diff:added-line"             foreground="green"/>
+  <style name="diff:removed-line"           foreground="red"/>
+  <style name="diff:changed-line"           foreground="yellow"/>
+  <style name="diff:special-case"           use-style="def:constant"/>
+  <style name="diff:location"               use-style="def:statement"/>
+  <style name="diff:diff-file"              use-style="def:type"/>
+
+  <style name="xml:tags"                    foreground="cyan"/>
+  <style name="xml:attribute-name"          foreground="purple"/>
+  <style name="xml:namespace"               foreground="green" bold="true"/>
+
+  <style name="js:built-in-constructor"     use-style="def:identifier"/>
+
+  <style name="latex:display-math"          foreground="purple"/>
+  <style name="latex:command"               foreground="green" bold="true"/>
+  <style name="latex:include"               use-style="def:preprocessor"/>
+
+  <style name="sh:variable"                 foreground="purple"/>
+
+  <!-- legacy styles for old lang files -->
+  <style name="Others"                      foreground="green" bold="true"/>
+  <style name="Others 2"                    foreground="cyan"/>
+  <style name="Others 3"                    foreground="purple"/>
+
+</style-scheme>

plugins/meson.build

@@ -9,7 +9,8 @@ subdir('outline')
 subdir('pastebin')
 subdir('preserve-indent')
 subdir('spell')
-subdir('strip-trailing-save')
+subdir('snippets')
 subdir('terminal')
 subdir('vim-emulation')
 subdir('word-completion')
+

plugins/outline/C/CtagsSymbolOutline.vala

@@ -18,14 +18,19 @@
 
 public class Code.Plugins.CtagsSymbolOutline : Object, Code.Plugins.SymbolOutline {
     public const string OUTLINE_RESOURCE_URI = "resource:///io/elementary/code/plugin/outline/";
-    public Scratch.Services.Document doc { get; protected set; }
-    Granite.Widgets.SourceList store;
-    Granite.Widgets.SourceList.ExpandableItem root;
-    GLib.Subprocess current_subprocess;
+    public Scratch.Services.Document doc { get; construct; }
+    private Granite.Widgets.SourceList store;
+    private Granite.Widgets.SourceList.ExpandableItem root;
+    private GLib.Subprocess current_subprocess;
 
     public CtagsSymbolOutline (Scratch.Services.Document _doc) {
-        doc = _doc;
-        doc.doc_saved.connect (() => {parse_symbols ();});
+        Object (
+            doc: _doc
+        );
+    }
+
+    construct {
+        doc.doc_saved.connect (parse_symbols);
         doc.doc_closed.connect (doc_closed);
 
         root = new Granite.Widgets.SourceList.ExpandableItem (_("Symbols"));
@@ -43,13 +48,16 @@ public class Code.Plugins.CtagsSymbolOutline : Object, Code.Plugins.SymbolOutlin
     }
 
     ~CtagsSymbolOutline () {
-        doc.doc_closed.disconnect (doc_closed);
+        debug ("Destroy Ctags outline");
     }
 
     void doc_closed (Scratch.Services.Document doc) {
-        closed ();
-    }
+        doc.doc_closed.disconnect (doc_closed);
+        doc.doc_saved.disconnect (parse_symbols);
 
+        doc.remove_outline_widget ();
+        doc.steal_data<SymbolOutline> ("SymbolOutline");
+    }
     public void parse_symbols () {
         if (current_subprocess != null)
             current_subprocess.force_exit ();