Commits November 2022

commits@lists.geany.org

1 participants
18 discussions

[geany/geany] b6de99: Change default label for end of line characters to "EOL" in statusbar
by Enrico Tröger 13 Nov '22

13 Nov '22

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 11 Sep 2022 15:36:40 UTC Commit: b6de99ddb652bd70c87facf9fa6029486450691c https://github.com/geany/geany/commit/b6de99ddb652bd70c87facf9fa60294864506… Log Message: ----------- Change default label for end of line characters to "EOL" in statusbar Modified Paths: -------------- doc/geany.txt src/ui_utils.c Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2705,7 +2705,7 @@ Statusbar Templates The default statusbar template is (note ``\t`` = tab): -``line: %l / %L\t col: %c\t sel: %s\t %w %t %mmode: %M encoding: %e filetype: %f scope: %S`` +``line: %l / %L\t col: %c\t sel: %s\t %w %t %mEOL: %M encoding: %e filetype: %f scope: %S`` Settings the preference to an empty string will also cause Geany to use this internal default. Modified: src/ui_utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -63,7 +63,7 @@ "col: %c\t " \ "sel: %s\t " \ "%w %t %m" \ - "mode: %M " \ + "EOL: %M " \ "encoding: %e " \ "filetype: %f " \ "scope: %S") -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 39e129: Add option to only show line endings if they differ from file default
by Enrico Tröger 13 Nov '22

13 Nov '22

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 11 Sep 2022 15:36:40 UTC Commit: 39e129bf382324cf27caa8d07dea10071f13e4da https://github.com/geany/geany/commit/39e129bf382324cf27caa8d07dea10071f13e… Log Message: ----------- Add option to only show line endings if they differ from file default Modified Paths: -------------- data/geany.glade doc/geany.txt src/editor.c src/editor.h src/keyfile.c src/plugindata.h src/prefs.c src/sciwrappers.c src/sciwrappers.h Modified: data/geany.glade 52 lines changed, 39 insertions(+), 13 deletions(-) =================================================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkAccelGroup" id="accelgroup1"/> @@ -3811,19 +3811,45 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="check_line_end"> - <property name="label" translatable="yes">Show line endings</property> + <object class="GtkFrame"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes">Shows the line ending character</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child type="label"> + <object class="GtkCheckButton" id="check_line_end"> + <property name="label" translatable="yes">Show line endings</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Shows the line ending character</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + </child> + <child> + <object class="GtkAlignment"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="left-padding">12</property> + <child> + <object class="GtkCheckButton" id="check_line_endings_only_when_differ"> + <property name="label" translatable="yes">Show only non-default line endings</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Shows line ending characters only when they differ from the file default line ending character</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -3839,7 +3865,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -3855,7 +3881,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -3871,7 +3897,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -3912,7 +3938,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> </object> Modified: doc/geany.txt 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -2301,6 +2301,10 @@ Show line endings Display a symbol everywhere that a carriage return or line feed is present. +Show only non-default line endings + Shows line ending characters only when they differ from the + file default line ending character. + Show line numbers Show or hide the Line Number margin. Modified: src/editor.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -5150,6 +5150,7 @@ void editor_apply_update_prefs(GeanyEditor *editor) sci_set_visible_eols(sci, editor_prefs.show_line_endings); sci_set_symbol_margin(sci, editor_prefs.show_markers_margin); sci_set_line_numbers(sci, editor_prefs.show_linenumber_margin); + sci_set_eol_representation_characters(sci, sci_get_eol_mode(sci)); sci_set_folding_margin_visible(sci, editor_prefs.folding); Modified: src/editor.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -138,6 +138,7 @@ typedef struct GeanyEditorPrefs gint autocompletion_update_freq; gint scroll_lines_around_cursor; gint ime_interaction; /* input method editor's candidate window behaviour */ + gboolean show_line_endings_only_when_differ; } GeanyEditorPrefs; Modified: src/keyfile.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -543,6 +543,7 @@ static void save_dialog_prefs(GKeyFile *config) g_key_file_set_boolean(config, PACKAGE, "show_indent_guide", editor_prefs.show_indent_guide); g_key_file_set_boolean(config, PACKAGE, "show_white_space", editor_prefs.show_white_space); g_key_file_set_boolean(config, PACKAGE, "show_line_endings", editor_prefs.show_line_endings); + g_key_file_set_boolean(config, PACKAGE, "show_line_endings_only_when_differ", editor_prefs.show_line_endings_only_when_differ); g_key_file_set_boolean(config, PACKAGE, "show_markers_margin", editor_prefs.show_markers_margin); g_key_file_set_boolean(config, PACKAGE, "show_linenumber_margin", editor_prefs.show_linenumber_margin); g_key_file_set_boolean(config, PACKAGE, "long_line_enabled", editor_prefs.long_line_enabled); @@ -905,6 +906,7 @@ static void load_dialog_prefs(GKeyFile *config) editor_prefs.show_indent_guide = utils_get_setting_boolean(config, PACKAGE, "show_indent_guide", FALSE); editor_prefs.show_white_space = utils_get_setting_boolean(config, PACKAGE, "show_white_space", FALSE); editor_prefs.show_line_endings = utils_get_setting_boolean(config, PACKAGE, "show_line_endings", FALSE); + editor_prefs.show_line_endings_only_when_differ = utils_get_setting_boolean(config, PACKAGE, "show_line_endings_only_when_differ", FALSE); editor_prefs.scroll_stop_at_last_line = utils_get_setting_boolean(config, PACKAGE, "scroll_stop_at_last_line", TRUE); editor_prefs.auto_close_xml_tags = utils_get_setting_boolean(config, PACKAGE, "auto_close_xml_tags", TRUE); editor_prefs.complete_snippets = utils_get_setting_boolean(config, PACKAGE, "complete_snippets", TRUE); Modified: src/plugindata.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -57,7 +57,7 @@ G_BEGIN_DECLS * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 244 +#define GEANY_API_VERSION 245 /* hack to have a different ABI when built with different GTK major versions * because loading plugins linked to a different one leads to crashes. Modified: src/prefs.c 19 lines changed, 19 insertions(+), 0 deletions(-) =================================================================== @@ -88,6 +88,7 @@ static void on_toolbar_show_toggled(GtkToggleButton *togglebutton, gpointer user static void on_show_notebook_tabs_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_enable_plugins_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_use_folding_toggled(GtkToggleButton *togglebutton, gpointer user_data); +static void on_check_line_end_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_open_encoding_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_sidebar_visible_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_prefs_print_radio_button_toggled(GtkToggleButton *togglebutton, gpointer user_data); @@ -595,6 +596,10 @@ static void prefs_init_dialog(void) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_end"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_line_endings); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_endings_only_when_differ"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + editor_prefs.show_line_endings_only_when_differ); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_numbers"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_linenumber_margin); @@ -1071,6 +1076,10 @@ on_prefs_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_end"); editor_prefs.show_line_endings = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_endings_only_when_differ"); + editor_prefs.show_line_endings_only_when_differ = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(widget)); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_numbers"); editor_prefs.show_linenumber_margin = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); @@ -1537,6 +1546,14 @@ static void on_use_folding_toggled(GtkToggleButton *togglebutton, gpointer user_ } +static void on_check_line_end_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ + gboolean sens = gtk_toggle_button_get_active(togglebutton); + + gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_endings_only_when_differ"), sens); +} + + static void on_enable_plugins_toggled(GtkToggleButton *togglebutton, gpointer user_data) { gboolean sens = gtk_toggle_button_get_active(togglebutton); @@ -1810,6 +1827,8 @@ void prefs_show_dialog(void) "toggled", G_CALLBACK(on_show_notebook_tabs_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_folding"), "toggled", G_CALLBACK(on_use_folding_toggled), NULL); + g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_end"), + "toggled", G_CALLBACK(on_check_line_end_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"), "toggled", G_CALLBACK(on_open_encoding_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_sidebar_visible"), Modified: src/sciwrappers.c 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -37,6 +37,7 @@ #include "sciwrappers.h" #include <Lexilla.h> /* ILexer5 */ +#include "editor.h" #include "utils.h" #include <string.h> @@ -269,6 +270,30 @@ gint sci_get_eol_mode(ScintillaObject *sci) void sci_set_eol_mode(ScintillaObject *sci, gint eolmode) { SSM(sci, SCI_SETEOLMODE, (uptr_t) eolmode, 0); + sci_set_eol_representation_characters(sci, eolmode); +} + + +/* Show only EOL characters if they differ from the file default EOL character */ +void sci_set_eol_representation_characters(ScintillaObject *sci, gint new_eolmode) +{ + const gchar *eolchar = NULL; + const gchar *new_eolchar = NULL; + gboolean visible = FALSE; + gint *eolmode; + gint appearance; + gint eol_modes[3] = {SC_EOL_CRLF, SC_EOL_CR, SC_EOL_LF}; + + foreach_c_array(eolmode, eol_modes, 3) + { + visible = (*eolmode != new_eolmode) || ! editor_prefs.show_line_endings_only_when_differ; + new_eolchar = (visible) ? utils_get_eol_short_name(*eolmode) : ""; + appearance = (visible) ? SC_REPRESENTATION_BLOB : SC_REPRESENTATION_PLAIN; + eolchar = utils_get_eol_char(*eolmode); + + SSM(sci, SCI_SETREPRESENTATION, (sptr_t) eolchar, (sptr_t) new_eolchar); + SSM(sci, SCI_SETREPRESENTATIONAPPEARANCE, (sptr_t) eolchar, appearance); + } } Modified: src/sciwrappers.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -130,6 +130,7 @@ void sci_set_visible_white_spaces(ScintillaObject *sci, gboolean set); void sci_convert_eols (ScintillaObject *sci, gint eolmode); gint sci_get_eol_mode (ScintillaObject *sci); void sci_set_eol_mode (ScintillaObject *sci, gint eolmode); +void sci_set_eol_representation_characters(ScintillaObject *sci, gint new_eolmode); void sci_zoom_in (ScintillaObject *sci); void sci_zoom_out (ScintillaObject *sci); void sci_zoom_off (ScintillaObject *sci); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8f35d3: Merge pull request #3287 from eht16/feature/show_only_differing_eols
by Enrico Tröger 13 Nov '22

