undo will make tab tag completion a regular tab

erinata · Sep 13, 2011 · 1e1dc1f · 1e1dc1f
1 parent 41dba82
commit 1e1dc1f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -4,6 +4,7 @@ changelog (for developer use only, include unreleased versions)
 ****** restructure plugin init functions
 ****** improve start up performance by removing redundant updateScintilla calls
 ****** update the settings hint
+****** undo after a tab triggertext completetion will become a regular tab
 
 0.5.40
 ****** optionarray use vector of string instead of char**, the limit of option numbers is lifted

diff --git a/DllMain.cpp b/DllMain.cpp
@@ -59,6 +59,7 @@ BOOL APIENTRY DllMain(HANDLE hModule, DWORD reasonForCall, LPVOID lpReserved)
 
 LRESULT CALLBACK SubWndProcNpp(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
+
     LRESULT	retVal = 0;
     switch (message)
     {
@@ -169,6 +170,7 @@ extern "C" __declspec(dllexport) void beNotified(SCNotification *notifyCode)
             //initialize();
             nppLoaded = 1;
             nppReady();
+
 
             break;
 

diff --git a/DuckEval/DuckEval.cpp b/DuckEval/DuckEval.cpp
@@ -59,6 +59,7 @@ Expression::Expression(std::string input)
 // perform operator check
 int Expression::checkOperator(const char &c) 
 {
+    // TODO: to radian and to degree
     switch(c) 
     {
         case '$' : 
@@ -128,8 +129,6 @@ std::string Expression::rephrasing(std::string input)
     int length = input.length();
     for (int j=0; j<length; ++j) input[j]=tolower(input[j]);
 
-    //TODO: need to fix the problem of negative number. solution can be find and replace all - by 0- if the char before - is not a digit
-
     //Operators
     signReplace(input,"==","=");
     signReplace(input,"==","=");

diff --git a/PluginDefinition.cpp b/PluginDefinition.cpp
@@ -130,8 +130,6 @@ void commandMenuInit()
     setCommand(TEXT("Testing2"), testing2);
 }
 
-
-
 void dialogsInit()
 {
     snippetDock.init((HINSTANCE)g_hModule, NULL);
@@ -230,6 +228,7 @@ void variablesInit()
 
 void nppReady()
 {
+    updateMode();
     pc.upgradeMessage();
 
     if (pc.configInt[FORCE_MULTI_PASTE]) ::SendScintilla(SCI_SETMULTIPASTE,1,0); 
@@ -4809,8 +4808,13 @@ void tabActivate()
 
                     ::SendScintilla(SCI_GOTOPOS, posSelectionStart, 0);
                     posCurrent = posSelectionStart;
+                    ::SendScintilla(SCI_TAB, 0, 0);
+                    ::SendScintilla(SCI_BEGINUNDOACTION, 0, 0);
+                    ::SendScintilla(SCI_SETSELECTION, posSelectionStart, ::SendScintilla(SCI_GETCURRENTPOS, 0, 0));
+                    ::SendScintilla(SCI_REPLACESEL, 0, (LPARAM)"");
                     //completeFound = snippetComplete();
                     completeFound = triggerTag(posCurrent,true);
+                    ::SendScintilla(SCI_ENDUNDOACTION, 0, 0);
                     if (completeFound)
                     {
                         ::SendScintilla(SCI_AUTOCCANCEL,0,0);

diff --git a/PluginDefinition.h b/PluginDefinition.h
@@ -30,6 +30,7 @@
 #ifndef PLUGINDEFINITION_H
 #define PLUGINDEFINITION_H
 
+
 #include "PluginInterface.h"
 
 #include <string>       // For alertString()

diff --git a/PluginInterface.h b/PluginInterface.h
@@ -100,5 +100,7 @@ extern "C" __declspec(dllexport) LRESULT messageProc(UINT Message, WPARAM wParam
 extern "C" __declspec(dllexport) BOOL isUnicode();
 #endif //UNICODE
 
+
+
 #endif //PLUGININTERFACE_H
 
diff --git a/README.rdoc b/README.rdoc
@@ -1,4 +1,4 @@
-= FingerText (current version 0.5.39)
+= FingerText (current version 0.5.39(Alpha))
 
 Tab triggered snippet plugin for Notepad++.