Merge branch 'master' of git://github.com/github/linguist into detect-sbt-as-scala-lang

test/fixtures/drupal.module

@@ -0,0 +1,140 @@
+<?php
+
+/**
+ * @file
+ * Additional filter for PHP input.
+ */
+
+/**
+ * Implements hook_help().
+ */
+function php_help($path, $arg) {
+  switch ($path) {
+    case 'admin/help#php':
+      $output = '';
+      $output .= '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('The PHP filter module adds a PHP filter to your site, for use with <a href="@filter">text formats</a>. This filter adds the ability to execute PHP code in any text field that uses a text format (such as the body of a content item or the text of a comment). <a href="@php-net">PHP</a> is a general-purpose scripting language widely-used for web development, and is the language with which Drupal has been developed. For more information, see the online handbook entry for the <a href="@php">PHP filter module</a>.', array('@filter' => url('admin/help/filter'), '@php-net' => 'http://www.php.net', '@php' => 'http://drupal.org/handbook/modules/php/')) . '</p>';
+      $output .= '<h3>' . t('Uses') . '</h3>';
+      $output .= '<dl>';
+      $output .= '<dt>' . t('Enabling execution of PHP in text fields') . '</dt>';
+      $output .= '<dd>' . t('The PHP filter module allows users with the proper permissions to include custom PHP code that will get executed when pages of your site are processed. While this is a powerful and flexible feature if used by a trusted user with PHP experience, it is a significant and dangerous security risk in the hands of a malicious or inexperienced user. Even a trusted user may accidentally compromise the site by entering malformed or incorrect PHP code. Only the most trusted users should be granted permission to use the PHP filter, and all PHP code added through the PHP filter should be carefully examined before use. <a href="@php-snippets">Example PHP snippets</a> can be found on Drupal.org.', array('@php-snippets' => url('http://drupal.org/handbook/customization/php-snippets'))) . '</dd>';
+      $output .= '</dl>';
+      return $output;
+  }
+}
+
+/**
+ * Implements hook_permission().
+ */
+function php_permission() {
+  return array(
+    'use PHP for settings' => array(
+      'title' => t('Use PHP for settings'),
+      'restrict access' => TRUE,
+    ),
+  );
+}
+
+/**
+ * Evaluate a string of PHP code.
+ *
+ * This is a wrapper around PHP's eval(). It uses output buffering to capture both
+ * returned and printed text. Unlike eval(), we require code to be surrounded by
+ * <?php ?> tags; in other words, we evaluate the code as if it were a stand-alone
+ * PHP file.
+ *
+ * Using this wrapper also ensures that the PHP code which is evaluated can not
+ * overwrite any variables in the calling code, unlike a regular eval() call.
+ *
+ * @param $code
+ *   The code to evaluate.
+ * @return
+ *   A string containing the printed output of the code, followed by the returned
+ *   output of the code.
+ *
+ * @ingroup php_wrappers
+ */
+function php_eval($code) {
+  global $theme_path, $theme_info, $conf;
+
+  // Store current theme path.
+  $old_theme_path = $theme_path;
+
+  // Restore theme_path to the theme, as long as php_eval() executes,
+  // so code evaluated will not see the caller module as the current theme.
+  // If theme info is not initialized get the path from theme_default.
+  if (!isset($theme_info)) {
+    $theme_path = drupal_get_path('theme', $conf['theme_default']);
+  }
+  else {
+    $theme_path = dirname($theme_info->filename);
+  }
+
+  ob_start();
+  print eval('?>' . $code);
+  $output = ob_get_contents();
+  ob_end_clean();
+
+  // Recover original theme path.
+  $theme_path = $old_theme_path;
+
+  return $output;
+}
+
+/**
+ * Tips callback for php filter.
+ */
+function _php_filter_tips($filter, $format, $long = FALSE) {
+  global $base_url;
+  if ($long) {
+    $output = '<h4>' . t('Using custom PHP code') . '</h4>';
+    $output .= '<p>' . t('Custom PHP code may be embedded in some types of site content, including posts and blocks. While embedding PHP code inside a post or block is a powerful and flexible feature when used by a trusted user with PHP experience, it is a significant and dangerous security risk when used improperly. Even a small mistake when posting PHP code may accidentally compromise your site.') . '</p>';
+    $output .= '<p>' . t('If you are unfamiliar with PHP, SQL, or Drupal, avoid using custom PHP code within posts. Experimenting with PHP may corrupt your database, render your site inoperable, or significantly compromise security.') . '</p>';
+    $output .= '<p>' . t('Notes:') . '</p>';
+    $output .= '<ul><li>' . t('Remember to double-check each line for syntax and logic errors <strong>before</strong> saving.') . '</li>';
+    $output .= '<li>' . t('Statements must be correctly terminated with semicolons.') . '</li>';
+    $output .= '<li>' . t('Global variables used within your PHP code retain their values after your script executes.') . '</li>';
+    $output .= '<li>' . t('<code>register_globals</code> is <strong>turned off</strong>. If you need to use forms, understand and use the functions in <a href="@formapi">the Drupal Form API</a>.', array('@formapi' => url('http://api.drupal.org/api/group/form_api/7'))) . '</li>';
+    $output .= '<li>' . t('Use a <code>print</code> or <code>return</code> statement in your code to output content.') . '</li>';
+    $output .= '<li>' . t('Develop and test your PHP code using a separate test script and sample database before deploying on a production site.') . '</li>';
+    $output .= '<li>' . t('Consider including your custom PHP code within a site-specific module or <code>template.php</code> file rather than embedding it directly into a post or block.') . '</li>';
+    $output .= '<li>' . t('Be aware that the ability to embed PHP code within content is provided by the PHP Filter module. If this module is disabled or deleted, then blocks and posts with embedded PHP may display, rather than execute, the PHP code.') . '</li></ul>';
+    $output .= '<p>' . t('A basic example: <em>Creating a "Welcome" block that greets visitors with a simple message.</em>') . '</p>';
+    $output .= '<ul><li>' . t('<p>Add a custom block to your site, named "Welcome" . With its text format set to "PHP code" (or another format supporting PHP input), add the following in the Block body:</p>
+<pre>
+print t(\'Welcome visitor! Thank you for visiting.\');
+</pre>') . '</li>';
+    $output .= '<li>' . t('<p>To display the name of a registered user, use this instead:</p>
+<pre>
+global $user;
+if ($user->uid) {
+  print t(\'Welcome @name! Thank you for visiting.\', array(\'@name\' => format_username($user)));
+}
+else {
+  print t(\'Welcome visitor! Thank you for visiting.\');
+}
+</pre>') . '</li></ul>';
+    $output .= '<p>' . t('<a href="@drupal">Drupal.org</a> offers <a href="@php-snippets">some example PHP snippets</a>, or you can create your own with some PHP experience and knowledge of the Drupal system.', array('@drupal' => url('http://drupal.org'), '@php-snippets' => url('http://drupal.org/handbook/customization/php-snippets'))) . '</p>';
+    return $output;
+  }
+  else {
+    return t('You may post PHP code. You should include &lt;?php ?&gt; tags.');
+  }
+}
+
+/**
+ * Implements hook_filter_info().
+ *
+ * Provide PHP code filter. Use with care.
+ */
+function php_filter_info() {
+  $filters['php_code'] = array(
+    'title' => t('PHP evaluator'),
+    'description' => t('Executes a piece of PHP code. The usage of this filter should be restricted to administrators only!'),
+    'process callback' => 'php_eval',
+    'tips callback' => '_php_filter_tips',
+    'cache' => FALSE,
+  );
+  return $filters;
+}
+

test/fixtures/matlab_function.m

@@ -0,0 +1,9 @@
+function ret = matlab_function(A,B)
+% Simple function adding two values and displaying the return value
+
+ret = A+B;
+% Display the return value
+disp('Return value in function');
+disp(ret);
+
+

test/fixtures/matlab_script.m

@@ -0,0 +1,12 @@
+% Matlab example script
+
+%Call matlab_function function which resides in the same directory
+
+value1 = 5 % semicolon at end of line is not mandatory, only suppresses output to command line.
+value2 = 3
+
+% Calculate sum of value1 and value2
+result = matlab_function(value1,value2);
+
+disp('called from script')
+disp(result);

test/fixtures/test-perl.pl

@@ -0,0 +1,2 @@
+#!/usr/bin/perl
+print "Hello, world!\n";

test/fixtures/test-perl2.pl

@@ -0,0 +1,3 @@
+
+# Perl file without shebang
+print "Hello, world!\n";

test/fixtures/test-prolog.pl

@@ -0,0 +1,12 @@
+/* Prolog test file */
+male(john).
+male(peter).
+
+female(vick).
+female(christie).
+
+parents(john, peter, christie).
+parents(vick, peter, christie).
+
+/* X is a brother of Y */
+brother(X, Y) :- male(X), parents(X, F, M), parents(Y, F, M).

test/test_blob.rb

@@ -230,6 +230,17 @@ class TestBlob < Test::Unit::TestCase
     assert_equal Language['Ruby'],        blob("wrong_shebang.rb").language
     assert_nil blob("octocat.png").language
 
+    # .pl disambiguation
+    assert_equal Language['Prolog'],      blob("test-prolog.pl").language
+    assert_equal Language['Perl'],        blob("test-perl.pl").language
+    assert_equal Language['Perl'],        blob("test-perl2.pl").language
+
+    # .m disambiguation
+    assert_equal Language['Objective-C'], blob("Foo.m").language
+    assert_equal Language['Objective-C'], blob("hello.m").language
+    assert_equal Language['Matlab'], blob("matlab_function.m").language
+    assert_equal Language['Matlab'], blob("matlab_script.m").language
+
     # .r disambiguation
     assert_equal Language['R'],           blob("hello-r.R").language
     assert_equal Language['Rebol'],       blob("hello-rebol.r").language
@@ -275,6 +286,9 @@ class TestBlob < Test::Unit::TestCase
 
     # http://docs.racket-lang.org/scribble/
     assert_equal Language['Racket'], blob("scribble.scrbl").language
+
+    # https://github.com/drupal/drupal/blob/7.x/modules/php/php.module
+    assert_equal Language['PHP'], blob("drupal.module").language
   end
 
   def test_lexer

test/test_language.rb

@@ -5,6 +5,20 @@ require 'test/unit'
 class TestLanguage < Test::Unit::TestCase
   include Linguist
 
+  def test_ambiguous_extensions
+    assert Language.ambiguous?('.h')
+    assert_equal Language['C'], Language.find_by_extension('h')
+
+    assert Language.ambiguous?('.m')
+    assert_equal Language['Objective-C'], Language.find_by_extension('m')
+
+    assert Language.ambiguous?('.pl')
+    assert_equal Language['Perl'], Language.find_by_extension('pl')
+
+    assert Language.ambiguous?('.r')
+    assert_equal Language['R'], Language.find_by_extension('r')
+  end
+
   def test_lexer
     # Add an assertion to this list if you add/change any lexers
     # in languages.yml. Please keep this list alphabetized.
@@ -81,6 +95,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Lexer['Ooc'], Language['ooc'].lexer
     assert_equal Lexer['PHP'], Language['PHP'].lexer
     assert_equal Lexer['Perl'], Language['Perl'].lexer
+    assert_equal Lexer['Prolog'], Language['Prolog'].lexer
     assert_equal Lexer['Python Traceback'], Language['Python traceback'].lexer
     assert_equal Lexer['Python'], Language['Python'].lexer
     assert_equal Lexer['REBOL'], Language['Rebol'].lexer
@@ -198,23 +213,18 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Language['reStructuredText'], Language.find_by_alias('rst')
   end
 
-  def test_major_groups
-    Language.all.each do |language|
-      if language.major?
-        assert_equal language, language.group
-      end
-    end
-  end
-
   def test_groups
     assert_equal Language['Assembly'], Language['GAS'].group
     assert_equal Language['C'], Language['OpenCL'].group
     assert_equal Language['Haskell'], Language['Literate Haskell'].group
     assert_equal Language['Java'], Language['Java Server Pages'].group
     assert_equal Language['JavaScript'], Language['JSON'].group
+    assert_equal Language['Perl'], Language['Perl'].group
     assert_equal Language['Python'], Language['Cython'].group
     assert_equal Language['Python'], Language['NumPy'].group
     assert_equal Language['Python'], Language['Python traceback'].group
+    assert_equal Language['Python'], Language['Python'].group
+    assert_equal Language['Ruby'], Language['Ruby'].group
     assert_equal Language['Shell'], Language['Batchfile'].group
     assert_equal Language['Shell'], Language['Gentoo Ebuild'].group
     assert_equal Language['Shell'], Language['Gentoo Eclass'].group
@@ -270,71 +280,21 @@ class TestLanguage < Test::Unit::TestCase
     assert Language['Brainfuck'].unpopular?
   end
 
-  def test_major
-    # Add an assertion to this list if you add/change any major
-    # settings in languages.yml. Please keep this list alphabetized.
-    assert Language['ASP'].major?
-    assert Language['ActionScript'].major?
-    assert Language['Ada'].major?
-    assert Language['Arc'].major?
-    assert Language['Assembly'].major?
-    assert Language['Boo'].major?
-    assert Language['C#'].major?
-    assert Language['C'].major?
-    assert Language['C++'].major?
-    assert Language['Clojure'].major?
-    assert Language['CoffeeScript'].major?
-    assert Language['ColdFusion'].major?
-    assert Language['Common Lisp'].major?
-    assert Language['D'].major?
-    assert Language['Delphi'].major?
-    assert Language['Dylan'].major?
-    assert Language['Eiffel'].major?
-    assert Language['Emacs Lisp'].major?
-    assert Language['Erlang'].major?
-    assert Language['F#'].major?
-    assert Language['FORTRAN'].major?
-    assert Language['Factor'].major?
-    assert Language['Go'].major?
-    assert Language['Groovy'].major?
-    assert Language['HaXe'].major?
-    assert Language['Haskell'].major?
-    assert Language['Io'].major?
-    assert Language['Java'].major?
-    assert Language['JavaScript'].major?
-    assert Language['Lua'].major?
-    assert Language['Max/MSP'].major?
-    assert Language['Nu'].major?
-    assert Language['OCaml'].major?
-    assert Language['Objective-C'].major?
-    assert Language['Objective-J'].major?
-    assert Language['PHP'].major?
-    assert Language['Perl'].major?
-    assert Language['Pure Data'].major?
-    assert Language['Python'].major?
-    assert Language['R'].major?
-    assert Language['Racket'].major?
-    assert Language['Ruby'].major?
-    assert Language['Scala'].major?
-    assert Language['Scheme'].major?
-    assert Language['Self'].major?
-    assert Language['Smalltalk'].major?
-    assert Language['SuperCollider'].major?
-    assert Language['Tcl'].major?
-    assert Language['VHDL'].major?
-    assert Language['Vala'].major?
-    assert Language['Verilog'].major?
-    assert Language['VimL'].major?
-    assert Language['Visual Basic'].major?
-    assert Language['XQuery'].major?
-    assert Language['ooc'].major?
+  def test_programming
+    assert_equal :programming, Language['JavaScript'].type
+    assert_equal :programming, Language['Perl'].type
+    assert_equal :programming, Language['Python'].type
+    assert_equal :programming, Language['Ruby'].type
   end
 
-  def test_minor
-    assert Language['Brainfuck'].minor?
-    assert Language['HTML'].minor?
-    assert Language['Makefile'].minor?
-    assert Language['YAML'].minor?
+  def test_markup
+    assert_equal :markup, Language['HTML'].type
+    assert_equal :markup, Language['YAML'].type
+  end
+
+  def test_other
+    assert_nil Language['Brainfuck'].type
+    assert_nil Language['Makefile'].type
   end
 
   def test_searchable
@@ -381,7 +341,9 @@ class TestLanguage < Test::Unit::TestCase
   def test_find_all_by_extension
     Language.all.each do |language|
       language.extensions.each do |extension|
-        assert_equal language, Language.find_by_extension(extension)
+        unless Language.ambiguous?(extension)
+          assert_equal language, Language.find_by_extension(extension)
+        end
       end
     end
   end
@@ -457,6 +419,16 @@ Hello
       assert_equal <<-HTML, Language['Ruby'].colorize_without_wrapper("def foo\n  'foo'\nend\n")
 <span class="k">def</span> <span class="nf">foo</span>
   <span class="s1">&#39;foo&#39;</span>
+<span class="k">end</span>
+      HTML
+    end
+
+    def test_colorize_doesnt_strip_newlines
+      assert_equal <<-HTML, Language['Ruby'].colorize_without_wrapper("\n\n# Foo\ndef 'foo'\nend\n")
+
+
+<span class="c1"># Foo</span>
+<span class="k">def</span> <span class="s1">&#39;foo&#39;</span>
 <span class="k">end</span>
       HTML
     end