13 Nov '22

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 13 Nov 2022 12:39:37 UTC Commit: 8f35d3342df724145ee9a6873e4ed3a18446211d https://github.com/geany/geany/commit/8f35d3342df724145ee9a6873e4ed3a184462… Log Message: ----------- Merge pull request #3287 from eht16/feature/show_only_differing_eols Add option to only show line endings if they differ from file default Modified Paths: -------------- data/geany.glade doc/geany.txt src/editor.c src/editor.h src/keyfile.c src/plugindata.h src/prefs.c src/sciwrappers.c src/sciwrappers.h src/ui_utils.c Modified: data/geany.glade 52 lines changed, 39 insertions(+), 13 deletions(-) =================================================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkAccelGroup" id="accelgroup1"/> @@ -3811,19 +3811,45 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="check_line_end"> - <property name="label" translatable="yes">Show line endings</property> + <object class="GtkFrame"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes">Shows the line ending character</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child type="label"> + <object class="GtkCheckButton" id="check_line_end"> + <property name="label" translatable="yes">Show line endings</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Shows the line ending character</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + </child> + <child> + <object class="GtkAlignment"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="left-padding">12</property> + <child> + <object class="GtkCheckButton" id="check_line_endings_only_when_differ"> + <property name="label" translatable="yes">Show only non-default line endings</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Shows line ending characters only when they differ from the file default line ending character</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -3839,7 +3865,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -3855,7 +3881,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -3871,7 +3897,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -3912,7 +3938,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> </object> Modified: doc/geany.txt 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -2298,6 +2298,10 @@ Show line endings Display a symbol everywhere that a carriage return or line feed is present. +Show only non-default line endings + Shows line ending characters only when they differ from the + file default line ending character. + Show line numbers Show or hide the Line Number margin. @@ -2698,7 +2702,7 @@ Statusbar Templates The default statusbar template is (note ``\t`` = tab): -``line: %l / %L\t col: %c\t sel: %s\t %w %t %mmode: %M encoding: %e filetype: %f scope: %S`` +``line: %l / %L\t col: %c\t sel: %s\t %w %t %mEOL: %M encoding: %e filetype: %f scope: %S`` Settings the preference to an empty string will also cause Geany to use this internal default. Modified: src/editor.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -5148,6 +5148,7 @@ void editor_apply_update_prefs(GeanyEditor *editor) sci_set_visible_eols(sci, editor_prefs.show_line_endings); sci_set_symbol_margin(sci, editor_prefs.show_markers_margin); sci_set_line_numbers(sci, editor_prefs.show_linenumber_margin); + sci_set_eol_representation_characters(sci, sci_get_eol_mode(sci)); sci_set_folding_margin_visible(sci, editor_prefs.folding); Modified: src/editor.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -138,6 +138,7 @@ typedef struct GeanyEditorPrefs gint autocompletion_update_freq; gint scroll_lines_around_cursor; gint ime_interaction; /* input method editor's candidate window behaviour */ + gboolean show_line_endings_only_when_differ; } GeanyEditorPrefs; Modified: src/keyfile.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -542,6 +542,7 @@ static void save_dialog_prefs(GKeyFile *config) g_key_file_set_boolean(config, PACKAGE, "show_indent_guide", editor_prefs.show_indent_guide); g_key_file_set_boolean(config, PACKAGE, "show_white_space", editor_prefs.show_white_space); g_key_file_set_boolean(config, PACKAGE, "show_line_endings", editor_prefs.show_line_endings); + g_key_file_set_boolean(config, PACKAGE, "show_line_endings_only_when_differ", editor_prefs.show_line_endings_only_when_differ); g_key_file_set_boolean(config, PACKAGE, "show_markers_margin", editor_prefs.show_markers_margin); g_key_file_set_boolean(config, PACKAGE, "show_linenumber_margin", editor_prefs.show_linenumber_margin); g_key_file_set_boolean(config, PACKAGE, "long_line_enabled", editor_prefs.long_line_enabled); @@ -904,6 +905,7 @@ static void load_dialog_prefs(GKeyFile *config) editor_prefs.show_indent_guide = utils_get_setting_boolean(config, PACKAGE, "show_indent_guide", FALSE); editor_prefs.show_white_space = utils_get_setting_boolean(config, PACKAGE, "show_white_space", FALSE); editor_prefs.show_line_endings = utils_get_setting_boolean(config, PACKAGE, "show_line_endings", FALSE); + editor_prefs.show_line_endings_only_when_differ = utils_get_setting_boolean(config, PACKAGE, "show_line_endings_only_when_differ", FALSE); editor_prefs.scroll_stop_at_last_line = utils_get_setting_boolean(config, PACKAGE, "scroll_stop_at_last_line", TRUE); editor_prefs.auto_close_xml_tags = utils_get_setting_boolean(config, PACKAGE, "auto_close_xml_tags", TRUE); editor_prefs.complete_snippets = utils_get_setting_boolean(config, PACKAGE, "complete_snippets", TRUE); Modified: src/plugindata.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -57,7 +57,7 @@ G_BEGIN_DECLS * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 244 +#define GEANY_API_VERSION 245 /* hack to have a different ABI when built with different GTK major versions * because loading plugins linked to a different one leads to crashes. Modified: src/prefs.c 19 lines changed, 19 insertions(+), 0 deletions(-) =================================================================== @@ -88,6 +88,7 @@ static void on_toolbar_show_toggled(GtkToggleButton *togglebutton, gpointer user static void on_show_notebook_tabs_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_enable_plugins_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_use_folding_toggled(GtkToggleButton *togglebutton, gpointer user_data); +static void on_check_line_end_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_open_encoding_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_sidebar_visible_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_prefs_print_radio_button_toggled(GtkToggleButton *togglebutton, gpointer user_data); @@ -591,6 +592,10 @@ static void prefs_init_dialog(void) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_end"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_line_endings); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_endings_only_when_differ"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + editor_prefs.show_line_endings_only_when_differ); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_numbers"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_linenumber_margin); @@ -1063,6 +1068,10 @@ on_prefs_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_end"); editor_prefs.show_line_endings = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_endings_only_when_differ"); + editor_prefs.show_line_endings_only_when_differ = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(widget)); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_numbers"); editor_prefs.show_linenumber_margin = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); @@ -1529,6 +1538,14 @@ static void on_use_folding_toggled(GtkToggleButton *togglebutton, gpointer user_ } +static void on_check_line_end_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ + gboolean sens = gtk_toggle_button_get_active(togglebutton); + + gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_endings_only_when_differ"), sens); +} + + static void on_enable_plugins_toggled(GtkToggleButton *togglebutton, gpointer user_data) { gboolean sens = gtk_toggle_button_get_active(togglebutton); @@ -1802,6 +1819,8 @@ void prefs_show_dialog(void) "toggled", G_CALLBACK(on_show_notebook_tabs_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_folding"), "toggled", G_CALLBACK(on_use_folding_toggled), NULL); + g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_end"), + "toggled", G_CALLBACK(on_check_line_end_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"), "toggled", G_CALLBACK(on_open_encoding_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_sidebar_visible"), Modified: src/sciwrappers.c 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -37,6 +37,7 @@ #include "sciwrappers.h" #include <Lexilla.h> /* ILexer5 */ +#include "editor.h" #include "utils.h" #include <string.h> @@ -269,6 +270,30 @@ gint sci_get_eol_mode(ScintillaObject *sci) void sci_set_eol_mode(ScintillaObject *sci, gint eolmode) { SSM(sci, SCI_SETEOLMODE, (uptr_t) eolmode, 0); + sci_set_eol_representation_characters(sci, eolmode); +} + + +/* Show only EOL characters if they differ from the file default EOL character */ +void sci_set_eol_representation_characters(ScintillaObject *sci, gint new_eolmode) +{ + const gchar *eolchar = NULL; + const gchar *new_eolchar = NULL; + gboolean visible = FALSE; + gint *eolmode; + gint appearance; + gint eol_modes[3] = {SC_EOL_CRLF, SC_EOL_CR, SC_EOL_LF}; + + foreach_c_array(eolmode, eol_modes, 3) + { + visible = (*eolmode != new_eolmode) || ! editor_prefs.show_line_endings_only_when_differ; + new_eolchar = (visible) ? utils_get_eol_short_name(*eolmode) : ""; + appearance = (visible) ? SC_REPRESENTATION_BLOB : SC_REPRESENTATION_PLAIN; + eolchar = utils_get_eol_char(*eolmode); + + SSM(sci, SCI_SETREPRESENTATION, (sptr_t) eolchar, (sptr_t) new_eolchar); + SSM(sci, SCI_SETREPRESENTATIONAPPEARANCE, (sptr_t) eolchar, appearance); + } } Modified: src/sciwrappers.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -130,6 +130,7 @@ void sci_set_visible_white_spaces(ScintillaObject *sci, gboolean set); void sci_convert_eols (ScintillaObject *sci, gint eolmode); gint sci_get_eol_mode (ScintillaObject *sci); void sci_set_eol_mode (ScintillaObject *sci, gint eolmode); +void sci_set_eol_representation_characters(ScintillaObject *sci, gint new_eolmode); void sci_zoom_in (ScintillaObject *sci); void sci_zoom_out (ScintillaObject *sci); void sci_zoom_off (ScintillaObject *sci); Modified: src/ui_utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -63,7 +63,7 @@ "col: %c\t " \ "sel: %s\t " \ "%w %t %m" \ - "mode: %M " \ + "EOL: %M " \ "encoding: %e " \ "filetype: %f " \ "scope: %S") -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a24655: Process header tags
by Jiří Techet 11 Nov '22

