Options parsing moved to a dedicated file

Author: kleber-swf

src/extension.ts

@@ -1,13 +1,10 @@
 import * as fs from 'fs/promises';
 import * as vscode from 'vscode';
-import { DEST_PATH, EXT_ID, ISSUES_URL, IndentationStyle, Options, TEMPLATES_BASEPATH } from './model';
+import { DEST_PATH, EXT_ID, ISSUES_URL, Replaces, TEMPLATES_BASEPATH } from './model';
+import { getReplaces } from './options';
 
 const TAG_REGEX = /\%(\w+)\%/gm;
-const PRIVATE_REGEX_KEY = 'PRIVATE';
-const LINE_BREAK_REGEX_KEY = 'LINE_BREAK';
-const TAB_REGEX_KEY = 'TAB';
-
-const files = ['classes', 'methods', 'calls'];
+const TEMPLATES = ['classes', 'methods', 'calls'];
 
 export function activate(context: vscode.ExtensionContext) {
 	const disposable = vscode.workspace.onDidChangeConfiguration(e => onConfigurationChanged(context, e));
@@ -18,7 +15,7 @@ function onConfigurationChanged(context: vscode.ExtensionContext, e: vscode.Conf
 	if (!e.affectsConfiguration(EXT_ID)) { return; }
 	const conf = vscode.workspace.getConfiguration(EXT_ID);
 
-	createSnippets(context, getOptions(conf))
+	createSnippets(context, getReplaces(conf))
 		.then(content => saveSnippets(context, content))
 		.then(() => {
 			vscode.window.showInformationMessage('Restart VSCode to apply the snippets', 'Restart')
@@ -27,48 +24,19 @@ function onConfigurationChanged(context: vscode.ExtensionContext, e: vscode.Conf
 		.catch(showError);
 }
 
-async function createSnippets(context: vscode.ExtensionContext, options: Options) {
-	const replace = parseOptions(options);
-
-	const contents: string[] = await Promise.all(files.map(file =>
-		replaceOnTemplate(context.asAbsolutePath(`${TEMPLATES_BASEPATH}/${file}.json`), replace)
+async function createSnippets(context: vscode.ExtensionContext, replaces: Replaces) {
+	const contents: string[] = await Promise.all(TEMPLATES.map(file =>
+		replaceOnTemplate(context.asAbsolutePath(`${TEMPLATES_BASEPATH}/${file}.json`), replaces)
 	));
 
 	let result = {};
 	contents.forEach(content => result = Object.assign(result, JSON.parse(content)));
 	return JSON.stringify(result, null, '\t');
 }
 
-function getOptions(conf: vscode.WorkspaceConfiguration) {
-	return {
-		style: conf.get('style') as IndentationStyle,
-		usePrivateKeyword: conf.get('usePrivateKeyword') as boolean
-	};
-}
-
-function parseOptions(options: Options) {
-	const result: Record<string, string> = {};
-
-	// private keyword
-	result[PRIVATE_REGEX_KEY] = options.usePrivateKeyword ? 'private ' : '';
-
-	// indentation style
-	if (options.style === 'allman') {
-		result[LINE_BREAK_REGEX_KEY] = '",\n\t\t\t"';
-		result[TAB_REGEX_KEY] = '\\t';
-	} else if (options.style === 'kr') {
-		result[LINE_BREAK_REGEX_KEY] = ' ';
-		result[TAB_REGEX_KEY] = '';
-	} else {
-		throw new Error(`Invalid style: ${options.style}`);
-	}
-
-	return result;
-}
-
-async function replaceOnTemplate(filePath: string, replace: Record<string, string>) {
+async function replaceOnTemplate(filePath: string, replaces: Replaces) {
 	const content = await fs.readFile(filePath, { encoding: 'utf-8' });
-	return content.replace(TAG_REGEX, (_match: string, p1: string) => replace[p1] ?? p1);
+	return content.replace(TAG_REGEX, (_match: string, p1: string) => replaces[p1 as keyof Replaces] ?? p1);
 }
 
 async function saveSnippets(context: vscode.ExtensionContext, content: string) {

src/model.ts

@@ -3,9 +3,11 @@ export const TEMPLATES_BASEPATH = 'templates/';
 export const DEST_PATH = 'snippets/snippets.json';
 export const ISSUES_URL = 'https://github.com/kleber-swf/vscode-unity-code-snippets/issues';
 
-
 export type IndentationStyle = 'kr' | 'allman';
 
+export type ReplaceType = 'PRIVATE' | 'LINE_BREAK' | 'TAB';
+export type Replaces = Record<ReplaceType, string>;
+
 export interface Options {
 	style: IndentationStyle;
 	usePrivateKeyword: boolean;

src/options.ts

@@ -0,0 +1,34 @@
+import * as vscode from 'vscode';
+import { IndentationStyle, Options, Replaces } from './model';
+
+export function getReplaces(conf: vscode.WorkspaceConfiguration): Replaces {
+	const options = getOptions(conf);
+	return parseOptions(options);
+}
+
+function getOptions(conf: vscode.WorkspaceConfiguration) {
+	return {
+		style: conf.get('style') as IndentationStyle,
+		usePrivateKeyword: conf.get('usePrivateKeyword') as boolean
+	};
+}
+
+function parseOptions(options: Options): Replaces {
+	const result: Replaces = {} as any;
+
+	// private keyword
+	result.PRIVATE = options.usePrivateKeyword ? 'private ' : '';
+
+	// indentation style
+	if (options.style === 'allman') {
+		result.LINE_BREAK = '",\n\t\t\t"';
+		result.TAB = '\\t';
+	} else if (options.style === 'kr') {
+		result.LINE_BREAK = ' ';
+		result.TAB = '';
+	} else {
+		throw new Error(`Invalid style: ${options.style}`);
+	}
+
+	return result;
+}