Merge branch 'develop' of https://github.com/equinusocio/vsc-material-theme into develop

README.md

@@ -41,9 +41,11 @@ Launch *Quick Open*
 Paste the following command and press `Enter`:
 
 ```shell
-ext install vsc-material-theme
+ext install material theme
 ```
 
+And pick the one by **Mattia Astorino** (me) as author.
+
 #### Packaged VSIX Extension
 
 [Download the latest .vsix release](https://marketplace.visualstudio.com/_apis/public/gallery/publishers/Equinusocio/vsextensions/vsc-material-theme/latest/vspackage) file from the marketplace and install it from the command line

extensions/helpers/settings.ts

@@ -40,11 +40,11 @@ export function isAccent(accentName: string, defaults: IDefaults): boolean {
 }
 
 /**
- * Determines if the passing theme label is a material theme
+ * Determines if the passing theme id is a material theme
  */
 export function isMaterialTheme(themeName: string): boolean {
   const packageJSON = getPackageJSON();
-  return Boolean(packageJSON.contributes.themes.find(contrib => contrib.label === themeName));
+  return Boolean(packageJSON.contributes.themes.find(contrib => contrib.id === themeName));
 }
 
 /**

extensions/interfaces/ipackage.json.ts

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

package.json

@@ -122,51 +122,61 @@
     },
     "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"