From 2b84f4bd4d97fad818ec377cca9a4c6f73c94309 Mon Sep 17 00:00:00 2001 From: Alec Thomas Date: Mon, 15 Jul 2019 20:35:09 +1000 Subject: [PATCH] Sync R lexer with Pygments. Fixes #260. --- lexers/j/javascript.go | 9 +++--- lexers/r/r.go | 10 ++----- lexers/testdata/r.actual | 7 +++++ lexers/testdata/r.expected | 58 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 lexers/testdata/r.actual create mode 100644 lexers/testdata/r.expected diff --git a/lexers/j/javascript.go b/lexers/j/javascript.go index 6291e33..282501d 100644 --- a/lexers/j/javascript.go +++ b/lexers/j/javascript.go @@ -5,6 +5,7 @@ import ( "github.com/alecthomas/chroma/lexers/internal" ) +// Javascript lexer. var JavascriptRules = Rules{ "commentsandwhitespace": { {`\s+`, Text, nil}, @@ -23,6 +24,7 @@ var JavascriptRules = Rules{ }, "root": { {`\A#! ?/.*?\n`, CommentHashbang, nil}, + {`^(?=\s|/|