restrict the addition of $[0[]0]

fintho · Mar 17, 2012 · f358742 · f358742
1 parent abab1ae
commit f358742
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,7 @@
 changelog (for developer use only, include unreleased versions)
 
+0.5.57.2
+****** restrict the addition of $[0[]0] to snippet with no hotspot and it's inserted to a document with no hotspot following the insertion
 
 0.5.57.1
 ****** Try to fix the final hotspot problem without an extra $[0[]0]

diff --git a/PluginDefinition.cpp b/PluginDefinition.cpp
@@ -3419,13 +3419,9 @@ bool replaceTag(char *expanded, int &posCurrent, int &posBeforeTag)
     ::SendScintilla(SCI_REPLACETARGET, strlen(expanded_eolfix), reinterpret_cast<LPARAM>(expanded_eolfix));
 
     delete [] expanded_eolfix;
-
-    ::SendScintilla(SCI_GOTOPOS,posBeforeTag,0);
-
-     //alert(g_stopCharArray);
+
 
-    int stopFound = searchNext(g_stopCharArray);
-    //int stopFound = -1;
+     //alert(g_stopCharArray);
 
     ::SendScintilla(SCI_GOTOPOS,posBeforeTag,0);
     searchNext("`[SnippetInserting]");
@@ -3451,14 +3447,19 @@ bool replaceTag(char *expanded, int &posCurrent, int &posBeforeTag)
     int posEndOfSnippet = ::SendScintilla(SCI_GETCURRENTPOS,0,0);
 
     ::SendScintilla(SCI_SETSELECTION,posEndOfSnippet,posEndOfInsertedText);
+    ::SendScintilla(SCI_REPLACESEL, 0, (LPARAM)"");
 
-    if (stopFound<0)
+    ::SendScintilla(SCI_GOTOPOS,posBeforeTag,0);
+    //int stopFound = searchNext(g_stopCharArray);
+    int stopFound = searchNext("\\$\\[.\\[",true);
+    //int stopFound = -1;
+
+    if (stopFound<posBeforeTag)
     {
+        ::SendScintilla(SCI_GOTOPOS,posEndOfSnippet,0);
         ::SendScintilla(SCI_REPLACESEL, 0, (LPARAM)g_stopCharArray);
-    } else
-    {
-        ::SendScintilla(SCI_REPLACESEL, 0, (LPARAM)"");
     }
+
 
     //delete [] g_stopCharArray;
 

diff --git a/README.rdoc b/README.rdoc
@@ -483,7 +483,7 @@ those files are included in the source.
 DuckEval and sqlite3 have their own licenses. The licenses are included in the 
 source.
 
-FingerText version 0.5.49 (excluding the parts mentioned above) is released 
+FingerText version 0.5.56 (excluding the parts mentioned above) is released 
 under MIT license.
 
 MIT license