2012-11-19 17:55:28 +01:00
|
|
|
"""
|
|
|
|
Fenced Code Extension for Python Markdown
|
|
|
|
=========================================
|
|
|
|
|
|
|
|
This extension adds Fenced Code Blocks to Python-Markdown.
|
|
|
|
|
|
|
|
>>> import markdown
|
|
|
|
>>> text = '''
|
|
|
|
... A paragraph before a fenced code block:
|
|
|
|
...
|
|
|
|
... ~~~
|
|
|
|
... Fenced code block
|
|
|
|
... ~~~
|
|
|
|
... '''
|
|
|
|
>>> html = markdown.markdown(text, extensions=['fenced_code'])
|
|
|
|
>>> print html
|
|
|
|
<p>A paragraph before a fenced code block:</p>
|
|
|
|
<pre><code>Fenced code block
|
|
|
|
</code></pre>
|
|
|
|
|
|
|
|
Works with safe_mode also (we check this because we are using the HtmlStash):
|
|
|
|
|
|
|
|
>>> print markdown.markdown(text, extensions=['fenced_code'], safe_mode='replace')
|
|
|
|
<p>A paragraph before a fenced code block:</p>
|
|
|
|
<pre><code>Fenced code block
|
|
|
|
</code></pre>
|
|
|
|
|
|
|
|
Include tilde's in a code block and wrap with blank lines:
|
|
|
|
|
|
|
|
>>> text = '''
|
|
|
|
... ~~~~~~~~
|
|
|
|
...
|
|
|
|
... ~~~~
|
|
|
|
... ~~~~~~~~'''
|
|
|
|
>>> print markdown.markdown(text, extensions=['fenced_code'])
|
|
|
|
<pre><code>
|
|
|
|
~~~~
|
|
|
|
</code></pre>
|
|
|
|
|
2017-03-20 18:54:00 +01:00
|
|
|
Removes trailing whitespace from code blocks that cause horizontal scrolling
|
|
|
|
>>> import markdown
|
|
|
|
>>> text = '''
|
|
|
|
... A paragraph before a fenced code block:
|
|
|
|
...
|
|
|
|
... ~~~
|
|
|
|
... Fenced code block \t\t\t\t\t\t\t
|
|
|
|
... ~~~
|
|
|
|
... '''
|
|
|
|
>>> html = markdown.markdown(text, extensions=['fenced_code'])
|
|
|
|
>>> print html
|
|
|
|
<p>A paragraph before a fenced code block:</p>
|
|
|
|
<pre><code>Fenced code block
|
|
|
|
</code></pre>
|
|
|
|
|
2012-11-19 17:55:28 +01:00
|
|
|
Language tags:
|
|
|
|
|
|
|
|
>>> text = '''
|
|
|
|
... ~~~~{.python}
|
|
|
|
... # Some python code
|
|
|
|
... ~~~~'''
|
|
|
|
>>> print markdown.markdown(text, extensions=['fenced_code'])
|
|
|
|
<pre><code class="python"># Some python code
|
|
|
|
</code></pre>
|
|
|
|
|
|
|
|
Copyright 2007-2008 [Waylan Limberg](http://achinghead.com/).
|
|
|
|
|
|
|
|
Project website: <http://packages.python.org/Markdown/extensions/fenced_code_blocks.html>
|
|
|
|
Contact: markdown@freewisdom.org
|
|
|
|
|
|
|
|
License: BSD (see ../docs/LICENSE for details)
|
|
|
|
|
|
|
|
Dependencies:
|
|
|
|
* [Python 2.4+](http://python.org)
|
|
|
|
* [Markdown 2.0+](http://packages.python.org/Markdown/)
|
|
|
|
* [Pygments (optional)](http://pygments.org)
|
|
|
|
|
|
|
|
"""
|
|
|
|
import re
|
2020-11-11 00:33:05 +01:00
|
|
|
from typing import Any, Iterable, List, Mapping, MutableSequence, Optional, Sequence
|
2020-06-11 00:54:34 +02:00
|
|
|
|
2020-10-30 01:31:33 +01:00
|
|
|
import lxml.html
|
2017-03-20 16:56:39 +01:00
|
|
|
from django.utils.html import escape
|
2020-10-19 06:37:43 +02:00
|
|
|
from markdown import Markdown
|
|
|
|
from markdown.extensions import Extension
|
2016-10-16 08:36:31 +02:00
|
|
|
from markdown.extensions.codehilite import CodeHilite, CodeHiliteExtension
|
2020-10-19 06:37:43 +02:00
|
|
|
from markdown.preprocessors import Preprocessor
|
2020-09-06 08:41:37 +02:00
|
|
|
from pygments.lexers import get_lexer_by_name
|
|
|
|
from pygments.util import ClassNotFound
|
2020-06-11 00:54:34 +02:00
|
|
|
|
2020-06-25 16:58:20 +02:00
|
|
|
from zerver.lib.exceptions import MarkdownRenderingException
|
2017-03-20 16:56:39 +01:00
|
|
|
from zerver.lib.tex import render_tex
|
2012-11-19 17:55:28 +01:00
|
|
|
|
|
|
|
# Global vars
|
2021-02-12 08:19:30 +01:00
|
|
|
FENCE_RE = re.compile(
|
|
|
|
"""
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
# ~~~ or ```
|
|
|
|
(?P<fence>
|
|
|
|
^(?:~{3,}|`{3,})
|
2012-11-19 17:55:28 +01:00
|
|
|
)
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
|
|
|
|
[ ]* # spaces
|
|
|
|
|
|
|
|
(
|
2016-06-16 13:24:52 +02:00
|
|
|
\\{?\\.?
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
(?P<lang>
|
2017-06-15 23:39:20 +02:00
|
|
|
[a-zA-Z0-9_+-./#]*
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
) # "py" or "javascript"
|
2016-06-16 13:24:52 +02:00
|
|
|
\\}?
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
) # language, like ".py" or "{javascript}"
|
2014-03-06 00:05:49 +01:00
|
|
|
[ ]* # spaces
|
2020-04-04 22:14:34 +02:00
|
|
|
(
|
|
|
|
\\{?\\.?
|
|
|
|
(?P<header>
|
|
|
|
[^~`]*
|
|
|
|
)
|
|
|
|
\\}?
|
|
|
|
) # header for features that use fenced block header syntax (like spoilers)
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
$
|
2021-02-12 08:19:30 +01:00
|
|
|
""",
|
|
|
|
re.VERBOSE,
|
|
|
|
)
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
|
|
|
|
|
2021-02-12 08:20:45 +01:00
|
|
|
CODE_WRAP = "<pre><code{}>{}\n</code></pre>"
|
2020-07-10 01:57:43 +02:00
|
|
|
LANG_TAG = ' class="{}"'
|
2012-11-19 17:55:28 +01:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2019-05-16 22:38:53 +02:00
|
|
|
def validate_curl_content(lines: List[str]) -> None:
|
|
|
|
error_msg = """
|
|
|
|
Missing required -X argument in curl command:
|
|
|
|
|
|
|
|
{command}
|
|
|
|
""".strip()
|
|
|
|
|
|
|
|
for line in lines:
|
2019-08-07 10:55:41 +02:00
|
|
|
regex = r'curl [-](sS)?X "?(GET|DELETE|PATCH|POST)"?'
|
2021-02-12 08:20:45 +01:00
|
|
|
if line.startswith("curl"):
|
2019-05-16 22:38:53 +02:00
|
|
|
if re.search(regex, line) is None:
|
2020-06-25 16:58:20 +02:00
|
|
|
raise MarkdownRenderingException(error_msg.format(command=line.strip()))
|
2019-05-16 22:38:53 +02:00
|
|
|
|
|
|
|
|
|
|
|
CODE_VALIDATORS = {
|
2021-02-12 08:20:45 +01:00
|
|
|
"curl": validate_curl_content,
|
2019-05-16 22:38:53 +02:00
|
|
|
}
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2020-10-19 06:37:43 +02:00
|
|
|
class FencedCodeExtension(Extension):
|
2020-06-13 03:34:01 +02:00
|
|
|
def __init__(self, config: Mapping[str, Any] = {}) -> None:
|
2019-05-16 22:38:53 +02:00
|
|
|
self.config = {
|
2021-02-12 08:20:45 +01:00
|
|
|
"run_content_validators": [
|
|
|
|
config.get("run_content_validators", False),
|
|
|
|
"Boolean specifying whether to run content validation code in CodeHandler",
|
python: Use trailing commas consistently.
Automatically generated by the following script, based on the output
of lint with flake8-comma:
import re
import sys
last_filename = None
last_row = None
lines = []
for msg in sys.stdin:
m = re.match(
r"\x1b\[35mflake8 \|\x1b\[0m \x1b\[1;31m(.+):(\d+):(\d+): (\w+)", msg
)
if m:
filename, row_str, col_str, err = m.groups()
row, col = int(row_str), int(col_str)
if filename == last_filename:
assert last_row != row
else:
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
with open(filename) as f:
lines = f.readlines()
last_filename = filename
last_row = row
line = lines[row - 1]
if err in ["C812", "C815"]:
lines[row - 1] = line[: col - 1] + "," + line[col - 1 :]
elif err in ["C819"]:
assert line[col - 2] == ","
lines[row - 1] = line[: col - 2] + line[col - 1 :].lstrip(" ")
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-10 05:23:40 +02:00
|
|
|
],
|
2019-05-16 22:38:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for key, value in config.items():
|
|
|
|
self.setConfig(key, value)
|
2012-11-19 17:55:28 +01:00
|
|
|
|
2020-10-19 06:37:43 +02:00
|
|
|
def extendMarkdown(self, md: Markdown) -> None:
|
2021-05-08 02:36:30 +02:00
|
|
|
"""Add FencedBlockPreprocessor to the Markdown instance."""
|
2012-11-19 17:55:28 +01:00
|
|
|
md.registerExtension(self)
|
2019-05-16 22:38:53 +02:00
|
|
|
processor = FencedBlockPreprocessor(
|
2021-02-12 08:20:45 +01:00
|
|
|
md, run_content_validators=self.config["run_content_validators"][0]
|
2021-02-12 08:19:30 +01:00
|
|
|
)
|
2021-02-12 08:20:45 +01:00
|
|
|
md.preprocessors.register(processor, "fenced_code_block", 25)
|
2012-11-19 17:55:28 +01:00
|
|
|
|
|
|
|
|
2018-11-02 17:11:42 +01:00
|
|
|
class BaseHandler:
|
|
|
|
def handle_line(self, line: str) -> None:
|
|
|
|
raise NotImplementedError()
|
|
|
|
|
|
|
|
def done(self) -> None:
|
|
|
|
raise NotImplementedError()
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
|
|
|
def generic_handler(
|
|
|
|
processor: Any,
|
|
|
|
output: MutableSequence[str],
|
|
|
|
fence: str,
|
|
|
|
lang: str,
|
|
|
|
header: str,
|
|
|
|
run_content_validators: bool = False,
|
|
|
|
default_language: Optional[str] = None,
|
|
|
|
) -> BaseHandler:
|
2020-04-04 22:14:34 +02:00
|
|
|
lang = lang.lower()
|
2021-02-12 08:20:45 +01:00
|
|
|
if lang in ("quote", "quoted"):
|
2020-04-13 06:26:25 +02:00
|
|
|
return QuoteHandler(processor, output, fence, default_language)
|
2021-02-12 08:20:45 +01:00
|
|
|
elif lang == "math":
|
2018-11-02 17:11:42 +01:00
|
|
|
return TexHandler(processor, output, fence)
|
2021-02-12 08:20:45 +01:00
|
|
|
elif lang == "spoiler":
|
2020-04-04 22:14:34 +02:00
|
|
|
return SpoilerHandler(processor, output, fence, header)
|
2018-11-02 17:11:42 +01:00
|
|
|
else:
|
2019-05-16 22:38:53 +02:00
|
|
|
return CodeHandler(processor, output, fence, lang, run_content_validators)
|
2018-11-02 17:11:42 +01:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
|
|
|
def check_for_new_fence(
|
|
|
|
processor: Any,
|
|
|
|
output: MutableSequence[str],
|
|
|
|
line: str,
|
|
|
|
run_content_validators: bool = False,
|
|
|
|
default_language: Optional[str] = None,
|
|
|
|
) -> None:
|
2018-11-02 17:11:42 +01:00
|
|
|
m = FENCE_RE.match(line)
|
|
|
|
if m:
|
2021-02-12 08:20:45 +01:00
|
|
|
fence = m.group("fence")
|
|
|
|
lang = m.group("lang")
|
|
|
|
header = m.group("header")
|
2020-04-13 06:26:25 +02:00
|
|
|
if not lang and default_language:
|
|
|
|
lang = default_language
|
2021-02-12 08:19:30 +01:00
|
|
|
handler = generic_handler(
|
|
|
|
processor, output, fence, lang, header, run_content_validators, default_language
|
|
|
|
)
|
2018-11-02 17:11:42 +01:00
|
|
|
processor.push(handler)
|
|
|
|
else:
|
|
|
|
output.append(line)
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2018-11-02 17:11:42 +01:00
|
|
|
class OuterHandler(BaseHandler):
|
2021-02-12 08:19:30 +01:00
|
|
|
def __init__(
|
|
|
|
self,
|
|
|
|
processor: Any,
|
|
|
|
output: MutableSequence[str],
|
|
|
|
run_content_validators: bool = False,
|
|
|
|
default_language: Optional[str] = None,
|
|
|
|
) -> None:
|
2018-11-02 17:11:42 +01:00
|
|
|
self.output = output
|
|
|
|
self.processor = processor
|
2019-05-16 22:38:53 +02:00
|
|
|
self.run_content_validators = run_content_validators
|
2020-04-13 06:26:25 +02:00
|
|
|
self.default_language = default_language
|
2018-11-02 17:11:42 +01:00
|
|
|
|
|
|
|
def handle_line(self, line: str) -> None:
|
2021-02-12 08:19:30 +01:00
|
|
|
check_for_new_fence(
|
|
|
|
self.processor, self.output, line, self.run_content_validators, self.default_language
|
|
|
|
)
|
2018-11-02 17:11:42 +01:00
|
|
|
|
|
|
|
def done(self) -> None:
|
|
|
|
self.processor.pop()
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2018-11-02 17:11:42 +01:00
|
|
|
class CodeHandler(BaseHandler):
|
2021-02-12 08:19:30 +01:00
|
|
|
def __init__(
|
|
|
|
self,
|
|
|
|
processor: Any,
|
|
|
|
output: MutableSequence[str],
|
|
|
|
fence: str,
|
|
|
|
lang: str,
|
|
|
|
run_content_validators: bool = False,
|
|
|
|
) -> None:
|
2018-11-02 17:11:42 +01:00
|
|
|
self.processor = processor
|
|
|
|
self.output = output
|
|
|
|
self.fence = fence
|
|
|
|
self.lang = lang
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
self.lines: List[str] = []
|
2019-05-16 22:38:53 +02:00
|
|
|
self.run_content_validators = run_content_validators
|
2018-11-02 17:11:42 +01:00
|
|
|
|
|
|
|
def handle_line(self, line: str) -> None:
|
|
|
|
if line.rstrip() == self.fence:
|
|
|
|
self.done()
|
|
|
|
else:
|
|
|
|
self.lines.append(line.rstrip())
|
|
|
|
|
|
|
|
def done(self) -> None:
|
2021-02-12 08:20:45 +01:00
|
|
|
text = "\n".join(self.lines)
|
2019-05-16 22:38:53 +02:00
|
|
|
|
|
|
|
# run content validators (if any)
|
|
|
|
if self.run_content_validators:
|
|
|
|
validator = CODE_VALIDATORS.get(self.lang, lambda text: None)
|
|
|
|
validator(self.lines)
|
|
|
|
|
2018-11-02 17:11:42 +01:00
|
|
|
text = self.processor.format_code(self.lang, text)
|
|
|
|
text = self.processor.placeholder(text)
|
2021-02-12 08:20:45 +01:00
|
|
|
processed_lines = text.split("\n")
|
|
|
|
self.output.append("")
|
2018-11-02 17:11:42 +01:00
|
|
|
self.output.extend(processed_lines)
|
2021-02-12 08:20:45 +01:00
|
|
|
self.output.append("")
|
2018-11-02 17:11:42 +01:00
|
|
|
self.processor.pop()
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2018-11-02 17:11:42 +01:00
|
|
|
class QuoteHandler(BaseHandler):
|
2021-02-12 08:19:30 +01:00
|
|
|
def __init__(
|
|
|
|
self,
|
|
|
|
processor: Any,
|
|
|
|
output: MutableSequence[str],
|
|
|
|
fence: str,
|
|
|
|
default_language: Optional[str] = None,
|
|
|
|
) -> None:
|
2018-11-02 17:11:42 +01:00
|
|
|
self.processor = processor
|
|
|
|
self.output = output
|
|
|
|
self.fence = fence
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
self.lines: List[str] = []
|
2020-04-13 06:26:25 +02:00
|
|
|
self.default_language = default_language
|
2018-11-02 17:11:42 +01:00
|
|
|
|
|
|
|
def handle_line(self, line: str) -> None:
|
|
|
|
if line.rstrip() == self.fence:
|
|
|
|
self.done()
|
|
|
|
else:
|
2021-02-12 08:19:30 +01:00
|
|
|
check_for_new_fence(
|
|
|
|
self.processor, self.lines, line, default_language=self.default_language
|
|
|
|
)
|
2018-11-02 17:11:42 +01:00
|
|
|
|
|
|
|
def done(self) -> None:
|
2021-02-12 08:20:45 +01:00
|
|
|
text = "\n".join(self.lines)
|
2018-11-02 17:11:42 +01:00
|
|
|
text = self.processor.format_quote(text)
|
2021-02-12 08:20:45 +01:00
|
|
|
processed_lines = text.split("\n")
|
|
|
|
self.output.append("")
|
2018-11-02 17:11:42 +01:00
|
|
|
self.output.extend(processed_lines)
|
2021-02-12 08:20:45 +01:00
|
|
|
self.output.append("")
|
2018-11-02 17:11:42 +01:00
|
|
|
self.processor.pop()
|
|
|
|
|
2020-04-04 22:14:34 +02:00
|
|
|
|
|
|
|
class SpoilerHandler(BaseHandler):
|
2021-02-12 08:19:30 +01:00
|
|
|
def __init__(
|
|
|
|
self, processor: Any, output: MutableSequence[str], fence: str, spoiler_header: str
|
|
|
|
) -> None:
|
2020-04-04 22:14:34 +02:00
|
|
|
self.processor = processor
|
|
|
|
self.output = output
|
|
|
|
self.fence = fence
|
|
|
|
self.spoiler_header = spoiler_header
|
|
|
|
self.lines: List[str] = []
|
|
|
|
|
|
|
|
def handle_line(self, line: str) -> None:
|
|
|
|
if line.rstrip() == self.fence:
|
|
|
|
self.done()
|
|
|
|
else:
|
|
|
|
check_for_new_fence(self.processor, self.lines, line)
|
|
|
|
|
|
|
|
def done(self) -> None:
|
|
|
|
if len(self.lines) == 0:
|
|
|
|
# No content, do nothing
|
|
|
|
return
|
|
|
|
else:
|
|
|
|
header = self.spoiler_header
|
2021-02-12 08:20:45 +01:00
|
|
|
text = "\n".join(self.lines)
|
2020-04-04 22:14:34 +02:00
|
|
|
|
|
|
|
text = self.processor.format_spoiler(header, text)
|
2021-02-12 08:20:45 +01:00
|
|
|
processed_lines = text.split("\n")
|
|
|
|
self.output.append("")
|
2020-04-04 22:14:34 +02:00
|
|
|
self.output.extend(processed_lines)
|
2021-02-12 08:20:45 +01:00
|
|
|
self.output.append("")
|
2020-04-04 22:14:34 +02:00
|
|
|
self.processor.pop()
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2018-11-02 17:11:42 +01:00
|
|
|
class TexHandler(BaseHandler):
|
|
|
|
def __init__(self, processor: Any, output: MutableSequence[str], fence: str) -> None:
|
|
|
|
self.processor = processor
|
|
|
|
self.output = output
|
|
|
|
self.fence = fence
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
self.lines: List[str] = []
|
2018-11-02 17:11:42 +01:00
|
|
|
|
|
|
|
def handle_line(self, line: str) -> None:
|
|
|
|
if line.rstrip() == self.fence:
|
|
|
|
self.done()
|
|
|
|
else:
|
|
|
|
self.lines.append(line)
|
|
|
|
|
|
|
|
def done(self) -> None:
|
2021-02-12 08:20:45 +01:00
|
|
|
text = "\n".join(self.lines)
|
2018-11-02 17:11:42 +01:00
|
|
|
text = self.processor.format_tex(text)
|
|
|
|
text = self.processor.placeholder(text)
|
2021-02-12 08:20:45 +01:00
|
|
|
processed_lines = text.split("\n")
|
|
|
|
self.output.append("")
|
2018-11-02 17:11:42 +01:00
|
|
|
self.output.extend(processed_lines)
|
2021-02-12 08:20:45 +01:00
|
|
|
self.output.append("")
|
2018-11-02 17:11:42 +01:00
|
|
|
self.processor.pop()
|
|
|
|
|
|
|
|
|
2020-10-19 06:37:43 +02:00
|
|
|
class FencedBlockPreprocessor(Preprocessor):
|
2021-02-12 08:19:30 +01:00
|
|
|
def __init__(self, md: Markdown, run_content_validators: bool = False) -> None:
|
2020-10-19 06:37:43 +02:00
|
|
|
super().__init__(md)
|
2012-11-19 17:55:28 +01:00
|
|
|
|
|
|
|
self.checked_for_codehilite = False
|
2019-05-16 22:38:53 +02:00
|
|
|
self.run_content_validators = run_content_validators
|
2020-11-11 00:33:05 +01:00
|
|
|
self.codehilite_conf: Mapping[str, Sequence[Any]] = {}
|
2012-11-19 17:55:28 +01:00
|
|
|
|
2018-11-02 17:11:42 +01:00
|
|
|
def push(self, handler: BaseHandler) -> None:
|
|
|
|
self.handlers.append(handler)
|
|
|
|
|
|
|
|
def pop(self) -> None:
|
|
|
|
self.handlers.pop()
|
|
|
|
|
2018-05-10 19:13:36 +02:00
|
|
|
def run(self, lines: Iterable[str]) -> List[str]:
|
2021-05-08 02:36:30 +02:00
|
|
|
"""Match and store Fenced Code Blocks in the HtmlStash."""
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
output: List[str] = []
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
|
|
|
|
processor = self
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
self.handlers: List[BaseHandler] = []
|
2018-11-02 17:11:42 +01:00
|
|
|
|
2020-04-13 06:26:25 +02:00
|
|
|
default_language = None
|
|
|
|
try:
|
|
|
|
default_language = self.md.zulip_realm.default_code_block_language
|
|
|
|
except AttributeError:
|
|
|
|
pass
|
|
|
|
handler = OuterHandler(processor, output, self.run_content_validators, default_language)
|
2018-11-02 17:11:42 +01:00
|
|
|
self.push(handler)
|
2020-05-26 03:13:03 +02:00
|
|
|
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
for line in lines:
|
2018-11-02 17:11:42 +01:00
|
|
|
self.handlers[-1].handle_line(line)
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
|
2018-11-02 17:11:42 +01:00
|
|
|
while self.handlers:
|
|
|
|
self.handlers[-1].done()
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
|
|
|
|
# This fiddly handling of new lines at the end of our output was done to make
|
2020-06-28 16:40:18 +02:00
|
|
|
# existing tests pass. Markdown is just kind of funny when it comes to new lines,
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
# but we could probably remove this hack.
|
2021-02-12 08:20:45 +01:00
|
|
|
if len(output) > 2 and output[-2] != "":
|
|
|
|
output.append("")
|
Support arbitrarily nested fenced quote/code blocks.
Now we can nest fenced code/quote blocks inside of quote
blocks down to arbitrary depths. Code blocks are always leafs.
Fenced blocks start with at least three tildes or backticks,
and the clump of punctuation then becomes the terminator for
the block. If the user ends their message without terminators,
all blocks are automatically closed.
When inside a quote block, you can start another fenced block
with any header that doesn't match the end-string of the outer
block. (If you don't want to specify a language, then you
can change the number of backticks/tildes to avoid amiguity.)
Most of the heavy lifting happens in FencedBlockPreprocessor.run().
The parser works by pushing handlers on to a stack and popping
them off when the ends of blocks are encountered. Parents communicate
with their children by passing in a simple Python list of strings
for the child to append to. Handlers also maintain their own
lists for their own content, and when their done() method is called,
they render their data as needed.
The handlers are objects returned by functions, and the handler
functions close on variables push, pop, and processor. The closure
style here makes the handlers pretty tightly coupled to the outer
run() method. If we wanted to move to a class-based style, the
tradeoff would be that the class instances would have to marshall
push/pop/processor etc., but we could test the components more
easily in isolation.
Dealing with blank lines is very fiddly inside of bugdown.
The new functionality here is captured in the test
BugdownTest.test_complexly_nested_quote().
(imported from commit 53886c8de74bdf2bbd3cef8be9de25f05bddb93c)
2013-11-20 23:25:48 +01:00
|
|
|
return output
|
|
|
|
|
2018-05-10 19:13:36 +02:00
|
|
|
def format_code(self, lang: str, text: str) -> str:
|
2013-11-20 19:48:44 +01:00
|
|
|
if lang:
|
2020-07-10 01:57:43 +02:00
|
|
|
langclass = LANG_TAG.format(lang)
|
2016-06-16 13:24:52 +02:00
|
|
|
else:
|
2021-02-12 08:20:45 +01:00
|
|
|
langclass = ""
|
2013-11-20 19:48:44 +01:00
|
|
|
|
2013-11-20 19:11:07 +01:00
|
|
|
# Check for code hilite extension
|
|
|
|
if not self.checked_for_codehilite:
|
2020-06-03 04:16:38 +02:00
|
|
|
for ext in self.md.registeredExtensions:
|
2013-11-20 19:11:07 +01:00
|
|
|
if isinstance(ext, CodeHiliteExtension):
|
|
|
|
self.codehilite_conf = ext.config
|
|
|
|
break
|
|
|
|
|
|
|
|
self.checked_for_codehilite = True
|
|
|
|
|
|
|
|
# If config is not empty, then the codehighlite extension
|
|
|
|
# is enabled, so we call it to highlite the code
|
|
|
|
if self.codehilite_conf:
|
2021-02-12 08:19:30 +01:00
|
|
|
highliter = CodeHilite(
|
|
|
|
text,
|
2021-02-12 08:20:45 +01:00
|
|
|
linenums=self.codehilite_conf["linenums"][0],
|
|
|
|
guess_lang=self.codehilite_conf["guess_lang"][0],
|
|
|
|
css_class=self.codehilite_conf["css_class"][0],
|
|
|
|
style=self.codehilite_conf["pygments_style"][0],
|
|
|
|
use_pygments=self.codehilite_conf["use_pygments"][0],
|
2021-02-12 08:19:30 +01:00
|
|
|
lang=(lang or None),
|
2021-02-12 08:20:45 +01:00
|
|
|
noclasses=self.codehilite_conf["noclasses"][0],
|
2021-02-12 08:19:30 +01:00
|
|
|
)
|
2013-11-20 19:11:07 +01:00
|
|
|
|
2021-02-12 08:20:45 +01:00
|
|
|
code = highliter.hilite().rstrip("\n")
|
2013-11-20 19:11:07 +01:00
|
|
|
else:
|
2020-07-10 01:57:43 +02:00
|
|
|
code = CODE_WRAP.format(langclass, self._escape(text))
|
2013-11-20 19:11:07 +01:00
|
|
|
|
2020-09-15 06:43:56 +02:00
|
|
|
# To support our "view in playground" feature, the frontend
|
|
|
|
# needs to know what Pygments language was used for
|
|
|
|
# highlighting this code block. We record this in a data
|
|
|
|
# attribute attached to the outer `pre` element.
|
|
|
|
# Unfortunately, the pygments API doesn't offer a way to add
|
|
|
|
# this, so we need to do it in a post-processing step.
|
2020-09-06 08:41:37 +02:00
|
|
|
if lang:
|
2020-10-30 01:31:33 +01:00
|
|
|
div_tag = lxml.html.fromstring(code)
|
2020-09-15 06:43:56 +02:00
|
|
|
|
|
|
|
# For the value of our data element, we get the lexer
|
|
|
|
# subclass name instead of directly using the language,
|
|
|
|
# since that canonicalizes aliases (Eg: `js` and
|
|
|
|
# `javascript` will be mapped to `JavaScript`).
|
2020-09-06 08:41:37 +02:00
|
|
|
try:
|
2020-09-15 06:43:56 +02:00
|
|
|
code_language = get_lexer_by_name(lang).name
|
2020-09-06 08:41:37 +02:00
|
|
|
except ClassNotFound:
|
2020-09-15 06:43:56 +02:00
|
|
|
# If there isn't a Pygments lexer by this name, we
|
|
|
|
# still tag it with the user's data-code-language
|
|
|
|
# value, since this allows hooking up a "playground"
|
|
|
|
# for custom "languages" that aren't known to Pygments.
|
2020-11-03 00:28:38 +01:00
|
|
|
code_language = lang
|
2020-09-15 06:43:56 +02:00
|
|
|
|
2021-02-12 08:20:45 +01:00
|
|
|
div_tag.attrib["data-code-language"] = code_language
|
2020-10-30 01:31:33 +01:00
|
|
|
code = lxml.html.tostring(div_tag, encoding="unicode")
|
2013-11-20 19:11:07 +01:00
|
|
|
return code
|
2013-01-29 16:14:30 +01:00
|
|
|
|
2018-05-10 19:13:36 +02:00
|
|
|
def format_quote(self, text: str) -> str:
|
2020-10-30 20:10:29 +01:00
|
|
|
paragraphs = text.split("\n")
|
2013-11-20 19:29:54 +01:00
|
|
|
quoted_paragraphs = []
|
|
|
|
for paragraph in paragraphs:
|
|
|
|
lines = paragraph.split("\n")
|
2020-10-30 20:10:29 +01:00
|
|
|
quoted_paragraphs.append("\n".join("> " + line for line in lines))
|
|
|
|
return "\n".join(quoted_paragraphs)
|
2013-11-20 19:29:54 +01:00
|
|
|
|
2020-04-04 22:14:34 +02:00
|
|
|
def format_spoiler(self, header: str, text: str) -> str:
|
|
|
|
output = []
|
|
|
|
header_div_open_html = '<div class="spoiler-block"><div class="spoiler-header">'
|
2020-09-02 02:50:08 +02:00
|
|
|
end_header_start_content_html = '</div><div class="spoiler-content" aria-hidden="true">'
|
2021-02-12 08:20:45 +01:00
|
|
|
footer_html = "</div></div>"
|
2020-04-04 22:14:34 +02:00
|
|
|
|
|
|
|
output.append(self.placeholder(header_div_open_html))
|
|
|
|
output.append(header)
|
|
|
|
output.append(self.placeholder(end_header_start_content_html))
|
|
|
|
output.append(text)
|
|
|
|
output.append(self.placeholder(footer_html))
|
|
|
|
return "\n\n".join(output)
|
|
|
|
|
2018-05-10 19:13:36 +02:00
|
|
|
def format_tex(self, text: str) -> str:
|
2017-03-20 16:56:39 +01:00
|
|
|
paragraphs = text.split("\n\n")
|
|
|
|
tex_paragraphs = []
|
|
|
|
for paragraph in paragraphs:
|
|
|
|
html = render_tex(paragraph, is_inline=False)
|
|
|
|
if html is not None:
|
|
|
|
tex_paragraphs.append(html)
|
|
|
|
else:
|
2021-02-12 08:20:45 +01:00
|
|
|
tex_paragraphs.append('<span class="tex-error">' + escape(paragraph) + "</span>")
|
2017-03-20 16:56:39 +01:00
|
|
|
return "\n\n".join(tex_paragraphs)
|
|
|
|
|
2018-05-10 19:13:36 +02:00
|
|
|
def placeholder(self, code: str) -> str:
|
2020-06-03 04:16:38 +02:00
|
|
|
return self.md.htmlStash.store(code)
|
2013-11-20 21:03:57 +01:00
|
|
|
|
2018-05-10 19:13:36 +02:00
|
|
|
def _escape(self, txt: str) -> str:
|
2021-05-08 02:36:30 +02:00
|
|
|
"""basic html escaping"""
|
2021-02-12 08:20:45 +01:00
|
|
|
txt = txt.replace("&", "&")
|
|
|
|
txt = txt.replace("<", "<")
|
|
|
|
txt = txt.replace(">", ">")
|
|
|
|
txt = txt.replace('"', """)
|
2012-11-19 17:55:28 +01:00
|
|
|
return txt
|
|
|
|
|
|
|
|
|
2017-11-05 11:15:10 +01:00
|
|
|
def makeExtension(*args: Any, **kwargs: None) -> FencedCodeExtension:
|
2019-05-16 22:38:53 +02:00
|
|
|
return FencedCodeExtension(kwargs)
|
2012-11-19 17:55:28 +01:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2012-11-19 17:55:28 +01:00
|
|
|
if __name__ == "__main__":
|
|
|
|
import doctest
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2012-11-19 17:55:28 +01:00
|
|
|
doctest.testmod()
|