paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-21 18:09:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fixed save as change case, bug #10368

Browse Source 
git-svn-id: trunk@35909 -
This commit is contained in:
mattias 2012-03-12 22:16:30 +00:00
parent 13538c50cc
commit 2a417ff43a
3 changed files with 95 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/codetools/sourcelog.pas
View File

@ -870,7 +870,6 @@ end;
function TSourceLog.SaveToFile(const Filename: string): boolean; function TSourceLog.SaveToFile(const Filename: string): boolean;
var var
fs: TFileStream; fs: TFileStream;
TheFilename: String;
s: String; s: String;
begin begin
{$IFDEF VerboseCTSave} {$IFDEF VerboseCTSave}
@ -881,14 +880,13 @@ begin
LastError:=''; LastError:='';
try try
// keep filename case on disk // keep filename case on disk
TheFilename := FindDiskFilename(Filename); if FileExistsUTF8(Filename) then begin
if FileExistsUTF8(TheFilename) then begin InvalidateFileStateCache(Filename);
InvalidateFileStateCache(TheFilename); fs := TFileStream.Create(UTF8ToSys(Filename), fmOpenWrite or fmShareDenyNone);
fs := TFileStream.Create(UTF8ToSys(TheFilename), fmOpenWrite or fmShareDenyNone);
fs.Size := 0; fs.Size := 0;
end else begin end else begin
InvalidateFileStateCache; // invalidate all (samba shares) InvalidateFileStateCache; // invalidate all (samba shares)
fs := TFileStream.Create(UTF8ToSys(TheFilename), fmCreate); fs := TFileStream.Create(UTF8ToSys(Filename), fmCreate);
end; end;
try try
s := Source; s := Source;

5
ide/dialogprocs.pas
View File

@ -272,7 +272,10 @@ var
begin begin
if Backup then begin if Backup then begin
Result:=BackupFileInteractive(Filename); Result:=BackupFileInteractive(Filename);
if Result<>mrOk then exit; if Result<>mrOk then begin
debugln(['SaveCodeBufferToFile backup failed: "',Filename,'"']);
exit;
end;
end else end else
Result:=mrOk; Result:=mrOk;
repeat repeat

168
ide/main.pp
View File

