Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-15 16:12:51 +11:00
Code Issues Projects Releases Packages Wiki Activity

The 'code' lexer renders code snippets with no highlights now.

Browse source
This commit is contained in:
Martin Mahner 2014-04-12 11:01:09 -04:00
parent 05d9da53ed
commit 550ad5a908
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dpaste/highlight.py
View file

@ -24,10 +24,13 @@ LEXER_LIST = sorted(LEXER_LIST)
# The list of lexers. Its not worth to autogenerate this. See above how to # The list of lexers. Its not worth to autogenerate this. See above how to
# retrieve this. # retrieve this.
PLAIN_TEXT = 'text' # lexer name whats rendered as text (paragraphs)
PLAIN_CODE = 'plain' # lexer name of code with no hihglighting
LEXER_LIST = getattr(settings, 'DPASTE_LEXER_LIST', ( LEXER_LIST = getattr(settings, 'DPASTE_LEXER_LIST', (
('text', 'Text'), (PLAIN_TEXT, 'Text'),
('code', 'Code'), (PLAIN_CODE, 'Code'),
(_('Specific Code'), ( (_('Highlighted'), (
('abap', 'ABAP'), ('abap', 'ABAP'),
('apacheconf', 'ApacheConf'), ('apacheconf', 'ApacheConf'),
('applescript', 'AppleScript'), ('applescript', 'AppleScript'),
@ -99,7 +102,7 @@ LEXER_LIST = getattr(settings, 'DPASTE_LEXER_LIST', (
)) ))
)) ))
LEXER_KEYS = ['text', 'code'] + [i for i in dict(LEXER_LIST[2][1]).keys()] LEXER_KEYS = [PLAIN_TEXT, PLAIN_CODE] + [i for i in dict(LEXER_LIST[2][1]).keys()]
# The default lexer is python # The default lexer is python
LEXER_DEFAULT = getattr(settings, 'DPASTE_LEXER_DEFAULT', 'python') LEXER_DEFAULT = getattr(settings, 'DPASTE_LEXER_DEFAULT', 'python')
@ -107,7 +110,6 @@ LEXER_DEFAULT = getattr(settings, 'DPASTE_LEXER_DEFAULT', 'python')
# Lexers which have wordwrap enabled by default # Lexers which have wordwrap enabled by default
LEXER_WORDWRAP = getattr(settings, 'DPASTE_LEXER_WORDWRAP', ('text', 'rst')) LEXER_WORDWRAP = getattr(settings, 'DPASTE_LEXER_WORDWRAP', ('text', 'rst'))
class NakedHtmlFormatter(HtmlFormatter): class NakedHtmlFormatter(HtmlFormatter):
def wrap(self, source, outfile): def wrap(self, source, outfile):
return self._wrap_code(source) return self._wrap_code(source)
@ -117,6 +119,11 @@ class NakedHtmlFormatter(HtmlFormatter):
yield i, t yield i, t
def pygmentize(code_string, lexer_name=LEXER_DEFAULT): def pygmentize(code_string, lexer_name=LEXER_DEFAULT):
# Plain code is noth hihglighted
if lexer_name == PLAIN_CODE:
return '\n'.join([u'<span class="nn">{}</span>'.format(l)
for l in code_string.splitlines()])
try: try:
lexer = lexer_name and get_lexer_by_name(lexer_name) \ lexer = lexer_name and get_lexer_by_name(lexer_name) \
or PythonLexer() or PythonLexer()

2
dpaste/templates/dpaste/snippet_pre.html
View file

@ -1 +1 @@
{% load dpaste_tags %}<div class="code"><ol>{% for line in snippet|highlight %}<li id="{{ forloop.counter }}">{{ line|safe|default:"&nbsp;" }}</li>{% endfor %}</ol></div> {% load dpaste_tags %}<div class="code {{ snippet.lexer }}"><ol>{% for line in snippet|highlight %}<li id="{{ forloop.counter }}">{{ line|safe|default:"&nbsp;" }}</li>{% endfor %}</ol></div>