Support YAML configuration

package.json

@@ -238,7 +238,8 @@
   },
   "dependencies": {
     "npm-module-path": "^2.0.2",
-    "remark": "^12.0.0"
+    "remark": "^12.0.0",
+    "yaml": "^1.10.0"
   },
   "scripts": {
     "vscode:prepublish": "npm run compile",

src/extension.ts

@@ -119,6 +119,7 @@ async function runRemark(document: vscode.TextDocument, range: vscode.Range): Pr
 					api = api.use(plugin.package);
 				}
 			} catch (err) {
+				console.error(err);
 				errors.push({
 					name: plugin.name,
 					err

src/test/suite/workspace.test.ts

@@ -21,11 +21,7 @@ suite('Extension Test Suite', () => {
 		vscode.window.showInformationMessage('All tests done!');
 	});
 
-	test('parseWorkspaceConfig', async () => {
-		// The configPath looks overly convoluted since `__dirname` points to the directory of the resulting .js
-		// file inside the `out` directory and not this source .ts file.
-		const configPath = path.join(__dirname, '..', '..', '..', 'src', 'test', 'suite', 'json', '.remarkrc');
-		console.log('configPath', configPath);
+	const parseWorkspaceConfigTest = async (configPath : string) => {
 		const files =  [ vscode.Uri.parse(configPath) ];
 		const config = await workspace.parseWorkspaceConfig(files);
 
@@ -47,5 +43,19 @@ suite('Extension Test Suite', () => {
 
 		expect(check.object(config['first-heading']), 'config["first-heading"]').to.be.true;
 		expect(config['first-heading'].heading, 'config["first-heading"].heading').to.be.eq('Hello, .remarkrc file!');
+	};
+
+	test('parseWorkspaceConfig(json)', async () => {
+		// The configPath looks overly convoluted since `__dirname` points to the directory of the resulting .js
+		// file inside the `out` directory and not this source .ts file.
+		const configPath = path.join(__dirname, '..', '..', '..', 'src', 'test', 'suite', 'json', '.remarkrc');
+		await parseWorkspaceConfigTest(configPath);
+	});
+
+	test('parseWorkspaceConfig(yaml)', async () => {
+		// The configPath looks overly convoluted since `__dirname` points to the directory of the resulting .js
+		// file inside the `out` directory and not this source .ts file.
+		const configPath = path.join(__dirname, '..', '..', '..', 'src', 'test', 'suite', 'yaml', '.remarkrc.yml');
+		await parseWorkspaceConfigTest(configPath);
 	});
 });

src/test/suite/yaml/.remarkrc.yml

@@ -0,0 +1,9 @@
+plugins:
+- first-heading
+- github
+settings:
+  closeAtx: true
+github:
+  repository: https://github.com/mrmlnc/vscode-remark
+first-heading:
+  heading: Hello, .remarkrc file!

src/utils/workspace.ts

@@ -2,6 +2,7 @@
 
 import * as vscode from 'vscode';
 import { fileRead } from './fs';
+import * as yaml from 'yaml';
 
 export async function getWorkspaceConfig() {
 	const files = await vscode.workspace.findFiles('**/*remarkrc*', '**/node_modules/**');
@@ -12,19 +13,30 @@ export async function parseWorkspaceConfig(files : vscode.Uri[]) {
 	if (files.length === 0) {
 		return null;
 	}
-	if (files[0].fsPath.endsWith('.js')) {
+
+	const fileName = files[0].fsPath;
+
+	if (fileName.endsWith('.js')) {
 		try {
 			return require(files[0].fsPath);
 		}
 		catch (err) {
+			console.error(err);
 			return 'SyntaxError';
 		}
 	}
+
 	const content = await fileRead(files[0].fsPath);
+
 	try {
+		if (fileName.endsWith('.yml') || fileName.endsWith('.yaml')) {
+			return yaml.parse(content);
+		}
+
 		return JSON.parse(content);
 	}
 	catch (err) {
+		console.error(err);
 		return 'SyntaxError';
 	}
 }

tsconfig.json

@@ -4,7 +4,8 @@
 		"target": "es6",
 		"outDir": "out",
 		"lib": [
-			"es6"
+			"es6",
+			"dom"
 		],
 		"sourceMap": true,
 		"rootDir": "src",