Ajustes e testes

EvoUMLPlugin/src/ituExplorerV2.pas

@@ -517,7 +517,7 @@ begin
        lmostrar := false;
 		 end;
 	 end
-   else
+   else if Key <> 190 then // Ponto(.)
    begin
       lChar := VK2Char(Key);
 	    if Pos(lChar,'?') > 0 then
@@ -1550,7 +1550,7 @@ begin
       end
       else
       begin
-        ls_expressao := '=,()^*#@$%&"!@#%&*''_-';
+        ls_expressao := '=,()^*#@$%&"!%''_-';
         if (trim(piTexto)  = __ASTERICO)  then
         begin
           li_Pos := li_Len + 1;
@@ -1558,7 +1558,9 @@ begin
    			end;
       end;
 		end
-    else if (piOpEve = fopEvenFromCompleto)  then
+    else if (piOpEve = fopEvenFromCompleto)   or
+            (piOpEve = fopEvenSearchFrom)
+    then
     begin
       if piTemPalavraAntes then
       begin
@@ -1566,10 +1568,12 @@ begin
       end
       else
       begin
-        ls_expressao := '=,()^~#@$%&"!@#$%&*_';
+        ls_expressao := '=,()^~#@$%&"!*''_-';
       end
 		end
-		else if (piOpEve = fopEvenWhereCompleto)  then
+		else if (piOpEve = fopEvenWhereCompleto)  or
+            (piOpEve = fopEvenSearchWhere)
+    then
     begin
        if piTemPalavraAntes then
        begin
@@ -1685,14 +1689,16 @@ begin
   lFromSec     := fhlt1.AddSection(__FROM);
   lWhereSec    := fhlt1.AddSection(__WHERE);
 
-
-  fopEvenSearchSelect              := fhlt1.AddOpenEvent('identifier','',fil_LastIdentPart);
+  fopEvenSearchSelect              := fhlt1.AddOpenEvent('identifier','',fil_None);
+  fopEvenSearchSelect.Action       := pac_Rep_LastTok;
   fopEvenSearchSelect.block        := lSelectSec;
 
-  fopEvenSearchFrom               := fhlt1.AddOpenEvent('identifier','',fil_LastIdentPart);
+  fopEvenSearchFrom               := fhlt1.AddOpenEvent('identifier','',fil_None);
+  fopEvenSearchFrom.Action        := pac_Rep_LastTok;
   fopEvenSearchFrom.block         := lFromSec;
 
-  fopEvenSearchWhere              := fhlt1.AddOpenEvent('identifier','',fil_LastIdentPart);
+  fopEvenSearchWhere              := fhlt1.AddOpenEvent('identifier','',fil_None);
+  fopEvenSearchWhere.Action       := pac_Rep_LastTok;
   fopEvenSearchWhere.block        := lWhereSec;
 
   fopEvenSelectAposPonto          := fhlt1.AddOpenEvent('identifier,''.''','',fil_None);