material-icon-theme 4.20.0 → 4.22.0

package/src/icons/generator/jsonGenerator.ts

@@ -1,6 +1,12 @@
-import * as fs from 'fs';
+import {
+  existsSync,
+  readdirSync,
+  renameSync,
+  unlinkSync,
+  writeFileSync,
+} from 'fs';
 import merge from 'lodash.merge';
-import * as path from 'path';
+import { basename, join } from 'path';
 import { getCustomIconPaths } from '../../helpers/customIcons';
 import { getFileConfigHash } from '../../helpers/fileConfig';
 import { IconConfiguration, IconJsonOptions } from '../../models/index';
@@ -91,8 +97,8 @@ export const createIconFile = (
   try {
     let iconJsonPath = __dirname;
     // if executed via script
-    if (path.basename(__dirname) !== 'dist') {
-      iconJsonPath = path.join(__dirname, '..', '..', '..', 'dist');
+    if (basename(__dirname) !== 'dist') {
+      iconJsonPath = join(__dirname, '..', '..', '..', 'dist');
     }
     if (!updatedConfigs || (updatedConfigs.folders || {}).color) {
       // if updatedConfigs do not exist (because of initial setup)
@@ -119,11 +125,11 @@ export const createIconFile = (
   try {
     let iconJsonPath = __dirname;
     // if executed via script
-    if (path.basename(__dirname) !== 'dist') {
-      iconJsonPath = path.join(__dirname, '..', '..', '..', 'dist');
+    if (basename(__dirname) !== 'dist') {
+      iconJsonPath = join(__dirname, '..', '..', '..', 'dist');
     }
-    fs.writeFileSync(
-      path.join(iconJsonPath, iconJsonName),
+    writeFileSync(
+      join(iconJsonPath, iconJsonName),
       JSON.stringify(json, undefined, 2),
       'utf-8'
     );
@@ -149,8 +155,6 @@ export const getDefaultIconOptions = (): Required<IconJsonOptions> => ({
   saturation: 1,
   files: { associations: {} },
   languages: { associations: {} },
-  showUpdateMessage: false,
-  showWelcomeMessage: false,
 });
 
 /**
@@ -160,27 +164,27 @@ export const getDefaultIconOptions = (): Required<IconJsonOptions> => ({
  */
 const renameIconFiles = (iconJsonPath: string, options: IconJsonOptions) => {
   const customPaths = getCustomIconPaths(options);
-  const defaultIconPath = path.join(iconJsonPath, '..', 'icons');
+  const defaultIconPath = join(iconJsonPath, '..', 'icons');
   const iconPaths = [defaultIconPath, ...customPaths];
 
   iconPaths.forEach((iconPath) => {
-    fs.readdirSync(iconPath)
+    readdirSync(iconPath)
       .filter((f) => f.match(/\.svg/gi))
       .forEach((f) => {
-        const filePath = path.join(iconPath, f);
+        const filePath = join(iconPath, f);
         const fileConfigHash = getFileConfigHash(options);
 
         // append file config to file name
-        const newFilePath = path.join(
+        const newFilePath = join(
           iconPath,
           f.replace(/(^[^\.~]+)(.*)\.svg/, `$1${fileConfigHash}.svg`)
         );
 
         // if generated files are already in place, do not overwrite them
-        if (filePath !== newFilePath && fs.existsSync(newFilePath)) {
-          fs.unlinkSync(filePath);
+        if (filePath !== newFilePath && existsSync(newFilePath)) {
+          unlinkSync(filePath);
         } else {
-          fs.renameSync(filePath, newFilePath);
+          renameSync(filePath, newFilePath);
         }
       });
   });

package/src/icons/languageIcons.ts

@@ -134,4 +134,8 @@ export const languageIcons: LanguageIcon[] = [
   { icon: { name: 'wolframlanguage' }, ids: ['wolfram'] },
   { icon: { name: 'shader' }, ids: ['hlsl', 'glsl', 'wgsl'] },
   { icon: { name: 'tree' }, ids: ['tree'] },
+  { icon: { name: 'svelte' }, ids: ['svelte'] },
+  { icon: { name: 'dart' }, ids: ['dart'] },
+  { icon: { name: 'cadence' }, ids: ['cadence'] },
+  { icon: { name: 'stylable' }, ids: ['stylable'] },
 ];

package/src/models/i18n/translation.ts

@@ -1,11 +1,6 @@
 export interface Translation {
-  themeInstalled: string;
-  howToActivate: string;
   activate: string;
   activated: string;
-  neverShowAgain: string;
-  themeUpdated: string;
-  readChangelog: string;
   iconPacks: {
     selectPack: string;
     description: string;
@@ -34,10 +29,6 @@ export interface Translation {
     enable: string;
     disable: string;
   };
-  confirmReload: string;
-  reload: string;
-  outdatedVersion: string;
-  updateVSCode: string;
   grayscale: {
     toggle: string;
     enable: string;

package/src/models/iconConfiguration.ts

@@ -1,4 +1,4 @@
-import { IconJsonOptions } from './index';
+import { IconJsonOptions } from './';
 
 export class IconConfiguration {
   file?: string;

package/src/models/icons/iconJsonOptions.ts

@@ -14,8 +14,6 @@ export interface IconJsonOptions {
   languages?: {
     associations?: IconAssociations;
   };
-  showWelcomeMessage?: boolean;
-  showUpdateMessage?: boolean;
 }
 
 export interface IconAssociations {

package/src/models/index.ts

@@ -1,4 +1,3 @@
 export * from './icons';
 export * from './i18n';
 export * from './iconConfiguration';
-export * from './helpers';

package/src/scripts/contributors/index.ts

@@ -1,8 +1,8 @@
-import * as fs from 'fs';
-import * as https from 'https';
-import * as path from 'path';
+import { writeFileSync } from 'fs';
+import { request, RequestOptions } from 'https';
+import { join } from 'path';
 import { Contributor } from '../../models/scripts/contributors/contributor';
-import * as painter from '../helpers/painter';
+import { green, red, yellow } from '../helpers/painter';
 import { createScreenshot } from '../helpers/screenshots';
 
 /**
@@ -29,7 +29,7 @@ const fetchContributors = (
   page: string
 ): Promise<{ contributorsOfPage: Contributor[]; nextPage: string }> => {
   return new Promise((resolve, reject) => {
-    const requestOptions: https.RequestOptions = {
+    const requestOptions: RequestOptions = {
       method: 'GET',
       hostname: 'api.github.com',
       path: `/repos/pkief/vscode-material-icon-theme/contributors?page=${page}`,
@@ -41,13 +41,13 @@ const fetchContributors = (
       },
     };
 
-    const req = https.request(requestOptions, (res) => {
+    const req = request(requestOptions, (res) => {
       const { nextPage, lastPage, prevPage } = parseLinkHeader(
         res.headers?.link?.toString() ?? ''
       );
       console.log(
         '> Material Icon Theme:',
-        painter.yellow(
+        yellow(
           `[${page}/${
             lastPage ? lastPage[1] : +prevPage[1] + 1
           }] Loading contributors from GitHub...`
@@ -90,8 +90,8 @@ const createContributorsList = (contributors: Contributor[]) => {
   const styling = '<link rel="stylesheet" href="contributors.css">';
   const generatedHtml = `${htmlDoctype}${styling}<ul>${list}</ul>`;
 
-  const outputPath = path.join(__dirname, 'contributors.html');
-  fs.writeFileSync(outputPath, generatedHtml);
+  const outputPath = join(__dirname, 'contributors.html');
+  writeFileSync(outputPath, generatedHtml);
   return outputPath;
 };
 
@@ -109,29 +109,29 @@ const init = async () => {
   if (contributorsList.length > 0) {
     console.log(
       '> Material Icon Theme:',
-      painter.green('Successfully fetched all contributors from GitHub!')
+      green('Successfully fetched all contributors from GitHub!')
     );
   } else {
     console.log(
       '> Material Icon Theme:',
-      painter.red('Error: Could not fetch contributors from GitHub!')
+      red('Error: Could not fetch contributors from GitHub!')
     );
     throw Error();
   }
   const outputPath = createContributorsList(contributorsList);
 
   // create the image
-  console.log('> Material Icon Theme:', painter.yellow('Creating image...'));
+  console.log('> Material Icon Theme:', yellow('Creating image...'));
   const fileName = 'contributors';
   createScreenshot(outputPath, fileName)
     .then(() => {
       console.log(
         '> Material Icon Theme:',
-        painter.green(`Successfully created ${fileName} image!`)
+        green(`Successfully created ${fileName} image!`)
       );
     })
     .catch(() => {
-      throw Error(painter.red(`Error while creating ${fileName} image`));
+      throw Error(red(`Error while creating ${fileName} image`));
     });
 };
 

package/src/scripts/helpers/screenshots.ts

@@ -1,5 +1,5 @@
-import path from 'path';
-import puppeteer from 'puppeteer';
+import { join } from 'path';
+import Puppeteer from 'puppeteer';
 
 /**
  * Create a screenshot from an HTML file and save it as image.
@@ -8,8 +8,8 @@ import puppeteer from 'puppeteer';
  */
 export const createScreenshot = async (filePath: string, fileName: string) => {
   try {
-    const htmlFilePath = path.join('file:', filePath);
-    const browser = await puppeteer.launch();
+    const htmlFilePath = join('file:', filePath);
+    const browser = await Puppeteer.launch();
     const page = await browser.newPage();
     await page.setViewport({
       height: 10,

package/src/scripts/icons/checks/checkIconAvailability.ts

@@ -1,12 +1,12 @@
-import * as fs from 'fs';
-import * as path from 'path';
+import { readdir } from 'fs';
+import { join, parse } from 'path';
 import {
   DefaultIcon,
   FileIcon,
   FolderIcon,
   FolderTheme,
 } from '../../../models/index';
-import * as painter from '../../helpers/painter';
+import { green, red } from '../../helpers/painter';
 import { similarity } from '../../helpers/similarity';
 import {
   fileIcons,
@@ -20,7 +20,7 @@ import {
 /**
  * Defines the folder where all icon files are located.
  */
-const folderPath = path.join('icons');
+const folderPath = join('icons');
 
 /**
  * Defines an array with all icons that can be found in the file system.
@@ -49,7 +49,7 @@ const fsReadAllIconFiles = (
 
   files.forEach((file) => {
     const fileName = file;
-    const iconName = path.parse(file).name;
+    const iconName = parse(file).name;
     availableIcons[iconName] = fileName;
   });
 
@@ -63,7 +63,7 @@ const fsReadAllIconFiles = (
 };
 
 // read from the file system
-export const check = () => fs.readdir(folderPath, fsReadAllIconFiles);
+export const check = () => readdir(folderPath, fsReadAllIconFiles);
 
 /**
  * Check if the file icons from the configuration are available on the file system.
@@ -152,12 +152,12 @@ const handleErrors = () => {
   if (amountOfErrors > 0) {
     console.log(
       '> Material Icon Theme:',
-      painter.red(`Found ${amountOfErrors} error(s) in the icon configuration!`)
+      red(`Found ${amountOfErrors} error(s) in the icon configuration!`)
     );
   } else {
     console.log(
       '> Material Icon Theme:',
-      painter.green('Passed icon availability checks!')
+      green('Passed icon availability checks!')
     );
   }
   logIconInformation(wrongIconNames.fileIcons, 'File icons');
@@ -179,11 +179,11 @@ const logIconInformation = (wrongIcons: string[], title: string) => {
       return similarity(icon, i) > 0.75;
     });
     const suggestionString = suggestion
-      ? ` (Did you mean ${painter.green(suggestion)}?)`
+      ? ` (Did you mean ${green(suggestion)}?)`
       : '';
     const isWrongLightVersion = icon.endsWith(lightColorFileEnding);
     const isWrongLightVersionString = isWrongLightVersion
-      ? ` (There is no light icon for ${painter.green(
+      ? ` (There is no light icon for ${green(
           icon.slice(0, -6)
         )}! Set the light option to false!)`
       : '';
@@ -191,12 +191,12 @@ const logIconInformation = (wrongIcons: string[], title: string) => {
       highContrastColorFileEnding
     );
     const isWrongHighContrastVersionString = isWrongHighContrastVersion
-      ? ` (There is no high contrast icon for ${painter.green(
+      ? ` (There is no high contrast icon for ${green(
           icon.slice(0, -13)
         )}! Set the highContrast option to false!)`
       : '';
     console.log(
-      painter.red(`Icon not found: ${icon}.svg`) +
+      red(`Icon not found: ${icon}.svg`) +
         `${suggestionString}${isWrongLightVersionString}${isWrongHighContrastVersionString}`
     );
   });

package/src/scripts/icons/checks/checkIconConflicts.ts

@@ -1,4 +1,4 @@
-import * as painter from '../../helpers/painter';
+import { green, red } from '../../helpers/painter';
 import { fileIcons, folderIcons, languageIcons } from './../../../icons';
 
 /**
@@ -119,22 +119,20 @@ const handleErrors = () => {
       ...Object.keys(allConflicts.languageIcons),
     ].length > 0
   ) {
-    console.log('> Material Icon Theme:', painter.red('Icon conflicts:'));
-    console.log(painter.red('--------------------------------------'));
+    console.log('> Material Icon Theme:', red('Icon conflicts:'));
+    console.log(red('--------------------------------------'));
 
     printErrorMessage(allConflicts.fileIcons.fileExtensions, 'fileExtension');
     printErrorMessage(allConflicts.fileIcons.fileNames, 'fileName');
     printErrorMessage(allConflicts.folderIcons, 'folderName');
     printErrorMessage(allConflicts.languageIcons, 'languageId');
 
-    console.log(
-      '\n' + painter.red('Please check the wrong icon configurations!\n')
-    );
+    console.log('\n' + red('Please check the wrong icon configurations!\n'));
     process.exit(1);
   } else {
     console.log(
       '> Material Icon Theme:',
-      painter.green('Passed icon conflict checks!')
+      green('Passed icon conflict checks!')
     );
   }
 };
@@ -144,7 +142,7 @@ const printErrorMessage = (icons: any, definitionType: string) => {
   keys.forEach((key) => {
     const conflictIcons = icons[key];
     console.log(
-      painter.red(
+      red(
         `For ${definitionType} "${key}" are ${
           conflictIcons.length
         } icons defined: [${conflictIcons.join(', ')}]`

package/src/scripts/icons/checks/checkIconUsage.ts

@@ -1,6 +1,7 @@
-import * as fs from 'fs';
-import * as path from 'path';
+import { readdir } from 'fs';
+import { join, parse } from 'path';
 import { DefaultIcon, FolderIcon, FolderTheme } from '../../../models/index';
+import { green, red } from '../../helpers/painter';
 import {
   fileIcons,
   folderIcons,
@@ -9,12 +10,11 @@ import {
   lightColorFileEnding,
   openedFolder,
 } from './../../../icons';
-import * as painter from './../../helpers/painter';
 
 /**
  * Defines the folder where all icon files are located.
  */
-const folderPath = path.join('icons');
+const folderPath = join('icons');
 
 /**
  * Defines an array with all icons that can be found in the file system.
@@ -34,7 +34,7 @@ const fsReadAllIconFiles = (
 
   files.forEach((file) => {
     const fileName = file;
-    const iconName = path.parse(file).name;
+    const iconName = parse(file).name;
     availableIcons[iconName] = fileName;
   });
 
@@ -57,24 +57,20 @@ const checkUsageOfAllIcons = () => {
 const handleErrors = () => {
   const amountOfUnusedIcons = Object.keys(availableIcons).length;
   if (amountOfUnusedIcons === 0) {
-    console.log(
-      '> Material Icon Theme:',
-      painter.green('Passed icon usage checks!')
-    );
+    console.log('> Material Icon Theme:', green('Passed icon usage checks!'));
   } else {
     console.log(
-      '> Material Icon Theme: ' +
-        painter.red(`${amountOfUnusedIcons} unused icon(s):`)
+      '> Material Icon Theme: ' + red(`${amountOfUnusedIcons} unused icon(s):`)
     );
     Object.keys(availableIcons).forEach((icon) => {
-      console.log(painter.red(`- ${availableIcons[icon]}`));
+      console.log(red(`- ${availableIcons[icon]}`));
     });
     throw new Error('Found unused icon files!');
   }
 };
 
 // read from the file system
-export const check = () => fs.readdir(folderPath, fsReadAllIconFiles);
+export const check = () => readdir(folderPath, fsReadAllIconFiles);
 
 const getAllUsedFileIcons = (): string[] => {
   return [

package/src/scripts/icons/checks/index.ts

@@ -1,7 +1,7 @@
-import * as checkAvailability from './checkIconAvailability';
-import * as checkIconConflicts from './checkIconConflicts';
-import * as checkIconUsage from './checkIconUsage';
+import { check as checkAvailability } from './checkIconAvailability';
+import { check as checkIconConflicts } from './checkIconConflicts';
+import { check as checkIconUsage } from './checkIconUsage';
 
-checkAvailability.check();
-checkIconUsage.check();
-checkIconConflicts.check();
+checkAvailability();
+checkIconUsage();
+checkIconConflicts();

package/src/scripts/preview/preview.ts

@@ -1,11 +1,11 @@
-import * as fs from 'fs';
-import * as path from 'path';
+import { writeFileSync } from 'fs';
+import { join } from 'path';
+import { green, red } from '../helpers/painter';
 import { createScreenshot } from '../helpers/screenshots';
-import * as painter from './../helpers/painter';
 import { toTitleCase } from './../helpers/titleCase';
 
 const htmlDoctype = '<!DOCTYPE html>';
-const cssFilePath = path.join('style.css');
+const cssFilePath = 'style.css';
 const styling = `<link rel="stylesheet" href="${cssFilePath}">`;
 
 const createHTMLTableHeadRow = (amount: number) => {
@@ -69,23 +69,21 @@ const savePreview = (
   size: number,
   icons: IconDefinition[][]
 ) => {
-  const filePath = path.join(__dirname, fileName + '.html');
+  const filePath = join(__dirname, fileName + '.html');
 
   // write the html file with the icon table
-  fs.writeFileSync(filePath, createPreviewTable(icons, size));
+  writeFileSync(filePath, createPreviewTable(icons, size));
 
   // create the image
   createScreenshot(filePath, fileName)
     .then(() => {
       console.log(
         '> Material Icon Theme:',
-        painter.green(`Successfully created ${fileName} preview image!`)
+        green(`Successfully created ${fileName} preview image!`)
       );
     })
     .catch(() => {
-      throw Error(
-        painter.red(`Error while creating ${fileName} preview image`)
-      );
+      throw Error(red(`Error while creating ${fileName} preview image`));
     });
 };
 

package/src/test/runTest.ts

@@ -1,15 +1,15 @@
-import * as path from 'path';
+import { resolve } from 'path';
 import { runTests } from 'vscode-test';
 
 const main = async () => {
   try {
     // The folder containing the Extension Manifest package.json
     // Passed to `--extensionDevelopmentPath`
-    const extensionDevelopmentPath = path.resolve(__dirname, '../../');
+    const extensionDevelopmentPath = resolve(__dirname, '../../');
 
     // The path to the extension test script
     // Passed to --extensionTestsPath
-    const extensionTestsPath = path.resolve(__dirname, './spec/index');
+    const extensionTestsPath = resolve(__dirname, './spec/index');
 
     // Download VS Code, unzip it and run the integration test
     await runTests({

package/src/test/spec/i18n/i18n.spec.ts

@@ -1,34 +1,30 @@
-import * as assert from 'assert';
+import { equal } from 'assert';
 import { getObjectPropertyValue } from '../../../helpers/objects';
-import * as i18n from '../../../i18n';
+import { getTranslationValue, initTranslations, replace } from '../../../i18n';
 import { Translation } from '../../../models';
 
 describe('i18n', () => {
   it('should initialize translations', () => {
-    return i18n.initTranslations();
+    return initTranslations();
   });
 
   it('should translate key', () => {
-    assert.equal(
-      i18n.getTranslationValue('activate', { activate: 'b' } as Translation),
+    equal(
+      getTranslationValue('activate', { activate: 'b' } as Translation),
       'b'
     );
   });
 
   it('should return undefined if translation is not defined', () => {
-    assert.equal(
-      i18n.getTranslationValue(
-        'activate',
-        {} as Translation,
-        {} as Translation
-      ),
+    equal(
+      getTranslationValue('activate', {} as Translation, {} as Translation),
       undefined
     );
   });
 
   it('should use fallback if translation is not defined', () => {
-    assert.equal(
-      i18n.getTranslationValue(
+    equal(
+      getTranslationValue(
         'activate',
         {} as Translation,
         { activate: 'fb' } as Translation
@@ -45,16 +41,13 @@ describe('i18n', () => {
         },
       },
     };
-    assert.equal(getObjectPropertyValue(translation, 'a.b.c'), 'c');
+    equal(getObjectPropertyValue(translation, 'a.b.c'), 'c');
   });
 
   it('should use placeholder in translation', () => {
-    assert.equal(
-      i18n.replace('%0 with placeholder', 'test'),
-      'test with placeholder'
-    );
-    assert.equal(
-      i18n.replace('%0 with %1', 'test', 'placeholder'),
+    equal(replace('%0 with placeholder', 'test'), 'test with placeholder');
+    equal(
+      replace('%0 with %1', 'test', 'placeholder'),
       'test with placeholder'
     );
   });

package/src/test/spec/icons/fileIcons.spec.ts

@@ -1,4 +1,4 @@
-import * as assert from 'assert';
+import { deepStrictEqual } from 'assert';
 import merge from 'lodash.merge';
 import {
   getDefaultIconOptions,
@@ -60,7 +60,7 @@ describe('file icons', () => {
       'filename.js': 'javascript',
     };
 
-    assert.deepStrictEqual(iconDefinitions, expectedConfig);
+    deepStrictEqual(iconDefinitions, expectedConfig);
   });
 
   it('should disable icon packs', () => {
@@ -108,7 +108,7 @@ describe('file icons', () => {
     // disable default icon pack by using empty string
     expectedConfig.options!.activeIconPack = '';
 
-    assert.deepStrictEqual(iconDefinitions, expectedConfig);
+    deepStrictEqual(iconDefinitions, expectedConfig);
   });
 
   it('should configure custom icon associations', () => {
@@ -165,7 +165,7 @@ describe('file icons', () => {
       'sample.js': 'javascript',
     };
 
-    assert.deepStrictEqual(iconDefinitions, expectedConfig);
+    deepStrictEqual(iconDefinitions, expectedConfig);
   });
 
   it('should configure language icons for light and high contrast', () => {
@@ -245,6 +245,6 @@ describe('file icons', () => {
       'filename.js': 'javascript',
     };
     /* eslint-enable camelcase */
-    assert.deepStrictEqual(iconDefinitions, expectedConfig);
+    deepStrictEqual(iconDefinitions, expectedConfig);
   });
 });