@ -719,13 +719,13 @@ type
// methods for 'save unit' // methods for 'save unit'
function DoShowSaveFileAsDialog(var AFilename: string; AnUnitInfo: TUnitInfo; function DoShowSaveFileAsDialog(var AFilename: string; AnUnitInfo: TUnitInfo;
var ResourceCode: TCodeBuffer; CanAbort: boolean): TModalResult; var LFMCode, LRSCode: TCodeBuffer; CanAbort: boolean): TModalResult;
function DoSaveUnitComponent(AnUnitInfo: TUnitInfo; function DoSaveUnitComponent(AnUnitInfo: TUnitInfo;
ResourceCode, LFMCode: TCodeBuffer; Flags: TSaveFlags): TModalResult; LRSCode, LFMCode: TCodeBuffer; Flags: TSaveFlags): TModalResult;
function DoRemoveDanglingEvents(AnUnitInfo: TUnitInfo; function DoRemoveDanglingEvents(AnUnitInfo: TUnitInfo;
OkOnCodeErrors: boolean): TModalResult; OkOnCodeErrors: boolean): TModalResult;
function DoRenameUnit(AnUnitInfo: TUnitInfo; NewFilename, NewUnitName: string; function DoRenameUnit(AnUnitInfo: TUnitInfo; NewFilename, NewUnitName: string;
var ResourceCode: TCodeBuffer): TModalresult; var LFMCode, LRSCode: TCodeBuffer): TModalresult;
// methods for 'open unit' and 'open main unit' // methods for 'open unit' and 'open main unit'
function DoOpenNotExistingFile(const AFileName:string; function DoOpenNotExistingFile(const AFileName:string;
@ -735,7 +735,7 @@ type
function DoOpenFileInSourceEditor(AnEditorInfo: TUnitEditorInfo; function DoOpenFileInSourceEditor(AnEditorInfo: TUnitEditorInfo;
PageIndex, WindowIndex: integer; Flags: TOpenFlags): TModalResult; PageIndex, WindowIndex: integer; Flags: TOpenFlags): TModalResult;
function DoLoadResourceFile(AnUnitInfo: TUnitInfo; function DoLoadResourceFile(AnUnitInfo: TUnitInfo;
var LFMCode, ResourceCode: TCodeBuffer; var LFMCode, LRSCode: TCodeBuffer;
IgnoreSourceErrors, AutoCreateResourceCode, ShowAbort: boolean): TModalResult; IgnoreSourceErrors, AutoCreateResourceCode, ShowAbort: boolean): TModalResult;
function DoLoadLFM(AnUnitInfo: TUnitInfo; OpenFlags: TOpenFlags; function DoLoadLFM(AnUnitInfo: TUnitInfo; OpenFlags: TOpenFlags;
CloseFlags: TCloseFlags): TModalResult; CloseFlags: TCloseFlags): TModalResult;
@ -5374,7 +5374,7 @@ begin
end; end;
function TMainIDE.DoLoadResourceFile(AnUnitInfo: TUnitInfo; function TMainIDE.DoLoadResourceFile(AnUnitInfo: TUnitInfo;
var LFMCode, ResourceCode: TCodeBuffer; var LFMCode, LRSCode: TCodeBuffer;
IgnoreSourceErrors, AutoCreateResourceCode, ShowAbort: boolean): TModalResult; IgnoreSourceErrors, AutoCreateResourceCode, ShowAbort: boolean): TModalResult;
var var
LFMFilename: string; LFMFilename: string;
@ -5382,7 +5382,7 @@ var
ResType: TResourceType; ResType: TResourceType;
begin begin
LFMCode:=nil; LFMCode:=nil;
ResourceCode:=nil; LRSCode:=nil;
//DebugLn(['TMainIDE.DoLoadResourceFile ',AnUnitInfo.Filename,' HasResources=',AnUnitInfo.HasResources,' IgnoreSourceErrors=',IgnoreSourceErrors,' AutoCreateResourceCode=',AutoCreateResourceCode]); //DebugLn(['TMainIDE.DoLoadResourceFile ',AnUnitInfo.Filename,' HasResources=',AnUnitInfo.HasResources,' IgnoreSourceErrors=',IgnoreSourceErrors,' AutoCreateResourceCode=',AutoCreateResourceCode]);
if AnUnitInfo.HasResources then begin if AnUnitInfo.HasResources then begin
//writeln('TMainIDE.DoLoadResourceFile A "',AnUnitInfo.Filename,'" "',AnUnitInfo.ResourceFileName,'"'); //writeln('TMainIDE.DoLoadResourceFile A "',AnUnitInfo.Filename,'" "',AnUnitInfo.ResourceFileName,'"');
@ -5391,12 +5391,12 @@ begin
if ResType=rtLRS then begin if ResType=rtLRS then begin
LRSFilename:=MainBuildBoss.FindLRSFilename(AnUnitInfo,false); LRSFilename:=MainBuildBoss.FindLRSFilename(AnUnitInfo,false);
if LRSFilename<>'' then begin if LRSFilename<>'' then begin
Result:=LoadCodeBuffer(ResourceCode,LRSFilename,[lbfUpdateFromDisk],ShowAbort); Result:=LoadCodeBuffer(LRSCode,LRSFilename,[lbfUpdateFromDisk],ShowAbort);
if Result<>mrOk then exit; if Result<>mrOk then exit;
end else begin end else begin
LRSFilename:=MainBuildBoss.GetDefaultLRSFilename(AnUnitInfo); LRSFilename:=MainBuildBoss.GetDefaultLRSFilename(AnUnitInfo);
if AutoCreateResourceCode then begin if AutoCreateResourceCode then begin
ResourceCode:=CodeToolBoss.CreateFile(LRSFilename); LRSCode:=CodeToolBoss.CreateFile(LRSFilename);
end else begin end else begin
DebugLn(['TMainIDE.DoLoadResourceFile .lrs file not found of unit ',AnUnitInfo.Filename]); DebugLn(['TMainIDE.DoLoadResourceFile .lrs file not found of unit ',AnUnitInfo.Filename]);
exit(mrCancel); exit(mrCancel);
@ -5404,7 +5404,7 @@ begin
end; end;
end else begin end else begin
LRSFilename:=''; LRSFilename:='';
ResourceCode:=nil; LRSCode:=nil;
end; end;
// if no resource file found (i.e. normally the .lrs file) // if no resource file found (i.e. normally the .lrs file)
@ -5500,7 +5500,7 @@ end;
function TMainIDE.DoShowSaveFileAsDialog(var AFilename: string; function TMainIDE.DoShowSaveFileAsDialog(var AFilename: string;
AnUnitInfo: TUnitInfo; AnUnitInfo: TUnitInfo;
var ResourceCode: TCodeBuffer; CanAbort: boolean): TModalResult; var LFMCode, LRSCode: TCodeBuffer; CanAbort: boolean): TModalResult;
var var
SaveDialog: TSaveDialog; SaveDialog: TSaveDialog;
SaveAsFilename, SaveAsFileExt, NewFilename, NewUnitName, NewFilePath, SaveAsFilename, SaveAsFileExt, NewFilename, NewUnitName, NewFilePath,
@ -5600,6 +5600,7 @@ begin
exit; exit;
end; end;
NewFilename:=ExpandFileNameUTF8(SaveDialog.Filename); NewFilename:=ExpandFileNameUTF8(SaveDialog.Filename);
//debugln(['TMainIDE.DoShowSaveFileAsDialog SaveDialog.Filename="',SaveDialog.Filename,'" NewFilename="',NewFilename,'"']);
finally finally
InputHistories.StoreFileDialogSettings(SaveDialog); InputHistories.StoreFileDialogSettings(SaveDialog);
SaveDialog.Free; SaveDialog.Free;
@ -5637,7 +5638,6 @@ begin
mtWarning,[mbIgnore,mbCancel],CanAbort); mtWarning,[mbIgnore,mbCancel],CanAbort);
if Result in [mrCancel,mrAbort] then exit; if Result in [mrCancel,mrAbort] then exit;
NewUnitName:=AlternativeUnitName; NewUnitName:=AlternativeUnitName;
Result:=mrCancel;
end; end;
if Project1.IndexOfUnitWithName(NewUnitName,true,AnUnitInfo)>=0 then if Project1.IndexOfUnitWithName(NewUnitName,true,AnUnitInfo)>=0 then
begin begin
@ -5693,7 +5693,7 @@ begin
if AnUnitInfo<>nil then begin if AnUnitInfo<>nil then begin
// rename unit // rename unit
Result:=DoRenameUnit(AnUnitInfo,NewFilename,NewUnitName,ResourceCode); Result:=DoRenameUnit(AnUnitInfo,NewFilename,NewUnitName,LFMCode,LRSCode);
AFilename:=AnUnitInfo.Filename; AFilename:=AnUnitInfo.Filename;
if Result<>mrOk then exit; if Result<>mrOk then exit;
end else begin end else begin
@ -5752,7 +5752,7 @@ begin
end; end;
function TMainIDE.DoSaveUnitComponent(AnUnitInfo: TUnitInfo; function TMainIDE.DoSaveUnitComponent(AnUnitInfo: TUnitInfo;
ResourceCode, LFMCode: TCodeBuffer; Flags: TSaveFlags): TModalResult; LRSCode, LFMCode: TCodeBuffer; Flags: TSaveFlags): TModalResult;
function IsI18NEnabled(UnitOwners: TFPList): boolean; function IsI18NEnabled(UnitOwners: TFPList): boolean;
var var
@ -5817,7 +5817,7 @@ begin
// <ClassName>.<PropertyName>=<PropertyValue> // <ClassName>.<PropertyName>=<PropertyValue>
LRSFilename:=''; LRSFilename:='';
ResType:=MainBuildBoss.GetResourceType(AnUnitInfo); ResType:=MainBuildBoss.GetResourceType(AnUnitInfo);
ResourceCode:=nil; LRSCode:=nil;
if (AnUnitInfo.Component<>nil) then begin if (AnUnitInfo.Component<>nil) then begin
// stream component to resource code and to lfm file // stream component to resource code and to lfm file
@ -5893,9 +5893,9 @@ begin
// create lazarus form resource code // create lazarus form resource code
if ComponentSavingOk and (LRSFilename<>'') then begin if ComponentSavingOk and (LRSFilename<>'') then begin
if ResourceCode=nil then begin if LRSCode=nil then begin
ResourceCode:=CodeToolBoss.CreateFile(LRSFilename); LRSCode:=CodeToolBoss.CreateFile(LRSFilename);
ComponentSavingOk:=(ResourceCode<>nil); ComponentSavingOk:=(LRSCode<>nil);
end; end;
if ComponentSavingOk then begin if ComponentSavingOk then begin
// there is no bug in the source, so the resource code should be // there is no bug in the source, so the resource code should be
@ -5924,28 +5924,28 @@ begin
// if resource name has changed, delete old resource // if resource name has changed, delete old resource
if (AnUnitInfo.ComponentName<>AnUnitInfo.ComponentResourceName) if (AnUnitInfo.ComponentName<>AnUnitInfo.ComponentResourceName)
and (AnUnitInfo.ComponentResourceName<>'') then begin and (AnUnitInfo.ComponentResourceName<>'') then begin
CodeToolBoss.RemoveLazarusResource(ResourceCode, CodeToolBoss.RemoveLazarusResource(LRSCode,
'T'+AnUnitInfo.ComponentResourceName); 'T'+AnUnitInfo.ComponentResourceName);
end; end;
// add comment to resource file (if not already exists) // add comment to resource file (if not already exists)
if (not CodeToolBoss.AddLazarusResourceHeaderComment(ResourceCode, if (not CodeToolBoss.AddLazarusResourceHeaderComment(LRSCode,
LRSComment)) then LRSComment)) then
begin begin
ACaption:=lisResourceSaveError; ACaption:=lisResourceSaveError;
AText:=Format(lisUnableToAddResourceHeaderCommentToResourceFile, [ AText:=Format(lisUnableToAddResourceHeaderCommentToResourceFile, [
#13, '"', ResourceCode.FileName, '"', #13]); #13, '"', LRSCode.FileName, '"', #13]);
Result:=MessageDlg(ACaption,AText,mtError,[mbIgnore,mbAbort],0); Result:=MessageDlg(ACaption,AText,mtError,[mbIgnore,mbAbort],0);
if Result<>mrIgnore then exit; if Result<>mrIgnore then exit;
end; end;
// add resource to resource file // add resource to resource file
if (not CodeToolBoss.AddLazarusResource(ResourceCode, if (not CodeToolBoss.AddLazarusResource(LRSCode,
'T'+AnUnitInfo.ComponentName,CompResourceCode)) then 'T'+AnUnitInfo.ComponentName,CompResourceCode)) then
begin begin
ACaption:=lisResourceSaveError; ACaption:=lisResourceSaveError;
AText:=Format( AText:=Format(
lisUnableToAddResourceTFORMDATAToResourceFileProbably, [ lisUnableToAddResourceTFORMDATAToResourceFileProbably, [
AnUnitInfo.ComponentName, AnUnitInfo.ComponentName,
#13, '"', ResourceCode.FileName, '"', #13] #13, '"', LRSCode.FileName, '"', #13]
); );
Result:=MessageDlg(ACaption, AText, mtError, [mbIgnore, mbAbort],0); Result:=MessageDlg(ACaption, AText, mtError, [mbIgnore, mbAbort],0);
if Result<>mrIgnore then exit; if Result<>mrIgnore then exit;
@ -5953,7 +5953,7 @@ begin
AnUnitInfo.ComponentResourceName:=AnUnitInfo.ComponentName; AnUnitInfo.ComponentResourceName:=AnUnitInfo.ComponentName;
end; end;
end else begin end else begin
ResourceCode.Source:=CompResourceCode; LRSCode.Source:=CompResourceCode;
end; end;
end; end;
end; end;
@ -6062,24 +6062,24 @@ begin
writeln('TMainIDE.SaveFileResources F ',ResourceCode.Modified); writeln('TMainIDE.SaveFileResources F ',ResourceCode.Modified);
{$ENDIF} {$ENDIF}
// save binary stream (.lrs) // save binary stream (.lrs)
if ResourceCode<>nil then begin if LRSCode<>nil then begin
if (not (sfSaveToTestDir in Flags)) then if (not (sfSaveToTestDir in Flags)) then
begin begin
if (ResourceCode.Modified) then begin if (LRSCode.Modified) then begin
if FilenameIsAbsolute(ResourceCode.Filename) then if FilenameIsAbsolute(LRSCode.Filename) then
LRSFilename:=ResourceCode.Filename LRSFilename:=LRSCode.Filename
else if LRSFilename='' then else if LRSFilename='' then
LRSFilename:=MainBuildBoss.FindLRSFilename(AnUnitInfo,true); LRSFilename:=MainBuildBoss.FindLRSFilename(AnUnitInfo,true);
Result:=ForceDirectoryInteractive(ExtractFilePath(LRSFilename),[mbRetry]); Result:=ForceDirectoryInteractive(ExtractFilePath(LRSFilename),[mbRetry]);
if not Result=mrOk then exit; if not Result=mrOk then exit;
Result:=SaveCodeBufferToFile(ResourceCode,LRSFilename); Result:=SaveCodeBufferToFile(LRSCode,LRSFilename);
if not Result=mrOk then exit; if not Result=mrOk then exit;
end; end;
end else begin end else begin
TestFilename:=MainBuildBoss.GetTestUnitFilename(AnUnitInfo); TestFilename:=MainBuildBoss.GetTestUnitFilename(AnUnitInfo);
Result:=SaveCodeBufferToFile(ResourceCode, Result:=SaveCodeBufferToFile(LRSCode,
ChangeFileExt(TestFilename, ChangeFileExt(TestFilename,
ExtractFileExt(ResourceCode.Filename))); ExtractFileExt(LRSCode.Filename)));
if not Result=mrOk then exit; if not Result=mrOk then exit;
end; end;
end; end;
@ -6127,17 +6127,17 @@ end;
function TMainIDE.DoRenameUnit(AnUnitInfo: TUnitInfo; function TMainIDE.DoRenameUnit(AnUnitInfo: TUnitInfo;
NewFilename, NewUnitName: string; NewFilename, NewUnitName: string;
var ResourceCode: TCodeBuffer): TModalresult; var LFMCode, LRSCode: TCodeBuffer): TModalresult;
var var
NewLFMFilename: String; NewLFMFilename: String;
OldSourceCode: String; OldSourceCode: String;
NewSource: TCodeBuffer; NewSource: TCodeBuffer;
NewFilePath: String; NewFilePath: String;
NewResFilePath: String; NewLRSFilePath: String;
OldFilePath: String; OldFilePath: String;
OldResFilePath: String; OldLRSFilePath: String;
OldFilename: String; OldFilename: String;
NewResFilename: String; NewLRSFilename: String;
NewHighlighter: TLazSyntaxHighlighter; NewHighlighter: TLazSyntaxHighlighter;
AmbiguousFiles: TStringList; AmbiguousFiles: TStringList;
AmbiguousText: string; AmbiguousText: string;
@ -6149,7 +6149,7 @@ var
OldPPUFilename: String; OldPPUFilename: String;
OutDir: string; OutDir: string;
Owners: TFPList; Owners: TFPList;
LFMBuf: TCodeBuffer; OldFileExisted: Boolean;
begin begin
Project1.BeginUpdate(false); Project1.BeginUpdate(false);
try try
@ -6160,7 +6160,7 @@ begin
OldLFMFilename:=ChangeFileExt(OldFilename,'.dfm'); OldLFMFilename:=ChangeFileExt(OldFilename,'.dfm');
if NewUnitName='' then if NewUnitName='' then
NewUnitName:=AnUnitInfo.Unit_Name; NewUnitName:=AnUnitInfo.Unit_Name;
debugln(['TMainIDE.DoRenameUnit ',AnUnitInfo.Filename,' NewUnitName=',NewUnitName,' OldUnitName=',AnUnitInfo.Unit_Name,' ResourceCode=',ResourceCode<>nil,' NewFilename="',NewFilename,'"']); debugln(['TMainIDE.DoRenameUnit ',AnUnitInfo.Filename,' NewUnitName=',NewUnitName,' OldUnitName=',AnUnitInfo.Unit_Name,' LFMCode=',LFMCode<>nil,' LRSCode=',LRSCode<>nil,' NewFilename="',NewFilename,'"']);
// check new resource file // check new resource file
NewLFMFilename:=ChangeFileExt(NewFilename,'.lfm'); NewLFMFilename:=ChangeFileExt(NewFilename,'.lfm');
@ -6216,42 +6216,58 @@ begin
end; end;
end; end;
// rename lfm file
if FilenameIsAbsolute(NewLFMFilename) then begin
if (LFMCode=nil)
and (OldLFMFilename<>'')
and FilenameIsAbsolute(OldLFMFilename) and FileExistsUTF8(OldLFMFilename) then
LFMCode:=CodeToolBoss.LoadFile(OldLFMFilename,false,false);
if (LFMCode<>nil) then begin
Result:=SaveCodeBufferToFile(LFMCode,NewLFMFilename,true);
if not (Result in [mrOk,mrIgnore]) then begin
DebugLn(['TMainIDE.DoRenameUnit SaveCodeBufferToFile failed for "',NewLFMFilename,'"']);
exit;
end;
LFMCode:=CodeToolBoss.LoadFile(NewLFMFilename,true,false);
end;
end;
// rename Resource file (.lrs) // rename Resource file (.lrs)
if (ResourceCode<>nil) then begin if (LRSCode<>nil) then begin
// the resource include line in the code will be changed later after // the resource include line in the code will be changed later after
// changing the unitname // changing the unitname
if AnUnitInfo.IsPartOfProject if AnUnitInfo.IsPartOfProject
and (not Project1.IsVirtual) and (not Project1.IsVirtual)
and (pfLRSFilesInOutputDirectory in Project1.Flags) then begin and (pfLRSFilesInOutputDirectory in Project1.Flags) then begin
NewResFilename:=MainBuildBoss.GetDefaultLRSFilename(AnUnitInfo); NewLRSFilename:=MainBuildBoss.GetDefaultLRSFilename(AnUnitInfo);
NewResFilename:=AppendPathDelim(ExtractFilePath(NewResFilename)) NewLRSFilename:=AppendPathDelim(ExtractFilePath(NewLRSFilename))
+ExtractFileNameOnly(NewFilename)+ResourceFileExt; +ExtractFileNameOnly(NewFilename)+ResourceFileExt;
end else begin end else begin
OldResFilePath:=ExtractFilePath(ResourceCode.Filename); OldLRSFilePath:=ExtractFilePath(LRSCode.Filename);
NewResFilePath:=OldResFilePath; NewLRSFilePath:=OldLRSFilePath;
if FilenameIsAbsolute(OldFilePath) if FilenameIsAbsolute(OldFilePath)
and FileIsInPath(OldResFilePath,OldFilePath) then begin and FileIsInPath(OldLRSFilePath,OldFilePath) then begin
// resource code was in the same or in a sub directory of source // resource code was in the same or in a sub directory of source
// -> try to keep this relationship // -> try to keep this relationship
NewResFilePath:=NewFilePath NewLRSFilePath:=NewFilePath
+copy(ResourceCode.Filename,length(OldFilePath)+1, +copy(LRSCode.Filename,length(OldFilePath)+1,
length(ResourceCode.Filename)); length(LRSCode.Filename));
if not DirPathExists(NewResFilePath) then if not DirPathExists(NewLRSFilePath) then
NewResFilePath:=NewFilePath; NewLRSFilePath:=NewFilePath;
end else begin end else begin
// resource code was not in the same or in a sub directory of source // resource code was not in the same or in a sub directory of source
// copy resource into the same directory as the source // copy resource into the same directory as the source
NewResFilePath:=NewFilePath; NewLRSFilePath:=NewFilePath;
end; end;
NewResFilename:=NewResFilePath NewLRSFilename:=NewLRSFilePath
+ExtractFileNameOnly(NewFilename)+ResourceFileExt; +ExtractFileNameOnly(NewFilename)+ResourceFileExt;
end; end;
Result:=ForceDirectoryInteractive(ExtractFilePath(NewResFilename),[mbRetry,mbIgnore]); Result:=ForceDirectoryInteractive(ExtractFilePath(NewLRSFilename),[mbRetry,mbIgnore]);
if Result=mrCancel then exit; if Result=mrCancel then exit;
if Result=mrOk then begin if Result=mrOk then begin
if not CodeToolBoss.SaveBufferAs(ResourceCode,NewResFilename,ResourceCode) if not CodeToolBoss.SaveBufferAs(LRSCode,NewLRSFilename,LRSCode)
then then
DebugLn(['TMainIDE.DoRenameUnit CodeToolBoss.SaveBufferAs failed: NewResFilename="',NewResFilename,'"']); DebugLn(['TMainIDE.DoRenameUnit CodeToolBoss.SaveBufferAs failed: NewResFilename="',NewLRSFilename,'"']);
end; end;
{$IFDEF IDE_DEBUG} {$IFDEF IDE_DEBUG}
@ -6260,7 +6276,7 @@ begin
if ResourceCode<>nil then debugln('*** ResourceFileName ',ResourceCode.Filename); if ResourceCode<>nil then debugln('*** ResourceFileName ',ResourceCode.Filename);
{$ENDIF} {$ENDIF}
end else begin end else begin
NewResFilename:=''; NewLRSFilename:='';
end; end;
// rename unit name of jit class // rename unit name of jit class
if (AnUnitInfo.Component<>nil) then if (AnUnitInfo.Component<>nil) then
@ -6270,19 +6286,6 @@ begin
debugln(['TMainIDE.DoRenameUnit D ',ResourceCode<>nil]); debugln(['TMainIDE.DoRenameUnit D ',ResourceCode<>nil]);
{$ENDIF} {$ENDIF}
// save new lfm
if FilenameIsAbsolute(OldLFMFilename) and FileExistsUTF8(OldLFMFilename) then
begin
LFMBuf:=CodeToolBoss.LoadFile(OldLFMFilename,false,false);
if (LFMBuf<>nil) and FilenameIsAbsolute(NewLFMFilename) then begin
Result:=SaveCodeBufferToFile(LFMBuf,NewLFMFilename,true);
if Result<>mrOk then begin
DebugLn(['TMainIDE.DoRenameUnit SaveCodeBufferToFile failed for ',NewLFMFilename]);
end;
if Result=mrAbort then exit;
end;
end;
// set new codebuffer in unitinfo and sourceeditor // set new codebuffer in unitinfo and sourceeditor
AnUnitInfo.Source:=NewSource; AnUnitInfo.Source:=NewSource;
AnUnitInfo.ClearModifieds; AnUnitInfo.ClearModifieds;
@ -6293,12 +6296,12 @@ begin
// change unitname in lpi and in main source file // change unitname in lpi and in main source file
AnUnitInfo.Unit_Name:=NewUnitName; AnUnitInfo.Unit_Name:=NewUnitName;
if ResourceCode<>nil then begin if LRSCode<>nil then begin
// change resource filename in the source include directive // change resource filename in the source include directive
if not CodeToolBoss.RenameMainInclude(AnUnitInfo.Source, if not CodeToolBoss.RenameMainInclude(AnUnitInfo.Source,
ExtractFilename(ResourceCode.Filename),false) ExtractFilename(LRSCode.Filename),false)
then then
DebugLn(['TMainIDE.DoRenameUnit CodeToolBoss.RenameMainInclude failed: AnUnitInfo.Source="',AnUnitInfo.Source,'" ResourceCode="',ExtractFilename(ResourceCode.Filename),'"']); DebugLn(['TMainIDE.DoRenameUnit CodeToolBoss.RenameMainInclude failed: AnUnitInfo.Source="',AnUnitInfo.Source,'" ResourceCode="',ExtractFilename(LRSCode.Filename),'"']);
end; end;
// change unitname on SourceNotebook // change unitname on SourceNotebook
@ -6327,6 +6330,8 @@ begin
AnUnitInfo.IsPartOfProject); AnUnitInfo.IsPartOfProject);
if Result=mrAbort then exit; if Result=mrAbort then exit;
OldFileExisted:=FilenameIsAbsolute(OldFilename) and FileExistsUTF8(OldFilename);
// delete ambiguous files // delete ambiguous files
NewFilePath:=ExtractFilePath(NewFilename); NewFilePath:=ExtractFilePath(NewFilename);
AmbiguousFiles:= AmbiguousFiles:=
@ -6393,7 +6398,7 @@ begin
// delete old pas, .pp, .ppu // delete old pas, .pp, .ppu
if (CompareFilenames(NewFilename,OldFilename)<>0) if (CompareFilenames(NewFilename,OldFilename)<>0)
and FilenameIsAbsolute(OldFilename) and FileExistsUTF8(OldFilename) then begin and OldFileExisted then begin
if MessageDlg(lisDeleteOldFile2, if MessageDlg(lisDeleteOldFile2,
Format(lisDeleteOldFile, ['"', OldFilename, '"']), Format(lisDeleteOldFile, ['"', OldFilename, '"']),
mtConfirmation,[mbYes,mbNo],0)=mrYes then mtConfirmation,[mbYes,mbNo],0)=mrYes then
@ -6401,6 +6406,7 @@ begin
Result:=DeleteFileInteractive(OldFilename,[mbAbort]); Result:=DeleteFileInteractive(OldFilename,[mbAbort]);
if Result=mrAbort then exit; if Result=mrAbort then exit;
// delete old lfm // delete old lfm
//debugln(['TMainIDE.DoRenameUnit NewLFMFilename=',NewLFMFilename,' exists=',FileExistsUTF8(NewLFMFilename),' Old=',OldLFMFilename,' exists=',FileExistsUTF8(OldLFMFilename)]);
if FileExistsUTF8(NewLFMFilename) then begin if FileExistsUTF8(NewLFMFilename) then begin
// the new file has a lfm, so it is safe to delete the old // the new file has a lfm, so it is safe to delete the old
// (if NewLFMFilename does not exist, it didn't belong to the unit // (if NewLFMFilename does not exist, it didn't belong to the unit
@ -6412,7 +6418,7 @@ begin
end; end;
end; end;
// delete old lrs // delete old lrs
if (ResourceCode<>nil) and FileExistsUTF8(ResourceCode.Filename) then begin if (LRSCode<>nil) and FileExistsUTF8(LRSCode.Filename) then begin
// the new file has a lrs, so it is safe to delete the old // the new file has a lrs, so it is safe to delete the old
// (if the new lrs does not exist, it didn't belong to the unit // (if the new lrs does not exist, it didn't belong to the unit
// or there was an error during delete. Never delete files in doubt.) // or there was an error during delete. Never delete files in doubt.)
@ -9015,7 +9021,7 @@ function TMainIDE.DoSaveEditorFile(AEditor: TSourceEditorInterface;
var var
AnUnitInfo: TUnitInfo; AnUnitInfo: TUnitInfo;
TestFilename, DestFilename: string; TestFilename, DestFilename: string;
ResourceCode, LFMCode: TCodeBuffer; LRSCode, LFMCode: TCodeBuffer;
MainUnitInfo: TUnitInfo; MainUnitInfo: TUnitInfo;
OldUnitName: String; OldUnitName: String;
OldFilename: String; OldFilename: String;
@ -9106,10 +9112,10 @@ begin
// load old resource file // load old resource file
LFMCode:=nil; LFMCode:=nil;
ResourceCode:=nil; LRSCode:=nil;
if WasPascalSource then if WasPascalSource then
begin begin
Result:=DoLoadResourceFile(AnUnitInfo,LFMCode,ResourceCode, Result:=DoLoadResourceFile(AnUnitInfo,LFMCode,LRSCode,
not (sfSaveAs in Flags),true,CanAbort); not (sfSaveAs in Flags),true,CanAbort);
if not (Result in [mrIgnore,mrOk]) then if not (Result in [mrIgnore,mrOk]) then
exit; exit;
@ -9123,10 +9129,9 @@ begin
if [sfSaveAs,sfSaveToTestDir]*Flags=[sfSaveAs] then begin if [sfSaveAs,sfSaveToTestDir]*Flags=[sfSaveAs] then begin
// let user choose a filename // let user choose a filename
NewFilename:=OldFilename; NewFilename:=OldFilename;
Result:=DoShowSaveFileAsDialog(NewFilename,AnUnitInfo,ResourceCode,CanAbort); Result:=DoShowSaveFileAsDialog(NewFilename,AnUnitInfo,LFMCode,LRSCode,CanAbort);
if not (Result in [mrIgnore,mrOk]) then if not (Result in [mrIgnore,mrOk]) then
exit; exit;
LFMCode:=nil;
end; end;
// save source // save source
@ -9177,8 +9182,8 @@ begin
{$ENDIF} {$ENDIF}
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.DoSaveEditorFile B');{$ENDIF} {$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.DoSaveEditorFile B');{$ENDIF}
// save resource file and lfm file // save resource file and lfm file
if (ResourceCode<>nil) or (AnUnitInfo.Component<>nil) then begin if (LRSCode<>nil) or (AnUnitInfo.Component<>nil) then begin
Result:=DoSaveUnitComponent(AnUnitInfo,ResourceCode,LFMCode,Flags); Result:=DoSaveUnitComponent(AnUnitInfo,LRSCode,LFMCode,Flags);
if not (Result in [mrIgnore, mrOk]) then if not (Result in [mrIgnore, mrOk]) then
exit; exit;
end; end;
@ -13245,7 +13250,7 @@ var
OldShortFilename: String; OldShortFilename: String;
NewFilename: String; NewFilename: String;
NewShortFilename: String; NewShortFilename: String;
ResourceCode: TCodeBuffer; LFMCode, LRSCode: TCodeBuffer;
NewUnitName: String; NewUnitName: String;
begin begin
Result:=mrOk; Result:=mrOk;
@ -13272,8 +13277,9 @@ begin
AnUnitInfo.ReadUnitNameFromSource(false); AnUnitInfo.ReadUnitNameFromSource(false);
NewUnitName:=AnUnitInfo.CreateUnitName; NewUnitName:=AnUnitInfo.CreateUnitName;
end; end;
ResourceCode:=nil; LFMCode:=nil;
Result:=DoRenameUnit(AnUnitInfo,NewFilename,NewUnitName,ResourceCode); LRSCode:=nil;
Result:=DoRenameUnit(AnUnitInfo,NewFilename,NewUnitName,LFMCode,LRSCode);
end; end;
function TMainIDE.DoCheckFilesOnDisk(Instantaneous: boolean): TModalResult; function TMainIDE.DoCheckFilesOnDisk(Instantaneous: boolean): TModalResult;