Merge pull request #110 from geriyoco/main

🚀 Release v1.2.1

Author: fanurs

CHANGELOG.md

@@ -1,8 +1,12 @@
 # Change Log
 
+## [1.2.1] - 2022-09-28
+### Fixed
+- Supported file extensions are now consistent between [`package.json`](package.json) and [`src/utils.ts`](src/utils.ts).
+
 ## [1.2.0] - 2022-09-21
 ### Added
-- Telemetry for feature insights. We strive to be transparent at what we collect. See [telemetry.json](telemetry.json) for all the events we collect. Following the [Microsoft Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement), we do not collect any Personally Identifiable Information (PII). Check out the open-source repository at [here](https://github.com/geriyoco/vscode-image-gallery) to inspect the code. You can always opt-out of telemetry by setting `geriyocoImageGallery.isTelemetryEnabled` to `false` in your VS Code settings. Visit [here](https://code.visualstudio.com/docs/getstarted/telemetry) to learn more about VS Code telemetry.
+- Telemetry for feature insights. We strive to be transparent at what we collect. See [`telemetry.json`](telemetry.json) for all the events we collect. Following the [Microsoft Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement), we do not collect any Personally Identifiable Information (PII). Check out the open-source repository at [here](https://github.com/geriyoco/vscode-image-gallery) to inspect the code. You can always opt-out of telemetry by setting `geriyocoImageGallery.isTelemetryEnabled` to `false` in your VS Code settings. Visit [here](https://code.visualstudio.com/docs/getstarted/telemetry) to learn more about VS Code telemetry.
 
 ### Fixed
 - Image sort preference was not respected when file watcher is involved, e.g. after an image is added, deleted, or modified.

package.json

@@ -2,7 +2,7 @@
 	"name": "vscode-image-gallery",
 	"displayName": "Image Gallery",
 	"description": "Improve image browsing experience, especially for remote development.",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"publisher": "GeriYoco",
 	"repository": {
 		"type": "git",

src/extension.ts

@@ -1,9 +1,12 @@
 import * as vscode from 'vscode';
+import * as utils from './utils';
 import * as gallery from './gallery/gallery';
 import * as viewer from './viewer/viewer';
 import * as telemetry from './telemetry';
 
 export function activate(context: vscode.ExtensionContext) {
+	utils.readPackageJSON(context);
+
 	telemetry.activate(context);
 	gallery.activate(context);
 	viewer.activate(context);

src/img_extensions.ts

@@ -2,6 +2,7 @@ import * as vscode from 'vscode';
 import TelemetryReporter, {
     TelemetryEventMeasurements, TelemetryEventProperties
 } from '@vscode/extension-telemetry';
+import * as utils from './utils';
 
 export let reporter: ExtensionReporter;
 
@@ -22,9 +23,8 @@ export class ExtensionReporter extends TelemetryReporter {
         public readonly enableTelemetry: boolean = getUserTelemetrySetting(),
         private readonly instrumentationKey = "a5e759de-afbd-4f36-a9c9-2fc95385683b",
     ) {
-        const packageJson = context.extension.packageJSON;
-        const extId = packageJson.publisher + '.' + packageJson.name;
-        const extVersion = packageJson.version;
+        const extId = utils.packageJSON.publisher + '.' + utils.packageJSON.name;
+        const extVersion = utils.packageJSON.version;
         super(extId, extVersion, instrumentationKey);
     }
 

src/telemetry.ts

@@ -3,7 +3,11 @@ import * as vscode from 'vscode';
 import { TFolder } from 'custom_typings';
 import crypto from 'crypto';
 import fileSystem from 'fs';
-import { imgExtensions } from './img_extensions';
+
+export let packageJSON: any; // global variable
+export function readPackageJSON(context: vscode.ExtensionContext) {
+	packageJSON = context.extension.packageJSON;
+}
 
 export function getCwd() {
 	if (!vscode.workspace.workspaceFolders) {
@@ -25,8 +29,17 @@ function getNonce() {
 }
 export const nonce = getNonce();
 
+function getImageExtensions() {
+	const pattern = packageJSON.contributes.customEditors[0].selector[0].filenamePattern;
+	const regex = /(?<=\{)(.*?)(?=\})/g;
+	const match = pattern.match(regex)[0];
+	const imageExtensions: string[] = match.split(',');
+	return imageExtensions;
+}
+
 export function getGlob() {
-	let upperCaseImg = imgExtensions.map(ext => ext.toUpperCase());
+	const imgExtensions = getImageExtensions();
+	const upperCaseImg = imgExtensions.map(ext => ext.toUpperCase());
 	const globPattern = `**/*.{${[...imgExtensions, ...upperCaseImg].join(',')}}`;
 	return globPattern;
 }