Fixed some issues handling Java and IDL import statements

Author: doxygen

src/filedef.cpp

@@ -1484,7 +1484,7 @@ void FileDefImpl::addUsingDeclaration(const Definition *d)
 
 void FileDefImpl::addIncludeDependency(const FileDef *fd,const QCString &incName,IncludeKind kind)
 {
-  //printf("FileDefImpl::addIncludeDependency(%p,%s,%d)\n",fd,incName,local);
+  //printf("FileDefImpl::addIncludeDependency(%p,%s,%d)\n",(void*)fd,qPrint(incName),kind);
   QCString iName = fd ? fd->absFilePath() : incName;
   if (!iName.isEmpty() && m_includeMap.find(iName.str())==m_includeMap.end())
   {

src/filedef.h

@@ -52,7 +52,7 @@ enum class IncludeKind : uint32_t
   ImportLocalObjC   = 0x0008,
   ImportSystem      = 0x0010, // C++20 header import
   ImportLocal       = 0x0020, // C++20 header import
-  ImportModule      = 0x0040  // C++20 module import
+  ImportModule      = 0x0040  // C++20/Java module import
 };
 
 inline constexpr uint32_t operator|(IncludeKind a, IncludeKind b) { return static_cast<uint32_t>(a) | static_cast<uint32_t>(b); }

src/scanner.l

@@ -382,6 +382,7 @@ NONLopt [^\n]*
 %x      Comment
 %x      PackageName
 %x      JavaImport
+%x      IDLImport
 %x      PHPUse
 %x      PHPUseAs
 %x      CSAccessorDecl
@@ -1963,20 +1964,33 @@ NONLopt [^\n]*
                                           QCString scope=yytext;
                                           yyextra->current->name=removeRedundantWhiteSpace(substitute(scope.left(scope.length()-1),".","::"));
                                           yyextra->current->fileName = yyextra->fileName;
+                                          bool ambig = false;
+                                          FileDef *incFd = findFileDef(Doxygen::inputNameLinkedMap,yyextra->fileName,ambig);
+                                          if (incFd)
+                                          {
+                                            incFd->addIncludeDependency(nullptr,scope,IncludeKind::ImportModule);
+                                          }
                                           yyextra->current->section = EntryType::makeUsingDir();
                                           yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
                                           initEntry(yyscanner);
                                           BEGIN(Using);
                                         }
 <JavaImport>({ID}{BN}*"."{BN}*)+{ID}    { // class import => add as a using declaration
-                                          ModuleManager::instance().addImport(yyextra->fileName,
-                                                                              yyextra->yyLineNr,
-                                                                              yytext,
-                                                                              yyextra->current->exported);
                                           lineCount(yyscanner);
                                           QCString scope=yytext;
                                           yyextra->current->name=removeRedundantWhiteSpace(substitute(scope,".","::"));
                                           yyextra->current->fileName = yyextra->fileName;
+                                          bool ambig = false;
+                                          FileDef *fromFd = findFileDef(Doxygen::inputNameLinkedMap,yyextra->fileName,ambig);
+                                          FileDef *toFd = findFileDef(Doxygen::inputNameLinkedMap,scope,ambig);
+                                          if (fromFd)
+                                          {
+                                            fromFd->addIncludeDependency(toFd,scope,IncludeKind::ImportModule);
+                                          }
+                                          if (toFd && fromFd)
+                                          {
+                                            toFd->addIncludedByDependency(fromFd,fromFd->docName(),IncludeKind::ImportModule);
+                                          }
                                           if (yyextra->insideD)
                                           {
                                             yyextra->current->section = EntryType::makeUsingDir();
@@ -1991,6 +2005,23 @@ NONLopt [^\n]*
                                           initEntry(yyscanner);
                                           BEGIN(Using);
                                         }
+<IDLImport>"\""[^"]*"\""                {
+                                          QCString fileName(&yytext[1],yyleng-2);
+                                          bool ambig = false;
+                                          FileDef *fromFd = findFileDef(Doxygen::inputNameLinkedMap,yyextra->fileName,ambig);
+                                          FileDef *toFd = findFileDef(Doxygen::inputNameLinkedMap,fileName,ambig);
+                                          if (fromFd)
+                                          {
+                                            fromFd->addIncludeDependency(toFd,fileName,IncludeKind::ImportModule);
+                                          }
+                                          if (toFd && fromFd)
+                                          {
+                                            toFd->addIncludedByDependency(fromFd,fromFd->docName(),IncludeKind::ImportModule);
+                                          }
+                                        }
+<IDLImport>";"                          {
+                                          BEGIN(FindMembers);
+                                        }
 <FindMembers>"using"{BN}+/("::"{ID}("::"{ID})*)? {
                                           if (yyextra->insideJava) REJECT;
                                           yyextra->current->startLine=yyextra->yyLineNr;
@@ -2430,7 +2461,7 @@ NONLopt [^\n]*
                                           else if ((yyextra->insideIDL || yyextra->insideJava || yyextra->insideD) && yyleng==6 && qstrcmp(yytext,"import")==0)
                                           {
                                             if (yyextra->insideIDL)
-                                              BEGIN(NextSemi);
+                                              BEGIN(IDLImport);
                                             else // yyextra->insideJava or yyextra->insideD
                                               BEGIN(JavaImport);
                                           }