Merge branch 'dev'

Author: banacorn

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.4
+* Fix judgement parsing (#23)
+* Fix plain text message won't display
+
 ## 0.6.3
 * Fix judgement parsing (#23)
 * Introduce dev-mode-only monitor (for debugging)

lib/parser/view.js

@@ -46,7 +46,7 @@ function divideContent(lines: string[]): {
 function concatItems(lines: string[]): string[] {
 
 
-    function isNewLine(line: string): boolean {
+    function isNewLine({ line, nextLine, index }): boolean {
         //      Goal: Banana
         const goal = /^Goal\: \S*/;
 
@@ -64,20 +64,24 @@ function concatItems(lines: string[]): string[] {
         //      banananananananananananananananana
         //          : Banana
         const reallyLongTermIdentifier = /^\S+$/;
+        const restOfTheJudgement = /^\s*\:\s* \S*$/;
 
         return goal.test(line)
         || have.test(line)
         || sort.test(line)
-        || reallyLongTermIdentifier.test(line)
+        || reallyLongTermIdentifier.test(line) && (nextLine && restOfTheJudgement.test(nextLine))
         || completeJudgement.test(line)
     }
 
 
     const newLineIndices = lines.map((line, index) => {
-            // console.log(isNewLine(line), line)
-            return { line, index }
+            return {
+                line: line,
+                nextLine: lines[index + 1],
+                index: index
+            }
         })
-        .filter(pair => isNewLine(pair.line))
+        .filter(obj => isNewLine(obj))
         .map(pair => pair.index)
 
     const aggregatedLines = newLineIndices.map((index, i) => {

lib/view.js

@@ -247,15 +247,20 @@ export default class View {
 
         if (type === V.Style.Info || type === V.Style.Success) {
             const { banner, body } = parseContent(payload);
-            const grouped = _.groupBy(body, 'judgementForm');
-            this.store.dispatch(updateBanner(banner));
-            this.store.dispatch(updateBody({
-                goal: (grouped['goal'] || []) as V.Goal[],
-                judgement: (grouped['type judgement'] || []) as V.Judgement[],
-                term: (grouped['term'] || []) as V.Term[],
-                meta: (grouped['meta'] || []) as V.Meta[],
-                sort: (grouped['sort'] || []) as V.Sort[]
-            }));
+            // if parseContent failed, fallback to displaying plain text
+            if (_.isEmpty(banner) && _.isEmpty(body)) {
+                this.store.dispatch(updatePlainText(payload.join('\n')));
+            } else {
+                const grouped = _.groupBy(body, 'judgementForm');
+                this.store.dispatch(updateBanner(banner));
+                this.store.dispatch(updateBody({
+                    goal: (grouped['goal'] || []) as V.Goal[],
+                    judgement: (grouped['type judgement'] || []) as V.Judgement[],
+                    term: (grouped['term'] || []) as V.Term[],
+                    meta: (grouped['meta'] || []) as V.Meta[],
+                    sort: (grouped['sort'] || []) as V.Sort[]
+                }));
+            }
         } else if (type === V.Style.Error) {
             const error = parseError(payload.join('\n'));
             this.store.dispatch(updateError(error));