paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-05 15:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

codetools: deprecated GetUnitNameForUsesSection

Browse Source 
git-svn-id: trunk@32108 -
This commit is contained in:
mattias 2011-08-30 09:28:53 +00:00
parent 9673a4f818
commit 684ea95b51
3 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/codetools/codecompletiontool.pas
View File

@ -1437,7 +1437,7 @@ begin
MissingUnit:='';
if (ExprType.Desc=xtContext)
and (ExprType.Context.Tool<>nil) then
MissingUnit:=GetUnitForUsesSection(ExprType.Context.Tool);
MissingUnit:=GetUnitNameForUsesSection(ExprType.Context.Tool);
Result:=AddLocalVariable(CleanCursorPos,OldTopLine,GetAtom(VarNameAtom),
NewType,MissingUnit,NewPos,NewTopLine,SourceChangeCache);
end;
@ -1833,7 +1833,7 @@ begin
MissingUnit:='';
if (ExprType.Desc=xtContext)
and (ExprType.Context.Tool<>nil) then
MissingUnit:=GetUnitForUsesSection(ExprType.Context.Tool);
MissingUnit:=GetUnitNameForUsesSection(ExprType.Context.Tool);
Result:=AddLocalVariable(CleanCursorPos,OldTopLine,GetAtom(VarNameAtom),
NewType,MissingUnit,NewPos,NewTopLine,SourceChangeCache);

43
components/codetools/finddeclarationtool.pas
View File

@ -597,7 +597,7 @@ type
{$ENDIF}
function FindDeclarationInUsesSection(UsesNode: TCodeTreeNode;
CleanPos: integer;
out NewPos: TCodeXYPosition; out NewTopLine: integer): boolean;
out NewPos: TCodeXYPosition; out NewTopLine: integer): boolean; // ToDo: dotted
function IsIncludeDirectiveAtPos(CleanPos, CleanCodePosInFront: integer;
var IncludeCode: TCodeBuffer): boolean;
function FindEnumInContext(Params: TFindDeclarationParams): boolean;
@ -613,7 +613,7 @@ type
function FindIdentifierInAncestors(ClassNode: TCodeTreeNode;
Params: TFindDeclarationParams): boolean;
function FindIdentifierInUsesSection(UsesNode: TCodeTreeNode;
Params: TFindDeclarationParams): boolean;
Params: TFindDeclarationParams): boolean; // ToDo: dotted
function FindIdentifierInHiddenUsedUnits(
Params: TFindDeclarationParams): boolean;
function FindIdentifierInUsedUnit(const AnUnitName: string;
@ -714,10 +714,10 @@ type
ExceptionOnNotFound: boolean): TFindDeclarationTool;
function FindUnitSourceWithUnitIdentifier(UsesNode: TCodeTreeNode;
const AnUnitIdentifier: string; ExceptionOnNotFound: boolean
): TCodeBuffer;
): TCodeBuffer; // ToDo: dotted
function FindCodeToolForUnitIdentifier(UsesNode: TCodeTreeNode;
const AnUnitIdentifier: string; ExceptionOnNotFound: boolean
): TFindDeclarationTool;
): TFindDeclarationTool; // ToDo: dotted
function FindIdentifierInInterface(AskingTool: TFindDeclarationTool;
Params: TFindDeclarationParams): boolean;
function CompareNodeIdentifier(Node: TCodeTreeNode;
@ -776,7 +776,7 @@ type
function FindDeclarationInInterface(const Identifier: string;
out NewPos: TCodeXYPosition; out NewTopLine: integer): boolean;
function FindDeclarationWithMainUsesSection(const Identifier: string;
out NewPos: TCodeXYPosition; out NewTopLine: integer): boolean;
out NewPos: TCodeXYPosition; out NewTopLine: integer): boolean; // ToDo: dotted
function FindDeclarationOfPropertyPath(const PropertyPath: string;
out NewContext: TFindContext; IgnoreTypeLess: boolean = false): boolean;
function FindDeclarationOfPropertyPath(const PropertyPath: string;
@ -789,21 +789,22 @@ type
function FindMainUsesSection(UseContainsSection: boolean = false): TCodeTreeNode;
function FindImplementationUsesSection: TCodeTreeNode;
function FindNameInUsesSection(UsesNode: TCodeTreeNode;
const AUnitName: string): TCodeTreeNode;
const AUnitName: string): TCodeTreeNode; // ToDo: dotted
function FindUnitInUsesSection(UsesNode: TCodeTreeNode;
const AnUnitName: string;
out NamePos, InPos: TAtomPosition): boolean;
out NamePos, InPos: TAtomPosition): boolean; // ToDo: dotted
function FindUnitInAllUsesSections(const AnUnitName: string;
out NamePos, InPos: TAtomPosition): boolean;
function GetUnitForUsesSection(Tool: TFindDeclarationTool): string;
out NamePos, InPos: TAtomPosition): boolean; // ToDo: dotted
function GetUnitNameForUsesSection(TargetTool: TFindDeclarationTool): string;
function GetUnitForUsesSection(TargetTool: TFindDeclarationTool): string; deprecated;
function FindUnitSource(const AnUnitName,
AnUnitInFilename: string; ExceptionOnNotFound: boolean): TCodeBuffer;
AnUnitInFilename: string; ExceptionOnNotFound: boolean): TCodeBuffer; // ToDo: dotted
function FindUnitCaseInsensitive(var AnUnitName,
AnUnitInFilename: string): string;
AnUnitInFilename: string): string; // ToDo: dotted
procedure GatherUnitAndSrcPath(var UnitPath, CompleteSrcPath: string);
function SearchUnitInUnitLinks(const TheUnitName: string): string;
function SearchUnitInUnitSet(const TheUnitName: string): string;
function SearchUnitInUnitLinks(const TheUnitName: string): string; deprecated;
function SearchUnitInUnitSet(const TheUnitName: string): string; // ToDo: dotted
function FindSmartHint(const CursorPos: TCodeXYPosition;
Flags: TFindSmartFlags = DefaultFindSmartHintFlags): string;
@ -1937,16 +1938,16 @@ begin
end;
end;
function TFindDeclarationTool.GetUnitForUsesSection(Tool: TFindDeclarationTool
): string;
function TFindDeclarationTool.GetUnitNameForUsesSection(
TargetTool: TFindDeclarationTool): string;
var
UsesNode: TCodeTreeNode;
Alternative: String;
begin
Result:='';
if (Tool=nil) or (Tool.MainFilename='') or (Tool=Self) then
if (TargetTool=nil) or (TargetTool.MainFilename='') or (TargetTool=Self) then
exit;
Result:=ExtractFileNameOnly(Tool.MainFilename);
Result:=ExtractFileNameOnly(TargetTool.MainFilename);
if Result='' then exit;
// check if system unit
@ -1981,12 +1982,18 @@ begin
// beautify
if Result=lowercase(Result) then begin
Alternative:=Tool.GetSourceName(false);
Alternative:=TargetTool.GetSourceName(false);
if Alternative<>'' then
Result:=Alternative;
end;
end;
function TFindDeclarationTool.GetUnitForUsesSection(
TargetTool: TFindDeclarationTool): string;
begin
Result:=GetUnitNameForUsesSection(TargetTool);
end;
function TFindDeclarationTool.FindInitializationSection: TCodeTreeNode;
begin
Result:=FindInitializationNode;

