From abbfbd6255d81eb8d11b81c1841d7eb9b05d1a79 Mon Sep 17 00:00:00 2001 From: robekras Date: Mon, 2 Jan 2012 19:48:16 +0000 Subject: [PATCH] 1) Reintroduced finishedBuilding 2) Fixed endless loop in parseIdentifiers --- .../phpdt/internal/core/builder/PHPBuilder.java | 8 ++++---- .../phpeclipse/builder/IdentifierIndexManager.java | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java index a462141..b6eebad 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java @@ -37,7 +37,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -//import org.eclipse.core.resources.IResourceChangeEvent; +import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IResourceVisitor; import org.eclipse.core.resources.IWorkspaceRoot; @@ -101,9 +101,9 @@ public class PHPBuilder extends IncrementalProjectBuilder { return new IMarker[0]; } -// public static void finishedBuilding(IResourceChangeEvent event) { -// BuildNotifier.resetProblemCounters(); -// } + public static void finishedBuilding(IResourceChangeEvent event) { + BuildNotifier.resetProblemCounters(); + } /** * Hook allowing to initialize some static state before a complete build diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java index 5b3a50f..639f165 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java @@ -385,7 +385,8 @@ public class IdentifierIndexManager { skipComments(); } } - } while (fToken != TokenNameRPAREN ); + getNextToken (); + } while ((fToken != TokenNameRPAREN) && (fToken != 0)); } parseDeclarations(null, buf, true); } -- 1.7.1