ajustes e testes

EvoUMLPlugin/src/ituExplorerV2.pas

@@ -181,7 +181,7 @@ type
     //
     function RetirarPalavraChaveOLQ(piSynEdit :TSynEdit;opEve: TFaOpenEvent):string;
     function IsKeyword(piItem : string): boolean;
-    function GetTextBetweenWord(piSynEdit :TSynEdit;piWord : string) : string;
+    function GetTextBetweenWord(piSynEdit :TSynEdit;piWordPos: TPoint;piWord : string) : string;
 
    protected
     procedure CreateParams(var Params : TCreateParams); override;
@@ -1220,11 +1220,13 @@ var  lWord,
      ls_espaco,
      ls_aux : string;
      li_Pos : integer;
+     p2,
      p1,zeroPoint : TPoint;
 begin
    result := '';
-   lWord := trim(piSynEdit.GetWordAtRowCol(piSynEdit.PrevWordPos));
-   lText :=  GetTextBetweenWord(piSynEdit,lWord);
+   p2     := piSynEdit.PrevWordPos;
+   lWord  := trim(piSynEdit.GetWordAtRowCol(p2));
+   lText  := GetTextBetweenWord(piSynEdit,p2,lWord);
    if not IsKeyword(lWord) then
    begin
      if (opEve = fopEvenSelectCompleto) or
@@ -1344,18 +1346,39 @@ begin
 
 end;
 
-function TExplorerV2.GetTextBetweenWord(piSynEdit :TSynEdit;piWord: string): string;
-var p1: TPoint;
-    li_Pos : integer;
+function TExplorerV2.GetTextBetweenWord(piSynEdit :TSynEdit;piWordPos: TPoint;piWord: string): string;
+var p1,p2: TPoint;
+    //li_Pos : integer;
 begin
-  li_Pos := Pos(piWord,piSynEdit.LineText);
+  if trim(piWord) = '' then
+  begin
+	   p1 := piWordPos;
+	   p2 := piSynEdit.CaretXY;
+	   result := '';
+	   while (result = '') and (p1.Y > 0) do
+	   begin
+	     p1.Y   := p1.Y - 1;
+	     result := piSynEdit.TextBetweenPoints[p1,p2];
+		 end;
+  end
+  else
+  begin
+	   p1 := piWordPos;
+	   p2 := piSynEdit.CaretXY;
+	   if p2.Y <> p1.Y then
+	   begin
+	     p1.X := p1.X - Length(piWord);
+	   end;
+		 result := piSynEdit.TextBetweenPoints[p1,p2];
+  end;
+
+  {li_Pos := Pos(piWord,piSynEdit.LineText);
   p1 := piSynEdit.CaretXY;
   if li_pos > 0 then
   begin
     p1.X:= li_Pos;
 	end;
-	result := piSynEdit.TextBetweenPoints[p1, piSynEdit.CaretXY];
-
+	result := piSynEdit.TextBetweenPoints[p1, piSynEdit.CaretXY]; }
 end;
 
 procedure TExplorerV2.CreateParams(var Params: TCreateParams);