MIME-Version: 1.0
From: Rahul Shirsat <rahul.shirsat@enterprisedb.com>
Date: Fri, 9 Apr 2021 11:30:02 +0530
Message-ID: 
 <CAKtn9dPh-b2mUAc8UFT9EwrVHrXXDMdwfqEvfc2hNEOM0iPaiw@mail.gmail.com>
Subject: [pgAdmin][patch] [Macro support] RM5908 Shortcut keys should be
 working with Manage macro & RM6161 Macro SQL input box cursor issue.
To: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="00000000000017c47d05bf83e27b"
Archived-At: 
 <https://www.postgresql.org/message-id/CAKtn9dPh-b2mUAc8UFT9EwrVHrXXDMdwfqEvfc2hNEOM0iPaiw%40mail.gmail.com>
Precedence: bulk

--00000000000017c47d05bf83e27b
Content-Type: multipart/alternative; boundary="00000000000017c47905bf83e279"

--00000000000017c47905bf83e279
Content-Type: text/plain; charset="UTF-8"

Hi Hackers,

Please find below patch which resolves the issues :

RM5908 <https://redmine.postgresql.org/issues/5908> Shortcut keys should be
working with Manage macro.
RM6161 <https://redmine.postgresql.org/issues/6161> Macro SQL input box
cursor issue.

