Browse Source

Fixes #329, block comment key events will no longer trigger inside a string

merge-requests/365/head
eidheim 9 years ago
parent
commit
7b35294b63
  1. 3
      src/source.cc
  2. 5
      src/source_spellcheck.h

3
src/source.cc

@ -1673,7 +1673,8 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
if(!is_code_iter(iter)) { if(!is_code_iter(iter)) {
// Add * at start of line in comment blocks // Add * at start of line in comment blocks
if((key->keyval==GDK_KEY_Return || key->keyval==GDK_KEY_KP_Enter) && !iter.starts_line()) { if((key->keyval==GDK_KEY_Return || key->keyval==GDK_KEY_KP_Enter) &&
!iter.starts_line() && !iter.has_tag(string_tag) && !iter.ends_tag(string_tag)) {
cleanup_whitespace_characters_on_return(iter); cleanup_whitespace_characters_on_return(iter);
iter=get_buffer()->get_insert()->get_iter(); iter=get_buffer()->get_insert()->get_iter();

5
src/source_spellcheck.h

@ -22,12 +22,13 @@ namespace Source {
bool is_code_iter(const Gtk::TextIter &iter); bool is_code_iter(const Gtk::TextIter &iter);
bool spellcheck_all=false; bool spellcheck_all=false;
guint last_keyval=0; guint last_keyval=0;
private:
Glib::RefPtr<Gtk::TextTag> spellcheck_error_tag;
Glib::RefPtr<Gtk::TextTag> comment_tag; Glib::RefPtr<Gtk::TextTag> comment_tag;
Glib::RefPtr<Gtk::TextTag> string_tag; Glib::RefPtr<Gtk::TextTag> string_tag;
Glib::RefPtr<Gtk::TextTag> no_spell_check_tag; Glib::RefPtr<Gtk::TextTag> no_spell_check_tag;
private:
Glib::RefPtr<Gtk::TextTag> spellcheck_error_tag;
sigc::connection signal_tag_added_connection; sigc::connection signal_tag_added_connection;
sigc::connection signal_tag_removed_connection; sigc::connection signal_tag_removed_connection;

Loading…
Cancel
Save