ajustes e testes

EvoUMLPlugin/src/ituExplorerV2.pas

@@ -28,16 +28,7 @@ const
     __IN                   = 'IN';
     __PONTO                = '.';
     __ASTERICO             = '*';
-     {
-    __E_COMERCIAL        = '&';
-    __PERCENTUAL         = '%';
-    __IGUAL              = '=';
-    __SINAL_MAIS         = '+';
-    __DIVISOR            = '/';
-    __PONTENCIA          = '^';
-    __SINAL_MAIOR        = '>';
-    __SINAL_MENOR        = '<';
-    __SINAL_MENOS        = '-'; }
+    __CARACTERES_ESPECIAIS = '=,<>()^~*-+./[]{}#@$%&"!@#$%&*''_';
 
 type
 
@@ -508,6 +499,7 @@ end;
  procedure TExplorerV2.SynEditOQLKeyUp(Sender: TObject; var Key: Word;
 	 Shift: TShiftState);
 var lmostrar : boolean;
+    lChar : string;
 begin
    lmostrar := true;
    // Ctrl + Espao
@@ -516,13 +508,25 @@ begin
    begin
      lmostrar := false;
 	 end;
-   //Espao
-   if key = 32 then
+
+   //ssShift
+   if ( Shift = [ssShift]) then
+   begin
+     if  Key in [49,52,53,54,55] then
+     begin
+       lmostrar := false;
+		 end;
+	 end
+   else
+   begin
+      lChar := VK2Char(Key);
+	    if Pos(lChar,'?') > 0 then
 	    begin
 	      lmostrar := false;
 		  end;
-   //backspace
-   if key = 8 then
+	 end;
+	 //backspace //Espao
+   if key in[8,32] then
    begin
      lmostrar := false;
 	 end;
@@ -1437,6 +1441,13 @@ begin
        begin
          result := lTextAfterWord;
 			 end;
+   	end
+    else if (Result  <> '') then
+    begin
+       if IsExepressaoValida(opEve,trim(Result)) then
+       begin
+         result := '';
+			 end;
    	end;
 	end
   else
@@ -1529,15 +1540,17 @@ begin
     ls_expressao := '';
     li_Pos       := 1;
     li_len       := Length(piTexto);
-    if (piOpEve = fopEvenSelectCompleto)  then
+    if (piOpEve = fopEvenSelectCompleto) or
+       (piOpEve = fopEvenSearchSelect)
+    then
     begin
       if piTemPalavraAntes then
       begin
-        ls_expressao := '=,(*';
+        ls_expressao := '=,(^*&';
       end
       else
       begin
-        ls_expressao := '=,()*';
+        ls_expressao := '=,()^*#@$%&"!@#%&*''_-';
         if (trim(piTexto)  = __ASTERICO)  then
         begin
           li_Pos := li_Len + 1;
@@ -1549,22 +1562,22 @@ begin
     begin
       if piTemPalavraAntes then
       begin
-        ls_expressao := ',(';
+        ls_expressao := ',(&^~';
       end
       else
       begin
-        ls_expressao := '=,()';
+        ls_expressao := '=,()^~#@$%&"!@#$%&*_';
       end
 		end
 		else if (piOpEve = fopEvenWhereCompleto)  then
     begin
        if piTemPalavraAntes then
        begin
-         ls_expressao := '=<>(*-+/';
+         ls_expressao := '=<>(^~*-+/&';
 			 end
 			 else
        begin
-         ls_expressao := '=,<>()*-+./[]{}';
+         ls_expressao := __CARACTERES_ESPECIAIS;
 			 end;
 		end;