Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add justify command to EvEditor.

Browse source
This commit is contained in:
Griatch 2017-02-05 10:35:56 +01:00
parent 66424c62ed
commit a731670f4c
1 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
evennia/utils/eveditor.py
View file

@ -44,7 +44,7 @@ import re
from django.conf import settings from django.conf import settings
from evennia import Command, CmdSet from evennia import Command, CmdSet
from evennia.utils import is_iter, fill, dedent, logger from evennia.utils import is_iter, fill, dedent, logger, justify
from evennia.commands import cmdhandler from evennia.commands import cmdhandler
# we use cmdhandler instead of evennia.syscmdkeys to # we use cmdhandler instead of evennia.syscmdkeys to
@ -93,7 +93,8 @@ _HELP_TEXT = \
:s <l> <w> <txt> - search/replace word or regex <w> in buffer or on line <l> :s <l> <w> <txt> - search/replace word or regex <w> in buffer or on line <l>
:f <l> - flood-fill entire buffer or line <l> :j <l> <w> - justify buffer or line <l>. <w> is f, c, l or r. Default f (full)
:f <l> - flood-fill entire buffer or line <l>: Equivalent to :j left
:fi <l> - indent entire buffer or line <l> :fi <l> - indent entire buffer or line <l>
:fd <l> - de-indent entire buffer or line <l> :fd <l> - de-indent entire buffer or line <l>
@ -370,7 +371,7 @@ class CmdEditorGroup(CmdEditorBase):
""" """
key = ":editor_command_group" key = ":editor_command_group"
aliases = [":","::", ":::", ":h", ":w", ":wq", ":q", ":q!", ":u", ":uu", ":UU", aliases = [":","::", ":::", ":h", ":w", ":wq", ":q", ":q!", ":u", ":uu", ":UU",
":dd", ":dw", ":DD", ":y", ":x", ":p", ":i", ":dd", ":dw", ":DD", ":y", ":x", ":p", ":i", ":j",
":r", ":I", ":A", ":s", ":S", ":f", ":fi", ":fd", ":echo"] ":r", ":I", ":A", ":s", ":S", ":f", ":fi", ":fd", ":echo"]
arg_regex = r"\s.*?|$" arg_regex = r"\s.*?|$"
@ -423,7 +424,7 @@ class CmdEditorGroup(CmdEditorBase):
# quit. If not saved, will ask # quit. If not saved, will ask
if self.editor._unsaved: if self.editor._unsaved:
caller.cmdset.add(SaveYesNoCmdSet) caller.cmdset.add(SaveYesNoCmdSet)
caller.msg("Save before quitting? {lcyes{lt[Y]{le/{lcno{ltN{le") caller.msg("Save before quitting? |lcyes|lt[Y]|le/|lcno|ltN|le")
else: else:
editor.quit() editor.quit()
elif cmd == ":q!": elif cmd == ":q!":
@ -552,6 +553,27 @@ class CmdEditorGroup(CmdEditorBase):
fbuf = fill(fbuf, width=width) fbuf = fill(fbuf, width=width)
buf = linebuffer[:lstart] + fbuf.split("\n") + linebuffer[lend:] buf = linebuffer[:lstart] + fbuf.split("\n") + linebuffer[lend:]
editor.update_buffer(buf) editor.update_buffer(buf)
elif cmd == ":j":
# :f <l> <w> justify buffer of <l> with <w> as align (one of
# f(ull), c(enter), r(ight) or l(left). Default is full.
align_map = {"full": "f", "f": "f", "center": "c", "c": "c",
"right": "r", "r": "r", "left": "l", "l": "l"}
align_name = {"f": "Full", "c": "Center", "l": "Left", "r": "Right"}
width = _DEFAULT_WIDTH
if self.arg1 and self.arg1.lower() not in align_map:
self.caller.msg("Valid justifications are [f]ull (default), [c]enter, [r]right or [l]eft")
return
align = align_map[self.arg1.lower()] if self.arg1 else 'f'
if not self.linerange:
lstart = 0
lend = self.cline + 1
self.caller.msg("%s-justified lines %i-%i." % (align_name[align], lstart + 1, lend))
else:
self.caller.msg("%s-justified %s." % (align_name[align], self.lstr))
jbuf = "\n".join(linebuffer[lstart:lend])
jbuf = justify(jbuf, width=width, align=align)
buf = linebuffer[:lstart] + jbuf.split("\n") + linebuffer[lend:]
editor.update_buffer(buf)
elif cmd == ":fi": elif cmd == ":fi":
# :fi <l> indent buffer or lines <l> of buffer. # :fi <l> indent buffer or lines <l> of buffer.
indent = " " * 4 indent = " " * 4