16
components/codetools/stdcodetools.pas
View File

@ -85,7 +85,7 @@ type
function RenameUsedUnit(const OldUnitName, NewUnitName,
NewUnitInFile: string;
SourceChangeCache: TSourceChangeCache): boolean;
function ReplaceUsedUnits(UnitNamePairs: TStringToStringTree;
function ReplaceUsedUnits(UnitNamePairs: TStringToStringTree; // ToDo: dotted
SourceChangeCache: TSourceChangeCache): boolean;
function AddUnitToUsesSection(UsesNode: TCodeTreeNode;
const NewUnitName, NewUnitInFile: string;
@ -115,7 +115,7 @@ type
SourceChangeCache: TSourceChangeCache): boolean;
function FixUsedUnitCase(SourceChangeCache: TSourceChangeCache): boolean;
function FixUsedUnitCaseInUsesSection(UsesNode: TCodeTreeNode;
SourceChangeCache: TSourceChangeCache): boolean;
SourceChangeCache: TSourceChangeCache): boolean; // ToDo: dotted
function FindUsedUnitNames(var MainUsesSection,
ImplementationUsesSection: TStrings): boolean;
function FindUsedUnitNames(var List: TStringToStringTree): boolean;
@ -124,15 +124,15 @@ type
ImplementationUsesSection: TStrings): boolean;
function FindDelphiProjectUnits(var FoundInUnits, MissingInUnits,
NormalUnits: TStrings;
UseContainsSection: boolean = false): boolean;
function UsesSectionToFilenames(UsesNode: TCodeTreeNode): TStrings;
function UsesSectionToUnitnames(UsesNode: TCodeTreeNode): TStrings;
UseContainsSection: boolean = false): boolean; // ToDo: dotted
function UsesSectionToFilenames(UsesNode: TCodeTreeNode): TStrings; // ToDo: dotted
function UsesSectionToUnitnames(UsesNode: TCodeTreeNode): TStrings; // ToDo: dotted
function FindMissingUnits(var MissingUnits: TStrings; FixCase: boolean;
SearchImplementation: boolean;
SourceChangeCache: TSourceChangeCache): boolean;
SourceChangeCache: TSourceChangeCache): boolean; // ToDo: dotted
function CommentUnitsInUsesSections(MissingUnits: TStrings;
SourceChangeCache: TSourceChangeCache): boolean;
function FindUnusedUnits(Units: TStrings): boolean;
SourceChangeCache: TSourceChangeCache): boolean; // ToDo: dotted
function FindUnusedUnits(Units: TStrings): boolean; // ToDo: dotted
// lazarus resources
function FindNextIncludeInInitialization(