highlight.js - npm Package Compare versions

Comparing version 9.13.0 to 9.13.1

lib/highlight.js

@@ -710,4 +710,4 @@ /*
   function autoDetection(name) {
-    name = (name || '').toLowerCase();
-    return !languages[name].disableAutodetect;
+    var lang = getLanguage(name);
+    return lang && !lang.disableAutodetect;
   }
@@ -714,0 +714,0 @@

lib/languages/angelscript.js

@@ -27,3 +27,4 @@ module.exports = function(hljs) {
       'or and xor not get|0 in inout|10 out override set|0 private public const default|0 ' +
-      'final shared external mixin|10 enum typedef funcdef this super import from interface',
+      'final shared external mixin|10 enum typedef funcdef this super import from interface ' +
+      'abstract|0 try catch protected explicit',
 
@@ -30,0 +31,0 @@ // avoid close detection with C# and JS

lib/languages/cs.js

@@ -157,3 +157,3 @@ module.exports = function(hljs) {
         begin: '(' + TYPE_IDENT_RE + '\\s+)+' + hljs.IDENT_RE + '\\s*\\(', returnBegin: true,
-        end: /[{;=]/, excludeEnd: true,
+        end: /\s*[{;=]/, excludeEnd: true,
         keywords: KEYWORDS,
@@ -160,0 +160,0 @@ contains: [

lib/languages/reasonml.js

@@ -17,3 +17,3 @@ module.exports = function(hljs) {
   var RE_MODULE_IDENT = '`?[A-Z$_][0-9a-zA-Z$_]*';
-  
+
   var RE_PARAM_TYPEPARAM = '\'?[a-z$_][0-9a-z$_]*';
@@ -37,3 +37,3 @@ var RE_PARAM_TYPE = '\s*:\s*[a-z$_][0-9a-z$_]*(\(\s*(' + RE_PARAM_TYPEPARAM + '\s*(,' + RE_PARAM_TYPEPARAM + ')*)?\s*\))?';
 
-  const RE_NUMBER = '\\b(0[xX][a-fA-F0-9_]+[Lln]?|' +
+  var RE_NUMBER = '\\b(0[xX][a-fA-F0-9_]+[Lln]?|' +
     '0[oO][0-7_]+[Lln]?|' +
@@ -43,4 +43,4 @@ '0[bB][01_]+[Lln]?|' +
 
-  const NUMBER_MODE = {
-    className: 'number',    
+  var NUMBER_MODE = {
+    className: 'number',
     relevance: 0,
@@ -57,3 +57,3 @@ variants: [
 
-  const OPERATOR_MODE = {
+  var OPERATOR_MODE = {
     className: 'operator',
@@ -63,3 +63,3 @@ relevance: 0,
   };
-  const LIST_CONTENTS_MODES = [
+  var LIST_CONTENTS_MODES = [
     {
@@ -74,3 +74,3 @@ className: 'identifier',
 
-  const MODULE_ACCESS_CONTENTS = [
+  var MODULE_ACCESS_CONTENTS = [
     hljs.QUOTE_STRING_MODE,
@@ -92,3 +92,3 @@ OPERATOR_MODE,
 
-  const PARAMS_CONTENTS = [
+  var PARAMS_CONTENTS = [
     {
@@ -109,3 +109,3 @@ className: 'module',
 
-  const PARAMS_MODE = {
+  var PARAMS_MODE = {
     begin: RE_IDENT,
@@ -127,3 +127,3 @@ end: '(,|\\n|\\))',
 
-  const FUNCTION_BLOCK_MODE = {
+  var FUNCTION_BLOCK_MODE = {
     className: 'function',
@@ -177,3 +177,3 @@ relevance: 0,
 
-  const CONSTRUCTOR_MODE = {
+  var CONSTRUCTOR_MODE = {
     className: 'constructor',
@@ -194,3 +194,3 @@ begin: RE_MODULE_IDENT + '\\(',
 
-  const PATTERN_MATCH_BLOCK_MODE = {
+  var PATTERN_MATCH_BLOCK_MODE = {
     className: 'pattern-match',
@@ -204,3 +204,3 @@ begin: '\\|',
       CONSTRUCTOR_MODE,
-      OPERATOR_MODE,    
+      OPERATOR_MODE,
       {
@@ -214,3 +214,3 @@ relevance: 0,
 
-  const MODULE_ACCESS_MODE = {
+  var MODULE_ACCESS_MODE = {
     className: 'module-access',
@@ -245,3 +245,3 @@ keywords: KEYWORDS,
   PARAMS_CONTENTS.push(MODULE_ACCESS_MODE);
-  
+
   return {
@@ -248,0 +248,0 @@ aliases: ['re'],

lib/languages/swift.js

 module.exports = function(hljs) {
   var SWIFT_KEYWORDS = {
-      keyword: '__COLUMN__ __FILE__ __FUNCTION__ __LINE__ as as! as? associatedtype associativity ' +
-        'break case catch class continue convenience default defer deinit didSet do ' +
+      keyword: '#available #colorLiteral #column #else #elseif #endif #file ' +
+        '#fileLiteral #function #if #imageLiteral #line #selector #sourceLocation ' +
+        '_ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype ' +
+        'associativity break case catch class continue convenience default defer deinit didSet do ' +
         'dynamic dynamicType else enum extension fallthrough false fileprivate final for func ' +
@@ -47,2 +49,10 @@ 'get guard if import in indirect infix init inout internal is lazy left let ' +
   };
+  var STRING = {
+    className: 'string',
+    contains: [hljs.BACKSLASH_ESCAPE, SUBST],
+    variants: [
+      {begin: /"""/, end: /"""/},
+      {begin: /"/, end: /"/},
+    ]
+  };
   var NUMBERS = {
@@ -53,5 +63,2 @@ className: 'number',
   };
-  var QUOTE_STRING_MODE = hljs.inherit(hljs.QUOTE_STRING_MODE, {
-    contains: [SUBST, hljs.BACKSLASH_ESCAPE]
-  });
   SUBST.contains = [NUMBERS];
@@ -62,3 +69,3 @@
     contains: [
-      QUOTE_STRING_MODE,
+      STRING,
       hljs.C_LINE_COMMENT_MODE,
@@ -85,3 +92,3 @@ BLOCK_COMMENT,
               NUMBERS,
-              QUOTE_STRING_MODE,
+              STRING,
               hljs.C_BLOCK_COMMENT_MODE,
@@ -88,0 +95,0 @@ {begin: ':'} // relevance booster

lib/languages/typescript.js

 module.exports = function(hljs) {
+  var JS_IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
   var KEYWORDS = {
@@ -21,2 +22,34 @@ keyword:
 
+  var DECORATOR = {
+    className: 'meta',
+    begin: '@' + JS_IDENT_RE,
+  };
+
+  var ARGS =
+  {
+    begin: '\\(',
+    end: /\)/,
+    keywords: KEYWORDS,
+    contains: [
+      'self',
+      hljs.QUOTE_STRING_MODE,
+      hljs.APOS_STRING_MODE,
+      hljs.NUMBER_MODE
+    ]
+  };
+
+  var PARAMS = {
+    className: 'params',
+    begin: /\(/, end: /\)/,
+    excludeBegin: true,
+    excludeEnd: true,
+    keywords: KEYWORDS,
+    contains: [
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      DECORATOR,
+      ARGS
+    ]
+  };
+
   return {
@@ -98,15 +131,4 @@ aliases: ['ts'],
           'self',
-          hljs.inherit(hljs.TITLE_MODE, {begin: /[A-Za-z$_][0-9A-Za-z$_]*/}),
-          {
-            className: 'params',
-            begin: /\(/, end: /\)/,
-            excludeBegin: true,
-            excludeEnd: true,
-            keywords: KEYWORDS,
-            contains: [
-              hljs.C_LINE_COMMENT_MODE,
-              hljs.C_BLOCK_COMMENT_MODE
-            ],
-            illegal: /["'\(]/
-          }
+          hljs.inherit(hljs.TITLE_MODE, { begin: JS_IDENT_RE }),
+          PARAMS
         ],
