Skip to content

Commit

Permalink
Manually merge PR#1497.
Browse files Browse the repository at this point in the history
This is a manual merge as we don't want to pull in the documentation
change as part of this fix for a cleaner history.
  • Loading branch information
Anteru committed Aug 22, 2020
1 parent 343123d commit 8b44070
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions pygments/lexers/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def get_tokens_unprocessed(self, text):
curcode += line
backslash_continuation = curcode.endswith('\\\n')
continue

venv_match = self._venv.match(line)
if venv_match:
venv = venv_match.group(1)
Expand Down Expand Up @@ -773,7 +773,7 @@ class PowerShellSessionLexer(ShellSessionBaseLexer):
mimetypes = []

_innerLexerCls = PowerShellLexer
_ps1rgx = re.compile(r'^((?:\[[^]]+\]: )?PS [^>]+> ?)(.*\n?)')
_ps1rgx = re.compile(r'^((?:\[[^]]+\]: )?PS[^>]*> ?)(.*\n?)')
_ps2 = '>> '


Expand Down Expand Up @@ -907,4 +907,3 @@ class ExeclineLexer(RegexLexer):
def analyse_text(text):
if shebang_matches(text, r'execlineb'):
return 1

0 comments on commit 8b44070

Please sign in to comment.