implemented for delphi unit conversion: auto fixing in filenames

git-svn-id: trunk@6707 -

components/codetools/finddeclarationtool.pas

@@ -1418,7 +1418,7 @@ var UnitSrcSearchPath: string;
   CompiledResult: TCodeBuffer;
   UnitSearchPath: string;
   SrcPathInitialized: boolean;
-  
+
   procedure InitSrcPath;
   begin
     if SrcPathInitialized then exit;
@@ -1468,7 +1468,7 @@ begin
     if FilenameIsAbsolute(AnUnitInFilename) then begin
       Result:=TCodeBuffer(Scanner.OnLoadSource(Self,AnUnitInFilename,true));
     end else begin
-      // file is virtual
+      // file is relative to current unit directory
       // -> search file in current directory
       CurDir:=AppendPathDelim(CurDir);
       if not LoadFile(CurDir+AnUnitInFilename,Result) then begin

components/codetools/stdcodetools.pas

@@ -61,6 +61,8 @@ type
     const IdentName: string; var IsDefined: boolean) of object;
 
 
+  { TStandardCodeTool }
+
   TStandardCodeTool = class(TIdentCompletionTool)
   private
     CachedSourceName: string;
@@ -99,6 +101,10 @@ type
           SourceChangeCache: TSourceChangeCache): boolean;
     function RemoveUnitFromAllUsesSections(const UpperUnitName: string;
           SourceChangeCache: TSourceChangeCache): boolean;
