Bug 545463 - Docker Build occasionally shows unknown includes in editor

- add checks in CBuildConfiguration so that a scanner info that has
  no include paths stored should be treated as no scanner info and
  the data should be fetched again

Change-Id: I6820c56304aed568a58b6058145e912d71fa33c1

1 files changed, 9 insertions, 1 deletions

diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
index 5dcb30c83b9..d2582994fa4 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
@@ -758,7 +758,7 @@ public abstract class CBuildConfiguration extends PlatformObject implements ICBu
 		synchronized (scannerInfoLock) {
 			info = scannerInfoCache.getScannerInfo(resource);
 		}
-		if (info == null) {
+		if (info == null || info.getIncludePaths().length == 0) {
 			ICElement celement = CCorePlugin.getDefault().getCoreModel().create(resource);
 			if (celement instanceof ITranslationUnit) {
 				try {
@@ -927,6 +927,10 @@ public abstract class CBuildConfiguration extends PlatformObject implements ICBu
 					boolean hasCommand = true;
 					synchronized (scannerInfoLock) {
 						if (scannerInfoCache.hasCommand(commandStrings)) {
+							IExtendedScannerInfo info = scannerInfoCache.getScannerInfo(commandStrings);
+							if (info.getIncludePaths().length == 0) {
+								needScannerRefresh = true;
+							}
 							if (!scannerInfoCache.hasResource(commandStrings, resource)) {
 								scannerInfoCache.addResource(commandStrings, resource);
 								infoChanged = true;
@@ -1053,6 +1057,10 @@ public abstract class CBuildConfiguration extends PlatformObject implements ICBu
 					boolean hasCommand = true;
 					synchronized (scannerInfoLock) {
 						if (scannerInfoCache.hasCommand(commandStrings)) {
+							IExtendedScannerInfo info = scannerInfoCache.getScannerInfo(commandStrings);
+							if (info.getIncludePaths().length == 0) {
+								needScannerRefresh = true;
+							}
 							if (!scannerInfoCache.hasResource(commandStrings, resource)) {
 								scannerInfoCache.addResource(commandStrings, resource);
 								infoChanged = true;