From 63f54bdf06a20c715c1161f551a8e5fe6e7b966a Mon Sep 17 00:00:00 2001 From: Oldes Date: Mon, 23 Mar 2015 10:43:39 +0100 Subject: [PATCH 1/7] Added grammar submodule for Red language --- .gitmodules | 3 +++ grammars.yml | 2 ++ lib/linguist/languages.yml | 2 +- vendor/grammars/Sublime-Red | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) create mode 160000 vendor/grammars/Sublime-Red diff --git a/.gitmodules b/.gitmodules index 29240331..9badd674 100644 --- a/.gitmodules +++ b/.gitmodules @@ -645,3 +645,6 @@ [submodule "vendor/grammars/perl.tmbundle"] path = vendor/grammars/perl.tmbundle url = https://github.com/textmate/perl.tmbundle +[submodule "vendor/grammars/Sublime-Red"] + path = vendor/grammars/Sublime-Red + url = https://github.com/Oldes/Sublime-Red diff --git a/grammars.yml b/grammars.yml index de69172a..ca828aa8 100644 --- a/grammars.yml +++ b/grammars.yml @@ -113,6 +113,8 @@ vendor/grammars/Sublime-QML: - source.qml vendor/grammars/Sublime-REBOL: - source.rebol +vendor/grammars/Sublime-Red: +- source.red vendor/grammars/Sublime-SQF-Language: - source.sqf vendor/grammars/Sublime-Text-2-OpenEdge-ABL: diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index b68baf2b..45802128 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -2637,7 +2637,7 @@ Red: - .reds aliases: - red/system - tm_scope: none + tm_scope: source.red ace_mode: text Redcode: diff --git a/vendor/grammars/Sublime-Red b/vendor/grammars/Sublime-Red new file mode 160000 index 00000000..4c84201c --- /dev/null +++ b/vendor/grammars/Sublime-Red @@ -0,0 +1 @@ +Subproject commit 4c84201cd2e25d4c2b714358110fae7488c65593 From cbaa3ca6f4ad98d6f5b7c91b855008c9006c7bc7 Mon Sep 17 00:00:00 2001 From: Oldes Date: Mon, 23 Mar 2015 11:38:07 +0100 Subject: [PATCH 2/7] Adding tm_scope for REBOL language and removing REBOL from LICENSE_WHITELIST as now is license available in the Sublime-REBOL project. --- lib/linguist/languages.yml | 1 + test/test_grammars.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index b68baf2b..b19519f1 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -2628,6 +2628,7 @@ Rebol: - .r3 - .rebol ace_mode: text + tm_scope: source.rebol Red: type: programming diff --git a/test/test_grammars.rb b/test/test_grammars.rb index c5fbee4e..88624ae8 100644 --- a/test/test_grammars.rb +++ b/test/test_grammars.rb @@ -13,7 +13,6 @@ class TestGrammars < Minitest::Test # These grammars have no license but have been grandfathered in. New grammars # must have a license that allows redistribution. "vendor/grammars/Sublime-Lasso", - "vendor/grammars/Sublime-REBOL", "vendor/grammars/x86-assembly-textmate-bundle" ].freeze From 0f6c2afbf6f678fb2abaa583a260dfcd1df38e66 Mon Sep 17 00:00:00 2001 From: Oldes Date: Mon, 23 Mar 2015 15:58:01 +0100 Subject: [PATCH 3/7] Sublime-REBOL submodule updated. --- vendor/grammars/Sublime-REBOL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/grammars/Sublime-REBOL b/vendor/grammars/Sublime-REBOL index 977ba9bb..102402f7 160000 --- a/vendor/grammars/Sublime-REBOL +++ b/vendor/grammars/Sublime-REBOL @@ -1 +1 @@ -Subproject commit 977ba9bb5881e4eec0f144f9f8dc23b0137cae00 +Subproject commit 102402f71aa3a7770b0c06c0183eff1be78e7280 From 76828c45c7509bc4780f42bc4fd40aa0785a06ba Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Sat, 21 Mar 2015 12:39:16 +0100 Subject: [PATCH 4/7] Fix Emacs modeline in DTrace sample. Apparently, the DTrace mode for Emacs is called dtrace-script: https://github.com/dotemacs/dtrace-script-mode --- lib/linguist/languages.yml | 2 ++ samples/DTrace/javascript-trace.d | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 7d89d65e..487ab648 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -711,6 +711,8 @@ DM: DTrace: type: programming + aliases: + - dtrace-script extensions: - .d interpreters: diff --git a/samples/DTrace/javascript-trace.d b/samples/DTrace/javascript-trace.d index 258c6cd2..0acbaa97 100644 --- a/samples/DTrace/javascript-trace.d +++ b/samples/DTrace/javascript-trace.d @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- Mode: dtrace-script; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * From 7df872eb7f5e0c7bfc527ae5124edb57c2507194 Mon Sep 17 00:00:00 2001 From: Andy Delcambre Date: Mon, 23 Mar 2015 14:33:03 -0600 Subject: [PATCH 5/7] Bump rugged to latest release --- github-linguist.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github-linguist.gemspec b/github-linguist.gemspec index 983db982..7cbc1c15 100644 --- a/github-linguist.gemspec +++ b/github-linguist.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.add_dependency 'charlock_holmes', '~> 0.7.3' s.add_dependency 'escape_utils', '~> 1.0.1' s.add_dependency 'mime-types', '>= 1.19' - s.add_dependency 'rugged', '~> 0.22.0b4' + s.add_dependency 'rugged', '~> 0.23.0b1' s.add_development_dependency 'minitest', '>= 5.0' s.add_development_dependency 'mocha' From 7c66301583f9ba46a9e3bcc633fc92d6d1293088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Tue, 24 Mar 2015 01:32:24 -0700 Subject: [PATCH 6/7] .storyboard and .xib as XML --- lib/linguist/languages.yml | 2 ++ samples/XML/Application.xib | 20 ++++++++++++++++++++ samples/XML/Storyboard.storyboard | 7 +++++++ 3 files changed, 29 insertions(+) create mode 100644 samples/XML/Application.xib create mode 100644 samples/XML/Storyboard.storyboard diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 487ab648..d0907629 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -3311,6 +3311,7 @@ XML: - .rss - .scxml - .srdf + - .storyboard - .stTheme - .sublime-snippet - .targets @@ -3334,6 +3335,7 @@ XML: - .x3d - .xacro - .xaml + - .xib - .xlf - .xliff - .xmi diff --git a/samples/XML/Application.xib b/samples/XML/Application.xib new file mode 100644 index 00000000..6c2e5f4d --- /dev/null +++ b/samples/XML/Application.xib @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/samples/XML/Storyboard.storyboard b/samples/XML/Storyboard.storyboard new file mode 100644 index 00000000..673e0f7e --- /dev/null +++ b/samples/XML/Storyboard.storyboard @@ -0,0 +1,7 @@ + + + + + + + From aa7aae7808a88478c224c4fa5bb54b47e504edaa Mon Sep 17 00:00:00 2001 From: Ben Draut Date: Tue, 24 Mar 2015 08:22:00 -0600 Subject: [PATCH 7/7] Fix categorization for Racket shell scripts. The current implementation categorizes shell scripts written in Racket as Scheme, which is incorrect. For example: ```racket \#!/usr/bin/env racket \#lang racket "Hello World!" ``` This should be categorized as Racket, not Scheme. [This file][1] demonstrates the problem in an existing repository. [1]: https://github.com/drautb/sketchbook/blob/master/racket/sublime-project-generator/generate-sublime-project.rkt --- lib/linguist/languages.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 487ab648..b6d98e02 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -2596,6 +2596,8 @@ Racket: - .rktd - .rktl - .scrbl + interpreters: + - racket tm_scope: source.racket ace_mode: lisp @@ -2850,7 +2852,6 @@ Scheme: - .ss interpreters: - guile - - racket - bigloo - chicken ace_mode: scheme