fixed bug about highlighting keywords which are actually just . accessed properties

getify · getify · commit 14a3b27f0c46 · 2013-08-28T10:55:11.000-05:00
diff --git a/syntaxur/syntaxur.js b/syntaxur/syntaxur.js
@@ -35,7 +35,7 @@
 			var segs = [], unmatched, left_context,
 				next_match_idx = 0, prev_match_idx = 0
 			;
-			
+
 			while (next_match_idx < code.length) {
 				unmatched = "";
 
@@ -76,7 +76,7 @@
 					}
 					else if (
 						match[0].match(/function|return|var|let|const|for|while|do|if|else|try|catch|finally|throw|break|continue|switch|case|default|delete|debugger|in|instanceof|new|this|typeof|void|with|class|export|import|extends|super|yield/) &&
-						!left_context.match(/\.$/)
+						!left_context.match(/\.\s*$/)
 					) {
 						segs.push({
 							type: SEGMENT_KEYWORD,
@@ -108,8 +108,7 @@
 
 				segs = split(seg.val);
 				if (segs.length > 0) {
-					segs.unshift(i,1); // add splice arguments onto front of array
-					segments.splice.apply(segments,segs);
+					segments.splice.apply([i,1].concat(segments),segs);
 					i += segs.length - 2;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`var segs = [], unmatched, left_context,`
`36`	`36`	`next_match_idx = 0, prev_match_idx = 0`
`37`	`37`	`;`
`38`		`-`
	`38`	`+`
`39`	`39`	`while (next_match_idx < code.length) {`
`40`	`40`	`unmatched = "";`
`41`	`41`
`@@ -76,7 +76,7 @@`
`76`	`76`	`}`
`77`	`77`	`else if (`
`78`	`78`	`match[0].match(/function\|return\|var\|let\|const\|for\|while\|do\|if\|else\|try\|catch\|finally\|throw\|break\|continue\|switch\|case\|default\|delete\|debugger\|in\|instanceof\|new\|this\|typeof\|void\|with\|class\|export\|import\|extends\|super\|yield/) &&`
`79`		`- !left_context.match(/\.$/)`
	`79`	`+ !left_context.match(/\.\s*$/)`
`80`	`80`	`) {`
`81`	`81`	`segs.push({`
`82`	`82`	`type: SEGMENT_KEYWORD,`
`@@ -108,8 +108,7 @@`
`108`	`108`
`109`	`109`	`segs = split(seg.val);`
`110`	`110`	`if (segs.length > 0) {`
`111`		`- segs.unshift(i,1); // add splice arguments onto front of array`
`112`		`- segments.splice.apply(segments,segs);`
	`111`	`+ segments.splice.apply([i,1].concat(segments),segs);`
`113`	`112`	`i += segs.length - 2;`
`114`	`113`	`}`
`115`	`114`	`}`