From 64205e2ee99e495648d6f2850c2f988f753103a6 Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Thu, 25 Feb 2021 10:45:32 +0100
Subject: [PATCH] Improved smart insertions of '' and ""

---
 src/source.hpp            |  3 ++-
 src/source_spellcheck.cpp | 42 +++++++++++++++++----------------------
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/source.hpp b/src/source.hpp
index d7e0b86..6496847 100644
--- a/src/source.hpp
+++ b/src/source.hpp
@@ -4,6 +4,7 @@
 #include "tooltips.hpp"
 #include <boost/filesystem.hpp>
 #include <boost/property_tree/xml_parser.hpp>
+#include <limits>
 #include <set>
 #include <string>
 #include <tuple>
@@ -158,7 +159,7 @@ namespace Source {
     bool find_close_symbol_forward(Gtk::TextIter iter, Gtk::TextIter &found_iter, unsigned int positive_char, unsigned int negative_char);
     /// Iter will not be moved if iter is already at open symbol.
     bool find_open_symbol_backward(Gtk::TextIter iter, Gtk::TextIter &found_iter, unsigned int positive_char, unsigned int negative_char);
-    long symbol_count(Gtk::TextIter iter, unsigned int positive_char, unsigned int negative_char = 0);
+    long symbol_count(Gtk::TextIter iter, unsigned int positive_char, unsigned int negative_char = std::numeric_limits<unsigned int>::max());
     bool is_templated_function(Gtk::TextIter iter, Gtk::TextIter &parenthesis_end_iter);
     /// If insert is at an possible argument. Also based on last key press.
     bool is_possible_argument();
diff --git a/src/source_spellcheck.cpp b/src/source_spellcheck.cpp
index b15c26c..cd0eb8e 100644
--- a/src/source_spellcheck.cpp
+++ b/src/source_spellcheck.cpp
@@ -387,8 +387,22 @@ bool Source::SpellCheckView::is_spellcheck_iter(const Gtk::TextIter &iter) {
     }
   }
   if(string_tag) {
-    if(iter.has_tag(string_tag) && !iter.begins_tag(string_tag))
+    if(iter.has_tag(string_tag) && !iter.begins_tag(string_tag)) {
+      // Check for string literal symbols
+      if(*iter == '\'' || *iter == '"') {
+        auto previous_iter = iter;
+        if(previous_iter.backward_char()) {
+          if(previous_iter.begins_tag(string_tag)) {
+            if(*previous_iter == 'L' || *previous_iter == 'u' || *previous_iter == 'U' || *previous_iter == 'R')
+              return false;
+          }
+          else if(*previous_iter == '8' && previous_iter.backward_char() && previous_iter.begins_tag(string_tag) &&
+                  *previous_iter == 'u')
+            return false;
+        }
+      }
       return true;
+    }
     // If iter is at the end of string_tag, with exception of after " and '
     else if(iter.ends_tag(string_tag)) {
       auto previous_iter = iter;
@@ -449,29 +463,9 @@ bool Source::SpellCheckView::is_code_iter(const Gtk::TextIter &iter) {
   if(!is_code_iter && (*iter == '\'' || *iter == '"')) {
     if(comment_tag && iter.ends_tag(comment_tag)) // ' or " at end of comments are not code iters
       return false;
-    if(*iter == '"') {
-      auto next_iter = iter;
-      next_iter.forward_char();
-      return !is_spellcheck_iter(next_iter);
-    }
-    // Have to look up ' manually since it can be a word iter:
-    auto previous_iter = iter;
-    if(previous_iter.backward_char() && *previous_iter == '\'') { // First, handle iter inside '':
-      auto next_iter = iter;
-      next_iter.forward_char();
-      return !is_spellcheck_iter(next_iter);
-    }
-    if(string_tag && (iter.has_tag(string_tag) || iter.ends_tag(string_tag))) {
-      long backslash_count = 0;
-      auto previous_iter = iter;
-      while(previous_iter.backward_char() && *previous_iter == '\\')
-        ++backslash_count;
-      if(backslash_count % 2 == 0) {
-        auto start_iter = iter;
-        if(start_iter.backward_to_tag_toggle(string_tag) && start_iter.begins_tag(string_tag) && *start_iter == '\'')
-          return true;
-      }
-    }
+    auto next_iter = iter;
+    next_iter.forward_char();
+    return !is_spellcheck_iter(next_iter);
   }
 
   if(is_bracket_language)