11 Nov '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 03 Nov 2022 22:25:34 UTC Commit: a24655d61d6bd4b7b7ebb0b1d3a8b3603f43975e https://github.com/geany/geany/commit/a24655d61d6bd4b7b7ebb0b1d3a8b3603f439… Log Message: ----------- Process header tags Enable header tag generation in ctags, introduce new tm_tag_header_t TMTagType. Disable usage of this tag for normal Geany usage such as symbol tree, tag generation or autocompletion. We'll use this tag type only for sorting autocompletion symbols. Modified Paths: -------------- src/symbols.c src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h src/tagmanager/tm_workspace.c Modified: src/symbols.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1133,7 +1133,7 @@ gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode) g_return_val_if_fail(DOC_VALID(doc), FALSE); - tags = get_tag_list(doc, ~tm_tag_local_var_t); + tags = get_tag_list(doc, ~(tm_tag_local_var_t | tm_tag_include_t)); if (tags == NULL) return FALSE; Modified: src/tagmanager/tm_parser.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -69,7 +69,7 @@ static GHashTable *subparser_map = NULL; {'u', tm_tag_union_t}, /* union */ \ {'v', tm_tag_variable_t}, /* variable */ \ {'x', tm_tag_externvar_t}, /* externvar */ \ - {'h', tm_tag_undef_t}, /* header */ \ + {'h', tm_tag_include_t}, /* header */ \ {'l', tm_tag_local_var_t}, /* local */ \ {'z', tm_tag_local_var_t}, /* parameter */ \ {'L', tm_tag_undef_t}, /* label */ \ @@ -81,7 +81,7 @@ static TMParserMapEntry map_C[] = { /* Used also by other languages than C - keep all the tm_tag_* here even though * they aren't used by C as they might be used by some other language */ static TMParserMapGroup group_C[] = { - {_("Namespaces"), TM_ICON_NAMESPACE, tm_tag_namespace_t | tm_tag_package_t}, + {_("Namespaces"), TM_ICON_NAMESPACE, tm_tag_namespace_t | tm_tag_package_t | tm_tag_include_t}, {_("Classes"), TM_ICON_CLASS, tm_tag_class_t}, {_("Interfaces"), TM_ICON_STRUCT, tm_tag_interface_t}, {_("Functions"), TM_ICON_METHOD, tm_tag_prototype_t | tm_tag_method_t | tm_tag_function_t}, Modified: src/tagmanager/tm_parser.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -42,7 +42,8 @@ typedef enum tm_tag_macro_with_arg_t = 131072, /**< Parameterized macro */ tm_tag_local_var_t = 262144, /**< Local variable (inside function) */ tm_tag_other_t = 524288, /**< Other (non C/C++/Java tag) */ - tm_tag_max_t = 1048575 /**< Maximum value of TMTagType */ + tm_tag_include_t = 1048576, /**< C/C++ included header file name */ + tm_tag_max_t = 2097151 /**< Maximum value of TMTagType */ } TMTagType; Modified: src/tagmanager/tm_workspace.c 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -540,7 +540,7 @@ static gboolean create_global_tags_preprocessed(const char *pre_process_cmd, } tm_tags_sort(source_file->tags_array, global_tags_sort_attrs, TRUE, FALSE); - filtered_tags = tm_tags_extract(source_file->tags_array, ~tm_tag_local_var_t); + filtered_tags = tm_tags_extract(source_file->tags_array, ~(tm_tag_local_var_t | tm_tag_include_t)); ret = tm_source_file_write_tags_file(tags_file, filtered_tags); g_ptr_array_free(filtered_tags, TRUE); tm_source_file_free(source_file); @@ -573,7 +573,7 @@ static gboolean create_global_tags_direct(GList *source_files, const char *tags_ } } - filtered_tags = tm_tags_extract(tags, ~tm_tag_local_var_t); + filtered_tags = tm_tags_extract(tags, ~(tm_tag_local_var_t | tm_tag_include_t)); tm_tags_sort(filtered_tags, global_tags_sort_attrs, TRUE, FALSE); if (filtered_tags->len > 0) @@ -676,7 +676,8 @@ gboolean tm_workspace_is_autocomplete_tag(TMTag *tag, gboolean valid_local = !tag->local || current_file == tag->file; return valid && valid_local && - !tm_tag_is_anon(tag) && tm_parser_langs_compatible(lang, tag->lang); + !tm_tag_is_anon(tag) && tm_parser_langs_compatible(lang, tag->lang) && + !(tag->type & tm_tag_include_t); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e441e5: Maintain a hash table of TMSourceFiles inside TMWorkspace
by Jiří Techet 11 Nov '22

11 Nov '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 05 Sep 2022 21:03:09 UTC Commit: e441e514d4810aa0d3bf70487c7b10f64745608f https://github.com/geany/geany/commit/e441e514d4810aa0d3bf70487c7b10f647456… Log Message: ----------- Maintain a hash table of TMSourceFiles inside TMWorkspace This allows us to quickly access TMSourceFile based on the file name. Modified Paths: -------------- src/tagmanager/tm_workspace.c src/tagmanager/tm_workspace.h Modified: src/tagmanager/tm_workspace.c 46 lines changed, 38 insertions(+), 8 deletions(-) =================================================================== @@ -64,6 +64,12 @@ static TMTagType TM_GLOBAL_TYPE_MASK = static TMWorkspace *theWorkspace = NULL; +static void free_ptr_array(gpointer arr) +{ + g_ptr_array_free(arr, TRUE); +} + + static gboolean tm_create_workspace(void) { theWorkspace = g_new(TMWorkspace, 1); @@ -73,6 +79,8 @@ static gboolean tm_create_workspace(void) theWorkspace->source_files = g_ptr_array_new(); theWorkspace->typename_array = g_ptr_array_new(); theWorkspace->global_typename_array = g_ptr_array_new(); + theWorkspace->source_file_map = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, + free_ptr_array); tm_ctags_init(); tm_parser_verify_type_mappings(); @@ -92,6 +100,7 @@ void tm_workspace_free(void) g_message("Workspace destroyed"); #endif + g_hash_table_destroy(theWorkspace->source_file_map); for (i=0; i < theWorkspace->source_files->len; ++i) tm_source_file_free(theWorkspace->source_files->pdata[i]); g_ptr_array_free(theWorkspace->source_files, TRUE); @@ -171,24 +180,34 @@ static void update_source_file(TMSourceFile *source_file, guchar* text_buf, } -/** Adds a source file to the workspace, parses it and updates the workspace tags. - @param source_file The source file to add to the workspace. -*/ -GEANY_API_SYMBOL -void tm_workspace_add_source_file(TMSourceFile *source_file) +void tm_workspace_add_source_file_noupdate(TMSourceFile *source_file) { + GPtrArray *file_arr; + g_return_if_fail(source_file != NULL); g_ptr_array_add(theWorkspace->source_files, source_file); - update_source_file(source_file, NULL, 0, FALSE, TRUE); + + file_arr = g_hash_table_lookup(theWorkspace->source_file_map, source_file->short_name); + if (!file_arr) + { + file_arr = g_ptr_array_new(); + g_hash_table_insert(theWorkspace->source_file_map, source_file->short_name, file_arr); + } + g_ptr_array_add(file_arr, source_file); } -void tm_workspace_add_source_file_noupdate(TMSourceFile *source_file) +/** Adds a source file to the workspace, parses it and updates the workspace tags. + @param source_file The source file to add to the workspace. +*/ +GEANY_API_SYMBOL +void tm_workspace_add_source_file(TMSourceFile *source_file) { g_return_if_fail(source_file != NULL); - g_ptr_array_add(theWorkspace->source_files, source_file); + tm_workspace_add_source_file_noupdate(source_file); + update_source_file(source_file, NULL, 0, FALSE, TRUE); } @@ -211,6 +230,15 @@ void tm_workspace_update_source_file_buffer(TMSourceFile *source_file, guchar* t } +static void remove_source_file_map(TMSourceFile *source_file) +{ + GPtrArray *file_arr = g_hash_table_lookup(theWorkspace->source_file_map, source_file->short_name); + + if (file_arr) + g_ptr_array_remove_fast(file_arr, source_file); +} + + /** Removes a source file from the workspace if it exists. This function also removes the tags belonging to this file from the workspace. To completely free the TMSourceFile pointer call tm_source_file_free() on it. @@ -229,6 +257,7 @@ void tm_workspace_remove_source_file(TMSourceFile *source_file) { tm_tags_remove_file_tags(source_file, theWorkspace->tags_array); tm_tags_remove_file_tags(source_file, theWorkspace->typename_array); + remove_source_file_map(source_file); g_ptr_array_remove_index_fast(theWorkspace->source_files, i); return; } @@ -326,6 +355,7 @@ void tm_workspace_remove_source_files(GPtrArray *source_files) { if (theWorkspace->source_files->pdata[j] == source_file) { + remove_source_file_map(source_file); g_ptr_array_remove_index_fast(theWorkspace->source_files, j); break; } Modified: src/tagmanager/tm_workspace.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -32,6 +32,7 @@ typedef struct TMWorkspace (just pointers to source file tags, the tag objects are owned by the source files). @elementtype{TMTag} */ GPtrArray *typename_array; /* Typename tags for syntax highlighting (pointers owned by source files) */ GPtrArray *global_typename_array; /* Like above for global tags */ + GHashTable *source_file_map; /* File name -> GPtrArray<TMSourceFile> map to speed up lookups based on file name */ } TMWorkspace; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 151bf6: Sort autocompletion tags also based on their presence in included files
by Jiří Techet 11 Nov '22

11 Nov '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 03 Nov 2022 22:43:38 UTC Commit: 151bf64384799ed0f13b74ee7617460ac11dd430 https://github.com/geany/geany/commit/151bf64384799ed0f13b74ee7617460ac11dd… Log Message: ----------- Sort autocompletion tags also based on their presence in included files This patch extends the current sorting of the tags which looks this way: - sort local vars first (with highest line number first), - followed by tags from current file, - followed by workspace tags, - followed by global tags by two new entries so it looks this way: - sort local vars first (with highest line number first), - followed by tags from current file, - NEW: followed by tags from header, - NEW: followed by tags from other included files, - followed by workspace tags, - followed by global tags Sorting tags from included files seems to be a natural heuristic as users explicitly included these and want their symbols to be present in the current file. As a special case, symbols from the header of the current source file (included file with the same base name as the current file) are listed in front of symbols from other included files as headers tend to be tightly coupled with corresponding source files in C/C++. Modified Paths: -------------- src/tagmanager/tm_workspace.c Modified: src/tagmanager/tm_workspace.c 146 lines changed, 142 insertions(+), 4 deletions(-) =================================================================== @@ -681,9 +681,36 @@ gboolean tm_workspace_is_autocomplete_tag(TMTag *tag, } +#if ! GLIB_CHECK_VERSION(2, 54, 0) +static gboolean +g_ptr_array_find (GPtrArray *haystack, + gconstpointer needle, + guint *index_) +{ + guint i; + + g_return_val_if_fail (haystack != NULL, FALSE); + + for (i = 0; i < haystack->len; i++) + { + if (g_direct_equal (g_ptr_array_index (haystack, i), needle)) + { + if (index_ != NULL) + *index_ = i; + return TRUE; + } + } + + return FALSE; +} +#endif + + typedef struct { TMSourceFile *file; + GPtrArray *header_candidates; + GHashTable *includes; guint line; const gchar *scope; } CopyInfo; @@ -703,10 +730,12 @@ static gboolean is_non_local_tag(TMTag *tag, CopyInfo *info) return !is_local_tag(tag, info); } -/* non-local tag not from current file */ +/* non-local tag not from current file, header, or included files */ static gboolean is_workspace_tag(TMTag *tag, CopyInfo *info) { return tag->file != info->file && + (!info->header_candidates || !g_ptr_array_find(info->header_candidates, tag->file, NULL)) && + !g_hash_table_lookup(info->includes, tag->file) && is_non_local_tag(tag, info); } @@ -756,6 +785,32 @@ static void fill_find_tags_array_prefix(GPtrArray *dst, const char *name, copy_tags(dst, found, count, name_table, max_num - dst->len, is_non_local_tag, info); } } + if (dst->len < max_num && info->header_candidates) + { + guint i; + + for (i = 0; i < info->header_candidates->len; i++) + { + TMSourceFile *hdr = info->header_candidates->pdata[i]; + found = tm_tags_find(hdr->tags_array, name, TRUE, &count); + if (found) + copy_tags(dst, found, count, name_table, max_num - dst->len, is_non_local_tag, info); + } + } + if (dst->len < max_num) + { + GHashTableIter iter; + gpointer key; + + g_hash_table_iter_init(&iter, info->includes); + while (g_hash_table_iter_next(&iter, &key, NULL)) + { + TMSourceFile *include_file = key; + found = tm_tags_find(include_file->tags_array, name, TRUE, &count); + if (found) + copy_tags(dst, found, count, name_table, max_num - dst->len, is_non_local_tag, info); + } + } if (dst->len < max_num) { found = tm_tags_find(theWorkspace->tags_array, name, TRUE, &count); @@ -773,9 +828,67 @@ static void fill_find_tags_array_prefix(GPtrArray *dst, const char *name, } +/* return TMSourceFile files corresponding to files included in 'source'; + * in addition, fill header_candidates with TMSourceFiles that could be the header + * of 'source' based on the file name */ +static GHashTable *get_includes(TMSourceFile *source, GPtrArray **header_candidates) +{ + GHashTable *includes = g_hash_table_new(NULL, NULL); + GPtrArray *headers; + gchar *src_basename, *ptr; + guint i; + + *header_candidates = NULL; + + if (!source || + (source->lang != TM_PARSER_C && source->lang != TM_PARSER_CPP)) + return includes; + + src_basename = g_strdup(source->short_name); + if (ptr = strrchr(src_basename, '.')) + *ptr = '\0'; + + headers = tm_tags_extract(source->tags_array, tm_tag_include_t); + + for (i = 0; i < headers->len; i++) + { + TMTag *hdr_tag = headers->pdata[i]; + gchar *hdr_name = g_path_get_basename(hdr_tag->name); + GPtrArray *tm_files = g_hash_table_lookup(theWorkspace->source_file_map, hdr_name); + + if (tm_files && tm_files->len > 0) + { + guint j; + + if (!*header_candidates) + { + gchar *hdr_basename = g_strdup(hdr_name); + if (ptr = strrchr(hdr_basename, '.')) + *ptr = '\0'; + + if (g_strcmp0(hdr_basename, src_basename) == 0) + *header_candidates = tm_files; + g_free(hdr_basename); + } + + for (j = 0; j < tm_files->len; j++) + g_hash_table_add(includes, tm_files->pdata[j]); + } + + g_free(hdr_name); + } + + g_ptr_array_free(headers, TRUE); + g_free(src_basename); + return includes; +} + + typedef struct { TMSourceFile *file; + GPtrArray *header_candidates; + GHashTable *includes; gboolean sort_by_name; } SortInfo; @@ -786,9 +899,12 @@ static gint sort_found_tags(gconstpointer a, gconstpointer b, gpointer user_data const TMTag *t1 = *((TMTag **) a); const TMTag *t2 = *((TMTag **) b); - /* sort local vars first (with highest line number first), followed - * by tags from current file, followed by workspace tags, followed by - * global tags */ + /* sort local vars first (with highest line number first), + * followed by tags from current file, + * followed by tags from header, + * followed by tags from other included files, + * followed by workspace tags, + * followed by global tags */ if (t1->type & tm_tag_local_var_t && t2->type & tm_tag_local_var_t) return info->sort_by_name ? g_strcmp0(t1->name, t2->name) : t2->line - t1->line; else if (t1->type & tm_tag_local_var_t) @@ -799,6 +915,18 @@ static gint sort_found_tags(gconstpointer a, gconstpointer b, gpointer user_data return -1; else if (t2->file == info->file && t1->file != info->file) return 1; + else if (info->header_candidates && + g_ptr_array_find(info->header_candidates, t1->file, NULL) && + !g_ptr_array_find(info->header_candidates, t2->file, NULL)) + return -1; + else if (info->header_candidates && + g_ptr_array_find(info->header_candidates, t2->file, NULL) && + !g_ptr_array_find(info->header_candidates, t1->file, NULL)) + return 1; + else if (g_hash_table_lookup(info->includes, t1->file) && !g_hash_table_lookup(info->includes, t2->file)) + return -1; + else if (g_hash_table_lookup(info->includes, t2->file) && !g_hash_table_lookup(info->includes, t1->file)) + return 1; else if (t1->file && !t2->file) return -1; else if (t2->file && !t1->file) @@ -824,20 +952,28 @@ GPtrArray *tm_workspace_find_prefix(const char *prefix, { TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; GPtrArray *tags = g_ptr_array_new(); + GPtrArray *header_candidates; SortInfo sort_info; CopyInfo copy_info; + GHashTable *includes = get_includes(current_file, &header_candidates); copy_info.file = current_file; + copy_info.header_candidates = header_candidates; + copy_info.includes = includes; copy_info.line = current_line; copy_info.scope = current_scope; fill_find_tags_array_prefix(tags, prefix, &copy_info, max_num); /* sort based on how "close" the tag is to current line with local * variables first */ sort_info.file = current_file; + sort_info.header_candidates = header_candidates; + sort_info.includes = includes; sort_info.sort_by_name = TRUE; g_ptr_array_sort_with_data(tags, sort_found_tags, &sort_info); + g_hash_table_destroy(includes); + return tags; } @@ -1258,6 +1394,7 @@ tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name, info.file = source_file; info.sort_by_name = FALSE; + info.includes = get_includes(source_file, &info.header_candidates); g_ptr_array_sort_with_data(tags, sort_found_tags, &info); /* Start searching inside the source file, continue with workspace tags and @@ -1274,6 +1411,7 @@ tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name, member, current_scope); g_ptr_array_free(tags, TRUE); + g_hash_table_destroy(info.includes); } if (member_tags) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f1c366: Merge pull request #3269 from techee/autocomplete_header2
by Jiří Techet 11 Nov '22

11 Nov '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 11 Nov 2022 18:48:13 UTC Commit: f1c36655683ac727782e293054a4926d6040045c https://github.com/geany/geany/commit/f1c36655683ac727782e293054a4926d60400… Log Message: ----------- Merge pull request #3269 from techee/autocomplete_header2 Sort autocompletion tags also based on their presence in included files Modified Paths: -------------- src/symbols.c src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h src/tagmanager/tm_workspace.c src/tagmanager/tm_workspace.h Modified: src/symbols.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1136,7 +1136,7 @@ gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode) g_return_val_if_fail(DOC_VALID(doc), FALSE); - tags = get_tag_list(doc, ~tm_tag_local_var_t); + tags = get_tag_list(doc, ~(tm_tag_local_var_t | tm_tag_include_t)); if (tags == NULL) return FALSE; Modified: src/tagmanager/tm_parser.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -69,7 +69,7 @@ static GHashTable *subparser_map = NULL; {'u', tm_tag_union_t}, /* union */ \ {'v', tm_tag_variable_t}, /* variable */ \ {'x', tm_tag_externvar_t}, /* externvar */ \ - {'h', tm_tag_undef_t}, /* header */ \ + {'h', tm_tag_include_t}, /* header */ \ {'l', tm_tag_local_var_t}, /* local */ \ {'z', tm_tag_local_var_t}, /* parameter */ \ {'L', tm_tag_undef_t}, /* label */ \ @@ -81,7 +81,7 @@ static TMParserMapEntry map_C[] = { /* Used also by other languages than C - keep all the tm_tag_* here even though * they aren't used by C as they might be used by some other language */ static TMParserMapGroup group_C[] = { - {_("Namespaces"), TM_ICON_NAMESPACE, tm_tag_namespace_t | tm_tag_package_t}, + {_("Namespaces"), TM_ICON_NAMESPACE, tm_tag_namespace_t | tm_tag_package_t | tm_tag_include_t}, {_("Classes"), TM_ICON_CLASS, tm_tag_class_t}, {_("Interfaces"), TM_ICON_STRUCT, tm_tag_interface_t}, {_("Functions"), TM_ICON_METHOD, tm_tag_prototype_t | tm_tag_method_t | tm_tag_function_t}, Modified: src/tagmanager/tm_parser.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -42,7 +42,8 @@ typedef enum tm_tag_macro_with_arg_t = 131072, /**< Parameterized macro */ tm_tag_local_var_t = 262144, /**< Local variable (inside function) */ tm_tag_other_t = 524288, /**< Other (non C/C++/Java tag) */ - tm_tag_max_t = 1048575 /**< Maximum value of TMTagType */ + tm_tag_include_t = 1048576, /**< C/C++ included header file name */ + tm_tag_max_t = 2097151 /**< Maximum value of TMTagType */ } TMTagType; Modified: src/tagmanager/tm_workspace.c 199 lines changed, 184 insertions(+), 15 deletions(-) =================================================================== @@ -64,6 +64,12 @@ static TMTagType TM_GLOBAL_TYPE_MASK = static TMWorkspace *theWorkspace = NULL; +static void free_ptr_array(gpointer arr) +{ + g_ptr_array_free(arr, TRUE); +} + + static gboolean tm_create_workspace(void) { theWorkspace = g_new(TMWorkspace, 1); @@ -73,6 +79,8 @@ static gboolean tm_create_workspace(void) theWorkspace->source_files = g_ptr_array_new(); theWorkspace->typename_array = g_ptr_array_new(); theWorkspace->global_typename_array = g_ptr_array_new(); + theWorkspace->source_file_map = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, + free_ptr_array); tm_ctags_init(); tm_parser_verify_type_mappings(); @@ -92,6 +100,7 @@ void tm_workspace_free(void) g_message("Workspace destroyed"); #endif + g_hash_table_destroy(theWorkspace->source_file_map); for (i=0; i < theWorkspace->source_files->len; ++i) tm_source_file_free(theWorkspace->source_files->pdata[i]); g_ptr_array_free(theWorkspace->source_files, TRUE); @@ -171,24 +180,34 @@ static void update_source_file(TMSourceFile *source_file, guchar* text_buf, } -/** Adds a source file to the workspace, parses it and updates the workspace tags. - @param source_file The source file to add to the workspace. -*/ -GEANY_API_SYMBOL -void tm_workspace_add_source_file(TMSourceFile *source_file) +void tm_workspace_add_source_file_noupdate(TMSourceFile *source_file) { + GPtrArray *file_arr; + g_return_if_fail(source_file != NULL); g_ptr_array_add(theWorkspace->source_files, source_file); - update_source_file(source_file, NULL, 0, FALSE, TRUE); + + file_arr = g_hash_table_lookup(theWorkspace->source_file_map, source_file->short_name); + if (!file_arr) + { + file_arr = g_ptr_array_new(); + g_hash_table_insert(theWorkspace->source_file_map, source_file->short_name, file_arr); + } + g_ptr_array_add(file_arr, source_file); } -void tm_workspace_add_source_file_noupdate(TMSourceFile *source_file) +/** Adds a source file to the workspace, parses it and updates the workspace tags. + @param source_file The source file to add to the workspace. +*/ +GEANY_API_SYMBOL +void tm_workspace_add_source_file(TMSourceFile *source_file) { g_return_if_fail(source_file != NULL); - g_ptr_array_add(theWorkspace->source_files, source_file); + tm_workspace_add_source_file_noupdate(source_file); + update_source_file(source_file, NULL, 0, FALSE, TRUE); } @@ -211,6 +230,15 @@ void tm_workspace_update_source_file_buffer(TMSourceFile *source_file, guchar* t } +static void remove_source_file_map(TMSourceFile *source_file) +{ + GPtrArray *file_arr = g_hash_table_lookup(theWorkspace->source_file_map, source_file->short_name); + + if (file_arr) + g_ptr_array_remove_fast(file_arr, source_file); +} + + /** Removes a source file from the workspace if it exists. This function also removes the tags belonging to this file from the workspace. To completely free the TMSourceFile pointer call tm_source_file_free() on it. @@ -229,6 +257,7 @@ void tm_workspace_remove_source_file(TMSourceFile *source_file) { tm_tags_remove_file_tags(source_file, theWorkspace->tags_array); tm_tags_remove_file_tags(source_file, theWorkspace->typename_array); + remove_source_file_map(source_file); g_ptr_array_remove_index_fast(theWorkspace->source_files, i); return; } @@ -326,6 +355,7 @@ void tm_workspace_remove_source_files(GPtrArray *source_files) { if (theWorkspace->source_files->pdata[j] == source_file) { + remove_source_file_map(source_file); g_ptr_array_remove_index_fast(theWorkspace->source_files, j); break; } @@ -510,7 +540,7 @@ static gboolean create_global_tags_preprocessed(const char *pre_process_cmd, } tm_tags_sort(source_file->tags_array, global_tags_sort_attrs, TRUE, FALSE); - filtered_tags = tm_tags_extract(source_file->tags_array, ~tm_tag_local_var_t); + filtered_tags = tm_tags_extract(source_file->tags_array, ~(tm_tag_local_var_t | tm_tag_include_t)); ret = tm_source_file_write_tags_file(tags_file, filtered_tags); g_ptr_array_free(filtered_tags, TRUE); tm_source_file_free(source_file); @@ -543,7 +573,7 @@ static gboolean create_global_tags_direct(GList *source_files, const char *tags_ } } - filtered_tags = tm_tags_extract(tags, ~tm_tag_local_var_t); + filtered_tags = tm_tags_extract(tags, ~(tm_tag_local_var_t | tm_tag_include_t)); tm_tags_sort(filtered_tags, global_tags_sort_attrs, TRUE, FALSE); if (filtered_tags->len > 0) @@ -646,13 +676,41 @@ gboolean tm_workspace_is_autocomplete_tag(TMTag *tag, gboolean valid_local = !tag->local || current_file == tag->file; return valid && valid_local && - !tm_tag_is_anon(tag) && tm_parser_langs_compatible(lang, tag->lang); + !tm_tag_is_anon(tag) && tm_parser_langs_compatible(lang, tag->lang) && + !(tag->type & tm_tag_include_t); } +#if ! GLIB_CHECK_VERSION(2, 54, 0) +static gboolean +g_ptr_array_find (GPtrArray *haystack, + gconstpointer needle, + guint *index_) +{ + guint i; + + g_return_val_if_fail (haystack != NULL, FALSE); + + for (i = 0; i < haystack->len; i++) + { + if (g_direct_equal (g_ptr_array_index (haystack, i), needle)) + { + if (index_ != NULL) + *index_ = i; + return TRUE; + } + } + + return FALSE; +} +#endif + + typedef struct { TMSourceFile *file; + GPtrArray *header_candidates; + GHashTable *includes; guint line; const gchar *scope; } CopyInfo; @@ -672,10 +730,12 @@ static gboolean is_non_local_tag(TMTag *tag, CopyInfo *info) return !is_local_tag(tag, info); } -/* non-local tag not from current file */ +/* non-local tag not from current file, header, or included files */ static gboolean is_workspace_tag(TMTag *tag, CopyInfo *info) { return tag->file != info->file && + (!info->header_candidates || !g_ptr_array_find(info->header_candidates, tag->file, NULL)) && + !g_hash_table_lookup(info->includes, tag->file) && is_non_local_tag(tag, info); } @@ -725,6 +785,32 @@ static void fill_find_tags_array_prefix(GPtrArray *dst, const char *name, copy_tags(dst, found, count, name_table, max_num - dst->len, is_non_local_tag, info); } } + if (dst->len < max_num && info->header_candidates) + { + guint i; + + for (i = 0; i < info->header_candidates->len; i++) + { + TMSourceFile *hdr = info->header_candidates->pdata[i]; + found = tm_tags_find(hdr->tags_array, name, TRUE, &count); + if (found) + copy_tags(dst, found, count, name_table, max_num - dst->len, is_non_local_tag, info); + } + } + if (dst->len < max_num) + { + GHashTableIter iter; + gpointer key; + + g_hash_table_iter_init(&iter, info->includes); + while (g_hash_table_iter_next(&iter, &key, NULL)) + { + TMSourceFile *include_file = key; + found = tm_tags_find(include_file->tags_array, name, TRUE, &count); + if (found) + copy_tags(dst, found, count, name_table, max_num - dst->len, is_non_local_tag, info); + } + } if (dst->len < max_num) { found = tm_tags_find(theWorkspace->tags_array, name, TRUE, &count); @@ -742,9 +828,67 @@ static void fill_find_tags_array_prefix(GPtrArray *dst, const char *name, } +/* return TMSourceFile files corresponding to files included in 'source'; + * in addition, fill header_candidates with TMSourceFiles that could be the header + * of 'source' based on the file name */ +static GHashTable *get_includes(TMSourceFile *source, GPtrArray **header_candidates) +{ + GHashTable *includes = g_hash_table_new(NULL, NULL); + GPtrArray *headers; + gchar *src_basename, *ptr; + guint i; + + *header_candidates = NULL; + + if (!source || + (source->lang != TM_PARSER_C && source->lang != TM_PARSER_CPP)) + return includes; + + src_basename = g_strdup(source->short_name); + if (ptr = strrchr(src_basename, '.')) + *ptr = '\0'; + + headers = tm_tags_extract(source->tags_array, tm_tag_include_t); + + for (i = 0; i < headers->len; i++) + { + TMTag *hdr_tag = headers->pdata[i]; + gchar *hdr_name = g_path_get_basename(hdr_tag->name); + GPtrArray *tm_files = g_hash_table_lookup(theWorkspace->source_file_map, hdr_name); + + if (tm_files && tm_files->len > 0) + { + guint j; + + if (!*header_candidates) + { + gchar *hdr_basename = g_strdup(hdr_name); + if (ptr = strrchr(hdr_basename, '.')) + *ptr = '\0'; + + if (g_strcmp0(hdr_basename, src_basename) == 0) + *header_candidates = tm_files; + g_free(hdr_basename); + } + + for (j = 0; j < tm_files->len; j++) + g_hash_table_add(includes, tm_files->pdata[j]); + } + + g_free(hdr_name); + } + + g_ptr_array_free(headers, TRUE); + g_free(src_basename); + return includes; +} + + typedef struct { TMSourceFile *file; + GPtrArray *header_candidates; + GHashTable *includes; gboolean sort_by_name; } SortInfo; @@ -755,9 +899,12 @@ static gint sort_found_tags(gconstpointer a, gconstpointer b, gpointer user_data const TMTag *t1 = *((TMTag **) a); const TMTag *t2 = *((TMTag **) b); - /* sort local vars first (with highest line number first), followed - * by tags from current file, followed by workspace tags, followed by - * global tags */ + /* sort local vars first (with highest line number first), + * followed by tags from current file, + * followed by tags from header, + * followed by tags from other included files, + * followed by workspace tags, + * followed by global tags */ if (t1->type & tm_tag_local_var_t && t2->type & tm_tag_local_var_t) return info->sort_by_name ? g_strcmp0(t1->name, t2->name) : t2->line - t1->line; else if (t1->type & tm_tag_local_var_t) @@ -768,6 +915,18 @@ static gint sort_found_tags(gconstpointer a, gconstpointer b, gpointer user_data return -1; else if (t2->file == info->file && t1->file != info->file) return 1; + else if (info->header_candidates && + g_ptr_array_find(info->header_candidates, t1->file, NULL) && + !g_ptr_array_find(info->header_candidates, t2->file, NULL)) + return -1; + else if (info->header_candidates && + g_ptr_array_find(info->header_candidates, t2->file, NULL) && + !g_ptr_array_find(info->header_candidates, t1->file, NULL)) + return 1; + else if (g_hash_table_lookup(info->includes, t1->file) && !g_hash_table_lookup(info->includes, t2->file)) + return -1; + else if (g_hash_table_lookup(info->includes, t2->file) && !g_hash_table_lookup(info->includes, t1->file)) + return 1; else if (t1->file && !t2->file) return -1; else if (t2->file && !t1->file) @@ -793,20 +952,28 @@ GPtrArray *tm_workspace_find_prefix(const char *prefix, { TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; GPtrArray *tags = g_ptr_array_new(); + GPtrArray *header_candidates; SortInfo sort_info; CopyInfo copy_info; + GHashTable *includes = get_includes(current_file, &header_candidates); copy_info.file = current_file; + copy_info.header_candidates = header_candidates; + copy_info.includes = includes; copy_info.line = current_line; copy_info.scope = current_scope; fill_find_tags_array_prefix(tags, prefix, &copy_info, max_num); /* sort based on how "close" the tag is to current line with local * variables first */ sort_info.file = current_file; + sort_info.header_candidates = header_candidates; + sort_info.includes = includes; sort_info.sort_by_name = TRUE; g_ptr_array_sort_with_data(tags, sort_found_tags, &sort_info); + g_hash_table_destroy(includes); + return tags; } @@ -1227,6 +1394,7 @@ tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name, info.file = source_file; info.sort_by_name = FALSE; + info.includes = get_includes(source_file, &info.header_candidates); g_ptr_array_sort_with_data(tags, sort_found_tags, &info); /* Start searching inside the source file, continue with workspace tags and @@ -1243,6 +1411,7 @@ tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name, member, current_scope); g_ptr_array_free(tags, TRUE); + g_hash_table_destroy(info.includes); } if (member_tags) Modified: src/tagmanager/tm_workspace.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -32,6 +32,7 @@ typedef struct TMWorkspace (just pointers to source file tags, the tag objects are owned by the source files). @elementtype{TMTag} */ GPtrArray *typename_array; /* Typename tags for syntax highlighting (pointers owned by source files) */ GPtrArray *global_typename_array; /* Like above for global tags */ + GHashTable *source_file_map; /* File name -> GPtrArray<TMSourceFile> map to speed up lookups based on file name */ } TMWorkspace; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 68f273: Add 2022 Geany e.V. General Assembly meeting
by Enrico Tröger 03 Nov '22

03 Nov '22

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 03 Nov 2022 21:37:54 UTC Commit: 68f27355fb349d8827fd4a85ef62c0b12b7607a3 https://github.com/geany/www.geany.org/commit/68f27355fb349d8827fd4a85ef62c… Log Message: ----------- Add 2022 Geany e.V. General Assembly meeting Modified Paths: -------------- page_content/association.md Modified: page_content/association.md 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -15,7 +15,16 @@ There are no plans to direct the development of Geany itself from the associatio #### Upcoming meetings -* None scheduled. +##### Geany e.V. General Assembly 2022 +Date: 19th November 2022 - 15:00 CET +Location: Hoepnerstraße, Leipzig, Germany +Audience: association members +Agenda: + +- Election of the association board +- General report +- Financial report +- Voting about changing the charter to allow online meetings #### Past meetings -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2022