fixed EnlighterJS#109

CHANGES.md

@@ -12,6 +12,7 @@
 * Changed: `java`, `scala`, `cpp` annotation token changed to `k11`
 * Changed: added token `k11` to themes
 * Changed: moved generic highlighting rules to `lang/rulesets/generic`
+* Changed: `ampersandCleanup` is performed after html escape sequences to eliminate issues related to double unquoting #109
 * Bugfix: vhdl single bit highlighting collided with attribute syntax - thanks to [tyriun on GitHub](https://github.com/EnlighterJS/EnlighterJS/issues/106)
 * Bugfix: css classnames/ids with hyphens were not recognized
 * Bugfix: XML mixins of single/double quotes in attributes failed #108

src/engine/sourcecode-extractor.js

@@ -16,16 +16,17 @@ export function getRawCodeFromElement(element, options){
     // apply input filter
     //code = this.textFilter.filterInput(code);
 
-    // cleanup ampersand ?
-    if (options.ampersandCleanup === true) {
-        code = code.replace(/&/gim, '&');
-    }
-
     // replace html escaped chars
     code = code .replace(/&lt;/gim, '<')
                 .replace(/&gt;/gim, '>')
                 .replace(/&nbsp;/gim, ' ');
 
+    // cleanup ampersand ?
+    // run cleanup after regular html escape sequences
+    if (options.ampersandCleanup === true) {
+        code = code.replace(/&amp;/gim, '&');
+    }
+
     // get indent option value
     const newIndent = options.indent;