mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-23 16:23:52 +02:00
Code Issues Wiki Activity

Multiple fixes for indexing support

Browse source 
- fix ContainerPropertyTab.performApply to be ready for a null
  enablement property which occurs when Apply is hit on another
  tab page
- fix LanguageSettingsWorkspaceProvider.getSettingEntries method
  to use the CommandLauncherManager so entries will be transformed
  to use cached headers

Change-Id: Ib2bb283d768905716e7fb37fd598aeace7832b2d
This commit is contained in:
Jeff Johnston 2017-05-10 14:36:37 -04:00
parent b04c4b68ef
commit eb561ddbf8
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java
View file

@ -20,6 +20,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.CommandLauncherManager;
import org.eclipse.cdt.core.language.settings.providers.ICListenerAgent; import org.eclipse.cdt.core.language.settings.providers.ICListenerAgent;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsBroadcastingProvider; import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsBroadcastingProvider;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsChangeEvent; import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsChangeEvent;
@ -178,6 +179,10 @@ public class LanguageSettingsProvidersSerializer {
public List<ICLanguageSettingEntry> getSettingEntries(ICConfigurationDescription cfgDescription, IResource rc, String languageId) { public List<ICLanguageSettingEntry> getSettingEntries(ICConfigurationDescription cfgDescription, IResource rc, String languageId) {
ILanguageSettingsProvider rawProvider = getRawProvider(); ILanguageSettingsProvider rawProvider = getRawProvider();
List<ICLanguageSettingEntry> entries = rawProvider!=null ? rawProvider.getSettingEntries(cfgDescription, rc, languageId) : null; List<ICLanguageSettingEntry> entries = rawProvider!=null ? rawProvider.getSettingEntries(cfgDescription, rc, languageId) : null;
if (cfgDescription != null) {
IProject project = cfgDescription.getProjectDescription().getProject();
entries = CommandLauncherManager.getInstance().getLanguageSettingEntries(project, entries);
}
return entries; return entries;
} }

3
launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java
View file

@ -359,7 +359,8 @@ public class ContainerPropertyTab extends AbstractCBuildPropertyTab
.getProperty(ContainerCommandLauncher.CONTAINER_BUILD_ENABLED); .getProperty(ContainerCommandLauncher.CONTAINER_BUILD_ENABLED);
String enablementProperty2 = prop2 String enablementProperty2 = prop2
.getProperty(ContainerCommandLauncher.CONTAINER_BUILD_ENABLED); .getProperty(ContainerCommandLauncher.CONTAINER_BUILD_ENABLED);
if (!enablementProperty.equals(enablementProperty2)) { if (enablementProperty != null
&& !enablementProperty.equals(enablementProperty2)) {
needToRecalculate = true; needToRecalculate = true;
} }
prop2.setProperty(ContainerCommandLauncher.CONTAINER_BUILD_ENABLED, prop2.setProperty(ContainerCommandLauncher.CONTAINER_BUILD_ENABLED,