Update to 7.1

vendor/assets/javascripts/highlight_js/languages/bash.js

@@ -3,30 +3,33 @@ Language: Bash
 Author: vah <vahtenberg@gmail.com>
 */
 
-hljs.LANGUAGES.bash = function(){
-  var BASH_LITERAL = {'true' : 1, 'false' : 1};
+hljs.LANGUAGES['bash'] = function(hljs) {
+  var BASH_LITERAL = 'true false';
   var VAR1 = {
-    className: 'variable',
-    begin: '\\$([a-zA-Z0-9_]+)\\b'
+    className: 'variable', begin: '\\$[a-zA-Z0-9_]+\\b'
   };
   var VAR2 = {
-    className: 'variable',
-    begin: '\\$\\{(([^}])|(\\\\}))+\\}',
-    contains: [hljs.C_NUMBER_MODE]
+    className: 'variable', begin: '\\${([^}]|\\\\})+}'
   };
-  var STRING = {
+  var QUOTE_STRING = {
     className: 'string',
     begin: '"', end: '"',
     illegal: '\\n',
     contains: [hljs.BACKSLASH_ESCAPE, VAR1, VAR2],
     relevance: 0
   };
+  var APOS_STRING = {
+    className: 'string',
+    begin: '\'', end: '\'',
+    contains: [{begin: '\'\''}],
+    relevance: 0
+  };
   var TEST_CONDITION = {
     className: 'test_condition',
     begin: '', end: '',
-    contains: [STRING, VAR1, VAR2, hljs.C_NUMBER_MODE],
+    contains: [QUOTE_STRING, APOS_STRING, VAR1, VAR2],
     keywords: {
-      'literal': BASH_LITERAL
+      literal: BASH_LITERAL
     },
     relevance: 0
   };
@@ -34,8 +37,8 @@ hljs.LANGUAGES.bash = function(){
   return {
     defaultMode: {
       keywords: {
-        'keyword': {'if' : 1, 'then' : 1, 'else' : 1, 'fi' : 1, 'for' : 1, 'break' : 1, 'continue' : 1, 'while' : 1, 'in' : 1, 'do' : 1, 'done' : 1, 'echo' : 1, 'exit' : 1, 'return' : 1, 'set' : 1, 'declare' : 1},
-        'literal': BASH_LITERAL
+        keyword: 'if then else fi for break continue while in do done echo exit return set declare',
+        literal: BASH_LITERAL
       },
       contains: [
         {
@@ -43,14 +46,14 @@ hljs.LANGUAGES.bash = function(){
           begin: '(#!\\/bin\\/bash)|(#!\\/bin\\/sh)',
           relevance: 10
         },
-        hljs.HASH_COMMENT_MODE,
-        hljs.C_NUMBER_MODE,
-        STRING,
         VAR1,
         VAR2,
+        hljs.HASH_COMMENT_MODE,
+        QUOTE_STRING,
+        APOS_STRING,
         hljs.inherit(TEST_CONDITION, {begin: '\\[ ', end: ' \\]', relevance: 0}),
         hljs.inherit(TEST_CONDITION, {begin: '\\[\\[ ', end: ' \\]\\]'})
       ]
     }
   };
-}();
+}(hljs);