KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-12-29 13:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore old mode

Browse Source
This commit is contained in:
Joshua Peek
2016-09-23 14:35:02 -07:00
parent daefff86ff
commit 0108ef4386
3 changed files with 414 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/linguist/language.rb
View File

@@ -302,6 +302,7 @@ module Linguist
@ace_mode = attributes[:ace_mode] @ace_mode = attributes[:ace_mode]
@codemirror_mode = attributes[:codemirror_mode] @codemirror_mode = attributes[:codemirror_mode]
@codemirror_mime_mode = attributes[:codemirror_mime_mode]
@wrap = attributes[:wrap] || false @wrap = attributes[:wrap] || false
# Set legacy search term # Set legacy search term
@@ -399,7 +400,18 @@ module Linguist
# Returns a String name or nil # Returns a String name or nil
attr_reader :ace_mode attr_reader :ace_mode
# Public: Get CodeMirror mode (as expressed by a mimetype) # Public: Get CodeMirror mode
#
# Examples
#
# # => "nil"
# # => "javascript"
# # => "clike"
#
# Returns a String name or nil
attr_reader :codemirror_mode
# Public: Get CodeMirror MIME type mode
# #
# Examples # Examples
# #
@@ -408,7 +420,7 @@ module Linguist
# # => "text/x-csrc" # # => "text/x-csrc"
# #
# Returns a String name or nil # Returns a String name or nil
attr_reader :codemirror_mode attr_reader :codemirror_mime_mode
# Public: Should language lines be wrapped # Public: Should language lines be wrapped
# #
@@ -587,6 +599,7 @@ module Linguist
:tm_scope => options['tm_scope'], :tm_scope => options['tm_scope'],
:ace_mode => options['ace_mode'], :ace_mode => options['ace_mode'],
:codemirror_mode => options['codemirror_mode'], :codemirror_mode => options['codemirror_mode'],
:codemirror_mime_mode => options['codemirror_mime_mode'],
:wrap => options['wrap'], :wrap => options['wrap'],
:group_name => options['group'], :group_name => options['group'],
:searchable => options.fetch('searchable', true), :searchable => options.fetch('searchable', true),

581
lib/linguist/languages.yml
View File

File diff suppressed because it is too large Load Diff

12
test/test_language.rb
View File

@@ -352,7 +352,17 @@ class TestLanguage < Minitest::Test
end end
def test_codemirror_mode def test_codemirror_mode
assert_equal 'text/x-c++src', Language['C++'].codemirror_mode assert_equal 'ruby', Language['Ruby'].codemirror_mode
assert_equal 'javascript', Language['JavaScript'].codemirror_mode
assert_equal 'clike', Language['C'].codemirror_mode
assert_equal 'clike', Language['C++'].codemirror_mode
end
def test_codemirror_mime_mode
assert_equal 'text/x-ruby', Language['Ruby'].codemirror_mime_mode
assert_equal 'text/javascript', Language['JavaScript'].codemirror_mime_mode
assert_equal 'text/x-csrc', Language['C'].codemirror_mime_mode
assert_equal 'text/x-c++src', Language['C++'].codemirror_mime_mode
end end
def test_wrap def test_wrap