From 849a8ab4fa04094650e4a5470f98fe62b714837d Mon Sep 17 00:00:00 2001
From: w3suli <w3suli@gmail.com>
Date: Sun, 10 Nov 2019 14:47:08 +0100
Subject: [PATCH 1/5] enh(xml) support for highlighting entities (#2260)

---
 CHANGES.md                                |  2 ++
 src/languages/xml.js                      | 13 ++++++++++---
 test/markup/twig/template_tags.expect.txt |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index dda7020b19..d93baf79ab 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@ New styles:
   none.
 
 Improvements:
+- enh(xml) support for highlighting entities (#2260) [w3suli][]
 - enh(gml) fix naming of keyword class (consistency fix) (#2254) [Liam Nobel][]
 - enh(javascript): Add support for jsdoc comments (#2245) [Milutin Kristofic][]
 - ehh(build) Add CI check for building a "use strict" safe rollup package from NPM builds (#2247) [Josh Goebel][]
@@ -23,6 +24,7 @@ Improvements:
 [Liam Nobel]: https://github.com/liamnobel
 [Carl Baxter]: https://github.com/cdbax
 [Milutin Kristofic]: https://github.com/milutin
+[w3suli]: https://github.com/w3suli
 
 
 ## Version 9.16.2
diff --git a/src/languages/xml.js b/src/languages/xml.js
index 1f16442735..3eb47ed10b 100644
--- a/src/languages/xml.js
+++ b/src/languages/xml.js
@@ -6,6 +6,10 @@ Category: common
 
 function(hljs) {
   var XML_IDENT_RE = '[A-Za-z0-9\\._:-]+';
+    var XML_ENTITIES = {
+    className: 'symbol',
+    begin: '&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;'
+  };
   var TAG_INTERNALS = {
     endsWithParent: true,
     illegal: /</,
@@ -24,8 +28,8 @@ function(hljs) {
             className: 'string',
             endsParent: true,
             variants: [
-              {begin: /"/, end: /"/},
-              {begin: /'/, end: /'/},
+              {begin: /"/, end: /"/, contains: [XML_ENTITIES]},
+              {begin: /'/, end: /'/, contains: [XML_ENTITIES]},
               {begin: /[^\s"'=<>`]+/}
             ]
           }
@@ -41,7 +45,9 @@ function(hljs) {
         className: 'meta',
         begin: '<!DOCTYPE', end: '>',
         relevance: 10,
-        contains: [{begin: '\\[', end: '\\]'}]
+        contains: [
+          {begin: '\\[', end: '\\]'}
+        ]
       },
       hljs.COMMENT(
         '<!--',
@@ -54,6 +60,7 @@ function(hljs) {
         begin: '<\\!\\[CDATA\\[', end: '\\]\\]>',
         relevance: 10
       },
+      XML_ENTITIES,
       {
         className: 'meta',
         begin: /<\?xml/, end: /\?>/, relevance: 10
diff --git a/test/markup/twig/template_tags.expect.txt b/test/markup/twig/template_tags.expect.txt
index d62d50bc8f..5016887343 100644
--- a/test/markup/twig/template_tags.expect.txt
+++ b/test/markup/twig/template_tags.expect.txt
@@ -1,10 +1,10 @@
 <span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-keyword">if</span></span> posts|<span class="hljs-keyword">length</span> %}</span><span class="xml">
   </span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-keyword">for</span></span> article in articles %}</span><span class="xml">
-  &amp;lt;div&amp;gt;
+  <span class="hljs-symbol">&amp;lt;</span>div<span class="hljs-symbol">&amp;gt;</span>
   </span><span class="hljs-template-variable">{{ article.title|<span class="hljs-keyword">upper</span>() }}</span><span class="xml">
 
   </span><span class="hljs-comment">{# outputs 'WELCOME' #}</span><span class="xml">
-  &amp;lt;/div&amp;gt;
+  <span class="hljs-symbol">&amp;lt;</span>/div<span class="hljs-symbol">&amp;gt;</span>
   </span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-keyword">endfor</span></span> %}</span><span class="xml">
 </span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-keyword">endif</span></span> %}</span><span class="xml">
 

From 79b47d8ae8fd6fce278ca306d7221b8636ff71c7 Mon Sep 17 00:00:00 2001
From: xp44mm <34696643@qq.com>
Date: Sun, 10 Nov 2019 21:52:21 +0800
Subject: [PATCH 2/5] Stop passing unused arguments (#2262)

- fix: providing with too many arguments to `startNewMode`
---
 src/highlight.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/highlight.js b/src/highlight.js
index bbeb712ad6..8094906cda 100644
--- a/src/highlight.js
+++ b/src/highlight.js
@@ -610,7 +610,7 @@ https://highlightjs.org/
           mode_buffer = lexeme;
         }
       }
-      startNewMode(new_mode, lexeme);
+      startNewMode(new_mode);
       return new_mode.returnBegin ? 0 : lexeme.length;
     }
 
@@ -645,7 +645,7 @@ https://highlightjs.org/
         if (end_mode.endSameAsBegin) {
           end_mode.starts.endRe = end_mode.endRe;
         }
-        startNewMode(end_mode.starts, '');
+        startNewMode(end_mode.starts);
       }
       return origin.returnEnd ? 0 : lexeme.length;
     }

From 0434ec2ec0678704e03927cbcf0e6d8e6254a289 Mon Sep 17 00:00:00 2001
From: David Benjamin <davidben@google.com>
Date: Mon, 11 Nov 2019 20:41:29 -0500
Subject: [PATCH 3/5] (go) Fix escaped character literals (#2266)

---
 CHANGES.md                        | 2 ++
 src/languages/go.js               | 2 +-
 test/markup/go/strings.expect.txt | 7 +++++++
 test/markup/go/strings.txt        | 7 +++++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 test/markup/go/strings.expect.txt
 create mode 100644 test/markup/go/strings.txt

diff --git a/CHANGES.md b/CHANGES.md
index d93baf79ab..7965b32ea8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,12 +19,14 @@ Improvements:
 - fix(parser): Fix merger HTML attribute quoting (#2235) [Josh Goebel][]
 - fix(parser): Look-ahead regex now work for end matches also (#2237) [Josh Goebel][]
 - fix(parser): Better errors when a language is missing (#2236) [Josh Goebel][]
+- fix(go): Fix escaped character literals (#2266) [David Benjamin][]
 
 [Josh Goebel]: https://github.com/yyyc514
 [Liam Nobel]: https://github.com/liamnobel
 [Carl Baxter]: https://github.com/cdbax
 [Milutin Kristofic]: https://github.com/milutin
 [w3suli]: https://github.com/w3suli
+[David Benjamin]: https://github.com/davidben
 
 
 ## Version 9.16.2
diff --git a/src/languages/go.js b/src/languages/go.js
index f473483c1b..5b6aff34d8 100644
--- a/src/languages/go.js
+++ b/src/languages/go.js
@@ -30,7 +30,7 @@ function(hljs) {
         className: 'string',
         variants: [
           hljs.QUOTE_STRING_MODE,
-          {begin: '\'', end: '[^\\\\]\''},
+          hljs.APOS_STRING_MODE,
           {begin: '`', end: '`'},
         ]
       },
diff --git a/test/markup/go/strings.expect.txt b/test/markup/go/strings.expect.txt
new file mode 100644
index 0000000000..b5c604552b
--- /dev/null
+++ b/test/markup/go/strings.expect.txt
@@ -0,0 +1,7 @@
+<span class="hljs-function"><span class="hljs-keyword">func</span> <span class="hljs-title">main</span><span class="hljs-params">()</span></span> {
+	str := <span class="hljs-string">"Hello, 世界\nHello \"world\"\nHello 'world'"</span>
+	char := <span class="hljs-string">'a'</span>
+	char2 := <span class="hljs-string">'"'</span>
+	char3 := <span class="hljs-string">'\\'</span>
+	char3 := <span class="hljs-string">'\''</span>
+}
diff --git a/test/markup/go/strings.txt b/test/markup/go/strings.txt
new file mode 100644
index 0000000000..6de354fc8b
--- /dev/null
+++ b/test/markup/go/strings.txt
@@ -0,0 +1,7 @@
+func main() {
+	str := "Hello, 世界\nHello \"world\"\nHello 'world'"
+	char := 'a'
+	char2 := '"'
+	char3 := '\\'
+	char3 := '\''
+}

From 5ef8249890b1af6725e7ebec04fe2f478c7b2bc2 Mon Sep 17 00:00:00 2001
From: David Benjamin <davidben@google.com>
Date: Mon, 11 Nov 2019 20:47:48 -0500
Subject: [PATCH 4/5] (objectivec) Handle multibyte character literals (#2268)

---
 CHANGES.md                                        | 1 +
 src/languages/objectivec.js                       | 5 +----
 test/markup/objectivec/string-literals.expect.txt | 7 +++++++
 test/markup/objectivec/string-literals.txt        | 7 +++++++
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 test/markup/objectivec/string-literals.expect.txt
 create mode 100644 test/markup/objectivec/string-literals.txt

diff --git a/CHANGES.md b/CHANGES.md
index 7965b32ea8..dac7a056dc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ Improvements:
 - fix(parser): Look-ahead regex now work for end matches also (#2237) [Josh Goebel][]
 - fix(parser): Better errors when a language is missing (#2236) [Josh Goebel][]
 - fix(go): Fix escaped character literals (#2266) [David Benjamin][]
+- fix(objectivec): Handle multibyte character literals (#2268) [David Benjamin][]
 
 [Josh Goebel]: https://github.com/yyyc514
 [Liam Nobel]: https://github.com/liamnobel
diff --git a/src/languages/objectivec.js b/src/languages/objectivec.js
index 1666428f71..c52c4ad659 100644
--- a/src/languages/objectivec.js
+++ b/src/languages/objectivec.js
@@ -53,6 +53,7 @@ function(hljs) {
       hljs.C_BLOCK_COMMENT_MODE,
       hljs.C_NUMBER_MODE,
       hljs.QUOTE_STRING_MODE,
+      hljs.APOS_STRING_MODE,
       {
         className: 'string',
         variants: [
@@ -60,10 +61,6 @@ function(hljs) {
             begin: '@"', end: '"',
             illegal: '\\n',
             contains: [hljs.BACKSLASH_ESCAPE]
-          },
-          {
-            begin: '\'', end: '[^\\\\]\'',
-            illegal: '[^\\\\][^\']'
           }
         ]
       },
diff --git a/test/markup/objectivec/string-literals.expect.txt b/test/markup/objectivec/string-literals.expect.txt
new file mode 100644
index 0000000000..1accd83881
--- /dev/null
+++ b/test/markup/objectivec/string-literals.expect.txt
@@ -0,0 +1,7 @@
+<span class="hljs-keyword">const</span> <span class="hljs-keyword">char</span> *str = <span class="hljs-string">"Regular \"quoted\" string\n"</span>;
+<span class="hljs-built_in">NSString</span> *nsstr = <span class="hljs-string">@"Obj-C \"quoted\" string\n"</span>;
+<span class="hljs-keyword">char</span> c = <span class="hljs-string">'c'</span>;
+<span class="hljs-keyword">char</span> c2 = <span class="hljs-string">'"'</span>;
+<span class="hljs-keyword">char</span> c3 = <span class="hljs-string">'\''</span>;
+<span class="hljs-keyword">char</span> c4 = <span class="hljs-string">'\n'</span>;
+<span class="hljs-keyword">int</span> multibyte_char = <span class="hljs-string">'abcd'</span>;
diff --git a/test/markup/objectivec/string-literals.txt b/test/markup/objectivec/string-literals.txt
new file mode 100644
index 0000000000..e1d4022ac2
--- /dev/null
+++ b/test/markup/objectivec/string-literals.txt
@@ -0,0 +1,7 @@
+const char *str = "Regular \"quoted\" string\n";
+NSString *nsstr = @"Obj-C \"quoted\" string\n";
+char c = 'c';
+char c2 = '"';
+char c3 = '\'';
+char c4 = '\n';
+int multibyte_char = 'abcd';

From 980ac21791b6760ed69ed83cb05a7c66b1fbad67 Mon Sep 17 00:00:00 2001
From: David Benjamin <davidben@google.com>
Date: Mon, 11 Nov 2019 20:50:12 -0500
Subject: [PATCH 5/5] (objectivec) Sync preprocessor highlighting with cpp
 (#2265)

The objectivec highlighting had a few bugs and was missing a few
features:

- Expressions with < were misidentified as a string like <stdio.h>
  (fixes #1964).
- Keywords like if, else, endif, etc. were not highlighted.
- The escape sequences in string literals were not parsed.
- Line continuations were not parsed.
- Comments were not parsed.

Fix all these by adapting cpp's preprocessor definition. Pull in the
preprocessor test from cpp. (This is actually objectivec's first markup
test. It probably could do with tests beyond just this feature.)
---
 CHANGES.md                                    |  1 +
 src/languages/cpp.js                          |  2 +-
 src/languages/objectivec.js                   | 22 +++++++++++++------
 test/markup/cpp/preprocessor.expect.txt       |  6 +++++
 test/markup/cpp/preprocessor.txt              |  6 +++++
 .../markup/objectivec/preprocessor.expect.txt | 19 ++++++++++++++++
 test/markup/objectivec/preprocessor.txt       | 19 ++++++++++++++++
 7 files changed, 67 insertions(+), 8 deletions(-)
 create mode 100644 test/markup/objectivec/preprocessor.expect.txt
 create mode 100644 test/markup/objectivec/preprocessor.txt

diff --git a/CHANGES.md b/CHANGES.md
index dac7a056dc..0ddce501b4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ Improvements:
 - fix(parser): Look-ahead regex now work for end matches also (#2237) [Josh Goebel][]
 - fix(parser): Better errors when a language is missing (#2236) [Josh Goebel][]
 - fix(go): Fix escaped character literals (#2266) [David Benjamin][]
+- fix(objectivec): Fix various preprocessor highlighting issues (#2265) [David Benjamin][]
 - fix(objectivec): Handle multibyte character literals (#2268) [David Benjamin][]
 
 [Josh Goebel]: https://github.com/yyyc514
diff --git a/src/languages/cpp.js b/src/languages/cpp.js
index 29c33263b6..bec975080f 100644
--- a/src/languages/cpp.js
+++ b/src/languages/cpp.js
@@ -56,7 +56,7 @@ function(hljs) {
       hljs.inherit(STRINGS, {className: 'meta-string'}),
       {
         className: 'meta-string',
-        begin: /<[^\n>]*>/, end: /$/,
+        begin: /<.*?>/, end: /$/,
         illegal: '\\n',
       },
       hljs.C_LINE_COMMENT_MODE,
diff --git a/src/languages/objectivec.js b/src/languages/objectivec.js
index c52c4ad659..1a4a9fe1cc 100644
--- a/src/languages/objectivec.js
+++ b/src/languages/objectivec.js
@@ -66,16 +66,24 @@ function(hljs) {
       },
       {
         className: 'meta',
-        begin: '#',
-        end: '$',
+        begin: /#\s*[a-z]+\b/, end: /$/,
+        keywords: {
+          'meta-keyword':
+            'if else elif endif define undef warning error line ' +
+            'pragma ifdef ifndef include'
+        },
         contains: [
+          {
+            begin: /\\\n/, relevance: 0
+          },
+          hljs.inherit(hljs.QUOTE_STRING_MODE, {className: 'meta-string'}),
           {
             className: 'meta-string',
-            variants: [
-              { begin: '\"', end: '\"' },
-              { begin: '<', end: '>' }
-            ]
-          }
+            begin: /<.*?>/, end: /$/,
+            illegal: '\\n',
+          },
+          hljs.C_LINE_COMMENT_MODE,
+          hljs.C_BLOCK_COMMENT_MODE
         ]
       },
       {
diff --git a/test/markup/cpp/preprocessor.expect.txt b/test/markup/cpp/preprocessor.expect.txt
index 62fff51bcc..2a7548ebc8 100644
--- a/test/markup/cpp/preprocessor.expect.txt
+++ b/test/markup/cpp/preprocessor.expect.txt
@@ -11,3 +11,9 @@
 <span class="hljs-meta">#<span class="hljs-meta-keyword">define</span> x(v) ((v))</span>
 <span class="hljs-meta"># <span class="hljs-meta-keyword">define</span> x(v) ((v))</span>
 <span class="hljs-meta">#  <span class="hljs-meta-keyword">define</span> x(v) ((v))</span>
+
+<span class="hljs-meta">#<span class="hljs-meta-keyword">if</span> MACRO_WITH_STRING_ARG(<span class="hljs-meta-string">"hello \"world\""</span>)</span>
+<span class="hljs-meta">#<span class="hljs-meta-keyword">elif</span> MULTI_LINE <span class="hljs-comment">/* comment */</span> &lt; \
+    EXPRESSION</span>
+<span class="hljs-keyword">int</span> bar;
+<span class="hljs-meta">#<span class="hljs-meta-keyword">endif</span>  <span class="hljs-comment">// comment</span></span>
diff --git a/test/markup/cpp/preprocessor.txt b/test/markup/cpp/preprocessor.txt
index b1ad6a67ff..01372cbfcd 100644
--- a/test/markup/cpp/preprocessor.txt
+++ b/test/markup/cpp/preprocessor.txt
@@ -11,3 +11,9 @@ int foo(void)
 #define x(v) ((v))
 # define x(v) ((v))
 #  define x(v) ((v))
+
+#if MACRO_WITH_STRING_ARG("hello \"world\"")
+#elif MULTI_LINE /* comment */ < \
+    EXPRESSION
+int bar;
+#endif  // comment
diff --git a/test/markup/objectivec/preprocessor.expect.txt b/test/markup/objectivec/preprocessor.expect.txt
new file mode 100644
index 0000000000..9002811ef6
--- /dev/null
+++ b/test/markup/objectivec/preprocessor.expect.txt
@@ -0,0 +1,19 @@
+<span class="hljs-meta">#<span class="hljs-meta-keyword">include</span> <span class="hljs-meta-string">&lt;iostream&gt;</span></span>
+<span class="hljs-meta">#<span class="hljs-meta-keyword">define</span> foo 1&lt;&lt;16</span>
+
+<span class="hljs-meta">#<span class="hljs-meta-keyword">ifdef</span> DEBUG</span>
+TYPE1 foo(<span class="hljs-keyword">void</span>)
+<span class="hljs-meta">#<span class="hljs-meta-keyword">else</span></span>
+<span class="hljs-keyword">int</span> foo(<span class="hljs-keyword">void</span>)
+<span class="hljs-meta">#<span class="hljs-meta-keyword">endif</span></span>
+{ }
+
+<span class="hljs-meta">#<span class="hljs-meta-keyword">define</span> x(v) ((v))</span>
+<span class="hljs-meta"># <span class="hljs-meta-keyword">define</span> x(v) ((v))</span>
+<span class="hljs-meta">#  <span class="hljs-meta-keyword">define</span> x(v) ((v))</span>
+
+<span class="hljs-meta">#<span class="hljs-meta-keyword">if</span> MACRO_WITH_STRING_ARG(<span class="hljs-meta-string">"hello \"world\""</span>)</span>
+<span class="hljs-meta">#<span class="hljs-meta-keyword">elif</span> MULTI_LINE <span class="hljs-comment">/* comment */</span> &lt; \
+    EXPRESSION</span>
+<span class="hljs-keyword">int</span> bar;
+<span class="hljs-meta">#<span class="hljs-meta-keyword">endif</span>  <span class="hljs-comment">// comment</span></span>
diff --git a/test/markup/objectivec/preprocessor.txt b/test/markup/objectivec/preprocessor.txt
new file mode 100644
index 0000000000..01372cbfcd
--- /dev/null
+++ b/test/markup/objectivec/preprocessor.txt
@@ -0,0 +1,19 @@
+#include <iostream>
+#define foo 1<<16
+
+#ifdef DEBUG
+TYPE1 foo(void)
+#else
+int foo(void)
+#endif
+{ }
+
+#define x(v) ((v))
+# define x(v) ((v))
+#  define x(v) ((v))
+
+#if MACRO_WITH_STRING_ARG("hello \"world\"")
+#elif MULTI_LINE /* comment */ < \
+    EXPRESSION
+int bar;
+#endif  // comment