#1391 resourceChangeListener treated config changes = as project open

jantje · jantje · commit b874b0ec0891 · 2021-12-08T13:42:08.000+01:00
For a config change the build folder needs to be deleted to force a
complete rebuild (including makefiles) where this is absolutely not
wanted for project open.

I did some cleanup on the CDT/sloeber synching as well as that is how I
found the root cause of this issue
diff --git a/io.sloeber.core/src/io/sloeber/core/api/Sketch.java b/io.sloeber.core/src/io/sloeber/core/api/Sketch.java
@@ -34,8 +34,6 @@ public static IStatus isUploadableProject(IProject project) {
         return Status.OK_STATUS;
     }
 
-
-
     /**
      * Synchronous upload of the sketch returning the status.
      *
@@ -48,7 +46,7 @@ public static IStatus syncUpload(IProject project) {
         if (!ret.isOK()) {
             return ret;
         }
-        SloeberProject sProject = SloeberProject.getSloeberProject(project, true);
+        SloeberProject sProject = SloeberProject.getSloeberProject(project);
         return sProject.upload();
     }
 
diff --git a/io.sloeber.core/src/io/sloeber/core/api/SloeberProject.java b/io.sloeber.core/src/io/sloeber/core/api/SloeberProject.java
diff --git a/io.sloeber.core/src/io/sloeber/core/common/Common.java b/io.sloeber.core/src/io/sloeber/core/common/Common.java
@@ -274,7 +274,7 @@ public static String makeEnvironmentVar(String variableName) {
      */
     static public String getOldWayEnvVar(ICConfigurationDescription confDesc, String envName) {
         return getBuildEnvironmentVariable(confDesc, envName,
-                getBuildEnvironmentVariable(confDesc, envName.toUpperCase(), EMPTY, true), true);
+                getBuildEnvironmentVariable(confDesc, envName.toUpperCase(), EMPTY, false), false);
     }
 
 }
