diff options
| author | Sergey Prigogin | 2013-02-07 23:38:05 +0000 |
|---|---|---|
| committer | Sergey Prigogin | 2013-02-08 18:30:07 +0000 |
| commit | b3954c80ca1b585a54e944ee5f3d436d6b1ff707 (patch) | |
| tree | 909a735849cfc98df142f0702b1e075049589ab3 | |
| parent | 6e5916b9ea9006da3a9e45df601db977e45b905f (diff) | |
| download | org.eclipse.cdt-b3954c80ca1b585a54e944ee5f3d436d6b1ff707.tar.gz org.eclipse.cdt-b3954c80ca1b585a54e944ee5f3d436d6b1ff707.tar.xz org.eclipse.cdt-b3954c80ca1b585a54e944ee5f3d436d6b1ff707.zip | |
Bug 400275 - CoreModel.isScannerInformationEmpty mistakenly thinks that
language settings providers are enabled
Change-Id: Ie9cbb2df8dbc9b1034bde2dbfd5de64d27d54c49
Reviewed-on: https://git.eclipse.org/r/10248
Reviewed-by: Andrew Gvozdev <angvoz.dev@gmail.com>
IP-Clean: Andrew Gvozdev <angvoz.dev@gmail.com>
Tested-by: Andrew Gvozdev <angvoz.dev@gmail.com>
| -rw-r--r-- | core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java index b24886879f6..90714bd6f0b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java @@ -20,6 +20,7 @@ import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CProjectNature; import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvidersKeeper; import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; +import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; import org.eclipse.cdt.core.resources.IPathEntryStore; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICLanguageSetting; @@ -1254,11 +1255,12 @@ public class CoreModel { if(des != null){ ICConfigurationDescription indexCfg = des.getDefaultSettingConfiguration(); if(indexCfg != null){ - if(!mngr.isNewStyleCfg(indexCfg)){ + if (!mngr.isNewStyleCfg(indexCfg)) { return oldIsScannerInformationEmpty(resource); } - if (indexCfg instanceof ILanguageSettingsProvidersKeeper) { + if (ScannerDiscoveryLegacySupport.isLanguageSettingsProvidersFunctionalityEnabled(project) && + indexCfg instanceof ILanguageSettingsProvidersKeeper) { List<String> languageIds = LanguageSettingsManager.getLanguages(resource, indexCfg); for (String langId : languageIds) { List<ICLanguageSettingEntry> entries = LanguageSettingsProvidersSerializer.getSettingEntriesByKind(indexCfg, resource, langId, |