From 1cb1705f8e9b3e51433f044be83702fb19d02900 Mon Sep 17 00:00:00 2001 From: Ethan White Date: Thu, 12 Dec 2013 13:39:33 -0500 Subject: [PATCH 1/6] Added RMarkdown to the list of languages --- lib/linguist/languages.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index c737bec3..51be998c 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1340,6 +1340,14 @@ RHTML: group: HTML primary_extension: .rhtml +RMarkdown: + type: markup + lexer: Text only + wrap: true + primary_extension: .rmd + extensions: + - .Rmd + Racket: type: programming lexer: Racket From 107fee88599f40ee4a70e8f120ee5087aca69332 Mon Sep 17 00:00:00 2001 From: Haralan Dobrev Date: Sat, 14 Dec 2013 16:21:35 +0200 Subject: [PATCH 2/6] Add `.jshintrc` to JSON filenames JSHint tool for linting JavaScript uses `.jshintrc` configuration file. It is in JSON format. Example: https://github.com/jquery/jquery/blob/master/.jshintrc --- lib/linguist/languages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index c737bec3..f23c350f 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -782,6 +782,7 @@ JSON: - .sublime-settings - .sublime-workspace filenames: + - .jshintrc - composer.lock Jade: From c598c9717dab39b4cd878a5f5cc4090a8ab8a637 Mon Sep 17 00:00:00 2001 From: Ted Nyman Date: Sun, 15 Dec 2013 00:09:54 -0800 Subject: [PATCH 3/6] Add ace mode --- lib/linguist/languages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 58614302..b908048f 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1345,6 +1345,7 @@ RMarkdown: type: markup lexer: Text only wrap: true + ace_mode: markdown primary_extension: .rmd extensions: - .Rmd From 8ba773127c6a8a3d016bb05f8bcdc1a31d369b4c Mon Sep 17 00:00:00 2001 From: Ted Nyman Date: Sun, 15 Dec 2013 12:20:10 -0800 Subject: [PATCH 4/6] Drop incorrect interpeter Fixes 1.8.7 issues. cc @arfon --- lib/linguist/languages.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index b908048f..f0283f37 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1223,8 +1223,6 @@ Pod: ace_mode: perl wrap: true primary_extension: .pod - interpreters: - - perl PogoScript: type: programming From 8c9ba2214af57d3f8026788ec24895ba60e86a93 Mon Sep 17 00:00:00 2001 From: Ted Nyman Date: Sun, 15 Dec 2013 12:21:40 -0800 Subject: [PATCH 5/6] Bump to 2.10.5 --- github-linguist.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github-linguist.gemspec b/github-linguist.gemspec index 5168a011..9f6994ab 100644 --- a/github-linguist.gemspec +++ b/github-linguist.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'github-linguist' - s.version = '2.10.4' + s.version = '2.10.5' s.summary = "GitHub Language detection" s.authors = "GitHub" From 567408bc5eb333365e2014438d2ebb1f5b94900e Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Sun, 15 Dec 2013 19:52:15 -0800 Subject: [PATCH 6/6] Adding rmd example --- lib/linguist/samples.json | 28 +++++++++++++++++++++++++--- samples/RMarkdown/example.rmd | 10 ++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 samples/RMarkdown/example.rmd diff --git a/lib/linguist/samples.json b/lib/linguist/samples.json index 5b323a8b..143e0fc4 100644 --- a/lib/linguist/samples.json +++ b/lib/linguist/samples.json @@ -333,6 +333,9 @@ "Rebol": [ ".r" ], + "RMarkdown": [ + ".rmd" + ], "RobotFramework": [ ".robot" ], @@ -506,8 +509,8 @@ ".gemrc" ] }, - "tokens_total": 426850, - "languages_total": 498, + "tokens_total": 426869, + "languages_total": 499, "tokens": { "ABAP": { "*/**": 1, @@ -38524,6 +38527,23 @@ "func": 1, "print": 1 }, + "RMarkdown": { + "Some": 1, + "text.": 1, + "##": 1, + "A": 1, + "graphic": 1, + "in": 1, + "R": 1, + "{": 1, + "r": 1, + "}": 1, + "plot": 1, + "(": 3, + ")": 3, + "hist": 1, + "rnorm": 1 + }, "RobotFramework": { "***": 16, "Settings": 3, @@ -44856,6 +44876,7 @@ "Ragel in Ruby Host": 593, "RDoc": 279, "Rebol": 11, + "RMarkdown": 19, "RobotFramework": 483, "Ruby": 3862, "Rust": 3566, @@ -44990,6 +45011,7 @@ "Ragel in Ruby Host": 3, "RDoc": 1, "Rebol": 1, + "RMarkdown": 1, "RobotFramework": 3, "Ruby": 17, "Rust": 1, @@ -45025,5 +45047,5 @@ "Xtend": 2, "YAML": 1 }, - "md5": "47fe2f821dd0c55027348132eab3a3b8" + "md5": "8d40049b60f9c3a47eafac12ac2e9f8f" } \ No newline at end of file diff --git a/samples/RMarkdown/example.rmd b/samples/RMarkdown/example.rmd new file mode 100644 index 00000000..edd7c2d5 --- /dev/null +++ b/samples/RMarkdown/example.rmd @@ -0,0 +1,10 @@ +# An example RMarkdown + +Some text. + +## A graphic in R + +```{r} +plot(1:10) +hist(rnorm(10000)) +``` \ No newline at end of file