diff --git a/io.sloeber.core/src/io/sloeber/core/listeners/ConfigurationChangeListener.java b/io.sloeber.core/src/io/sloeber/core/listeners/ConfigurationChangeListener.java
@@ -17,7 +17,7 @@ public class ConfigurationChangeListener implements ICProjectDescriptionListener
     public void handleEvent(CProjectDescriptionEvent event) {
 
         IProject activeProject = event.getProject();
-        SloeberProject sloeberProject = SloeberProject.getSloeberProject(activeProject, true);
+        SloeberProject sloeberProject = SloeberProject.getSloeberProject(activeProject);
         if (sloeberProject == null) {
             // this is not a sloeber project so ignore
             return;
diff --git a/io.sloeber.core/src/io/sloeber/core/listeners/IndexerController.java b/io.sloeber.core/src/io/sloeber/core/listeners/IndexerController.java
@@ -11,47 +11,62 @@
 import org.eclipse.core.runtime.Status;
 
 import io.sloeber.core.Activator;
+import io.sloeber.core.api.SloeberProject;
 import io.sloeber.core.common.Common;
 import io.sloeber.core.common.Const;
 
-public class IndexerController extends IndexerSetupParticipant  {
-	private static Set<IProject> fProjects = new HashSet<>();
-	private static IndexerController theController=null;
-	@Override
-	public boolean postponeIndexerSetup(ICProject cProject) {
-		IProject project=cProject.getProject();
-		boolean ret= fProjects.contains(project);
-		if(ret) {
-			Common.log(new Status(Const.SLOEBER_STATUS_DEBUG, Activator.getId(),"pospone index "+project.getName())); //$NON-NLS-1$
-		}
-		else {
-			Common.log(new Status(Const.SLOEBER_STATUS_DEBUG, Activator.getId(),"do not pospone index "+project.getName())); //$NON-NLS-1$
-		}
-		return ret;
-	}
+public class IndexerController extends IndexerSetupParticipant {
+    private static Set<IProject> doNotIndexProjects = new HashSet<>();
+    private static Set<IProject> indexingPosponedProjects = new HashSet<>();
+    private static IndexerController theController = null;
+
+    @Override
+    public boolean postponeIndexerSetup(ICProject cProject) {
+        IProject project = cProject.getProject();
+        SloeberProject sloeberProject = SloeberProject.getSloeberProject(project);
+        if (sloeberProject != null) {
+            if (!sloeberProject.isInMemory()) {
+                doNotIndexProjects.add(project);
+            }
+        }
+        boolean ret = doNotIndexProjects.contains(project);
+        if (ret) {
+            Common.log(new Status(Const.SLOEBER_STATUS_DEBUG, Activator.getId(), "pospone index " + project.getName())); //$NON-NLS-1$
+            indexingPosponedProjects.add(project);
+        } else {
+            Common.log(new Status(Const.SLOEBER_STATUS_DEBUG, Activator.getId(),
+                    "do not pospone index " + project.getName())); //$NON-NLS-1$
+        }
+        return ret;
+    }
 
     static public boolean isPosponed(IProject project) {
-	    return fProjects.contains(project);
-	}
-	public static void doNotIndex(IProject project) {
-		Common.log(new Status(Const.SLOEBER_STATUS_DEBUG, Activator.getId(),"Do not index "+project.getName())); //$NON-NLS-1$
-		fProjects.add(project);
-		getIndexController();
-	}
-	public static void index(IProject project) {
-		Common.log(new Status(Const.SLOEBER_STATUS_DEBUG, Activator.getId(),"index "+project.getName())); //$NON-NLS-1$
-		fProjects.remove(project);
-		ICProject cProject = CoreModel.getDefault().getCModel().getCProject(project.getName());
-		getIndexController().notifyIndexerSetup(cProject);
-	}
-
-	public static IndexerController getIndexController() {
-		if (theController==null) {
-			theController=new IndexerController();
-			CCorePlugin.getIndexManager().addIndexerSetupParticipant(theController);
-		}
-		return theController;
-		
-	}
-	
+        return doNotIndexProjects.contains(project);
+    }
+
+    public static void doNotIndex(IProject project) {
+        Common.log(new Status(Const.SLOEBER_STATUS_DEBUG, Activator.getId(), "Do not index " + project.getName())); //$NON-NLS-1$
+        doNotIndexProjects.add(project);
+        getIndexController();
+    }
+
+    public static void index(IProject project) {
+        Common.log(new Status(Const.SLOEBER_STATUS_DEBUG, Activator.getId(), "index " + project.getName())); //$NON-NLS-1$
+        doNotIndexProjects.remove(project);
+        if (indexingPosponedProjects.contains(project)) {
+            indexingPosponedProjects.remove(project);
+            ICProject cProject = CoreModel.getDefault().getCModel().getCProject(project.getName());
+            getIndexController().notifyIndexerSetup(cProject);
+        }
+    }
+
+    public static IndexerController getIndexController() {
+        if (theController == null) {
+            theController = new IndexerController();
+            CCorePlugin.getIndexManager().addIndexerSetupParticipant(theController);
+        }
+        return theController;
+
+    }
+
 }
diff --git a/io.sloeber.core/src/io/sloeber/core/listeners/resourceChangeListener.java b/io.sloeber.core/src/io/sloeber/core/listeners/resourceChangeListener.java
@@ -38,6 +38,7 @@ public void resourceChanged(IResourceChangeEvent event) {
                     IProject iProject = sloeberCfgDelta.getResource().getProject();
                     // stop the indexer
                     IndexerController.doNotIndex(iProject);
+
                     // log to process later
                     changedSloeberCfgFiles.add(iProject);
                 }
@@ -50,10 +51,16 @@ public void resourceChanged(IResourceChangeEvent event) {
                         // as it is a open of a cdt project assume it is a sloeber project.
                         // We will find out later if not
                         IProject iProject = cProjectDelta.getResource().getProject();
-                        // stop the indexer
-                        IndexerController.doNotIndex(iProject);
+                        SloeberProject curSloeberProject = SloeberProject.getSloeberProject(iProject);
+                        if (curSloeberProject != null) {
+                            if (!curSloeberProject.isInMemory()) {
+                                // stop the indexer
+                                IndexerController.doNotIndex(iProject);
+                                curSloeberProject.configure();
+                            }
+                        }
                         // log to process later
-                        changedSloeberCfgFiles.add(iProject);
+                        //changedSloeberCfgFiles.add(iProject);
                     }
             }
         }
