Better psql commands parser

Recognize strings and quoted variables. Handled as a separate state.

1 files changed, 12 insertions, 5 deletions

diff --git a/pygments/lexers/postgres.py b/pygments/lexers/postgres.py
index 8b584811..ab797f2b 100644
--- a/pygments/lexers/postgres.py
+++ b/pygments/lexers/postgres.py
@@ -51,11 +51,10 @@ class PostgresLexer(RegexLexer):
             (r'"(""|[^"])*"', String.Name), # quoted identifier
             (r'[a-zA-Z_][a-zA-Z0-9_]*', Name),
 
-            # psql backslash command and variable
-            # These actually belongs to the console lexer,
-            # but putting it here makes things easier.
-            (r'\\.*?\n', Name),             # TODO: what is a good token?
-            (r':[a-z][a-z0-9_]*\b', Name.Variable),
+            # TODO: consider splitting the regex parser
+            (r'\\[^\s]+', Keyword.Pseudo, 'psql-command'),
+            # psql variable in SQL
+            (r""":(['"]?)[a-z][a-z0-9_]*\b\1""", Name.Variable),
 
             (r'[;:()\[\],\.]', Punctuation),
         ],
@@ -64,6 +63,14 @@ class PostgresLexer(RegexLexer):
             (r'\*/', Comment.Multiline, '#pop'),
             (r'[^/\*]+', Comment.Multiline),
             (r'[/*]', Comment.Multiline)
+        ],
+        'psql-command': [
+            (r'\n', Text, 'root'),
+            (r'\s+', Text),
+            (r""":(['"]?)[a-z][a-z0-9_]*\b\1""", Name.Variable),
+            (r"'(''|[^'])*'", String.Single),
+            (r"`([^`])*`", String.Backtick),
+            (r"[^\s]+", String.Symbol),
         ]
     }