forks/vsc-material-theme
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: revert id on package json for conflict (#292)

Browse source
This commit is contained in:
Alessio Occhipinti 2018-11-25 23:06:27 +01:00 committed by Mattia Astorino
parent 977be340cb
commit 678d5c3e97
4 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
extensions/helpers/fs.ts
View file

@ -61,10 +61,7 @@ export function getThemeIconsContribute(ID: string): IPackageJSONThemeIcons {
*/
export function getIconVariantFromTheme(theme: string): string {
const {themeIconVariants} = getDefaultValues();
const splitted = theme.split('-');
const variantIcon = splitted[splitted.length - 1];
const found = Object.keys(themeIconVariants)
.find(key => themeIconVariants[key].includes(variantIcon));
const found = Object.keys(themeIconVariants).find(variant => theme.includes(variant));
return found ? found.toLowerCase() : null;
}

2
extensions/helpers/settings.ts
View file

@ -44,7 +44,7 @@ export function isAccent(accentName: string, defaults: IDefaults): boolean {
*/
export function isMaterialTheme(themeName: string): boolean {
const packageJSON = getPackageJSON();
return Boolean(packageJSON.contributes.themes.find(contrib => contrib.id === themeName));
return Boolean(packageJSON.contributes.themes.find(contrib => contrib.label === themeName));
}
/**

1
extensions/interfaces/ipackage.json.ts
View file

@ -24,7 +24,6 @@ export interface IPackageJSONCommand {
}
export interface IPackageJSONTheme {
id: string;
label: string;
path: string;
uiTheme: string;

10
package.json
View file

@ -122,61 +122,51 @@
},
"themes": [
{
"id": "eq-material-theme-default",
"label": "Material Theme",
"path": "./themes/Material-Theme-Default.json",
"uiTheme": "vs-dark"
},
{
"id": "eq-material-theme-default-high-contrast",
"label": "Material Theme High Contrast",
"path": "./themes/Material-Theme-Default-High-Contrast.json",
"uiTheme": "vs-dark"
},
{
"id": "eq-material-theme-darker",
"label": "Material Theme Darker",
"path": "./themes/Material-Theme-Darker.json",
"uiTheme": "vs-dark"
},
{
"id": "eq-material-theme-darker-high-contrast",
"label": "Material Theme Darker High Contrast",
"path": "./themes/Material-Theme-Darker-High-Contrast.json",
"uiTheme": "vs-dark"
},
{
"id": "eq-material-theme-palenight",
"label": "Material Theme Palenight",
"path": "./themes/Material-Theme-Palenight.json",
"uiTheme": "vs-dark"
},
{
"id": "eq-material-theme-palenight-high-contrast",
"label": "Material Theme Palenight High Contrast",
"path": "./themes/Material-Theme-Palenight-High-Contrast.json",
"uiTheme": "vs-dark"
},
{
"id": "eq-material-theme-ocean",
"label": "Material Theme Ocean",
"path": "./themes/Material-Theme-Ocean.json",
"uiTheme": "vs-dark"
},
{
"id": "eq-material-theme-ocean-high-contrast",
"label": "Material Theme Ocean High Contrast",
"path": "./themes/Material-Theme-Ocean-High-Contrast.json",
"uiTheme": "vs-dark"
},
{
"id": "eq-material-theme-lighter",
"label": "Material Theme Lighter",
"path": "./themes/Material-Theme-Lighter.json",
"uiTheme": "vs"
},
{
"id": "eq-material-theme-lighter-high-contrast",
"label": "Material Theme Lighter High Contrast",
"path": "./themes/Material-Theme-Lighter-High-Contrast.json",
"uiTheme": "vs"