IDE: apply wordexceptions to unit names in identifier completion

git-svn-id: trunk@38030 -
This commit is contained in:
mattias 2012-07-24 08:30:35 +00:00
parent b7d2540ebf
commit 4e187f7a92
2 changed files with 5 additions and 3 deletions

View File

@ -552,6 +552,7 @@ var
Indent: LongInt;
StartContextPos: TCodeXYPosition;
s: String;
IsWordPolicyExcept: Boolean;
begin
Result:='';
CursorToLeft:=0;
@ -574,7 +575,7 @@ begin
Result:=IdentItem.Identifier;
with CodeToolBoss.SourceChangeCache.BeautifyCodeOptions do
WordExceptions.CheckExceptions(Result);
IsWordPolicyExcept:=WordExceptions.CheckExceptions(Result);
case IdentItem.GetDesc of
@ -670,9 +671,8 @@ begin
end;
icvUnitName:
begin
if not IsWordPolicyExcept then
Result:=FindUnitName(IdentList,IdentItem);
end;
end;
if CursorAtEnd then ;

View File

@ -364,6 +364,8 @@ begin
begin
IdentItem := TIdentifierListItem(Items.Objects[ItemIndex]);
Result := IdentItem.Identifier;
with CodeToolBoss.SourceChangeCache.BeautifyCodeOptions do
if WordExceptions.CheckExceptions(Result) then Exit;
CodeBuf := CodeToolBoss.FindUnitSource(SourceEditorManager.ActiveEditor.CodeBuffer, Result, '');
if Assigned(CodeBuf) then
begin