codetools: search in virtual directory first virtual units

git-svn-id: trunk@23652 -

components/codetools/directorycacher.pas

@@ -983,10 +983,15 @@ begin
     end else begin
       // not found in cache -> search in complete source path
 
-      SrcPath:=Strings[ctdcsCompleteSrcPath];
+      if Directory='' then begin
-
+        // virtual directory => search virtual unit
+        Result:=Pool.FindVirtualUnit(AUnitName);
+      end;
+      if Result='' then begin
         // search in search path
+        SrcPath:=Strings[ctdcsCompleteSrcPath];
         Result:=FindUnitSourceInCleanSearchPath(AUnitName,SrcPath,AnyCase);
+      end;
       if Result='' then begin
         // search in unit links
         {$IFDEF ShowTriedUnits}
@@ -1236,12 +1241,30 @@ end;
 function TCTDirectoryCachePool.FindVirtualUnit(const AUnitName: string): string;
 var
   e: TCTPascalExtType;
+  CurUnitName:String;
 begin
+  // search normal
   for e:=Low(CTPascalExtension) to High(CTPascalExtension) do begin
     if CTPascalExtension[e]='' then continue;
     Result:=FindVirtualFile(AUnitName+CTPascalExtension[e]);
     if Result<>'' then exit;
   end;
+  // search lowercase
+  CurUnitName:=lowercase(AUnitName);
+  if CurUnitName<>AUnitName then begin
+    for e:=Low(CTPascalExtension) to High(CTPascalExtension) do begin
+      if CTPascalExtension[e]='' then continue;
+      Result:=FindVirtualFile(CurUnitName+CTPascalExtension[e]);
+      if Result<>'' then exit;
+    end;
+  end;
+  // search uppercase
+  CurUnitName:=uppercase(AUnitName);
+  for e:=Low(CTPascalExtension) to High(CTPascalExtension) do begin
+    if CTPascalExtension[e]='' then continue;
+    Result:=FindVirtualFile(CurUnitName+uppercase(CTPascalExtension[e]));
+    if Result<>'' then exit;
+  end;
   Result:='';
 end;
 

components/codetools/eventcodetool.pas

@@ -734,21 +734,27 @@ function TEventsCodeTool.CreateMethod(ClassNode: TCodeTreeNode;
   end;
 
   function FindPropertyType(out FindContext: TFindContext): boolean;
+  var
+    Tool: TFindDeclarationTool;
   begin
     Result:=false;
     if APropertyPath<>'' then begin
       // find unit of property
+      Tool:=nil;
+      FindContext:=CleanFindContext;
       if APropertyUnitName='' then begin
-        FindContext.Tool:=Self;
+        Tool:=Self;
       end else begin
-        FindContext.Tool:=FindCodeToolForUsedUnit(APropertyUnitName,'',true);
+        Tool:=FindCodeToolForUsedUnit(APropertyUnitName,'',true);
-        if FindContext.Tool=nil then
+        if Tool=nil then
           raise Exception.Create('failed to get codetool for unit '+APropertyUnitName);
       end;
       // find property with type
-      if not FindContext.Tool.FindDeclarationOfPropertyPath(
+      if not Tool.FindDeclarationOfPropertyPath(APropertyPath,FindContext,true)
-        APropertyPath,FindContext,true)
+      then begin
-      then exit;
+        DebugLn(['FindPropertyType FindDeclarationOfPropertyPath failed: ',Tool.MainFilename,' APropertyPath=',APropertyPath]);
+        exit;
+      end;
       if FindContext.Node.Desc<>ctnProperty then
         FindContext.Tool.RaiseException(
           APropertyPath+' is not a property.'

components/codetools/finddeclarationtool.pas

@@ -1603,8 +1603,13 @@ begin
   NewContext:=CleanFindContext;
   //DebugLn('TFindDeclarationTool.FindDeclarationOfPropertyPath PropertyPath="',PropertyPath,'"');
   if PropertyPath='' then exit;
+  ActivateGlobalWriteLock;
+  Params:=TFindDeclarationParams.Create;
+  try
     BuildTree(false);
 
+    //DebugLn(['TFindDeclarationTool.FindDeclarationOfPropertyPath ',Src]);
+
     // first search the class/variable in the interface
     StartPos:=1;
     Identifier:=GetNextIdentifier;
@@ -1612,15 +1617,12 @@ begin
     Context.Tool:=Self;
     Context.Node:=FindDeclarationNodeInInterface(Identifier,true);
     if Context.Node=nil then begin
-    //DebugLn(['TFindDeclarationTool.FindDeclarationOfPropertyPath Identifier not found in interface ',Identifier]);
+      DebugLn(['TFindDeclarationTool.FindDeclarationOfPropertyPath Identifier not found in interface ',Identifier]);
       exit;
     end;
-  Params:=TFindDeclarationParams.Create;
-  ActivateGlobalWriteLock;
-  try
     Context:=FindBaseTypeOfNode(Params,Context.Node);
     if Context.Node=nil then begin
-      //DebugLn(['TFindDeclarationTool.FindDeclarationOfPropertyPath context not found']);
+      DebugLn(['TFindDeclarationTool.FindDeclarationOfPropertyPath context not found']);
       exit;
     end;
     // then search the properties
@@ -1991,6 +1993,7 @@ begin
 
   NewUnitName:=AnUnitName;
   NewInFilename:=AnUnitInFilename;
+
   AFilename:=DirectoryCache.FindUnitSourceInCompletePath(
                                                NewUnitName,NewInFilename,false);
   Result:=TCodeBuffer(Scanner.OnLoadSource(Self,AFilename,true));