Merge pull request #109 from geriyoco/fix/inconsistent-file-pattern

🐛 Read file extensions from package.json

Author: fanurs

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;
 }