fix: registering CSS theme via UI fails

eclipse-tm4e · Sep 6, 2024 · 0a8c706 · 0a8c706
1 parent a2c3b64
commit 0a8c706
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/...e.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/preferences/ThemePreferencePage.java b/...e.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/preferences/ThemePreferencePage.java
@@ -165,14 +165,20 @@ protected void createButtons() {
 				final var themePath = Path.of(res);
 				final var themeFileName = themePath.getFileName().toString();
 				try {
-					final var rawTheme = RawThemeReader.readTheme(IThemeSource.fromFile(themePath));
-					final var rawThemeName = rawTheme.getName();
-					final String name = rawThemeName == null
-							? themeFileName.substring(0, themeFileName.lastIndexOf('.'))
-							: rawThemeName;
-					return new Theme(name, themePath.toAbsolutePath().toString(), name, false);
+					final String themeName;
+					if (themeFileName.endsWith(".css")) {
+						themeName = themeFileName.substring(0, themeFileName.lastIndexOf('.'));
+					} else {
+						final var rawTheme = RawThemeReader.readTheme(IThemeSource.fromFile(themePath));
+						final var rawThemeName = rawTheme.getName();
+						themeName = rawThemeName == null
+								? themeFileName.substring(0, themeFileName.lastIndexOf('.'))
+								: rawThemeName;
+					}
+					return new Theme(themeName, themePath.toAbsolutePath().toString(), themeName, false);
 				} catch (final Exception ex) {
 					MessageDialog.openError(getShell(), "Invalid theme file", "Failed to parse [" + themePath + "]: " + ex);
+					TMUIPlugin.logError(ex);
 					return null;
 				}