paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-23 06:40:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed changing unitname during update

Browse Source 
git-svn-id: trunk@3117 -
This commit is contained in:
mattias 2002-08-18 08:57:44 +00:00
parent 1387be7243
commit dfc8500a42
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ide/main.pp
View File

@ -2822,7 +2822,7 @@ begin
SaveAsFileExt:=EditorOpts.HighlighterList.GetDefaultFilextension( SaveAsFileExt:=EditorOpts.HighlighterList.GetDefaultFilextension(
SrcEdit.SyntaxHighlighterType); SrcEdit.SyntaxHighlighterType);
end; end;
AnUnitInfo.ReadUnitNameFromSource; AnUnitInfo.ReadUnitNameFromSource(true);
SaveAsFilename:=AnUnitInfo.UnitName; SaveAsFilename:=AnUnitInfo.UnitName;
if SaveAsFilename='' then if SaveAsFilename='' then
SaveAsFilename:=ExtractFileNameOnly(AnUnitInfo.Filename); SaveAsFilename:=ExtractFileNameOnly(AnUnitInfo.Filename);
@ -3438,7 +3438,7 @@ begin
end; end;
NewUnitInfo:=TUnitInfo.Create(PreReadBuf); NewUnitInfo:=TUnitInfo.Create(PreReadBuf);
if FilenameIsPascalSource(NewUnitInfo.Filename) then if FilenameIsPascalSource(NewUnitInfo.Filename) then
NewUnitInfo.ReadUnitNameFromSource; NewUnitInfo.ReadUnitNameFromSource(true);
Project1.AddUnit(NewUnitInfo,false); Project1.AddUnit(NewUnitInfo,false);
Result:=mrOk; Result:=mrOk;
end; end;
@ -4470,7 +4470,7 @@ begin
NewUnitInfo.Source:=NewBuf; NewUnitInfo.Source:=NewBuf;
NewUnitInfo.Modified:=NewUnitInfo.Source.FileOnDiskNeedsUpdate; NewUnitInfo.Modified:=NewUnitInfo.Source.FileOnDiskNeedsUpdate;
if FilenameIsPascalUnit(NewUnitInfo.Filename) then if FilenameIsPascalUnit(NewUnitInfo.Filename) then
NewUnitInfo.ReadUnitNameFromSource; NewUnitInfo.ReadUnitNameFromSource(false);
end else begin end else begin
// open unknown file // open unknown file
Handled:=false; Handled:=false;
@ -5360,7 +5360,7 @@ begin
ActiveUnitInfo.IsPartOfProject:=true; ActiveUnitInfo.IsPartOfProject:=true;
if (FilenameIsPascalUnit(ActiveUnitInfo.Filename)) if (FilenameIsPascalUnit(ActiveUnitInfo.Filename))
and (Project1.ProjectType in [ptProgram, ptApplication]) then begin and (Project1.ProjectType in [ptProgram, ptApplication]) then begin
ActiveUnitInfo.ReadUnitNameFromSource; ActiveUnitInfo.ReadUnitNameFromSource(false);
ShortUnitName:=ActiveUnitInfo.CreateUnitName; ShortUnitName:=ActiveUnitInfo.CreateUnitName;
if (ShortUnitName<>'') then begin if (ShortUnitName<>'') then begin
if CodeToolBoss.AddUnitToMainUsesSection( if CodeToolBoss.AddUnitToMainUsesSection(
@ -6282,7 +6282,7 @@ begin
end; end;
NewUnitName:=AnUnitInfo.UnitName; NewUnitName:=AnUnitInfo.UnitName;
if NewUnitName='' then begin if NewUnitName='' then begin
AnUnitInfo.ReadUnitNameFromSource; AnUnitInfo.ReadUnitNameFromSource(false);
NewUnitName:=AnUnitInfo.CreateUnitName; NewUnitName:=AnUnitInfo.CreateUnitName;
end; end;
ResourceCode:=nil; ResourceCode:=nil;
@ -7806,7 +7806,7 @@ begin
if FilenameIsPascalUnit(AnUnitInfo.Filename) then begin if FilenameIsPascalUnit(AnUnitInfo.Filename) then begin
SourceName:=CodeToolBoss.GetCachedSourceName(AnUnitInfo.Source); SourceName:=CodeToolBoss.GetCachedSourceName(AnUnitInfo.Source);
if SourceName<>'' then if SourceName<>'' then
AnUnitInfo.UnitName:=SourceName; AnUnitInfo.ReadUnitNameFromSource(true);
end else end else
SourceName:=''; SourceName:='';
PageName:=CreateSrcEditPageName(SourceName,AnUnitInfo.Filename,PageIndex); PageName:=CreateSrcEditPageName(SourceName,AnUnitInfo.Filename,PageIndex);
@ -8644,7 +8644,7 @@ begin
AnUnitInfo.IsPartOfProject:=true; AnUnitInfo.IsPartOfProject:=true;
if FilenameIsPascalUnit(AnUnitInfo.Filename) if FilenameIsPascalUnit(AnUnitInfo.Filename)
and (Project1.ProjectType in [ptProgram, ptApplication]) then begin and (Project1.ProjectType in [ptProgram, ptApplication]) then begin
AnUnitInfo.ReadUnitNameFromSource; AnUnitInfo.ReadUnitNameFromSource(false);
ShortUnitName:=AnUnitInfo.UnitName; ShortUnitName:=AnUnitInfo.UnitName;
if (ShortUnitName<>'') then begin if (ShortUnitName<>'') then begin
Dummy:=CodeToolBoss.AddUnitToMainUsesSection( Dummy:=CodeToolBoss.AddUnitToMainUsesSection(
@ -9233,6 +9233,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.609 2003/06/19 09:26:58 mattias
fixed changing unitname during update
Revision 1.608 2003/06/18 11:50:53 mattias Revision 1.608 2003/06/18 11:50:53 mattias
implemented Paste components in source implemented Paste components in source