fix highlight trigger for macros

does not work for math highlights
texstudio-org · Jan 11, 2025 · 21e8cee · 21e8cee
1 parent 11a6d46
commit 21e8cee
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 6 deletions.
diff --git a/src/latexeditorview.cpp b/src/latexeditorview.cpp
@@ -116,7 +116,23 @@ bool DefaultInputBinding::runMacros(QKeyEvent *event, QEditor *editor)
 	foreach (const Macro &m, completerConfig->userMacros) {
 		if (!m.isActiveForTrigger(Macro::ST_REGEX)) continue;
 		if (!m.isActiveForLanguage(language)) continue;
-		if (!(m.isActiveForFormat(line.getFormatAt(column)) || (column > 0 && m.isActiveForFormat(line.getFormatAt(column - 1))))) continue; //two checks, so it works at beginning and end of an environment
+        if(m.hasFormatTriggers()){
+            // check formats at column from overlays
+            QList<int> formats=m.getFormatExcludeTriggers();
+            if(!formats.isEmpty()){
+                QFormatRange fr = line.getOverlayAt(column, formats);
+                if(fr.isValid()){
+                    continue;
+                }
+            }
+            formats=m.getFormatTriggers();
+            if(!formats.isEmpty()){
+                QFormatRange fr = line.getOverlayAt(column, formats);
+                if(!fr.isValid()){
+                    continue;
+                }
+            }
+        }
         const QRegularExpression &r = m.triggerRegex;
         QRegularExpressionMatch match=r.match(prev);
         if (match.hasMatch()) {

diff --git a/src/usermacro.cpp b/src/usermacro.cpp
@@ -248,11 +248,31 @@ bool Macro::isActiveForLanguage(QLanguageDefinition *lang) const
 	return triggerLanguage.isEmpty() || triggerLanguages.contains(lang);
 }
 
-bool Macro::isActiveForFormat(int format) const
+/*!
+ * \brief check if any format trigger are set
+ * Included or excluded formats are considered
+ * \return
+ */
+bool Macro::hasFormatTriggers() const
 {
-	if (!triggerFormatsUnprocessed.isEmpty() || !triggerFormatExcludesUnprocessed.isEmpty()) (const_cast<Macro *>(this))->initTriggerFormats();
-	// if no trigger format is specified, the macro is active for all formats.
-	return (triggerFormats.isEmpty() || triggerFormats.contains(format)) && (!triggerFormatExcludes.contains(format));
+    if (!triggerFormatsUnprocessed.isEmpty() || !triggerFormatExcludesUnprocessed.isEmpty()) (const_cast<Macro *>(this))->initTriggerFormats();
+    return !triggerFormats.isEmpty() || !triggerFormatExcludes.isEmpty();
+}
+/*!
+ * \brief return the list of format triggers
+ * \return
+ */
+QList<int> Macro::getFormatTriggers() const
+{
+    return triggerFormats;
+}
+/*!
+ * \brief return the list of format triggers which should be excluded
+ * \return
+ */
+QList<int> Macro::getFormatExcludeTriggers() const
+{
+    return triggerFormatExcludes;
 }
 
 bool Macro::save(const QString &fileName) const {

diff --git a/src/usermacro.h b/src/usermacro.h
@@ -54,7 +54,9 @@ class Macro
 	void parseTriggerLanguage(QLanguageFactory *langFactory);
 	bool isActiveForTrigger(SpecialTrigger trigger) const;
 	bool isActiveForLanguage(QLanguageDefinition *lang) const;
-	bool isActiveForFormat(int format) const;
+    bool hasFormatTriggers() const;
+    QList<int>getFormatTriggers() const;
+    QList<int>getFormatExcludeTriggers() const;
 
     bool load(const QString &fileName);
     bool loadFromText(const QString &text);