@@ -73,12 +80,15 @@ protected IStatus run(IProgressMonitor monitor) {
                     public void run(IProgressMonitor monitor) throws CoreException {
                         for (IProject curProject : changedSloeberCfgFiles) {
                             if (curProject.isOpen()) {
-                                SloeberProject curSloeberProject = SloeberProject.getSloeberProject(curProject, false);
+                                SloeberProject curSloeberProject = SloeberProject.getSloeberProject(curProject);
                                 if (curSloeberProject == null) {
                                     // this is not a sloeber project;
                                     // make it one?
                                 } else {
-                                    curSloeberProject.sloeberCfgChanged();
+                                    //no use updating the cfg if it wasn't read already
+                                    if (curSloeberProject.isInMemory()) {
+                                        curSloeberProject.sloeberCfgChanged();
+                                    }
                                 }
                             }
                             IndexerController.index(curProject);
diff --git a/io.sloeber.core/src/io/sloeber/core/toolchain/SloeberBuildRunner.java b/io.sloeber.core/src/io/sloeber/core/toolchain/SloeberBuildRunner.java
@@ -42,7 +42,7 @@ public boolean invokeBuild(int kind, IProject project, IConfiguration configurat
 
         List<String> stopSerialOnBuildTargets = List.of(Preferences.getDisconnectSerialTargetsList());
         if (stopSerialOnBuildTargets.contains(theBuildTarget)) {
-            SloeberProject sloeberProject = SloeberProject.getSloeberProject(project, true);
+            SloeberProject sloeberProject = SloeberProject.getSloeberProject(project);
             if (sloeberProject != null) {
                 BoardDescription myBoardDescriptor = sloeberProject.getBoardDescription(configuration.getName(), true);
                 if (myBoardDescriptor != null) {
diff --git a/io.sloeber.core/src/io/sloeber/core/toolchain/SloeberConfigurationVariableSupplier.java b/io.sloeber.core/src/io/sloeber/core/toolchain/SloeberConfigurationVariableSupplier.java
@@ -22,7 +22,7 @@ private static SloeberProject getSloeberProject(IConfiguration configuration) {
         ICConfigurationDescription confDesc = ManagedBuildManager.getDescriptionForConfiguration(configuration);
         ICProjectDescription projDesc = confDesc.getProjectDescription();
         IProject project = projDesc.getProject();
-        return SloeberProject.getSloeberProject(project, false);
+        return SloeberProject.getSloeberProject(project);
     }
 
     @Override
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/Libraries.java b/io.sloeber.core/src/io/sloeber/core/tools/Libraries.java
@@ -114,7 +114,7 @@ private static Map<String, IPath> findAllSubFolders(IPath ipath) {
     private static Map<String, IPath> findAllHarwareLibraries(ICConfigurationDescription confDesc) {
         Map<String, IPath> ret = new HashMap<>();
         IProject project = confDesc.getProjectDescription().getProject();
-        SloeberProject sProject = SloeberProject.getSloeberProject(project, false);
+        SloeberProject sProject = SloeberProject.getSloeberProject(project);
         BoardDescription boardDescriptor = sProject.getBoardDescription(confDesc.getName(), false);
         // first add the referenced
         IPath libPath = boardDescriptor.getReferencedCoreLibraryPath();
diff --git a/io.sloeber.tests/src/io/sloeber/core/RegressionTest.java b/io.sloeber.tests/src/io/sloeber/core/RegressionTest.java
@@ -109,7 +109,7 @@ public void issue555() {
             e.printStackTrace();
             fail("Failed to compile the project:" + unoBoardid.getBoardName() + " as uno exception");
         }
-        SloeberProject arduinoProject = SloeberProject.getSloeberProject(theTestProject, false);
+        SloeberProject arduinoProject = SloeberProject.getSloeberProject(theTestProject);
         ICProjectDescription cProjectDescription = CCorePlugin.getDefault().getProjectDescription(theTestProject);
         arduinoProject.setBoardDescription(cProjectDescription.getActiveConfiguration().getName(), teensyBoardid, true);
 
@@ -390,7 +390,7 @@ public void openAndClosePreservesSettings() throws Exception {
 
         // Read the data we want to test
         Shared.waitForAllJobsToFinish(); // for the indexer
-        SloeberProject sloeberDesc = SloeberProject.getSloeberProject(theTestProject, false);
+        SloeberProject sloeberDesc = SloeberProject.getSloeberProject(theTestProject);
         ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(theTestProject);
         ICConfigurationDescription confDesc = projDesc.getActiveConfiguration();
         BoardDescription createdBoardDesc = sloeberDesc.getBoardDescription(confDesc.getName(), false);
@@ -405,7 +405,7 @@ public void openAndClosePreservesSettings() throws Exception {
         Shared.waitForAllJobsToFinish();
 
         // read the data we want to test
-        sloeberDesc = SloeberProject.getSloeberProject(theTestProject, false);
+        sloeberDesc = SloeberProject.getSloeberProject(theTestProject);
         projDesc = CoreModel.getDefault().getProjectDescription(theTestProject);
         confDesc = projDesc.getActiveConfiguration();
         BoardDescription reopenedBoardDesc = sloeberDesc.getBoardDescription(confDesc.getName(), false);
@@ -486,14 +486,14 @@ public void openAndCloseUsesSavedSettings() throws Exception {
 
         // Read the data we want to test
         Shared.waitForAllJobsToFinish(); // for the indexer
-        SloeberProject proj1SloeberDesc = SloeberProject.getSloeberProject(proj1, false);
+        SloeberProject proj1SloeberDesc = SloeberProject.getSloeberProject(proj1);
         ICProjectDescription proj1Desc = CoreModel.getDefault().getProjectDescription(proj1);
         ICConfigurationDescription proj1ConfDesc = proj1Desc.getActiveConfiguration();
         BoardDescription proj1CreatedBoardDesc = proj1SloeberDesc.getBoardDescription(proj1ConfDesc.getName(), false);
         CompileDescription proj1CreatedCompileDesc = proj1SloeberDesc.getCompileDescription(proj1ConfDesc.getName(),
                 false);
 
-        SloeberProject proj2SloeberDesc = SloeberProject.getSloeberProject(proj2, false);
+        SloeberProject proj2SloeberDesc = SloeberProject.getSloeberProject(proj2);
         ICProjectDescription proj2Desc = CoreModel.getDefault().getProjectDescription(proj2);
         ICConfigurationDescription proj2ConfDesc = proj2Desc.getActiveConfiguration();
         BoardDescription proj2CreatedBoardDesc = proj2SloeberDesc.getBoardDescription(proj2ConfDesc.getName(), false);
@@ -522,7 +522,7 @@ public void openAndCloseUsesSavedSettings() throws Exception {
         Shared.waitForAllJobsToFinish();
 
         // reread project 2
-        proj2SloeberDesc = SloeberProject.getSloeberProject(proj2, false);
+        proj2SloeberDesc = SloeberProject.getSloeberProject(proj2);
         proj2Desc = CoreModel.getDefault().getProjectDescription(proj2);
         proj2ConfDesc = proj2Desc.getActiveConfiguration();
         BoardDescription proj2OpenedBoardDesc = proj2SloeberDesc.getBoardDescription(proj2ConfDesc.getName(), false);
diff --git a/io.sloeber.ui/src/io/sloeber/ui/ExplorerLabelDecorator.java b/io.sloeber.ui/src/io/sloeber/ui/ExplorerLabelDecorator.java
@@ -41,7 +41,7 @@ public Image decorateImage(Image image, Object element) {
 	public String decorateText(String text, Object element) {
 		IProject proj = (IProject) element;
 		if (proj != null) {
-			SloeberProject arduinoProject = SloeberProject.getSloeberProject(proj, true);
+			SloeberProject arduinoProject = SloeberProject.getSloeberProject(proj);
 			if (arduinoProject != null) {
 				return arduinoProject.getDecoratedText(text);
 			}
diff --git a/io.sloeber.ui/src/io/sloeber/ui/actions/BurnBootloaderHandler.java b/io.sloeber.ui/src/io/sloeber/ui/actions/BurnBootloaderHandler.java
@@ -31,7 +31,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 		}
 		IProject selectedProject = ProjectExplorerListener.getSelectedProject();
 		if (selectedProject != null) {
-			SloeberProject sProject = SloeberProject.getSloeberProject(selectedProject, true);
+			SloeberProject sProject = SloeberProject.getSloeberProject(selectedProject);
 			if (sProject != null) {
 				sProject.burnBootloader();
 			}
diff --git a/io.sloeber.ui/src/io/sloeber/ui/actions/OpenSerialMonitorHandler.java b/io.sloeber.ui/src/io/sloeber/ui/actions/OpenSerialMonitorHandler.java
@@ -43,7 +43,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 				for (IProject curproject : SelectedProjects) {
 					int baud = Sketch.getCodeBaudRate(curproject);
 					if (baud > 0) {
-						SloeberProject sProject = SloeberProject.getSloeberProject(curproject, true);
+						SloeberProject sProject = SloeberProject.getSloeberProject(curproject);
 						if (sProject != null) {
 							ICConfigurationDescription activeConf = CoreModel.getDefault()
 									.getProjectDescription(curproject).getActiveConfiguration();
diff --git a/io.sloeber.ui/src/io/sloeber/ui/actions/UploadProjectHandler.java b/io.sloeber.ui/src/io/sloeber/ui/actions/UploadProjectHandler.java
@@ -68,7 +68,7 @@ public void run() {
 			}
 		}
 		if (canUpload) {
-			SloeberProject sProject = SloeberProject.getSloeberProject(UploadJobHandler.this.myBuildProject, true);
+			SloeberProject sProject = SloeberProject.getSloeberProject(UploadJobHandler.this.myBuildProject);
 			if (sProject != null) {
 				if (myIsProgram) {
 					retStatus = sProject.upLoadUsingProgrammer();
diff --git a/io.sloeber.ui/src/io/sloeber/ui/project/properties/SloeberCpropertyTab.java b/io.sloeber.ui/src/io/sloeber/ui/project/properties/SloeberCpropertyTab.java
@@ -54,7 +54,7 @@ public void createControls(Composite parent, ICPropertyProvider provider) {
 		// This is needed so that when a copy is made
 		// the root compile description is known
 		ICProjectDescription projDesc = getConfdesc().getProjectDescription();
-		mySloeberProject = SloeberProject.getSloeberProject(projDesc.getProject(), false);
+		mySloeberProject = SloeberProject.getSloeberProject(projDesc.getProject());
 		for (ICConfigurationDescription curConfig : projDesc.getConfigurations()) {
 			Object description = getFromSloeber(curConfig);
 			if (description == null) {
@@ -110,7 +110,6 @@ protected void performOK() {
 		ICConfigurationDescription confDesc = getConfdesc();
 		ICProjectDescription projDesc = confDesc.getProjectDescription();
 
-
 		// Copy local info to sloeber project and clean local info up
 		for (ICConfigurationDescription curConfDesc : projDesc.getConfigurations()) {
 			updateSloeber(curConfDesc);

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ public static IStatus isUploadableProject(IProject project) {`
`34`	`34`	`return Status.OK_STATUS;`
`35`	`35`	`}`
`36`	`36`
`37`		`-`
`38`		`-`
`39`	`37`	`/**`
`40`	`38`	`* Synchronous upload of the sketch returning the status.`
`41`	`39`	`*`
`@@ -48,7 +46,7 @@ public static IStatus syncUpload(IProject project) {`
`48`	`46`	`if (!ret.isOK()) {`
`49`	`47`	`return ret;`
`50`	`48`	`}`
`51`		`- SloeberProject sProject = SloeberProject.getSloeberProject(project, true);`
	`49`	`+ SloeberProject sProject = SloeberProject.getSloeberProject(project);`
`52`	`50`	`return sProject.upload();`
`53`	`51`	`}`
`54`	`52`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ public static String makeEnvironmentVar(String variableName) {`
`274`	`274`	`*/`
`275`	`275`	`static public String getOldWayEnvVar(ICConfigurationDescription confDesc, String envName) {`
`276`	`276`	`return getBuildEnvironmentVariable(confDesc, envName,`
`277`		`- getBuildEnvironmentVariable(confDesc, envName.toUpperCase(), EMPTY, true), true);`
	`277`	`+ getBuildEnvironmentVariable(confDesc, envName.toUpperCase(), EMPTY, false), false);`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ private static SloeberProject getSloeberProject(IConfiguration configuration) {`
`22`	`22`	`ICConfigurationDescription confDesc = ManagedBuildManager.getDescriptionForConfiguration(configuration);`
`23`	`23`	`ICProjectDescription projDesc = confDesc.getProjectDescription();`
`24`	`24`	`IProject project = projDesc.getProject();`
`25`		`- return SloeberProject.getSloeberProject(project, false);`
	`25`	`+ return SloeberProject.getSloeberProject(project);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Override`