+    function FixUnitInFilenameCase(
+          SourceChangeCache: TSourceChangeCache): boolean;
+    function FixUnitInFilenameCaseInUsesSection(UsesNode: TCodeTreeNode;
+          SourceChangeCache: TSourceChangeCache): boolean;
     function FindUsedUnitNames(var MainUsesSection,
           ImplementationUsesSection: TStrings): boolean;
     function FindUsedUnitFiles(var MainUsesSection,
@@ -597,8 +603,7 @@ begin
   BuildTree(false);
   SectionNode:=Tree.Root;
   while (SectionNode<>nil) do begin
-    if (SectionNode.Desc in [ctnProgram,ctnInterface,ctnImplementation])
+    if (SectionNode.FirstChild<>nil)
-    and (SectionNode.FirstChild<>nil)
     and (SectionNode.FirstChild.Desc=ctnUsesSection) then begin
       if not RemoveUnitFromUsesSection(SectionNode.FirstChild,UpperUnitName,
          SourceChangeCache)
@@ -611,6 +616,109 @@ begin
   Result:=true;
 end;
 
+function TStandardCodeTool.FixUnitInFilenameCase(
+  SourceChangeCache: TSourceChangeCache): boolean;
+var
+  SectionNode: TCodeTreeNode;
+begin
+  debugln('TStandardCodeTool.FixUnitInFilenameCase ',MainFilename);
+  Result:=false;
+  BuildTree(false);
+  SectionNode:=Tree.Root;
+  while (SectionNode<>nil) do begin
+    if (SectionNode.FirstChild<>nil)
+    and (SectionNode.FirstChild.Desc=ctnUsesSection) then begin
+      if not FixUnitInFilenameCaseInUsesSection(
+        SectionNode.FirstChild,SourceChangeCache)
+      then begin
+        exit;
+      end;
+    end;
+    SectionNode:=SectionNode.NextBrother;
+  end;
+  Result:=true;
+end;
+
+function TStandardCodeTool.FixUnitInFilenameCaseInUsesSection(
+  UsesNode: TCodeTreeNode; SourceChangeCache: TSourceChangeCache): boolean;
+  
+  function FindUnit(const AFilename: string): string;
+  var
+    CurDir: String;
+    MainCodeIsVirtual: Boolean;
+    FileInfo: TSearchRec;
+    CurFilename: String;
+  begin
+    if FilenameIsAbsolute(AFilename) then
+      CurDir:=ExtractFilePath(AFilename)
+    else begin
+      MainCodeIsVirtual:=TCodeBuffer(Scanner.MainCode).IsVirtual;
+      if not MainCodeIsVirtual then begin
+        CurDir:=ExtractFilePath(TCodeBuffer(Scanner.MainCode).Filename);
+      end else begin
+        CurDir:='';
+      end;
+    end;
+    CurFilename:=ExtractFilename(AFilename);
+    Result:='';
+    if SysUtils.FindFirst(AppendPathDelim(CurDir)+FileMask,
+                          faAnyFile,FileInfo)=0 then
+    begin
+      repeat
+        // check if special file
+        if (FileInfo.Name='.') or (FileInfo.Name='..') then continue;
+        if (SysUtils.CompareText(CurFilename,FileInfo.Name)=0)
+        then begin
+          if (Result='') or (FileInfo.Name=CurFilename) then
+            Result:=FileInfo.Name;
+        end;
+      until SysUtils.FindNext(FileInfo)<>0;
+    end;
+    SysUtils.FindClose(FileInfo);
+  end;
+  
+var
+  UnitInFilename: String;
+  Changed: Boolean;
+  RealUnitInFilename: String;
+begin
+  Result:=false;
+  if (UsesNode=nil) then exit;
+  MoveCursorToNodeStart(UsesNode);
+  ReadNextAtom; // read 'uses'
+  Changed:=false;
+  repeat
+    ReadNextAtom; // read name
+    if not AtomIsIdentifier(false) then exit;
+    ReadNextAtom;
+    if UpAtomIs('IN') then begin
+      ReadNextAtom;
+      UnitInFilename:=GetAtom;
+      debugln('TStandardCodeTool.FixUnitInFilenameCaseInUsesSection A UnitInFilename="',UnitInFilename,'"');
+      if (UnitInFilename<>'') and (UnitInFilename[1]='''') then begin
+        UnitInFilename:=copy(UnitInFilename,2,length(UnitInFilename)-2);
+        RealUnitInFilename:=FindUnit(UnitInFilename);
+        debugln('TStandardCodeTool.FixUnitInFilenameCaseInUsesSection B RealUnitInFilename="',RealUnitInFilename,'"');
+        if (RealUnitInFilename<>'')
+        and (RealUnitInFilename<>UnitInFilename) then begin
+          if not Changed then begin
+            SourceChangeCache.MainScanner:=Scanner;
+            Changed:=true;
+          end;
+          debugln('TStandardCodeTool.FixUnitInFilenameCaseInUsesSection C Replacing ...');
+          if not SourceChangeCache.Replace(gtNone,gtNone,
+            CurPos.StartPos,CurPos.EndPos,''''+RealUnitInFilename+'''') then exit;
+        end;
+      end;
+      ReadNextAtom;
+    end;
+    if AtomIsChar(';') then break;
+    if not AtomIsChar(',') then exit;
+  until (CurPos.StartPos>UsesNode.EndPos) or (CurPos.StartPos>SrcLen);
+  if Changed and (not SourceChangeCache.Apply) then exit;
+  Result:=true;
+end;
+
 function TStandardCodeTool.FindUsedUnitNames(var MainUsesSection,
   ImplementationUsesSection: TStrings): boolean;
 var
@@ -701,9 +809,9 @@ begin
     end else
       AnUnitInFilename:='';
     // find unit file
-    NewCode:=FindUnitSource(AnUnitName,AnUnitInFilename,false);
     if AnUnitInFilename<>'' then begin
       // An 'in' unit => Delphi project file
+      NewCode:=FindUnitSource(AnUnitName,AnUnitInFilename,false);
       if (NewCode=nil) then begin
         // no source found
         MissingInUnits.Add(AnUnitName+' in '+AnUnitInFilename);
@@ -713,6 +821,7 @@ begin
       end;
     end else begin
       // the non 'in' units are 'Forms' or units added by the user
+      NewCode:=FindUnitSource(AnUnitName,AnUnitInFilename,false);
       NormalUnits.AddObject(AnUnitName,NewCode);
     end;
     // read keyword 'uses' or comma
@@ -2785,6 +2894,7 @@ function TStandardCodeTool.ConvertDelphiToLazarusSource(AddLRSCode: boolean;
 
   function ConvertUsedUnits: boolean;
   // replace unit 'Windows' with 'LCLIntf' and add 'LResources'
+  // rename 'in' filenames to case sensitive filename
   var
     NamePos, InPos: TAtomPosition;
   begin
@@ -2809,6 +2919,11 @@ function TStandardCodeTool.ConvertDelphiToLazarusSource(AddLRSCode: boolean;
       debugln('ConvertUsedUnits Unable to remove Variants from all uses sections');
       exit;
     end;
+    if not FixUnitInFilenameCase(SourceChangeCache) then
+    begin
+      debugln('ConvertUsedUnits Unable to fix unit filename case sensitivity in all uses sections');
+      exit;
+    end;
     Result:=true;
   end;
 

ide/delphiunit2laz.pas

@@ -356,6 +356,7 @@ begin
                          [lbfCheckIfText,lbfUpdateFromDisk]);
   if Result<>mrOk then exit;
   CTResult:=CodeToolBoss.ConvertDelphiToLazarusSource(LPRCode,AddLRSCode);
+  debugln('CreateLPRFileForDPRFile: ',LPRCode.Source);
   if not CTResult then begin
     Result:=mrCancel;
     exit;

ide/lazarusidestrconsts.pas

@@ -283,7 +283,8 @@ resourcestring
   lisLazarusProjectInfoLpiLpiAllFiles = 'Lazarus Project Info (*.lpi)|*.lpi|'
     +'All Files|*.*';
   lisCompilerOptionsForProject = 'Compiler Options for Project: %s';
-  lisChooseDelphiUnit = 'Choose Delphi unit';
+  lisChooseDelphiUnit = 'Choose Delphi unit (*.pas)';
+  lisChooseDelphiProject = 'Choose Delphi project (*.dpr)';
   lisUnableToReadFileError = 'Unable to read file %s%s%s%sError: %s';
   lisFormatError = 'Format error';
   lisLFMFileCorrupt = 'LFM file corrupt';

ide/main.pp

@@ -2918,8 +2918,9 @@ begin
   OpenDialog:=TOpenDialog.Create(nil);
   try
     InputHistories.ApplyFileDialogSettings(OpenDialog);
-    OpenDialog.Title:=lisChooseDelphiUnit;
+    OpenDialog.Title:=lisChooseDelphiProject;
     OpenDialog.Options:=OpenDialog.Options;
+    OpenDialog.Filter:='Delphi project (*.dpr)|*.dpr|All files (*.*)|*.*';
     if OpenDialog.Execute then begin
       AFilename:=CleanAndExpandFilename(OpenDialog.Filename);
       //debugln('TMainIDE.mnuToolConvertDelphiProjectClicked A ',AFilename);
@@ -7192,7 +7193,7 @@ begin
   Project1.BeginUpdate(true);
   try
     if ProjInspector<>nil then ProjInspector.LazProject:=Project1;
-    MainUnitInfo:=TUnitInfo.Create(DPRCode);
+    MainUnitInfo:=TUnitInfo.Create(LPRCode);
     MainUnitInfo.SyntaxHighlighter:=
               ExtensionToLazSyntaxHighlighter(ExtractFileExt(LPRCode.Filename));
     MainUnitInfo.IsPartOfProject:=true;
@@ -11382,6 +11383,9 @@ end.
 
 { =============================================================================
   $Log$
+  Revision 1.841  2005/01/28 16:42:30  mattias
+  implemented for delphi unit conversion: auto fixing in filenames
+
   Revision 1.840  2005/01/26 15:56:13  mattias
   fixed add editor file to project