From df5a8768ece9801c08dfcca3e690f296de8f3df6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 9 Feb 2017 20:13:44 +0900
Subject: [PATCH] =?UTF-8?q?=E5=A4=89=E6=95=B0=E3=82=B5=E3=83=9D=E3=83=BC?=
 =?UTF-8?q?=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/text/elements/code.js | 67 ++++++++++++++++++++++++++++----
 src/web/app/base.styl            |  5 +++
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/src/common/text/elements/code.js b/src/common/text/elements/code.js
index 190a090d9..e55b11c23 100644
--- a/src/common/text/elements/code.js
+++ b/src/common/text/elements/code.js
@@ -80,6 +80,14 @@ const symbols = [
 	'~'
 ];
 
+// 変数宣言
+const varDef = [
+	'var',
+	'const',
+	'let',
+	'mut'
+];
+
 const elements = [
 	// comment
 	code => {
@@ -122,6 +130,45 @@ const elements = [
 		}
 	},
 
+	// extract vars
+	(code, i, source, vars) => {
+		const prev = source[i - 1];
+		if (prev && /[a-zA-Z]/.test(prev)) return null;
+
+		const match = varDef.filter(v => code.substr(0, v.length + 1) == v + ' ')[0];
+
+		if (match) {
+			const bar = code.substr(match.length + 1).match(/^[a-zA-Z0-9_-]+/);
+			if (bar) {
+				if (!keywords.some(k => k == bar)) {
+					console.log(bar[0]);
+					vars.push(bar[0]);
+				}
+			}
+		}
+
+		return null;
+	},
+
+	// vars
+	(code, i, source, vars) => {
+		const prev = source[i - 1];
+		if (prev && /[a-zA-Z]/.test(prev)) return null;
+
+		const match = vars.sort((a, b) => b.length - a.length)
+			.filter(v => code.substr(0, v.length) == v)[0];
+
+		if (match) {
+			if (/^[a-zA-Z]/.test(code.substr(match.length))) return null;
+			return {
+				html: `<span class="var">${match}</span>`,
+				next: match.length
+			};
+		} else {
+			return null;
+		}
+	},
+
 	// number
 	(code, i, source) => {
 		const prev = source[i - 1];
@@ -139,7 +186,10 @@ const elements = [
 	},
 
 	// keyword
-	code => {
+	(code, i, source) => {
+		const prev = source[i - 1];
+		if (prev && /[a-zA-Z]/.test(prev)) return null;
+
 		const match = keywords.filter(k => code.substr(0, k.length) == k)[0];
 		if (match) {
 			if (/^[a-zA-Z]/.test(code.substr(match.length))) return null;
@@ -171,16 +221,19 @@ function genHtml(source, lang) {
 	let code = source;
 	let html = '';
 
-	function push(token) {
-		html += token.html;
-		code = code.substr(token.next);
-	}
+	let vars = [];
 
 	let i = 0;
 
+	function push(token) {
+		html += token.html;
+		code = code.substr(token.next);
+		i += token.next;
+	}
+
 	while (code != '') {
 		const parsed = elements.some(el => {
-			const e = el(code, i, source);
+			const e = el(code, i, source, vars);
 			if (e) {
 				push(e);
 				return true;
@@ -193,8 +246,6 @@ function genHtml(source, lang) {
 				next: 1
 			});
 		}
-
-		i++;
 	}
 
 	return html;
diff --git a/src/web/app/base.styl b/src/web/app/base.styl
index 4082fa24c..30ff7133d 100644
--- a/src/web/app/base.styl
+++ b/src/web/app/base.styl
@@ -130,6 +130,11 @@ pre > code
 	.number
 		color #ae81ff
 
+	.var:not(.keyword)
+		font-weight bold
+		font-style italic
+		//text-decoration underline
+
 mk-locker
 	display block
 	position fixed