paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-05 22:38:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: SynCompletion, add some utf8 support. issue #0024954

Browse Source 
git-svn-id: trunk@43322 -
This commit is contained in:
martin 2013-10-26 11:56:58 +00:00
parent f1c0a8c344
commit 6d22536a80
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
components/synedit/syncompletion.pas
View File

@ -46,7 +46,8 @@ interface
uses
LCLProc, LCLIntf, LCLType, LMessages, Classes, Graphics, Forms,
Controls, StdCtrls, ExtCtrls, Menus, SysUtils, types,
SynEditMiscProcs, SynEditKeyCmds, SynEdit, SynEditTypes, SynEditPlugins;
SynEditMiscProcs, SynEditKeyCmds, SynEdit, SynEditTypes, SynEditPlugins
{$IF FPC_FULLVERSION >= 20701}, character, LazUTF8{$ENDIF};
type
TSynBaseCompletionPaintItem =
@ -446,6 +447,29 @@ implementation
var
KeyOffset: integer;
function IsIdentifierChar(p: PChar): boolean; inline;
var
u: UnicodeString;
i: Integer;
L: Cardinal;
begin
Result := p^ in ['a'..'z','A'..'Z','0'..'9','_'];
if Result then exit;
{$IF FPC_FULLVERSION >= 20701}
if p^ <= #127 then exit;
i := UTF8CharacterLength(p);
SetLength(u, i);
// wide chars of UTF-16 <= bytes of UTF-8 string
if ConvertUTF8ToUTF16(PWideChar(u), i + 1, p, i, [toInvalidCharToSymbol], L) = trNoError
then begin
SetLength(u, L - 1);
if L > 1 then
Result := TCharacter.IsLetterOrDigit(u, 1);
end;
{$ENDIF}
end;
{ TSynCompletionForm }
procedure TSynCompletionForm.AddCharAtCursor(AUtf8Char: TUTF8Char);
@ -1041,7 +1065,7 @@ begin
// backspace
end
else
if (Length(UTF8Key)>=1) and (not (UTF8Key[1] in ['a'..'z','A'..'Z','0'..'9','_'])) then
if (Length(UTF8Key)>=1) and (not IsIdentifierChar(@UTF8Key[1])) then
begin
// non identifier character
// if it is special key then eat it
@ -1735,7 +1759,7 @@ begin
NewBlockBegin:=LogCaret;
CurLine:=Lines[NewBlockBegin.Y - 1];
while (NewBlockBegin.X>1) and (NewBlockBegin.X-1<=length(CurLine))
and (CurLine[NewBlockBegin.X-1] in ['a'..'z','A'..'Z','0'..'9','_']) do
and (IsIdentifierChar(@CurLine[NewBlockBegin.X-1])) do
dec(NewBlockBegin.X);
//BlockBegin:=NewBlockBegin;
if ssShift in Shift then begin
@ -1746,7 +1770,7 @@ begin
NewBlockEnd := LogCaret;
CurLine:=Lines[NewBlockEnd.Y - 1];
while (NewBlockEnd.X<=length(CurLine))
and (CurLine[NewBlockEnd.X] in ['a'..'z','A'..'Z','0'..'9','_']) do
and (IsIdentifierChar(@CurLine[NewBlockEnd.X])) do
inc(NewBlockEnd.X);
end;
//debugln('TSynCompletion.Validate B Position=',dbgs(Position));