The issue was not only for macro support modal, but also for other models
related to sqleditor (description in RM6161
<https://redmine.postgresql.org/issues/6161>) which is resolved in this fix.

-- 
*Rahul Shirsat*
Senior Software Engineer | EnterpriseDB Corporation.

--00000000000017c47905bf83e279
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">Hi Hackers,<div><br></div><div>Please find below patch whi=
ch resolves=C2=A0the issues :</div><div><br></div><div><a href=3D"https://r=
edmine.postgresql.org/issues/5908">RM5908</a> Shortcut keys should be worki=
ng with Manage macro.</div><div><a href=3D"https://redmine.postgresql.org/i=
ssues/6161">RM6161</a> Macro SQL input box cursor issue.</div><div><br></di=
v><div>The issue was not only for macro support modal, but also for other m=
odels related to sqleditor (description in <a href=3D"https://redmine.postg=
resql.org/issues/6161">RM6161</a>) which is resolved in this fix.</div><div=
><div><br></div>-- <br><div dir=3D"ltr" class=3D"gmail_signature" data-smar=
tmail=3D"gmail_signature"><div dir=3D"ltr"><div><div dir=3D"ltr"><div dir=
=3D"ltr"><div style=3D"color:rgb(0,0,0);font-family:Helvetica;font-size:12p=
x"><b style=3D"color:rgb(96,96,97)">Rahul Shirsat</b><br></div><div style=
=3D"color:rgb(0,0,0);font-family:Helvetica;font-size:12px"><font color=3D"#=
5f5e5f">Senior Software Engineer=C2=A0|=C2=A0EnterpriseDB=C2=A0Corporation.=
</font></div></div></div></div></div></div></div></div>

--00000000000017c47905bf83e279--

--00000000000017c47d05bf83e27b
Content-Type: application/octet-stream; name="RM5908_RM6161.patch"
Content-Disposition: attachment; filename="RM5908_RM6161.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_kn9wads50>
X-Attachment-Id: f_kn9wads50

ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9qcy9jcmVh
dGVfZGlhbG9ndWUuanMgYi93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9zdGF0aWMvanMv
Y3JlYXRlX2RpYWxvZ3VlLmpzCmluZGV4IGZhMDhlYTU2MC4uZTNiMjY5ZjAwIDEwMDY0NAotLS0g
YS93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9zdGF0aWMvanMvY3JlYXRlX2RpYWxvZ3Vl
LmpzCisrKyBiL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9qcy9jcmVhdGVf
ZGlhbG9ndWUuanMKQEAgLTE5MSw0ICsxOTEsNCBAQCBtb2R1bGUuZXhwb3J0cyA9ICBBbGVydGlm
eS5kaWFsb2coJ2NyZWF0ZU1vZGVEbGcnLCBmdW5jdGlvbigpIHsKICAgICAgIH0KICAgICB9LAog
ICB9OwotfSwgdHJ1ZSwgJ2ZpbGVTZWxlY3Rpb25EbGcnKTsKK30sIGZhbHNlLCAnZmlsZVNlbGVj
dGlvbkRsZycpOwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9t
YWNyby5qcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvbWFjcm8uanMKaW5kZXgg
NzRjN2RhYjJkLi40YWYwZjNhZjUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9z
cWxlZGl0b3IvbWFjcm8uanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9t
YWNyby5qcwpAQCAtNjMsNiArNjMsMTcgQEAgbGV0IE1hY3JvRGlhbG9nID0gewogICAgICAgICAg
ICAgICBjbGFzc05hbWU6ICdidG4gYnRuLXByaW1hcnkgZmEgZmEtc2F2ZSBwZy1hbGVydGlmeS1i
dXR0b24nLAogICAgICAgICAgICAgICAnZGF0YS1idG4tbmFtZSc6ICdvaycsCiAgICAgICAgICAg
ICB9XSwKKyAgICAgICAgICAgIGZvY3VzOiB7CisgICAgICAgICAgICAgIGVsZW1lbnQ6IGZ1bmN0
aW9uKCl7CisgICAgICAgICAgICAgIC8qCisgICAgICAgICAgICAgIHJldHVybmluZyBmYWxzZSB3
aWxsIGZvY3VzIG5vdGhpbmcsIGJ1dCBpdCB3aWxsIG1ha2UKKyAgICAgICAgICAgICAgY29udGVu
dHMgYmVoaW5kIHRoZSBtb2RhbCBhY2Nlc3NpYmxlIHZpYSBUYWIga2V5LAorICAgICAgICAgICAg
ICBzbyBmb2N1cyB0aGUgZGlhbG9nIGl0c2VsZiBpbnN0ZWFkLgorICAgICAgICAgICAgICAqLwor
ICAgICAgICAgICAgICAgIHJldHVybiAkKHRoaXMuZWxlbWVudHMuZGlhbG9nKS5maW5kKCcuaGVh
ZGVyLWljb24tY2VsbCBidXR0b24nKVswXTsKKyAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAg
ICAgc2VsZWN0OiB0cnVlLAorICAgICAgICAgICAgfSwKICAgICAgICAgICAgIC8vIFNldCBvcHRp
b25zIGZvciBkaWFsb2cKICAgICAgICAgICAgIG9wdGlvbnM6IHsKICAgICAgICAgICAgICAgdGl0
bGU6IHRpdGxlLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9u
ZXdfY29ubmVjdGlvbl9kaWFsb2cuanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9y
L25ld19jb25uZWN0aW9uX2RpYWxvZy5qcwppbmRleCA5ZmVkZTJiMDcuLjY4ZjFiYTgxOCAxMDA2
NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9uZXdfY29ubmVjdGlvbl9k
aWFsb2cuanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9uZXdfY29ubmVj
dGlvbl9kaWFsb2cuanMKQEAgLTgyLDYgKzgyLDE3IEBAIGxldCBOZXdDb25uZWN0aW9uRGlhbG9n
ID0gewogICAgICAgICAgICAgICAgICAgJ2RhdGEtYnRuLW5hbWUnOiAnb2snLAogICAgICAgICAg
ICAgICAgIH0sCiAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgIGZvY3VzOiB7CisgICAg
ICAgICAgICAgICAgZWxlbWVudDogZnVuY3Rpb24oKXsKKyAgICAgICAgICAgICAgICAvKgorICAg
ICAgICAgICAgICAgIHJldHVybmluZyBmYWxzZSB3aWxsIGZvY3VzIG5vdGhpbmcsIGJ1dCBpdCB3
aWxsIG1ha2UKKyAgICAgICAgICAgICAgICBjb250ZW50cyBiZWhpbmQgdGhlIG1vZGFsIGFjY2Vz
c2libGUgdmlhIFRhYiBrZXksCisgICAgICAgICAgICAgICAgc28gZm9jdXMgdGhlIGRpYWxvZyBp
dHNlbGYgaW5zdGVhZC4KKyAgICAgICAgICAgICAgICAqLworICAgICAgICAgICAgICAgICAgcmV0
dXJuICQodGhpcy5lbGVtZW50cy5kaWFsb2cpLmZpbmQoJy5uZXctY29ubmVjdGlvbi1kaWFsb2cg
Lm5hdi1saW5rLmFjdGl2ZS5zaG93Jyk7CisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAg
ICAgICBzZWxlY3Q6IHRydWUsCisgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgIC8vIFNl
dCBvcHRpb25zIGZvciBkaWFsb2cKICAgICAgICAgICAgICAgb3B0aW9uczogewogICAgICAgICAg
ICAgICAgIHRpdGxlOiB0aXRsZSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9z
cWxlZGl0b3JfdXRpbHMuanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yX3V0aWxz
LmpzCmluZGV4IGU1MWNhYjU3Yi4uMzMyYmRmMTMzIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9z
dGF0aWMvanMvc3FsZWRpdG9yX3V0aWxzLmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9z
cWxlZGl0b3JfdXRpbHMuanMKQEAgLTgsOCArOCw4IEBACiAvLy8vLy8vLy8vLy8vLy8vLy8vLy8v
Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwogLy8g
VGhpcyBmaWxlIGNvbnRhaW5zIGNvbW1vbiB1dGlsaXRpZXMgZnVuY3Rpb25zIHVzZWQgaW4gc3Fs
ZWRpdG9yIG1vZHVsZXMKIAotZGVmaW5lKFsnanF1ZXJ5JywgJ3VuZGVyc2NvcmUnLCAnc291cmNl
cy9nZXR0ZXh0JywgJ3NvdXJjZXMvdXJsX2ZvciddLAotICBmdW5jdGlvbiAoJCwgXywgZ2V0dGV4
dCwgdXJsX2ZvcikgeworZGVmaW5lKFsnanF1ZXJ5JywgJ3VuZGVyc2NvcmUnLCAnc291cmNlcy9n
ZXR0ZXh0JywgJ3NvdXJjZXMvdXJsX2ZvcicsICdwZ2FkbWluLmFsZXJ0aWZ5anMnXSwKKyAgZnVu
Y3Rpb24gKCQsIF8sIGdldHRleHQsIHVybF9mb3IsIGFsZXJ0aWZ5KSB7CiAgICAgdmFyIHNxbEVk
aXRvclV0aWxzID0gewogICAgICAgLyogUmVmZXJlbmNlIGxpbmsgaHR0cDovL3N0YWNrb3ZlcmZs
b3cuY29tL3F1ZXN0aW9ucy8xMDUwMzQvY3JlYXRlLWd1aWQtdXVpZC1pbi1qYXZhc2NyaXB0CiAg
ICAgICAgKiBNb2RpZmllZCBhcyBwZXIgcmVxdWlyZW1lbnQuCkBAIC0yMzYsNiArMjM2LDIzIEBA
IGRlZmluZShbJ2pxdWVyeScsICd1bmRlcnNjb3JlJywgJ3NvdXJjZXMvZ2V0dGV4dCcsICdzb3Vy
Y2VzL3VybF9mb3InXSwKICAgICAgICAgICB9OwogICAgICAgICB9CiAgICAgICB9LAorCisgICAg
ICBpc01vZGFsT3BlbjogZnVuY3Rpb24oZGlhbG9nX2xpc3QpIHsKKyAgICAgICAgLyogY2hlY2sg
dGhlIG1vZGFscyBpbnNpZGUgdGhlIHNxbGVkaXRvciBhcmUgb3BlbiBvciBub3QgKi8KKyAgICAg
ICAgaWYoQXJyYXkuaXNBcnJheShkaWFsb2dfbGlzdCkpIHsKKyAgICAgICAgICBmb3IobGV0IGQg
b2YgZGlhbG9nX2xpc3QpIHsKKyAgICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICAgIGlmKGFs
ZXJ0aWZ5LmRpYWxvZyhkKSAmJiBhbGVydGlmeS5kaWFsb2coZCkuaXNPcGVuKCkpCisgICAgICAg
ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBjYXRjaCAo
ZXJyKSB7CisgICAgICAgICAgICAgIC8vIERvIG5vdGhpbmcKKyAgICAgICAgICAgICAgY29uc29s
ZS53YXJuKGVyci5zdGFjayB8fCBlcnIpOworICAgICAgICAgICAgfQorICAgICAgICAgIH0KKyAg
ICAgICAgfQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICB9LAogICAgIH07CiAgICAgcmV0
dXJuIHNxbEVkaXRvclV0aWxzOwogICB9KTsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xz
L3NxbGVkaXRvci9zdGF0aWMvanMvc3FsZWRpdG9yLmpzIGIvd2ViL3BnYWRtaW4vdG9vbHMvc3Fs
ZWRpdG9yL3N0YXRpYy9qcy9zcWxlZGl0b3IuanMKaW5kZXggNWRhNjYzNjlkLi5iNTUwMzI1NWMg
MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvanMvc3FsZWRp
dG9yLmpzCisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvanMvc3FsZWRp
dG9yLmpzCkBAIC01MDYsMTMgKzUwNiwyMyBAQCBkZWZpbmUoJ3Rvb2xzLnF1ZXJ5dG9vbCcsIFsK
ICAgICAgICAgICAgICAgICB0cmFuc0lkID0gc2VsZi5oYW5kbGVyLnRyYW5zSWQ7CiAKICAgICAg
ICAgICAgICAgaWYgKCEkY29udGFpbmVyLmhhc0NsYXNzKCd3Y1BhbmVsVGFiQ29udGVudEhpZGRl
bicpKSB7Ci0gICAgICAgICAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbiAoKSB7Ci0gICAgICAg
ICAgICAgICAgICBzZWxmLmhhbmRsZXIuZ3JpZFZpZXcucXVlcnlfdG9vbF9vYmouZm9jdXMoKTsK
LSAgICAgICAgICAgICAgICB9LCAyMDApOwotICAgICAgICAgICAgICAgIC8vIFRyaWdnZXIgYW4g
ZXZlbnQgdG8gdXBkYXRlIGNvbm5lY3Rpb24gc3RhdHVzIGZsYWcKLSAgICAgICAgICAgICAgICBw
Z0Jyb3dzZXIuRXZlbnRzLnRyaWdnZXIoCi0gICAgICAgICAgICAgICAgICAncGdhZG1pbjpxdWVy
eV90b29sOnBhbmVsOmdhaW5fZm9jdXM6JyArIHRyYW5zSWQKLSAgICAgICAgICAgICAgICApOwor
CisgICAgICAgICAgICAgICAgbGV0IG1vZGFsX2xpc3QgPSBbJ2ZpbGVTZWxlY3Rpb25EbGcnLCAn
Y3JlYXRlTW9kZURsZycsCisgICAgICAgICAgICAgICAgICAnY29uZmlybScsICdhbGVydCcsICdj
b25maXJtU2F2ZScsICduZXdDb25uZWN0aW9uRGlhbG9nJywKKyAgICAgICAgICAgICAgICAgICdt
YWNyb0RpYWxvZyddOworCisgICAgICAgICAgICAgICAgLyogY2hlY2sgdGhlIG1vZGFscyBpbnNp
ZGUgdGhlIHNxbGVkaXRvciBhcmUgb3BlbiwgaWYgbm90LAorICAgICAgICAgICAgICAgIGZvY3Vz
IG9uIHRoZSBlZGl0b3IgaW5zdGVhZC4gKi8KKyAgICAgICAgICAgICAgICBpZighU3FsRWRpdG9y
VXRpbHMuaXNNb2RhbE9wZW4obW9kYWxfbGlzdCkpIHsKKyAgICAgICAgICAgICAgICAgIHNldFRp
bWVvdXQoZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgICAgICAgICBzZWxmLmhhbmRsZXIuZ3Jp
ZFZpZXcucXVlcnlfdG9vbF9vYmouZm9jdXMoKTsKKyAgICAgICAgICAgICAgICAgIH0sIDIwMCk7
CisKKyAgICAgICAgICAgICAgICAgIC8vIFRyaWdnZXIgYW4gZXZlbnQgdG8gdXBkYXRlIGNvbm5l
Y3Rpb24gc3RhdHVzIGZsYWcKKyAgICAgICAgICAgICAgICAgIHBnQnJvd3Nlci5FdmVudHMudHJp
Z2dlcigKKyAgICAgICAgICAgICAgICAgICAgJ3BnYWRtaW46cXVlcnlfdG9vbDpwYW5lbDpnYWlu
X2ZvY3VzOicgKyB0cmFuc0lkCisgICAgICAgICAgICAgICAgICApOworICAgICAgICAgICAgICAg
IH0KICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSk7CiAK
--00000000000017c47d05bf83e27b--