@@ -120,14 +142,3 @@ illegal: /%/,
           'self',
-          {
-            className: 'params',
-            begin: /\(/, end: /\)/,
-            excludeBegin: true,
-            excludeEnd: true,
-            keywords: KEYWORDS,
-            contains: [
-              hljs.C_LINE_COMMENT_MODE,
-              hljs.C_BLOCK_COMMENT_MODE
-            ],
-            illegal: /["'\(]/
-          }
+          PARAMS
         ]
@@ -137,3 +148,3 @@ },
         begin: /module\./,
-        keywords: {built_in: 'module'},
+        keywords: { built_in: 'module' },
         relevance: 0
@@ -154,7 +165,6 @@ },
       },
-      {
-        className: 'meta', begin: '@[A-Za-z]+'
-      }
+      DECORATOR,
+      ARGS
     ]
   };
 };

package.json

@@ -9,3 +9,3 @@ {
   "homepage": "https://highlightjs.org/",
-  "version": "9.13.0",
+  "version": "9.13.1",
   "author": {
@@ -17,2 +17,22 @@ "name": "Ivan Sagalaev",
     {
+      "name": "Gidi Meir Morris",
+      "email": "[e-mail]"
+    },
+    {
+      "name": "Jan T. Sott",
+      "email": "[e-mail]"
+    },
+    {
+      "name": "Li Xuanji",
+      "email": "[e-mail]"
+    },
+    {
+      "name": "Marcos Cáceres",
+      "email": "[e-mail]"
+    },
+    {
+      "name": "Sang Dang",
+      "email": "[e-mail]"
+    },
+    {
       "name": "Ivan Sagalaev (original author)",
@@ -366,6 +386,2 @@ "email": "[e-mail]"
     {
-      "name": "Jan T. Sott",
-      "email": "[e-mail]"
-    },
-    {
       "name": "Brent Bradbury",
@@ -1011,6 +1027,2 @@ "email": "[e-mail]"
     {
-      "name": "Gidi Meir Morris",
-      "email": "[e-mail]"
-    },
-    {
       "name": "Tristian Kelly",
@@ -1046,2 +1058,10 @@ "email": "[e-mail]"
       "email": "[e-mail]"
+    },
+    {
+      "name": "Antoine Boisier-Michaud",
+      "email": "[e-mail]"
+    },
+    {
+      "name": "Alejandro Isaza",
+      "email": "[e-mail]"
     }
@@ -1048,0 +1068,0 @@ ],

README.md

@@ -158,3 +158,9 @@ # Highlight.js
 
+To set the syntax highlighting style, if your build tool processes CSS from your JavaScript entry point, you can import the stylesheet directly into your CommonJS-module:
 
+```javascript
+import hljs from 'highlight.js/lib/highlight';
+import 'highlight.js/styles/github.css'
+```
+
 ## License
@@ -161,0 +167,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1246583

increased by0.07%

Lines of code

27913

increased by0.05%

Number of lines in readme file

187

increased by3.31%

No dependency changes