Merge pull request #13 from antonydevanchi/master

Fix issue #12: broke quotes
rstacruz · Apr 8, 2021 · c4c6115 · c4c6115
2 parents 84da376 + 224ede7
commit c4c6115
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/index.js b/index.js
@@ -1,4 +1,6 @@
-var hljs = require('highlight.js');
+var hljs     = require('highlight.js');
+var entities = require('html-entities');
+
 var colorize;
 
 /***
@@ -68,7 +70,7 @@ function hicat (str, options) {
   }
 
   return {
-    ansi: out.ansi,
+    ansi: entities.decode(out.ansi, {level: 'html5', scope: 'strict'}),
     language: out.language,
     html: out.value,
     raw: str
@@ -152,10 +154,7 @@ function html2ansi (str, options) {
 
   return str
     .replace(/<span class="([^"]*)">/g, '')
-    .replace(/<\/span>/g, '')
-    .replace(/&lt;/g, '<')
-    .replace(/&gt;/g, '>')
-    .replace(/&amp;/g, '&');
+    .replace(/<\/span>/g, '');
 }
 
 /**

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,8 @@
     "hicat": "bin/hicat"
   },
   "dependencies": {
-    "highlight.js": "^10.4.1",
+    "highlight.js": "^10.5.0",
+    "html-entities": "^2.0.6",
     "minimist": "^1.2.5"
   },
   "devDependencies": {

diff --git a/test/test.js b/test/test.js
@@ -72,12 +72,6 @@ describe('A simple example', function() {
     expect(out.raw).eql(input);
   });
 
-  it('produces ansi codes', function () {
-    var inputEscaped = 'var x = 2345 + &quot;hi&quot;; /*yo*/ window.document.x = function($){};';
-    var code = str.replace(/\033[^m]+m/g, '');
-    expect(code).eql(inputEscaped);
-  });
-
   it('highlights numbers', function () {
     var fragment = hicat.colorize('2345', hicat.color('number', 'javascript'));
     expect(str).include(str);