Merge branch 'develop' into master

misskey-dev · Jun 12, 2021 · fcd1632 · fcd1632
2 parents 2926855 + de03976
commit fcd1632
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/docs/syntax.md b/docs/syntax.md
@@ -53,6 +53,7 @@
 - `>`の後に続く0～1文字のスペースを無視する。
 - 隣接する引用の行は一つになる。
 - 複数行の引用では空行も含めることができる。
+- 引用の後ろにある空行は無視される。([#61](https://github.com/misskey-dev/mfm.js/issues/61))
 
 
 

diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "mfm-js",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "An MFM parser implementation with PEG.js",
   "main": "./built/index.js",
   "types": "./built/index.d.ts",
   "scripts": {
     "build": "npm run tsc && npm run peg",
     "build-debug": "npm run tsc && npm run peg-debug",
-    "peg": "peggy --cache -o built/parser.js --allowed-start-rules fullParser,inlineParser,plainParser src/parser.pegjs",
-    "peg-debug": "peggy --cache -o built/parser.js --allowed-start-rules fullParser,inlineParser,plainParser --trace src/parser.pegjs",
+    "peg": "peggy --cache -o built/internal/parser.js --allowed-start-rules fullParser,inlineParser,plainParser src/internal/parser.pegjs",
+    "peg-debug": "peggy --cache -o built/internal/parser.js --allowed-start-rules fullParser,inlineParser,plainParser --trace src/internal/parser.pegjs",
     "tsc": "tsc",
     "tsd": "tsd",
     "parse": "node ./built/cli/parse",

diff --git a/src/api.ts b/src/api.ts
@@ -1,8 +1,8 @@
 import peg from 'peggy';
 import { MfmNode, MfmPlainNode } from './node';
-import { stringifyNode, stringifyTree, inspectOne } from './util';
+import { stringifyNode, stringifyTree, inspectOne } from './internal/util';
 
-const parser: peg.Parser = require('./parser');
+const parser: peg.Parser = require('./internal/parser');
 
 /**
  * Generates a MfmNode tree from the MFM string.

diff --git a/src/parser.pegjs → src/internal/parser.pegjs b/src/parser.pegjs → src/internal/parser.pegjs
@@ -22,7 +22,7 @@
 		LINK,
 		FN,
 		TEXT
-	} = require('./node');
+	} = require('../node');
 
 	const {
 		mergeText,
@@ -128,7 +128,7 @@ plain
 // block: quote
 
 quote
-	= &(BEGIN ">") q:quoteInner { return q; }
+	= &(BEGIN ">") q:quoteInner LF? { return q; }
 
 quoteInner
 	= head:quoteMultiLine tails:quoteMultiLine+

diff --git a/src/util.ts → src/internal/util.ts b/src/util.ts → src/internal/util.ts
@@ -1,4 +1,4 @@
-import { isMfmBlock, MfmNode, TEXT } from './node';
+import { isMfmBlock, MfmNode, TEXT } from '../node';
 
 export function mergeText(nodes: (MfmNode | string)[]): MfmNode[] {
 	const dest: MfmNode[] = [];

diff --git a/test/parser.ts b/test/parser.ts
@@ -129,6 +129,20 @@ describe('FullParser', () => {
 			];
 			assert.deepStrictEqual(mfm.parse(input), output);
 		});
+		it('引用ブロックの後ろの空行は無視される', () => {
+			const input = `
+> foo
+> bar
+
+hoge`;
+			const output = [
+				QUOTE([
+					TEXT('foo\nbar')
+				]),
+				TEXT('hoge')
+			];
+			assert.deepStrictEqual(mfm.parse(input), output);
+		});
 	});
 
 	describe('search', () => {