[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/devtools/kdevelop4-extra-plugins/java
From:       Hamish Rodda <rodda () kde ! org>
Date:       2009-02-16 3:11:06
Message-ID: 1234753866.041493.29778.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 926743 by rodda:

Fix bug in identifier compilation (very weird bug, make identifiers change order, eg. \
java.io.IOException became io.java.IOException) Remove debug output


 M  +4 -4      duchain/contextbuilder.cpp  
 M  +3 -11     javalanguagesupport.cpp  


--- trunk/playground/devtools/kdevelop4-extra-plugins/java/duchain/contextbuilder.cpp \
#926742:926743 @@ -100,13 +100,13 @@
 
   QualifiedIdentifier result;
   
-  const KDevPG::ListNode<IdentifierAst*> *__it = id, *__end = __it;
+  const KDevPG::ListNode<IdentifierAst*> *__it = id->front(), *__end = __it;
   do {
     m_identifierCompiler->run(__it->element);
-    result = m_identifierCompiler->identifier() + result;
+    result.push(m_identifierCompiler->identifier());
     __it = __it->next;
   } while (__it != __end);
-
+  
   return result;
 }
 
@@ -277,7 +277,7 @@
     if (imported)
       currentContext()->addImportedParentContext(imported.data());
     else
-      kDebug() << "Import context not provided:" << import << \
(node->identifierName->hasStar ? ".*" : ""); +      kDebug() << "Import context not \
provided:" << import << (node->identifierName->hasStar ? ".*" : "") << "requested in" \
<< editor()->currentUrl().str();  }
 }
 
--- trunk/playground/devtools/kdevelop4-extra-plugins/java/javalanguagesupport.cpp \
#926742:926743 @@ -117,13 +117,14 @@
 {
     QString path = id.toStringList().join("/");
 
+    if (!isDirectory)
+        path += ".java";
+
     return contextForPath(path, isDirectory);
 }
 
 KDevelop::ReferencedTopDUContext JavaLanguageSupport::contextForPath(const QString& \
path, bool isDirectory)  {
-    kDebug() << "Reqested path" << path;
-    
     // TODO: very crude, needs fixing once java-supported build system managers \
                available
     foreach (KDevelop::IProject *project, \
KDevelop::ICore::self()->projectController()->projects()) {  if (isDirectory) {
@@ -131,7 +132,6 @@
             foreach (KDevelop::ProjectFolderItem* folder, folders) {
                 KDevelop::DUChainWriteLocker lock(KDevelop::DUChain::lock());
                 if (KDevelop::TopDUContext* topContext = \
                KDevelop::DUChainUtils::standardContextForUrl(folder->url())) {
-                    kDebug() << "Found it";
                     return KDevelop::ReferencedTopDUContext(topContext);
                 } else {
                     // Create new top context, and fire off parsing jobs for \
everything @@ -152,7 +152,6 @@
                             top->addImportedParentContext(contextForPath(path, \
true));  }
                     }
-                    kDebug() << "Created it, added" << \
top->importedParentContexts().count() << "imports";  return top;
                 }
             }
@@ -160,11 +159,9 @@
             QList<KDevelop::ProjectFileItem*> files = project->filesForUrl(path);
             foreach (KDevelop::ProjectFileItem* file, files) {
                 if (KDevelop::TopDUContext* topContext = \
                KDevelop::DUChainUtils::standardContextForUrl(file->url())) {
-                    kDebug() << "Found it";
                     return KDevelop::ReferencedTopDUContext(topContext);
                 } else {
                     // Create new top context, and fire off a parse job
-                    kDebug() << "Created it";
                     KDevelop::DUChainWriteLocker lock(KDevelop::DUChain::lock());
                     return createFileContext(file->url());
                 }
@@ -180,7 +177,6 @@
     QFileInfo info(javaSourceUrl.path());
     if (info.exists() && info.isReadable()) {
         if (KDevelop::TopDUContext* topContext = \
                KDevelop::DUChainUtils::standardContextForUrl(javaSourceUrl)) {
-            kDebug() << "Found it";
             return KDevelop::ReferencedTopDUContext(topContext);
         } else {
             KDevelop::DUChainWriteLocker lock(KDevelop::DUChain::lock());
@@ -207,7 +203,6 @@
 
 KDevelop::ReferencedTopDUContext JavaLanguageSupport::createFileContext(const KUrl& \
url)  {
-    kDebug() << url;
     KDevelop::ReferencedTopDUContext top = \
                createTopContext(KDevelop::IndexedString(url));
     KDevelop::ICore::self()->languageController()->backgroundParser()->addDocument(url, \
KDevelop::TopDUContext::AllDeclarationsAndContexts);  return top;
@@ -215,12 +210,9 @@
 
 KDevelop::ReferencedTopDUContext JavaLanguageSupport::createDirectoryContext(const \
KUrl& url)  {
-    kDebug() << url;
     KDevelop::ReferencedTopDUContext top = \
createTopContext(KDevelop::IndexedString(url));  QDir dirInfo(url.path());
-    kDebug() << dirInfo.absolutePath() << dirInfo.isReadable() << \
dirInfo.entryInfoList(QDir::NoDotAndDotDot | QDir::Readable | QDir::Dirs | \
                QDir::Files).count();
     foreach (const QFileInfo& entry, dirInfo.entryInfoList(QDir::NoDotAndDotDot | \
                QDir::Readable | QDir::Dirs | QDir::Files)) {
-        kDebug() << "found file/dir:" << entry.absoluteFilePath();
         if (entry.isFile()) {
             KDevelop::ReferencedTopDUContext child = \
createFileContext(KUrl::fromPath(entry.filePath()));  \
top->addImportedParentContext(child);


[prev in list] [next in list] [prev in thread] [next in thread]