bug 401961: Adjusted LSP property page UI to function for legacy projects where no languages defined in the toolchain

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java

@@ -18,8 +18,10 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.IDecoration;
@@ -114,7 +116,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 				return overlayKeys;
 			}
 
-			if (currentLanguageId != null) {
 			IResource rc = getResource();
 			List<ICLanguageSettingEntry> entries = getSettingEntries(provider);
 			if (entries == null && !(rc instanceof IProject)) {
@@ -130,7 +131,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 					overlayKeys[IDecoration.TOP_RIGHT] = CDTSharedImages.IMG_OVR_SETTING;
 				}
 			}
-			}
 
 			ICConfigurationDescription cfgDescription = getConfigurationDescription();
 			List<ILanguageSettingsProvider> initialProviders = initialProvidersMap.get(cfgDescription.getId());
@@ -291,9 +291,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 	 * @return list of setting entries for the current context.
 	 */
 	private List<ICLanguageSettingEntry> getSettingEntriesUpResourceTree(ILanguageSettingsProvider provider) {
-		if (currentLanguageId == null)
-			return null;
-
 		ICConfigurationDescription cfgDescription = getConfigurationDescription();
 		IResource rc = getResource();
 		List<ICLanguageSettingEntry> entries = LanguageSettingsManager.getSettingEntriesUpResourceTree(provider, cfgDescription, rc, currentLanguageId);
@@ -305,9 +302,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 	 * @return list of setting entries for the current context.
 	 */
 	private List<ICLanguageSettingEntry> getSettingEntries(ILanguageSettingsProvider provider) {
-		if (currentLanguageId==null)
-			return null;
-
 		ICConfigurationDescription cfgDescription = getConfigurationDescription();
 		IResource rc = getResource();
 		return provider.getSettingEntries(cfgDescription, rc, currentLanguageId);
@@ -906,7 +900,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 	 */
 	private List<ILanguageSettingsProvider> getProviders(String languageSettingId) {
 		List<ILanguageSettingsProvider> itemsList = new LinkedList<ILanguageSettingsProvider>();
-		if (currentLanguageId != null) {
 		IResource rc = getResource();
 		ICConfigurationDescription cfgDescription = getConfigurationDescription();
 		if (rc != null && cfgDescription instanceof ILanguageSettingsProvidersKeeper) {
@@ -923,7 +916,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 				itemsList.add(cfgProvider);
 			}
 		}
-		}
 		return itemsList;
 	}
 
@@ -945,15 +937,18 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 		currentLanguageId = null;
 
 		List<String> languageIds = LanguageSettingsManager.getLanguages(rcDes);
-		// Not sure what to do with null language ID, ignoring for now
+		if (languageIds.size() > 1) {
+			// remove null language when some real ones are defined
 			languageIds.remove(null);
 			Collections.sort(languageIds);
+		} else if (languageIds.isEmpty()) {
+			// if no languages are defined keep null language as "Unspecified language"
+			languageIds.add(null);
+		}
 		for (String langId : languageIds) {
 			ILanguage language = LanguageManager.getInstance().getLanguage(langId);
-			if (language == null)
-				continue;
 
-			String langName = language.getName();
+			String langName = language != null ? language.getName() : Messages.LanguageSettingsEntriesTab_UnspecifiedLanguage;
 			if (langName == null || langName.length() == 0)
 				continue;
 
@@ -980,7 +975,7 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 		currentLanguageIdGlobal = currentLanguageId;
 
 		for (TreeItem t : treeLanguages.getItems()) {
-			if (t.getData().equals(langId)) {
+			if ((t.getData() == null && langId == null) || t.getData().equals(langId)) {
 				treeLanguages.setSelection(t);
 				break;
 			}
@@ -1040,7 +1035,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 				if (provider instanceof ILanguageSettingsEditableProvider) {
 					for (TreeItem langItems : treeLanguages.getItems()) {
 						String langId = (String)langItems.getData();
-						if (langId != null) {
 						if (provider.getSettingEntries(cfgDescription, rc, langId) != null) {
 							if (providerCopy == null) {
 								// copy providers to be able to "Cancel" in UI
@@ -1054,7 +1048,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 						}
 					}
 				}
-				}
 				if (providerCopy != null) {
 					newProviders.add(providerCopy);
 				} else {
@@ -1101,6 +1094,20 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 		// filter out files not associated with any languages such as *.o
 		if (page.isForFile()) {
 			List<String> languageIds = LanguageSettingsManager.getLanguages(getResDesc());
+			if (languageIds.isEmpty() || (languageIds.size() == 1 && languageIds.get(0) == null)) {
+				// for legacy projects check if the file is associated with any CDT language
+				IResource rc = getResource();
+				if (rc instanceof IFile) {
+					try {
+						ILanguage language = LanguageManager.getInstance().getLanguageForFile((IFile)rc, null);
+						return language != null;
+					} catch (CoreException e) {
+						// who cares, not even logging
+					}
+				}
+				return false;
+			} else {
+				// for regular MBS project verify language against toolchain language
 				for (String langId : languageIds) {
 					if (langId != null) {
 						ILanguage language = LanguageManager.getInstance().getLanguage(langId);
@@ -1109,6 +1116,7 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 						}
 					}
 				}
+			}
 			return false;
 		}
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.java

@@ -213,6 +213,7 @@ public class Messages extends NLS {
 	public static String LanguageSettingEntryDialog_WorkspacePath;
 	public static String LanguageSettingsEntriesTab_Cannot_Determine_Languages;
 	public static String LanguageSettingsEntriesTab_Entries_Not_Editable;
+	public static String LanguageSettingsEntriesTab_UnspecifiedLanguage;
 	public static String LanguageSettingsImages_FileDoesNotExist;
 	public static String LanguageSettingsImages_FolderDoesNotExist;
 	public static String LanguageSettingsImages_UsingRelativePathsNotRecommended;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties

@@ -189,6 +189,7 @@ LanguageSettingEntryDialog_Value=Value:
 LanguageSettingEntryDialog_WorkspacePath=Workspace Path
 LanguageSettingsEntriesTab_Cannot_Determine_Languages=Cannot determine toolchain languages.
 LanguageSettingsEntriesTab_Entries_Not_Editable=Setting entries for this provider are supplied by the system and are not editable.
+LanguageSettingsEntriesTab_UnspecifiedLanguage=[ Unspecified ]
 LanguageSettingsImages_FileDoesNotExist=The selected file does not exist or not accessible.
 LanguageSettingsImages_FolderDoesNotExist=The selected folder does not exist or not accessible.
 LanguageSettingsImages_UsingRelativePathsNotRecommended=Using relative paths is ambiguous and not recommended. It can cause unexpected effects.