Merge branch 'master' into no-language

Conflicts:
	lib/linguist/heuristics.rb

CONTRIBUTING.md

@@ -10,7 +10,7 @@ This can usually be solved either by adding a new filename or file name extensio
 
 ### Syntax highlighting looks wrong
 
-Assuming your code is being detected as the right language (see above), in most cases this is due to a bug in the language grammar rather than a bug in Linguist. [`grammars.yml`][grammars] lists all the grammars we use for syntax highlighting on github.com. Find the one corresponding to your code's programming language and submit a bug report upstream.
+Assuming your code is being detected as the right language (see above), in most cases this is due to a bug in the language grammar rather than a bug in Linguist. [`grammars.yml`][grammars] lists all the grammars we use for syntax highlighting on github.com. Find the one corresponding to your code's programming language and submit a bug report upstream. If you can, try to reproduce the highlighting problem in the text editor that the grammar is designed for (TextMate, Sublime Text, or Atom) and include that information in your bug report.
 
 You can also try to fix the bug yourself and submit a Pull Request. [This piece from TextMate's documentation](http://manual.macromates.com/en/language_grammars) offers a good introduction on how to work with TextMate-compatible grammars. You can test grammars using [Lightshow](https://lightshow.githubapp.com).
 

grammars.yml

@@ -9,8 +9,6 @@ http://svn.textmate.org/trunk/Review/Bundles/Forth.tmbundle:
 - source.forth
 http://svn.textmate.org/trunk/Review/Bundles/Parrot.tmbundle:
 - source.parrot.pir
-http://svn.textmate.org/trunk/Review/Bundles/Ruby%20Sass.tmbundle:
-- source.sass
 http://svn.textmate.org/trunk/Review/Bundles/SecondLife%20LSL.tmbundle:
 - source.lsl
 http://svn.textmate.org/trunk/Review/Bundles/VHDL.tmbundle:
@@ -85,6 +83,8 @@ https://github.com/atom/language-csharp:
 - source.cs
 - source.csx
 - source.nant-build
+https://github.com/atom/language-gfm:
+- text.html.markdown
 https://github.com/atom/language-javascript:
 - source.js
 - source.js.regexp
@@ -92,6 +92,9 @@ https://github.com/atom/language-python:
 - source.python
 - source.regexp.python
 - text.python.traceback
+https://github.com/atom/language-sass:
+- source.css.scss
+- source.sass
 https://github.com/atom/language-shellscript:
 - source.shell
 - text.shell-session
@@ -170,6 +173,7 @@ https://github.com/lavrton/sublime-better-typescript:
 https://github.com/leafo/moonscript-tmbundle:
 - source.moonscript
 https://github.com/lsf37/Isabelle.tmbundle:
+- source.isabelle.root
 - source.isabelle.theory
 https://github.com/lunixbochs/x86-assembly-textmate-bundle:
 - source.asm.x86
@@ -323,8 +327,6 @@ https://github.com/textmate/lua.tmbundle:
 - source.lua
 https://github.com/textmate/make.tmbundle:
 - source.makefile
-https://github.com/textmate/markdown.tmbundle:
-- text.html.markdown
 https://github.com/textmate/matlab.tmbundle:
 - source.matlab
 - source.octave
@@ -422,3 +424,5 @@ https://raw.githubusercontent.com/eregon/oz-tmbundle/master/Syntaxes/Oz.tmLangua
 - source.oz
 https://raw.githubusercontent.com/tenbits/sublime-mask/release/Syntaxes/mask.tmLanguage:
 - source.mask
+https://raw.githubusercontent.com/andik/IDL-Syntax/master/IDL.tmLanguage:
+- source.webidl

lib/linguist/heuristics.rb

@@ -61,6 +61,14 @@ module Linguist
       @heuristic.call(data)
     end
 
+    disambiguate "BitBake", "BlitzBasic" do |data|
+      if /^\s*; /.match(data) || data.include?("End Function")
+        Language["BlitzBasic"]
+      elsif /^\s*(# |include|require)\b/.match(data)
+        Language["BitBake"]
+      end
+    end
+
     disambiguate "Objective-C", "C++", "C" do |data|
       if (/@(interface|class|protocol|property|end|synchronised|selector|implementation)\b/.match(data))
         Language["Objective-C"]
@@ -156,6 +164,14 @@ module Linguist
       end
     end
 
+    disambiguate "TypeScript", "XML" do |data|
+      if data.include?("<TS ")
+        Language["XML"]
+      else
+        Language["TypeScript"]
+      end
+    end
+
     disambiguate "Frege", "Forth", "Text" do |data|
       if /^(: |also |new-device|previous )/.match(data)
         Language["Forth"]
@@ -165,13 +181,5 @@ module Linguist
         Language["Text"]
       end
     end
-
-    disambiguate "TypeScript", "XML" do |data|
-      if data.include?("<TS ")
-        Language["XML"]
-      else
-        Language["TypeScript"]
-      end
-    end
   end
 end

lib/linguist/languages.yml

@@ -281,6 +281,13 @@ Bison:
   - .y
   ace_mode: text
 
+BitBake:
+  type: programming
+  tm_scope: none
+  extensions:
+  - .bb
+  ace_mode: text
+
 BlitzBasic:
   type: programming
   aliases:
@@ -3028,6 +3035,13 @@ Volt:
   tm_scope: source.d
   ace_mode: d
 
+WebIDL:
+  type: programming
+  extensions:
+  - .webidl
+  tm_scope: source.webidl
+  ace_mode: text
+
 XC:
   type: programming
   extensions:

lib/linguist/popular.yml

@@ -3,7 +3,6 @@
 # This file should only be edited by GitHub staff
 
 - ActionScript
-- Bash
 - C
 - C#
 - C++
@@ -27,3 +26,4 @@
 - SQL
 - Scala
 - Scheme
+- Shell

lib/linguist/shebang.rb

@@ -18,23 +18,32 @@ module Linguist
     #
     # Returns a String or nil
     def self.interpreter(data)
-      lines = data.lines
-      return unless match = /^#! ?(.+)$/.match(lines.first)
+      shebang = data.lines.first
 
-      tokens = match[1].split(' ')
-      script = tokens.first.split('/').last
+      # First line must start with #!
+      return unless shebang && shebang.start_with?("#!")
 
+      # Get the parts of the shebang without the #!
+      tokens = shebang.sub(/^#!\s*/, '').strip.split(' ')
+
+      # There was nothing after the #!
+      return if tokens.empty?
+
+      # Get the name of the interpreter
+      script = File.basename(tokens.first)
+
+      # Get next argument if interpreter was /usr/bin/env
       script = tokens[1] if script == 'env'
 
-      # If script has an invalid shebang, we might get here
+      # Interpreter was /usr/bin/env with no arguments
       return unless script
 
       # "python2.6" -> "python2"
-      script.sub! $1, '' if script =~ /(\.\d+)$/
+      script.sub! /(\.\d+)$/, ''
 
       # Check for multiline shebang hacks that call `exec`
       if script == 'sh' &&
-        lines.first(5).any? { |l| l.match(/exec (\w+).+\$0.+\$@/) }
+        data.lines.first(5).any? { |l| l.match(/exec (\w+).+\$0.+\$@/) }
         script = $1
       end
 

samples/BitBake/gstreamer-libav.bb

@@ -0,0 +1,25 @@
+include gstreamer1.0-libav.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
+                    file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
+                    file://gst-libs/ext/libav/LICENSE;md5=23a54f59b82572c203a559346e89ed57 \
+                    file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
+                    file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+SRC_URI = " \
+    http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
+    file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
+    "
+SRC_URI[md5sum] = "86540dee14d31daf976eb2713f2294f3"
+SRC_URI[sha256sum] = "585eb7971006100ad771a852e07bd2f3e23bcc6eb0b1253a40b5a0e40e4e7418"
+
+LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
+  --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
+  --ranlib='${RANLIB}' \
+  ${GSTREAMER_1_0_DEBUG}"
+
+S = "${WORKDIR}/gst-libav-${PV}"
+

samples/BitBake/qtbase-native.bb

@@ -0,0 +1,13 @@
+require qt5-git.inc
+require ${PN}.inc
+
+do_install_append() {
+    # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
+    # e.g. qt3d, qtwayland
+    ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
+}
+
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 168 commits
+SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f"
+

samples/WebIDL/AnimationEvent.webidl

@@ -0,0 +1,25 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * http://www.w3.org/TR/css3-animations/#animation-events-
+ * http://dev.w3.org/csswg/css3-animations/#animation-events-
+ *
+ * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
+ * liability, trademark and document use rules apply.
+ */
+
+[Constructor(DOMString type, optional AnimationEventInit eventInitDict)]
+interface AnimationEvent : Event {
+  readonly attribute DOMString animationName;
+  readonly attribute float     elapsedTime;
+  readonly attribute DOMString pseudoElement;
+};
+
+dictionary AnimationEventInit : EventInit {
+  DOMString animationName = "";
+  float elapsedTime = 0;
+  DOMString pseudoElement = "";
+};

samples/WebIDL/Fetch.webidl

@@ -0,0 +1,35 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * http://fetch.spec.whatwg.org/
+ */
+
+typedef object JSON;
+// FIXME(nsm): Bug 739173: FormData is not available in workers.
+// typedef (ArrayBuffer or ArrayBufferView or Blob or FormData or USVString or URLSearchParams) BodyInit;
+typedef (ArrayBuffer or ArrayBufferView or Blob or USVString or URLSearchParams) BodyInit;
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface Body {
+  readonly attribute boolean bodyUsed;
+  [Throws]
+  Promise<ArrayBuffer> arrayBuffer();
+  [Throws]
+  Promise<Blob> blob();
+  // FIXME(nsm): Bug 739173 FormData is not supported in workers.
+  // Promise<FormData> formData();
+  [Throws]
+  Promise<JSON> json();
+  [Throws]
+  Promise<USVString> text();
+};
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface GlobalFetch {
+  [Throws, Func="mozilla::dom::Headers::PrefEnabled"]
+  Promise<Response> fetch(RequestInfo input, optional RequestInit init);
+};
+

test/test_heuristics.rb

@@ -126,6 +126,13 @@ class TestHeuristcs < Test::Unit::TestCase
     })
   end
 
+  def test_bb_by_heuristics
+    assert_heuristics({
+      "BitBake" => all_fixtures("BitBake"),
+      "BlitzBasic" => all_fixtures("BlitzBasic")
+    })
+  end
+
   def assert_heuristics(hash)
     candidates = hash.keys.map { |l| Language[l] }
 

test/test_language.rb

@@ -375,4 +375,13 @@ class TestLanguage < Test::Unit::TestCase
     message << missing.map { |language| sprintf("%-#{width}s %s", language.name, language.ace_mode) }.sort.join("\n")
     assert missing.empty?, message
   end
+
+  def test_all_popular_languages_exist
+    popular = YAML.load(File.read(File.expand_path("../../lib/linguist/popular.yml", __FILE__)))
+
+    missing = popular - Language.all.map(&:name)
+    message = "The following languages are listed in lib/linguist/popular.yml but not in lib/linguist/languages.yml.\n"
+    message << missing.sort.join("\n")
+    assert missing.empty?, message
+  end
 end

test/test_shebang.rb

@@ -17,6 +17,8 @@ class TestShebang < Test::Unit::TestCase
     assert_interpreter nil, " #!/usr/sbin/ruby"
     assert_interpreter nil, "\n#!/usr/sbin/ruby"
     assert_interpreter nil, "#!"
+    assert_interpreter nil, "#! "
+    assert_interpreter nil, "#!/usr/bin/env"
 
     assert_interpreter "ruby", "#!/usr/sbin/ruby\n# bar"
     assert_interpreter "ruby", "#!/usr/bin/ruby\n# foo"
@@ -34,6 +36,8 @@ class TestShebang < Test::Unit::TestCase
     assert_interpreter "python3", "#!/usr/bin/python3\n\n\n\n"
     assert_interpreter "sbcl", "#!/usr/bin/sbcl --script\n\n"
     assert_interpreter "perl", "#! perl"
+
+    assert_interpreter "ruby", "#!/bin/sh\n\n\nexec ruby $0 $@"
   end
 
 end