M, N, O

Author: joshgoebel

.eslintrc.js

@@ -69,7 +69,7 @@ module.exports = {
         // "object-curly-spacing": 1,
         // "key-spacing": "off",
         // "array-bracket-spacing": [1],
-        "array-bracket-newline": [1, {
+        "array-bracket-newline": [0, {
           multiline: true,
           minItems: 2
         }],

src/languages/makefile.js

@@ -8,64 +8,69 @@ Category: common
 
 export default function(hljs) {
   /* Variables: simple (eg $(var)) and special (eg $@) */
-  var VARIABLE = {
+  const VARIABLE = {
     className: 'variable',
     variants: [
       {
         begin: '\\$\\(' + hljs.UNDERSCORE_IDENT_RE + '\\)',
-        contains: [hljs.BACKSLASH_ESCAPE],
+        contains: [ hljs.BACKSLASH_ESCAPE ]
       },
       {
         begin: /\$[@%<?\^\+\*]/
-      },
+      }
     ]
   };
   /* Quoted string with variables inside */
-  var QUOTE_STRING = {
+  const QUOTE_STRING = {
     className: 'string',
-    begin: /"/, end: /"/,
+    begin: /"/,
+    end: /"/,
     contains: [
       hljs.BACKSLASH_ESCAPE,
-      VARIABLE,
+      VARIABLE
     ]
   };
   /* Function: $(func arg,...) */
-  var FUNC = {
+  const FUNC = {
     className: 'variable',
-    begin: /\$\([\w-]+\s/, end: /\)/,
+    begin: /\$\([\w-]+\s/,
+    end: /\)/,
     keywords: {
       built_in:
         'subst patsubst strip findstring filter filter-out sort ' +
         'word wordlist firstword lastword dir notdir suffix basename ' +
         'addsuffix addprefix join wildcard realpath abspath error warning ' +
-        'shell origin flavor foreach if or and call eval file value',
+        'shell origin flavor foreach if or and call eval file value'
     },
-    contains: [
-      VARIABLE,
-    ]
+    contains: [ VARIABLE ]
   };
   /* Variable assignment */
-  var ASSIGNMENT = {
+  const ASSIGNMENT = {
     begin: '^' + hljs.UNDERSCORE_IDENT_RE + '\\s*(?=[:+?]?=)'
   };
   /* Meta targets (.PHONY) */
-  var META = {
+  const META = {
     className: 'meta',
-    begin: /^\.PHONY:/, end: /$/,
+    begin: /^\.PHONY:/,
+    end: /$/,
     keywords: {
       $pattern: /[\.\w]+/,
       'meta-keyword': '.PHONY'
     }
   };
   /* Targets */
-  var TARGET = {
+  const TARGET = {
     className: 'section',
-    begin: /^[^\s]+:/, end: /$/,
-    contains: [VARIABLE,]
+    begin: /^[^\s]+:/,
+    end: /$/,
+    contains: [ VARIABLE ]
   };
   return {
     name: 'Makefile',
-    aliases: ['mk', 'mak'],
+    aliases: [
+      'mk',
+      'mak'
+    ],
     keywords: {
       $pattern: /[\w-]+/,
       keyword: 'define endef undefine ifdef ifndef ifeq ifneq else endif ' +
@@ -78,7 +83,7 @@ export default function(hljs) {
       FUNC,
       ASSIGNMENT,
       META,
-      TARGET,
+      TARGET
     ]
   };
 }

src/languages/markdown.js

@@ -10,29 +10,46 @@ import * as regex from '../lib/regex.js';
 
 export default function(hljs) {
   const INLINE_HTML = {
-    begin: /<\/?[A-Za-z_]/, end: '>',
+    begin: /<\/?[A-Za-z_]/,
+    end: '>',
     subLanguage: 'xml',
     relevance: 0
   };
   const HORIZONTAL_RULE = {
-    begin: '^[-\\*]{3,}', end: '$'
+    begin: '^[-\\*]{3,}',
+    end: '$'
   };
   const CODE = {
     className: 'code',
     variants: [
       // TODO: fix to allow these to work with sublanguage also
-      { begin: '(`{3,})(.|\\n)*?\\1`*[ ]*', },
-      { begin: '(~{3,})(.|\\n)*?\\1~*[ ]*', },
+      {
+        begin: '(`{3,})(.|\\n)*?\\1`*[ ]*'
+      },
+      {
+        begin: '(~{3,})(.|\\n)*?\\1~*[ ]*'
+      },
       // needed to allow markdown as a sublanguage to work
-      { begin: '```', end: '```+[ ]*$' },
-      { begin: '~~~', end: '~~~+[ ]*$' },
-      { begin: '`.+?`' },
+      {
+        begin: '```',
+        end: '```+[ ]*$'
+      },
+      {
+        begin: '~~~',
+        end: '~~~+[ ]*$'
+      },
+      {
+        begin: '`.+?`'
+      },
       {
         begin: '(?=^( {4}|\\t))',
         // use contains to gobble up multiple lines to allow the block to be whatever size
         // but only have a single open/close tag vs one per line
         contains: [
-          { begin: '^( {4}|\\t)', end: '(\\n)$' }
+          {
+            begin: '^( {4}|\\t)',
+            end: '(\\n)$'
+          }
         ],
         relevance: 0
       }
@@ -50,12 +67,15 @@ export default function(hljs) {
     contains: [
       {
         className: 'symbol',
-        begin: /\[/, end: /\]/,
-        excludeBegin: true, excludeEnd: true
+        begin: /\[/,
+        end: /\]/,
+        excludeBegin: true,
+        excludeEnd: true
       },
       {
         className: 'link',
-        begin: /:\s*/, end: /$/,
+        begin: /:\s*/,
+        end: /$/,
         excludeBegin: true
       }
     ]
@@ -65,35 +85,53 @@ export default function(hljs) {
     variants: [
       // too much like nested array access in so many languages
       // to have any real relevance
-      { begin: /\[.+?\]\[.*?\]/, relevance: 0 },
+      {
+        begin: /\[.+?\]\[.*?\]/,
+        relevance: 0
+      },
       // popular internet URLs
-      { begin: /\[.+?\]\(((data|javascript|mailto):|(?:http|ftp)s?:\/\/).*?\)/, relevance: 2 },
-      { begin: regex.concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/), relevance: 2 },
+      {
+        begin: /\[.+?\]\(((data|javascript|mailto):|(?:http|ftp)s?:\/\/).*?\)/,
+        relevance: 2
+      },
+      {
+        begin: regex.concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/),
+        relevance: 2
+      },
       // relative urls
-      { begin: /\[.+?\]\([./?&#].*?\)/, relevance: 1 },
+      {
+        begin: /\[.+?\]\([./?&#].*?\)/,
+        relevance: 1
+      },
       // whatever else, lower relevance (might not be a link at all)
-      { begin: /\[.+?\]\(.*?\)/, relevance: 0 }
+      {
+        begin: /\[.+?\]\(.*?\)/,
+        relevance: 0
+      }
     ],
     returnBegin: true,
     contains: [
       {
         className: 'string',
         relevance: 0,
-        begin: '\\[', end: '\\]',
+        begin: '\\[',
+        end: '\\]',
         excludeBegin: true,
-        returnEnd: true,
+        returnEnd: true
       },
       {
         className: 'link',
         relevance: 0,
-        begin: '\\]\\(', end: '\\)',
+        begin: '\\]\\(',
+        end: '\\)',
         excludeBegin: true,
         excludeEnd: true
       },
       {
         className: 'symbol',
         relevance: 0,
-        begin: '\\]\\[', end: '\\]',
+        begin: '\\]\\[',
+        end: '\\]',
         excludeBegin: true,
         excludeEnd: true
       }
@@ -103,30 +141,43 @@ export default function(hljs) {
     className: 'strong',
     contains: [],
     variants: [
-      {begin: /_{2}/, end: /_{2}/ },
-      {begin: /\*{2}/, end: /\*{2}/ }
+      {
+        begin: /_{2}/,
+        end: /_{2}/
+      },
+      {
+        begin: /\*{2}/,
+        end: /\*{2}/
+      }
     ]
   };
   const ITALIC = {
     className: 'emphasis',
     contains: [],
     variants: [
-      { begin: /\*(?!\*)/, end: /\*/ },
-      { begin: /_(?!_)/, end: /_/, relevance: 0},
+      {
+        begin: /\*(?!\*)/,
+        end: /\*/
+      },
+      {
+        begin: /_(?!_)/,
+        end: /_/,
+        relevance: 0
+      }
     ]
   };
   BOLD.contains.push(ITALIC);
   ITALIC.contains.push(BOLD);
 
-  var CONTAINABLE = [
+  let CONTAINABLE = [
     INLINE_HTML,
     LINK
   ];
 
   BOLD.contains = BOLD.contains.concat(CONTAINABLE);
   ITALIC.contains = ITALIC.contains.concat(CONTAINABLE);
 
-  CONTAINABLE = CONTAINABLE.concat(BOLD,ITALIC);
+  CONTAINABLE = CONTAINABLE.concat(BOLD, ITALIC);
 
   const HEADER = {
     className: 'section',
@@ -135,27 +186,37 @@ export default function(hljs) {
         begin: '^#{1,6}',
         end: '$',
         contains: CONTAINABLE
-       },
+      },
       {
         begin: '(?=^.+?\\n[=-]{2,}$)',
         contains: [
-          { begin: '^[=-]*$' },
-          { begin: '^', end: "\\n", contains: CONTAINABLE },
+          {
+            begin: '^[=-]*$'
+          },
+          {
+            begin: '^',
+            end: "\\n",
+            contains: CONTAINABLE
+          }
         ]
-       }
+      }
     ]
   };
 
   const BLOCKQUOTE = {
     className: 'quote',
     begin: '^>\\s+',
     contains: CONTAINABLE,
-    end: '$',
+    end: '$'
   };
 
   return {
     name: 'Markdown',
-    aliases: ['md', 'mkdown', 'mkd'],
+    aliases: [
+      'md',
+      'mkdown',
+      'mkd'
+    ],
     contains: [
       HEADER,
       INLINE_HTML,

src/languages/mathematica.js

@@ -116,7 +116,10 @@ export default function(hljs) {
 
   return {
     name: 'Mathematica',
-    aliases: ['mma', 'wl'],
+    aliases: [
+      'mma',
+      'wl'
+    ],
     classNameAliases: {
       brace: 'punctuation',
       pattern: 'type',
@@ -127,7 +130,9 @@ export default function(hljs) {
       'message-name': 'string'
     },
     contains: [
-      hljs.COMMENT(/\(\*/, /\*\)/, {contains: ['self']}),
+      hljs.COMMENT(/\(\*/, /\*\)/, {
+        contains: [ 'self' ]
+      }),
       PATTERNS,
       SLOTS,
       MESSAGES,